I agree with all of your comments and will modify the sources soon. On 2018/1/20 18:57, Ard Biesheuvel wrote: > On 18 January 2018 at 15:01, Ming Huang <heyi....@linaro.org> wrote: >> From: Jason Zhang <zhangjinso...@huawei.com> >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Jason Zhang <zhangjinso...@huawei.com> >> Signed-off-by: Ming Huang <huangmin...@huawei.com> >> Signed-off-by: Heyi Guo <heyi....@linaro.org> >> --- >> Platform/Hisilicon/D03/D03.dsc | 2 +- >> Platform/Hisilicon/D03/D03.fdf | 3 +- >> Platform/Hisilicon/D05/D05.dsc | 1 + >> Platform/Hisilicon/D05/D05.fdf | 2 +- >> Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.c | 89 >> ++++++++++++++++++++ >> Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.h | 49 +++++++++++ >> Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf | 61 ++++++++++++++ >> Silicon/Hisilicon/HisiPkg.dec | 2 + >> Silicon/Hisilicon/Include/Library/OemDevicePath.h | 54 ++++++++++++ >> Silicon/Hisilicon/Include/Protocol/PlatformSasProtocol.h | 11 +++ >> 10 files changed, 270 insertions(+), 4 deletions(-) >> >> diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc >> index 69bc7b4..370e17b 100644 >> --- a/Platform/Hisilicon/D03/D03.dsc >> +++ b/Platform/Hisilicon/D03/D03.dsc >> @@ -474,7 +474,7 @@ >> >> Platform/Hisilicon/D03/Drivers/ReportPciePlugDidVidToBmc/ReportPciePlugDidVidToBmc.inf >> Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf >> Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf >> - >> + Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf >> Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf >> >> >> diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf >> index ffddd2d..6e43228 100644 >> --- a/Platform/Hisilicon/D03/D03.fdf >> +++ b/Platform/Hisilicon/D03/D03.fdf >> @@ -271,8 +271,7 @@ READ_LOCK_STATUS = TRUE >> # VGA Driver >> # >> INF Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf >> - >> - INF Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.inf >> + INF Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf >> INF Platform/Hisilicon/D03/Drivers/Sas/SasDxeDriver.inf >> >> INF >> SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf >> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc >> index b99cda5..0d19909 100644 >> --- a/Platform/Hisilicon/D05/D05.dsc >> +++ b/Platform/Hisilicon/D05/D05.dsc >> @@ -627,6 +627,7 @@ >> >> Platform/Hisilicon/D05/Drivers/ReportPciePlugDidVidToBmc/ReportPciePlugDidVidToBmc.inf >> Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf >> Platform/Hisilicon/D05/Drivers/Sm750Dxe/UefiSmi.inf >> + Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf >> MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf >> Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf >> >> diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf >> index 9a61c52..9edc679 100644 >> --- a/Platform/Hisilicon/D05/D05.fdf >> +++ b/Platform/Hisilicon/D05/D05.fdf >> @@ -294,7 +294,7 @@ READ_LOCK_STATUS = TRUE >> # >> INF Platform/Hisilicon/D05/Drivers/Sm750Dxe/UefiSmi.inf >> INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf >> - INF Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf >> + INF Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf >> INF Platform/Hisilicon/D05/Drivers/Sas/SasDxeDriver.inf >> >> INF >> SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf >> diff --git a/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.c >> b/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.c >> new file mode 100644 >> index 0000000..d57905e >> --- /dev/null >> +++ b/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.c >> @@ -0,0 +1,89 @@ >> +/** @file >> +* >> +* Copyright (c) 2017, Hisilicon Limited. All rights reserved. >> +* Copyright (c) 2017, Linaro Limited. All rights reserved. >> +* >> +* This program and the accompanying materials >> +* are licensed and made available under the terms and conditions of the >> BSD License >> +* which accompanies this distribution. The full text of the license may >> be found at >> +* http://opensource.org/licenses/bsd-license.php >> +* >> +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, >> +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR >> IMPLIED. >> +* >> +**/ >> + >> + >> +#include "SasPlatform.h" >> +#include <Library/OemDevicePath.h> >> +#include <Library/DevicePathLib.h> >> + >> +#define SAS0BusAddr 0xc3000000 >> +#define SAS1BusAddr 0xa2000000 >> +#define SAS2BusAddr 0xa3000000 >> + >> +#define SAS0ResetAddr 0xc0000000 >> +#define SAS1ResetAddr 0xa0000000 >> +#define SAS2ResetAddr 0xa0000000 >> + > > STATIC > >> +HISI_PLATFORM_SAS_PROTOCOL mSasPlatformProtocol[] = { >> + { >> + 0, >> + FALSE, >> + SAS0BusAddr, >> + SAS0ResetAddr >> + }, >> + { >> + 1, >> + TRUE, >> + SAS1BusAddr, >> + SAS1ResetAddr >> + }, >> + { >> + 2, >> + FALSE, >> + SAS2BusAddr, >> + SAS2ResetAddr >> + } >> +}; >> +#define SAS_CONTROLLER_NUMBER sizeof (mSasPlatformProtocol) / sizeof >> (HISI_PLATFORM_SAS_PROTOCOL) >> + > > Use ARRAY_SIZE > >> +EFI_STATUS >> +EFIAPI >> +SasPlatformInitialize ( >> + IN EFI_HANDLE ImageHandle, >> + IN EFI_SYSTEM_TABLE *SystemTable >> + ) >> +{ >> + UINTN Loop; >> + SAS_PLATFORM_INSTANCE *PrivateData; >> + EFI_STATUS Status; >> + >> + for (Loop = 0; Loop < SAS_CONTROLLER_NUMBER; Loop++) { >> + if (mSasPlatformProtocol[Loop].Enable != TRUE) { >> + continue; >> + } >> + PrivateData = AllocateZeroPool (sizeof(SAS_PLATFORM_INSTANCE)); >> + if (PrivateData == NULL) { >> + return EFI_OUT_OF_RESOURCES; >> + } >> + >> + PrivateData->SasPlatformProtocol = mSasPlatformProtocol[Loop]; >> + >> + Status = gBS->InstallMultipleProtocolInterfaces ( >> + &PrivateData->Handle, >> + &gHisiPlatformSasProtocolGuid, >> + &PrivateData->SasPlatformProtocol, >> + NULL > > indentation > >> + ); >> + if (EFI_ERROR (Status)) { >> + FreePool (PrivateData); >> + DEBUG ((DEBUG_ERROR, "[%a]:[%dL] InstallProtocolInterface fail. >> %r\n", __FUNCTION__, __LINE__, Status)); >> + return Status; > > Don't return error from a loop like this: the driver will unload but > the protocols installed in prior iterations will still remain > >> + } >> + } >> + >> + DEBUG ((DEBUG_INFO, "sas platform init dirver Ok!!!\n")); > > driver not dirver > >> + return EFI_SUCCESS; >> +} >> + >> diff --git a/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.h >> b/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.h >> new file mode 100644 >> index 0000000..a3e99dd >> --- /dev/null >> +++ b/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.h >> @@ -0,0 +1,49 @@ >> +/** @file >> +* >> +* Copyright (c) 2017, Hisilicon Limited. All rights reserved. >> +* Copyright (c) 2017, Linaro Limited. All rights reserved. >> +* >> +* This program and the accompanying materials >> +* are licensed and made available under the terms and conditions of the >> BSD License >> +* which accompanies this distribution. The full text of the license may >> be found at >> +* http://opensource.org/licenses/bsd-license.php >> +* >> +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, >> +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR >> IMPLIED. >> +* >> +**/ >> + >> + >> + >> +#ifndef _SAS_PLATFORM_H_ >> +#define _SAS_PLATFORM_H_ >> + >> +#include <Uefi.h> >> +#include <PiDxe.h> >> +#include <Guid/EventGroup.h> >> +#include <Library/DebugLib.h> >> +#include <Library/BaseMemoryLib.h> >> +#include <Library/UefiDriverEntryPoint.h> >> +#include <Library/UefiBootServicesTableLib.h> >> +#include <Library/UefiLib.h> >> +#include <Library/BaseLib.h> >> +#include <Library/MemoryAllocationLib.h> >> +#include <Library/PcdLib.h> >> +#include <Library/IoLib.h> >> +#include <Library/ArmLib.h> >> +#include <Library/DxeServicesTableLib.h> >> + >> +#include <Library/ReportStatusCodeLib.h> >> +#include <Protocol/PlatformSasProtocol.h> >> + >> + >> + >> +typedef struct { >> + UINTN Signature; >> + EFI_HANDLE Handle; >> + HISI_PLATFORM_SAS_PROTOCOL SasPlatformProtocol; >> +} SAS_PLATFORM_INSTANCE; >> + >> + >> +#endif // _SAS_PLATFORM_H_ >> + > > Just move all of this in to the .c file > >> diff --git a/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf >> b/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf >> new file mode 100644 >> index 0000000..6237f50 >> --- /dev/null >> +++ b/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf >> @@ -0,0 +1,61 @@ >> +#/** @file >> +# >> +# Copyright (c) 2017, Hisilicon Limited. All rights reserved. >> +# Copyright (c) 2017, Linaro Limited. All rights reserved. >> +# >> +# This program and the accompanying materials >> +# are licensed and made available under the terms and conditions of the >> BSD License >> +# which accompanies this distribution. The full text of the license may >> be found at >> +# http://opensource.org/licenses/bsd-license.php >> +# >> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, >> +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR >> IMPLIED. >> +# >> +#**/ >> + >> +[Defines] >> + INF_VERSION = 0x00010019 >> + BASE_NAME = SasPlatform >> + FILE_GUID = 67B9CDE8-257D-44f9-9DE7-39DE866E3539 >> + MODULE_TYPE = DXE_DRIVER >> + VERSION_STRING = 1.0 >> + ENTRY_POINT = SasPlatformInitialize >> + >> +[Sources] >> + SasPlatform.h >> + SasPlatform.c >> + >> +[Packages] >> + ArmPkg/ArmPkg.dec > > Does your code use ArmPkg? > >> + MdeModulePkg/MdeModulePkg.dec >> + MdePkg/MdePkg.dec >> + Silicon/Hisilicon/HisiPkg.dec >> + >> +[FeaturePcd] >> + > > Remove empty sections > >> + >> +[LibraryClasses] >> + ArmLib >> + BaseLib >> + BaseMemoryLib >> + CacheMaintenanceLib >> + DebugLib >> + DxeServicesTableLib >> + IoLib >> + MemoryAllocationLib >> + PcdLib >> + PlatformSysCtrlLib >> + ReportStatusCodeLib >> + UefiBootServicesTableLib >> + UefiDriverEntryPoint >> + UefiLib >> + > > Does your code really use all of these? > >> +[Guids] >> + gEfiHisiSocControllerGuid >> + >> +[Protocols] >> + gHisiPlatformSasProtocolGuid >> + gEfiDevicePathProtocolGuid >> + >> +[Depex] >> + TRUE >> diff --git a/Silicon/Hisilicon/HisiPkg.dec b/Silicon/Hisilicon/HisiPkg.dec >> index 81ba3be..9fa94fd 100644 >> --- a/Silicon/Hisilicon/HisiPkg.dec >> +++ b/Silicon/Hisilicon/HisiPkg.dec >> @@ -37,12 +37,14 @@ >> gBmcInfoProtocolGuid = {0x43fa6ffd, 0x35e4, 0x479e, {0xab, 0xec, 0x5, >> 0x3, 0xf6, 0x48, 0x0, 0xf5}} >> gSataEnableFlagProtocolGuid = {0xc2b3c770, 0x8b4a, 0x4796, {0xb2, 0xcf, >> 0x1d, 0xee, 0x44, 0xd0, 0x32, 0xf3}} >> gPlatformSasProtocolGuid = {0x40e9829f, 0x3a2c, 0x479a, {0x9a, 0x93, >> 0x45, 0x7d, 0x13, 0x50, 0x96, 0x5d}} >> + gHisiPlatformSasProtocolGuid = {0x20e9829f, 0x3a2c, 0x479a, {0x9a, 0x93, >> 0x45, 0x7d, 0x13, 0x50, 0x96, 0x6d}} >> >> [Guids] >> gHisiTokenSpaceGuid = {0xc8bc553e, 0x12bf, 0x11e6, {0x97, 0x4f, 0x87, >> 0xf7, 0x7c, 0xfd, 0x52, 0x1d}} >> >> gHisiEfiMemoryMapGuid = {0xf8870015, 0x6994, 0x4b98, {0x95, 0xa2, 0xbd, >> 0x56, 0xda, 0x91, 0xc0, 0x7f}} >> gVersionInfoHobGuid = {0xe13a14c, 0x859c, 0x4f22, {0x82, 0xbd, 0x18, 0xe, >> 0xe1, 0x42, 0x12, 0xbf}} >> + gEfiHisiSocControllerGuid = {0xee369cc3, 0xa743, 0x5382, {0x75, 0x64, >> 0x53, 0xe4, 0x31, 0x19, 0x38, 0x35}} >> >> [LibraryClasses] >> PlatformSysCtrlLib|Include/Library/PlatformSysCtrlLib.h >> diff --git a/Silicon/Hisilicon/Include/Library/OemDevicePath.h >> b/Silicon/Hisilicon/Include/Library/OemDevicePath.h >> new file mode 100644 >> index 0000000..ec8cd02 >> --- /dev/null >> +++ b/Silicon/Hisilicon/Include/Library/OemDevicePath.h >> @@ -0,0 +1,54 @@ >> +/** @file >> +* >> +* Copyright (c) 2015 - 2017, Hisilicon Limited. All rights reserved. >> +* Copyright (c) 2015 - 2017, Linaro Limited. All rights reserved. >> +* >> +* This program and the accompanying materials >> +* are licensed and made available under the terms and conditions of the >> BSD License >> +* which accompanies this distribution. The full text of the license may >> be found at >> +* http://opensource.org/licenses/bsd-license.php >> +* >> +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, >> +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR >> IMPLIED. >> +* >> +**/ >> + >> +#ifndef _OEM_DEVICE_PATH_H_ >> +#define _OEM_DEVICE_PATH_H_ >> +#include <Protocol/DevicePath.h> >> + >> +typedef enum >> +{ >> + C_NIC = 1, >> + C_SATA = 2, >> + C_SAS = 3, >> + C_USB = 4, >> +} CONTROLLER_TYPE; >> + >> +typedef struct{ >> + VENDOR_DEVICE_PATH Vender; >> + UINT8 ControllerType; >> + UINT8 Socket; >> + UINT8 Port; >> +} EXT_VENDOR_DEVICE_PATH; >> + >> +typedef struct{ >> + UINT16 BootIndex; >> + UINT16 Port; >> +}SATADES; > > Space after } > >> + >> +typedef struct{ >> + UINT16 BootIndex; >> + UINT16 ParentPortNumber; >> + UINT16 InterfaceNumber; >> +}USBDES; >> + > > and here > >> +typedef struct{ >> + UINT16 BootIndex; >> + UINT16 Port; >> +}PXEDES; >> + > > and here > >> +extern EFI_GUID gEfiHisiSocControllerGuid; > > You don't need this > >> + >> +#endif >> + >> diff --git a/Silicon/Hisilicon/Include/Protocol/PlatformSasProtocol.h >> b/Silicon/Hisilicon/Include/Protocol/PlatformSasProtocol.h >> index 1e1892b..dbd215a 100644 >> --- a/Silicon/Hisilicon/Include/Protocol/PlatformSasProtocol.h >> +++ b/Silicon/Hisilicon/Include/Protocol/PlatformSasProtocol.h >> @@ -34,4 +34,15 @@ struct _PLATFORM_SAS_PROTOCOL { >> SAS_INIT Init; >> }; >> > > Please create a separate header file for the below > >> +typedef struct _HISI_PLATFORM_SAS_PROTOCOL HISI_PLATFORM_SAS_PROTOCOL; >> + >> +struct _HISI_PLATFORM_SAS_PROTOCOL { >> + UINT32 ControllerId; >> + BOOLEAN Enable; >> + UINT64 BaseAddr; >> + UINT64 ResetAddr; >> +}; >> + >> +extern EFI_GUID gHisiPlatformSasProtocolGuid; >> + >> #endif >> -- >> 1.9.1 >> >> _______________________________________________ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel > > . >
-- Best Regards, Ming _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
