mirror of https://gitee.com/openkylin/linux.git
Merge branch 'bnxt_en-next'
Michael Chan says: ==================== bnxt_en: Updates for net-next. Updates to support autoneg for all supported speeds, add PF port statistics, and Advanced Error Reporting. v2: Fixed patch 3 to not use parentheses on function return. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
02daec7c22
|
|
@ -2362,6 +2362,14 @@ static void bnxt_free_stats(struct bnxt *bp)
|
|||
u32 size, i;
|
||||
struct pci_dev *pdev = bp->pdev;
|
||||
|
||||
if (bp->hw_rx_port_stats) {
|
||||
dma_free_coherent(&pdev->dev, bp->hw_port_stats_size,
|
||||
bp->hw_rx_port_stats,
|
||||
bp->hw_rx_port_stats_map);
|
||||
bp->hw_rx_port_stats = NULL;
|
||||
bp->flags &= ~BNXT_FLAG_PORT_STATS;
|
||||
}
|
||||
|
||||
if (!bp->bnapi)
|
||||
return;
|
||||
|
||||
|
|
@ -2398,6 +2406,24 @@ static int bnxt_alloc_stats(struct bnxt *bp)
|
|||
|
||||
cpr->hw_stats_ctx_id = INVALID_STATS_CTX_ID;
|
||||
}
|
||||
|
||||
if (BNXT_PF(bp)) {
|
||||
bp->hw_port_stats_size = sizeof(struct rx_port_stats) +
|
||||
sizeof(struct tx_port_stats) + 1024;
|
||||
|
||||
bp->hw_rx_port_stats =
|
||||
dma_alloc_coherent(&pdev->dev, bp->hw_port_stats_size,
|
||||
&bp->hw_rx_port_stats_map,
|
||||
GFP_KERNEL);
|
||||
if (!bp->hw_rx_port_stats)
|
||||
return -ENOMEM;
|
||||
|
||||
bp->hw_tx_port_stats = (void *)(bp->hw_rx_port_stats + 1) +
|
||||
512;
|
||||
bp->hw_tx_port_stats_map = bp->hw_rx_port_stats_map +
|
||||
sizeof(struct rx_port_stats) + 512;
|
||||
bp->flags |= BNXT_FLAG_PORT_STATS;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -3834,6 +3860,23 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int bnxt_hwrm_port_qstats(struct bnxt *bp)
|
||||
{
|
||||
int rc;
|
||||
struct bnxt_pf_info *pf = &bp->pf;
|
||||
struct hwrm_port_qstats_input req = {0};
|
||||
|
||||
if (!(bp->flags & BNXT_FLAG_PORT_STATS))
|
||||
return 0;
|
||||
|
||||
bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_PORT_QSTATS, -1, -1);
|
||||
req.port_id = cpu_to_le16(pf->port_id);
|
||||
req.tx_stat_host_addr = cpu_to_le64(bp->hw_tx_port_stats_map);
|
||||
req.rx_stat_host_addr = cpu_to_le64(bp->hw_rx_port_stats_map);
|
||||
rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void bnxt_hwrm_free_tunnel_ports(struct bnxt *bp)
|
||||
{
|
||||
if (bp->vxlan_port_cnt) {
|
||||
|
|
@ -4468,6 +4511,7 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)
|
|||
link_info->pause = resp->pause;
|
||||
link_info->auto_mode = resp->auto_mode;
|
||||
link_info->auto_pause_setting = resp->auto_pause;
|
||||
link_info->lp_pause = resp->link_partner_adv_pause;
|
||||
link_info->force_pause_setting = resp->force_pause;
|
||||
link_info->duplex_setting = resp->duplex;
|
||||
if (link_info->phy_link_status == BNXT_LINK_LINK)
|
||||
|
|
@ -4478,6 +4522,8 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)
|
|||
link_info->auto_link_speed = le16_to_cpu(resp->auto_link_speed);
|
||||
link_info->support_speeds = le16_to_cpu(resp->support_speeds);
|
||||
link_info->auto_link_speeds = le16_to_cpu(resp->auto_link_speed_mask);
|
||||
link_info->lp_auto_link_speeds =
|
||||
le16_to_cpu(resp->link_partner_adv_speeds);
|
||||
link_info->preemphasis = le32_to_cpu(resp->preemphasis);
|
||||
link_info->phy_ver[0] = resp->phy_maj;
|
||||
link_info->phy_ver[1] = resp->phy_min;
|
||||
|
|
@ -4889,6 +4935,22 @@ bnxt_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
|
|||
stats->tx_dropped += le64_to_cpu(hw_stats->tx_drop_pkts);
|
||||
}
|
||||
|
||||
if (bp->flags & BNXT_FLAG_PORT_STATS) {
|
||||
struct rx_port_stats *rx = bp->hw_rx_port_stats;
|
||||
struct tx_port_stats *tx = bp->hw_tx_port_stats;
|
||||
|
||||
stats->rx_crc_errors = le64_to_cpu(rx->rx_fcs_err_frames);
|
||||
stats->rx_frame_errors = le64_to_cpu(rx->rx_align_err_frames);
|
||||
stats->rx_length_errors = le64_to_cpu(rx->rx_undrsz_frames) +
|
||||
le64_to_cpu(rx->rx_ovrsz_frames) +
|
||||
le64_to_cpu(rx->rx_runt_frames);
|
||||
stats->rx_errors = le64_to_cpu(rx->rx_false_carrier_frames) +
|
||||
le64_to_cpu(rx->rx_jbr_frames);
|
||||
stats->collisions = le64_to_cpu(tx->tx_total_collisions);
|
||||
stats->tx_fifo_errors = le64_to_cpu(tx->tx_fifo_underruns);
|
||||
stats->tx_errors = le64_to_cpu(tx->tx_err);
|
||||
}
|
||||
|
||||
return stats;
|
||||
}
|
||||
|
||||
|
|
@ -5229,6 +5291,10 @@ static void bnxt_timer(unsigned long data)
|
|||
if (atomic_read(&bp->intr_sem) != 0)
|
||||
goto bnxt_restart_timer;
|
||||
|
||||
if (bp->link_info.link_up && (bp->flags & BNXT_FLAG_PORT_STATS)) {
|
||||
set_bit(BNXT_PERIODIC_STATS_SP_EVENT, &bp->sp_event);
|
||||
schedule_work(&bp->sp_task);
|
||||
}
|
||||
bnxt_restart_timer:
|
||||
mod_timer(&bp->timer, jiffies + bp->current_interval);
|
||||
}
|
||||
|
|
@ -5280,6 +5346,9 @@ static void bnxt_sp_task(struct work_struct *work)
|
|||
rtnl_unlock();
|
||||
}
|
||||
|
||||
if (test_and_clear_bit(BNXT_PERIODIC_STATS_SP_EVENT, &bp->sp_event))
|
||||
bnxt_hwrm_port_qstats(bp);
|
||||
|
||||
smp_mb__before_atomic();
|
||||
clear_bit(BNXT_STATE_IN_SP_TASK, &bp->state);
|
||||
}
|
||||
|
|
@ -5343,6 +5412,8 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)
|
|||
goto init_err_release;
|
||||
}
|
||||
|
||||
pci_enable_pcie_error_reporting(pdev);
|
||||
|
||||
INIT_WORK(&bp->sp_task, bnxt_sp_task);
|
||||
|
||||
spin_lock_init(&bp->ntp_fltr_lock);
|
||||
|
|
@ -5722,6 +5793,7 @@ static void bnxt_remove_one(struct pci_dev *pdev)
|
|||
if (BNXT_PF(bp))
|
||||
bnxt_sriov_disable(bp);
|
||||
|
||||
pci_disable_pcie_error_reporting(pdev);
|
||||
unregister_netdev(dev);
|
||||
cancel_work_sync(&bp->sp_task);
|
||||
bp->sp_event = 0;
|
||||
|
|
@ -5961,11 +6033,117 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
return rc;
|
||||
}
|
||||
|
||||
/**
|
||||
* bnxt_io_error_detected - called when PCI error is detected
|
||||
* @pdev: Pointer to PCI device
|
||||
* @state: The current pci connection state
|
||||
*
|
||||
* This function is called after a PCI bus error affecting
|
||||
* this device has been detected.
|
||||
*/
|
||||
static pci_ers_result_t bnxt_io_error_detected(struct pci_dev *pdev,
|
||||
pci_channel_state_t state)
|
||||
{
|
||||
struct net_device *netdev = pci_get_drvdata(pdev);
|
||||
|
||||
netdev_info(netdev, "PCI I/O error detected\n");
|
||||
|
||||
rtnl_lock();
|
||||
netif_device_detach(netdev);
|
||||
|
||||
if (state == pci_channel_io_perm_failure) {
|
||||
rtnl_unlock();
|
||||
return PCI_ERS_RESULT_DISCONNECT;
|
||||
}
|
||||
|
||||
if (netif_running(netdev))
|
||||
bnxt_close(netdev);
|
||||
|
||||
pci_disable_device(pdev);
|
||||
rtnl_unlock();
|
||||
|
||||
/* Request a slot slot reset. */
|
||||
return PCI_ERS_RESULT_NEED_RESET;
|
||||
}
|
||||
|
||||
/**
|
||||
* bnxt_io_slot_reset - called after the pci bus has been reset.
|
||||
* @pdev: Pointer to PCI device
|
||||
*
|
||||
* Restart the card from scratch, as if from a cold-boot.
|
||||
* At this point, the card has exprienced a hard reset,
|
||||
* followed by fixups by BIOS, and has its config space
|
||||
* set up identically to what it was at cold boot.
|
||||
*/
|
||||
static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev)
|
||||
{
|
||||
struct net_device *netdev = pci_get_drvdata(pdev);
|
||||
struct bnxt *bp = netdev_priv(netdev);
|
||||
int err = 0;
|
||||
pci_ers_result_t result = PCI_ERS_RESULT_DISCONNECT;
|
||||
|
||||
netdev_info(bp->dev, "PCI Slot Reset\n");
|
||||
|
||||
rtnl_lock();
|
||||
|
||||
if (pci_enable_device(pdev)) {
|
||||
dev_err(&pdev->dev,
|
||||
"Cannot re-enable PCI device after reset.\n");
|
||||
} else {
|
||||
pci_set_master(pdev);
|
||||
|
||||
if (netif_running(netdev))
|
||||
err = bnxt_open(netdev);
|
||||
|
||||
if (!err)
|
||||
result = PCI_ERS_RESULT_RECOVERED;
|
||||
}
|
||||
|
||||
if (result != PCI_ERS_RESULT_RECOVERED && netif_running(netdev))
|
||||
dev_close(netdev);
|
||||
|
||||
rtnl_unlock();
|
||||
|
||||
err = pci_cleanup_aer_uncorrect_error_status(pdev);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev,
|
||||
"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n",
|
||||
err); /* non-fatal, continue */
|
||||
}
|
||||
|
||||
return PCI_ERS_RESULT_RECOVERED;
|
||||
}
|
||||
|
||||
/**
|
||||
* bnxt_io_resume - called when traffic can start flowing again.
|
||||
* @pdev: Pointer to PCI device
|
||||
*
|
||||
* This callback is called when the error recovery driver tells
|
||||
* us that its OK to resume normal operation.
|
||||
*/
|
||||
static void bnxt_io_resume(struct pci_dev *pdev)
|
||||
{
|
||||
struct net_device *netdev = pci_get_drvdata(pdev);
|
||||
|
||||
rtnl_lock();
|
||||
|
||||
netif_device_attach(netdev);
|
||||
|
||||
rtnl_unlock();
|
||||
}
|
||||
|
||||
static const struct pci_error_handlers bnxt_err_handler = {
|
||||
.error_detected = bnxt_io_error_detected,
|
||||
.slot_reset = bnxt_io_slot_reset,
|
||||
.resume = bnxt_io_resume
|
||||
};
|
||||
|
||||
static struct pci_driver bnxt_pci_driver = {
|
||||
.name = DRV_MODULE_NAME,
|
||||
.id_table = bnxt_pci_tbl,
|
||||
.probe = bnxt_init_one,
|
||||
.remove = bnxt_remove_one,
|
||||
.err_handler = &bnxt_err_handler,
|
||||
#if defined(CONFIG_BNXT_SRIOV)
|
||||
.sriov_configure = bnxt_sriov_configure,
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -757,10 +757,6 @@ struct bnxt_ntuple_filter {
|
|||
#define BNXT_FLTR_UPDATE 1
|
||||
};
|
||||
|
||||
#define BNXT_ALL_COPPER_ETHTOOL_SPEED \
|
||||
(ADVERTISED_100baseT_Full | ADVERTISED_1000baseT_Full | \
|
||||
ADVERTISED_10000baseT_Full)
|
||||
|
||||
struct bnxt_link_info {
|
||||
u8 media_type;
|
||||
u8 transceiver;
|
||||
|
|
@ -780,6 +776,7 @@ struct bnxt_link_info {
|
|||
#define BNXT_LINK_PAUSE_RX PORT_PHY_QCFG_RESP_PAUSE_RX
|
||||
#define BNXT_LINK_PAUSE_BOTH (PORT_PHY_QCFG_RESP_PAUSE_RX | \
|
||||
PORT_PHY_QCFG_RESP_PAUSE_TX)
|
||||
u8 lp_pause;
|
||||
u8 auto_pause_setting;
|
||||
u8 force_pause_setting;
|
||||
u8 duplex_setting;
|
||||
|
|
@ -814,6 +811,7 @@ struct bnxt_link_info {
|
|||
#define BNXT_LINK_SPEED_MSK_25GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_25GB
|
||||
#define BNXT_LINK_SPEED_MSK_40GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_40GB
|
||||
#define BNXT_LINK_SPEED_MSK_50GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_50GB
|
||||
u16 lp_auto_link_speeds;
|
||||
u16 auto_link_speed;
|
||||
u16 force_link_speed;
|
||||
u32 preemphasis;
|
||||
|
|
@ -875,6 +873,7 @@ struct bnxt {
|
|||
#define BNXT_FLAG_MSIX_CAP 0x80
|
||||
#define BNXT_FLAG_RFS 0x100
|
||||
#define BNXT_FLAG_SHARED_RINGS 0x200
|
||||
#define BNXT_FLAG_PORT_STATS 0x400
|
||||
|
||||
#define BNXT_FLAG_ALL_CONFIG_FEATS (BNXT_FLAG_TPA | \
|
||||
BNXT_FLAG_RFS | \
|
||||
|
|
@ -927,7 +926,7 @@ struct bnxt {
|
|||
struct bnxt_queue_info q_info[BNXT_MAX_QUEUE];
|
||||
|
||||
unsigned int current_interval;
|
||||
#define BNXT_TIMER_INTERVAL (HZ / 2)
|
||||
#define BNXT_TIMER_INTERVAL HZ
|
||||
|
||||
struct timer_list timer;
|
||||
|
||||
|
|
@ -947,6 +946,13 @@ struct bnxt {
|
|||
void *hwrm_dbg_resp_addr;
|
||||
dma_addr_t hwrm_dbg_resp_dma_addr;
|
||||
#define HWRM_DBG_REG_BUF_SIZE 128
|
||||
|
||||
struct rx_port_stats *hw_rx_port_stats;
|
||||
struct tx_port_stats *hw_tx_port_stats;
|
||||
dma_addr_t hw_rx_port_stats_map;
|
||||
dma_addr_t hw_tx_port_stats_map;
|
||||
int hw_port_stats_size;
|
||||
|
||||
int hwrm_cmd_timeout;
|
||||
struct mutex hwrm_cmd_lock; /* serialize hwrm messages */
|
||||
struct hwrm_ver_get_output ver_resp;
|
||||
|
|
@ -982,6 +988,7 @@ struct bnxt {
|
|||
#define BNXT_RESET_TASK_SP_EVENT 6
|
||||
#define BNXT_RST_RING_SP_EVENT 7
|
||||
#define BNXT_HWRM_PF_UNLOAD_SP_EVENT 8
|
||||
#define BNXT_PERIODIC_STATS_SP_EVENT 9
|
||||
|
||||
struct bnxt_pf_info pf;
|
||||
#ifdef CONFIG_BNXT_SRIOV
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
*/
|
||||
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/stringify.h>
|
||||
#include <linux/ethtool.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/pci.h>
|
||||
|
|
@ -83,13 +84,99 @@ static int bnxt_set_coalesce(struct net_device *dev,
|
|||
|
||||
#define BNXT_NUM_STATS 21
|
||||
|
||||
#define BNXT_RX_STATS_OFFSET(counter) \
|
||||
(offsetof(struct rx_port_stats, counter) / 8)
|
||||
|
||||
#define BNXT_RX_STATS_ENTRY(counter) \
|
||||
{ BNXT_RX_STATS_OFFSET(counter), __stringify(counter) }
|
||||
|
||||
#define BNXT_TX_STATS_OFFSET(counter) \
|
||||
((offsetof(struct tx_port_stats, counter) + \
|
||||
sizeof(struct rx_port_stats) + 512) / 8)
|
||||
|
||||
#define BNXT_TX_STATS_ENTRY(counter) \
|
||||
{ BNXT_TX_STATS_OFFSET(counter), __stringify(counter) }
|
||||
|
||||
static const struct {
|
||||
long offset;
|
||||
char string[ETH_GSTRING_LEN];
|
||||
} bnxt_port_stats_arr[] = {
|
||||
BNXT_RX_STATS_ENTRY(rx_64b_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_65b_127b_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_128b_255b_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_256b_511b_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_512b_1023b_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_1024b_1518_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_good_vlan_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_1519b_2047b_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_2048b_4095b_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_4096b_9216b_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_9217b_16383b_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_total_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_ucast_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_mcast_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_bcast_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_fcs_err_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_ctrl_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_pause_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_pfc_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_align_err_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_ovrsz_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_jbr_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_mtu_err_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_tagged_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_double_tagged_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_good_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_undrsz_frames),
|
||||
BNXT_RX_STATS_ENTRY(rx_eee_lpi_events),
|
||||
BNXT_RX_STATS_ENTRY(rx_eee_lpi_duration),
|
||||
BNXT_RX_STATS_ENTRY(rx_bytes),
|
||||
BNXT_RX_STATS_ENTRY(rx_runt_bytes),
|
||||
BNXT_RX_STATS_ENTRY(rx_runt_frames),
|
||||
|
||||
BNXT_TX_STATS_ENTRY(tx_64b_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_65b_127b_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_128b_255b_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_256b_511b_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_512b_1023b_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_1024b_1518_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_good_vlan_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_1519b_2047_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_2048b_4095b_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_4096b_9216b_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_9217b_16383b_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_good_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_total_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_ucast_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_mcast_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_bcast_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_pause_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_pfc_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_jabber_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_fcs_err_frames),
|
||||
BNXT_TX_STATS_ENTRY(tx_err),
|
||||
BNXT_TX_STATS_ENTRY(tx_fifo_underruns),
|
||||
BNXT_TX_STATS_ENTRY(tx_eee_lpi_events),
|
||||
BNXT_TX_STATS_ENTRY(tx_eee_lpi_duration),
|
||||
BNXT_TX_STATS_ENTRY(tx_total_collisions),
|
||||
BNXT_TX_STATS_ENTRY(tx_bytes),
|
||||
};
|
||||
|
||||
#define BNXT_NUM_PORT_STATS ARRAY_SIZE(bnxt_port_stats_arr)
|
||||
|
||||
static int bnxt_get_sset_count(struct net_device *dev, int sset)
|
||||
{
|
||||
struct bnxt *bp = netdev_priv(dev);
|
||||
|
||||
switch (sset) {
|
||||
case ETH_SS_STATS:
|
||||
return BNXT_NUM_STATS * bp->cp_nr_rings;
|
||||
case ETH_SS_STATS: {
|
||||
int num_stats = BNXT_NUM_STATS * bp->cp_nr_rings;
|
||||
|
||||
if (bp->flags & BNXT_FLAG_PORT_STATS)
|
||||
num_stats += BNXT_NUM_PORT_STATS;
|
||||
|
||||
return num_stats;
|
||||
}
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
|
@ -118,6 +205,14 @@ static void bnxt_get_ethtool_stats(struct net_device *dev,
|
|||
buf[j] = le64_to_cpu(hw_stats[k]);
|
||||
buf[j++] = cpr->rx_l4_csum_errors;
|
||||
}
|
||||
if (bp->flags & BNXT_FLAG_PORT_STATS) {
|
||||
__le64 *port_stats = (__le64 *)bp->hw_rx_port_stats;
|
||||
|
||||
for (i = 0; i < BNXT_NUM_PORT_STATS; i++, j++) {
|
||||
buf[j] = le64_to_cpu(*(port_stats +
|
||||
bnxt_port_stats_arr[i].offset));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void bnxt_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
|
||||
|
|
@ -172,6 +267,12 @@ static void bnxt_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
|
|||
sprintf(buf, "[%d]: rx_l4_csum_errors", i);
|
||||
buf += ETH_GSTRING_LEN;
|
||||
}
|
||||
if (bp->flags & BNXT_FLAG_PORT_STATS) {
|
||||
for (i = 0; i < BNXT_NUM_PORT_STATS; i++) {
|
||||
strcpy(buf, bnxt_port_stats_arr[i].string);
|
||||
buf += ETH_GSTRING_LEN;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
netdev_err(bp->dev, "bnxt_get_strings invalid request %x\n",
|
||||
|
|
@ -496,28 +597,8 @@ static void bnxt_get_drvinfo(struct net_device *dev,
|
|||
kfree(pkglog);
|
||||
}
|
||||
|
||||
static u32 bnxt_fw_to_ethtool_support_spds(struct bnxt_link_info *link_info)
|
||||
static u32 _bnxt_fw_to_ethtool_adv_spds(u16 fw_speeds, u8 fw_pause)
|
||||
{
|
||||
u16 fw_speeds = link_info->support_speeds;
|
||||
u32 speed_mask = 0;
|
||||
|
||||
if (fw_speeds & BNXT_LINK_SPEED_MSK_100MB)
|
||||
speed_mask |= SUPPORTED_100baseT_Full;
|
||||
if (fw_speeds & BNXT_LINK_SPEED_MSK_1GB)
|
||||
speed_mask |= SUPPORTED_1000baseT_Full;
|
||||
if (fw_speeds & BNXT_LINK_SPEED_MSK_2_5GB)
|
||||
speed_mask |= SUPPORTED_2500baseX_Full;
|
||||
if (fw_speeds & BNXT_LINK_SPEED_MSK_10GB)
|
||||
speed_mask |= SUPPORTED_10000baseT_Full;
|
||||
if (fw_speeds & BNXT_LINK_SPEED_MSK_40GB)
|
||||
speed_mask |= SUPPORTED_40000baseCR4_Full;
|
||||
|
||||
return speed_mask;
|
||||
}
|
||||
|
||||
static u32 bnxt_fw_to_ethtool_advertised_spds(struct bnxt_link_info *link_info)
|
||||
{
|
||||
u16 fw_speeds = link_info->auto_link_speeds;
|
||||
u32 speed_mask = 0;
|
||||
|
||||
/* TODO: support 25GB, 40GB, 50GB with different cable type */
|
||||
|
|
@ -532,9 +613,48 @@ static u32 bnxt_fw_to_ethtool_advertised_spds(struct bnxt_link_info *link_info)
|
|||
speed_mask |= ADVERTISED_10000baseT_Full;
|
||||
if (fw_speeds & BNXT_LINK_SPEED_MSK_40GB)
|
||||
speed_mask |= ADVERTISED_40000baseCR4_Full;
|
||||
|
||||
if ((fw_pause & BNXT_LINK_PAUSE_BOTH) == BNXT_LINK_PAUSE_BOTH)
|
||||
speed_mask |= ADVERTISED_Pause;
|
||||
else if (fw_pause & BNXT_LINK_PAUSE_TX)
|
||||
speed_mask |= ADVERTISED_Asym_Pause;
|
||||
else if (fw_pause & BNXT_LINK_PAUSE_RX)
|
||||
speed_mask |= ADVERTISED_Pause | ADVERTISED_Asym_Pause;
|
||||
|
||||
return speed_mask;
|
||||
}
|
||||
|
||||
static u32 bnxt_fw_to_ethtool_advertised_spds(struct bnxt_link_info *link_info)
|
||||
{
|
||||
u16 fw_speeds = link_info->auto_link_speeds;
|
||||
u8 fw_pause = 0;
|
||||
|
||||
if (link_info->autoneg & BNXT_AUTONEG_FLOW_CTRL)
|
||||
fw_pause = link_info->auto_pause_setting;
|
||||
|
||||
return _bnxt_fw_to_ethtool_adv_spds(fw_speeds, fw_pause);
|
||||
}
|
||||
|
||||
static u32 bnxt_fw_to_ethtool_lp_adv(struct bnxt_link_info *link_info)
|
||||
{
|
||||
u16 fw_speeds = link_info->lp_auto_link_speeds;
|
||||
u8 fw_pause = 0;
|
||||
|
||||
if (link_info->autoneg & BNXT_AUTONEG_FLOW_CTRL)
|
||||
fw_pause = link_info->lp_pause;
|
||||
|
||||
return _bnxt_fw_to_ethtool_adv_spds(fw_speeds, fw_pause);
|
||||
}
|
||||
|
||||
static u32 bnxt_fw_to_ethtool_support_spds(struct bnxt_link_info *link_info)
|
||||
{
|
||||
u16 fw_speeds = link_info->support_speeds;
|
||||
u32 supported;
|
||||
|
||||
supported = _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);
|
||||
return supported | SUPPORTED_Pause | SUPPORTED_Asym_Pause;
|
||||
}
|
||||
|
||||
u32 bnxt_fw_to_ethtool_speed(u16 fw_link_speed)
|
||||
{
|
||||
switch (fw_link_speed) {
|
||||
|
|
@ -566,7 +686,6 @@ static int bnxt_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|||
u16 ethtool_speed;
|
||||
|
||||
cmd->supported = bnxt_fw_to_ethtool_support_spds(link_info);
|
||||
cmd->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
|
||||
|
||||
if (link_info->auto_link_speeds)
|
||||
cmd->supported |= SUPPORTED_Autoneg;
|
||||
|
|
@ -576,21 +695,13 @@ static int bnxt_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|||
bnxt_fw_to_ethtool_advertised_spds(link_info);
|
||||
cmd->advertising |= ADVERTISED_Autoneg;
|
||||
cmd->autoneg = AUTONEG_ENABLE;
|
||||
if (link_info->phy_link_status == BNXT_LINK_LINK)
|
||||
cmd->lp_advertising =
|
||||
bnxt_fw_to_ethtool_lp_adv(link_info);
|
||||
} else {
|
||||
cmd->autoneg = AUTONEG_DISABLE;
|
||||
cmd->advertising = 0;
|
||||
}
|
||||
if (link_info->autoneg & BNXT_AUTONEG_FLOW_CTRL) {
|
||||
if ((link_info->auto_pause_setting & BNXT_LINK_PAUSE_BOTH) ==
|
||||
BNXT_LINK_PAUSE_BOTH) {
|
||||
cmd->advertising |= ADVERTISED_Pause;
|
||||
} else {
|
||||
cmd->advertising |= ADVERTISED_Asym_Pause;
|
||||
if (link_info->auto_pause_setting &
|
||||
BNXT_LINK_PAUSE_RX)
|
||||
cmd->advertising |= ADVERTISED_Pause;
|
||||
}
|
||||
}
|
||||
|
||||
cmd->port = PORT_NONE;
|
||||
if (link_info->media_type == PORT_PHY_QCFG_RESP_MEDIA_TYPE_TP) {
|
||||
|
|
@ -686,16 +797,10 @@ static int bnxt_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|||
return rc;
|
||||
|
||||
if (cmd->autoneg == AUTONEG_ENABLE) {
|
||||
if (link_info->media_type != PORT_PHY_QCFG_RESP_MEDIA_TYPE_TP) {
|
||||
netdev_err(dev, "Media type doesn't support autoneg\n");
|
||||
rc = -EINVAL;
|
||||
goto set_setting_exit;
|
||||
}
|
||||
if (cmd->advertising & ~(BNXT_ALL_COPPER_ETHTOOL_SPEED |
|
||||
ADVERTISED_Autoneg |
|
||||
ADVERTISED_TP |
|
||||
ADVERTISED_Pause |
|
||||
ADVERTISED_Asym_Pause)) {
|
||||
u32 supported_spds = bnxt_fw_to_ethtool_support_spds(link_info);
|
||||
|
||||
if (cmd->advertising & ~(supported_spds | ADVERTISED_Autoneg |
|
||||
ADVERTISED_TP | ADVERTISED_FIBRE)) {
|
||||
netdev_err(dev, "Unsupported advertising mask (adv: 0x%x)\n",
|
||||
cmd->advertising);
|
||||
rc = -EINVAL;
|
||||
|
|
@ -750,8 +855,10 @@ static void bnxt_get_pauseparam(struct net_device *dev,
|
|||
if (BNXT_VF(bp))
|
||||
return;
|
||||
epause->autoneg = !!(link_info->autoneg & BNXT_AUTONEG_FLOW_CTRL);
|
||||
epause->rx_pause = ((link_info->pause & BNXT_LINK_PAUSE_RX) != 0);
|
||||
epause->tx_pause = ((link_info->pause & BNXT_LINK_PAUSE_TX) != 0);
|
||||
epause->rx_pause =
|
||||
((link_info->auto_pause_setting & BNXT_LINK_PAUSE_RX) != 0);
|
||||
epause->tx_pause =
|
||||
((link_info->auto_pause_setting & BNXT_LINK_PAUSE_TX) != 0);
|
||||
}
|
||||
|
||||
static int bnxt_set_pauseparam(struct net_device *dev,
|
||||
|
|
|
|||
Loading…
Reference in New Issue