From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.81]) by mx.groups.io with SMTP id smtpd.web11.9461.1583394960174795239 for ; Wed, 04 Mar 2020 23:56:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@vmware.com header.s=selector2 header.b=rGP6CLfL; spf=pass (domain: vmware.com, ip: 40.107.244.81, mailfrom: awarkentin@vmware.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TN28rJUk+H9LyWN+8qagqjnsYo8jyB6RwI1m+XS3bra6/3bBzRMprQqGJb8a3Ozac+J7SPiQ/qxlGbM6Bl75qfYwdlwGEwxn2p6MDZhO2tApCzqQMz2Vyd7C56HpTUKWZO4woGt4seo5PKsHO2K6T571wzJaj9SfIDC4d0SzppRQqb8BwyoeUzZU1dmUjTzX8B9RZnC/fKAomUj/k0xEQUTsatSzHA/TSkOG5n6CLedP/sxz5hcdvDC8ZaFOiSNUUYZVx4k1wb6yXv2wO5SO0F256pIgwZEcKGPBBf7xff452sUl7B5MM2BQJ2yslM01inZuvxMj2uEuDlnWur2Zgg== 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=cv7RbQHqd0Kk5BqVU5Tdh74PArN7V1FG+DgKS5Od6JY=; b=WYxRGjlqL8xh/kDtlop7CYJoF3t1CNfZmoY4B4nr0BggQNkyQCMtO8Wsj/tDoN5MYe6ZkmxLjdYj7RldUwDCa2kp+z4RRIBYmns7aLcqqUpQ38gAao/q0Eu230/KvcNOJKxKMmgnys9y9CY+ZGIz/bEp32bBsWkwfYnEHi8pozlhcCnpbHe+1KoZ/V8qD+p11KDSsXI/H+gm/GMYxXhcRh4O+Fi/TfQn2Dd3eOa26Eda6H/mrfjjt63yw5mTueyvg+IV1YYS3GwVlUPbUYfB7GE4YtpaABkxcktUT9kxZRCy4Re+wgGax4S0cU9pOg9bttq6qECPira8751XyifECQ== 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=cv7RbQHqd0Kk5BqVU5Tdh74PArN7V1FG+DgKS5Od6JY=; b=rGP6CLfLcAMlEVCP3U36usBDjlFf2AS/oTmdEwxKxF7lLaE5sKU5hBbzmgjCpHzu3xMamI1ytP2rOCSijQ0Z7m7ULA25rl4Rqm2XiYdnid1Jaf11/gRpG9yrtyi/q7lQkfARXFttG9TfAozbN+bcRRUMx/zSYVyUC1ShDC9ym2A= Received: from CY4PR05MB3413.namprd05.prod.outlook.com (2603:10b6:910:59::21) by CY4PR05MB3623.namprd05.prod.outlook.com (2603:10b6:910:56::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.11; Thu, 5 Mar 2020 07:55:58 +0000 Received: from CY4PR05MB3413.namprd05.prod.outlook.com ([fe80::71f8:2de2:a54:38bb]) by CY4PR05MB3413.namprd05.prod.outlook.com ([fe80::71f8:2de2:a54:38bb%7]) with mapi id 15.20.2793.011; Thu, 5 Mar 2020 07:55:58 +0000 Received: from ubuntu.localdomain (24.147.160.127) by SN4PR0501CA0098.namprd05.prod.outlook.com (2603:10b6:803:42::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; Thu, 5 Mar 2020 07:55:57 +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][PATCH 1/1] ArmPlatformPkg/PrePi: fix IS_XIP Thread-Topic: [edk2][PATCH 1/1] ArmPlatformPkg/PrePi: fix IS_XIP Thread-Index: AQHV8sOBIw7Ahl2wjUeKHU1yrETvVg== Date: Thu, 5 Mar 2020 07:55:58 +0000 Message-ID: <20200305075545.449-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: SN4PR0501CA0098.namprd05.prod.outlook.com (2603:10b6:803:42::15) To CY4PR05MB3413.namprd05.prod.outlook.com (2603:10b6:910:59::21) 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: 37ee8ff4-d556-44c1-a61e-08d7c0daa3d0 x-ms-traffictypediagnostic: CY4PR05MB3623: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2512; x-forefront-prvs: 03333C607F x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(39860400002)(346002)(396003)(366004)(136003)(376002)(199004)(189003)(26005)(6916009)(8936002)(186003)(316002)(5660300002)(478600001)(54906003)(4744005)(36756003)(1076003)(16526019)(81166006)(86362001)(64756008)(956004)(66946007)(66556008)(2616005)(66446008)(52116002)(8676002)(66476007)(71200400001)(2906002)(4326008)(6512007)(6506007)(6486002)(81156014);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR05MB3623;H:CY4PR05MB3413.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: MBGDFrhPM1Z1wXaxLcMVIj8k4mrlpKhO9eR36+PLsrvCwxmCLSEL6lh5k1KBCRfWpoRuS9ZgTISJcUdFAf9kLMmRrFr3R9RbSo43ws5lb7IMX9QInjBHGq5njcvoGMugTFGTQ5TiM0bY2kcDvG6AusfhdZTKV/62a6JCq6UKnkv/ZRApI+VIOoPxYeb8zkMdnPi10h3LAjsKrBz9DZoHSroSBulbxJHhJNG6wG8WOHY5PtEHCMcbnoFTkPYmmEQ7Smiul2GDtL6Y9m5YQLPSfTOTXOGWQPenFJTcZd1h/i6C5Vk7YV/hcwbpp/NUcDCMHaG6Pd/h2sMi/vkWxTX7k7mzq5DiOvHmOOFoz+6T0CibK+OUWF4LTYC+YAFDhhnHMmhh5l3Mybo0rkcfpTHVSxm0v9PNkLyf108RRhQ6QgJ/aCJbDszTBRZqrLCQYALd x-ms-exchange-antispam-messagedata: ei11xqyaS/e4gQqX5y7ZIcO26dDz81w+3JmCJh6JVBNaajfKmUCl1SaXoIBOp3PZn0uYwc4TUKY5//ESwn2Sh9JGgjrSvZaITOcF0nwK1NhGJoRshZio8JjEIfgpGRowFp7tO0VXVXNpRASzBqBj8A== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37ee8ff4-d556-44c1-a61e-08d7c0daa3d0 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Mar 2020 07:55:58.3466 (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: 9pwz06/ItcxqpAaR7R4eiJOxihGXFJebZbTJVP7UYxTITh9q+jryDru38bkCTFT0P3+nBB4j3yqZ856ra0yx6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR05MB3623 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable This wasn't correctly testing for FD to be outside RAM, when RAM base immediately follows the FD. This is part of some cleanup for RPi4 in edk2-platform. Signed-off-by: Andrei Warkentin --- ArmPlatformPkg/PrePi/PrePi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c index 2bb1449581..74284f1883 100644 --- a/ArmPlatformPkg/PrePi/PrePi.c +++ b/ArmPlatformPkg/PrePi/PrePi.c @@ -22,7 +22,7 @@ #include "PrePi.h" =20 #define IS_XIP() (((UINT64)FixedPcdGet64 (PcdFdBaseAddress) > mSystemMemor= yEnd) || \ - ((FixedPcdGet64 (PcdFdBaseAddress) + FixedPcdGet32 (PcdF= dSize)) < FixedPcdGet64 (PcdSystemMemoryBase))) + ((FixedPcdGet64 (PcdFdBaseAddress) + FixedPcdGet32 (PcdF= dSize)) <=3D FixedPcdGet64 (PcdSystemMemoryBase))) =20 UINT64 mSystemMemoryEnd =3D FixedPcdGet64(PcdSystemMemoryBase) + FixedPcdGet64(PcdSystemMemorySize) - 1; --=20 2.17.1