From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (NAM02-CY1-obe.outbound.protection.outlook.com [40.107.76.54]) by mx.groups.io with SMTP id smtpd.web11.1732.1608056361361996642 for ; Tue, 15 Dec 2020 10:19:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@vmware.com header.s=selector2 header.b=aH0nrck+; spf=pass (domain: vmware.com, ip: 40.107.76.54, mailfrom: awarkentin@vmware.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GQvex3iaYMsNbXUaooka47H8iwTjbhQfxmUSoWG91FhukO/9WonT27zj6TGFy3L8lhNPg9oV7Mr1V+1TV0uQtdO+MsOoPgI+bNCYAP7d1HEpdKBj0WzvWlJehJKhRKPlISHur1/V/Hg3EHISNUV7z9g8WOv0UhPzk7LHR9Bogtdked1kCG3a++qjg3V9inLAPUG0hT0Xfkk7qu+6ORGP99W5GSGrPZ+RPcS8VzhMTYa2o97ADNJ6jfVLAJ6DoO59k/CndCbXGC/Z0n3zwJFQGVHMhkK3q9yOZKCqI9ZGJV/nbPn9x8AhVutKvNL3MB7YneVe19tD/OFQwypvm47LrQ== 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=N1GBqFMO6Y1Ewd8e/dUfucTc8LAGQx5CcGLkOQy0iuA=; b=Je4XJa0mubK9b45CGPK4mn+aPVSOw91HarECvLU/UYD81zXp5mtSbsEBhafbLuzpnXGeViMPqbsbw2MdU62xmtLcMJmNHYk+Js4iImV6pRDQX0L84d9FpX56P/BZ6e7U5AgUJ4hL7iAW8qby09MzoTPEfgW7VwUSWke75YdBPjLm9DKh37xtFApJVD7hO+7y1pVgHH98urutqgIRTFgUBtIG15HXC93rfaASLlgOObspkAFbE8u06H1kliMd8VEKrSa3ZdLnLxtCLQ7l19ZVIqyKrdRUx/E725PHwisiSCyRCyqNs64/vrqdbuuHKYDErrWiukJ86EdipA2wyabR3Q== 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=N1GBqFMO6Y1Ewd8e/dUfucTc8LAGQx5CcGLkOQy0iuA=; b=aH0nrck+DBAi2yBwe3d/YMfoRCd3Tgm3b7gC4wGZFMcdM5OnxzP7ZxYTKnSYG7nWv/dUs6xGI+791dl7D/DNLb8uR6WF2+zAA4Zl7Fg/h2yz6uelr2cddxg+evU9kP7KPjw4jmgpImY8O/N3gmXcyWxhn6DTSPO2KqZdQbWJYFk= Received: from SJ0PR05MB7580.namprd05.prod.outlook.com (2603:10b6:a03:2e0::24) by SJ0PR05MB7754.namprd05.prod.outlook.com (2603:10b6:a03:2ea::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.13; Tue, 15 Dec 2020 18:19:20 +0000 Received: from SJ0PR05MB7580.namprd05.prod.outlook.com ([fe80::ad1c:9900:1bea:47cf]) by SJ0PR05MB7580.namprd05.prod.outlook.com ([fe80::ad1c:9900:1bea:47cf%6]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 18:19:20 +0000 From: "Andrei Warkentin" To: "devel@edk2.groups.io" , "jeremy.linton@arm.com" CC: "ard.biesheuvel@arm.com" , "leif@nuviainc.com" , "pete@akeo.ie" , "andrey.warkentin@gmail.com" , "samer.el-haj-mahmoud@arm.com" Subject: Re: [edk2-devel] [PATCH 7/7] Platform/RaspberryPi: Correct device path removal. Thread-Topic: [edk2-devel] [PATCH 7/7] Platform/RaspberryPi: Correct device path removal. Thread-Index: AQHW0nA3uYQ2qTTCF0i0EHcVoQHA8Kn4eLgx Date: Tue, 15 Dec 2020 18:19:19 +0000 Message-ID: References: <20201214232350.1192387-1-jeremy.linton@arm.com>,<20201214232350.1192387-8-jeremy.linton@arm.com> In-Reply-To: <20201214232350.1192387-8-jeremy.linton@arm.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=vmware.com; x-originating-ip: [98.214.99.181] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 90a180f3-9732-482b-2a66-08d8a125f0f1 x-ms-traffictypediagnostic: SJ0PR05MB7754: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4125; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9QGDbkUqRRBJXLBXSyXnvNMRTNek/src8xxComaQt6ILEyfAEeNT/G02UwgNPUUPLv3FIvJY+hKp6MHjlI5f/2acC8tb4BgIhW/vssGA74Nqa5n42PY+ly23kJfzsRmk1h9P78562S/X09TzcFKOgKHuOo7WNDB6RT6E6favSHgrGGR2fToHR52mCZ77JSLW0bcpMOv/NDwlBCiAyC4P6t6jKRrWwYH3YNGrdYp1h+iw3HB5GmpmMcbsECCrUX4FjnQmUQDYE9mFPR4R8UeMtZJ/gk8PaWofMHfXt3lwuemFwHegTzvSe8PofBDSfniyJ2oEXdDi03D/YOKX5YtTuCLPzIZauCXPhdbLj44swoffdRo6k6i+ljjXQfTl+4ObyXa7pHI1PgUO577tPuoG4zvA3vctVU3kyNNhQ1hAWDZA1Xkdj7yQ4hnz5is9I9wD x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR05MB7580.namprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(136003)(39860400002)(396003)(376002)(366004)(83380400001)(64756008)(66946007)(66446008)(316002)(33656002)(66476007)(76116006)(166002)(66556008)(45080400002)(91956017)(6506007)(186003)(5660300002)(54906003)(53546011)(26005)(19627405001)(4326008)(7696005)(478600001)(86362001)(966005)(71200400001)(2906002)(8936002)(55016002)(110136005)(8676002)(9686003)(52536014);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?ig6u5U7pbqdpvMdMOFQPLtumKSUBrKZ3VUQs1c9MVS3YdD0H0/CPrL0xjYc+?= =?us-ascii?Q?uoQi/z7KWVcUz/itFuDpNdMPR5sHLCw/dOCPr8X7EL8yjc+m88I0gOAcj1/C?= =?us-ascii?Q?zpDArtedztFm4+Hxp6BMThyfonEqilE/pQYNZwZ4Qi4AiF+kWNUYeERHvFEP?= =?us-ascii?Q?X4EkbLc5Vx4LZmOJTZBkht0etjTyaWxXlHuNDELIMWHIBAM4msJTgcefTxOa?= =?us-ascii?Q?3r9NjMt7j5rHMIGUfhlbdGv+4l/MqL592waufhvYwRSw+pLBSJZcxGZvuB/T?= =?us-ascii?Q?RAhwN0mdfjm1z5Il7ljsgSO6rLbDFyu9jPdUxZm9ExKyLxB/bdy5M2N4mjY3?= =?us-ascii?Q?OcHmKfXrRKIycGfWIjQ5yMl6GamPyhDTb0D9K3guFJSqimQ1HyDbS+pd9l+l?= =?us-ascii?Q?A3d4w0uUsccwiMFBWEB+62KVEJTqYYYMmvMWEHt3O1M9mLTQpI3n+t9v/6VE?= =?us-ascii?Q?T1U83myDEuPIZnfZkqbMS77TkFyZp9skTkcHdW8rawTy0K2XHGfpgESOKGGk?= =?us-ascii?Q?j2bArgvhfsvsMhfH3axwkMp+k5X8yE1IeOX0xz3Xz+1oik72gozDwh2ZDeKr?= =?us-ascii?Q?nf4Ut1Pb0LAGIs+UiEK7BJ8wTAOKJE5H6TdX9ZQwz0GqjqIjq+LVtwVctvHu?= =?us-ascii?Q?sWu9dvgits9f+bnW6Zhh7UcjVK6QUTnQJZ/+NnGjvp4W+6UelM7yyvPqfBWQ?= =?us-ascii?Q?ZD//R8ERyEBSkedeIyDN9mfJz2yh4kg9HTmF1LhCE+oj+Ixfe2c0PjRi4Fop?= =?us-ascii?Q?oyFC+snzNfKfSvJMUBsl0GY/IH1nmwvyvPcs1KeYl/+siBjBzqeP4zvscmf7?= =?us-ascii?Q?A3qo7JQYeB7nSZMB2ZRUkG4quRflFB0XJi1iJP2uiZWumsI1xUI1cZYaQsTd?= =?us-ascii?Q?QM89TFicWVgHEAv+++57BfI5kYHpOj7wAykLt8LxSaxGK+tnojl5bLWH4Kk0?= =?us-ascii?Q?ryn+4ToQoXmEYbnTAsfiLlFjPJBGXTSoGNxsh+TYLd8=3D?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR05MB7580.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 90a180f3-9732-482b-2a66-08d8a125f0f1 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Dec 2020 18:19:19.9779 (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: 3HuCyvyj0iKw9QBYTnEa/JT/CjNnm1/tBH2D2vv6f4Ru6zecJrRBA5Wqtob6ySxN/ZW+7ej1S24sAA617JmgwQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR05MB7754 Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_SJ0PR05MB75809FC4802D76F8A09E7C36B9C60SJ0PR05MB7580namp_" --_000_SJ0PR05MB75809FC4802D76F8A09E7C36B9C60SJ0PR05MB7580namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable LGTM Reviewed-by: Andrei Warkentin ________________________________ From: devel@edk2.groups.io on behalf of Jeremy Linto= n via groups.io Sent: Monday, December 14, 2020 5:23 PM To: devel@edk2.groups.io Cc: ard.biesheuvel@arm.com ; leif@nuviainc.com ; pete@akeo.ie ; andrey.warkentin@gmail.com ; samer.el-haj-mahmoud@arm.com ; Jeremy Linton Subject: [edk2-devel] [PATCH 7/7] Platform/RaspberryPi: Correct device path= removal. The "arasan" driver now works with the emmc2 device. This means that both the PcdSdIsArasan and the !PcdSdIsArasan result in valid SD controllers on the rpi4. Lets avoid removing the "stale" boot entry, in this case which also has the side effect of avoiding a boot assert when emmc2 is selected. Signed-off-by: Jeremy Linton --- Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm= .c b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c index fa46be7917..c2fc40b8ea 100644 --- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c @@ -431,7 +431,7 @@ RemoveStaleBootOptions ( EFI_DEVICE_PATH_PROTOCOL *DevicePath =3D BootOptions[Index].FilePath; if (CompareMem (&mArasan, DevicePath, GetDevicePathSize (DevicePath)) = =3D=3D 0) { - if (PcdGet32 (PcdSdIsArasan)) { + if (PcdGet32 (PcdSdIsArasan) || RPI_MODEL =3D=3D 4) { continue; } } else if (CompareMem (&mSDHost, DevicePath, GetDevicePathSize (Device= Path)) =3D=3D 0) { -- 2.13.7 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68819): https://nam04.safelinks.protection.outlook.com/= ?url=3Dhttps%3A%2F%2Fedk2.groups.io%2Fg%2Fdevel%2Fmessage%2F68819&data= =3D04%7C01%7Cawarkentin%40vmware.com%7Cdab0e33c11a44f3c745208d8a0875815%7Cb= 39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637435850452609234%7CUnknown%7CTW= FpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3= D%7C1000&sdata=3DJnEy1ggO05LRNBxNj7EfQRQSKys48mjnVQgPsnTmL4k%3D&res= erved=3D0 Mute This Topic: https://nam04.safelinks.protection.outlook.com/?url=3Dhttp= s%3A%2F%2Fgroups.io%2Fmt%2F78964896%2F4387333&data=3D04%7C01%7Cawarkent= in%40vmware.com%7Cdab0e33c11a44f3c745208d8a0875815%7Cb39138ca3cee4b4aa4d6cd= 83d9dd62f0%7C0%7C0%7C637435850452609234%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4= wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3D= nnW4LmTnA%2BnxaLjhlLlHOiru5Rdx7FQLX1JTSTzDCvQ%3D&reserved=3D0 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://nam04.safelinks.protection.outlook.com/?url=3Dhttps%3A= %2F%2Fedk2.groups.io%2Fg%2Fdevel%2Funsub&data=3D04%7C01%7Cawarkentin%40= vmware.com%7Cdab0e33c11a44f3c745208d8a0875815%7Cb39138ca3cee4b4aa4d6cd83d9d= d62f0%7C0%7C0%7C637435850452609234%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAw= MDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3DevhGh= iInBiwlnupjx0eBedSkMzOr5RCpLNyhYLV%2Btro%3D&reserved=3D0 [awarkentin@vm= ware.com] -=3D-=3D-=3D-=3D-=3D-=3D --_000_SJ0PR05MB75809FC4802D76F8A09E7C36B9C60SJ0PR05MB7580namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable
LGTM

Reviewed-by: Andrei Warkentin <= awarkentin@vmware.com>

From: devel@edk2.groups.io = <devel@edk2.groups.io> on behalf of Jeremy Linton via groups.io <j= eremy.linton=3Darm.com@groups.io>
Sent: Monday, December 14, 2020 5:23 PM
To: devel@edk2.groups.io <devel@edk2.groups.io>
Cc: ard.biesheuvel@arm.com <ard.biesheuvel@arm.com>; leif@nuvi= ainc.com <leif@nuviainc.com>; pete@akeo.ie <pete@akeo.ie>; andr= ey.warkentin@gmail.com <andrey.warkentin@gmail.com>; samer.el-haj-mah= moud@arm.com <samer.el-haj-mahmoud@arm.com>; Jeremy Linton <jeremy.linton@arm.com>
Subject: [edk2-devel] [PATCH 7/7] Platform/RaspberryPi: Correct devi= ce path removal.
 
The "arasan" driver now works with the e= mmc2 device.
This means that both the PcdSdIsArasan and the
!PcdSdIsArasan result in valid SD controllers on the rpi4.

Lets avoid removing the "stale" boot entry, in this case
which also has the side effect of avoiding a boot assert
when emmc2 is selected.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
 Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c | 2 = +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm= .c b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c
index fa46be7917..c2fc40b8ea 100644
--- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c
@@ -431,7 +431,7 @@ RemoveStaleBootOptions (
     EFI_DEVICE_PATH_PROTOCOL *DevicePath =3D BootOptio= ns[Index].FilePath;

 

     if (CompareMem (&mArasan, DevicePath, GetDevic= ePathSize (DevicePath)) =3D=3D 0) {

-      if (PcdGet32 (PcdSdIsArasan)) {

+      if (PcdGet32 (PcdSdIsArasan) || RPI_MODEL = =3D=3D 4) {

         continue;

       }

     } else if (CompareMem (&mSDHost, DevicePath, G= etDevicePathSize (DevicePath)) =3D=3D 0) {

--
2.13.7



-=3D-=3D-=3D-=3D-=3D-=3D
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#68819): https://nam04.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fedk2.gr= oups.io%2Fg%2Fdevel%2Fmessage%2F68819&amp;data=3D04%7C01%7Cawarkentin%4= 0vmware.com%7Cdab0e33c11a44f3c745208d8a0875815%7Cb39138ca3cee4b4aa4d6cd83d9= dd62f0%7C0%7C0%7C637435850452609234%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjA= wMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=3D= JnEy1ggO05LRNBxNj7EfQRQSKys48mjnVQgPsnTmL4k%3D&amp;reserved=3D0
Mute This Topic: https://nam04.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fgroups.= io%2Fmt%2F78964896%2F4387333&amp;data=3D04%7C01%7Cawarkentin%40vmware.c= om%7Cdab0e33c11a44f3c745208d8a0875815%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C= 0%7C0%7C637435850452609234%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQ= IjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=3DnnW4LmTnA= %2BnxaLjhlLlHOiru5Rdx7FQLX1JTSTzDCvQ%3D&amp;reserved=3D0
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://nam04.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fedk2.gr= oups.io%2Fg%2Fdevel%2Funsub&amp;data=3D04%7C01%7Cawarkentin%40vmware.co= m%7Cdab0e33c11a44f3c745208d8a0875815%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0= %7C0%7C637435850452609234%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQI= joiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=3DevhGhiInBi= wlnupjx0eBedSkMzOr5RCpLNyhYLV%2Btro%3D&amp;reserved=3D0 [awarkentin@vmware.com]
-=3D-=3D-=3D-=3D-=3D-=3D


--_000_SJ0PR05MB75809FC4802D76F8A09E7C36B9C60SJ0PR05MB7580namp_--