igc: Add ethtool support
Subsystems (2)
PATCH 1/1 igc: Add ethtool support
This patch adds basic ethtool support to the device to allow for configuration.
Signed-off-by Sasha Neftin <[email protected]>
--- drivers/net/ethernet/intel/igc/Makefile | 3 +- drivers/net/ethernet/intel/igc/igc.h | 34 +- drivers/net/ethernet/intel/igc/igc_base.c | 1 + drivers/net/ethernet/intel/igc/igc_defines.h | 4 + drivers/net/ethernet/intel/igc/igc_ethtool.c | 1032 ++++++++++++++++++++++++++ drivers/net/ethernet/intel/igc/igc_hw.h | 1 + drivers/net/ethernet/intel/igc/igc_main.c | 109 ++- drivers/net/ethernet/intel/igc/igc_regs.h | 3 + 8 files changed, 1169 insertions(+), 18 deletions(-) create mode 100644 drivers/net/ethernet/intel/igc/igc_ethtool.c
drivers/net/ethernet/intel/igc/Makefile +2 -1
@@ -7,4 +7,5 @@ obj-$(CONFIG_IGC) += igc.o -igc-objs := igc_main.o igc_mac.o igc_i225.o igc_base.o igc_nvm.o igc_phy.o +igc-objs := igc_main.o igc_mac.o igc_i225.o igc_base.o igc_nvm.o igc_phy.o \ +igc_ethtool.o
drivers/net/ethernet/intel/igc/igc.h +32 -2
@@ -13,19 +13,43 @@#include "igc_hw.h" -/* main */ +/* forward declaration */ +void igc_set_ethtool_ops (struct net_device *); + +struct igc_adapter ; +struct igc_ring ; + +void igc_up (struct igc_adapter *adapter); +void igc_down (struct igc_adapter *adapter); +int igc_setup_tx_resources (struct igc_ring *ring); +int igc_setup_rx_resources (struct igc_ring *ring); +void igc_free_tx_resources (struct igc_ring *ring); +void igc_free_rx_resources (struct igc_ring *ring); +unsigned int igc_get_max_rss_queues (struct igc_adapter *adapter); +void igc_set_flag_queue_pairs (struct igc_adapter *adapter, +const u32 max_rss_queues); +int igc_reinit_queues (struct igc_adapter *adapter); +bool igc_has_link (struct igc_adapter *adapter); +void igc_reset (struct igc_adapter *adapter); +int igc_set_spd_dplx (struct igc_adapter *adapter,u32 spd,u8 dplx); +extern char igc_driver_name[];extern char igc_driver_version[]; +#define IGC_REGS_LEN 740 +#define IGC_RETA_SIZE 128 +/* Interrupt defines */ #define IGC_START_ITR 648/* ~6000 ints/sec */ #define IGC_FLAG_HAS_MSI BIT(0) -#define IGC_FLAG_QUEUE_PAIRS BIT(4) +#define IGC_FLAG_QUEUE_PAIRS BIT(3) +#define IGC_FLAG_DMAC BIT(4)#define IGC_FLAG_NEED_LINK_UPDATE BIT(9)#define IGC_FLAG_MEDIA_RESET BIT(10)#define IGC_FLAG_MAS_ENABLE BIT(12)#define IGC_FLAG_HAS_MSIX BIT(13)#define IGC_FLAG_VLAN_PROMISC BIT(15) +#define IGC_FLAG_RX_LEGACY BIT(16)#define IGC_START_ITR 648/* ~6000 ints/sec */ #define IGC_4K_ITR 980
@@ -60,6 +84,7 @@ extern char igc_driver_version[];#define IGC_RXBUFFER_2048 2048#define IGC_RXBUFFER_3072 3072 +#define AUTO_ALL_MODES 0#define IGC_RX_HDR_LEN IGC_RXBUFFER_256/* RX and TX descriptor control thresholds.
@@ -340,6 +365,8 @@ struct igc_adapter {struct igc_mac_addr *mac_table; +u8 rss_indir_tbl[IGC_RETA_SIZE ]; +unsigned long link_check_timeout;struct igc_info ei; };
@@ -418,6 +445,9 @@ static inline s32 igc_read_phy_reg(struct igc_hw *hw, u32 offset, u16 *data)return 0 ; } +/* forward declaration */ +void igc_reinit_locked (struct igc_adapter *); +#define igc_rx_pg_size (_ring) (PAGE_SIZE << igc_rx_pg_order(_ring))#define IGC_TXD_DCMD (IGC_ADVTXD_DCMD_EOP | IGC_ADVTXD_DCMD_RS)
drivers/net/ethernet/intel/igc/igc_base.c +1 -0
@@ -131,6 +131,7 @@ static s32 igc_init_nvm_params_base(struct igc_hw *hw)if (size >15 ) size =15 ; + nvm->type = igc_nvm_eeprom_spi; nvm->word_size =BIT (size); nvm->opcode_bits =8 ; nvm->delay_usec =1 ;
drivers/net/ethernet/intel/igc/igc_defines.h +4 -0
@@ -4,6 +4,10 @@#ifndef _IGC_DEFINES_H_#define _IGC_DEFINES_H_ +/* Number of Transmit and Receive Descriptors must be a multiple of 8 */ +#define REQ_TX_DESCRIPTOR_MULTIPLE 8 +#define REQ_RX_DESCRIPTOR_MULTIPLE 8 +#define IGC_CTRL_EXT_DRV_LOAD 0x10000000/* Drv loaded bit for FW */ /* PCI Bus Info */
drivers/net/ethernet/intel/igc/igc_ethtool.c new file +1032 -0
1,032 lines not on this page · raw message
drivers/net/ethernet/intel/igc/igc_hw.h +1 -0
@@ -55,6 +55,7 @@ enum igc_media_type {enum igc_nvm_type { igc_nvm_unknown =0 , + igc_nvm_eeprom_spi, igc_nvm_flash_hw, igc_nvm_invm, };
drivers/net/ethernet/intel/igc/igc_main.c +94 -15
211 lines not on this page · raw message
drivers/net/ethernet/intel/igc/igc_regs.h +3 -0
@@ -80,6 +80,9 @@/* MSI-X Table Register Descriptions */ #define IGC_PBACL 0x05B68/* MSIx PBA Clear - R/W 1 to clear */ +/* Redirection Table - RW Array */ +#define IGC_RETA (_i) (0x05C00 + ((_i) * 4)) +/* Receive Register Descriptions */ #define IGC_RCTL 0x00100/* Rx Control - RW */ #define IGC_SRRCTL (_n) (0x0C00C + ((_n) * 0x40))
Signature · 1 line
2.11.0
Brown
PATCH 1/1 igc: Add ethtool support
Quoted 10 lines
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Sasha Neftin
Sent: Wednesday, January 30, 2019 9:13 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH v1 1/1] igc: Add ethtool supportThis patch adds basic ethtool support to the device to allow for configuration.
Signed-off-by Sasha Neftin <[email protected]>
Quoted 13 lines
--- drivers/net/ethernet/intel/igc/Makefile | 3 +- drivers/net/ethernet/intel/igc/igc.h | 34 +- drivers/net/ethernet/intel/igc/igc_base.c | 1 + drivers/net/ethernet/intel/igc/igc_defines.h | 4 + drivers/net/ethernet/intel/igc/igc_ethtool.c | 1032 ++++++++++++++++++++++++++ drivers/net/ethernet/intel/igc/igc_hw.h | 1 + drivers/net/ethernet/intel/igc/igc_main.c | 109 ++- drivers/net/ethernet/intel/igc/igc_regs.h | 3 + 8 files changed, 1169 insertions(+), 18 deletions(-) create mode 100644 drivers/net/ethernet/intel/igc/igc_ethtool.c
Tested-by Aaron Brown <[email protected]>