From nobody Mon Feb 9 20:35:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+60032+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60032+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1590073496; cv=none; d=zohomail.com; s=zohoarc; b=KRvxG0AdmWod8sWonJaSNk9OneQ8Idu50olegngjeIVA4Kn+XO1952aW9SOlIXuufy4UiEiXETauPPUVnTI17G1/gKg45p4uwR/2dW1zm1754lGcw3x71QGrE7E2N1ALpqGq6/wig0bGvLR2DBaKXTXEwxEJc9pMVA3H6Qib8gQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590073496; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=S1IeOIOfE1OzJji8CSzxMh2fZOsutCOJAmv3RdCk6I0=; b=hhvcpEPwgfEu0xedNI4OQGZq/rEwH3btS7mmMX3rC9s0lXVYbfIRGGuHJeDoZ32OKQ4pYoIXv3GHaL3naRXCzXJ6CjSiLb2dHMPblTvs/EnJZu5jYB7gERZGrNOwNMBZtTgWXFBwe26T3PuLGHg0i08vM5SPyv7dEKYkUp6IECQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60032+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1590073496318431.58343699524266; Thu, 21 May 2020 08:04:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id zuGsYY1788612xMwJrMp3Fff; Thu, 21 May 2020 08:04:55 -0700 X-Received: from huawei.com (huawei.com [45.249.212.32]) by mx.groups.io with SMTP id smtpd.web10.7367.1590072322041492459 for ; Thu, 21 May 2020 07:45:22 -0700 X-Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 38413F7DF3DE870C5FDA; Thu, 21 May 2020 22:45:17 +0800 (CST) X-Received: from HGH1000039998.huawei.com (10.184.68.188) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.487.0; Thu, 21 May 2020 22:45:07 +0800 From: Ming Huang To: , , CC: , , , , Subject: [edk2-devel] [RFC edk2-platforms v1 2/3] Silicon/Hisilicon/Acpi: Add update sas address feature Date: Thu, 21 May 2020 22:43:03 +0800 Message-ID: <1590072184-16219-3-git-send-email-huangming23@huawei.com> In-Reply-To: <1590072184-16219-1-git-send-email-huangming23@huawei.com> References: <1590072184-16219-1-git-send-email-huangming23@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.68.188] X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: 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,huangming23@huawei.com X-Gm-Message-State: vNTpR5igEPs4HrIicbYdPLWHx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1590073495; bh=xjDb9JQiu0+Qft2Uoxk7MGCPghQAxLGL1hqun41MqGo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=EurLlJRXG3+hGTts+hPHEI3aKA9eyV5ue3Akzg5vnod4sq0N1jIaMCLZulWGspJlWtD +SeCNQ9Ed2nCUep9VUxLI1m8mMvhlD+HrDQxUAWoloPK8FKzzslKFSmZ3PIecciKl/tA6 K3RMJqXH0NUGeCGNJku95KDPFXnXoMtJHsI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The updating sas address feature is similar with apdating mac address. Modify updating dsdt flow for add this feature. Signed-off-by: Ming Huang --- Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 2 +- Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c | 200 +++++++++++= ++++----- Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h | 2 +- 3 files changed, 158 insertions(+), 46 deletions(-) diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Sil= icon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c index 1ab55bc..d3ea051 100644 --- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c +++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c @@ -46,7 +46,7 @@ UpdateAcpiDsdt ( return; } =20 - Status =3D EthMacInit (); + Status =3D UpdateAcpiDsdtTable (); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, " UpdateAcpiDsdtTable Failed, Status =3D %r\n", S= tatus)); } diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c b/Silicon/H= isilicon/Drivers/AcpiPlatformDxe/EthMac.c index cd98506..205f2f9 100644 --- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c +++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c @@ -1,8 +1,8 @@ /** @file =20 - Copyright (c) 2014, Applied Micro Curcuit Corporation. All rights reserv= ed.
- Copyright (c) 2015, Hisilicon Limited. All rights reserved.
- Copyright (c) 2015, Linaro Limited. All rights reserved.
+ Copyright (c) 2014 - 2020, Applied Micro Curcuit Corporation. All rights= reserved.
+ Copyright (c) 2015 - 2020, Hisilicon Limited. All rights reserved.
+ Copyright (c) 2015 - 2020, Linaro Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 This driver is called to initialize the FW part of the PHY in preparation @@ -30,6 +30,7 @@ #include #include #include +#include =20 #include =20 @@ -45,13 +46,20 @@ #define EFI_ACPI_MAX_NUM_TABLES 20 #define DSDT_SIGNATURE 0x54445344 =20 -#define D03_ACPI_ETH_ID "HISI00C2" - #define ACPI_ETH_MAC_KEY "local-mac-address" +#define ACPI_ETH_SAS_KEY "sas-addr" =20 #define PREFIX_VARIABLE_NAME L"MAC" #define PREFIX_VARIABLE_NAME_COMPAT L"RGMII_MAC" -#define MAC_MAX_LEN 30 +#define ADDRESS_MAX_LEN 30 + +CHAR8 *mHisiAcpiDevId[] =3D {"HISI00C1","HISI00C2","HISI0162"}; + +typedef enum { + DsdtDeviceUnknown, + DsdtDeviceLan, + DsdtDeviceSas +} DSDT_DEVICE_TYPE; =20 EFI_STATUS GetEnvMac( IN UINTN MacNextID, @@ -89,12 +97,35 @@ EFI_STATUS GetEnvMac( return EFI_SUCCESS; } =20 -EFI_STATUS _SearchReplacePackageMACAddress( +EFI_STATUS GetSasAddress ( + IN UINT8 Index, + IN OUT UINT8 *SasAddrBuffer + ) +{ + if (SasAddrBuffer =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + SasAddrBuffer[0] =3D 0x50; + SasAddrBuffer[1] =3D 0x01; + SasAddrBuffer[2] =3D 0x88; + SasAddrBuffer[3] =3D 0x20; + SasAddrBuffer[4] =3D 0x16; + SasAddrBuffer[5] =3D 0x00; + SasAddrBuffer[6] =3D 0x00; + SasAddrBuffer[7] =3D Index; + + return EFI_SUCCESS; +} + +EFI_STATUS _SearchReplacePackageAddress( IN EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, IN EFI_ACPI_HANDLE ChildHandle, IN UINTN Level, IN OUT BOOLEAN *Found, - IN UINTN MacNextID) + IN UINTN DevNextID, + IN DSDT_DEVICE_TYPE FoundDev + ) { // ASL template for ethernet driver: /* @@ -117,12 +148,18 @@ EFI_STATUS _SearchReplacePackageMACAddress( UINTN Count; EFI_ACPI_HANDLE CurrentHandle; EFI_ACPI_HANDLE NextHandle; - UINT8 MACBuffer[MAC_MAX_LEN]; + EFI_ACPI_HANDLE Level1Handle; + UINT8 *AddressBuffer; + UINT8 AddressByte =3D 0; =20 DBG("In Level:%d\n", Level); + Level1Handle =3D NULL; Status =3D EFI_SUCCESS; for (CurrentHandle =3D NULL; ;) { Status =3D AcpiTableProtocol->GetChild(ChildHandle, &CurrentHandle); + if (Level =3D=3D 1) { + Level1Handle =3D CurrentHandle; + } if (Level !=3D 3 && (EFI_ERROR(Status) || CurrentHandle =3D=3D NULL)) break; =20 @@ -143,11 +180,14 @@ EFI_STATUS _SearchReplacePackageMACAddress( DataSize, Data[0], DataSize > 1 ? Data[1] : 0); =20 Data =3D Buffer; - if (DataType !=3D EFI_ACPI_DATA_TYPE_STRING - || AsciiStrCmp((CHAR8 *) Data, ACPI_ETH_MAC_KEY) !=3D 0) + if ((DataType !=3D EFI_ACPI_DATA_TYPE_STRING) || + ((AsciiStrCmp ((CHAR8 *) Data, ACPI_ETH_MAC_KEY) !=3D 0) && + (AsciiStrCmp ((CHAR8 *) Data, ACPI_ETH_SAS_KEY) !=3D 0))) { + ChildHandle =3D Level1Handle; continue; + } =20 - DBG("_DSD Key Type %d. Found MAC address key\n", DataType); + DBG("_DSD Key Type %d. Found address key\n", DataType); =20 // // We found the node. @@ -157,13 +197,33 @@ EFI_STATUS _SearchReplacePackageMACAddress( } =20 if (Level =3D=3D 3 && *Found) { + AddressBuffer =3D AllocateZeroPool (ADDRESS_MAX_LEN); + if (AddressBuffer =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "%a:%d AllocateZeroPool failed\n", __FILE__, = __LINE__)); + return EFI_OUT_OF_RESOURCES; + } =20 - //Update the MAC - Status =3D GetEnvMac(MacNextID, MACBuffer); - if (EFI_ERROR(Status)) + switch (FoundDev) { + case DsdtDeviceLan: + //Update the MAC + Status =3D GetEnvMac (DevNextID, AddressBuffer); + AddressByte =3D 6; + break; + case DsdtDeviceSas: + //Update SAS Address. + Status =3D GetSasAddress (DevNextID, AddressBuffer); + AddressByte =3D 8; + break; + default: + Status =3D EFI_INVALID_PARAMETER; + } + if (EFI_ERROR (Status)) { + FreePool (AddressBuffer); + AddressBuffer =3D NULL; break; + } =20 - for (Count =3D 0; Count < 6; Count++) { + for (Count =3D 0; Count < AddressByte; Count++) { Status =3D AcpiTableProtocol->GetOption(CurrentHandle, 1, &DataTyp= e, &Buffer, &DataSize); if (EFI_ERROR(Status)) break; @@ -177,13 +237,15 @@ EFI_STATUS _SearchReplacePackageMACAddress( =20 // only need one byte. // FIXME: Assume the CPU is little endian - Status =3D AcpiTableProtocol->SetOption(CurrentHandle, 1, (VOID *)= &MACBuffer[Count], sizeof(UINT8)); + Status =3D AcpiTableProtocol->SetOption (CurrentHandle, 1, Address= Buffer + Count, sizeof(UINT8)); if (EFI_ERROR(Status)) break; Status =3D AcpiTableProtocol->GetChild(ChildHandle, &CurrentHandle= ); if (EFI_ERROR(Status) || CurrentHandle =3D=3D NULL) break; } + FreePool (AddressBuffer); + AddressBuffer =3D NULL; break; } =20 @@ -192,7 +254,13 @@ EFI_STATUS _SearchReplacePackageMACAddress( =20 //Search next package AcpiTableProtocol->Open((VOID *) Buffer, &NextHandle); - Status =3D _SearchReplacePackageMACAddress(AcpiTableProtocol, NextHand= le, Level + 1, Found, MacNextID); + Status =3D _SearchReplacePackageAddress( + AcpiTableProtocol, + NextHandle, + Level + 1, + Found, + DevNextID, + FoundDev); AcpiTableProtocol->Close(NextHandle); if (!EFI_ERROR(Status)) break; @@ -201,22 +269,26 @@ EFI_STATUS _SearchReplacePackageMACAddress( return Status; } =20 -EFI_STATUS SearchReplacePackageMACAddress( +EFI_STATUS SearchReplacePackageAddress( IN EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, IN EFI_ACPI_HANDLE ChildHandle, - IN UINTN MacNextID) + IN UINTN DevNextID, + IN DSDT_DEVICE_TYPE FoundDev + ) { BOOLEAN Found =3D FALSE; UINTN Level =3D 0; =20 - return _SearchReplacePackageMACAddress(AcpiTableProtocol, ChildHandle, L= evel, &Found, MacNextID); + return _SearchReplacePackageAddress(AcpiTableProtocol, ChildHandle, Leve= l, + &Found, DevNextID, FoundDev); } =20 EFI_STATUS -GetEthID ( +GetDeviceInfo ( EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, EFI_ACPI_HANDLE ChildHandle, - UINTN *EthID + UINTN *DevID, + DSDT_DEVICE_TYPE *FoundDev ) { EFI_STATUS Status; @@ -225,7 +297,7 @@ GetEthID ( CONST VOID *Buffer; UINTN DataSize; =20 - // Get NameString ETHx + // Get NameString Status =3D AcpiTableProtocol->GetOption (ChildHandle, 1, &DataType, &Buf= fer, &DataSize); if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "[%a:%d] Get NameString failed: %r\n", __FUNCTION= __, __LINE__, Status)); @@ -236,14 +308,23 @@ GetEthID ( DBG("Size %p Data %02x %02x %02x %02x\n", DataSize, Data[0], Data[1], Da= ta[2], Data[3]); =20 Data[4] =3D '\0'; - if (DataSize !=3D 4 || - AsciiStrnCmp ("ETH", Data, 3) !=3D 0 || - Data[3] > '9' || Data[3] < '0') { - DEBUG ((EFI_D_ERROR, "[%a:%d] The NameString %a is not ETHn\n", __FUNC= TION__, __LINE__, Data)); + if ((DataSize !=3D 4) || + (Data[3] > '9' || Data[3] < '0')) { + DEBUG ((DEBUG_ERROR, "The NameString %a is not ETHn or SASn\n", Data)); return EFI_INVALID_PARAMETER; } =20 - *EthID =3D Data[3] - '0'; + if (AsciiStrnCmp ("ETH", Data, 3) =3D=3D 0) { + *FoundDev =3D DsdtDeviceLan; + } else if (AsciiStrnCmp ("SAS", Data, 3) =3D=3D 0) { + *FoundDev =3D DsdtDeviceSas; + } else { + DEBUG ((DEBUG_ERROR, "[%a:%d] The NameString %a is not ETHn or SASn\n", + __FUNCTION__, __LINE__, Data)); + return EFI_INVALID_PARAMETER; + } + + *DevID =3D Data[3] - '0'; return EFI_SUCCESS; } =20 @@ -257,8 +338,10 @@ EFI_STATUS ProcessDSDTDevice ( CONST VOID *Buffer; UINTN DataSize; EFI_ACPI_HANDLE DevHandle; - INTN Found =3D 0; - UINTN MacNextID; + DSDT_DEVICE_TYPE FoundDev =3D DsdtDeviceUnknown; + UINTN DevNextID; + BOOLEAN HisiAcpiDevNotFound; + UINTN Index; =20 Status =3D AcpiTableProtocol->GetOption(ChildHandle, 0, &DataType, &Buff= er, &DataSize); if (EFI_ERROR(Status)) @@ -280,7 +363,7 @@ EFI_STATUS ProcessDSDTDevice ( break; =20 // - // Search for _HID with Ethernet ID + // Search for _HID with Device ID // Status =3D AcpiTableProtocol->GetOption(DevHandle, 0, &DataType, &Buff= er, &DataSize); if (EFI_ERROR(Status)) @@ -312,23 +395,34 @@ EFI_STATUS ProcessDSDTDevice ( DBG("[%a:%d] - _HID =3D %a\n", __FUNCTION__, __LINE__, Data); =20 if (EFI_ERROR(Status) || - DataType !=3D EFI_ACPI_DATA_TYPE_STRING || - (AsciiStrCmp((CHAR8 *) Data, D03_ACPI_ETH_ID) !=3D 0)) { - AcpiTableProtocol->Close(ValueHandle); - Found =3D 0; + DataType !=3D EFI_ACPI_DATA_TYPE_STRING) { + AcpiTableProtocol->Close (ValueHandle); + FoundDev =3D DsdtDeviceUnknown; + continue; + } + + HisiAcpiDevNotFound =3D TRUE; + for (Index =3D 0; Index < ARRAY_SIZE (mHisiAcpiDevId); Index++) { + if (AsciiStrCmp ((CHAR8 *)Data, mHisiAcpiDevId[Index]) =3D=3D = 0) { + HisiAcpiDevNotFound =3D FALSE; + break; + } + } + if (HisiAcpiDevNotFound) { + AcpiTableProtocol->Close (ValueHandle); + FoundDev =3D DsdtDeviceUnknown; continue; } =20 - DBG("Found Ethernet device\n"); + DBG("Found device\n"); AcpiTableProtocol->Close(ValueHandle); - Status =3D GetEthID (AcpiTableProtocol, ChildHandle, &MacNextID); + Status =3D GetDeviceInfo (AcpiTableProtocol, ChildHandle, &DevNe= xtID, &FoundDev); if (EFI_ERROR (Status)) { continue; } - Found =3D 1; - } else if (Found =3D=3D 1 && AsciiStrnCmp((CHAR8 *) Data, "_DSD", = 4) =3D=3D 0) { + } else if ((FoundDev !=3D DsdtDeviceUnknown) && AsciiStrnCmp((CHAR= 8 *) Data, "_DSD", 4) =3D=3D 0) { // - // Patch MAC address for open source kernel + // Patch DSD data // EFI_ACPI_HANDLE PkgHandle; Status =3D AcpiTableProtocol->GetOption(DevHandle, 2, &DataType,= &Buffer, &DataSize); @@ -351,12 +445,30 @@ EFI_STATUS ProcessDSDTDevice ( // // Walk the _DSD node // - if (DataSize =3D=3D 1 && Data[0] =3D=3D AML_PACKAGE_OP) - Status =3D SearchReplacePackageMACAddress(AcpiTableProtocol, P= kgHandle, MacNextID); + if (DataSize =3D=3D 1 && Data[0] =3D=3D AML_PACKAGE_OP) { + Status =3D SearchReplacePackageAddress (AcpiTableProtocol, Pkg= Handle, DevNextID, FoundDev); + } =20 AcpiTableProtocol->Close(PkgHandle); + } else if (AsciiStrnCmp ((CHAR8 *) Data, "_ADR", 4) =3D=3D 0) { + Status =3D AcpiTableProtocol->GetOption (DevHandle, 2, &DataType= , &Buffer, &DataSize); + if (EFI_ERROR (Status)) { + break; + } + + if (DataType !=3D EFI_ACPI_DATA_TYPE_CHILD) { + continue; + } + + Status =3D GetDeviceInfo (AcpiTableProtocol, ChildHandle, &DevNe= xtID, &FoundDev); + + if (EFI_ERROR (Status)) { + continue; + } } } + } else if ((DataSize =3D=3D 2) && (Data[0] =3D=3D AML_EXT_OP) && (Data= [1] =3D=3D AML_EXT_DEVICE_OP)) { + ProcessDSDTDevice (AcpiTableProtocol, DevHandle); } } =20 @@ -457,7 +569,7 @@ AcpiCheckSum ( Buffer[ChecksumOffset] =3D CalculateCheckSum8 (Buffer, Table->Length); } =20 -EFI_STATUS EthMacInit(void) +EFI_STATUS UpdateAcpiDsdtTable(void) { EFI_STATUS Status; EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol; diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h b/Silicon/H= isilicon/Drivers/AcpiPlatformDxe/EthMac.h index 0a3e811..a7e1eed 100644 --- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h +++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h @@ -10,7 +10,7 @@ #ifndef _ETH_MAC_H_ #define _ETH_MAC_H_ =20 -EFI_STATUS EthMacInit(VOID); +EFI_STATUS UpdateAcpiDsdtTable (VOID); =20 #endif =20 --=20 2.8.1 -=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 (#60032): https://edk2.groups.io/g/devel/message/60032 Mute This Topic: https://groups.io/mt/74377141/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-