From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 525507803DF for ; Mon, 8 Jan 2024 14:02:44 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=GmlYcwaLs3ykxlvhPTUMJPeqP9vM58cPhBw2okFR+24=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1704722563; v=1; b=jLQlWaH4K8/msdzsTo24+U7S7QXDtXJB7WMnRWtYa0yI7LAdK7bZd7F/B/0q0spsIb2B1QmM 86vStJzKh9+bOlgs7qr0v4HCFeSgpZtbLfWlA9fWnFBU7FPd1zCQMETgKWTvfQIwzpgdEWmeYRl jXR/eyWz06O9BJjX9pccJAuE= X-Received: by 127.0.0.2 with SMTP id VVHvYY7687511x5sC3WBywKe; Mon, 08 Jan 2024 06:02:43 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.7297.1704722562280442220 for ; Mon, 08 Jan 2024 06:02:42 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-595-jVFZKfHLMnCvggCuKNrVWQ-1; Mon, 08 Jan 2024 09:02:32 -0500 X-MC-Unique: jVFZKfHLMnCvggCuKNrVWQ-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D9CE185A79B; Mon, 8 Jan 2024 14:02:21 +0000 (UTC) X-Received: from [10.39.192.221] (unknown [10.39.192.221]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 68975C15968; Mon, 8 Jan 2024 14:02:18 +0000 (UTC) Message-ID: Date: Mon, 8 Jan 2024 15:02:17 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH v6 24/36] ArmVirtPkg: Move PlatformBootManagerLib to OvmfPkg To: Chao Li , devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann , Jiewen Yao References: <20240105094118.2279380-1-lichao@loongson.cn> <20240105094538.2281380-1-lichao@loongson.cn> From: "Laszlo Ersek" In-Reply-To: <20240105094538.2281380-1-lichao@loongson.cn> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 73iRi4MmgXaNc3bYeoiYyUDwx7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=jLQlWaH4; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io On 1/5/24 10:45, Chao Li wrote: > Moved the PlatformBootManagerLib to OvmfPkg and renamed to > PlatformBootManagerLibLight for easy use by other ARCH. >=20 > Build-tested only (with "ArmVirtQemu.dsc"). >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4584 >=20 > Cc: Ard Biesheuvel > Cc: Leif Lindholm > Cc: Sami Mujawar > Cc: Gerd Hoffmann > Cc: Jiewen Yao > Cc: Lazlo Ersek > Signed-off-by: Chao Li > --- > ArmVirtPkg/ArmVirtPkg.ci.yaml | 1 - > ArmVirtPkg/ArmVirtPkg.dec | 1 - > ArmVirtPkg/ArmVirtQemu.dsc | 2 +- > ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- > .../Library/PlatformBootManagerLibLight}/PlatformBm.c | 0 > .../Library/PlatformBootManagerLibLight}/PlatformBm.h | 0 > .../PlatformBootManagerLib.inf | 7 +++---- > .../Library/PlatformBootManagerLibLight}/QemuKernel.c | 0 > OvmfPkg/OvmfPkg.dec | 4 ++++ > 9 files changed, 9 insertions(+), 8 deletions(-) > rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/P= latformBootManagerLibLight}/PlatformBm.c (100%) > rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/P= latformBootManagerLibLight}/PlatformBm.h (100%) > rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/P= latformBootManagerLibLight}/PlatformBootManagerLib.inf (92%) > rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/P= latformBootManagerLibLight}/QemuKernel.c (100%) >=20 > diff --git a/ArmVirtPkg/ArmVirtPkg.ci.yaml b/ArmVirtPkg/ArmVirtPkg.ci.yam= l > index 506b0e72f0..b186d4eb42 100644 > --- a/ArmVirtPkg/ArmVirtPkg.ci.yaml > +++ b/ArmVirtPkg/ArmVirtPkg.ci.yaml > @@ -24,7 +24,6 @@ > ], > ## Both file path and directory path are accepted. > "IgnoreFiles": [ > - "Library/PlatformBootManagerLib/PlatformBm.c" > ] > }, > ## options defined .pytool/Plugin/CompilerPlugin You don't seem to be reinstating this under OvmfPkg, so I think the same so= urce file under OvmfPkg will cause a CI failure. > diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec > index 315db4e8ea..6aa5ea05f4 100644 > --- a/ArmVirtPkg/ArmVirtPkg.dec > +++ b/ArmVirtPkg/ArmVirtPkg.dec > @@ -27,7 +27,6 @@ > =20 > [LibraryClasses] > ArmVirtMemInfoLib|Include/Library/ArmVirtMemInfoLib.h > - FdtSerialPortAddressLib|Include/Library/FdtSerialPortAddressLib.h > =20 > [Guids.common] > gArmVirtTokenSpaceGuid =3D { 0x0B6F5CA7, 0x4F53, 0x445A, { 0xB7, 0x6E,= 0x2E, 0x36, 0x5B, 0x80, 0x63, 0x66 } } > diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec > index a03c30995b..2ed7863a98 100644 > --- a/OvmfPkg/OvmfPkg.dec > +++ b/OvmfPkg/OvmfPkg.dec > @@ -144,6 +144,10 @@ > # > HardwareInfoLib|Include/Library/HardwareInfoLib.h > =20 > + ## @libraryclass FdtSerialPortAddressLib > + # > + FdtSerialPortAddressLib|Include/Library/FdtSerialPortAddressLib.h > + > [Guids] > gUefiOvmfPkgTokenSpaceGuid =3D {0x93bb96af, 0xb9f2, 0x4eb8,= {0x94, 0x62, 0xe0, 0xba, 0x74, 0x56, 0x42, 0x36}} > gEfiXenInfoGuid =3D {0xd3b46f3b, 0xd441, 0x1244,= {0x9a, 0x12, 0x0, 0x12, 0x27, 0x3f, 0xc1, 0x4d}} These two hunks don't seem to belong in this patch -- I think they might be= long to patch 22, "ArmVirtPkg: Move the FdtSerialPortAddressLib to OvmfPkg"= ; is that right? Also, the lib classes in the [LibraryClasses] section of the DEC file was o= riginally meant to be lexicographically sorted. Over time, soring errors go= t introduced; it would be nice to restore the sort order in a separate patc= h. (Although it's not a pre-requisite for this patch set to be accepted, I = guess.) > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 147180f645..e48c75b5e9 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -70,7 +70,7 @@ > =20 > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.in= f > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > - PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Platf= ormBootManagerLib.inf > + PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibLight/Pla= tformBootManagerLib.inf > PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPr= intScLib.inf > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customi= zedDisplayLib.inf > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBl= tLib.inf > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKer= nel.dsc > index c22a422353..668a65ba64 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -69,7 +69,7 @@ > =20 > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.in= f > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > - PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Platf= ormBootManagerLib.inf > + PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibLight/Pla= tformBootManagerLib.inf > PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPr= intScLib.inf > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customi= zedDisplayLib.inf > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBl= tLib.inf > diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/Ovm= fPkg/Library/PlatformBootManagerLibLight/PlatformBm.c > similarity index 100% > rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c > rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c > diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h b/Ovm= fPkg/Library/PlatformBootManagerLibLight/PlatformBm.h > similarity index 100% > rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h > rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.h > diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManage= rLib.inf b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerL= ib.inf > similarity index 92% > rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManager= Lib.inf > rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManager= Lib.inf > index 1ddcd107d2..f2fb69bd3c 100644 > --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.in= f > +++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.= inf > @@ -20,7 +20,7 @@ > # > # The following information is for reference only and not required by th= e build tools. > # > -# VALID_ARCHITECTURES =3D ARM AARCH64 > +# VALID_ARCHITECTURES =3D ARM AARCH64 LOONGARCH64 > # > =20 > [Sources] > @@ -29,7 +29,6 @@ > QemuKernel.c > =20 > [Packages] > - ArmVirtPkg/ArmVirtPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > OvmfPkg/OvmfPkg.dec > @@ -56,15 +55,15 @@ > UefiRuntimeServicesTableLib > =20 > [FixedPcd] > - gUefiOvmfPkgTokenSpaceGuid.PcdUninstallMemAttrProtocol > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits > + gUefiOvmfPkgTokenSpaceGuid.PcdUninstallMemAttrProtocol > =20 > [Pcd] > - gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut > + gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer > =20 > [Guids] > gEfiEndOfDxeEventGroupGuid > diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c b/Ovm= fPkg/Library/PlatformBootManagerLibLight/QemuKernel.c These last few hunks seem to restore sorting order (is that right?), which = is welcome, but probably belong in a separate patch. > similarity index 100% > rename from ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c > rename to OvmfPkg/Library/PlatformBootManagerLibLight/QemuKernel.c Looks OK to me otherwise. Thanks Laszlo -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113394): https://edk2.groups.io/g/devel/message/113394 Mute This Topic: https://groups.io/mt/103540123/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-