net/txgbe: support OEM subsystem vendor ID

Add support for OEM subsystem vendor ID.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
This commit is contained in:
Jiawen Wu 2022-06-22 14:56:07 +08:00 committed by Ferruh Yigit
parent 94b3c1a725
commit 138d869e41
5 changed files with 59 additions and 0 deletions

View File

@ -177,6 +177,10 @@ New Features
* Added support for yt8531s PHY.
* **Updated Wangxun txgbe driver.**
* Added support for OEM subsystem vendor ID.
* **Added Elliptic Curve Diffie-Hellman (ECDH) algorithm in cryptodev.**
Added support for Elliptic Curve Diffie Hellman (ECDH) asymmetric

View File

@ -2608,6 +2608,45 @@ s32 txgbe_prot_autoc_write_raptor(struct txgbe_hw *hw, bool locked, u64 autoc)
return err;
}
/* cmd_addr is used for some special command:
* 1. to be sector address, when implemented erase sector command
* 2. to be flash address when implemented read, write flash address
*
* Return 0 on success, return 1 on failure.
*/
u32 txgbe_fmgr_cmd_op(struct txgbe_hw *hw, u32 cmd, u32 cmd_addr)
{
u32 cmd_val, i;
cmd_val = TXGBE_SPICMD_CMD(cmd) | TXGBE_SPICMD_CLK(3) | cmd_addr;
wr32(hw, TXGBE_SPICMD, cmd_val);
for (i = 0; i < TXGBE_SPI_TIMEOUT; i++) {
if (rd32(hw, TXGBE_SPISTAT) & TXGBE_SPISTAT_OPDONE)
break;
usec_delay(10);
}
if (i == TXGBE_SPI_TIMEOUT)
return 1;
return 0;
}
u32 txgbe_flash_read_dword(struct txgbe_hw *hw, u32 addr)
{
u32 status;
status = txgbe_fmgr_cmd_op(hw, 1, addr);
if (status == 0x1) {
DEBUGOUT("Read flash timeout.");
return status;
}
return rd32(hw, TXGBE_SPIDAT);
}
/**
* txgbe_init_ops_pf - Inits func ptrs and MAC type
* @hw: pointer to hardware structure

View File

@ -111,4 +111,6 @@ s32 txgbe_prot_autoc_read_raptor(struct txgbe_hw *hw, bool *locked, u64 *value);
s32 txgbe_prot_autoc_write_raptor(struct txgbe_hw *hw, bool locked, u64 value);
s32 txgbe_reinit_fdir_tables(struct txgbe_hw *hw);
bool txgbe_verify_lesm_fw_enabled_raptor(struct txgbe_hw *hw);
u32 txgbe_fmgr_cmd_op(struct txgbe_hw *hw, u32 cmd, u32 cmd_addr);
u32 txgbe_flash_read_dword(struct txgbe_hw *hw, u32 addr);
#endif /* _TXGBE_HW_H_ */

View File

@ -28,6 +28,7 @@
#define TXGBE_FDIR_INIT_DONE_POLL 10
#define TXGBE_FDIRCMD_CMD_POLL 10
#define TXGBE_VF_INIT_TIMEOUT 200 /* Number of retries to clear RSTI */
#define TXGBE_SPI_TIMEOUT 10000
#define TXGBE_ALIGN 128 /* as intel did */

View File

@ -594,6 +594,19 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
/* Vendor and Device ID need to be set before init of shared code */
hw->device_id = pci_dev->id.device_id;
hw->vendor_id = pci_dev->id.vendor_id;
if (pci_dev->id.subsystem_vendor_id == PCI_VENDOR_ID_WANGXUN) {
hw->subsystem_device_id = pci_dev->id.subsystem_device_id;
} else {
u32 ssid;
ssid = txgbe_flash_read_dword(hw, 0xFFFDC);
if (ssid == 0x1) {
PMD_INIT_LOG(ERR,
"Read of internal subsystem device id failed\n");
return -ENODEV;
}
hw->subsystem_device_id = (u16)ssid >> 8 | (u16)ssid << 8;
}
hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
hw->allow_unsupported_sfp = 1;