From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::442; helo=mail-wr1-x442.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 85B7E211E2EE9 for ; Thu, 21 Mar 2019 11:02:42 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id j9so7666916wrn.6 for ; Thu, 21 Mar 2019 11:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=GniZKp1OU9lY5/aegR1jg9jRoqfoJdXmyNzmG9juQG4=; b=kqvYgBJbefmiHleynNtYTAggVke7Zg0mGC6mA11vejsNwe8VB1dycQaPjLBLUDZA7+ I7RaHt1n9j50KfYICUwDScB/HDrWp3Uj6nLYR2wa1ZsLn4McN8MSjKzJyQDtUxFPDMVh s0LDLMhx76D2JFRlPNRVNg2QTKEYkR07P7oVb6iaz299mgEfQ/v9exLwIRJ18+vjLHMx QDq95Q+/dQu68/egcsOy2E1BvgK8z5dUpu37lovyUyBdAY6FDxHjRHXQzps3/DVob5By thUdCtiCAJaJoSRjt0Cqphv0L9rrsdqR2Me7UTeg+wJFT9TqfLYmtqPmlq699YxmTUCb +ysQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=GniZKp1OU9lY5/aegR1jg9jRoqfoJdXmyNzmG9juQG4=; b=HyyD7SVy+zC9IUVHDRWm16Rd8l1Y8IGyOQdXeHVVg0uDWUaB7I0mBV7kn6D1m5CofL 1/qbyd6bJet2W6UNAQEFzGP2Fx3lmNSebhPU887gLwzGtNxovultHe2wdM8+zYOMLLuC SxbhuKWIAqfrK+glIlU+i8CvChuIONm5yVyeUDe/WrKVCHsH0Mm5+441swUVQW7b14OG S8RCUNetEM84PKTjpzmjoytrXD8uPWWmuqiAMwPp5JB6H+B2cAgkSovMkQBzYYkAQK7d qwYdBStFvIdGkE2ga3XwjTMzWliusb3e4yqo9caeHWjtUA1XGdNqehBvj4PDPKHfIrzR lsAw== X-Gm-Message-State: APjAAAVNphVCdrud86t3WDZokVeAc5nznLtmZFui2AoE9Sw56gqxrANp qajA/FmGxZ50So1m3xGWUkpqYA== X-Google-Smtp-Source: APXvYqxfNgN+yCLuTRHy8Y7rVIi+1hB+O2w3W8V+aa/xHbo3YXMGMjw9yr1vhkLTsMu9oLm1njJ5fA== X-Received: by 2002:a5d:4e82:: with SMTP id e2mr3657577wru.164.1553191360967; Thu, 21 Mar 2019 11:02:40 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id h17sm3957135wrq.93.2019.03.21.11.02.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2019 11:02:39 -0700 (PDT) Date: Thu, 21 Mar 2019 18:02:38 +0000 From: Leif Lindholm To: Ming Huang Cc: linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org, ard.biesheuvel@linaro.org, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com, huangming23@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, john.garry@huawei.com, zhangfeng56@huawei.com, xiaojun2@hisilicon.com Message-ID: <20190321180237.ygkdmlzfux4rjeb7@bivouac.eciton.net> References: <20190320080829.52003-1-ming.huang@linaro.org> <20190320080829.52003-13-ming.huang@linaro.org> MIME-Version: 1.0 In-Reply-To: <20190320080829.52003-13-ming.huang@linaro.org> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH edk2-platforms v3 12/18] Hisilicon/D06: Modify for IMP self-Adapte support X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Mar 2019 18:02:42 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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_SPEED 1 > - > -#define SFP_GE_SPEED_VAL_VENDOR_FINISAR 0x0C > -#define SFP_GE_SPEED_VAL 0x0D > -#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_OFFSET 12 > - > -#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 (&SpdDev, RegAddr, 1, &SfpSelect); > - 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 (&SpdDev, RegAddr, 1, &SfpSpeed); > - 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 (CPU2_SFP2_10G_GE_CARD_OFFSET) & CARD_PRESENT_10G) != 0) { > - *Fiber100Ge = 0x0; > - *Fiber1Type = SFP_10G_SPEED; > - *Fiber2Type = SFP_10G_SPEED; > - if (ReadCpldReg (CPU2_SFP0_LOCATE_OFFSET) == FIBER_PRESENT) { > - // Fiber detected in CPU2 slot0, read speed via i2c > - Status = GetSfpSpeed (SOCKET_1, SfpNum1, &SfpSpeed1); > - if (EFI_ERROR (Status)) { > - DEBUG((DEBUG_ERROR, > - "Get Socket1 Sfp%d Speed Error: %r.\n", > - SfpNum1, > - Status)); > - return Status; > - } > - if (SfpSpeed1 == SFP_25G_SPEED) { > - // P1 don't support 25G, so set speed to 10G > - *Fiber1Type = SFP_10G_SPEED; > - } else { > - *Fiber1Type = SfpSpeed1; > - } > - } else { > - // No fiber, set speed to 10G > - *Fiber1Type = SFP_10G_SPEED; > - } > - > - if (ReadCpldReg (CPU2_SFP1_LOCATE_OFFSET) == FIBER_PRESENT) { > - // Fiber detected in CPU2 slot1, read speed via i2c > - Status = GetSfpSpeed (SOCKET_1, SfpNum2, &SfpSpeed2); > - if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "Get Sfp%d Speed Error: %r.\n", SfpNum2, Status)); > - return Status; > - } > - if (SfpSpeed2 == SFP_25G_SPEED) { > - *Fiber2Type = SFP_10G_SPEED; > - } else { > - *Fiber2Type = SfpSpeed2; > - } > - } else { > - // No fiber, set speed to 10G > - *Fiber2Type = SFP_10G_SPEED; > - } > - } else { > - // 100Ge/10Ge/Ge Fiber is not found. > - *Fiber1Type = SFP_10G_SPEED; > - *Fiber2Type = SFP_10G_SPEED; > - *Fiber100Ge = 0x0; > - } > - > - return EFI_SUCCESS; > -} > - > -//Fiber1Type/Fiber2Type return: SFP_10G_SPEED, SFP_25G_SPEED, SFP_GE_SPEED > -UINT32 > -GetCpu1FiberType ( > - UINT8* Fiber1Type, > - UINT8* Fiber2Type > - ) > -{ > - EFI_STATUS Status; > - UINT16 SfpNum1; > - UINT8 SfpSpeed1; > - UINT16 SfpNum2; > - UINT8 SfpSpeed2; > - > - SfpNum1 = 0x1; > - SfpSpeed1 = SFP_10G_SPEED; > - SfpNum2 = 0x2; > - SfpSpeed2 = SFP_10G_SPEED; > - *Fiber1Type = SFP_10G_SPEED; > - *Fiber2Type = SFP_10G_SPEED; > - // Fiber detected in CPU1 slot0, read speed via i2c > - if (ReadCpldReg (CPU1_SFP0_LOCATE_OFFSET) == FIBER_PRESENT) { > - Status = GetSfpSpeed (SOCKET_0, SfpNum1, &SfpSpeed1); > - if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "Get Socket0 Sfp%d Speed Error: %r.\n", > - SfpNum1, Status)); > - return Status; > - } > - *Fiber1Type = SfpSpeed1; > - } else { > - *Fiber1Type = SFP_10G_SPEED; > - } > - > - // Fiber detected in CPU1 slot1, read speed via i2c > - if (ReadCpldReg (CPU1_SFP1_LOCATE_OFFSET) == FIBER_PRESENT) { > - Status = GetSfpSpeed (SOCKET_0, SfpNum2, &SfpSpeed2); > - if (EFI_ERROR (Status)) { > - *Fiber2Type = SFP_10G_SPEED; > - DEBUG ((DEBUG_ERROR, "Get Sfp%d Speed Error: %r.\n", SfpNum2, Status)); > - return Status; > - } > - *Fiber2Type = SfpSpeed2; > - } else { > - *Fiber2Type = SFP_10G_SPEED; > - } > - > - return EFI_SUCCESS; > -} > - > UINT16 MakeCrcCheckSum ( > UINT8 *Buffer, > UINT32 Length > @@ -567,3 +346,51 @@ OemIsInitEth ( > { > return TRUE; > } > + > +EFI_STATUS > +ConfigCDR ( > + UINT32 Socket > + ) > +{ > + return EFI_SUCCESS; > +} > + > +UINT32 > +OemGetNclConfOffset ( > + UINT32 Socket > + ) > +{ > + UINT32 ConfigurationOffset; > + > + if (Socket == 0) { > + // For 1st socket, the NCL configuration offset is 0 > + ConfigurationOffset = 0; > + MmioWrite32 (SRAM_NIC_NCL1_OFFSET_ADDRESS, ConfigurationOffset); > + return ConfigurationOffset; > + } > + > + // For 2nd Socket > + if ((ReadCpldReg (CPU2_SFP2_100G_CARD_OFFSET) & CARD_PRESENT_100G) != 0) { > + ConfigurationOffset = SIZE_128KB; > + } else { > + ConfigurationOffset = SIZE_64KB; > + } > + MmioWrite32 (SRAM_NIC_NCL2_OFFSET_ADDRESS, ConfigurationOffset); > + return ConfigurationOffset; > +} > + > +UINT32 > +OemGetNetPortNum ( > + UINT32 Socket > + ) > +{ > + if (Socket == 0){ > + return SOCKET0_NET_PORT_NUM; > + } > + > + if ((ReadCpldReg (CPU2_SFP2_100G_CARD_OFFSET) & CARD_PRESENT_100G) != 0) { > + return SOCKET1_NET_PORT_100G; > + } else { > + return SOCKET1_NET_PORT_NUM; > + } > +} > -- > 2.9.5 >