From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.86]) by mx.groups.io with SMTP id smtpd.web09.46.1583361072530522744 for ; Wed, 04 Mar 2020 14:31:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@vmware.com header.s=selector2 header.b=WhovHIiY; spf=pass (domain: vmware.com, ip: 40.107.94.86, mailfrom: awarkentin@vmware.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BNhO55Z9WfMYch78XOs19bsst81/iQ5k0WfQj2/QpXPojjr0wUo4SjRowPmht2bp0HcCzMhwVsYd1vX6Zf6Tc/NgjJbWsIliuWS3+s0u0oB/UkaDpe5COV9dB/6XQMsD1MFCSp5TjE9wV7Eulf5i9HEZffWv2z848wmQpzCdevdgEIBmN/NL+eAy4soKR/PXJcJgjiU7OQ7aMg4jbGb+Rj9tTSCvapSp3HftIcdThah9dhGtoS4vzF5TlDfGgTl/5yfY0PLq4R+se+8MJYisMU1Dihhj0IOaa4GG8p30BH3DlMePHkScOSCoY/xJlXEsluc6IL2r9hsOHOzPnG3EeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hdgB45lnUr8vLJz7PlDuySG4DkK0kG04UlIie0SAGW0=; b=kNxOTV4U2t6odlTUNMSh1w4PqWvmZAfULQlRS2kZimYQ23bXzzmqYwNT3EoK0uTPb9j+JTTCytD/zMyINCkZH4BidyK4nT19tAMvxf9yqYDKPLOZu5fs433e7xnLVt+S4vctrwOYRO9QNFKLiwnNscGyCsiOUQLUgUks2t0dJVXsIYkOJWRd0Icy7C8K9+qSHpwf60a7fDmwbgcFVLoI8D0apsuZd9YEt9cbt2gEHWBeoKIJjX19vpxjvz4Blm/EM91rCftJ9bB8CJXTxaLj2z0xSEPNwDOSN5b4heSOsKiBnrm6y3ycXMrKtYX9BdmQlx3eJHQ3JLTi7gl5pwJdEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hdgB45lnUr8vLJz7PlDuySG4DkK0kG04UlIie0SAGW0=; b=WhovHIiYNw3ID++bQpQG/mOp4DBRz6IyBhnocrB61MyOa8mXcsKLZPDC/B7vPzEPk7eIC5IG0hqwz0iX4DFqgm+KY4yECgijDNNdPpZEsKuxDwcCD3r1BGK4QJdoQy12qgLimrR7qhltfmXAF+7Z4ItDOxPjV5e1wnu3VXvkGZY= Received: from BN6PR05MB3411.namprd05.prod.outlook.com (2603:10b6:405:43::23) by BN6PR05MB3316.namprd05.prod.outlook.com (2603:10b6:405:3f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.11; Wed, 4 Mar 2020 22:31:10 +0000 Received: from BN6PR05MB3411.namprd05.prod.outlook.com ([fe80::5df3:40e3:521a:7f84]) by BN6PR05MB3411.namprd05.prod.outlook.com ([fe80::5df3:40e3:521a:7f84%5]) with mapi id 15.20.2793.013; Wed, 4 Mar 2020 22:31:10 +0000 Received: from ubuntu.localdomain (24.147.160.127) by SN4PR0501CA0038.namprd05.prod.outlook.com (2603:10b6:803:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.5 via Frontend Transport; Wed, 4 Mar 2020 22:31:09 +0000 From: "Andrei Warkentin" To: "devel@edk2.groups.io" CC: "ard.biesheuvel@linaro.org" , "leif@nuviainc.com" , "pete@akeo.ie" , "philmd@redhat.com" Subject: [edk2-platforms][PATCH 1/2] Platform/RaspberryPi/Drivers/ConfigDxe: fix bug in 3GB RAM logic Thread-Topic: [edk2-platforms][PATCH 1/2] Platform/RaspberryPi/Drivers/ConfigDxe: fix bug in 3GB RAM logic Thread-Index: AQHV8nSai8oMc5wa1kam8QjhvGajqw== Date: Wed, 4 Mar 2020 22:31:10 +0000 Message-ID: <20200304223056.116868-2-awarkentin@vmware.com> References: <20200304223056.116868-1-awarkentin@vmware.com> In-Reply-To: <20200304223056.116868-1-awarkentin@vmware.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [24.147.160.127] x-clientproxiedby: SN4PR0501CA0038.namprd05.prod.outlook.com (2603:10b6:803:41::15) To BN6PR05MB3411.namprd05.prod.outlook.com (2603:10b6:405:43::23) authentication-results: spf=none (sender IP is ) smtp.mailfrom=awarkentin@vmware.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0de6a5f5-9c6e-4393-fe77-08d7c08bbcfd x-ms-traffictypediagnostic: BN6PR05MB3316: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2958; x-forefront-prvs: 0332AACBC3 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(346002)(136003)(376002)(396003)(39860400002)(366004)(199004)(189003)(86362001)(66946007)(66446008)(66556008)(66476007)(6666004)(966005)(52116002)(1076003)(316002)(71200400001)(64756008)(81156014)(5660300002)(8676002)(8936002)(81166006)(54906003)(6486002)(956004)(186003)(4326008)(36756003)(16526019)(26005)(6916009)(6512007)(2906002)(478600001)(2616005)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR05MB3316;H:BN6PR05MB3411.namprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: uzqG6ZlGblHOKSw6AaNryswJCJKEHyfVXtXwBj83GnU3R++I0MWhgwVxgh6/x/FWHyVNzvxXVRfHIW2SSXvQoc0eDP2sqS6wkPWkKrRu+cOUjvj/1P3Jg+/ekRVf8Im6vl9Q4t/GOZXYPxfseVl6AeDSdrVYeiqDjTBM7LRNYvCP1ODzWIk+5hZiaViQrbwYtc+3zF51sv+w6F6djp2pOR6pX20Pzo5kmdWehrlmWKKlvCgwUPySxJFLKcfOFiZJ8n6JqNASEl4pAQX1aNiA/KqMRLbGSNs6DOv9Wvv9PvucugH6Gz9/FNZ6A6gbVU2fnGg2oayZIAxUzXnLU/N8Wa+X0mxWhEq/jTbCYHWCuN1+MrR2HtG0X6nlh/DG6Ks12see6HfiLVfSpHusqZ6fPzvlO7bFNqzSlh7eXWhVHNgnVAY2HwJXZ10+jukEBsk2F2YISERW7KN+WvGXkR9lC80/7kHHCvbJTtKHFxNi46ciLu0DhSqIkbx0v9IyRx7b8CsIMY07dM7On9Gjxqms5g== x-ms-exchange-antispam-messagedata: O/b2jY2+ObPaJ1JOYmyI4/xdHyOuVfSA3LzR4Da4sJQ9PqZevsp/MZFsXfzjQAo3ZIj7+ZeQOz0bXzu4bP0sE74Ac/sna7B17mgEeetiMQ84NxLWLQ7QazKQodxWBFKORhpSNtjdFP/ZRhRWW584UA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0de6a5f5-9c6e-4393-fe77-08d7c08bbcfd X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Mar 2020 22:31:10.4051 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: s4ys3Y5PNbJaOI2f05SPAJwiJwQoZXXRjnt9k0/7T8s/m0crmfyvX4BMvyvJ4hFWODRhkkbpxquOTracORQ/RA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR05MB3316 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable The original change*** used positive logic (PcdPi4GBEnabled), while the upstreamed change uses negative logic (PcdRamLimitTo3GB), which requires an additional condition, or it blows up on 1GiB and 2GiB boards. Tested on 2GB and 4GB boards (with limiting and without) *** https://github.com/pftf/edk2-platforms/\ commit/968451beb7c9302517098abf72f7e42b57a0e024 Signed-off-by: Andrei Warkentin --- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c b/Platform/= RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c index ccac8daa..5fca3c7a 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c @@ -288,7 +288,8 @@ ApplyVariables ( DEBUG ((DEBUG_INFO, "Current CPU speed is %uHz\n", Rate)); } =20 - if (mModelFamily >=3D 4 && PcdGet32 (PcdRamLimitTo3GB) =3D=3D 0) { + if (mModelFamily >=3D 4 && PcdGet32 (PcdRamMoreThan3GB) && + PcdGet32 (PcdRamLimitTo3GB) =3D=3D 0) { /* * Similar to how we compute the > 3 GB RAM segment's size in Platform= Lib/ * RaspberryPiMem.c, with some overlap protection for the Bcm2xxx regi= ster --=20 2.17.1