From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.85.128.68, mailfrom: philmd@redhat.com) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by groups.io with SMTP; Mon, 06 May 2019 04:06:08 -0700 Received: by mail-wm1-f68.google.com with SMTP id f2so9728129wmj.3 for ; Mon, 06 May 2019 04:06:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=7NHUGX+B4L+0aJSpdKX2ORvlHM4sOqG3Udi6zB/OqlU=; b=t5KHpNmBq8slYBkhE4wZNQc7P8CczdHc9KgAyRim3k6Fxrq6s57GwuARWgAkxDfL8Y lg56pJeYT6adJ3kzaeVfes1KeKeTXf0eag5hkCmJT/uUlCRKDVDmx9EyXQiZY+1QCKK8 cuaLmUE+di0UCEglYZY9qyb6gfBDoeFwyEgjtTmdLIzhg31G5ZyuBkVPYvHNSS3eHT6o veCA9l0/PKvGTYQSJN0sV3TOOJLS55AcLO6db7ckOw7OjOhU3rBwt4D+7h78EhyL2/Xm 5n39NHWr9EmlAxGCBNQOCXZb0TvcktZm6E7siAVgwdxdNkt2RD0oZsMqpP2RCCSq9x2h N3Bg== X-Gm-Message-State: APjAAAUxLEUaQWNE5NtOZgzvtkLhqKqha2rZfAd3w5+6zEPSnd5KOXxt FeeYsNM3+/gpuTcZHPsKvyjT9A== X-Google-Smtp-Source: APXvYqzdljgkCNoF0yV7p53E84W3kPusph5rjwQZvEGsfICozEnq5C10RxyIHtuv1DYiLLGDpL7Zlg== X-Received: by 2002:a1c:a00f:: with SMTP id j15mr15661272wme.148.1557140767063; Mon, 06 May 2019 04:06:07 -0700 (PDT) Return-Path: Received: from [192.168.1.33] (193.red-88-21-103.staticip.rima-tde.net. [88.21.103.193]) by smtp.gmail.com with ESMTPSA id z17sm8450779wrm.33.2019.05.06.04.06.05 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Mon, 06 May 2019 04:06:06 -0700 (PDT) Subject: Re: [edk2-devel] [PATCH 1/4] OvmfPkg/PlatformPei: assign PciSize on both i440fx/q35 branches explicitly To: devel@edk2.groups.io, lersek@redhat.com Cc: Ard Biesheuvel , Gerd Hoffmann , Jordan Justen References: <20190504000716.7525-1-lersek@redhat.com> <20190504000716.7525-2-lersek@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Openpgp: id=89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE; url=http://pgp.mit.edu/pks/lookup?op=get&search=0xA2A3FD6EDEADC0DE Message-ID: Date: Mon, 6 May 2019 13:06:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190504000716.7525-2-lersek@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit On 5/4/19 2:07 AM, Laszlo Ersek wrote: > In the MemMapInitialization() function, we currently have a common > PciSize assignment, shared between i440fx and q35. In order to simplify > the rest of this series, lift and duplicate the assignment identically to > both board-specific branches. > > Cc: Ard Biesheuvel > Cc: Gerd Hoffmann > Cc: Jordan Justen > Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1666941 > Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1701710 > Contributed-under: TianoCore Contribution Agreement 1.1 I guess you can now drop the 'Contributed-under' tag from your git config. It has been removed from the wiki: https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message-Format/_compare/03d738e...ee27b0b > Signed-off-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daudé > --- > OvmfPkg/PlatformPei/Platform.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c > index 0876316eefbc..5e0a15484230 100644 > --- a/OvmfPkg/PlatformPei/Platform.c > +++ b/OvmfPkg/PlatformPei/Platform.c > @@ -190,8 +190,10 @@ MemMapInitialization ( > ASSERT (TopOfLowRam <= PciExBarBase); > ASSERT (PciExBarBase <= MAX_UINT32 - SIZE_256MB); > PciBase = (UINT32)(PciExBarBase + SIZE_256MB); > + PciSize = 0xFC000000 - PciBase; > } else { > PciBase = (TopOfLowRam < BASE_2GB) ? BASE_2GB : TopOfLowRam; > + PciSize = 0xFC000000 - PciBase; > } > > // > @@ -207,7 +209,6 @@ MemMapInitialization ( > // 0xFED20000 gap 896 KB > // 0xFEE00000 LAPIC 1 MB > // > - PciSize = 0xFC000000 - PciBase; > AddIoMemoryBaseSizeHob (PciBase, PciSize); > PcdStatus = PcdSet64S (PcdPciMmio32Base, PciBase); > ASSERT_RETURN_ERROR (PcdStatus); >