Re: [edk2] [PATCH edk2-platforms v3 12/18] Hisilicon/D06: Modify for IMP self-Adapte support
On Wed, Mar 20, 2019 at 04:08:23PM +0800, Ming Huang wrote:
> As new IMP(Cortex-M7) firmware support self-adapte, so do not
> need BIOS to implement some function, remove useless funtions
I will reword/correct the above to "unused functions". With that:
Reviewed-by: Leif Lindholm
> and report CPU0/CPU1 Nic NCL offset to IMP.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ming Huang
> ---
> Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c | 281
>
> 1 file changed, 54 insertions(+), 227 deletions(-)
>
> diff --git a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
> b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
> index aaf990216982..678c2107bdd3 100644
> --- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
> +++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
> @@ -21,44 +21,21 @@
> #include
>
> #define CPU2_SFP2_100G_CARD_OFFSET 0x25
> -#define CPU1_SFP1_LOCATE_OFFSET 0x16
> -#define CPU1_SFP0_LOCATE_OFFSET 0x12
> -#define CPU2_SFP1_LOCATE_OFFSET 0x21
> -#define CPU2_SFP0_LOCATE_OFFSET 0x19
> -#define CPU2_SFP2_10G_GE_CARD_OFFSET 0x25
>
> -#define SFP_10G_SPEED 10
> -#define SFP_25G_SPEED 25
> -#define SFP_100G_SPEED 100
> -#define SFP_GE_SPEED1
> -
> -#define SFP_GE_SPEED_VAL_VENDOR_FINISAR 0x0C
> -#define SFP_GE_SPEED_VAL0x0D
> -#define SFP_10G_SPEED_VAL 0x67
> -#define SFP_25G_SPEED_VAL 0xFF
> +#define SOCKET1_NET_PORT_100G 1
> +#define SOCKET0_NET_PORT_NUM 4
> +#define SOCKET1_NET_PORT_NUM 2
>
> #define CARD_PRESENT_100G (BIT7)
> -#define CARD_PRESENT_10G(BIT0)
> -#define SELECT_SFP_BY_INDEX(index) (1 << (index - 1))
> -#define SPF_SPEED_OFFSET12
> -
> -#define SFP_DEVICE_ADDRESS 0x50
> -#define CPU1_9545_I2C_ADDR 0x70
> -#define CPU2_9545_I2C_ADDR 0x71
> -
> -#define FIBER_PRESENT 0
> -#define CARD_PRESENT 1
> -#define I2C_PORT_SFP 4
> -#define CPU2_I2C_PORT_SFP 5
> -
> -#define SOCKET_0 0
> -#define SOCKET_1 1
> #define EEPROM_I2C_PORT 4
> #define EEPROM_PAGE_SIZE 0x40
> #define MAC_ADDR_LEN 6
> #define I2C_OFFSET_EEPROM_ETH0 (0xc00)
> #define I2C_SLAVEADDR_EEPROM (0x52)
>
> +#define SRAM_NIC_NCL1_OFFSET_ADDRESS 0xA0E87FE0
> +#define SRAM_NIC_NCL2_OFFSET_ADDRESS 0xA0E87FE4
> +
> #pragma pack(1)
> typedef struct {
>UINT16 Crc16;
> @@ -114,204 +91,6 @@ UINT16 CrcTable16[256] = {
>0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0,
> };
>
> -EFI_STATUS
> -GetSfpSpeed (
> - UINT16 Socket,
> - UINT16 SfpNum,
> - UINT8* FiberSpeed
> - )
> -{
> - EFI_STATUS Status;
> - I2C_DEVICE SpdDev;
> - UINT8 SfpSelect;
> - UINT8 SfpSpeed;
> - UINT32 RegAddr;
> - UINT16 I2cAddr;
> - UINT32 SfpPort;
> -
> - SfpSpeed = 0x0;
> - if (Socket == SOCKET_1) {
> -I2cAddr = CPU2_9545_I2C_ADDR;
> -SfpPort = CPU2_I2C_PORT_SFP;
> - } else {
> -I2cAddr = CPU1_9545_I2C_ADDR;
> -SfpPort = I2C_PORT_SFP;
> - }
> -
> - Status = I2CInit (Socket, SfpPort, Normal);
> - if (EFI_ERROR (Status)) {
> -DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Socket%d Call I2CInit failed!
> p1=0x%x.\n",
> -__FUNCTION__, __LINE__, Socket, Status));
> -return Status;
> - }
> -
> - SpdDev.Socket = Socket;
> - SpdDev.DeviceType = DEVICE_TYPE_SPD;
> - SpdDev.Port = SfpPort;
> - SpdDev.SlaveDeviceAddress = I2cAddr;
> - RegAddr = 0x0;
> - SfpSelect = SELECT_SFP_BY_INDEX (SfpNum);
> -
> - Status = I2CWrite (, RegAddr, 1, );
> - if (EFI_ERROR (Status)) {
> -DEBUG ((DEBUG_ERROR, "I2CWrite Error =%r.\n", Status));
> -return Status;
> - }
> -
> - SpdDev.Socket = Socket;
> - SpdDev.DeviceType = DEVICE_TYPE_SPD;
> - SpdDev.Port = SfpPort;
> - SpdDev.SlaveDeviceAddress = SFP_DEVICE_ADDRESS;
> -
> - RegAddr = SPF_SPEED_OFFSET;
> - Status = I2CRead (, RegAddr, 1, );
> - if (EFI_ERROR (Status)) {
> -DEBUG ((DEBUG_ERROR, "I2CRead Error =%r.\n", Status));
> -return Status;
> - }
> -
> - DEBUG ((DEBUG_INFO, "BR, Nominal, Nominal signalling rate, SfpSpeed:
> 0x%x\n",
> - SfpSpeed));
> -
> - if (SfpSpeed == SFP_10G_SPEED_VAL) {
> -*FiberSpeed = SFP_10G_SPEED;
> - } else if (SfpSpeed == SFP_25G_SPEED_VAL) {
> -*FiberSpeed = SFP_25G_SPEED;
> - } else if ((SfpSpeed == SFP_GE_SPEED_VAL) ||
> - (SfpSpeed == SFP_GE_SPEED_VAL_VENDOR_FINISAR)) {
> -*FiberSpeed = SFP_GE_SPEED;
> - }
> -
> - return EFI_SUCCESS;
> -}
> -
> -//Fiber1Type/Fiber2Type/Fiber3Type return: SFP_10G_SPEED, SFP_100G_SPEED,
> SFP_GE_SPEED
> -UINT32
> -GetCpu2FiberType (
> - UINT8* Fiber1Type,
> - UINT8* Fiber2Type,
> - UINT8* Fiber100Ge
> - )
> -{
> - EFI_STATUS Status;
> - UINT16 SfpNum1;
> - UINT8 SfpSpeed1;
> - UINT16 SfpNum2;
> - UINT8 SfpSpeed2;
> -
> - SfpNum1 = 0x1;
> -
[edk2] [PATCH edk2-platforms v3 12/18] Hisilicon/D06: Modify for IMP self-Adapte support
As new IMP(Cortex-M7) firmware support self-adapte, so do not
need BIOS to implement some function, remove useless funtions
and report CPU0/CPU1 Nic NCL offset to IMP.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ming Huang
---
Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c | 281
1 file changed, 54 insertions(+), 227 deletions(-)
diff --git a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
index aaf990216982..678c2107bdd3 100644
--- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
+++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
@@ -21,44 +21,21 @@
#include
#define CPU2_SFP2_100G_CARD_OFFSET 0x25
-#define CPU1_SFP1_LOCATE_OFFSET 0x16
-#define CPU1_SFP0_LOCATE_OFFSET 0x12
-#define CPU2_SFP1_LOCATE_OFFSET 0x21
-#define CPU2_SFP0_LOCATE_OFFSET 0x19
-#define CPU2_SFP2_10G_GE_CARD_OFFSET 0x25
-#define SFP_10G_SPEED 10
-#define SFP_25G_SPEED 25
-#define SFP_100G_SPEED 100
-#define SFP_GE_SPEED1
-
-#define SFP_GE_SPEED_VAL_VENDOR_FINISAR 0x0C
-#define SFP_GE_SPEED_VAL0x0D
-#define SFP_10G_SPEED_VAL 0x67
-#define SFP_25G_SPEED_VAL 0xFF
+#define SOCKET1_NET_PORT_100G 1
+#define SOCKET0_NET_PORT_NUM 4
+#define SOCKET1_NET_PORT_NUM 2
#define CARD_PRESENT_100G (BIT7)
-#define CARD_PRESENT_10G(BIT0)
-#define SELECT_SFP_BY_INDEX(index) (1 << (index - 1))
-#define SPF_SPEED_OFFSET12
-
-#define SFP_DEVICE_ADDRESS 0x50
-#define CPU1_9545_I2C_ADDR 0x70
-#define CPU2_9545_I2C_ADDR 0x71
-
-#define FIBER_PRESENT 0
-#define CARD_PRESENT 1
-#define I2C_PORT_SFP 4
-#define CPU2_I2C_PORT_SFP 5
-
-#define SOCKET_0 0
-#define SOCKET_1 1
#define EEPROM_I2C_PORT 4
#define EEPROM_PAGE_SIZE 0x40
#define MAC_ADDR_LEN 6
#define I2C_OFFSET_EEPROM_ETH0 (0xc00)
#define I2C_SLAVEADDR_EEPROM (0x52)
+#define SRAM_NIC_NCL1_OFFSET_ADDRESS 0xA0E87FE0
+#define SRAM_NIC_NCL2_OFFSET_ADDRESS 0xA0E87FE4
+
#pragma pack(1)
typedef struct {
UINT16 Crc16;
@@ -114,204 +91,6 @@ UINT16 CrcTable16[256] = {
0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0,
};
-EFI_STATUS
-GetSfpSpeed (
- UINT16 Socket,
- UINT16 SfpNum,
- UINT8* FiberSpeed
- )
-{
- EFI_STATUS Status;
- I2C_DEVICE SpdDev;
- UINT8 SfpSelect;
- UINT8 SfpSpeed;
- UINT32 RegAddr;
- UINT16 I2cAddr;
- UINT32 SfpPort;
-
- SfpSpeed = 0x0;
- if (Socket == SOCKET_1) {
-I2cAddr = CPU2_9545_I2C_ADDR;
-SfpPort = CPU2_I2C_PORT_SFP;
- } else {
-I2cAddr = CPU1_9545_I2C_ADDR;
-SfpPort = I2C_PORT_SFP;
- }
-
- Status = I2CInit (Socket, SfpPort, Normal);
- if (EFI_ERROR (Status)) {
-DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Socket%d Call I2CInit failed! p1=0x%x.\n",
-__FUNCTION__, __LINE__, Socket, Status));
-return Status;
- }
-
- SpdDev.Socket = Socket;
- SpdDev.DeviceType = DEVICE_TYPE_SPD;
- SpdDev.Port = SfpPort;
- SpdDev.SlaveDeviceAddress = I2cAddr;
- RegAddr = 0x0;
- SfpSelect = SELECT_SFP_BY_INDEX (SfpNum);
-
- Status = I2CWrite (, RegAddr, 1, );
- if (EFI_ERROR (Status)) {
-DEBUG ((DEBUG_ERROR, "I2CWrite Error =%r.\n", Status));
-return Status;
- }
-
- SpdDev.Socket = Socket;
- SpdDev.DeviceType = DEVICE_TYPE_SPD;
- SpdDev.Port = SfpPort;
- SpdDev.SlaveDeviceAddress = SFP_DEVICE_ADDRESS;
-
- RegAddr = SPF_SPEED_OFFSET;
- Status = I2CRead (, RegAddr, 1, );
- if (EFI_ERROR (Status)) {
-DEBUG ((DEBUG_ERROR, "I2CRead Error =%r.\n", Status));
-return Status;
- }
-
- DEBUG ((DEBUG_INFO, "BR, Nominal, Nominal signalling rate, SfpSpeed:
0x%x\n",
- SfpSpeed));
-
- if (SfpSpeed == SFP_10G_SPEED_VAL) {
-*FiberSpeed = SFP_10G_SPEED;
- } else if (SfpSpeed == SFP_25G_SPEED_VAL) {
-*FiberSpeed = SFP_25G_SPEED;
- } else if ((SfpSpeed == SFP_GE_SPEED_VAL) ||
- (SfpSpeed == SFP_GE_SPEED_VAL_VENDOR_FINISAR)) {
-*FiberSpeed = SFP_GE_SPEED;
- }
-
- return EFI_SUCCESS;
-}
-
-//Fiber1Type/Fiber2Type/Fiber3Type return: SFP_10G_SPEED, SFP_100G_SPEED,
SFP_GE_SPEED
-UINT32
-GetCpu2FiberType (
- UINT8* Fiber1Type,
- UINT8* Fiber2Type,
- UINT8* Fiber100Ge
- )
-{
- EFI_STATUS Status;
- UINT16 SfpNum1;
- UINT8 SfpSpeed1;
- UINT16 SfpNum2;
- UINT8 SfpSpeed2;
-
- SfpNum1 = 0x1;
- SfpSpeed1 = SFP_10G_SPEED;
- SfpNum2 = 0x2;
- SfpSpeed2 = SFP_10G_SPEED;
- *Fiber100Ge = 0x0;
- *Fiber1Type = SFP_10G_SPEED;
- *Fiber2Type = SFP_10G_SPEED;
-
- if ((ReadCpldReg (CPU2_SFP2_100G_CARD_OFFSET) & CARD_PRESENT_100G) != 0) {
-// 100 Ge card
-*Fiber1Type = SFP_10G_SPEED;
-*Fiber2Type = SFP_10G_SPEED;
-*Fiber100Ge = SFP_100G_SPEED;
-DEBUG ((DEBUG_ERROR,"Detect Fiber SFP_100G is Present, Set 100Ge\n"));
- } else if ((ReadCpldReg
