net: lan743x: PCI11010 / PCI11414 devices Enhancements
Subsystems (3)
cover net: lan743x: PCI11010 / PCI11414 devices Enhancements
This patch series continues with the addition of supported features for the Ethernet function of the PCI11010 / PCI11414 devices to the LAN743x driver.
Raju Lakkaraju (5):
net: lan743x: Add support to display Tx Queue statistics
net: lan743x: Add support for EEPROM
net: lan743x: Add support for OTP
net: lan743x: Add support for PTP-IO Event Input External Timestamp
(extts)
net: lan743x: Add support for PTP-IO Event Output (Periodic Output)
.../net/ethernet/microchip/lan743x_ethtool.c | 405 ++++++++++++- drivers/net/ethernet/microchip/lan743x_main.c | 2 + drivers/net/ethernet/microchip/lan743x_main.h | 159 +++++ drivers/net/ethernet/microchip/lan743x_ptp.c | 546 ++++++++++++++++-- drivers/net/ethernet/microchip/lan743x_ptp.h | 10 + 5 files changed, 1076 insertions(+), 46 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/5 net: lan743x: Add support to display Tx Queue statistics
Tx 4 queue statistics display through ethtool application
--- .../net/ethernet/microchip/lan743x_ethtool.c | 31 +++++++++++++++++++ drivers/net/ethernet/microchip/lan743x_main.c | 1 + drivers/net/ethernet/microchip/lan743x_main.h | 1 + 3 files changed, 33 insertions(+)
drivers/net/ethernet/microchip/lan743x_ethtool.c +31 -0
@@ -365,6 +365,14 @@ static const char lan743x_set1_sw_cnt_strings[][ETH_GSTRING_LEN] = { "RX Queue 3 Frames", }; +static const char lan743x_tx_queue_cnt_strings[][ETH_GSTRING_LEN ] = { +"TX Queue 0 Frames" , +"TX Queue 1 Frames" , +"TX Queue 2 Frames" , +"TX Queue 3 Frames" , +"TX Total Queue Frames" , +}; +static const char lan743x_set2_hw_cnt_strings[][ETH_GSTRING_LEN ] = {"RX Total Frames" ,"EEE RX LPI Transitions" ,
@@ -462,6 +470,8 @@ static const char lan743x_priv_flags_strings[][ETH_GSTRING_LEN] = {static void lan743x_ethtool_get_strings (struct net_device *netdev,u32 stringset,u8 *data) { +struct lan743x_adapter *adapter =netdev_priv (netdev); +switch (stringset) {case ETH_SS_STATS : memcpy(data, lan743x_set0_hw_cnt_strings,
@@ -473,6 +483,13 @@ static void lan743x_ethtool_get_strings(struct net_device *netdev, sizeof(lan743x_set1_sw_cnt_strings)], lan743x_set2_hw_cnt_strings, sizeof(lan743x_set2_hw_cnt_strings)); +if (adapter->is_pci11x1x) { +memcpy (&data[sizeof (lan743x_set0_hw_cnt_strings) + +sizeof (lan743x_set1_sw_cnt_strings) + +sizeof (lan743x_set2_hw_cnt_strings)], + lan743x_tx_queue_cnt_strings, +sizeof (lan743x_tx_queue_cnt_strings)); + }break ;case ETH_SS_PRIV_FLAGS : memcpy(data, lan743x_priv_flags_strings,
@@ -486,7 +503,9 @@ static void lan743x_ethtool_get_ethtool_stats(struct net_device *netdev, u64 *data) {struct lan743x_adapter *adapter =netdev_priv (netdev); +u64 total_queue_count =0 ;int data_index =0 ; +u64 pkt_cnt;u32 buf;int i;
@@ -500,6 +519,14 @@ static void lan743x_ethtool_get_ethtool_stats(struct net_device *netdev, buf =lan743x_csr_read (adapter, lan743x_set2_hw_cnt_addr[i]); data[data_index++] = (u64 )buf; } +if (adapter->is_pci11x1x) { +for (i =0 ; i <ARRAY_SIZE (adapter->tx); i++) { + pkt_cnt = (u64)(adapter->tx[i].frame_count); + data[data_index++] = pkt_cnt; + total_queue_count += pkt_cnt; + } + data[data_index++] = total_queue_count; + } }static u32 lan743x_ethtool_get_priv_flags (struct net_device *netdev)
@@ -520,6 +547,8 @@ static int lan743x_ethtool_set_priv_flags(struct net_device *netdev, u32 flags)static int lan743x_ethtool_get_sset_count (struct net_device *netdev,int sset) { +struct lan743x_adapter *adapter =netdev_priv (netdev); +switch (sset) {case ETH_SS_STATS : {
@@ -528,6 +557,8 @@ static int lan743x_ethtool_get_sset_count(struct net_device *netdev, int sset) ret =ARRAY_SIZE (lan743x_set0_hw_cnt_strings); ret +=ARRAY_SIZE (lan743x_set1_sw_cnt_strings); ret +=ARRAY_SIZE (lan743x_set2_hw_cnt_strings); +if (adapter->is_pci11x1x) + ret +=ARRAY_SIZE (lan743x_tx_queue_cnt_strings);return ret; }case ETH_SS_PRIV_FLAGS :
drivers/net/ethernet/microchip/lan743x_main.c +1 -0
@@ -1776,6 +1776,7 @@ static netdev_tx_t lan743x_tx_xmit_frame(struct lan743x_tx *tx,dev_kfree_skb_irq (skb); goto unlock; } + tx->frame_count++;if (gso)lan743x_tx_frame_add_lso (tx, frame_length, nr_frags);
drivers/net/ethernet/microchip/lan743x_main.h +1 -0
@@ -715,6 +715,7 @@ struct lan743x_tx {int last_tail;struct napi_struct napi; +u32 frame_count;struct sk_buff *overflow_skb; };
Signature · 1 line
2.25.1
PATCH 2/5 net: lan743x: Add support for EEPROM
In reply to Raju LakkarajuAdd new the EEPROM read and write access functions and system lock protection to access by devices for PCI11010/PCI11414 chips
--- .../net/ethernet/microchip/lan743x_ethtool.c | 190 +++++++++++++++++- drivers/net/ethernet/microchip/lan743x_main.c | 1 + drivers/net/ethernet/microchip/lan743x_main.h | 38 ++++ 3 files changed, 224 insertions(+), 5 deletions(-)
drivers/net/ethernet/microchip/lan743x_ethtool.c +185 -5
@@ -7,6 +7,7 @@#include <linux/phy.h> #include "lan743x_main.h" #include "lan743x_ethtool.h" +#include <linux/sched.h> /* eeprom */ #define LAN743X_EEPROM_MAGIC (0x74A5)
@@ -19,6 +20,8 @@#define OTP_INDICATOR_1 (0xF3)#define OTP_INDICATOR_2 (0xF7) +#define LOCK_TIMEOUT_MAX_CNT (100) // 1 sec (10 msce * 100) +static int lan743x_otp_power_up (struct lan743x_adapter *adapter) {u32 reg_value;
@@ -149,6 +152,62 @@ static int lan743x_otp_write(struct lan743x_adapter *adapter, u32 offset,return 0 ; } +static int lan743x_hs_syslock_acquire (struct lan743x_adapter *adapter, +u16 timeout) +{ +u16 timeout_cnt =0 ; +u32 val; + +do { +spin_lock (&adapter->eth_syslock_spinlock); +if (adapter->eth_syslock_acquire_cnt ==0 ) { +lan743x_csr_write (adapter,ETH_SYSTEM_SYS_LOCK_REG , +SYS_LOCK_REG_ENET_SS_LOCK_ ); + val =lan743x_csr_read (adapter,ETH_SYSTEM_SYS_LOCK_REG ); +if (val &SYS_LOCK_REG_ENET_SS_LOCK_ ) { + adapter->eth_syslock_acquire_cnt++; +WARN_ON (adapter->eth_syslock_acquire_cnt ==0 ); +spin_unlock (&adapter->eth_syslock_spinlock); +break ; + } + }else { + adapter->eth_syslock_acquire_cnt++; +WARN_ON (adapter->eth_syslock_acquire_cnt ==0 ); +spin_unlock (&adapter->eth_syslock_spinlock); +break ; + } + +spin_unlock (&adapter->eth_syslock_spinlock); + +if (timeout_cnt++ < timeout) +usleep_range (10000 ,11000 ); +else +return -EINVAL ; + }while (true); + +return 0 ; +} + +static void lan743x_hs_syslock_release (struct lan743x_adapter *adapter) +{ +u32 val; + +spin_lock (&adapter->eth_syslock_spinlock); +WARN_ON (adapter->eth_syslock_acquire_cnt ==0 ); + +if (adapter->eth_syslock_acquire_cnt) { + adapter->eth_syslock_acquire_cnt--; +if (adapter->eth_syslock_acquire_cnt ==0 ) { +lan743x_csr_write (adapter,ETH_SYSTEM_SYS_LOCK_REG ,0 ); + val =lan743x_csr_read (adapter, +ETH_SYSTEM_SYS_LOCK_REG ); +WARN_ON ((val &SYS_LOCK_REG_ENET_SS_LOCK_ ) !=0 ); + } + } + +spin_unlock (&adapter->eth_syslock_spinlock); +} +static int lan743x_eeprom_wait (struct lan743x_adapter *adapter) {unsigned long start_time = jiffies;
@@ -263,6 +322,119 @@ static int lan743x_eeprom_write(struct lan743x_adapter *adapter,return 0 ; } +static int lan743x_hs_eeprom_cmd_cmplt_chk (struct lan743x_adapter *adapter) +{ +unsigned long start_time = jiffies; +u32 val; + +do { + val =lan743x_csr_read (adapter,HS_E2P_CMD ); +if (!(val &HS_E2P_CMD_EPC_BUSY_ ) || + (val &HS_E2P_CMD_EPC_TIMEOUT_ )) +break ; + +usleep_range (50 ,60 ); + }while (!time_after (jiffies, start_time +HZ )); + +if (val & (HS_E2P_CMD_EPC_TIMEOUT_ |HS_E2P_CMD_EPC_BUSY_ )) { +netif_warn (adapter, drv, adapter->netdev, +"HS EEPROM operation timeout/busy\n" ); +return -ETIMEDOUT ; + } + +return 0 ; +} + +static int lan743x_hs_eeprom_read (struct lan743x_adapter *adapter, +u32 offset,u32 length,u8 *data) +{ +int retval; +u32 val; +int i; + +if (offset + length >MAX_EEPROM_SIZE ) +return -EINVAL ; + + retval =lan743x_hs_syslock_acquire (adapter,LOCK_TIMEOUT_MAX_CNT ); +if (retval <0 ) +return retval; + + retval =lan743x_hs_eeprom_cmd_cmplt_chk (adapter); +lan743x_hs_syslock_release (adapter); +if (retval <0 ) +return retval; + +for (i =0 ; i < length; i++) { + retval =lan743x_hs_syslock_acquire (adapter, +LOCK_TIMEOUT_MAX_CNT ); +if (retval <0 ) +return retval; + + val =HS_E2P_CMD_EPC_BUSY_ |HS_E2P_CMD_EPC_CMD_READ_ ; + val |= (offset &HS_E2P_CMD_EPC_ADDR_MASK_ ); +lan743x_csr_write (adapter,HS_E2P_CMD , val); + retval =lan743x_hs_eeprom_cmd_cmplt_chk (adapter); +if (retval <0 ) { +lan743x_hs_syslock_release (adapter); +return retval; + } + + val =lan743x_csr_read (adapter,HS_E2P_DATA ); + +lan743x_hs_syslock_release (adapter); + + data[i] = val &0xFF ; + offset++; + } + +return 0 ; +} + +static int lan743x_hs_eeprom_write (struct lan743x_adapter *adapter, +u32 offset,u32 length,u8 *data) +{ +int retval; +u32 val; +int i; + +if (offset + length >MAX_EEPROM_SIZE ) +return -EINVAL ; + + retval =lan743x_hs_syslock_acquire (adapter,LOCK_TIMEOUT_MAX_CNT ); +if (retval <0 ) +return retval; + + retval =lan743x_hs_eeprom_cmd_cmplt_chk (adapter); +lan743x_hs_syslock_release (adapter); +if (retval <0 ) +return retval; + +for (i =0 ; i < length; i++) { + retval =lan743x_hs_syslock_acquire (adapter, +LOCK_TIMEOUT_MAX_CNT ); +if (retval <0 ) +return retval; + +/* Fill data register */ + val = data[i]; +lan743x_csr_write (adapter,HS_E2P_DATA , val); + +/* Send "write" command */ + val =HS_E2P_CMD_EPC_BUSY_ |HS_E2P_CMD_EPC_CMD_WRITE_ ; + val |= (offset &HS_E2P_CMD_EPC_ADDR_MASK_ ); +lan743x_csr_write (adapter,HS_E2P_CMD , val); + + retval =lan743x_hs_eeprom_cmd_cmplt_chk (adapter); +lan743x_hs_syslock_release (adapter); +if (retval <0 ) +return retval; + + offset++; + } + +return 0 ; +} +static void lan743x_ethtool_get_drvinfo (struct net_device *netdev,struct ethtool_drvinfo *info) {
@@ -304,10 +476,14 @@ static int lan743x_ethtool_get_eeprom(struct net_device *netdev,struct lan743x_adapter *adapter =netdev_priv (netdev);int ret =0 ; -if (adapter->flags &LAN743X_ADAPTER_FLAG_OTP ) +if (adapter->flags &LAN743X_ADAPTER_FLAG_OTP ) { ret =lan743x_otp_read (adapter, ee->offset, ee->len, data); -else - ret =lan743x_eeprom_read (adapter, ee->offset, ee->len, data); + }else { +if (adapter->is_pci11x1x) + ret =lan743x_hs_eeprom_read (adapter, ee->offset, ee->len, data); +else + ret =lan743x_eeprom_read (adapter, ee->offset, ee->len, data); + }return ret; }
@@ -326,8 +502,12 @@ static int lan743x_ethtool_set_eeprom(struct net_device *netdev, } }else {if (ee->magic ==LAN743X_EEPROM_MAGIC ) { - ret =lan743x_eeprom_write (adapter, ee->offset, - ee->len, data); +if (adapter->is_pci11x1x) + ret =lan743x_hs_eeprom_write (adapter, ee->offset, + ee->len, data); +else + ret =lan743x_eeprom_write (adapter, ee->offset, + ee->len, data); } }
drivers/net/ethernet/microchip/lan743x_main.c +1 -0
@@ -2869,6 +2869,7 @@ static int lan743x_hardware_init(struct lan743x_adapter *adapter, adapter->used_tx_channels =PCI11X1X_USED_TX_CHANNELS ; adapter->max_vector_count =PCI11X1X_MAX_VECTOR_COUNT ;pci11x1x_strap_get_status (adapter); +spin_lock_init (&adapter->eth_syslock_spinlock); }else { adapter->max_tx_channels =LAN743X_MAX_TX_CHANNELS ; adapter->used_tx_channels =LAN743X_USED_TX_CHANNELS ;
drivers/net/ethernet/microchip/lan743x_main.h +38 -0
@@ -86,6 +86,40 @@#define E2P_DATA (0x044) +/* Hearthstone top level & System Reg Addresses */ +#define ETH_CTRL_REG_ADDR_BASE (0x0000) +#define ETH_SYS_REG_ADDR_BASE (0x4000) +#define CONFIG_REG_ADDR_BASE (0x0000) +#define ETH_EEPROM_REG_ADDR_BASE (0x0E00) +#define ETH_OTP_REG_ADDR_BASE (0x1000) +#define SYS_LOCK_REG (0x00A0) +#define SYS_LOCK_REG_MAIN_LOCK_ BIT(7) +#define SYS_LOCK_REG_GEN_PERI_LOCK_ BIT(5) +#define SYS_LOCK_REG_SPI_PERI_LOCK_ BIT(4) +#define SYS_LOCK_REG_SMBUS_PERI_LOCK_ BIT(3) +#define SYS_LOCK_REG_UART_SS_LOCK_ BIT(2) +#define SYS_LOCK_REG_ENET_SS_LOCK_ BIT(1) +#define SYS_LOCK_REG_USB_SS_LOCK_ BIT(0) +#define ETH_SYSTEM_SYS_LOCK_REG (ETH_SYS_REG_ADDR_BASE + \ + CONFIG_REG_ADDR_BASE + \ + SYS_LOCK_REG) +#define HS_EEPROM_REG_ADDR_BASE (ETH_SYS_REG_ADDR_BASE + \ + ETH_EEPROM_REG_ADDR_BASE) +#define HS_E2P_CMD (HS_EEPROM_REG_ADDR_BASE + 0x0000) +#define HS_E2P_CMD_EPC_BUSY_ BIT(31) +#define HS_E2P_CMD_EPC_CMD_WRITE_ GENMASK(29, 28) +#define HS_E2P_CMD_EPC_CMD_READ_ (0x0) +#define HS_E2P_CMD_EPC_TIMEOUT_ BIT(17) +#define HS_E2P_CMD_EPC_ADDR_MASK_ GENMASK(15, 0) +#define HS_E2P_DATA (HS_EEPROM_REG_ADDR_BASE + 0x0004) +#define HS_E2P_DATA_MASK_ GENMASK(7, 0) +#define HS_E2P_CFG (HS_EEPROM_REG_ADDR_BASE + 0x0008) +#define HS_E2P_CFG_I2C_PULSE_MASK_ GENMASK(19, 16) +#define HS_E2P_CFG_EEPROM_SIZE_SEL_ BIT(12) +#define HS_E2P_CFG_I2C_BAUD_RATE_MASK_ GENMASK(9, 8) +#define HS_E2P_CFG_TEST_EEPR_TO_BYP_ BIT(0) +#define HS_E2P_PAD_CTL (HS_EEPROM_REG_ADDR_BASE + 0x000C) +#define GPIO_CFG0 (0x050)#define GPIO_CFG0_GPIO_DIR_BIT_ (bit) BIT(16 + (bit))#define GPIO_CFG0_GPIO_DATA_BIT_ (bit) BIT(0 + (bit))
@@ -773,6 +807,10 @@ struct lan743x_adapter {struct lan743x_rx rx[LAN743X_USED_RX_CHANNELS ];bool is_pci11x1x;bool is_sgmii_en; +/* protect ethernet syslock */ +spinlock_t eth_syslock_spinlock; +bool eth_syslock_en; +u32 eth_syslock_acquire_cnt;u8 max_tx_channels;u8 used_tx_channels;u8 max_vector_count;
Signature · 1 line
2.25.1
PATCH 3/5 net: lan743x: Add support for OTP
In reply to Raju LakkarajuAdd new the OTP read and write access functions for PCI11010/PCI11414 chips PCI11010/PCI11414 OTP module register offsets are different from LAN743x OTP module
--- .../net/ethernet/microchip/lan743x_ethtool.c | 184 +++++++++++++++++- drivers/net/ethernet/microchip/lan743x_main.h | 14 ++ 2 files changed, 195 insertions(+), 3 deletions(-)
drivers/net/ethernet/microchip/lan743x_ethtool.c +181 -3
@@ -208,6 +208,177 @@ static void lan743x_hs_syslock_release(struct lan743x_adapter *adapter)spin_unlock (&adapter->eth_syslock_spinlock); } +static void lan743x_hs_otp_power_up (struct lan743x_adapter *adapter) +{ +u32 reg_value; + + reg_value =lan743x_csr_read (adapter,HS_OTP_PWR_DN ); +if (reg_value &OTP_PWR_DN_PWRDN_N_ ) { + reg_value &= ~OTP_PWR_DN_PWRDN_N_ ; +lan743x_csr_write (adapter,HS_OTP_PWR_DN , reg_value); +/* To flush the posted write so the subsequent delay is +* guaranteed to happen after the write at the hardware +*/ +lan743x_csr_read (adapter,HS_OTP_PWR_DN ); +udelay (1 ); + } +} + +static void lan743x_hs_otp_power_down (struct lan743x_adapter *adapter) +{ +u32 reg_value; + + reg_value =lan743x_csr_read (adapter,HS_OTP_PWR_DN ); +if (!(reg_value &OTP_PWR_DN_PWRDN_N_ )) { + reg_value |=OTP_PWR_DN_PWRDN_N_ ; +lan743x_csr_write (adapter,HS_OTP_PWR_DN , reg_value); +/* To flush the posted write so the subsequent delay is +* guaranteed to happen after the write at the hardware +*/ +lan743x_csr_read (adapter,HS_OTP_PWR_DN ); +udelay (1 ); + } +} + +static void lan743x_hs_otp_set_address (struct lan743x_adapter *adapter, +u32 address) +{ +lan743x_csr_write (adapter,HS_OTP_ADDR_HIGH , (address >>8 ) &0x03 ); +lan743x_csr_write (adapter,HS_OTP_ADDR_LOW , address &0xFF ); +} + +static void lan743x_hs_otp_read_go (struct lan743x_adapter *adapter) +{ +lan743x_csr_write (adapter,HS_OTP_FUNC_CMD ,OTP_FUNC_CMD_READ_ ); +lan743x_csr_write (adapter,HS_OTP_CMD_GO ,OTP_CMD_GO_GO_ ); +} + +static int lan743x_hs_otp_cmd_cmplt_chk (struct lan743x_adapter *adapter) +{ +unsigned long start_time = jiffies; +u32 val; + +do { + val =lan743x_csr_read (adapter,HS_OTP_STATUS ); +if (!(val &OTP_STATUS_BUSY_ )) +break ; + +usleep_range (80 ,100 ); + }while (!time_after (jiffies, start_time +HZ )); + +if (val &OTP_STATUS_BUSY_ ) { +netif_warn (adapter, drv, adapter->netdev, +"Timeout on HS_OTP_STATUS completion\n" ); +return -ETIMEDOUT ; + } + +return 0 ; +} + +static int lan743x_hs_otp_read (struct lan743x_adapter *adapter,u32 offset, +u32 length,u8 *data) +{ +int ret; +int i; + +if (offset + length >MAX_OTP_SIZE ) +return -EINVAL ; + + ret =lan743x_hs_syslock_acquire (adapter,LOCK_TIMEOUT_MAX_CNT ); +if (ret <0 ) +return ret; + +lan743x_hs_otp_power_up (adapter); + + ret =lan743x_hs_otp_cmd_cmplt_chk (adapter); +if (ret <0 ) + goto power_down; + +lan743x_hs_syslock_release (adapter); + +for (i =0 ; i < length; i++) { + ret =lan743x_hs_syslock_acquire (adapter, +LOCK_TIMEOUT_MAX_CNT ); +if (ret <0 ) +return ret; + +lan743x_hs_otp_set_address (adapter, offset + i); + +lan743x_hs_otp_read_go (adapter); + ret =lan743x_hs_otp_cmd_cmplt_chk (adapter); +if (ret <0 ) + goto power_down; + + data[i] =lan743x_csr_read (adapter,HS_OTP_READ_DATA ); + +lan743x_hs_syslock_release (adapter); + } + + ret =lan743x_hs_syslock_acquire (adapter, +LOCK_TIMEOUT_MAX_CNT ); +if (ret <0 ) +return ret; + +power_down: +lan743x_hs_otp_power_down (adapter); +lan743x_hs_syslock_release (adapter); + +return ret; +} + +static int lan743x_hs_otp_write (struct lan743x_adapter *adapter,u32 offset, +u32 length,u8 *data) +{ +int ret; +int i; + +if (offset + length >MAX_OTP_SIZE ) +return -EINVAL ; + + ret =lan743x_hs_syslock_acquire (adapter,LOCK_TIMEOUT_MAX_CNT ); +if (ret <0 ) +return ret; + +lan743x_hs_otp_power_up (adapter); + + ret =lan743x_hs_otp_cmd_cmplt_chk (adapter); +if (ret <0 ) + goto power_down; + +/* set to BYTE program mode */ +lan743x_csr_write (adapter,HS_OTP_PRGM_MODE ,OTP_PRGM_MODE_BYTE_ ); + +lan743x_hs_syslock_release (adapter); + +for (i =0 ; i < length; i++) { + ret =lan743x_hs_syslock_acquire (adapter,LOCK_TIMEOUT_MAX_CNT ); +if (ret <0 ) +return ret; + +lan743x_hs_otp_set_address (adapter, offset + i); + +lan743x_csr_write (adapter,HS_OTP_PRGM_DATA , data[i]); +lan743x_csr_write (adapter,HS_OTP_TST_CMD ,OTP_TST_CMD_PRGVRFY_ ); +lan743x_csr_write (adapter,HS_OTP_CMD_GO ,OTP_CMD_GO_GO_ ); + + ret =lan743x_hs_otp_cmd_cmplt_chk (adapter); +if (ret <0 ) + goto power_down; + +lan743x_hs_syslock_release (adapter); + } + + ret =lan743x_hs_syslock_acquire (adapter,LOCK_TIMEOUT_MAX_CNT ); +if (ret <0 ) +return ret; + +power_down: +lan743x_hs_otp_power_down (adapter); +lan743x_hs_syslock_release (adapter); + +return ret; +} +static int lan743x_eeprom_wait (struct lan743x_adapter *adapter) {unsigned long start_time = jiffies;
@@ -477,7 +648,10 @@ static int lan743x_ethtool_get_eeprom(struct net_device *netdev,int ret =0 ;if (adapter->flags &LAN743X_ADAPTER_FLAG_OTP ) { - ret =lan743x_otp_read (adapter, ee->offset, ee->len, data); +if (adapter->is_pci11x1x) + ret =lan743x_hs_otp_read (adapter, ee->offset, ee->len, data); +else + ret =lan743x_otp_read (adapter, ee->offset, ee->len, data); }else {if (adapter->is_pci11x1x) ret =lan743x_hs_eeprom_read (adapter, ee->offset, ee->len, data);
@@ -497,8 +671,12 @@ static int lan743x_ethtool_set_eeprom(struct net_device *netdev,if (adapter->flags &LAN743X_ADAPTER_FLAG_OTP ) {/* Beware! OTP is One Time Programming ONLY! */ if (ee->magic ==LAN743X_OTP_MAGIC ) { - ret =lan743x_otp_write (adapter, ee->offset, - ee->len, data); +if (adapter->is_pci11x1x) + ret =lan743x_hs_otp_write (adapter, ee->offset, + ee->len, data); +else + ret =lan743x_otp_write (adapter, ee->offset, + ee->len, data); } }else {if (ee->magic ==LAN743X_EEPROM_MAGIC ) {
drivers/net/ethernet/microchip/lan743x_main.h +14 -0
@@ -556,6 +556,20 @@#define OTP_STATUS (0x1030)#define OTP_STATUS_BUSY_ BIT(0) +/* Hearthstone OTP block registers */ +#define HS_OTP_BLOCK_BASE (ETH_SYS_REG_ADDR_BASE + \ + ETH_OTP_REG_ADDR_BASE) +#define HS_OTP_PWR_DN (HS_OTP_BLOCK_BASE + 0x0) +#define HS_OTP_ADDR_HIGH (HS_OTP_BLOCK_BASE + 0x4) +#define HS_OTP_ADDR_LOW (HS_OTP_BLOCK_BASE + 0x8) +#define HS_OTP_PRGM_DATA (HS_OTP_BLOCK_BASE + 0x10) +#define HS_OTP_PRGM_MODE (HS_OTP_BLOCK_BASE + 0x14) +#define HS_OTP_READ_DATA (HS_OTP_BLOCK_BASE + 0x18) +#define HS_OTP_FUNC_CMD (HS_OTP_BLOCK_BASE + 0x20) +#define HS_OTP_TST_CMD (HS_OTP_BLOCK_BASE + 0x24) +#define HS_OTP_CMD_GO (HS_OTP_BLOCK_BASE + 0x28) +#define HS_OTP_STATUS (HS_OTP_BLOCK_BASE + 0x30) +/* MAC statistics registers */ #define STAT_RX_FCS_ERRORS (0x1200)#define STAT_RX_ALIGNMENT_ERRORS (0x1204)
Signature · 1 line
2.25.1
PATCH 4/5 net: lan743x: Add support for PTP-IO Event Input External Timestamp (extts)
In reply to Raju LakkarajuPTP-IOs block provides for time stamping PTP-IO input events. PTP-IOs are numbered from 0 to 11.
When a PTP-IO is enabled by the corresponding bit in the PTP-IO Capture Configuration Register, a rising or falling edge, respectively, will capture the 1588 Local Time Counter
--- drivers/net/ethernet/microchip/lan743x_main.h | 73 ++++ drivers/net/ethernet/microchip/lan743x_ptp.c | 329 ++++++++++++++++-- drivers/net/ethernet/microchip/lan743x_ptp.h | 9 + 3 files changed, 375 insertions(+), 36 deletions(-)
drivers/net/ethernet/microchip/lan743x_main.h +73 -0
@@ -358,8 +358,18 @@#define PTP_GENERAL_CONFIG_RELOAD_ADD_X_ (channel) (BIT((channel) << 2))#define PTP_INT_STS (0x0A08) +#define PTP_INT_IO_FE_MASK_ GENMASK(31, 24) +#define PTP_INT_IO_FE_SHIFT_ (24) +#define PTP_INT_IO_FE_SET_ (channel) BIT(24 + (channel)) +#define PTP_INT_IO_RE_MASK_ GENMASK(23, 16) +#define PTP_INT_IO_RE_SHIFT_ (16) +#define PTP_INT_IO_RE_SET_ (channel) BIT(16 + (channel))#define PTP_INT_EN_SET (0x0A0C) +#define PTP_INT_EN_FE_EN_SET_ (channel) BIT(24 + (channel)) +#define PTP_INT_EN_RE_EN_SET_ (channel) BIT(16 + (channel))#define PTP_INT_EN_CLR (0x0A10) +#define PTP_INT_EN_FE_EN_CLR_ (channel) BIT(24 + (channel)) +#define PTP_INT_EN_RE_EN_CLR_ (channel) BIT(16 + (channel))#define PTP_INT_BIT_TX_SWTS_ERR_ BIT(13)#define PTP_INT_BIT_TX_TS_ BIT(12)#define PTP_INT_BIT_TIMER_B_ BIT(1)
@@ -377,6 +387,16 @@#define PTP_CLOCK_TARGET_NS_X (channel) (0x0A34 + ((channel) << 4))#define PTP_CLOCK_TARGET_RELOAD_SEC_X (channel) (0x0A38 + ((channel) << 4))#define PTP_CLOCK_TARGET_RELOAD_NS_X (channel) (0x0A3C + ((channel) << 4)) +#define PTP_LTC_SET_SEC_HI (0x0A50) +#define PTP_LTC_SET_SEC_HI_SEC_47_32_MASK_ GENMASK(15, 0) +#define PTP_VERSION (0x0A54) +#define PTP_VERSION_TX_UP_MASK_ GENMASK(31, 24) +#define PTP_VERSION_TX_LO_MASK_ GENMASK(23, 16) +#define PTP_VERSION_RX_UP_MASK_ GENMASK(15, 8) +#define PTP_VERSION_RX_LO_MASK_ GENMASK(7, 0) +#define PTP_IO_SEL (0x0A58) +#define PTP_IO_SEL_MASK_ GENMASK(10, 8) +#define PTP_IO_SEL_SHIFT_ (8)#define PTP_LATENCY (0x0A5C)#define PTP_LATENCY_TX_SET_ (tx_latency) (((u32)(tx_latency)) << 16)#define PTP_LATENCY_RX_SET_ (rx_latency) \
@@ -401,6 +421,59 @@#define PTP_TX_MSG_HEADER_MSG_TYPE_ (0x000F0000)#define PTP_TX_MSG_HEADER_MSG_TYPE_SYNC_ (0x00000000) +#define PTP_TX_CAP_INFO (0x0AB8) +#define PTP_TX_CAP_INFO_TX_CH_MASK_ GENMASK(1, 0) +#define PTP_TX_DOMAIN (0x0ABC) +#define PTP_TX_DOMAIN_MASK_ GENMASK(23, 16) +#define PTP_TX_DOMAIN_RANGE_EN_ BIT(15) +#define PTP_TX_DOMAIN_RANGE_MASK_ GENMASK(7, 0) +#define PTP_TX_SDOID (0x0AC0) +#define PTP_TX_SDOID_MASK_ GENMASK(23, 16) +#define PTP_TX_SDOID_RANGE_EN_ BIT(15) +#define PTP_TX_SDOID_11_0_MASK_ GENMASK(7, 0) +#define PTP_IO_CAP_CONFIG (0x0AC4) +#define PTP_IO_CAP_CONFIG_LOCK_FE_ (channel) BIT(24 + (channel)) +#define PTP_IO_CAP_CONFIG_LOCK_RE_ (channel) BIT(16 + (channel)) +#define PTP_IO_CAP_CONFIG_FE_CAP_EN_ (channel) BIT(8 + (channel)) +#define PTP_IO_CAP_CONFIG_RE_CAP_EN_ (channel) BIT(0 + (channel)) +#define PTP_IO_RE_LTC_SEC_CAP_X (0x0AC8) +#define PTP_IO_RE_LTC_NS_CAP_X (0x0ACC) +#define PTP_IO_FE_LTC_SEC_CAP_X (0x0AD0) +#define PTP_IO_FE_LTC_NS_CAP_X (0x0AD4) +#define PTP_IO_EVENT_OUTPUT_CFG (0x0AD8) +#define PTP_IO_EVENT_OUTPUT_CFG_SEL_ (channel) BIT(16 + (channel)) +#define PTP_IO_EVENT_OUTPUT_CFG_EN_ (channel) BIT(0 + (channel)) +#define PTP_IO_PIN_CFG (0x0ADC) +#define PTP_IO_PIN_CFG_OBUF_TYPE_ (channel) BIT(0 + (channel)) +#define PTP_LTC_RD_SEC_HI (0x0AF0) +#define PTP_LTC_RD_SEC_HI_SEC_47_32_MASK_ GENMASK(15, 0) +#define PTP_LTC_RD_SEC_LO (0x0AF4) +#define PTP_LTC_RD_NS (0x0AF8) +#define PTP_LTC_RD_NS_29_0_MASK_ GENMASK(29, 0) +#define PTP_LTC_RD_SUBNS (0x0AFC) +#define PTP_RX_USER_MAC_HI (0x0B00) +#define PTP_RX_USER_MAC_HI_47_32_MASK_ GENMASK(15, 0) +#define PTP_RX_USER_MAC_LO (0x0B04) +#define PTP_RX_USER_IP_ADDR_0 (0x0B20) +#define PTP_RX_USER_IP_ADDR_1 (0x0B24) +#define PTP_RX_USER_IP_ADDR_2 (0x0B28) +#define PTP_RX_USER_IP_ADDR_3 (0x0B2C) +#define PTP_RX_USER_IP_MASK_0 (0x0B30) +#define PTP_RX_USER_IP_MASK_1 (0x0B34) +#define PTP_RX_USER_IP_MASK_2 (0x0B38) +#define PTP_RX_USER_IP_MASK_3 (0x0B3C) +#define PTP_TX_USER_MAC_HI (0x0B40) +#define PTP_TX_USER_MAC_HI_47_32_MASK_ GENMASK(15, 0) +#define PTP_TX_USER_MAC_LO (0x0B44) +#define PTP_TX_USER_IP_ADDR_0 (0x0B60) +#define PTP_TX_USER_IP_ADDR_1 (0x0B64) +#define PTP_TX_USER_IP_ADDR_2 (0x0B68) +#define PTP_TX_USER_IP_ADDR_3 (0x0B6C) +#define PTP_TX_USER_IP_MASK_0 (0x0B70) +#define PTP_TX_USER_IP_MASK_1 (0x0B74) +#define PTP_TX_USER_IP_MASK_2 (0x0B78) +#define PTP_TX_USER_IP_MASK_3 (0x0B7C) +#define DMAC_CFG (0xC00)#define DMAC_CFG_COAL_EN_ BIT(16)#define DMAC_CFG_CH_ARB_SEL_RX_HIGH_ (0x00000000)
drivers/net/ethernet/microchip/lan743x_ptp.c +293 -36
417 lines not on this page · raw message
drivers/net/ethernet/microchip/lan743x_ptp.h +9 -0
@@ -18,6 +18,9 @@*/ #define LAN743X_PTP_N_EVENT_CHAN 2#define LAN743X_PTP_N_PEROUT LAN743X_PTP_N_EVENT_CHAN +#define LAN743X_PTP_N_EXTTS 4 +#define LAN743X_PTP_N_PPS 0 +#define PCI11X1X_PTP_IO_MAX_CHANNELS 8struct lan743x_adapter ;
@@ -60,6 +63,11 @@ struct lan743x_ptp_perout {int gpio_pin;/* GPIO pin where output appears */ }; +struct lan743x_extts { +int flags; +struct timespec64 ts; +}; +struct lan743x_ptp {int flags;
@@ -72,6 +80,7 @@ struct lan743x_ptp {unsigned long used_event_ch;struct lan743x_ptp_perout perout[LAN743X_PTP_N_PEROUT ]; +struct lan743x_extts extts[LAN743X_PTP_N_EXTTS ];bool leds_multiplexed;bool led_enabled[LAN7430_N_LED ];
Signature · 1 line
2.25.1
PATCH 5/5 net: lan743x: Add support for PTP-IO Event Output (Periodic Output)
In reply to Raju LakkarajuAdd support for PTP-IO Event Output (Periodic Output - perout) for PCI11010/PCI11414 chips
--- drivers/net/ethernet/microchip/lan743x_main.h | 33 +++ drivers/net/ethernet/microchip/lan743x_ptp.c | 217 +++++++++++++++++- drivers/net/ethernet/microchip/lan743x_ptp.h | 1 + 3 files changed, 249 insertions(+), 2 deletions(-)
drivers/net/ethernet/microchip/lan743x_main.h +33 -0
@@ -336,6 +336,7 @@#define INT_MOD_CFG9 (0x7E4)#define PTP_CMD_CTL (0x0A00) +#define PTP_CMD_CTL_PTP_LTC_TARGET_READ_ BIT(13)#define PTP_CMD_CTL_PTP_CLK_STP_NSEC_ BIT(6)#define PTP_CMD_CTL_PTP_CLOCK_STEP_SEC_ BIT(5)#define PTP_CMD_CTL_PTP_CLOCK_LOAD_ BIT(4)
@@ -357,6 +358,30 @@ (((value) & 0x7) << (1 + ((channel) << 2)))#define PTP_GENERAL_CONFIG_RELOAD_ADD_X_ (channel) (BIT((channel) << 2)) +#define HS_PTP_GENERAL_CONFIG (0x0A04) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_X_MASK_ (channel) \ + (0xf << (4 + ((channel) << 2))) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_100NS_ (0) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_500NS_ (1) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_1US_ (2) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_5US_ (3) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_10US_ (4) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_50US_ (5) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_100US_ (6) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_500US_ (7) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_1MS_ (8) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_5MS_ (9) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_10MS_ (10) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_50MS_ (11) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_100MS_ (12) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_200MS_ (13) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_TOGG_ (14) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_INT_ (15) +#define HS_PTP_GENERAL_CONFIG_CLOCK_EVENT_X_SET_ (channel, value) \ + (((value) & 0xf) << (4 + ((channel) << 2))) +#define HS_PTP_GENERAL_CONFIG_EVENT_POL_X_ (channel) (BIT(1 + ((channel) * 2))) +#define HS_PTP_GENERAL_CONFIG_RELOAD_ADD_X_ (channel) (BIT((channel) * 2)) +#define PTP_INT_STS (0x0A08)#define PTP_INT_IO_FE_MASK_ GENMASK(31, 24)#define PTP_INT_IO_FE_SHIFT_ (24)
@@ -364,9 +389,17 @@#define PTP_INT_IO_RE_MASK_ GENMASK(23, 16)#define PTP_INT_IO_RE_SHIFT_ (16)#define PTP_INT_IO_RE_SET_ (channel) BIT(16 + (channel)) +#define PTP_INT_TX_TS_OVRFL_INT_ BIT(14) +#define PTP_INT_TX_SWTS_ERR_INT_ BIT(13) +#define PTP_INT_TX_TS_INT_ BIT(12) +#define PTP_INT_RX_TS_OVRFL_INT_ BIT(9) +#define PTP_INT_RX_TS_INT_ BIT(8) +#define PTP_INT_TIMER_INT_B_ BIT(1) +#define PTP_INT_TIMER_INT_A_ BIT(0)#define PTP_INT_EN_SET (0x0A0C)#define PTP_INT_EN_FE_EN_SET_ (channel) BIT(24 + (channel))#define PTP_INT_EN_RE_EN_SET_ (channel) BIT(16 + (channel)) +#define PTP_INT_EN_TIMER_SET_ (channel) BIT(channel)#define PTP_INT_EN_CLR (0x0A10)#define PTP_INT_EN_FE_EN_CLR_ (channel) BIT(24 + (channel))#define PTP_INT_EN_RE_EN_CLR_ (channel) BIT(16 + (channel))
drivers/net/ethernet/microchip/lan743x_ptp.c +215 -2
230 lines not on this page · raw message
drivers/net/ethernet/microchip/lan743x_ptp.h +1 -0
@@ -80,6 +80,7 @@ struct lan743x_ptp {unsigned long used_event_ch;struct lan743x_ptp_perout perout[LAN743X_PTP_N_PEROUT ]; +int ptp_io_perout[LAN743X_PTP_N_PEROUT ];/* PTP event channel (0=channel A, 1=channel B) */ struct lan743x_extts extts[LAN743X_PTP_N_EXTTS ];bool leds_multiplexed;
Signature · 1 line
2.25.1
kernel test robot
build botRe: [PATCH net-next 4/5] net: lan743x: Add support for PTP-IO Event Input External Timestamp (extts)
In reply to Raju LakkarajuThank you for the patch! Perhaps something to improve:
Hi Raju,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
url: https://github.com/0day-ci/linux/commits/Raju-Lakkaraju/net-lan743x-PCI11010-PCI11414-devices-Enhancements/20220315-141814 base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git bdd6a89de44b9e07d0b106076260d2367fe0e49a config: arc-allyesconfig (https://download.01.org/0day-ci/archive/20220315/[email protected]/config) compiler: arceb-elf-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/11e2990b814fce8f91e9aa9d11d9dc04869d6856
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Raju-Lakkaraju/net-lan743x-PCI11010-PCI11414-devices-Enhancements/20220315-141814 git checkout 11e2990b814fce8f91e9aa9d11d9dc04869d6856
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arc SHELL=/bin/bash drivers/net/ethernet/microchip/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
drivers/net/ethernet/microchip/lan743x_ptp.c: In function 'lan743x_ptp_io_extts':
>> drivers/net/ethernet/microchip/lan743x_ptp.c:776:31: warning: variable 'extts' set but not used [-Wunused-but-set-variable]
776 | struct lan743x_extts *extts;
| ^~~~~vim +/extts +776 drivers/net/ethernet/microchip/lan743x_ptp.c
769
770 static int lan743x_ptp_io_extts(struct lan743x_adapter *adapter, int on,
771 struct ptp_extts_request *extts_request)
772 {
773 struct lan743x_ptp *ptp = &adapter->ptp;
774 u32 flags = extts_request->flags;
775 u32 index = extts_request->index;
> 776 struct lan743x_extts *extts;
777 int extts_pin;
778 int ret = 0;
779
780 extts = &ptp->extts[index];
781
782 if (on) {
783 extts_pin = ptp_find_pin(ptp->ptp_clock, PTP_PF_EXTTS, index);
784 if (extts_pin < 0)
785 return -EBUSY;
786
787 ret = lan743x_ptp_io_event_cap_en(adapter, flags, index);
788 } else {
789 lan743x_ptp_io_extts_off(adapter, index);
790 }
791
792 return ret;
793 }
794
---
0-DAY CI Kernel Test Service
https://lists.01.org/hyperkitty/list/[email protected]
kernel test robot
build botRe: [PATCH net-next 4/5] net: lan743x: Add support for PTP-IO Event Input External Timestamp (extts)
In reply to Raju LakkarajuThank you for the patch! Perhaps something to improve:
Hi Raju,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
url: https://github.com/0day-ci/linux/commits/Raju-Lakkaraju/net-lan743x-PCI11010-PCI11414-devices-Enhancements/20220315-141814 base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git bdd6a89de44b9e07d0b106076260d2367fe0e49a config: i386-randconfig-a015-20220314 (https://download.01.org/0day-ci/archive/20220315/[email protected]/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project a6b2f50fb47da3baeee10b1906da6e30ac5d26ec)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/11e2990b814fce8f91e9aa9d11d9dc04869d6856
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Raju-Lakkaraju/net-lan743x-PCI11010-PCI11414-devices-Enhancements/20220315-141814 git checkout 11e2990b814fce8f91e9aa9d11d9dc04869d6856
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/net/ethernet/microchip/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/net/ethernet/microchip/lan743x_ptp.c:776:24: warning: variable 'extts' set but not used [-Wunused-but-set-variable]
struct lan743x_extts *extts;
^1 warning generated.
vim +/extts +776 drivers/net/ethernet/microchip/lan743x_ptp.c
769
770 static int lan743x_ptp_io_extts(struct lan743x_adapter *adapter, int on,
771 struct ptp_extts_request *extts_request)
772 {
773 struct lan743x_ptp *ptp = &adapter->ptp;
774 u32 flags = extts_request->flags;
775 u32 index = extts_request->index;
> 776 struct lan743x_extts *extts;
777 int extts_pin;
778 int ret = 0;
779
780 extts = &ptp->extts[index];
781
782 if (on) {
783 extts_pin = ptp_find_pin(ptp->ptp_clock, PTP_PF_EXTTS, index);
784 if (extts_pin < 0)
785 return -EBUSY;
786
787 ret = lan743x_ptp_io_event_cap_en(adapter, flags, index);
788 } else {
789 lan743x_ptp_io_extts_off(adapter, index);
790 }
791
792 return ret;
793 }
794
---
0-DAY CI Kernel Test Service
https://lists.01.org/hyperkitty/list/[email protected]
Re: [PATCH net-next 2/5] net: lan743x: Add support for EEPROM
In reply to Raju LakkarajuQuoted 21 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +21
-0+static int lan743x_hs_syslock_acquire (struct lan743x_adapter *adapter, +u16 timeout) +{ +u16 timeout_cnt =0 ; +u32 val; + + do { + spin_lock(&adapter->eth_syslock_spinlock); + if (adapter->eth_syslock_acquire_cnt == 0) { + lan743x_csr_write(adapter, ETH_SYSTEM_SYS_LOCK_REG, + SYS_LOCK_REG_ENET_SS_LOCK_); + val = lan743x_csr_read(adapter, ETH_SYSTEM_SYS_LOCK_REG); + if (val & SYS_LOCK_REG_ENET_SS_LOCK_) { + adapter->eth_syslock_acquire_cnt++; + WARN_ON(adapter->eth_syslock_acquire_cnt == 0); + spin_unlock(&adapter->eth_syslock_spinlock); + break; + } + } else { + adapter->eth_syslock_acquire_cnt++; + WARN_ON(adapter->eth_syslock_acquire_cnt == 0);
drivers/net/ethernet/microchip/lan743x_ethtool.c static int lan743x_otp_write(struct lan743x_adapter *adapter, u32 offset, · line 185
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +10
-0+spin_unlock (&adapter->eth_syslock_spinlock); +break ; + } + +spin_unlock (&adapter->eth_syslock_spinlock); + +if (timeout_cnt++ < timeout) +usleep_range (10000 ,11000 ); +else +return -EINVAL ;
ETIMEDOUT should be used for a timeout.
Quoted 9 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +9
-0+static int lan743x_hs_eeprom_cmd_cmplt_chk (struct lan743x_adapter *adapter) +{ +unsigned long start_time = jiffies; +u32 val; + + do { + val = lan743x_csr_read(adapter, HS_E2P_CMD); + if (!(val & HS_E2P_CMD_EPC_BUSY_) || + (val & HS_E2P_CMD_EPC_TIMEOUT_))
drivers/net/ethernet/microchip/lan743x_ethtool.c static int lan743x_eeprom_write(struct lan743x_adapter *adapter, · line 343
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +10
-0+break ; + +usleep_range (50 ,60 ); + }while (!time_after (jiffies, start_time +HZ )); + +if (val & (HS_E2P_CMD_EPC_TIMEOUT_ |HS_E2P_CMD_EPC_BUSY_ )) { +netif_warn (adapter, drv, adapter->netdev, +"HS EEPROM operation timeout/busy\n" ); +return -ETIMEDOUT ; + }
It looks like iopoll.h should be used here.
drivers/net/ethernet/microchip/lan743x_ethtool.c static int lan743x_eeprom_write(struct lan743x_adapter *adapter, · line 401
Quoted 9 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +9
-0+static int lan743x_hs_eeprom_write (struct lan743x_adapter *adapter, +u32 offset,u32 length,u8 *data) +{ +int retval; +u32 val; +int i; + +if (offset + length >MAX_EEPROM_SIZE ) +return -EINVAL ;
The core should of already checked this. Look at net/ethtool/ioctl.c
Andrew
Re: [PATCH net-next 3/5] net: lan743x: Add support for OTP
In reply to Raju LakkarajuQuoted 8 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +8
-0+static int lan743x_hs_otp_cmd_cmplt_chk (struct lan743x_adapter *adapter) +{ +unsigned long start_time = jiffies; +u32 val; + + do { + val = lan743x_csr_read(adapter, HS_OTP_STATUS); + if (!(val & OTP_STATUS_BUSY_))
drivers/net/ethernet/microchip/lan743x_ethtool.c static void lan743x_hs_syslock_release(struct lan743x_adapter *adapter) · line 273
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +10
-0+break ; + +usleep_range (80 ,100 ); + }while (!time_after (jiffies, start_time +HZ )); + +if (val &OTP_STATUS_BUSY_ ) { +netif_warn (adapter, drv, adapter->netdev, +"Timeout on HS_OTP_STATUS completion\n" ); +return -ETIMEDOUT ; + }
iopoll.h
drivers/net/ethernet/microchip/lan743x_ethtool.c static void lan743x_hs_syslock_release(struct lan743x_adapter *adapter) · line 285
Quoted 8 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +8
-0+static int lan743x_hs_otp_read (struct lan743x_adapter *adapter,u32 offset, +u32 length,u8 *data) +{ +int ret; +int i; + +if (offset + length >MAX_OTP_SIZE ) +return -EINVAL ;
The core does this.
drivers/net/ethernet/microchip/lan743x_ethtool.c static void lan743x_hs_syslock_release(struct lan743x_adapter *adapter) · line 336
Quoted 8 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +8
-0+static int lan743x_hs_otp_write (struct lan743x_adapter *adapter,u32 offset, +u32 length,u8 *data) +{ +int ret; +int i; + +if (offset + length >MAX_OTP_SIZE ) +return -EINVAL ;
The core does this.
Andrew
Re: [PATCH net-next 4/5] net: lan743x: Add support for PTP-IO Event Input External Timestamp (extts)
In reply to Raju LakkarajuQuoted 5 lines · Raju Lakkaraju
PTP-IOs block provides for time stamping PTP-IO input events. PTP-IOs are numbered from 0 to 11.
When a PTP-IO is enabled by the corresponding bit in the PTP-IO Capture Configuration Register, a rising or falling edge, respectively, will capture the 1588 Local Time Counter
For PTP patches, please always Cc: the PTP maintainer.
Andrew
Re: [PATCH net-next 2/5] net: lan743x: Add support for EEPROM
In reply to Andrew LunnHi Andrew,
Thank you for review comments
Quoted 27 lines · Andrew Lunn
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 25 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +25
-0+static int lan743x_hs_syslock_acquire (struct lan743x_adapter *adapter, +u16 timeout) +{ +u16 timeout_cnt =0 ; +u32 val; + + do { + spin_lock(&adapter->eth_syslock_spinlock); + if (adapter->eth_syslock_acquire_cnt == 0) { + lan743x_csr_write(adapter, ETH_SYSTEM_SYS_LOCK_REG, + SYS_LOCK_REG_ENET_SS_LOCK_); + val = lan743x_csr_read(adapter, ETH_SYSTEM_SYS_LOCK_REG); + if (val & SYS_LOCK_REG_ENET_SS_LOCK_) { + adapter->eth_syslock_acquire_cnt++; + WARN_ON(adapter->eth_syslock_acquire_cnt == 0); + spin_unlock(&adapter->eth_syslock_spinlock); + break; + } + } else { + adapter->eth_syslock_acquire_cnt++; + WARN_ON(adapter->eth_syslock_acquire_cnt == 0); + spin_unlock(&adapter->eth_syslock_spinlock); + break; + } +
Quoted 9 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c static int lan743x_otp_write(struct lan743x_adapter *adapter, u32 offset, · line 185
Quoted 6 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +6
-0+spin_unlock (&adapter->eth_syslock_spinlock); + +if (timeout_cnt++ < timeout) +usleep_range (10000 ,11000 ); +else +return -EINVAL ;ETIMEDOUT should be used for a timeout.
Accpeted. Fix in V1 patches
Quoted 13 lines
Quoted 13 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +13
-0+static int lan743x_hs_eeprom_cmd_cmplt_chk (struct lan743x_adapter *adapter) +{ +unsigned long start_time = jiffies; +u32 val; + +do { + val =lan743x_csr_read (adapter,HS_E2P_CMD ); +if (!(val &HS_E2P_CMD_EPC_BUSY_ ) || + (val &HS_E2P_CMD_EPC_TIMEOUT_ )) +break ; + +usleep_range (50 ,60 ); + }while (!time_after (jiffies, start_time +HZ ));
Quoted 9 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c static int lan743x_eeprom_write(struct lan743x_adapter *adapter, · line 343
Quoted 6 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +6
-0+ +if (val & (HS_E2P_CMD_EPC_TIMEOUT_ |HS_E2P_CMD_EPC_BUSY_ )) { +netif_warn (adapter, drv, adapter->netdev, +"HS EEPROM operation timeout/busy\n" ); +return -ETIMEDOUT ; + }It looks like
iopoll.hshould be used here.
Accepted. Fix in V1 patches
Quoted 12 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c static int lan743x_eeprom_write(struct lan743x_adapter *adapter, · line 401
Quoted 9 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +9
-0+static int lan743x_hs_eeprom_write (struct lan743x_adapter *adapter, +u32 offset,u32 length,u8 *data) +{ +int retval; +u32 val; +int i; + +if (offset + length >MAX_EEPROM_SIZE ) +return -EINVAL ;The core should of already checked this. Look at
net/ethtool/ioctl.c
Quoted 1 line
Andrew
Accepted. Fix in V1 patches
Signature · 2 lines
Thanks, Raju
Re: [PATCH net-next 3/5] net: lan743x: Add support for OTP
In reply to Andrew LunnHi Andrew
Quoted 14 lines · Andrew Lunn
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 12 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +12
-0+static int lan743x_hs_otp_cmd_cmplt_chk (struct lan743x_adapter *adapter) +{ +unsigned long start_time = jiffies; +u32 val; + +do { + val =lan743x_csr_read (adapter,HS_OTP_STATUS ); +if (!(val &OTP_STATUS_BUSY_ )) +break ; + +usleep_range (80 ,100 ); + }while (!time_after (jiffies, start_time +HZ ));
Quoted 9 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c static void lan743x_hs_syslock_release(struct lan743x_adapter *adapter) · line 273
Quoted 6 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +6
-0+ +if (val &OTP_STATUS_BUSY_ ) { +netif_warn (adapter, drv, adapter->netdev, +"Timeout on HS_OTP_STATUS completion\n" ); +return -ETIMEDOUT ; + }
iopoll.h
Accepted. Fix in V1 patches
Quoted 11 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c static void lan743x_hs_syslock_release(struct lan743x_adapter *adapter) · line 285
Quoted 8 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +8
-0+static int lan743x_hs_otp_read (struct lan743x_adapter *adapter,u32 offset, +u32 length,u8 *data) +{ +int ret; +int i; + +if (offset + length >MAX_OTP_SIZE ) +return -EINVAL ;The core does this.
Accepted. Fix in V1 patches
Quoted 11 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c static void lan743x_hs_syslock_release(struct lan743x_adapter *adapter) · line 336
Quoted 8 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +8
-0+static int lan743x_hs_otp_write (struct lan743x_adapter *adapter,u32 offset, +u32 length,u8 *data) +{ +int ret; +int i; + +if (offset + length >MAX_OTP_SIZE ) +return -EINVAL ;The core does this.
Accepted. Fix in V1 patches
Quoted 1 line
Andrew
Signature · 2 lines
Thanks, Raju
Re: [PATCH net-next 4/5] net: lan743x: Add support for PTP-IO Event Input External Timestamp (extts)
In reply to Andrew LunnHi Andrew,
Quoted 11 lines · Andrew Lunn
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 5 lines · Raju Lakkaraju
PTP-IOs block provides for time stamping PTP-IO input events. PTP-IOs are numbered from 0 to 11.
When a PTP-IO is enabled by the corresponding bit in the PTP-IO Capture Configuration Register, a rising or falling edge, respectively, will capture the 1588 Local Time CounterFor PTP patches, please always Cc: the PTP maintainer.
Accepted. Fix in V1 patches
Quoted 1 line
Andrew
Signature · 2 lines
Thanks, Raju