net: intel: igb: minor ethool regdump amendment
Subsystems (3)
PATCH 1/2 net: intel: igb: minor ethool regdump amendment
From: Artem Bityutskiy <[email protected]>
This patch has no functional impact and it is just a preparation for the following patch. It removes an early return from the 'igb_get_regs()' function by moving the 82576-only registers dump into an "if" block. With this preparation, we can dump more non-82576 registers at the end of this function.
--- drivers/net/ethernet/intel/igb/igb_ethtool.c | 70 ++++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-)
drivers/net/ethernet/intel/igb/igb_ethtool.c +35 -35
@@ -675,41 +675,41 @@ static void igb_get_regs(struct net_device *netdev, regs_buff[554 ] = adapter->stats.b2ogprc; } -if (hw->mac.type != e1000_82576) -return ; -for (i =0 ; i <12 ; i++) - regs_buff[555 + i] =rd32 (E1000_SRRCTL (i +4 )); -for (i =0 ; i <4 ; i++) - regs_buff[567 + i] =rd32 (E1000_PSRTYPE (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[571 + i] =rd32 (E1000_RDBAL (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[583 + i] =rd32 (E1000_RDBAH (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[595 + i] =rd32 (E1000_RDLEN (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[607 + i] =rd32 (E1000_RDH (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[619 + i] =rd32 (E1000_RDT (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[631 + i] =rd32 (E1000_RXDCTL (i +4 )); - -for (i =0 ; i <12 ; i++) - regs_buff[643 + i] =rd32 (E1000_TDBAL (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[655 + i] =rd32 (E1000_TDBAH (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[667 + i] =rd32 (E1000_TDLEN (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[679 + i] =rd32 (E1000_TDH (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[691 + i] =rd32 (E1000_TDT (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[703 + i] =rd32 (E1000_TXDCTL (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[715 + i] =rd32 (E1000_TDWBAL (i +4 )); -for (i =0 ; i <12 ; i++) - regs_buff[727 + i] =rd32 (E1000_TDWBAH (i +4 )); +if (hw->mac.type == e1000_82576) { +for (i =0 ; i <12 ; i++) + regs_buff[555 + i] =rd32 (E1000_SRRCTL (i +4 )); +for (i =0 ; i <4 ; i++) + regs_buff[567 + i] =rd32 (E1000_PSRTYPE (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[571 + i] =rd32 (E1000_RDBAL (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[583 + i] =rd32 (E1000_RDBAH (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[595 + i] =rd32 (E1000_RDLEN (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[607 + i] =rd32 (E1000_RDH (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[619 + i] =rd32 (E1000_RDT (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[631 + i] =rd32 (E1000_RXDCTL (i +4 )); + +for (i =0 ; i <12 ; i++) + regs_buff[643 + i] =rd32 (E1000_TDBAL (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[655 + i] =rd32 (E1000_TDBAH (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[667 + i] =rd32 (E1000_TDLEN (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[679 + i] =rd32 (E1000_TDH (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[691 + i] =rd32 (E1000_TDT (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[703 + i] =rd32 (E1000_TXDCTL (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[715 + i] =rd32 (E1000_TDWBAL (i +4 )); +for (i =0 ; i <12 ; i++) + regs_buff[727 + i] =rd32 (E1000_TDWBAH (i +4 )); + } }static int igb_get_eeprom_len (struct net_device *netdev)
Signature · 1 line
2.20.1
PATCH 2/2 net: intel: igb: add RR2DCDELAY to ethtool registers dump
From: Artem Bityutskiy <[email protected]>
This patch adds the RR2DCDELAY register to the ethtool registers dump. RR2DCDELAY exists on I210 and I211 Intel Gigabit Ethernet chips and it stands for "Read Request To Data Completion Delay". Here is how this register is described in the I210 datasheet:
"This field captures the maximum PCIe split time in 16 ns units, which is the maximum delay between the read request to the first data completion. This is giving an estimation of the PCIe round trip time."
In other words, whenever I210 reads from the host memory (e.g., fetches a descriptor from the ring), the chip measures every PCI DMA read transaction and captures the maximum value. So it ends up containing the longest DMA transaction time.
This register is very useful for troubleshooting and research purposes. If you are dealing with time-sensitive networks, this register can help you get an idea of your "I210-to-ring" latency. This helps answering questions like "should I have PCIe ASPM enabled?" or "should I enable deep C-states?" on my system.
It is safe to read this register at any point, reading it has no effect on the I210 chip functionality.
--- drivers/net/ethernet/intel/igb/e1000_regs.h | 2 ++ drivers/net/ethernet/intel/igb/igb_ethtool.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igb/e1000_regs.h +2 -0
@@ -409,6 +409,8 @@ do { \#define E1000_I210_TQAVCC (_n) (0x3004 + ((_n) * 0x40))#define E1000_I210_TQAVHC (_n) (0x300C + ((_n) * 0x40)) +#define E1000_I210_RR2DCDELAY 0x5BF4 +#define E1000_INVM_DATA_REG (_n) (0x12120 + 4*(_n))#define E1000_INVM_SIZE 64/* Number of INVM Data Registers */
drivers/net/ethernet/intel/igb/igb_ethtool.c +4 -1
@@ -448,7 +448,7 @@ static void igb_set_msglevel(struct net_device *netdev, u32 data)static int igb_get_regs_len (struct net_device *netdev) { -#define IGB_REGS_LEN 739 +#define IGB_REGS_LEN 740return IGB_REGS_LEN *sizeof (u32); }
@@ -710,6 +710,9 @@ static void igb_get_regs(struct net_device *netdev,for (i =0 ; i <12 ; i++) regs_buff[727 + i] =rd32 (E1000_TDWBAH (i +4 )); } + +if (hw->mac.type == e1000_i210 || hw->mac.type == e1000_i211) + regs_buff[739 ] =rd32 (E1000_I210_RR2DCDELAY ); }static int igb_get_eeprom_len (struct net_device *netdev)
Signature · 1 line
2.20.1
Re: [PATCH 2/2] net: intel: igb: add RR2DCDELAY to ethtool registers dump
Quoted 22 lines · Artem Bityutskiy
From: Artem Bityutskiy <[email protected]>
This patch adds the RR2DCDELAY register to the ethtool registers dump. RR2DCDELAY exists on I210 and I211 Intel Gigabit Ethernet chips and it stands for "Read Request To Data Completion Delay". Here is how this register is described in the I210 datasheet:
"This field captures the maximum PCIe split time in 16 ns units, which is the maximum delay between the read request to the first data completion. This is giving an estimation of the PCIe round trip time."
In other words, whenever I210 reads from the host memory (e.g., fetches a descriptor from the ring), the chip measures every PCI DMA read transaction and captures the maximum value. So it ends up containing the longest DMA transaction time.
This register is very useful for troubleshooting and research purposes. If you are dealing with time-sensitive networks, this register can help you get an idea of your "I210-to-ring" latency. This helps answering questions like "should I have PCIe ASPM enabled?" or "should I enable deep C-states?" on my system.
Quoted 9 lines
It is safe to read this register at any point, reading it has no effect on the I210 chip functionality.
Signed-off-by Artem Bityutskiy <[email protected]>--- drivers/net/ethernet/intel/igb/e1000_regs.h | 2 ++ drivers/net/ethernet/intel/igb/igb_ethtool.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-)
Quoted 1 line · Artem Bityutskiy
From: Artem Bityutskiy <[email protected]>
Hi Artem.
The subject line is missing a t in ethtool.
Quoted 1 line
Signed-off-by Artem Bityutskiy <[email protected]>
Otherwise
Andrew
Quoted 8 lines · Artem Bityutskiy
From: Artem Bityutskiy <[email protected]>
This patch has no functional impact and it is just a preparation for the following patch. It removes an early return from the '
igb_get_regs()' function by moving the 82576-only registers dump into an "if" block. With this preparation, we can dump more non-82576 registers at the end of this function.
Quoted 5 lines
Signed-off-by Artem Bityutskiy <[email protected]>--- drivers/net/ethernet/intel/igb/igb_ethtool.c | 70 ++++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-)
Aside from teh missing "t" for ethtool in the subject that Andrew Lunn pointed out...