From: Jiawen Wu <jiawenwu@trustnetic.com>
To: dev@dpdk.org
Cc: Jiawen Wu <jiawenwu@trustnetic.com>
Subject: [PATCH 19/19] net/ngbe: disable LLDP by default
Date: Tue, 18 Jun 2024 15:11:50 +0800 [thread overview]
Message-ID: <20240618071150.21564-20-jiawenwu@trustnetic.com> (raw)
In-Reply-To: <20240618071150.21564-1-jiawenwu@trustnetic.com>
In the new firmware versions, LLDP is enabled by default to implement
new features in other drivers. But it is useless in DPDK. So disable
it in device initialization to prevent it from affecting hardware
default behavior.
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
drivers/net/ngbe/base/ngbe_eeprom.h | 4 ++
drivers/net/ngbe/base/ngbe_hw.c | 75 ++++++++++++++++++++++++----
drivers/net/ngbe/base/ngbe_hw.h | 4 +-
drivers/net/ngbe/base/ngbe_mng.c | 46 +++++++++++++++++
drivers/net/ngbe/base/ngbe_mng.h | 13 +++++
drivers/net/ngbe/base/ngbe_phy_mvl.c | 2 +-
drivers/net/ngbe/base/ngbe_regs.h | 2 +
drivers/net/ngbe/base/ngbe_type.h | 2 +
drivers/net/ngbe/ngbe_ethdev.c | 7 +--
9 files changed, 138 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ngbe/base/ngbe_eeprom.h b/drivers/net/ngbe/base/ngbe_eeprom.h
index 26ac686723..68c4296b50 100644
--- a/drivers/net/ngbe/base/ngbe_eeprom.h
+++ b/drivers/net/ngbe/base/ngbe_eeprom.h
@@ -11,6 +11,10 @@
#define NGBE_CALSUM_CAP_STATUS 0x10224
#define NGBE_EEPROM_VERSION_STORE_REG 0x1022C
+#define NGBE_FW_SUPPORT_LLDP 0x19
+#define NGBE_FW_GET_LLDP 0x1B
+#define NGBE_FW_MASK 0xFF
+
s32 ngbe_init_eeprom_params(struct ngbe_hw *hw);
s32 ngbe_validate_eeprom_checksum_em(struct ngbe_hw *hw, u16 *checksum_val);
s32 ngbe_get_eeprom_semaphore(struct ngbe_hw *hw);
diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c
index 0f1a5b9f8d..e8dda8d460 100644
--- a/drivers/net/ngbe/base/ngbe_hw.c
+++ b/drivers/net/ngbe/base/ngbe_hw.c
@@ -10,6 +10,56 @@
#include "ngbe_mng.h"
#include "ngbe_hw.h"
+static s32 ngbe_is_lldp(struct ngbe_hw *hw)
+{
+ u32 tmp = 0, lldp_flash_data = 0, i;
+ s32 err = 0;
+
+ if ((hw->eeprom_id & NGBE_FW_MASK) >= NGBE_FW_GET_LLDP) {
+ err = ngbe_hic_get_lldp(hw);
+ if (err == 0)
+ return 0;
+ }
+
+ for (i = 0; i < 1024; i++) {
+ err = ngbe_flash_read_dword(hw, NGBE_LLDP_REG + i * 4, &tmp);
+ if (err)
+ return err;
+
+ if (tmp == BIT_MASK32)
+ break;
+ lldp_flash_data = tmp;
+ }
+
+ if (lldp_flash_data & MS(hw->bus.lan_id, 1))
+ hw->lldp_enabled = true;
+ else
+ hw->lldp_enabled = false;
+
+ return 0;
+}
+
+static void ngbe_disable_lldp(struct ngbe_hw *hw)
+{
+ s32 err = 0;
+
+ if ((hw->eeprom_id & NGBE_FW_MASK) < NGBE_FW_SUPPORT_LLDP)
+ return;
+
+ err = ngbe_is_lldp(hw);
+ if (err) {
+ PMD_INIT_LOG(INFO, "Can not get LLDP status.");
+ } else if (hw->lldp_enabled) {
+ err = ngbe_hic_set_lldp(hw, false);
+ if (!err)
+ PMD_INIT_LOG(INFO,
+ "LLDP detected on port %d, turn it off by default.",
+ hw->port_id);
+ else
+ PMD_INIT_LOG(INFO, "Can not set LLDP status.");
+ }
+}
+
/**
* ngbe_start_hw - Prepare hardware for Tx/Rx
* @hw: pointer to hardware structure
@@ -55,6 +105,7 @@ s32 ngbe_init_hw(struct ngbe_hw *hw)
ngbe_read_efuse(hw);
ngbe_save_eeprom_version(hw);
+ ngbe_disable_lldp(hw);
/* Reset the hardware */
status = hw->mac.reset_hw(hw);
@@ -1816,9 +1867,9 @@ s32 ngbe_enable_rx_dma(struct ngbe_hw *hw, u32 regval)
* 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.
+ * Return 0 on success, return NGBE_ERR_TIMEOUT on failure.
*/
-u32 ngbe_fmgr_cmd_op(struct ngbe_hw *hw, u32 cmd, u32 cmd_addr)
+s32 ngbe_fmgr_cmd_op(struct ngbe_hw *hw, u32 cmd, u32 cmd_addr)
{
u32 cmd_val, i;
@@ -1832,33 +1883,35 @@ u32 ngbe_fmgr_cmd_op(struct ngbe_hw *hw, u32 cmd, u32 cmd_addr)
usec_delay(10);
}
if (i == NGBE_SPI_TIMEOUT)
- return 1;
+ return NGBE_ERR_TIMEOUT;
return 0;
}
-u32 ngbe_flash_read_dword(struct ngbe_hw *hw, u32 addr)
+s32 ngbe_flash_read_dword(struct ngbe_hw *hw, u32 addr, u32 *data)
{
- u32 status;
+ s32 status;
status = ngbe_fmgr_cmd_op(hw, 1, addr);
- if (status == 0x1) {
+ if (status < 0) {
DEBUGOUT("Read flash timeout.");
return status;
}
- return rd32(hw, NGBE_SPIDAT);
+ *data = rd32(hw, NGBE_SPIDAT);
+
+ return 0;
}
void ngbe_read_efuse(struct ngbe_hw *hw)
{
- u32 efuse[2];
+ u32 efuse[2] = {0, 0};
u8 lan_id = hw->bus.lan_id;
- efuse[0] = ngbe_flash_read_dword(hw, 0xfe010 + lan_id * 8);
- efuse[1] = ngbe_flash_read_dword(hw, 0xfe010 + lan_id * 8 + 4);
+ ngbe_flash_read_dword(hw, 0xfe010 + lan_id * 8, &efuse[0]);
+ ngbe_flash_read_dword(hw, 0xfe010 + lan_id * 8 + 4, &efuse[1]);
- DEBUGOUT("port %d efuse[0] = %08x, efuse[1] = %08x\n",
+ DEBUGOUT("port %d efuse[0] = %08x, efuse[1] = %08x",
lan_id, efuse[0], efuse[1]);
hw->gphy_efuse[0] = efuse[0];
diff --git a/drivers/net/ngbe/base/ngbe_hw.h b/drivers/net/ngbe/base/ngbe_hw.h
index b9805af499..26a7ff4e83 100644
--- a/drivers/net/ngbe/base/ngbe_hw.h
+++ b/drivers/net/ngbe/base/ngbe_hw.h
@@ -84,8 +84,8 @@ s32 ngbe_enable_rx_dma(struct ngbe_hw *hw, u32 regval);
void ngbe_map_device_id(struct ngbe_hw *hw);
void ngbe_read_efuse(struct ngbe_hw *hw);
-u32 ngbe_fmgr_cmd_op(struct ngbe_hw *hw, u32 cmd, u32 cmd_addr);
-u32 ngbe_flash_read_dword(struct ngbe_hw *hw, u32 addr);
+s32 ngbe_fmgr_cmd_op(struct ngbe_hw *hw, u32 cmd, u32 cmd_addr);
+s32 ngbe_flash_read_dword(struct ngbe_hw *hw, u32 addr, u32 *data);
void ngbe_set_ncsi_status(struct ngbe_hw *hw);
#endif /* _NGBE_HW_H_ */
diff --git a/drivers/net/ngbe/base/ngbe_mng.c b/drivers/net/ngbe/base/ngbe_mng.c
index ad9372bec2..df6f60c443 100644
--- a/drivers/net/ngbe/base/ngbe_mng.c
+++ b/drivers/net/ngbe/base/ngbe_mng.c
@@ -379,3 +379,49 @@ s32 ngbe_phy_led_oem_chk(struct ngbe_hw *hw, u32 *data)
return err;
}
+
+s32 ngbe_hic_get_lldp(struct ngbe_hw *hw)
+{
+ struct ngbe_hic_write_lldp buffer;
+ s32 err = 0;
+
+ buffer.hdr.cmd = FW_LLDP_GET_CMD;
+ buffer.hdr.buf_len = 0x1;
+ buffer.hdr.cmd_or_resp.cmd_resv = FW_CEM_CMD_RESERVED;
+ buffer.hdr.checksum = FW_DEFAULT_CHECKSUM;
+ buffer.func = hw->bus.lan_id;
+
+ err = ngbe_host_interface_command(hw, (u32 *)&buffer, sizeof(buffer),
+ NGBE_HI_COMMAND_TIMEOUT, true);
+ if (err)
+ return err;
+
+ if (buffer.hdr.cmd_or_resp.ret_status == FW_CEM_RESP_STATUS_SUCCESS) {
+ /* this field returns the status of LLDP */
+ if (buffer.func)
+ hw->lldp_enabled = true;
+ else
+ hw->lldp_enabled = false;
+ } else {
+ err = NGBE_ERR_HOST_INTERFACE_COMMAND;
+ }
+
+ return err;
+}
+
+s32 ngbe_hic_set_lldp(struct ngbe_hw *hw, bool on)
+{
+ struct ngbe_hic_write_lldp buffer;
+
+ if (on)
+ buffer.hdr.cmd = FW_LLDP_SET_CMD_ON;
+ else
+ buffer.hdr.cmd = FW_LLDP_SET_CMD_OFF;
+ buffer.hdr.buf_len = 0x1;
+ buffer.hdr.cmd_or_resp.cmd_resv = FW_CEM_CMD_RESERVED;
+ buffer.hdr.checksum = FW_DEFAULT_CHECKSUM;
+ buffer.func = hw->bus.lan_id;
+
+ return ngbe_host_interface_command(hw, (u32 *)&buffer, sizeof(buffer),
+ NGBE_HI_COMMAND_TIMEOUT, false);
+}
diff --git a/drivers/net/ngbe/base/ngbe_mng.h b/drivers/net/ngbe/base/ngbe_mng.h
index 7dee6053f9..081ca5977a 100644
--- a/drivers/net/ngbe/base/ngbe_mng.h
+++ b/drivers/net/ngbe/base/ngbe_mng.h
@@ -28,6 +28,10 @@
#define FW_EEPROM_CHECK_STATUS 0xE9
#define FW_PHY_LED_CONF 0xF1
#define FW_READ_SHADOW_RAM_GPIO 0xB4
+#define FW_LLDP_GET_CMD 0xF5
+#define FW_LLDP_SET_CMD_OFF 0xF3
+#define FW_LLDP_SET_CMD_ON 0xF2
+#define FW_CEM_CMD_RESERVED 0X0
#define FW_CHECKSUM_CAP_ST_PASS 0x80658383
#define FW_CHECKSUM_CAP_ST_FAIL 0x70657376
@@ -97,6 +101,13 @@ struct ngbe_hic_write_pcie {
u32 data;
};
+struct ngbe_hic_write_lldp {
+ struct ngbe_hic_hdr hdr;
+ u8 func;
+ u8 pad2;
+ u16 pad3;
+};
+
s32 ngbe_hic_sr_read(struct ngbe_hw *hw, u32 addr, u8 *buf, int len);
s32 ngbe_hic_sr_write(struct ngbe_hw *hw, u32 addr, u8 *buf, int len);
s32 ngbe_hic_pcie_read(struct ngbe_hw *hw, u16 addr, u32 *buf, int len);
@@ -104,5 +115,7 @@ s32 ngbe_hic_pcie_write(struct ngbe_hw *hw, u16 addr, u32 *buf, int len);
s32 ngbe_hic_check_cap(struct ngbe_hw *hw);
s32 ngbe_phy_led_oem_chk(struct ngbe_hw *hw, u32 *data);
+s32 ngbe_hic_get_lldp(struct ngbe_hw *hw);
+s32 ngbe_hic_set_lldp(struct ngbe_hw *hw, bool on);
#endif /* _NGBE_MNG_H_ */
diff --git a/drivers/net/ngbe/base/ngbe_phy_mvl.c b/drivers/net/ngbe/base/ngbe_phy_mvl.c
index 8746a72eb3..36128265fd 100644
--- a/drivers/net/ngbe/base/ngbe_phy_mvl.c
+++ b/drivers/net/ngbe/base/ngbe_phy_mvl.c
@@ -53,7 +53,7 @@ s32 ngbe_check_phy_mode_mvl(struct ngbe_hw *hw)
u8 value = 0;
u32 phy_mode = 0;
- phy_mode = ngbe_flash_read_dword(hw, 0xFF010);
+ ngbe_flash_read_dword(hw, 0xFF010, &phy_mode);
value = (u8)(phy_mode >> (hw->bus.lan_id * 8));
if (MVL_GEN_CTL_MODE(value) == MVL_GEN_CTL_MODE_COPPER) {
diff --git a/drivers/net/ngbe/base/ngbe_regs.h b/drivers/net/ngbe/base/ngbe_regs.h
index c0e79a2ba7..8a6776b0e6 100644
--- a/drivers/net/ngbe/base/ngbe_regs.h
+++ b/drivers/net/ngbe/base/ngbe_regs.h
@@ -1257,6 +1257,8 @@ enum ngbe_5tuple_protocol {
#define NGBE_MDIOMODE_PRT1CL22 MS(1, 0x1)
#define NGBE_MDIOMODE_PRT0CL22 MS(0, 0x1)
+#define NGBE_LLDP_REG 0x0F1000
+
#define NVM_OROM_OFFSET 0x17
#define NVM_OROM_BLK_LOW 0x83
#define NVM_OROM_BLK_HI 0x84
diff --git a/drivers/net/ngbe/base/ngbe_type.h b/drivers/net/ngbe/base/ngbe_type.h
index 1b74b7a61f..a987bbe25b 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -455,10 +455,12 @@ struct ngbe_hw {
u16 sub_device_id;
u16 sub_system_id;
u32 eeprom_id;
+ u8 port_id;
u8 revision_id;
bool adapter_stopped;
bool wol_enabled;
bool ncsi_enabled;
+ bool lldp_enabled;
uint64_t isb_dma;
void IOMEM *isb_mem;
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index b9618cc074..23a452cacd 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -371,15 +371,16 @@ eth_ngbe_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->back = pci_dev;
+ hw->port_id = eth_dev->data->port_id;
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->sub_system_id = pci_dev->id.subsystem_device_id;
} else {
- u32 ssid;
+ u32 ssid = 0;
- ssid = ngbe_flash_read_dword(hw, 0xFFFDC);
- if (ssid == 0x1) {
+ err = ngbe_flash_read_dword(hw, 0xFFFDC, &ssid);
+ if (err) {
PMD_INIT_LOG(ERR,
"Read of internal subsystem device id failed\n");
return -ENODEV;
--
2.27.0
next prev parent reply other threads:[~2024-06-18 7:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-18 7:11 [PATCH 00/19] Wangxun fixes and supports Jiawen Wu
2024-06-18 7:11 ` [PATCH 01/19] net/txgbe: fix to parse tunnel packets Jiawen Wu
2024-06-18 7:11 ` [PATCH 02/19] net/txgbe: fix flow filters in VT mode Jiawen Wu
2024-06-18 7:11 ` [PATCH 03/19] net/txgbe: fix Tx hang on queue disable Jiawen Wu
2024-06-18 7:11 ` [PATCH 04/19] net/txgbe: restrict the configuration of VLAN strip offload Jiawen Wu
2024-06-18 7:11 ` [PATCH 05/19] net/txgbe: reconfigure more MAC Rx registers Jiawen Wu
2024-06-18 7:11 ` [PATCH 06/19] net/txgbe: fix VF promiscuous and allmulticast Jiawen Wu
2024-06-18 7:11 ` [PATCH 07/19] net/ngbe: special config for YT8531SH-CA PHY Jiawen Wu
2024-06-18 7:11 ` [PATCH 08/19] net/ngbe: keep PHY power down while device probing Jiawen Wu
2024-06-18 7:11 ` [PATCH 09/19] net/ngbe: add WOL and NCSI capability Jiawen Wu
2024-06-18 7:11 ` [PATCH 10/19] net/txgbe: fix hotplug remove Jiawen Wu
2024-06-18 7:11 ` [PATCH 11/19] net/ngbe: " Jiawen Wu
2024-06-18 7:11 ` [PATCH 12/19] net/txgbe: correct valid MTU range Jiawen Wu
2024-06-18 7:11 ` [PATCH 13/19] net/ngbe: " Jiawen Wu
2024-06-18 7:11 ` [PATCH 14/19] net/txgbe: fix memory leak Jiawen Wu
2024-06-18 7:11 ` [PATCH 15/19] net/ngbe: " Jiawen Wu
2024-06-18 7:11 ` [PATCH 16/19] net/txgbe: fix Rx interrupt Jiawen Wu
2024-06-18 7:11 ` [PATCH 17/19] net/ngbe: support " Jiawen Wu
2024-06-18 7:11 ` [PATCH 18/19] net/txgbe: disable LLDP by default Jiawen Wu
2024-06-18 7:11 ` Jiawen Wu [this message]
2024-06-25 1:51 ` [PATCH 00/19] Wangxun fixes and supports Jiawen Wu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240618071150.21564-20-jiawenwu@trustnetic.com \
--to=jiawenwu@trustnetic.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).