From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web11.27948.1643287546888015281 for ; Thu, 27 Jan 2022 04:45:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=O+h51scU; spf=pass (domain: kernel.org, ip: 139.178.84.217, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4426861ABD for ; Thu, 27 Jan 2022 12:45:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAAA2C340E4 for ; Thu, 27 Jan 2022 12:45:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643287545; bh=dYCAe5wxKKqxujW1YS2MhgMiT1cpcDuE+JmyUygRE6w=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=O+h51scU1r87F0RbEYo/tVLqWFPCI4xm+mNFg9PKlFSv8OEWFHCvuCxartKpAMw4A yNeKMrQ9RMTXreV5RPMVuEnNSZygxKwRD9z3fmtvBk1BCw3DMKEobA3oU5Cf1XB5kC 0fwLcPBzQMFeyqgeeAAQp9QG2JY6X+S8cP2F0v/bxr/4ijnmBEokzv2Uj3ZtRFwJHI t9xBnj75hvLRCahiZjj6xsEfAgCEo24DhlHZ2vpz2Maql20QEzwNcXoUAUxFaZXlsZ wKlV776onz6OHe6mqNpZCd6Hl9rga325xa5fO6HHPuR693ZyJCalNVclUkfDX4sC+m juW+MWd4CA0FA== Received: by mail-wm1-f43.google.com with SMTP id j5-20020a05600c1c0500b0034d2e956aadso1775120wms.4 for ; Thu, 27 Jan 2022 04:45:45 -0800 (PST) X-Gm-Message-State: AOAM532cICIJauuMzEM8i4MN7sAt4njlx+95qq/xBx5iC1TJQTvzCcXd gbVjoUos4Gz1qabqw5lwUrdB85ZC1bFppXJc/Ms= X-Google-Smtp-Source: ABdhPJyaOdYwhQvf4esWRRmTFcWeiP+YfcDNyPZpDPkJKoyjzxOePkt/y2rNmZv5kXXI3V5/KZxVoFf5OfYSEHycKbI= X-Received: by 2002:a1c:a90d:: with SMTP id s13mr3115187wme.32.1643287544034; Thu, 27 Jan 2022 04:45:44 -0800 (PST) MIME-Version: 1.0 References: <20220122014056.1367-1-michael.d.kinney@intel.com> In-Reply-To: <20220122014056.1367-1-michael.d.kinney@intel.com> From: "Ard Biesheuvel" Date: Thu, 27 Jan 2022 13:45:33 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-devel] [Patch 1/1] MdeModulePkg/Bus/Pci/PciBusDxe: Support platform PCI ROM override To: edk2-devel-groups-io , Michael Kinney Cc: Hao A Wu , Ray Ni , Star Zeng Content-Type: text/plain; charset="UTF-8" On Sat, 22 Jan 2022 at 02:41, Michael D Kinney wrote: > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3811 > > Remove ASSERT() statements that are triggered if a platform provides > an override of PCI ROM attached to a PCI Controller. The PCI Platform > Protocol allows the platform to provide a PCI ROM image for a PCI > Controller. This works for PCI Controllers that do not have an attached > PCI ROM, but the platform is not allowed to replace the PCI ROM for a > PCI Controller that has its own PCI ROM. Removing these ASSERT() > statements enables this additional use case. > > Cc: Hao A Wu > Cc: Ray Ni > Cc: Star Zeng > Signed-off-by: Michael D Kinney Acked-by: Ard Biesheuvel > --- > MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c > index 5535bd3013b8..cb845ec2b186 100644 > --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c > +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c > @@ -58,10 +58,9 @@ PciRomAddImageMapping ( > { > // > // Expect once RomImage and RomSize are recorded, they will be passed in > - // later when updating ImageHandle > + // later when updating ImageHandle. They may also be updated with new > + // values if the platform provides an override of RomImage and RomSize. > // > - ASSERT ((mRomImageTable[Index].RomImage == NULL) || (RomImage == mRomImageTable[Index].RomImage)); > - ASSERT ((mRomImageTable[Index].RomSize == 0) || (RomSize == mRomImageTable[Index].RomSize)); > break; > } > } > -- > 2.32.0.windows.1 > > > > > >