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 5AD6FD81195 for ; Tue, 16 Jan 2024 06:33:13 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=6xGNXUpkNJ0f6cmYofWBJkKB6KnffT9UQXtIEC2F0pc=; 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=1705386792; v=1; b=b1P2OtkD5h+uXR6z4vSXXYCR2YPJfYqRm+05HF2ouWXPDowBTx4GJEivfLWbXeLVxdwKNAUg f3gA8E+vm20GP99Bk9TJtPO4ulaDu5zY5iNypk8hfqqNYOrHDk4tdlEs2ceLuA2SNdo5rmMJxeH 7NcacxuYIPTQo8/2+qbMXno8= X-Received: by 127.0.0.2 with SMTP id HBNBYY7687511xvY6KQ5LXmU; Mon, 15 Jan 2024 22:33:12 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.73610.1705308391626582664 for ; Mon, 15 Jan 2024 00:46:31 -0800 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-30-4QvtxQ53NKOoHYXYgOjkMA-1; Mon, 15 Jan 2024 03:46:25 -0500 X-MC-Unique: 4QvtxQ53NKOoHYXYgOjkMA-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 B35861C04B40; Mon, 15 Jan 2024 08:46:24 +0000 (UTC) X-Received: from [10.39.193.170] (unknown [10.39.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7178F2026D6F; Mon, 15 Jan 2024 08:46:23 +0000 (UTC) Message-ID: <29414777-a154-bd1c-95c8-6c4f4e01bbcb@redhat.com> Date: Mon, 15 Jan 2024 09:46:22 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH v7 25/37] ArmVirtPkg: Move PlatformBootManagerLib to OvmfPkg To: Chao Li , devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann , Jiewen Yao References: <20240112082153.3284189-1-lichao@loongson.cn> <20240112082534.3299238-1-lichao@loongson.cn> From: "Laszlo Ersek" In-Reply-To: <20240112082534.3299238-1-lichao@loongson.cn> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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: pM5rYNJfCIK78UJIZyr9p8fDx7686176AA= 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=b1P2OtkD; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none) On 1/12/24 09:25, 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 > .../PlatformBootManagerLibLight}/PlatformBootManagerLib.inf | 3 +-- > .../Library/PlatformBootManagerLibLight}/QemuKernel.c | 0 > 8 files changed, 3 insertions(+), 6 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 OK > 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 } } This hunk belongs to patch "ArmVirtPkg: Move the FdtSerialPortAddressLib to OvmfPkg". > 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 OK > 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 OK > 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 OK > 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 OK > 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 5bbd13aecb..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] OK > @@ -29,7 +29,6 @@ > QemuKernel.c > =20 > [Packages] > - ArmVirtPkg/ArmVirtPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > OvmfPkg/OvmfPkg.dec Hmmm. This makes me wonder. If we can remove the ArmVirtPkg package dependency from the lib instance in *this patch*, then we should be able to remove it *earlier* too (i.e., independently), while the lib instance still exists under ArmVirtPkg= . I don't see why the "ArmVirtPkg.dec" dep becomes superfluous *right here*. If I look at this INF file, as of commit 4a443f73fd67, I see at least two "ArmVirtPkg.dec" dependencies: [FixedPcd] gArmVirtTokenSpaceGuid.PcdUninstallMemAttrProtocol [Pcd] gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer In patch 24 ("ArmVirtPkg: Move two PCD variables into OvmfPkg"), you move these PCDs to OvmfPkg. Ah, I understand now. In brief: this particular hunk belongs to patch 24 (where you correctly modify "PlatformBootManagerLib.inf" anyway). The point is that, with the movement of both PCDs from the ArmVirt token space to the OVMF token space, "PlatformBootManagerLib.inf"'s dependency on "ArmVirtPkg.dec" disappears. Therefore the above hunk belongs to patch 24. ... When you implement that, please build-test both patches 24 and 25. More precisely, your patch set should build at every stage, considering both ArmVirt and OVMF platforms. The command "git rebase --exec" is useful for building a series at every stage. > diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c b/Ovm= fPkg/Library/PlatformBootManagerLibLight/QemuKernel.c > similarity index 100% > rename from ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c > rename to OvmfPkg/Library/PlatformBootManagerLibLight/QemuKernel.c OK 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 (#113809): https://edk2.groups.io/g/devel/message/113809 Mute This Topic: https://groups.io/mt/103679477/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-