* [PATCH ethtool-next v1] ethtool: remove ixgb support
@ 2023-03-23 19:54 Jesse Brandeburg
2023-03-23 23:41 ` Florian Fainelli
0 siblings, 1 reply; 3+ messages in thread
From: Jesse Brandeburg @ 2023-03-23 19:54 UTC (permalink / raw)
To: Michal Kubecek; +Cc: netdev, Jesse Brandeburg, Tony Nguyen
The ixgb driver is no longer in use so just remove the associated code.
The product was discontinued in 2010.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
Makefile.am | 2 +-
ethtool.c | 2 -
internal.h | 2 -
ixgb.c | 147 ----------------------------------------------------
4 files changed, 1 insertion(+), 152 deletions(-)
delete mode 100644 ixgb.c
diff --git a/Makefile.am b/Makefile.am
index c83cb18173db..5f220bf8bf2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ ethtool_SOURCES = ethtool.c uapi/linux/ethtool.h internal.h \
if ETHTOOL_ENABLE_PRETTY_DUMP
ethtool_SOURCES += \
amd8111e.c de2104x.c dsa.c e100.c e1000.c et131x.c igb.c \
- fec.c fec_8xx.c fsl_enetc.c ibm_emac.c ixgb.c ixgbe.c \
+ fec.c fec_8xx.c fsl_enetc.c ibm_emac.c ixgbe.c \
natsemi.c pcnet32.c realtek.c tg3.c marvell.c vioc.c \
smsc911x.c at76c50x-usb.c sfc.c stmmac.c \
sff-common.c sff-common.h sfpid.c sfpdiag.c \
diff --git a/ethtool.c b/ethtool.c
index 6022a6ecabc0..171482b71584 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -11,7 +11,6 @@
* ETHTOOL_PHYS_ID support by Chris Leech <christopher.leech@intel.com>
* e1000 support by Scott Feldman <scott.feldman@intel.com>
* e100 support by Wen Tao <wen-hwa.tao@intel.com>
- * ixgb support by Nicholas Nunley <Nicholas.d.nunley@intel.com>
* amd8111e support by Reeja John <reeja.john@amd.com>
* long arguments by Andi Kleen.
* SMSC LAN911x support by Steve Glendinning <steve.glendinning@smsc.com>
@@ -1134,7 +1133,6 @@ static const struct {
{ "e1000", e1000_dump_regs },
{ "e1000e", e1000_dump_regs },
{ "igb", igb_dump_regs },
- { "ixgb", ixgb_dump_regs },
{ "ixgbe", ixgbe_dump_regs },
{ "ixgbevf", ixgbevf_dump_regs },
{ "natsemi", natsemi_dump_regs },
diff --git a/internal.h b/internal.h
index 3923719c39d5..5336858b457e 100644
--- a/internal.h
+++ b/internal.h
@@ -332,8 +332,6 @@ int fec_8xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
int ibm_emac_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
/* Intel(R) PRO/10GBe Gigabit Adapter Family */
-int ixgb_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
-
int ixgbe_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
int ixgbevf_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
diff --git a/ixgb.c b/ixgb.c
deleted file mode 100644
index 8aec9a9d2258..000000000000
--- a/ixgb.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Copyright (c) 2006 Intel Corporation */
-#include <stdio.h>
-#include "internal.h"
-
-/* CTRL0 Bit Masks */
-#define IXGB_CTRL0_LRST 0x00000008
-#define IXGB_CTRL0_VME 0x40000000
-
-/* STATUS Bit Masks */
-#define IXGB_STATUS_LU 0x00000002
-#define IXGB_STATUS_BUS64 0x00001000
-#define IXGB_STATUS_PCIX_MODE 0x00002000
-#define IXGB_STATUS_PCIX_SPD_100 0x00004000
-#define IXGB_STATUS_PCIX_SPD_133 0x00008000
-
-/* RCTL Bit Masks */
-#define IXGB_RCTL_RXEN 0x00000002
-#define IXGB_RCTL_SBP 0x00000004
-#define IXGB_RCTL_UPE 0x00000008
-#define IXGB_RCTL_MPE 0x00000010
-#define IXGB_RCTL_RDMTS_MASK 0x00000300
-#define IXGB_RCTL_RDMTS_1_2 0x00000000
-#define IXGB_RCTL_RDMTS_1_4 0x00000100
-#define IXGB_RCTL_RDMTS_1_8 0x00000200
-#define IXGB_RCTL_BAM 0x00008000
-#define IXGB_RCTL_BSIZE_MASK 0x00030000
-#define IXGB_RCTL_BSIZE_4096 0x00010000
-#define IXGB_RCTL_BSIZE_8192 0x00020000
-#define IXGB_RCTL_BSIZE_16384 0x00030000
-#define IXGB_RCTL_VFE 0x00040000
-#define IXGB_RCTL_CFIEN 0x00080000
-
-/* TCTL Bit Masks */
-#define IXGB_TCTL_TXEN 0x00000002
-
-/* RAH Bit Masks */
-#define IXGB_RAH_ASEL_DEST 0x00000000
-#define IXGB_RAH_ASEL_SRC 0x00010000
-#define IXGB_RAH_AV 0x80000000
-
-int ixgb_dump_regs(struct ethtool_drvinfo *info __maybe_unused,
- struct ethtool_regs *regs)
-{
- u32 *regs_buff = (u32 *)regs->data;
- u8 version = (u8)(regs->version >> 24);
- u32 reg;
-
- if (version != 1)
- return -1;
- fprintf(stdout, "MAC Registers\n");
- fprintf(stdout, "-------------\n");
-
- /* Device control register */
- reg = regs_buff[0];
- fprintf(stdout,
- "0x00000: CTRL0 (Device control register) 0x%08X\n"
- " Link reset: %s\n"
- " VLAN mode: %s\n",
- reg,
- reg & IXGB_CTRL0_LRST ? "reset" : "normal",
- reg & IXGB_CTRL0_VME ? "enabled" : "disabled");
-
- /* Device status register */
- reg = regs_buff[2];
- fprintf(stdout,
- "0x00010: STATUS (Device status register) 0x%08X\n"
- " Link up: %s\n"
- " Bus type: %s\n"
- " Bus speed: %s\n"
- " Bus width: %s\n",
- reg,
- (reg & IXGB_STATUS_LU) ? "link config" : "no link config",
- (reg & IXGB_STATUS_PCIX_MODE) ? "PCI-X" : "PCI",
- ((reg & IXGB_STATUS_PCIX_SPD_133) ? "133MHz" :
- (reg & IXGB_STATUS_PCIX_SPD_100) ? "100MHz" :
- "66MHz"),
- (reg & IXGB_STATUS_BUS64) ? "64-bit" : "32-bit");
- /* Receive control register */
- reg = regs_buff[9];
- fprintf(stdout,
- "0x00100: RCTL (Receive control register) 0x%08X\n"
- " Receiver: %s\n"
- " Store bad packets: %s\n"
- " Unicast promiscuous: %s\n"
- " Multicast promiscuous: %s\n"
- " Descriptor minimum threshold size: %s\n"
- " Broadcast accept mode: %s\n"
- " VLAN filter: %s\n"
- " Cononical form indicator: %s\n",
- reg,
- reg & IXGB_RCTL_RXEN ? "enabled" : "disabled",
- reg & IXGB_RCTL_SBP ? "enabled" : "disabled",
- reg & IXGB_RCTL_UPE ? "enabled" : "disabled",
- reg & IXGB_RCTL_MPE ? "enabled" : "disabled",
- (reg & IXGB_RCTL_RDMTS_MASK) == IXGB_RCTL_RDMTS_1_2 ? "1/2" :
- (reg & IXGB_RCTL_RDMTS_MASK) == IXGB_RCTL_RDMTS_1_4 ? "1/4" :
- (reg & IXGB_RCTL_RDMTS_MASK) == IXGB_RCTL_RDMTS_1_8 ? "1/8" :
- "reserved",
- reg & IXGB_RCTL_BAM ? "accept" : "ignore",
- reg & IXGB_RCTL_VFE ? "enabled" : "disabled",
- reg & IXGB_RCTL_CFIEN ? "enabled" : "disabled");
- fprintf(stdout,
- " Receive buffer size: %s\n",
- (reg & IXGB_RCTL_BSIZE_MASK) == IXGB_RCTL_BSIZE_16384 ? "16384" :
- (reg & IXGB_RCTL_BSIZE_MASK) == IXGB_RCTL_BSIZE_8192 ? "8192" :
- (reg & IXGB_RCTL_BSIZE_MASK) == IXGB_RCTL_BSIZE_4096 ? "4096" :
- "2048");
-
- /* Receive descriptor registers */
- fprintf(stdout,
- "0x00120: RDLEN (Receive desc length) 0x%08X\n",
- regs_buff[14]);
- fprintf(stdout,
- "0x00128: RDH (Receive desc head) 0x%08X\n",
- regs_buff[15]);
- fprintf(stdout,
- "0x00130: RDT (Receive desc tail) 0x%08X\n",
- regs_buff[16]);
- fprintf(stdout,
- "0x00138: RDTR (Receive delay timer) 0x%08X\n",
- regs_buff[17]);
-
- /* Transmit control register */
- reg = regs_buff[53];
- fprintf(stdout,
- "0x00600: TCTL (Transmit ctrl register) 0x%08X\n"
- " Transmitter: %s\n",
- reg,
- reg & IXGB_TCTL_TXEN ? "enabled" : "disabled");
-
- /* Transmit descriptor registers */
- fprintf(stdout,
- "0x00610: TDLEN (Transmit desc length) 0x%08X\n",
- regs_buff[56]);
- fprintf(stdout,
- "0x00618: TDH (Transmit desc head) 0x%08X\n",
- regs_buff[57]);
- fprintf(stdout,
- "0x00620: TDT (Transmit desc tail) 0x%08X\n",
- regs_buff[58]);
- fprintf(stdout,
- "0x00628: TIDV (Transmit delay timer) 0x%08X\n",
- regs_buff[59]);
-
- return 0;
-}
-
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH ethtool-next v1] ethtool: remove ixgb support
2023-03-23 19:54 [PATCH ethtool-next v1] ethtool: remove ixgb support Jesse Brandeburg
@ 2023-03-23 23:41 ` Florian Fainelli
2023-04-18 23:12 ` Michal Kubecek
0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2023-03-23 23:41 UTC (permalink / raw)
To: Jesse Brandeburg, Michal Kubecek; +Cc: netdev, Tony Nguyen
On 3/23/23 12:54, Jesse Brandeburg wrote:
> The ixgb driver is no longer in use so just remove the associated code.
> The product was discontinued in 2010.
That is the case with most of the pretty dumping tools that ethtool
contains, yet we kept them because people might still have those
Ethernet NICs around, why should we treat ixgb differently here? The
amount of maintenance for this file is basically close to zero.
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH ethtool-next v1] ethtool: remove ixgb support
2023-03-23 23:41 ` Florian Fainelli
@ 2023-04-18 23:12 ` Michal Kubecek
0 siblings, 0 replies; 3+ messages in thread
From: Michal Kubecek @ 2023-04-18 23:12 UTC (permalink / raw)
To: Florian Fainelli; +Cc: Jesse Brandeburg, netdev, Tony Nguyen
[-- Attachment #1: Type: text/plain, Size: 759 bytes --]
On Thu, Mar 23, 2023 at 04:41:50PM -0700, Florian Fainelli wrote:
> On 3/23/23 12:54, Jesse Brandeburg wrote:
> > The ixgb driver is no longer in use so just remove the associated code.
> > The product was discontinued in 2010.
>
> That is the case with most of the pretty dumping tools that ethtool
> contains, yet we kept them because people might still have those Ethernet
> NICs around, why should we treat ixgb differently here? The amount of
> maintenance for this file is basically close to zero.
I agree with Florian. Unless there is an actual problem with the code,
keeping it does no harm and might actually help someone. People tend to
use all kinds of ancient hardware that vendors would like to believe to
be long gone.
Michal
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-18 23:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-23 19:54 [PATCH ethtool-next v1] ethtool: remove ixgb support Jesse Brandeburg
2023-03-23 23:41 ` Florian Fainelli
2023-04-18 23:12 ` Michal Kubecek
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).