From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web10.4991.1666867693997467198 for ; Thu, 27 Oct 2022 03:48:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=iAMvpDLO; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: quicinc.com, ip: 205.220.168.131, mailfrom: quic_llindhol@quicinc.com) Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29R8ctKm016486; Thu, 27 Oct 2022 10:48:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=qcppdkim1; bh=yay9umc3INZTUW9wNYyLzdNk/g5tEHnFto3bG3w0MkU=; b=iAMvpDLOHxzJSCKwcS+rZYvQOE5429Pxm9NLji3+F3HSzxb2PyGiVtYoLqJ94AJeAozh lCTbCkTqCU1t0waeZI9x4o21F6M9P/hnquwql12ACVOjx0xG+PfIpHLX+0jJouQBYKPs M7wuxv/dFp8RfLqysN/TSegig+fczQNF4gPPbf4zosV7kGiP5OBkQeplsV92MBCH5tYt IIg7u6+rEDdeh45QDXj34DjHJROKH7vOjZuRRDAC5N2yNVj8JzhrEJHGXnwUlygEwLbL fZxJbbZXSZs9faGK6DHW0wmcjU9s+8Hgdv/4htaLDd/JoZuLpeGaV6Cne4DTOFVRDKlU ug== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3kfah5thsk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Oct 2022 10:48:13 +0000 Received: from m0279863.ppops.net (m0279863.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 29RAkYrq014153; Thu, 27 Oct 2022 10:48:12 GMT Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3kfah5thsj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Oct 2022 10:48:12 +0000 Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 29RAmCr3018882 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Oct 2022 10:48:12 GMT Received: from qc-i7.hemma.eciton.net (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Thu, 27 Oct 2022 03:48:10 -0700 Date: Thu, 27 Oct 2022 11:48:07 +0100 From: "Leif Lindholm" To: Ard Biesheuvel CC: , Graeme Gregory Subject: Re: [PATCH edk2-platforms] Platform/SbsaQemu: Switch to VirtNorFlashDxe Message-ID: References: <20221026174210.1255165-1-ardb@kernel.org> MIME-Version: 1.0 In-Reply-To: <20221026174210.1255165-1-ardb@kernel.org> X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: 9nA06VYlO8PBp5640eHT6ZpfDwUuGh9S X-Proofpoint-GUID: 9nA06VYlO8PBp5640eHT6ZpfDwUuGh9S X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-27_05,2022-10-27_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=919 impostorscore=0 mlxscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 clxscore=1011 phishscore=0 suspectscore=0 bulkscore=0 adultscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=2 engine=8.12.0-2210170000 definitions=main-2210270059 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline On Wed, Oct 26, 2022 at 19:42:10 +0200, Ard Biesheuvel wrote: > Switch to the OVMF version of the NOR flash DXE driver, which supports > QEMU's NOR flash emulation specifically, and carries some optimizations > that are therefore permitted. > > Cc: Leif Lindholm > Cc: Graeme Gregory Graeme Gregory is probably more likely to be seen these days. Patch to Maintainers.txt coming up (although Graeme is out this week). > Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm > --- > Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 4 ++-- > Platform/Qemu/SbsaQemu/SbsaQemu.fdf | 2 +- > Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf | 4 ++-- > Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c | 12 ++++++------ > 4 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc > index ff280709a509..79dd200ca7fc 100644 > --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc > +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc > @@ -178,7 +178,7 @@ [LibraryClasses.common] > ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf > > TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf > - NorFlashPlatformLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf > + VirtNorFlashPlatformLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf > > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > @@ -663,7 +663,7 @@ [Components.common] > > ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > ArmPkg/Drivers/TimerDxe/TimerDxe.inf > - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > + OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf > MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > > # > diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > index 9f031c3e6649..781215707c3d 100644 > --- a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > @@ -189,7 +189,7 @@ [FV.FvMain] > > INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf > - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > + INF OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf > INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > > # > diff --git a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf > index f2ba41e1df99..f7e3f8e05eec 100644 > --- a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf > +++ b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf > @@ -14,16 +14,16 @@ [Defines] > FILE_GUID = c53d904d-de50-40f1-a148-a2ece48303d8 > MODULE_TYPE = BASE > VERSION_STRING = 1.0 > - LIBRARY_CLASS = NorFlashPlatformLib > + LIBRARY_CLASS = VirtNorFlashPlatformLib > > [Sources.common] > SbsaQemuNorFlashLib.c > > [Packages] > - ArmPlatformPkg/ArmPlatformPkg.dec > ArmPkg/ArmPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > + OvmfPkg/OvmfPkg.dec > > [FixedPcd] > gArmTokenSpaceGuid.PcdFdBaseAddress > diff --git a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c > index 0946327cb529..56c26019a140 100644 > --- a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c > +++ b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c > @@ -8,19 +8,19 @@ > > #include > #include > -#include > +#include > > #define QEMU_NOR_BLOCK_SIZE SIZE_256KB > > EFI_STATUS > -NorFlashPlatformInitialization ( > +VirtNorFlashPlatformInitialization ( > VOID > ) > { > return EFI_SUCCESS; > } > > -NOR_FLASH_DESCRIPTION mNorFlashDevice = > +STATIC VIRT_NOR_FLASH_DESCRIPTION mNorFlashDevice = > { > FixedPcdGet64(PcdFdBaseAddress), > FixedPcdGet64(PcdFlashNvStorageVariableBase), > @@ -29,9 +29,9 @@ NOR_FLASH_DESCRIPTION mNorFlashDevice = > }; > > EFI_STATUS > -NorFlashPlatformGetDevices ( > - OUT NOR_FLASH_DESCRIPTION **NorFlashDescriptions, > - OUT UINT32 *Count > +VirtNorFlashPlatformGetDevices ( > + OUT VIRT_NOR_FLASH_DESCRIPTION **NorFlashDescriptions, > + OUT UINT32 *Count > ) > { > *NorFlashDescriptions = &mNorFlashDevice; > -- > 2.35.1 >