Re: [patch] MdeModulePkg: Refine codes of iSCSI driver

["Dong, Eric" <eric.dong@intel.com>]

Reviewed-by:  Eric Dong <eric.dong@intel.com>

> -----Original Message-----
> From: Zhang, Lubo
> Sent: Thursday, August 11, 2016 3:19 PM
> To: Dong, Eric
> Cc: Ye, Ting; Fu, Siyuan; edk2-devel@lists.01.org
> Subject: RE: [edk2] [patch] MdeModulePkg: Refine codes of iSCSI driver
> 
> Hi Eric
>     Do you have any comments for this patch.
> 
> Best regards
> Lubo
> 
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Zhang Lubo
> Sent: Thursday, August 11, 2016 10:28 AM
> To: edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Dong, Eric <eric.dong@intel.com>
> Subject: [edk2] [patch] MdeModulePkg: Refine codes of iSCSI driver
> 
> The RSDT is only used when the bios need to support ACPI 1.0 version. When change PcdAcpiExposedTableVersions to 0x3C, it will not
> support ACPI 1.0. The default is 0x3E.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Fu Siyuan <siyuan.fu@intel.com>
> ---
>  .../Universal/Network/IScsiDxe/IScsiIbft.c         | 35 ++++++++++++----------
>  1 file changed, 20 insertions(+), 15 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
> index e5f685f..45d89a6 100644
> --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
> +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
> @@ -434,42 +434,42 @@ IScsiPublishIbft (
>    EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER *Table;
>    UINTN                                     HandleCount;
>    EFI_HANDLE                                *HandleBuffer;
>    UINT8                                     *Heap;
>    UINT8                                     Checksum;
> -  UINTN                                         Index;
>    EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER  *Rsdp;
>    EFI_ACPI_DESCRIPTION_HEADER                   *Rsdt;
> +  EFI_ACPI_DESCRIPTION_HEADER                   *Xsdt;
> +
> +  Rsdt = NULL;
> +  Xsdt = NULL;
> 
>    Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **)&AcpiTableProtocol);
>    if (EFI_ERROR (Status)) {
>      return ;
>    }
> 
> 
>    //
>    // Find ACPI table RSD_PTR from system table
>    //
> -  for (Index = 0, Rsdp = NULL; Index < gST->NumberOfTableEntries; Index++) {
> -    if (CompareGuid (&(gST->ConfigurationTable[Index].VendorGuid), &gEfiAcpi20TableGuid) ||
> -      CompareGuid (&(gST->ConfigurationTable[Index].VendorGuid), &gEfiAcpi10TableGuid) ||
> -      CompareGuid (&(gST->ConfigurationTable[Index].VendorGuid), &gEfiAcpiTableGuid)
> -      ) {
> -      //
> -      // A match was found.
> -      //
> -      Rsdp = (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER *) gST->ConfigurationTable[Index].VendorTable;
> -      break;
> -    }
> +  Status = EfiGetSystemConfigurationTable (&gEfiAcpiTableGuid, (VOID
> + **) &Rsdp);  if (EFI_ERROR (Status)) {
> +    Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid,
> + (VOID **) &Rsdp);
>    }
> 
> -  if (Rsdp == NULL) {
> +  if (EFI_ERROR (Status) || (Rsdp == NULL)) {
>      return ;
> -  } else {
> +  } else if (Rsdp->Revision >= EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION && Rsdp->XsdtAddress != 0) {
> +    Xsdt = (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN) Rsdp->XsdtAddress;
> + } else if (Rsdp->RsdtAddress != 0) {
>      Rsdt = (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN) Rsdp->RsdtAddress;
>    }
> 
> +  if ((Xsdt == NULL) && (Rsdt == NULL)) {
> +    return ;
> +  }
> 
>    if (mIbftInstalled) {
>      Status = AcpiTableProtocol->UninstallAcpiTable (
>                                    AcpiTableProtocol,
>                                    mTableKey @@ -504,11 +504,16 @@ IScsiPublishIbft (
>    Heap = (UINT8 *) Table + IBFT_HEAP_OFFSET;
> 
>    //
>    // Fill in the various section of the iSCSI Boot Firmware Table.
>    //
> -  IScsiInitIbfTableHeader (Table, Rsdt->OemId, &Rsdt->OemTableId);
> +  if (Rsdp->Revision >= EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION) {
> +    IScsiInitIbfTableHeader (Table, Xsdt->OemId, &Xsdt->OemTableId);  }
> + else {
> +    IScsiInitIbfTableHeader (Table, Rsdt->OemId, &Rsdt->OemTableId);  }
> +
>    IScsiInitControlSection (Table, HandleCount);
>    IScsiFillInitiatorSection (Table, &Heap, HandleBuffer[0]);
>    IScsiFillNICAndTargetSections (Table, &Heap, HandleCount, HandleBuffer);
> 
>    Checksum = CalculateCheckSum8((UINT8 *)Table, Table->Length);
> --
> 1.9.5.msysgit.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel