From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web12.18909.1658924885644342575 for ; Wed, 27 Jul 2022 05:28:05 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=AGHhqvtj; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: maciej.czajkowski@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658924885; x=1690460885; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2J5pzTwPYNm66rCYFt5U3MrxN/xEvTpNYciEiFqnEEM=; b=AGHhqvtjKmAFIGcXt1qsoeN7aISU9h47s4TO+Elyzev9gJ80fo0bYoQp 05+2HGgInysCFfGlM9LdC1zzZFc1jzOrdUPmaBQQu7TkkqLJjkBhar9fC VjLcKBqLHWc709fxdNHUKpD88ug/m4KLoJUoVRN7QTjw6GuxWsXXJTaEA 66HwQ+VBty2GCvGCekiFa9axEDaPFTsGwv4DGFbltoHM/U32zfTEHvCGF huY7kQCXLGHIzCxO0tR16RneTfuN1sNm4n29sUp6t18bcTzrZK4Fn9b/x 6izk/NAj66XyVc84LWf5i7x0Hs9WAp90aWcC45hYW392SCGvwkzVsHweT A==; X-IronPort-AV: E=McAfee;i="6400,9594,10420"; a="289413430" X-IronPort-AV: E=Sophos;i="5.93,195,1654585200"; d="scan'208";a="289413430" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2022 05:27:45 -0700 X-IronPort-AV: E=Sophos;i="5.93,195,1654585200"; d="scan'208";a="659177263" Received: from mczajkow-mobl.ger.corp.intel.com ([10.252.57.70]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2022 05:27:44 -0700 From: "Maciej Czajkowski" To: devel@edk2.groups.io Cc: Hao A Wu , Ray Ni , Liming Gao Subject: [PATCH v2 2/2] MdeModulePkg/AhciPei: Use PCI_DEVICE_PPI to manage AHCI device Date: Wed, 27 Jul 2022 14:27:33 +0200 Message-Id: <20220727122733.2251-3-maciej.czajkowski@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20220727122733.2251-1-maciej.czajkowski@intel.com> References: <20220727122733.2251-1-maciej.czajkowski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3907 This change modifies AhciPei library to allow usage both EDKII_PCI_DEVICE_P= PI and EDKII_PEI_ATA_AHCI_HOST_CONTROLLER_PPI to manage ATA HDD working under AHCI mode. Cc: Hao A Wu Cc: Ray Ni Cc: Liming Gao Signed-off-by: Maciej Czajkowski --- Notes: v2 changes: - added missing function descriptions - moved controller initialization from PCI_DEVICE_PPI to seperate funci= ton in order to reduce code duplication - added DevicePathLib BASE instance to the MdeModulePkg.dec to allow PE= IMs to consume it MdeModulePkg/Bus/Ata/AhciPei/AhciPei.c | 585 ++++++++++++++------ MdeModulePkg/Bus/Ata/AhciPei/DevicePath.c | 44 -- MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h | 17 +- MdeModulePkg/Bus/Ata/AhciPei/AhciPei.inf | 5 +- MdeModulePkg/MdeModulePkg.dsc | 1 + 5 files changed, 430 insertions(+), 222 deletions(-) diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.c b/MdeModulePkg/Bus/Ata/= AhciPei/AhciPei.c index 208b7e9a3606..8ad98dc76bc1 100644 --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.c +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.c @@ -9,6 +9,47 @@ **/ = #include "AhciPei.h" +#include +#include +#include + +/** + Callback for EDKII_ATA_AHCI_HOST_CONTROLLER_PPI installation. + + @param[in] PeiServices Pointer to PEI Services Table. + @param[in] NotifyDescriptor Pointer to the descriptor for the Notific= ation + event that caused this function to execut= e. + @param[in] Ppi Pointer to the PPI data associated with t= his function. + + @retval EFI_SUCCESS The function completes successfully + +**/ +EFI_STATUS +EFIAPI +AtaAhciHostControllerPpiInstallationCallback ( + IN EFI_PEI_SERVICES **PeiServices, + IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, + IN VOID *Ppi + ); + +/** + Callback for EDKII_PCI_DEVICE_PPI installation. + + @param[in] PeiServices Pointer to PEI Services Table. + @param[in] NotifyDescriptor Pointer to the descriptor for the Notific= ation + event that caused this function to execut= e. + @param[in] Ppi Pointer to the PPI data associated with t= his function. + + @retval EFI_SUCCESS The function completes successfully + +**/ +EFI_STATUS +EFIAPI +AtaAhciPciDevicePpiInstallationCallback ( + IN EFI_PEI_SERVICES **PeiServices, + IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, + IN VOID *Ppi + ); = EFI_PEI_PPI_DESCRIPTOR mAhciAtaPassThruPpiListTemplate =3D { (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), @@ -40,6 +81,18 @@ EFI_PEI_NOTIFY_DESCRIPTOR mAhciEndOfPeiNotifyListTempla= te =3D { AhciPeimEndOfPei }; = +EFI_PEI_NOTIFY_DESCRIPTOR mAtaAhciHostControllerNotify =3D { + (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINA= TE_LIST), + &gEdkiiPeiAtaAhciHostControllerPpiGuid, + AtaAhciHostControllerPpiInstallationCallback +}; + +EFI_PEI_NOTIFY_DESCRIPTOR mPciDevicePpiNotify =3D { + (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINA= TE_LIST), + &gEdkiiPeiPciDevicePpiGuid, + AtaAhciPciDevicePpiInstallationCallback +}; + /** Free the DMA resources allocated by an ATA AHCI controller. = @@ -111,33 +164,30 @@ AhciPeimEndOfPei ( } = /** - Entry point of the PEIM. + Initialize and install PrivateData PPIs. = - @param[in] FileHandle Handle of the file being invoked. - @param[in] PeiServices Describes the list of possible PEI Services. - - @retval EFI_SUCCESS PPI successfully installed. + @param[in] MmioBase MMIO base address of specific AHCI contro= ller + @param[in] DevicePath A pointer to the EFI_DEVICE_PATH_PROTOCOL + structure. + @param[in] DevicePathLength Length of the device path. = + @retval EFI_SUCCESS AHCI controller initialized and PPIs installed + @retval others Failed to initialize AHCI controller **/ EFI_STATUS -EFIAPI -AtaAhciPeimEntry ( - IN EFI_PEI_FILE_HANDLE FileHandle, - IN CONST EFI_PEI_SERVICES **PeiServices +AtaAhciInitPrivateData ( + IN UINTN MmioBase, + IN EFI_DEVICE_PATH_PROTOCOL *DevicePath, + IN UINTN DevicePathLength ) { - EFI_STATUS Status; - EFI_BOOT_MODE BootMode; - EDKII_ATA_AHCI_HOST_CONTROLLER_PPI *AhciHcPpi; - UINT8 Controller; - UINTN MmioBase; - UINTN DevicePathLength; - EFI_DEVICE_PATH_PROTOCOL *DevicePath; - UINT32 PortBitMap; - PEI_AHCI_CONTROLLER_PRIVATE_DATA *Private; - UINT8 NumberOfPorts; + EFI_STATUS Status; + UINT32 PortBitMap; + UINT8 NumberOfPorts; + PEI_AHCI_CONTROLLER_PRIVATE_DATA *Private; + EFI_BOOT_MODE BootMode; = - DEBUG ((DEBUG_INFO, "%a: Enters.\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "Initializing private data for ATA\n")); = // // Get the current boot mode. @@ -149,19 +199,149 @@ AtaAhciPeimEntry ( } = // - // Locate the ATA AHCI host controller PPI. - // - Status =3D PeiServicesLocatePpi ( - &gEdkiiPeiAtaAhciHostControllerPpiGuid, - 0, - NULL, - (VOID **)&AhciHcPpi - ); + // Check validity of the device path of the ATA AHCI controller. + // + Status =3D AhciIsHcDevicePathValid (DevicePath, DevicePathLength); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "%a: The device path is invalid.\n", + __FUNCTION__ + )); + return Status; + } + + // + // For S3 resume performance consideration, not all ports on an ATA AHCI + // controller will be enumerated/initialized. The driver consumes the + // content within S3StorageDeviceInitList LockBox to get the ports that + // will be enumerated/initialized during S3 resume. + // + if (BootMode =3D=3D BOOT_ON_S3_RESUME) { + NumberOfPorts =3D AhciS3GetEumeratePorts (DevicePath, DevicePathLength= , &PortBitMap); + if (NumberOfPorts =3D=3D 0) { + return EFI_SUCCESS; + } + } else { + PortBitMap =3D MAX_UINT32; + } + + // + // Memory allocation for controller private data. + // + Private =3D AllocateZeroPool (sizeof (PEI_AHCI_CONTROLLER_PRIVATE_DATA)); + if (Private =3D=3D NULL) { + DEBUG (( + DEBUG_ERROR, + "%a: Fail to allocate private data.\n", + __FUNCTION__ + )); + return EFI_OUT_OF_RESOURCES; + } + + // + // Initialize controller private data. + // + Private->Signature =3D AHCI_PEI_CONTROLLER_PRIVATE_DATA_SIGNATURE; + Private->MmioBase =3D MmioBase; + Private->DevicePathLength =3D DevicePathLength; + Private->DevicePath =3D DevicePath; + Private->PortBitMap =3D PortBitMap; + InitializeListHead (&Private->DeviceList); + + Status =3D AhciModeInitialization (Private); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: Failed to locate AtaAhciHostControllerPpi.\n= ", __FUNCTION__)); - return EFI_UNSUPPORTED; + return Status; + } + + Private->AtaPassThruMode.Attributes =3D EFI_ATA_PASS_THRU_ATTRIBUTES_PHY= SICAL | + EFI_ATA_PASS_THRU_ATTRIBUTES_LOGIC= AL; + Private->AtaPassThruMode.IoAlign =3D sizeof (UINTN); + Private->AtaPassThruPpi.Revision =3D EDKII_PEI_ATA_PASS_THRU_PPI_RE= VISION; + Private->AtaPassThruPpi.Mode =3D &Private->AtaPassThruMode; + Private->AtaPassThruPpi.PassThru =3D AhciAtaPassThruPassThru; + Private->AtaPassThruPpi.GetNextPort =3D AhciAtaPassThruGetNextPort; + Private->AtaPassThruPpi.GetNextDevice =3D AhciAtaPassThruGetNextDevice; + Private->AtaPassThruPpi.GetDevicePath =3D AhciAtaPassThruGetDevicePath; + CopyMem ( + &Private->AtaPassThruPpiList, + &mAhciAtaPassThruPpiListTemplate, + sizeof (EFI_PEI_PPI_DESCRIPTOR) + ); + Private->AtaPassThruPpiList.Ppi =3D &Private->AtaPassThruPpi; + PeiServicesInstallPpi (&Private->AtaPassThruPpiList); + + Private->BlkIoPpi.GetNumberOfBlockDevices =3D AhciBlockIoGetDeviceNo; + Private->BlkIoPpi.GetBlockDeviceMediaInfo =3D AhciBlockIoGetMediaInfo; + Private->BlkIoPpi.ReadBlocks =3D AhciBlockIoReadBlocks; + CopyMem ( + &Private->BlkIoPpiList, + &mAhciBlkIoPpiListTemplate, + sizeof (EFI_PEI_PPI_DESCRIPTOR) + ); + Private->BlkIoPpiList.Ppi =3D &Private->BlkIoPpi; + PeiServicesInstallPpi (&Private->BlkIoPpiList); + + Private->BlkIo2Ppi.Revision =3D EFI_PEI_RECOVERY_BLOCK_IO= 2_PPI_REVISION; + Private->BlkIo2Ppi.GetNumberOfBlockDevices =3D AhciBlockIoGetDeviceNo2; + Private->BlkIo2Ppi.GetBlockDeviceMediaInfo =3D AhciBlockIoGetMediaInfo2; + Private->BlkIo2Ppi.ReadBlocks =3D AhciBlockIoReadBlocks2; + CopyMem ( + &Private->BlkIo2PpiList, + &mAhciBlkIo2PpiListTemplate, + sizeof (EFI_PEI_PPI_DESCRIPTOR) + ); + Private->BlkIo2PpiList.Ppi =3D &Private->BlkIo2Ppi; + PeiServicesInstallPpi (&Private->BlkIo2PpiList); + + if (Private->TrustComputingDevices !=3D 0) { + DEBUG (( + DEBUG_INFO, + "%a: Security Security Command PPI will be produced.\n", + __FUNCTION__ + )); + Private->StorageSecurityPpi.Revision =3D EDKII_STORAGE_SECUR= ITY_PPI_REVISION; + Private->StorageSecurityPpi.GetNumberofDevices =3D AhciStorageSecurity= GetDeviceNo; + Private->StorageSecurityPpi.GetDevicePath =3D AhciStorageSecurity= GetDevicePath; + Private->StorageSecurityPpi.ReceiveData =3D AhciStorageSecurity= ReceiveData; + Private->StorageSecurityPpi.SendData =3D AhciStorageSecurity= SendData; + CopyMem ( + &Private->StorageSecurityPpiList, + &mAhciStorageSecurityPpiListTemplate, + sizeof (EFI_PEI_PPI_DESCRIPTOR) + ); + Private->StorageSecurityPpiList.Ppi =3D &Private->StorageSecurityPpi; + PeiServicesInstallPpi (&Private->StorageSecurityPpiList); } = + CopyMem ( + &Private->EndOfPeiNotifyList, + &mAhciEndOfPeiNotifyListTemplate, + sizeof (EFI_PEI_NOTIFY_DESCRIPTOR) + ); + PeiServicesNotifyPpi (&Private->EndOfPeiNotifyList); + + return EFI_SUCCESS; +} + +/** + Initialize AHCI controller from EDKII_ATA_AHCI_HOST_CONTROLLER_PPI insta= nce. + + @param[in] AhciHcPpi Pointer to the AHCI Host Controller PPI instance. + + @retval EFI_SUCCESS PPI successfully installed. +**/ +EFI_STATUS +AtaAhciInitPrivateDataFromHostControllerPpi ( + IN EDKII_ATA_AHCI_HOST_CONTROLLER_PPI *AhciHcPpi + ) +{ + UINT8 Controller; + UINTN MmioBase; + UINTN DevicePathLength; + EFI_DEVICE_PATH_PROTOCOL *DevicePath; + EFI_STATUS Status; + Controller =3D 0; MmioBase =3D 0; while (TRUE) { @@ -193,65 +373,7 @@ AtaAhciPeimEntry ( return Status; } = - // - // Check validity of the device path of the ATA AHCI controller. - // - Status =3D AhciIsHcDevicePathValid (DevicePath, DevicePathLength); - if (EFI_ERROR (Status)) { - DEBUG (( - DEBUG_ERROR, - "%a: The device path is invalid for Controller %d.\n", - __FUNCTION__, - Controller - )); - Controller++; - continue; - } - - // - // For S3 resume performance consideration, not all ports on an ATA AH= CI - // controller will be enumerated/initialized. The driver consumes the - // content within S3StorageDeviceInitList LockBox to get the ports that - // will be enumerated/initialized during S3 resume. - // - if (BootMode =3D=3D BOOT_ON_S3_RESUME) { - NumberOfPorts =3D AhciS3GetEumeratePorts (DevicePath, DevicePathLeng= th, &PortBitMap); - if (NumberOfPorts =3D=3D 0) { - // - // No ports need to be enumerated for this controller. - // - Controller++; - continue; - } - } else { - PortBitMap =3D MAX_UINT32; - } - - // - // Memory allocation for controller private data. - // - Private =3D AllocateZeroPool (sizeof (PEI_AHCI_CONTROLLER_PRIVATE_DATA= )); - if (Private =3D=3D NULL) { - DEBUG (( - DEBUG_ERROR, - "%a: Fail to allocate private data for Controller %d.\n", - __FUNCTION__, - Controller - )); - return EFI_OUT_OF_RESOURCES; - } - - // - // Initialize controller private data. - // - Private->Signature =3D AHCI_PEI_CONTROLLER_PRIVATE_DATA_SIGNATU= RE; - Private->MmioBase =3D MmioBase; - Private->DevicePathLength =3D DevicePathLength; - Private->DevicePath =3D DevicePath; - Private->PortBitMap =3D PortBitMap; - InitializeListHead (&Private->DeviceList); - - Status =3D AhciModeInitialization (Private); + Status =3D AtaAhciInitPrivateData (MmioBase, DevicePath, DevicePathLen= gth); if (EFI_ERROR (Status)) { DEBUG (( DEBUG_ERROR, @@ -260,86 +382,229 @@ AtaAhciPeimEntry ( Controller, Status )); - Controller++; - continue; - } - - Private->AtaPassThruMode.Attributes =3D EFI_ATA_PASS_THRU_ATTRIBUTES_P= HYSICAL | - EFI_ATA_PASS_THRU_ATTRIBUTES_LOG= ICAL; - Private->AtaPassThruMode.IoAlign =3D sizeof (UINTN); - Private->AtaPassThruPpi.Revision =3D EDKII_PEI_ATA_PASS_THRU_PPI_= REVISION; - Private->AtaPassThruPpi.Mode =3D &Private->AtaPassThruMode; - Private->AtaPassThruPpi.PassThru =3D AhciAtaPassThruPassThru; - Private->AtaPassThruPpi.GetNextPort =3D AhciAtaPassThruGetNextPort; - Private->AtaPassThruPpi.GetNextDevice =3D AhciAtaPassThruGetNextDevice; - Private->AtaPassThruPpi.GetDevicePath =3D AhciAtaPassThruGetDevicePath; - CopyMem ( - &Private->AtaPassThruPpiList, - &mAhciAtaPassThruPpiListTemplate, - sizeof (EFI_PEI_PPI_DESCRIPTOR) - ); - Private->AtaPassThruPpiList.Ppi =3D &Private->AtaPassThruPpi; - PeiServicesInstallPpi (&Private->AtaPassThruPpiList); - - Private->BlkIoPpi.GetNumberOfBlockDevices =3D AhciBlockIoGetDeviceNo; - Private->BlkIoPpi.GetBlockDeviceMediaInfo =3D AhciBlockIoGetMediaInfo; - Private->BlkIoPpi.ReadBlocks =3D AhciBlockIoReadBlocks; - CopyMem ( - &Private->BlkIoPpiList, - &mAhciBlkIoPpiListTemplate, - sizeof (EFI_PEI_PPI_DESCRIPTOR) - ); - Private->BlkIoPpiList.Ppi =3D &Private->BlkIoPpi; - PeiServicesInstallPpi (&Private->BlkIoPpiList); - - Private->BlkIo2Ppi.Revision =3D EFI_PEI_RECOVERY_BLOCK_= IO2_PPI_REVISION; - Private->BlkIo2Ppi.GetNumberOfBlockDevices =3D AhciBlockIoGetDeviceNo2; - Private->BlkIo2Ppi.GetBlockDeviceMediaInfo =3D AhciBlockIoGetMediaInfo= 2; - Private->BlkIo2Ppi.ReadBlocks =3D AhciBlockIoReadBlocks2; - CopyMem ( - &Private->BlkIo2PpiList, - &mAhciBlkIo2PpiListTemplate, - sizeof (EFI_PEI_PPI_DESCRIPTOR) - ); - Private->BlkIo2PpiList.Ppi =3D &Private->BlkIo2Ppi; - PeiServicesInstallPpi (&Private->BlkIo2PpiList); - - if (Private->TrustComputingDevices !=3D 0) { + } else { DEBUG (( DEBUG_INFO, - "%a: Security Security Command PPI will be produced for Controller= %d.\n", + "%a: Controller %d has been successfully initialized.\n", __FUNCTION__, Controller )); - Private->StorageSecurityPpi.Revision =3D EDKII_STORAGE_SEC= URITY_PPI_REVISION; - Private->StorageSecurityPpi.GetNumberofDevices =3D AhciStorageSecuri= tyGetDeviceNo; - Private->StorageSecurityPpi.GetDevicePath =3D AhciStorageSecuri= tyGetDevicePath; - Private->StorageSecurityPpi.ReceiveData =3D AhciStorageSecuri= tyReceiveData; - Private->StorageSecurityPpi.SendData =3D AhciStorageSecuri= tySendData; - CopyMem ( - &Private->StorageSecurityPpiList, - &mAhciStorageSecurityPpiListTemplate, - sizeof (EFI_PEI_PPI_DESCRIPTOR) - ); - Private->StorageSecurityPpiList.Ppi =3D &Private->StorageSecurityPpi; - PeiServicesInstallPpi (&Private->StorageSecurityPpiList); } = - CopyMem ( - &Private->EndOfPeiNotifyList, - &mAhciEndOfPeiNotifyListTemplate, - sizeof (EFI_PEI_NOTIFY_DESCRIPTOR) - ); - PeiServicesNotifyPpi (&Private->EndOfPeiNotifyList); - - DEBUG (( - DEBUG_INFO, - "%a: Controller %d has been successfully initialized.\n", - __FUNCTION__, - Controller - )); Controller++; } = return EFI_SUCCESS; } + +/** + Callback for EDKII_ATA_AHCI_HOST_CONTROLLER_PPI installation. + + @param[in] PeiServices Pointer to PEI Services Table. + @param[in] NotifyDescriptor Pointer to the descriptor for the Notific= ation + event that caused this function to execut= e. + @param[in] Ppi Pointer to the PPI data associated with t= his function. + + @retval EFI_SUCCESS The function completes successfully + @retval Others Cannot initialize AHCI controller for giv= en device +**/ +EFI_STATUS +EFIAPI +AtaAhciHostControllerPpiInstallationCallback ( + IN EFI_PEI_SERVICES **PeiServices, + IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, + IN VOID *Ppi + ) +{ + EDKII_ATA_AHCI_HOST_CONTROLLER_PPI *AhciHcPpi; + + if (Ppi =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + AhciHcPpi =3D (EDKII_ATA_AHCI_HOST_CONTROLLER_PPI *)Ppi; + + return AtaAhciInitPrivateDataFromHostControllerPpi (AhciHcPpi); +} + +/** + Initialize AHCI controller from fiven PCI_DEVICE_PPI. + + @param[in] PciDevice Pointer to the PCI Device PPI instance. + + @retval EFI_SUCCESS The function completes successfully + @retval Others Cannot initialize AHCI controller for given dev= ice +**/ +EFI_STATUS +AtaAhciInitPrivateDataFromPciDevice ( + EDKII_PCI_DEVICE_PPI *PciDevice + ) +{ + EFI_STATUS Status; + PCI_TYPE00 PciData; + UINTN MmioBase; + EFI_DEVICE_PATH_PROTOCOL *DevicePath; + UINTN DevicePathLength; + + // + // Now further check the PCI header: Base Class (offset 0x0B) and + // Sub Class (offset 0x0A). This controller should be an SATA controller + // + Status =3D PciDevice->PciIo.Pci.Read ( + &PciDevice->PciIo, + EfiPciIoWidthUint8, + PCI_CLASSCODE_OFFSET, + sizeof (PciData.Hdr.ClassCode), + PciData.Hdr.ClassCode + ); + if (EFI_ERROR (Status)) { + return EFI_UNSUPPORTED; + } + + if (!IS_PCI_IDE (&PciData) && !IS_PCI_SATADPA (&PciData)) { + return EFI_UNSUPPORTED; + } + + Status =3D PciDevice->PciIo.Attributes ( + &PciDevice->PciIo, + EfiPciIoAttributeOperationSet, + EFI_PCI_DEVICE_ENABLE, + NULL + ); + if (EFI_ERROR (Status)) { + return EFI_UNSUPPORTED; + } + + Status =3D PciDevice->PciIo.Pci.Read ( + &PciDevice->PciIo, + EfiPciIoWidthUint32, + 0x24, + sizeof (UINTN), + &MmioBase + ); + if (EFI_ERROR (Status)) { + return EFI_UNSUPPORTED; + } + + DevicePathLength =3D GetDevicePathSize (PciDevice->DevicePath); + DevicePath =3D PciDevice->DevicePath; + + Status =3D AtaAhciInitPrivateData (MmioBase, DevicePath, DevicePathLengt= h); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_INFO, + "%a: Failed to init controller, with Status - %r\n", + __FUNCTION__, + Status + )); + } + + return EFI_SUCCESS; +} + +/** + Callback for EDKII_PCI_DEVICE_PPI installation. + + @param[in] PeiServices Pointer to PEI Services Table. + @param[in] NotifyDescriptor Pointer to the descriptor for the Notific= ation + event that caused this function to execut= e. + @param[in] Ppi Pointer to the PPI data associated with t= his function. + + @retval EFI_SUCCESS The function completes successfully + @retval Others Cannot initialize AHCI controller for giv= en device +**/ +EFI_STATUS +EFIAPI +AtaAhciPciDevicePpiInstallationCallback ( + IN EFI_PEI_SERVICES **PeiServices, + IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, + IN VOID *Ppi + ) +{ + EDKII_PCI_DEVICE_PPI *PciDevice; + + PciDevice =3D (EDKII_PCI_DEVICE_PPI *)Ppi; + + return AtaAhciInitPrivateDataFromPciDevice (PciDevice); +} + +/** + Initialize AHCI controller from EDKII_ATA_AHCI_HOST_CONTROLLER_PPI insta= nces found in the system. + + @retval EFI_SUCCESS The function completes successfully +**/ +EFI_STATUS +AtaAhciInitPrivateDataFromPciDevices ( + VOID + ) +{ + EFI_STATUS Status; + UINTN ControllerIndex; + EDKII_PCI_DEVICE_PPI *PciDevice; + + Status =3D EFI_SUCCESS; + for (ControllerIndex =3D 0; Status !=3D EFI_NOT_FOUND; ControllerIndex++= ) { + Status =3D PeiServicesLocatePpi ( + &gEdkiiPeiPciDevicePpiGuid, + ControllerIndex, + NULL, + (VOID **)&PciDevice + ); + if (EFI_ERROR (Status)) { + continue; + } + + AtaAhciInitPrivateDataFromPciDevice (PciDevice); + + // + // Override the status to continue the for loop + // + Status =3D EFI_SUCCESS; + } + + return EFI_SUCCESS; +} + +/** + Entry point of the PEIM. + + @param[in] FileHandle Handle of the file being invoked. + @param[in] PeiServices Describes the list of possible PEI Services. + + @retval EFI_SUCCESS PPI successfully installed. + +**/ +EFI_STATUS +EFIAPI +AtaAhciPeimEntry ( + IN EFI_PEI_FILE_HANDLE FileHandle, + IN CONST EFI_PEI_SERVICES **PeiServices + ) +{ + EFI_STATUS Status; + EDKII_ATA_AHCI_HOST_CONTROLLER_PPI *AhciHcPpi; + + DEBUG ((DEBUG_INFO, "%a: Enters.\n", __FUNCTION__)); + + PeiServicesNotifyPpi (&mAtaAhciHostControllerNotify); + + PeiServicesNotifyPpi (&mPciDevicePpiNotify); + + AtaAhciInitPrivateDataFromPciDevices (); + + // + // Locate the ATA AHCI host controller PPI. + // + Status =3D PeiServicesLocatePpi ( + &gEdkiiPeiAtaAhciHostControllerPpiGuid, + 0, + NULL, + (VOID **)&AhciHcPpi + ); + if (!EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: Using AtaAhciHostControllerPpi to initialize= private data.\n", __FUNCTION__)); + Status =3D AtaAhciInitPrivateDataFromHostControllerPpi (AhciHcPpi); + } + + return Status; +} diff --git a/MdeModulePkg/Bus/Ata/AhciPei/DevicePath.c b/MdeModulePkg/Bus/A= ta/AhciPei/DevicePath.c index 81f8743d40d8..cf0955929dde 100644 --- a/MdeModulePkg/Bus/Ata/AhciPei/DevicePath.c +++ b/MdeModulePkg/Bus/Ata/AhciPei/DevicePath.c @@ -38,50 +38,6 @@ EFI_DEVICE_PATH_PROTOCOL mAhciEndDevicePathNodeTemplate= =3D { } }; = -/** - Returns the 16-bit Length field of a device path node. - - Returns the 16-bit Length field of the device path node specified by Nod= e. - Node is not required to be aligned on a 16-bit boundary, so it is recomm= ended - that a function such as ReadUnaligned16() be used to extract the content= s of - the Length field. - - If Node is NULL, then ASSERT(). - - @param Node A pointer to a device path node data structure. - - @return The 16-bit Length field of the device path node specified by Nod= e. - -**/ -UINTN -DevicePathNodeLength ( - IN CONST VOID *Node - ) -{ - ASSERT (Node !=3D NULL); - return ReadUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))-= >Length[0]); -} - -/** - Returns a pointer to the next node in a device path. - - If Node is NULL, then ASSERT(). - - @param Node A pointer to a device path node data structure. - - @return a pointer to the device path node that follows the device path n= ode - specified by Node. - -**/ -EFI_DEVICE_PATH_PROTOCOL * -NextDevicePathNode ( - IN CONST VOID *Node - ) -{ - ASSERT (Node !=3D NULL); - return (EFI_DEVICE_PATH_PROTOCOL *)((UINT8 *)(Node) + DevicePathNodeLeng= th (Node)); -} - /** Get the size of the current device path instance. = diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h b/MdeModulePkg/Bus/Ata/= AhciPei/AhciPei.h index 43ad4639bd77..7332c4051a0c 100644 --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h @@ -29,6 +29,7 @@ #include #include #include +#include = // // Structure forward declarations @@ -631,22 +632,6 @@ TrustTransferAtaDevice ( OUT UINTN *TransferLengthOut ); = -/** - Returns a pointer to the next node in a device path. - - If Node is NULL, then ASSERT(). - - @param Node A pointer to a device path node data structure. - - @return a pointer to the device path node that follows the device path n= ode - specified by Node. - -**/ -EFI_DEVICE_PATH_PROTOCOL * -NextDevicePathNode ( - IN CONST VOID *Node - ); - /** Get the size of the current device path instance. = diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.inf b/MdeModulePkg/Bus/At= a/AhciPei/AhciPei.inf index 912ff7a8ba4f..788660b33299 100644 --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.inf +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.inf @@ -50,11 +50,13 @@ [LibraryClasses] TimerLib LockBoxLib PeimEntryPoint + DevicePathLib = [Ppis] gEdkiiPeiAtaAhciHostControllerPpiGuid ## CONSUMES gEdkiiIoMmuPpiGuid ## CONSUMES gEfiEndOfPeiSignalPpiGuid ## CONSUMES + gEdkiiPeiPciDevicePpiGuid ## CONSUMES gEdkiiPeiAtaPassThruPpiGuid ## SOMETIMES_PRODUCES gEfiPeiVirtualBlockIoPpiGuid ## SOMETIMES_PRODUCES gEfiPeiVirtualBlockIo2PpiGuid ## SOMETIMES_PRODUCES @@ -65,8 +67,7 @@ [Guids] = [Depex] gEfiPeiMemoryDiscoveredPpiGuid AND - gEfiPeiMasterBootModePpiGuid AND - gEdkiiPeiAtaAhciHostControllerPpiGuid + gEfiPeiMasterBootModePpiGuid = [UserExtensions.TianoCore."ExtraFiles"] AhciPeiExtra.uni diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index 90a0a7ec4a7c..45a8ec84ad69 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -117,6 +117,7 @@ [LibraryClasses.common.PEIM] MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibBase.inf = [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf -- = 2.27.0.windows.1 --------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydz= ial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-31= 6 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata= i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wi= adomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiek= olwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the s= ole use of the intended recipient(s). If you are not the intended recipient= , please contact the sender and delete all copies; any review or distributi= on by others is strictly prohibited.