From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 14F222035D114 for ; Mon, 6 Nov 2017 18:36:33 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Nov 2017 18:40:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,355,1505804400"; d="scan'208";a="1215076015" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga001.fm.intel.com with ESMTP; 06 Nov 2017 18:40:31 -0800 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 6 Nov 2017 18:40:30 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 6 Nov 2017 18:40:30 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Tue, 7 Nov 2017 10:40:28 +0800 From: "Ni, Ruiyu" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Kinney, Michael D" , Michael Turner , "Yao, Jiewen" Thread-Topic: [edk2] [PATCH v2] MdeModulePkg/PciBus: Disable BME of all devices when entering RT Thread-Index: AQHTUszNpYZo0LLy1kOTfxw5YA/Yq6MIPeTQ Date: Tue, 7 Nov 2017 02:40:27 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5BAB53FA@SHSMSX104.ccr.corp.intel.com> References: <20171101044839.1772-1-ruiyu.ni@intel.com> In-Reply-To: <20171101044839.1772-1-ruiyu.ni@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2] MdeModulePkg/PciBus: Disable BME of all devices when entering RT X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2017 02:36:33 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Jiewen, Any comments? Thanks/Ray > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Ruiyu Ni > Sent: Wednesday, November 1, 2017 12:49 PM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D ; Michael Turner > ; Yao, Jiewen > Subject: [edk2] [PATCH v2] MdeModulePkg/PciBus: Disable BME of all > devices when entering RT >=20 > The patch ensures all DMA transactions are blocked after ExitBootService. > If a platform enables IOMMU before and needs disable IOMMU after > ExitBootService, the IOMMU should be disabled after PCI bus driver disabl= es > BME. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael Turner > Signed-off-by: Ruiyu Ni > Cc: Michael D Kinney > Cc: Jiewen Yao > Cc: Jeff Fan > --- > MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h | 2 + > MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf | 3 + > MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c | 86 > +++++++++++++++++++++++ > 3 files changed, 91 insertions(+) >=20 > diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h > b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h > index 55eb3a5a80..79b5b71082 100644 > --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h > +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h > @@ -18,6 +18,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY > KIND, EITHER EXPRESS OR IMPLIED. >=20 > #include >=20 > +#include > + > #include > #include > #include > diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf > b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf > index 97608bfcf2..d5b8fab3ca 100644 > --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf > +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf > @@ -80,6 +80,9 @@ [LibraryClasses] > DebugLib > PeCoffLib >=20 > +[Guids] > + gEfiEventExitBootServicesGuid ## SOMETIMES_CONSUMES = ## > Event > + > [Protocols] > gEfiPciHotPlugRequestProtocolGuid ## SOMETIMES_PRODUCES > gEfiPciIoProtocolGuid ## BY_START > diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c > b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c > index 97bb971a59..004f2a3b5b 100644 > --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c > +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c > @@ -21,6 +21,72 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY > KIND, EITHER EXPRESS OR IMPLIED. > LIST_ENTRY mPciDevicePool; >=20 > /** > + Disable Bus Master Enable bit in all devices in the list. > + > + @param Devices A device list. > +**/ > +VOID > +DisableBmeOnTree ( > + IN LIST_ENTRY *Devices > + ) > +{ > + LIST_ENTRY *Link; > + PCI_IO_DEVICE *PciIoDevice; > + UINT16 Command; > + > + for ( Link =3D GetFirstNode (Devices) > + ; !IsNull (Devices, Link) > + ; Link =3D GetNextNode (Devices, Link) > + ) { > + PciIoDevice =3D PCI_IO_DEVICE_FROM_LINK (Link); > + // > + // Turn off all children's Bus Master, if any > + // > + DisableBmeOnTree (&PciIoDevice->ChildList); > + > + // > + // If this is a device that supports BME, disable BME on this device= . > + // > + if ((PciIoDevice->Supports & EFI_PCI_IO_ATTRIBUTE_BUS_MASTER) !=3D 0= ) > { > + PCI_READ_COMMAND_REGISTER(PciIoDevice, &Command); > + if ((Command & EFI_PCI_COMMAND_BUS_MASTER) !=3D 0) { > + Command &=3D ~EFI_PCI_COMMAND_BUS_MASTER; > + PCI_SET_COMMAND_REGISTER (PciIoDevice, Command); > + DEBUG (( > + DEBUG_INFO," %02x %02x %02x %04x\n", > + PciIoDevice->BusNumber, PciIoDevice->DeviceNumber, PciIoDevice= - > >FunctionNumber, > + Command > + )); > + } > + } > + } > +} > + > +/** > + Exit Boot Services Event notification handler. > + > + Disable Bus Master on any that were enabled during BDS. > + > + @param[in] Event Event whose notification function is being invok= ed. > + @param[in] Context Pointer to the notification function's context. > + > +**/ > +VOID > +EFIAPI > +OnExitBootServices ( > + IN EFI_EVENT Event, > + IN VOID *Context > + ) > +{ > + DEBUG (( > + DEBUG_INFO, > + "PciBus: Disable Bus Master of all devices...\n" > + " Bus# Device# Function# NewCommand\n" > + )); > + DisableBmeOnTree(&mPciDevicePool); > +} > + > +/** > Initialize the PCI devices pool. >=20 > **/ > @@ -29,7 +95,27 @@ InitializePciDevicePool ( > VOID > ) > { > + EFI_EVENT ExitBootServicesEvent; > + EFI_STATUS Status; > + > InitializeListHead (&mPciDevicePool); > + > + // > + // DisableBME on ExitBootServices should be synchonized with any > IOMMU ExitBootServices routine. > + // DisableBME should be run before the IOMMU protections are disabled. > + // One way to do this is to ensure that the IOMMU ExitBootServices > callback runs at TPL_CALLBACK. > + // > + Status =3D gBS->CreateEventEx ( > + EVT_NOTIFY_SIGNAL, > + TPL_NOTIFY, > + OnExitBootServices, > + NULL, > + &gEfiEventExitBootServicesGuid, > + &ExitBootServicesEvent > + ); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "PciBus: Unable to hook ExitBootServices event > + - %r\n", Status)); } > } >=20 > /** > -- > 2.12.2.windows.2 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel