From nobody Fri Mar 29 09:47:54 2024 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+60035+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+60035+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1590073497; cv=none; d=zohomail.com; s=zohoarc; b=BqA0qzVDdI6IOi3YTswNWI6eJN+r1QqeS9SpglV2DsMDfOO83WRqBxP2eVZWIMp4U+7lcQJYzmbMNWv17jmqbVB14NqOKVQEWHn2CStHGgMWLX67AesYahvA5QckX3uNd6I1OCU1EX8HYpzz4evyh2hgQqNz7N4c8xvTYbwh8EE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590073497; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=+hVzm0ITdihd2rEbesO89LT5kwaGDhmTMLmDNOy08hQ=; b=Ymk/DrouxND+XfQJ4KZvCb4xLKGHAGtayqD5FXj3eQFVH0ie/DksWtfpXgOGkDrWeglObDf9/374WJuiRenpcfi2SI+k6ojPTC6zdt46mYdcjdV5ZcCkq3AuOmEijltfuFlSmiTv1LVwifG5eYE1l3ZxM7pfuJVnLU9X/3vqBo0= 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+60035+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1590073497447357.52268255430806; Thu, 21 May 2020 08:04:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id I1oCYY1788612xd4oECPcHzM; Thu, 21 May 2020 08:04:57 -0700 X-Received: from huawei.com (huawei.com [45.249.212.191]) by mx.groups.io with SMTP id smtpd.web11.7535.1590072322041776342 for ; Thu, 21 May 2020 07:45:24 -0700 X-Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 673B0881191AC577702D; 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:06 +0800 From: Ming Huang To: , , CC: , , , , Subject: [edk2-devel] [RFC edk2-platforms v1 1/3] Silicon/Hisilicon: Change updating dsdt in ready to boot event Date: Thu, 21 May 2020 22:43:02 +0800 Message-ID: <1590072184-16219-2-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: vEX8gwufzRa4FZpQvDThQhNyx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1590073497; bh=BD+g+EZqF5OT+0dKzx/x9BQNxtkgDhqbBp5lCMpz384=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=VqKQuuiTHqfXp0rfVlszD5xHKhclPl+0B0j9slzNisMhTk2S44Yyl+4wrLsxdYTFa6X zF+xnihd1Xo+ExYwZea7gtb/3Yp4x0gjSKPoo8psxeXaedeL+IihcF60K5g7FHgg9nTlA Yat6gd2Px+Q2xO0L0EAUrEYUyh1z89pjQw0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The better time for updating dsdt is in ready to boot event, so change the updating time. Signed-off-by: Ming Huang --- Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 60 ++++++++++++= ++++++-- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Sil= icon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c index b888cb1..1ab55bc 100644 --- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c +++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.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 **/ @@ -23,6 +23,38 @@ #include #include "EthMac.h" =20 +EFI_EVENT mUpdateAcpiDsdtTableEvent; + +VOID +EFIAPI +UpdateAcpiDsdt ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + EFI_ACPI_TABLE_PROTOCOL *AcpiTableProtocol; + EFI_STATUS Status; + + Status =3D gBS->LocateProtocol ( + &gEfiAcpiTableProtocolGuid, + NULL, + (VOID**)&AcpiTableProtocol + ); + + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, " Unable to locate ACPI table protocol\n")); + return; + } + + Status =3D EthMacInit (); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, " UpdateAcpiDsdtTable Failed, Status =3D %r\n", S= tatus)); + } + + gBS->CloseEvent (Event); + return; +} + EFI_STATUS EFIAPI AcpiPlatformEntryPoint ( @@ -30,5 +62,25 @@ AcpiPlatformEntryPoint ( IN EFI_SYSTEM_TABLE *SystemTable ) { - return EthMacInit(); + EFI_STATUS Status; + + // + // Register notify function + // + Status =3D gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + UpdateAcpiDsdt, + NULL, + &gEfiEventReadyToBootGuid, + &mUpdateAcpiDsdtTableEvent + ); + + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Create ReadyToBoot event for UpdateAcpiDsdt fail= ed.\n")); + } else { + DEBUG ((DEBUG_INFO, "Create ReadyToBoot event for UpdateAcpiDsdt succe= ss.\n")); + } + + return Status; } --=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 (#60035): https://edk2.groups.io/g/devel/message/60035 Mute This Topic: https://groups.io/mt/74377144/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- From nobody Fri Mar 29 09:47:54 2024 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- From nobody Fri Mar 29 09:47:54 2024 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+60034+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+60034+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1590073496; cv=none; d=zohomail.com; s=zohoarc; b=Ep0FcomR0qG/AaYHyaECYsJaa20Juy5sm3tLv18rjl8H4ImOWDQn57pXjs3P5aQGtXv1UayeqCBrZaGu+vG8qB1965EuzHOI8fpIePfxCUwp6WBZ3iMi6z3AebJ1JObYShwr5Kp7rYi9s9vJKDRxZtVO8Urhm7L8FEt7bqgkhoY= 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=XLFwrR6PVB12RztBgsIldH7yUMApgFfc/QVu5uZ98MQ=; b=Uj82C1mwLbL5EyaitBtDmUDT08ZFCXCc+TO2qAbxFC6VAxSLUvGD1PmzGD7JplXjBAwunYbPmEyQ2ijochsCH59wR3pjIMVYrXA1Yj2rPChejTv/fQ2VwATW1MLKu2w5BzRl33K6UsGdBAycb09c6tc8C/+S33KK6xCF9SsdFso= 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+60034+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1590073496876520.1369260223742; Thu, 21 May 2020 08:04:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Ym4RYY1788612x5EgTQX5fCS; 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.7368.1590072322586038771 for ; Thu, 21 May 2020 07:45:23 -0700 X-Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 420DF4966A9B0D1756F8; 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:08 +0800 From: Ming Huang To: , , CC: , , , , Subject: [edk2-devel] [RFC edk2-platforms v1 3/3] Silicon/Hisilicon: Rename EthMac files Date: Thu, 21 May 2020 22:43:04 +0800 Message-ID: <1590072184-16219-4-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: 8yFcee0QlaYSWytFQg02ofEEx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1590073495; bh=9QOgi2xdd27t1WtbFTm22HY7DVenwj0Knfi2y2quG5M=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=fX3u2cvgI2OFYnnwLaory6kFbLaFOFwc1h0Wyy0vVwvP3jTNy2h3PYwrd1jPTuFmo6h 6wFOn9FJQ0wTWphkYMIQe51PaNDbQszEjwD1zt/EWKjKldmeMEonDMrdjmBeLsyMAsqq0 NRPP7OigxjIfw1LhI+DDoKOXZSRRg1R06Gk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As not only update mac address feature in EthMac files, so rename them to UpdateDsdt. Signed-off-by: Ming Huang --- Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 2 +- Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +- Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c | 612 ------= -------------- Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h | 16 - Silicon/Hisilicon/Drivers/AcpiPlatformDxe/UpdateDsdt.c | 612 ++++++= ++++++++++++++ Silicon/Hisilicon/Drivers/AcpiPlatformDxe/UpdateDsdt.h | 16 + 6 files changed, 633 insertions(+), 633 deletions(-) diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Sil= icon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c index d3ea051..fd67677 100644 --- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c +++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c @@ -21,7 +21,7 @@ #include #include #include -#include "EthMac.h" +#include "UpdateDsdt.h" =20 EFI_EVENT mUpdateAcpiDsdtTableEvent; =20 diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf = b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf index 53da731..a2b669d 100644 --- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -1,8 +1,8 @@ ## @file # -# Copyright (c) 2014, Applied Micro Curcuit Corp. All rights reserved.
-# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
-# Copyright (c) 2015, Linaro Limited. All rights reserved.
+# Copyright (c) 2014 - 2020, Applied Micro Curcuit Corp. All rights reser= ved.
+# 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 # ## @@ -18,7 +18,7 @@ =20 [Sources] AcpiPlatform.c - EthMac.c + UpdateDsdt.c =20 [Packages] MdePkg/MdePkg.dec diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c b/Silicon/H= isilicon/Drivers/AcpiPlatformDxe/EthMac.c deleted file mode 100644 index 205f2f9..0000000 --- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c +++ /dev/null @@ -1,612 +0,0 @@ -/** @file - - 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 - - This driver is called to initialize the FW part of the PHY in preparation - for the OS. - -**/ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -// Turn on debug message by enabling below define -//#define ACPI_DEBUG - -#ifdef ACPI_DEBUG -#define DBG(arg...) DEBUG((EFI_D_ERROR,## arg)) -#else -#define DBG(arg...) -#endif - -#define EFI_ACPI_MAX_NUM_TABLES 20 -#define DSDT_SIGNATURE 0x54445344 - -#define ACPI_ETH_MAC_KEY "local-mac-address" -#define ACPI_ETH_SAS_KEY "sas-addr" - -#define PREFIX_VARIABLE_NAME L"MAC" -#define PREFIX_VARIABLE_NAME_COMPAT L"RGMII_MAC" -#define ADDRESS_MAX_LEN 30 - -CHAR8 *mHisiAcpiDevId[] =3D {"HISI00C1","HISI00C2","HISI0162"}; - -typedef enum { - DsdtDeviceUnknown, - DsdtDeviceLan, - DsdtDeviceSas -} DSDT_DEVICE_TYPE; - -EFI_STATUS GetEnvMac( - IN UINTN MacNextID, - IN OUT UINT8 *MacBuffer) -{ - EFI_MAC_ADDRESS Mac; - EFI_STATUS Status; - HISI_BOARD_NIC_PROTOCOL *OemNic =3D NULL; - - Status =3D gBS->LocateProtocol(&gHisiBoardNicProtocolGuid, NULL, (VOID *= *)&OemNic); - if(EFI_ERROR(Status)) - { - DEBUG((EFI_D_ERROR, "[%a]:[%dL] LocateProtocol failed %r\n", __FUNCTIO= N__, __LINE__, Status)); - return Status; - } - - Status =3D OemNic->GetMac(&Mac, MacNextID); - if(EFI_ERROR(Status)) - { - DEBUG((EFI_D_ERROR, "[%a]:[%dL] GetMac failed %r\n", __FUNCTION__, __L= INE__, Status)); - return Status; - } - - CopyMem (MacBuffer, &Mac, 6); - DEBUG((EFI_D_ERROR, "Port %d MAC %02x:%02x:%02x:%02x:%02x:%02x\n", - MacNextID, - MacBuffer[0], - MacBuffer[1], - MacBuffer[2], - MacBuffer[3], - MacBuffer[4], - MacBuffer[5] - )); - - return EFI_SUCCESS; -} - -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 DevNextID, - IN DSDT_DEVICE_TYPE FoundDev - ) -{ - // ASL template for ethernet driver: -/* - * Name (_DSD, Package () { - * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - * Package () { - * Package (2) {"mac-address", Package (6) { 00, 11, 22, 33, 44, 55 }} - * Package (2) {"phy-channel", 0}, - * Package (2) {"phy-mode", "rgmii"}, - * Package (2) {"max-transfer-unit", 0x5dc}, // MTU of 1500 - * Package (2) {"max-speed", 0x3e8}, // 1000 Mbps - * } - * }) - */ - EFI_STATUS Status; - EFI_ACPI_DATA_TYPE DataType; - CONST UINT8 *Data; - CONST VOID *Buffer; - UINTN DataSize; - UINTN Count; - EFI_ACPI_HANDLE CurrentHandle; - EFI_ACPI_HANDLE NextHandle; - EFI_ACPI_HANDLE Level1Handle; - UINT8 *AddressBuffer; - UINT8 AddressByte =3D 0; - - 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; - - Status =3D AcpiTableProtocol->GetOption(CurrentHandle, 0, &DataType, &= Buffer, &DataSize); - Data =3D Buffer; - DBG("_DSD Child Subnode Store Op Code 0x%02X 0x%02X %02X\n", - DataSize, Data[0], DataSize > 1 ? Data[1] : 0); - - if (Level < 2 && Data[0] !=3D AML_PACKAGE_OP) - continue; - - if (Level =3D=3D 2 && Data[0] =3D=3D AML_STRING_PREFIX) { - Status =3D AcpiTableProtocol->GetOption(CurrentHandle, 1, &DataType,= &Buffer, &DataSize); - if (EFI_ERROR(Status)) - break; - - DBG(" _DSD Child Subnode Store Op Code 0x%02X 0x%02X %02X\n", - DataSize, Data[0], DataSize > 1 ? Data[1] : 0); - - Data =3D Buffer; - 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; - } - - DBG("_DSD Key Type %d. Found address key\n", DataType); - - // - // We found the node. - // - *Found =3D TRUE; - continue; - } - - 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; - } - - 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; - } - - for (Count =3D 0; Count < AddressByte; Count++) { - Status =3D AcpiTableProtocol->GetOption(CurrentHandle, 1, &DataTyp= e, &Buffer, &DataSize); - if (EFI_ERROR(Status)) - break; - - Data =3D Buffer; - DBG(" _DSD Child Subnode Store Op Code 0x%02X 0x%02X %02X DataT= ype 0x%X\n", - DataSize, Data[0], DataSize > 1 ? Data[1] : 0, DataType); - - if (DataType !=3D EFI_ACPI_DATA_TYPE_UINT) - break; - - // only need one byte. - // FIXME: Assume the CPU is little endian - 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; - } - - if (Level > 3) - break; - - //Search next package - AcpiTableProtocol->Open((VOID *) Buffer, &NextHandle); - Status =3D _SearchReplacePackageAddress( - AcpiTableProtocol, - NextHandle, - Level + 1, - Found, - DevNextID, - FoundDev); - AcpiTableProtocol->Close(NextHandle); - if (!EFI_ERROR(Status)) - break; - } - - return Status; -} - -EFI_STATUS SearchReplacePackageAddress( - IN EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, - IN EFI_ACPI_HANDLE ChildHandle, - IN UINTN DevNextID, - IN DSDT_DEVICE_TYPE FoundDev - ) -{ - BOOLEAN Found =3D FALSE; - UINTN Level =3D 0; - - return _SearchReplacePackageAddress(AcpiTableProtocol, ChildHandle, Leve= l, - &Found, DevNextID, FoundDev); -} - -EFI_STATUS -GetDeviceInfo ( - EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, - EFI_ACPI_HANDLE ChildHandle, - UINTN *DevID, - DSDT_DEVICE_TYPE *FoundDev - ) -{ - EFI_STATUS Status; - EFI_ACPI_DATA_TYPE DataType; - CHAR8 Data[5]; - CONST VOID *Buffer; - UINTN DataSize; - - // 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)); - return Status; - } - - CopyMem (Data, Buffer, 4); - DBG("Size %p Data %02x %02x %02x %02x\n", DataSize, Data[0], Data[1], Da= ta[2], Data[3]); - - Data[4] =3D '\0'; - 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; - } - - 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; -} - -EFI_STATUS ProcessDSDTDevice ( - EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, - EFI_ACPI_HANDLE ChildHandle) -{ - EFI_STATUS Status; - EFI_ACPI_DATA_TYPE DataType; - CONST UINT8 *Data; - CONST VOID *Buffer; - UINTN DataSize; - EFI_ACPI_HANDLE DevHandle; - DSDT_DEVICE_TYPE FoundDev =3D DsdtDeviceUnknown; - UINTN DevNextID; - BOOLEAN HisiAcpiDevNotFound; - UINTN Index; - - Status =3D AcpiTableProtocol->GetOption(ChildHandle, 0, &DataType, &Buff= er, &DataSize); - if (EFI_ERROR(Status)) - return EFI_SUCCESS; - - Data =3D Buffer; - // - // Skip all non-device type - // - if (DataSize !=3D 2 || Data[0] !=3D AML_EXT_OP || Data[1] !=3D AML_EXT_D= EVICE_OP) - return EFI_SUCCESS; - - // - // Walk the device type node - // - for (DevHandle =3D NULL; ; ) { - Status =3D AcpiTableProtocol->GetChild(ChildHandle, &DevHandle); - if (EFI_ERROR(Status) || DevHandle =3D=3D NULL) - break; - - // - // Search for _HID with Device ID - // - Status =3D AcpiTableProtocol->GetOption(DevHandle, 0, &DataType, &Buff= er, &DataSize); - if (EFI_ERROR(Status)) - break; - - Data =3D Buffer; - DBG("Data Type 0x%02X %02X\n", Data[0], DataSize > 1 ? Data[1] : 0); - if (DataSize =3D=3D 1 && Data[0] =3D=3D AML_NAME_OP) { - Status =3D AcpiTableProtocol->GetOption(DevHandle, 1, &DataType, &Bu= ffer, &DataSize); - if (EFI_ERROR(Status)) - break; - - Data =3D Buffer; - if (DataType =3D=3D EFI_ACPI_DATA_TYPE_NAME_STRING) { - if (AsciiStrnCmp((CHAR8 *) Data, "_HID", 4) =3D=3D 0) { - EFI_ACPI_HANDLE ValueHandle; - - Status =3D AcpiTableProtocol->GetOption(DevHandle, 2, &DataType,= &Buffer, &DataSize); - if (EFI_ERROR(Status)) - break; - - if (DataType !=3D EFI_ACPI_DATA_TYPE_CHILD) - continue; - - AcpiTableProtocol->Open((VOID *) Buffer, &ValueHandle); - Status =3D AcpiTableProtocol->GetOption(ValueHandle, 1, &DataTyp= e, &Buffer, &DataSize); - - Data =3D Buffer; - DBG("[%a:%d] - _HID =3D %a\n", __FUNCTION__, __LINE__, Data); - - if (EFI_ERROR(Status) || - 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; - } - - DBG("Found device\n"); - AcpiTableProtocol->Close(ValueHandle); - Status =3D GetDeviceInfo (AcpiTableProtocol, ChildHandle, &DevNe= xtID, &FoundDev); - if (EFI_ERROR (Status)) { - continue; - } - } else if ((FoundDev !=3D DsdtDeviceUnknown) && AsciiStrnCmp((CHAR= 8 *) Data, "_DSD", 4) =3D=3D 0) { - // - // Patch DSD data - // - EFI_ACPI_HANDLE PkgHandle; - Status =3D AcpiTableProtocol->GetOption(DevHandle, 2, &DataType,= &Buffer, &DataSize); - if (EFI_ERROR(Status)) - break; - - if (DataType !=3D EFI_ACPI_DATA_TYPE_CHILD) - continue; - - // - // Open package data - // - AcpiTableProtocol->Open((VOID *) Buffer, &PkgHandle); - Status =3D AcpiTableProtocol->GetOption(PkgHandle, 0, &DataType,= &Buffer, &DataSize); - - Data =3D Buffer; - DBG("_DSD Subnode Store Op Code 0x%02X %02X\n", - Data[0], DataSize > 1 ? Data[1] : 0); - - // - // Walk the _DSD node - // - if (DataSize =3D=3D 1 && Data[0] =3D=3D AML_PACKAGE_OP) { - Status =3D SearchReplacePackageAddress (AcpiTableProtocol, Pkg= Handle, DevNextID, FoundDev); - } - - 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); - } - } - - return EFI_SUCCESS; -} - - -BOOLEAN -IsSbScope ( - EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, - EFI_ACPI_HANDLE ChildHandle - ) -{ - EFI_STATUS Status; - EFI_ACPI_DATA_TYPE DataType; - CONST UINT8 *Data; - CONST VOID *Buffer; - UINTN DataSize; - - Status =3D AcpiTableProtocol->GetOption (ChildHandle, 0, &DataType, &Buf= fer, &DataSize); - if (EFI_ERROR(Status)) return FALSE; - - Data =3D Buffer; - if (DataSize !=3D 1 || Data[0] !=3D AML_SCOPE_OP) { - return FALSE; - } - - return TRUE; -} - -EFI_STATUS ProcessDSDTChild( - EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, - EFI_ACPI_HANDLE ChildHandle) -{ - EFI_STATUS Status; - EFI_ACPI_HANDLE DevHandle; - - // Check Scope(_SB) at first - if (!IsSbScope (AcpiTableProtocol, ChildHandle)) { - return ProcessDSDTDevice (AcpiTableProtocol, ChildHandle); - } - - for (DevHandle =3D NULL; ; ) { - Status =3D AcpiTableProtocol->GetChild (ChildHandle, &DevHandle); - if (EFI_ERROR(Status) || DevHandle =3D=3D NULL) { - break; - } - - ProcessDSDTDevice (AcpiTableProtocol, DevHandle); - } - - return EFI_SUCCESS; -} - -static EFI_STATUS ProcessDSDT( - EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, - EFI_ACPI_HANDLE TableHandle) -{ - EFI_STATUS Status; - EFI_ACPI_HANDLE ChildHandle; - // - // Parse table for device type - DBG ("[%a:%d] - TableHandle=3D%p\n", __FUNCTION__, __LINE__, TableHandle= ); - for (ChildHandle =3D NULL; ; ) { - Status =3D AcpiTableProtocol->GetChild(TableHandle, &ChildHandle); - DBG ("[%a:%d] - Child=3D%p, %r\n", __FUNCTION__, __LINE__, ChildHandle= , Status); - if (EFI_ERROR(Status)) - break; - if (ChildHandle =3D=3D NULL) - break; - - ProcessDSDTChild(AcpiTableProtocol, ChildHandle); - } - - return EFI_SUCCESS; -} - -STATIC -VOID -AcpiCheckSum ( - IN OUT EFI_ACPI_SDT_HEADER *Table - ) -{ - UINTN ChecksumOffset; - UINT8 *Buffer; - - ChecksumOffset =3D OFFSET_OF (EFI_ACPI_DESCRIPTION_HEADER, Checksum); - Buffer =3D (UINT8 *)Table; - - // - // set checksum to 0 first - // - Buffer[ChecksumOffset] =3D 0; - - // - // Update checksum value - // - Buffer[ChecksumOffset] =3D CalculateCheckSum8 (Buffer, Table->Length); -} - -EFI_STATUS UpdateAcpiDsdtTable(void) -{ - EFI_STATUS Status; - EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol; - EFI_ACPI_SDT_HEADER *Table; - EFI_ACPI_TABLE_VERSION TableVersion; - UINTN TableKey; - EFI_ACPI_HANDLE TableHandle; - UINTN i; - - DEBUG ((EFI_D_ERROR, "Updating Ethernet MAC in ACPI DSDT...\n")); - - // - // Find the AcpiTable protocol - Status =3D gBS->LocateProtocol(&gEfiAcpiSdtProtocolGuid, NULL, (VOID**) = &AcpiTableProtocol); - if (EFI_ERROR(Status)) { - DBG("Unable to locate ACPI table protocol\n"); - return EFI_SUCCESS; - } - - // - // Search for DSDT Table - for (i =3D 0; i < EFI_ACPI_MAX_NUM_TABLES; i++) { - Status =3D AcpiTableProtocol->GetAcpiTable(i, &Table, &TableVersion, &= TableKey); - if (EFI_ERROR(Status)) - break; - if (Table->Signature !=3D DSDT_SIGNATURE) - continue; - - Status =3D AcpiTableProtocol->OpenSdt(TableKey, &TableHandle); - if (EFI_ERROR(Status)) - break; - - ProcessDSDT(AcpiTableProtocol, TableHandle); - - AcpiTableProtocol->Close(TableHandle); - AcpiCheckSum (Table); - } - - return EFI_SUCCESS; -} diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h b/Silicon/H= isilicon/Drivers/AcpiPlatformDxe/EthMac.h deleted file mode 100644 index a7e1eed..0000000 --- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * - * Copyright (c) 2014, Applied Micro Circuits Corporation - * Copyright (c) 2015, Hisilicon Limited. All rights reserved. - * Copyright (c) 2015, Linaro Limited. All rights reserved. - * Author: Loc Ho - * - * SPDX-License-Identifier: BSD-2-Clause-Patent - */ -#ifndef _ETH_MAC_H_ -#define _ETH_MAC_H_ - -EFI_STATUS UpdateAcpiDsdtTable (VOID); - -#endif - diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/UpdateDsdt.c b/Silic= on/Hisilicon/Drivers/AcpiPlatformDxe/UpdateDsdt.c new file mode 100644 index 0000000..205f2f9 --- /dev/null +++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/UpdateDsdt.c @@ -0,0 +1,612 @@ +/** @file + + 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 + + This driver is called to initialize the FW part of the PHY in preparation + for the OS. + +**/ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +// Turn on debug message by enabling below define +//#define ACPI_DEBUG + +#ifdef ACPI_DEBUG +#define DBG(arg...) DEBUG((EFI_D_ERROR,## arg)) +#else +#define DBG(arg...) +#endif + +#define EFI_ACPI_MAX_NUM_TABLES 20 +#define DSDT_SIGNATURE 0x54445344 + +#define ACPI_ETH_MAC_KEY "local-mac-address" +#define ACPI_ETH_SAS_KEY "sas-addr" + +#define PREFIX_VARIABLE_NAME L"MAC" +#define PREFIX_VARIABLE_NAME_COMPAT L"RGMII_MAC" +#define ADDRESS_MAX_LEN 30 + +CHAR8 *mHisiAcpiDevId[] =3D {"HISI00C1","HISI00C2","HISI0162"}; + +typedef enum { + DsdtDeviceUnknown, + DsdtDeviceLan, + DsdtDeviceSas +} DSDT_DEVICE_TYPE; + +EFI_STATUS GetEnvMac( + IN UINTN MacNextID, + IN OUT UINT8 *MacBuffer) +{ + EFI_MAC_ADDRESS Mac; + EFI_STATUS Status; + HISI_BOARD_NIC_PROTOCOL *OemNic =3D NULL; + + Status =3D gBS->LocateProtocol(&gHisiBoardNicProtocolGuid, NULL, (VOID *= *)&OemNic); + if(EFI_ERROR(Status)) + { + DEBUG((EFI_D_ERROR, "[%a]:[%dL] LocateProtocol failed %r\n", __FUNCTIO= N__, __LINE__, Status)); + return Status; + } + + Status =3D OemNic->GetMac(&Mac, MacNextID); + if(EFI_ERROR(Status)) + { + DEBUG((EFI_D_ERROR, "[%a]:[%dL] GetMac failed %r\n", __FUNCTION__, __L= INE__, Status)); + return Status; + } + + CopyMem (MacBuffer, &Mac, 6); + DEBUG((EFI_D_ERROR, "Port %d MAC %02x:%02x:%02x:%02x:%02x:%02x\n", + MacNextID, + MacBuffer[0], + MacBuffer[1], + MacBuffer[2], + MacBuffer[3], + MacBuffer[4], + MacBuffer[5] + )); + + return EFI_SUCCESS; +} + +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 DevNextID, + IN DSDT_DEVICE_TYPE FoundDev + ) +{ + // ASL template for ethernet driver: +/* + * Name (_DSD, Package () { + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + * Package () { + * Package (2) {"mac-address", Package (6) { 00, 11, 22, 33, 44, 55 }} + * Package (2) {"phy-channel", 0}, + * Package (2) {"phy-mode", "rgmii"}, + * Package (2) {"max-transfer-unit", 0x5dc}, // MTU of 1500 + * Package (2) {"max-speed", 0x3e8}, // 1000 Mbps + * } + * }) + */ + EFI_STATUS Status; + EFI_ACPI_DATA_TYPE DataType; + CONST UINT8 *Data; + CONST VOID *Buffer; + UINTN DataSize; + UINTN Count; + EFI_ACPI_HANDLE CurrentHandle; + EFI_ACPI_HANDLE NextHandle; + EFI_ACPI_HANDLE Level1Handle; + UINT8 *AddressBuffer; + UINT8 AddressByte =3D 0; + + 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; + + Status =3D AcpiTableProtocol->GetOption(CurrentHandle, 0, &DataType, &= Buffer, &DataSize); + Data =3D Buffer; + DBG("_DSD Child Subnode Store Op Code 0x%02X 0x%02X %02X\n", + DataSize, Data[0], DataSize > 1 ? Data[1] : 0); + + if (Level < 2 && Data[0] !=3D AML_PACKAGE_OP) + continue; + + if (Level =3D=3D 2 && Data[0] =3D=3D AML_STRING_PREFIX) { + Status =3D AcpiTableProtocol->GetOption(CurrentHandle, 1, &DataType,= &Buffer, &DataSize); + if (EFI_ERROR(Status)) + break; + + DBG(" _DSD Child Subnode Store Op Code 0x%02X 0x%02X %02X\n", + DataSize, Data[0], DataSize > 1 ? Data[1] : 0); + + Data =3D Buffer; + 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; + } + + DBG("_DSD Key Type %d. Found address key\n", DataType); + + // + // We found the node. + // + *Found =3D TRUE; + continue; + } + + 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; + } + + 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; + } + + for (Count =3D 0; Count < AddressByte; Count++) { + Status =3D AcpiTableProtocol->GetOption(CurrentHandle, 1, &DataTyp= e, &Buffer, &DataSize); + if (EFI_ERROR(Status)) + break; + + Data =3D Buffer; + DBG(" _DSD Child Subnode Store Op Code 0x%02X 0x%02X %02X DataT= ype 0x%X\n", + DataSize, Data[0], DataSize > 1 ? Data[1] : 0, DataType); + + if (DataType !=3D EFI_ACPI_DATA_TYPE_UINT) + break; + + // only need one byte. + // FIXME: Assume the CPU is little endian + 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; + } + + if (Level > 3) + break; + + //Search next package + AcpiTableProtocol->Open((VOID *) Buffer, &NextHandle); + Status =3D _SearchReplacePackageAddress( + AcpiTableProtocol, + NextHandle, + Level + 1, + Found, + DevNextID, + FoundDev); + AcpiTableProtocol->Close(NextHandle); + if (!EFI_ERROR(Status)) + break; + } + + return Status; +} + +EFI_STATUS SearchReplacePackageAddress( + IN EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, + IN EFI_ACPI_HANDLE ChildHandle, + IN UINTN DevNextID, + IN DSDT_DEVICE_TYPE FoundDev + ) +{ + BOOLEAN Found =3D FALSE; + UINTN Level =3D 0; + + return _SearchReplacePackageAddress(AcpiTableProtocol, ChildHandle, Leve= l, + &Found, DevNextID, FoundDev); +} + +EFI_STATUS +GetDeviceInfo ( + EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, + EFI_ACPI_HANDLE ChildHandle, + UINTN *DevID, + DSDT_DEVICE_TYPE *FoundDev + ) +{ + EFI_STATUS Status; + EFI_ACPI_DATA_TYPE DataType; + CHAR8 Data[5]; + CONST VOID *Buffer; + UINTN DataSize; + + // 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)); + return Status; + } + + CopyMem (Data, Buffer, 4); + DBG("Size %p Data %02x %02x %02x %02x\n", DataSize, Data[0], Data[1], Da= ta[2], Data[3]); + + Data[4] =3D '\0'; + 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; + } + + 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; +} + +EFI_STATUS ProcessDSDTDevice ( + EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, + EFI_ACPI_HANDLE ChildHandle) +{ + EFI_STATUS Status; + EFI_ACPI_DATA_TYPE DataType; + CONST UINT8 *Data; + CONST VOID *Buffer; + UINTN DataSize; + EFI_ACPI_HANDLE DevHandle; + DSDT_DEVICE_TYPE FoundDev =3D DsdtDeviceUnknown; + UINTN DevNextID; + BOOLEAN HisiAcpiDevNotFound; + UINTN Index; + + Status =3D AcpiTableProtocol->GetOption(ChildHandle, 0, &DataType, &Buff= er, &DataSize); + if (EFI_ERROR(Status)) + return EFI_SUCCESS; + + Data =3D Buffer; + // + // Skip all non-device type + // + if (DataSize !=3D 2 || Data[0] !=3D AML_EXT_OP || Data[1] !=3D AML_EXT_D= EVICE_OP) + return EFI_SUCCESS; + + // + // Walk the device type node + // + for (DevHandle =3D NULL; ; ) { + Status =3D AcpiTableProtocol->GetChild(ChildHandle, &DevHandle); + if (EFI_ERROR(Status) || DevHandle =3D=3D NULL) + break; + + // + // Search for _HID with Device ID + // + Status =3D AcpiTableProtocol->GetOption(DevHandle, 0, &DataType, &Buff= er, &DataSize); + if (EFI_ERROR(Status)) + break; + + Data =3D Buffer; + DBG("Data Type 0x%02X %02X\n", Data[0], DataSize > 1 ? Data[1] : 0); + if (DataSize =3D=3D 1 && Data[0] =3D=3D AML_NAME_OP) { + Status =3D AcpiTableProtocol->GetOption(DevHandle, 1, &DataType, &Bu= ffer, &DataSize); + if (EFI_ERROR(Status)) + break; + + Data =3D Buffer; + if (DataType =3D=3D EFI_ACPI_DATA_TYPE_NAME_STRING) { + if (AsciiStrnCmp((CHAR8 *) Data, "_HID", 4) =3D=3D 0) { + EFI_ACPI_HANDLE ValueHandle; + + Status =3D AcpiTableProtocol->GetOption(DevHandle, 2, &DataType,= &Buffer, &DataSize); + if (EFI_ERROR(Status)) + break; + + if (DataType !=3D EFI_ACPI_DATA_TYPE_CHILD) + continue; + + AcpiTableProtocol->Open((VOID *) Buffer, &ValueHandle); + Status =3D AcpiTableProtocol->GetOption(ValueHandle, 1, &DataTyp= e, &Buffer, &DataSize); + + Data =3D Buffer; + DBG("[%a:%d] - _HID =3D %a\n", __FUNCTION__, __LINE__, Data); + + if (EFI_ERROR(Status) || + 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; + } + + DBG("Found device\n"); + AcpiTableProtocol->Close(ValueHandle); + Status =3D GetDeviceInfo (AcpiTableProtocol, ChildHandle, &DevNe= xtID, &FoundDev); + if (EFI_ERROR (Status)) { + continue; + } + } else if ((FoundDev !=3D DsdtDeviceUnknown) && AsciiStrnCmp((CHAR= 8 *) Data, "_DSD", 4) =3D=3D 0) { + // + // Patch DSD data + // + EFI_ACPI_HANDLE PkgHandle; + Status =3D AcpiTableProtocol->GetOption(DevHandle, 2, &DataType,= &Buffer, &DataSize); + if (EFI_ERROR(Status)) + break; + + if (DataType !=3D EFI_ACPI_DATA_TYPE_CHILD) + continue; + + // + // Open package data + // + AcpiTableProtocol->Open((VOID *) Buffer, &PkgHandle); + Status =3D AcpiTableProtocol->GetOption(PkgHandle, 0, &DataType,= &Buffer, &DataSize); + + Data =3D Buffer; + DBG("_DSD Subnode Store Op Code 0x%02X %02X\n", + Data[0], DataSize > 1 ? Data[1] : 0); + + // + // Walk the _DSD node + // + if (DataSize =3D=3D 1 && Data[0] =3D=3D AML_PACKAGE_OP) { + Status =3D SearchReplacePackageAddress (AcpiTableProtocol, Pkg= Handle, DevNextID, FoundDev); + } + + 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); + } + } + + return EFI_SUCCESS; +} + + +BOOLEAN +IsSbScope ( + EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, + EFI_ACPI_HANDLE ChildHandle + ) +{ + EFI_STATUS Status; + EFI_ACPI_DATA_TYPE DataType; + CONST UINT8 *Data; + CONST VOID *Buffer; + UINTN DataSize; + + Status =3D AcpiTableProtocol->GetOption (ChildHandle, 0, &DataType, &Buf= fer, &DataSize); + if (EFI_ERROR(Status)) return FALSE; + + Data =3D Buffer; + if (DataSize !=3D 1 || Data[0] !=3D AML_SCOPE_OP) { + return FALSE; + } + + return TRUE; +} + +EFI_STATUS ProcessDSDTChild( + EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, + EFI_ACPI_HANDLE ChildHandle) +{ + EFI_STATUS Status; + EFI_ACPI_HANDLE DevHandle; + + // Check Scope(_SB) at first + if (!IsSbScope (AcpiTableProtocol, ChildHandle)) { + return ProcessDSDTDevice (AcpiTableProtocol, ChildHandle); + } + + for (DevHandle =3D NULL; ; ) { + Status =3D AcpiTableProtocol->GetChild (ChildHandle, &DevHandle); + if (EFI_ERROR(Status) || DevHandle =3D=3D NULL) { + break; + } + + ProcessDSDTDevice (AcpiTableProtocol, DevHandle); + } + + return EFI_SUCCESS; +} + +static EFI_STATUS ProcessDSDT( + EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol, + EFI_ACPI_HANDLE TableHandle) +{ + EFI_STATUS Status; + EFI_ACPI_HANDLE ChildHandle; + // + // Parse table for device type + DBG ("[%a:%d] - TableHandle=3D%p\n", __FUNCTION__, __LINE__, TableHandle= ); + for (ChildHandle =3D NULL; ; ) { + Status =3D AcpiTableProtocol->GetChild(TableHandle, &ChildHandle); + DBG ("[%a:%d] - Child=3D%p, %r\n", __FUNCTION__, __LINE__, ChildHandle= , Status); + if (EFI_ERROR(Status)) + break; + if (ChildHandle =3D=3D NULL) + break; + + ProcessDSDTChild(AcpiTableProtocol, ChildHandle); + } + + return EFI_SUCCESS; +} + +STATIC +VOID +AcpiCheckSum ( + IN OUT EFI_ACPI_SDT_HEADER *Table + ) +{ + UINTN ChecksumOffset; + UINT8 *Buffer; + + ChecksumOffset =3D OFFSET_OF (EFI_ACPI_DESCRIPTION_HEADER, Checksum); + Buffer =3D (UINT8 *)Table; + + // + // set checksum to 0 first + // + Buffer[ChecksumOffset] =3D 0; + + // + // Update checksum value + // + Buffer[ChecksumOffset] =3D CalculateCheckSum8 (Buffer, Table->Length); +} + +EFI_STATUS UpdateAcpiDsdtTable(void) +{ + EFI_STATUS Status; + EFI_ACPI_SDT_PROTOCOL *AcpiTableProtocol; + EFI_ACPI_SDT_HEADER *Table; + EFI_ACPI_TABLE_VERSION TableVersion; + UINTN TableKey; + EFI_ACPI_HANDLE TableHandle; + UINTN i; + + DEBUG ((EFI_D_ERROR, "Updating Ethernet MAC in ACPI DSDT...\n")); + + // + // Find the AcpiTable protocol + Status =3D gBS->LocateProtocol(&gEfiAcpiSdtProtocolGuid, NULL, (VOID**) = &AcpiTableProtocol); + if (EFI_ERROR(Status)) { + DBG("Unable to locate ACPI table protocol\n"); + return EFI_SUCCESS; + } + + // + // Search for DSDT Table + for (i =3D 0; i < EFI_ACPI_MAX_NUM_TABLES; i++) { + Status =3D AcpiTableProtocol->GetAcpiTable(i, &Table, &TableVersion, &= TableKey); + if (EFI_ERROR(Status)) + break; + if (Table->Signature !=3D DSDT_SIGNATURE) + continue; + + Status =3D AcpiTableProtocol->OpenSdt(TableKey, &TableHandle); + if (EFI_ERROR(Status)) + break; + + ProcessDSDT(AcpiTableProtocol, TableHandle); + + AcpiTableProtocol->Close(TableHandle); + AcpiCheckSum (Table); + } + + return EFI_SUCCESS; +} diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/UpdateDsdt.h b/Silic= on/Hisilicon/Drivers/AcpiPlatformDxe/UpdateDsdt.h new file mode 100644 index 0000000..a7e1eed --- /dev/null +++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/UpdateDsdt.h @@ -0,0 +1,16 @@ +/* + * + * Copyright (c) 2014, Applied Micro Circuits Corporation + * Copyright (c) 2015, Hisilicon Limited. All rights reserved. + * Copyright (c) 2015, Linaro Limited. All rights reserved. + * Author: Loc Ho + * + * SPDX-License-Identifier: BSD-2-Clause-Patent + */ +#ifndef _ETH_MAC_H_ +#define _ETH_MAC_H_ + +EFI_STATUS UpdateAcpiDsdtTable (VOID); + +#endif + --=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 (#60034): https://edk2.groups.io/g/devel/message/60034 Mute This Topic: https://groups.io/mt/74377143/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-