/tools/perf/scripts/python/bin/

diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index 87c906e744fb..fb68339e1511 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c

@@ -270,7 +270,7 @@ static void el3_dev_fill(struct net_device *dev, __be16 *phys_addr, int ioaddr,

static void el3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c
index 8d90fed5d33e..2227c83a4862 100644
--- a/drivers/net/ethernet/3com/3c515.c
+++ b/drivers/net/ethernet/3com/3c515.c

-/* Allow setting MTU to a larger size, bypassing the normal ethernet setup. */

/* Maximum events (Rx packets, etc.) to handle at each interrupt. */

@@ -567,6 +566,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,

@@ -619,7 +619,6 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,

@@ -631,8 +630,9 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,

@@ -859,7 +859,7 @@ static int corkscrew_open(struct net_device *dev)

@@ -1050,7 +1050,7 @@ static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,

@@ -1414,7 +1414,7 @@ static int corkscrew_close(struct net_device *dev)

@@ -1526,7 +1526,7 @@ static void set_rx_mode(struct net_device *dev)

@@ -1547,9 +1547,8 @@ static const struct ethtool_ops netdev_ethtool_ops = {

diff --git a/drivers/net/ethernet/3com/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
index dd4d3c48b98d..1f2070497a75 100644
--- a/drivers/net/ethernet/3com/3c574_cs.c
+++ b/drivers/net/ethernet/3com/3c574_cs.c

@@ -305,15 +305,13 @@ static int tc574_config(struct pcmcia_device *link)

@@ -347,19 +345,20 @@ static int tc574_config(struct pcmcia_device *link)

@@ -859,7 +858,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)

diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index 09816e84314d..ea49be43b8c3 100644
--- a/drivers/net/ethernet/3com/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c

@@ -195,6 +195,7 @@ static int tc589_probe(struct pcmcia_device *link)

@@ -218,7 +219,15 @@ static int tc589_probe(struct pcmcia_device *link)

@@ -237,8 +246,8 @@ static void tc589_detach(struct pcmcia_device *link)

static const char * const ram_split[] = {"5:3", "3:1", "1:1", "3:5"};

@@ -246,7 +255,6 @@ static int tc589_config(struct pcmcia_device *link)

@@ -285,18 +293,19 @@ static int tc589_config(struct pcmcia_device *link)

/* The address and resource configuration register aren't loaded from

* the EEPROM and *must* be set to 0 and IRQ3 for the PCMCIA version.

@@ -480,7 +489,7 @@ static void tc589_reset(struct net_device *dev)

@@ -493,7 +502,7 @@ static int el3_config(struct net_device *dev, struct ifmap *map)

@@ -676,7 +685,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)

diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 17c16333a412..8c9cc97efd4e 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c

@@ -1091,6 +1091,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,

@@ -1284,7 +1285,8 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,

@@ -1300,7 +1302,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,

@@ -2689,7 +2691,7 @@ vortex_down(struct net_device *dev, int final_down)

@@ -2957,13 +2959,13 @@ static void vortex_get_drvinfo(struct net_device *dev,

diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index 706bd59bf645..1fbab79e2be4 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig

Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA

Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA

diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index 05e15b6e5e2c..aaaff3ba43ef 100644
--- a/drivers/net/ethernet/3com/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c

@@ -138,11 +138,6 @@ MODULE_PARM_DESC(use_mmio, "Use MMIO (1) or PIO(0) to access the NIC. "

-#warning Typhoon only supports 32 entries in its SG list for TSO, disabling TSO

@@ -974,12 +969,12 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

@@ -989,8 +984,8 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

- strlcpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info));

+ strscpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info));

@@ -1138,7 +1133,9 @@ typhoon_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)

-typhoon_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)

+typhoon_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering,

+static netdev_features_t typhoon_features_check(struct sk_buff *skb,

@@ -2276,6 +2292,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

@@ -2407,8 +2424,9 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

- *(__be16 *)&dev->dev_addr[0] = htons(le16_to_cpu(xp_resp[0].parm1));

- *(__be32 *)&dev->dev_addr[2] = htonl(le32_to_cpu(xp_resp[0].parm2));

@@ -2446,7 +2464,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

diff --git a/drivers/net/ethernet/8390/8390.c b/drivers/net/ethernet/8390/8390.c
index 0e0aa4016858..c5636245f1ca 100644
--- a/drivers/net/ethernet/8390/8390.c
+++ b/drivers/net/ethernet/8390/8390.c

diff --git a/drivers/net/ethernet/8390/8390.h b/drivers/net/ethernet/8390/8390.h
index e52264465998..f784a6e2ab0e 100644
--- a/drivers/net/ethernet/8390/8390.h
+++ b/drivers/net/ethernet/8390/8390.h

/* This file is part of Donald Becker's 8390 drivers, and is distributed

diff --git a/drivers/net/ethernet/8390/8390p.c b/drivers/net/ethernet/8390/8390p.c
index 6834742057b3..6d429b11e9c6 100644
--- a/drivers/net/ethernet/8390/8390p.c
+++ b/drivers/net/ethernet/8390/8390p.c

@@ -102,4 +102,5 @@ static void __exit NS8390p_cleanup_module(void)

+MODULE_DESCRIPTION("National Semiconductor 8390 core for ISA driver");

diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index a4130e643342..345f250781c6 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig

diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c
index da1ae37a9d73..828edca8d30c 100644
--- a/drivers/net/ethernet/8390/apne.c
+++ b/drivers/net/ethernet/8390/apne.c

* Amiga Linux/68k 8390 based PCMCIA Ethernet Driver for the Amiga 1200

* ----------------------------------------------------------------------------

- * This file is subject to the terms and conditions of the GNU General Public

- * License. See the file COPYING in the main directory of the Linux

- * ----------------------------------------------------------------------------

@@ -320,8 +315,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)

i = request_irq(dev->irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);

+MODULE_DESCRIPTION("National Semiconductor 8390 Amiga PCMCIA ethernet driver");

diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 6c6bdd5913ec..e1695d0fbd8b 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c

@@ -579,9 +579,9 @@ static void ax_get_drvinfo(struct net_device *dev,

struct platform_device *pdev = to_platform_device(dev->dev.parent);

@@ -748,16 +748,18 @@ static int ax_init_dev(struct net_device *dev)

@@ -830,8 +832,6 @@ static int ax_remove(struct platform_device *pdev)

diff --git a/drivers/net/ethernet/8390/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c
index 3c370e686ec3..7c8213011b5c 100644
--- a/drivers/net/ethernet/8390/axnet_cs.c
+++ b/drivers/net/ethernet/8390/axnet_cs.c

/*======================================================================

- Director, National Security Agency. This software may be used and

- distributed according to the terms of the GNU General Public License,

======================================================================*/

@@ -187,6 +187,7 @@ static int get_prom(struct pcmcia_device *link)

@@ -220,9 +221,11 @@ static int get_prom(struct pcmcia_device *link)

@@ -547,7 +550,7 @@ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id)

@@ -647,7 +650,6 @@ static void block_input(struct net_device *dev, int count,

@@ -659,9 +661,7 @@ static void block_input(struct net_device *dev, int count,

/*====================================================================*/

diff --git a/drivers/net/ethernet/8390/etherh.c b/drivers/net/ethernet/8390/etherh.c
index bd22a534b1c0..e876fe52399a 100644
--- a/drivers/net/ethernet/8390/etherh.c
+++ b/drivers/net/ethernet/8390/etherh.c

@@ -258,7 +258,7 @@ static int etherh_set_config(struct net_device *dev, struct ifmap *map)

static void etherh_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

@@ -655,6 +655,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)

@@ -724,12 +725,13 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)

diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c
index 941754ea78ec..fd9dcdc356e6 100644
--- a/drivers/net/ethernet/8390/hydra.c
+++ b/drivers/net/ethernet/8390/hydra.c

/* Based on old hydra driver by Topi Kanerva (topi@susanna.oulu.fi) */

-/* This file is subject to the terms and conditions of the GNU General */

-/* Public License. See the file COPYING in the main directory of the */

diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c
index e84021282edf..84aeb8054304 100644
--- a/drivers/net/ethernet/8390/lib8390.c
+++ b/drivers/net/ethernet/8390/lib8390.c

- of the GNU General Public License, incorporated herein by reference.

diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index 9aac7119d382..4a0a095a1a8a 100644
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c

- Jes Sorensen, and ne2k-pci.c by Donald Becker and Paul Gortmaker.

- This software may be used and distributed according to the terms of

+ Jes Sorensen, and ne2k-pci.c by Donald Becker and Paul Gortmaker. */

@@ -292,6 +290,7 @@ static bool mac8390_rsrc_init(struct net_device *dev,

@@ -314,7 +313,8 @@ static bool mac8390_rsrc_init(struct net_device *dev,

diff --git a/drivers/net/ethernet/8390/mcf8390.c b/drivers/net/ethernet/8390/mcf8390.c
index 4ad8031ab669..94ff8364cdf0 100644
--- a/drivers/net/ethernet/8390/mcf8390.c
+++ b/drivers/net/ethernet/8390/mcf8390.c

* Support for ColdFire CPU based boards using a NS8390 Ethernet device.

- * This file is subject to the terms and conditions of the GNU General Public

- * License. See the file COPYING in the main directory of the Linux

@@ -374,8 +372,7 @@ static int mcf8390_init(struct net_device *dev)

@@ -406,15 +403,13 @@ static int mcf8390_init(struct net_device *dev)

@@ -434,7 +429,7 @@ static int mcf8390_probe(struct platform_device *pdev)

@@ -446,17 +441,15 @@ static int mcf8390_probe(struct platform_device *pdev)

diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c
index 53660bc8d6ff..961019c32842 100644
--- a/drivers/net/ethernet/8390/ne.c
+++ b/drivers/net/ethernet/8390/ne.c

/* ne.c: A general non-shared-memory NS8390 ethernet driver for linux. */

- of the GNU General Public License, incorporated herein by reference.

Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403

@@ -500,9 +499,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)

@@ -826,7 +823,7 @@ static int __init ne_drv_probe(struct platform_device *pdev)

@@ -845,7 +842,6 @@ static int ne_drv_remove(struct platform_device *pdev)

diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index d6715008e04d..1a34da07c0db 100644
--- a/drivers/net/ethernet/8390/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c

@@ -185,17 +186,6 @@ static void ne2k_pci_block_output(struct net_device *dev, const int count,

-/* There is no room in the standard 8390 structure for extra info we need,

/* NEx000-clone boards have a Station Address (SA) PROM (SAPROM) in the packet

* buffer memory space. By-the-spec NE2000 clones have 0x57,0x57 in bytes

* 0x0e,0x0f of the SAPROM, while other supposed NE2000 clones must be

@@ -390,7 +380,7 @@ static int ne2k_pci_init_one(struct pci_dev *pdev,

diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c
index 96ad72abd373..19f9c5db3f3b 100644
--- a/drivers/net/ethernet/8390/pcnet_cs.c
+++ b/drivers/net/ethernet/8390/pcnet_cs.c

/*======================================================================

- Director, National Security Agency. This software may be used and

- distributed according to the terms of the GNU General Public License,

@@ -278,6 +277,7 @@ static struct hw_info *get_hwinfo(struct pcmcia_device *link)

@@ -302,7 +302,8 @@ static struct hw_info *get_hwinfo(struct pcmcia_device *link)

@@ -324,6 +325,7 @@ static struct hw_info *get_prom(struct pcmcia_device *link)

@@ -362,7 +364,8 @@ static struct hw_info *get_prom(struct pcmcia_device *link)

@@ -377,6 +380,7 @@ static struct hw_info *get_prom(struct pcmcia_device *link)

@@ -385,7 +389,8 @@ static struct hw_info *get_dl10019(struct pcmcia_device *link)

@@ -400,6 +405,7 @@ static struct hw_info *get_ax88190(struct pcmcia_device *link)

@@ -413,9 +419,10 @@ static struct hw_info *get_ax88190(struct pcmcia_device *link)

@@ -430,6 +437,7 @@ static struct hw_info *get_ax88190(struct pcmcia_device *link)

@@ -438,7 +446,8 @@ static struct hw_info *get_hwired(struct pcmcia_device *link)

@@ -985,7 +994,7 @@ static int set_config(struct net_device *dev, struct ifmap *map)

@@ -1009,7 +1018,7 @@ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id)

diff --git a/drivers/net/ethernet/8390/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c
index 0890fa493f70..22ca804b2e95 100644
--- a/drivers/net/ethernet/8390/smc-ultra.c
+++ b/drivers/net/ethernet/8390/smc-ultra.c

- of the GNU General Public License, incorporated herein by reference.

@@ -204,6 +203,7 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)

@@ -239,7 +239,8 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)

diff --git a/drivers/net/ethernet/8390/stnic.c b/drivers/net/ethernet/8390/stnic.c
index fbbd7f22c142..6cc0e190aa79 100644
--- a/drivers/net/ethernet/8390/stnic.c
+++ b/drivers/net/ethernet/8390/stnic.c

/* stnic.c : A SH7750 specific part of driver for NS DP83902A ST-NIC.

- * This file is subject to the terms and conditions of the GNU General Public

- * License. See the file "COPYING" in the main directory of this archive

/* Set the base address to point to the NIC, not the "real" base! */

+MODULE_DESCRIPTION("National Semiconductor DP83902AV ethernet driver");

diff --git a/drivers/net/ethernet/8390/wd.c b/drivers/net/ethernet/8390/wd.c
index 263a942d81fa..ffd639477dfc 100644
--- a/drivers/net/ethernet/8390/wd.c
+++ b/drivers/net/ethernet/8390/wd.c

- of the GNU General Public License, incorporated herein by reference.

@@ -168,6 +167,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)

@@ -191,7 +191,8 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)

diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
index 35a500a21521..c24dd4fe7a10 100644
--- a/drivers/net/ethernet/8390/zorro8390.c
+++ b/drivers/net/ethernet/8390/zorro8390.c

* ---------------------------------------------------------------------------

- * This file is subject to the terms and conditions of the GNU General Public

- * License. See the file COPYING in the main directory of the Linux

- * ---------------------------------------------------------------------------

* The Ariadne II and X-Surf are Zorro-II boards containing Realtek RTL8019AS

@@ -364,8 +359,7 @@ static int zorro8390_init(struct net_device *dev, unsigned long board,

@@ -449,4 +443,5 @@ static void __exit zorro8390_cleanup_module(void)

diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 1cdff1dca790..4a1b368ca7e6 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig

Say Y here to support the Myson MTD-800 family of PCI-based Ethernet

Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.

+ tristate "OPEN Alliance TC6 10BASE-T1x MAC-PHY support" if COMPILE_TEST

@@ -166,20 +183,24 @@ source "drivers/net/ethernet/renesas/Kconfig"

diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index cb3f9084a21b..2e18df8ca8ec 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile

diff --git a/drivers/net/ethernet/actions/Kconfig b/drivers/net/ethernet/actions/Kconfig
index ccad6a3f4d6f..f630cac2ab6c 100644
--- a/drivers/net/ethernet/actions/Kconfig
+++ b/drivers/net/ethernet/actions/Kconfig

If you have a network (Ethernet) card belonging to this class, say Y.

diff --git a/drivers/net/ethernet/actions/owl-emac.c b/drivers/net/ethernet/actions/owl-emac.c
index c4ecf4fcadf8..0a08da799255 100644
--- a/drivers/net/ethernet/actions/owl-emac.c
+++ b/drivers/net/ethernet/actions/owl-emac.c

@@ -342,7 +342,7 @@ static u32 owl_emac_dma_cmd_stop(struct owl_emac_priv *priv)

@@ -1173,7 +1173,7 @@ static int owl_emac_ndo_set_mac_addr(struct net_device *netdev, void *addr)

@@ -1275,9 +1275,6 @@ static int owl_emac_mdio_read(struct mii_bus *bus, int addr, int regnum)

data |= OWL_EMAC_VAL_MAC_CSR10_OPCODE_RD << OWL_EMAC_OFF_MAC_CSR10_OPCODE;

@@ -1305,9 +1302,6 @@ owl_emac_mdio_write(struct mii_bus *bus, int addr, int regnum, u16 val)

data |= OWL_EMAC_VAL_MAC_CSR10_OPCODE_WR << OWL_EMAC_OFF_MAC_CSR10_OPCODE;

@@ -1331,15 +1325,10 @@ static int owl_emac_mdio_init(struct net_device *netdev)

+ mdio_node = of_get_available_child_by_name(dev->of_node, "mdio");

@@ -1385,7 +1374,7 @@ static void owl_emac_get_mac_addr(struct net_device *netdev)

@@ -1576,7 +1565,7 @@ static int owl_emac_probe(struct platform_device *pdev)

- netif_napi_add(netdev, &priv->napi, owl_emac_poll, NAPI_POLL_WEIGHT);

@@ -1588,15 +1577,13 @@ static int owl_emac_probe(struct platform_device *pdev)

diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index e0f6cc910bd2..e1b8794b14c9 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c

@@ -641,6 +633,7 @@ static int starfire_init_one(struct pci_dev *pdev,

@@ -696,7 +689,8 @@ static int starfire_init_one(struct pci_dev *pdev,

#if ! defined(final_version) /* Dump the EEPROM contents during development. */

@@ -770,7 +764,7 @@ static int starfire_init_one(struct pci_dev *pdev,

+ netif_napi_add_weight(dev, &np->napi, netdev_poll, max_interrupt_work);

@@ -1787,14 +1781,14 @@ static void set_rx_mode(struct net_device *dev)

@@ -1805,7 +1799,7 @@ static void set_rx_mode(struct net_device *dev)

__le16 mc_filter[32] __attribute__ ((aligned(sizeof(long)))); /* Multicast hash filter */

@@ -1819,7 +1813,7 @@ static void set_rx_mode(struct net_device *dev)

@@ -1842,8 +1836,8 @@ static int check_if_running(struct net_device *dev)

static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

- strlcpy(info->bus_info, pci_name(np->pci_dev), sizeof(info->bus_info));

+ strscpy(info->bus_info, pci_name(np->pci_dev), sizeof(info->bus_info));

diff --git a/drivers/net/ethernet/adi/Kconfig b/drivers/net/ethernet/adi/Kconfig
new file mode 100644
index 000000000000..760a9a60bc15
--- /dev/null
+++ b/drivers/net/ethernet/adi/Kconfig

+ If you have a network (Ethernet) card belonging to this class, say Y.

+ Note that the answer to this question doesn't directly affect the

diff --git a/drivers/net/ethernet/adi/Makefile b/drivers/net/ethernet/adi/Makefile
new file mode 100644
index 000000000000..d0383d94303c
--- /dev/null
+++ b/drivers/net/ethernet/adi/Makefile

diff --git a/drivers/net/ethernet/adi/adin1110.c b/drivers/net/ethernet/adi/adin1110.c
new file mode 100644
index 000000000000..30f9d271e595
--- /dev/null
+++ b/drivers/net/ethernet/adi/adin1110.c

+static int adin1110_read_reg(struct adin1110_priv *priv, u16 reg, u32 *val)

+static int adin1110_write_reg(struct adin1110_priv *priv, u16 reg, u32 val)

+ priv->data[0] = ADIN1110_CD | ADIN1110_WRITE | FIELD_GET(GENMASK(12, 8), reg);

+ priv->data[header_len + write_len] = adin1110_crc_data(&priv->data[header_len],

+ return spi_write(priv->spidev, &priv->data[0], header_len + write_len);

+static int adin1110_read_fifo(struct adin1110_port_priv *port_priv)

+ frame_size_no_fcs = frame_size - ADIN1110_FRAME_HEADER_LEN - ADIN1110_FEC_LEN;

+ rxb = netdev_alloc_skb(port_priv->netdev, round_len + header_len);

+ skb_put(rxb, frame_size_no_fcs + header_len + ADIN1110_FRAME_HEADER_LEN);

+ if ((port_priv->flags & IFF_ALLMULTI && rxb->pkt_type == PACKET_MULTICAST) ||

+ (port_priv->flags & IFF_BROADCAST && rxb->pkt_type == PACKET_BROADCAST))

+static int adin1110_write_fifo(struct adin1110_port_priv *port_priv,

+ /* mention the port on which to send the frame in the frame header */

+ ret = spi_write(priv->spidev, &priv->data[0], round_len + header_len);

+static int adin1110_mdio_read(struct mii_bus *bus, int phy_id, int reg)

+ ret = readx_poll_timeout_atomic(adin1110_read_mdio_acc, priv, val,

+ return readx_poll_timeout_atomic(adin1110_read_mdio_acc, priv, val,

+static bool adin1110_port_rx_ready(struct adin1110_port_priv *port_priv,

+static void adin1110_read_frames(struct adin1110_port_priv *port_priv,

+ adin1110_write_reg(priv, ADIN1110_STATUS0, ADIN1110_CLEAR_STATUS0);

+/* ADIN1110 can filter up to 16 MAC addresses, mac_nr here is the slot used */

+static int adin1110_write_mac_address(struct adin1110_port_priv *port_priv,

+ port_rules_mask |= ADIN1110_MAC_ADDR_TO_HOST | ADIN2111_MAC_ADDR_TO_OTHER_PORT;

+ ret = adin1110_set_bits(priv, ADIN1110_MAC_ADDR_FILTER_UPR + offset,

+static int adin1110_clear_mac_address(struct adin1110_priv *priv, int mac_nr)

+ ret = adin1110_write_reg(priv, ADIN1110_MAC_ADDR_FILTER_UPR + offset, 0);

+ ret = adin1110_write_reg(priv, ADIN1110_MAC_ADDR_FILTER_LWR + offset, 0);

+ ret = adin1110_write_reg(priv, ADIN1110_MAC_ADDR_MASK_UPR + offset, 0);

+ ret = adin1110_write_reg(priv, ADIN1110_MAC_ADDR_MASK_LWR + offset, 0);

+static u32 adin1110_port_rules(struct adin1110_port_priv *port_priv,

+static int adin1110_multicast_filter(struct adin1110_port_priv *port_priv,

+static int adin1110_broadcasts_filter(struct adin1110_port_priv *port_priv,

+ mac_slot = (!port_priv->nr) ? ADIN_MAC_P1_ADDR_SLOT : ADIN_MAC_P2_ADDR_SLOT;

+ return adin1110_write_mac_address(port_priv, mac_slot, netdev->dev_addr,

+static int adin1110_ndo_set_mac_address(struct net_device *netdev, void *addr)

+static int adin1110_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)

+static int adin1110_set_promisc_mode(struct adin1110_port_priv *port_priv,

+static int adin1110_setup_rx_mode(struct adin1110_port_priv *port_priv)

+ ret = adin1110_multicast_filter(port_priv, ADIN_MAC_MULTICAST_ADDR_SLOT,

+static bool adin1110_can_offload_forwarding(struct adin1110_priv *priv)

+ /* Can't enable forwarding if ports do not belong to the same bridge */

+ if (priv->ports[0]->bridge != priv->ports[1]->bridge || !priv->ports[0]->bridge)

+ port_priv = container_of(work, struct adin1110_port_priv, rx_mode_work);

+ ret = adin1110_write_reg(priv, ADIN1110_CONFIG2, ADIN1110_CRC_APPEND);

+ val = ADIN1110_TX_RDY_IRQ | ADIN1110_RX_RDY_IRQ | ADIN1110_SPI_ERR_IRQ;

+ ret = adin1110_set_bits(priv, ADIN1110_CONFIG1, ADIN1110_CONFIG1_SYNC,

+ mask = !port_priv->nr ? ADIN2111_RX_RDY_IRQ : ADIN1110_RX_RDY_IRQ;

+ port_priv = container_of(work, struct adin1110_port_priv, tx_work);

+static netdev_tx_t adin1110_start_xmit(struct sk_buff *skb, struct net_device *dev)

+ tx_space_needed = skb->len + ADIN1110_FRAME_HEADER_LEN + ADIN1110_INTERNAL_SIZE_HEADER_LEN;

+static int adin1110_port_get_port_parent_id(struct net_device *dev,

+ ppid->id_len = strnlen(priv->mii_bus_name, MAX_PHYS_ITEM_ID_LEN);

+static int adin1110_ndo_get_phys_port_name(struct net_device *dev,

+ strscpy(di->bus_info, dev_name(dev->dev.parent), sizeof(di->bus_info));

+ reset_gpio = devm_gpiod_get_optional(&priv->spidev->dev, "reset",

+static int adin1110_hw_forwarding(struct adin1110_priv *priv, bool enable)

+ for (i = ADIN_MAC_FDB_ADDR_SLOT; i < ADIN_MAC_MAX_ADDR_SLOTS; i++) {

+static int adin1110_port_bridge_join(struct adin1110_port_priv *port_priv,

+ return adin1110_set_mac_address(port_priv->netdev, bridge->dev_addr);

+static int adin1110_port_bridge_leave(struct adin1110_port_priv *port_priv,

+static int adin1110_netdevice_event(struct notifier_block *unused,

+static int adin1110_port_set_forwarding_state(struct adin1110_port_priv *port_priv)

+static int adin1110_port_set_blocking_state(struct adin1110_port_priv *port_priv)

+ mac_slot = (!port_priv->nr) ? ADIN_MAC_P1_ADDR_SLOT : ADIN_MAC_P2_ADDR_SLOT;

+static int adin1110_port_attr_stp_state_set(struct adin1110_port_priv *port_priv,

+static int adin1110_port_attr_set(struct net_device *dev, const void *ctx,

+static int adin1110_switchdev_blocking_event(struct notifier_block *unused,

+static struct notifier_block adin1110_switchdev_blocking_notifier = {

+static void adin1110_fdb_offload_notify(struct net_device *netdev,

+ for (mac_nr = ADIN_MAC_FDB_ADDR_SLOT; mac_nr < ADIN_MAC_MAX_ADDR_SLOTS; mac_nr++) {

+ ret = adin1110_read_reg(priv, ADIN1110_MAC_ADDR_FILTER_UPR + (mac_nr * 2), &val);

+ return adin1110_write_mac_address(other_port, mac_nr, (u8 *)fdb->addr,

+static int adin1110_read_mac(struct adin1110_priv *priv, int mac_nr, u8 *addr)

+ ret = adin1110_read_reg(priv, ADIN1110_MAC_ADDR_FILTER_UPR + (mac_nr * 2), &val);

+ ret = adin1110_read_reg(priv, ADIN1110_MAC_ADDR_FILTER_LWR + (mac_nr * 2), &val);

+ for (mac_nr = ADIN_MAC_FDB_ADDR_SLOT; mac_nr < ADIN_MAC_MAX_ADDR_SLOTS; mac_nr++) {

+static void adin1110_switchdev_event_work(struct work_struct *work)

+ switchdev_work = container_of(work, struct adin1110_switchdev_event_work, work);

+static int adin1110_switchdev_event(struct notifier_block *unused,

+ unregister_switchdev_blocking_notifier(&adin1110_switchdev_blocking_notifier);

+ ret = register_switchdev_blocking_notifier(&adin1110_switchdev_blocking_notifier);

+ netdev_err(netdev, "Could not find PHY with device address: %d.\n", i);

+ netdev_err(netdev, "Could not connect PHY with device address: %d.\n", i);

+ priv = devm_kzalloc(dev, sizeof(struct adin1110_priv), GFP_KERNEL);

+ /* use of CRC on control and data transactions is pin dependent */

+ priv->append_crc = device_property_read_bool(dev, "adi,spi-crc");

+ ret = adin1110_write_reg(priv, ADIN1110_RESET, ADIN1110_SWRESET);

+MODULE_AUTHOR("Alexandru Tachici <alexandru.tachici@analog.com>");

diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index c560ad06f0be..a593adc16c78 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c

@@ -258,6 +258,7 @@ static int greth_init_rings(struct greth_private *greth)

@@ -483,7 +484,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)

@@ -1025,7 +1027,7 @@ static int greth_set_mac_add(struct net_device *dev, void *p)

GRETH_REGSAVE(regs->esa_msb, dev->dev_addr[0] << 8 | dev->dev_addr[1]);

GRETH_REGSAVE(regs->esa_lsb, dev->dev_addr[2] << 24 | dev->dev_addr[3] << 16 |

@@ -1112,9 +1114,9 @@ static void greth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *in

- strlcpy(info->bus_info, greth->dev->bus->name, sizeof(info->bus_info));

+ strscpy(info->bus_info, greth->dev->bus->name, sizeof(info->bus_info));

static void greth_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)

@@ -1346,6 +1348,7 @@ static int greth_of_probe(struct platform_device *ofdev)

@@ -1449,8 +1452,6 @@ static int greth_of_probe(struct platform_device *ofdev)

@@ -1464,7 +1465,8 @@ static int greth_of_probe(struct platform_device *ofdev)

@@ -1507,7 +1509,7 @@ static int greth_of_probe(struct platform_device *ofdev)

@@ -1543,8 +1545,6 @@ static int greth_of_remove(struct platform_device *of_dev)

of_iounmap(&of_dev->resource[0], greth->regs, resource_size(&of_dev->resource[0]));

diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c
index 920633161174..5c8217638dda 100644
--- a/drivers/net/ethernet/agere/et131x.c
+++ b/drivers/net/ethernet/agere/et131x.c

@@ -1106,7 +1106,7 @@ static void et1310_config_rxmac_regs(struct et131x_adapter *adapter)

@@ -2413,11 +2413,13 @@ static void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)

/* nic_send_packet - NIC specific send handler for version B silicon. */

static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)

@@ -2432,9 +2434,6 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)

@@ -2460,6 +2459,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)

@@ -2469,6 +2472,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)

@@ -2479,6 +2486,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)

@@ -2490,6 +2501,9 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)

@@ -2579,6 +2593,27 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)

static int send_packet(struct sk_buff *skb, struct et131x_adapter *adapter)

@@ -2953,8 +2988,8 @@ static void et131x_get_drvinfo(struct net_device *netdev,

- struct et131x_adapter *adapter = from_timer(adapter, t, error_timer);

@@ -3640,7 +3676,7 @@ static int et131x_close(struct net_device *netdev)

/* et131x_set_packet_filter - Configures the Rx Packet filtering */

@@ -3762,6 +3798,13 @@ static netdev_tx_t et131x_tx(struct sk_buff *skb, struct net_device *netdev)

+ if (unlikely(skb_shinfo(skb)->nr_frags > MAX_TX_DESC_PER_PKT - 2)) {

@@ -3846,7 +3889,7 @@ static int et131x_change_mtu(struct net_device *netdev, int new_mtu)

@@ -3863,7 +3906,7 @@ static int et131x_change_mtu(struct net_device *netdev, int new_mtu)

@@ -3914,10 +3957,9 @@ static int et131x_pci_setup(struct pci_dev *pdev,

@@ -3964,9 +4006,9 @@ static int et131x_pci_setup(struct pci_dev *pdev,

@@ -3977,8 +4019,7 @@ static int et131x_pci_setup(struct pci_dev *pdev,

+ snprintf(adapter->mii_bus->id, MII_BUS_ID_SIZE, "%x", pci_dev_id(adapter->pdev));

diff --git a/drivers/net/ethernet/airoha/Kconfig b/drivers/net/ethernet/airoha/Kconfig
new file mode 100644
index 000000000000..ad3ce501e7a5
--- /dev/null
+++ b/drivers/net/ethernet/airoha/Kconfig

diff --git a/drivers/net/ethernet/airoha/Makefile b/drivers/net/ethernet/airoha/Makefile
new file mode 100644
index 000000000000..94468053e34b
--- /dev/null
+++ b/drivers/net/ethernet/airoha/Makefile

diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c
new file mode 100644
index 000000000000..75893c90a0a1
--- /dev/null
+++ b/drivers/net/ethernet/airoha/airoha_eth.c

+static void airoha_qdma_set_irqmask(struct airoha_irq_bank *irq_bank,

+ /* Read irq_enable register in order to guarantee the update above

+static void airoha_qdma_irq_enable(struct airoha_irq_bank *irq_bank,

+static void airoha_qdma_irq_disable(struct airoha_irq_bank *irq_bank,

+static void airoha_set_macaddr(struct airoha_gdm_port *port, const u8 *addr)

+static void airoha_set_gdm_port_fwd_cfg(struct airoha_eth *eth, u32 addr,

+static int airoha_set_vip_for_gdm_port(struct airoha_gdm_port *port,

+ airoha_fe_wr(eth, REG_FE_VIP_EN(3), PATN_FCPU_EN_MASK | PATN_EN_MASK);

+static u32 airoha_fe_get_pse_queue_rsv_pages(struct airoha_eth *eth,

+static void airoha_fe_set_pse_queue_rsv_pages(struct airoha_eth *eth,

+ airoha_fe_rmw(eth, REG_FE_PSE_QUEUE_CFG_VAL, PSE_CFG_OQ_RSV_MASK,

+ u32 orig_val = airoha_fe_get_pse_queue_rsv_pages(eth, port, queue);

+static int airoha_qdma_rx_process(struct airoha_queue *q, int budget)

+ enum dma_data_direction dir = page_pool_get_dma_dir(q->page_pool);

+static int airoha_qdma_rx_napi_poll(struct napi_struct *napi, int budget)

+ struct airoha_queue *q = container_of(napi, struct airoha_queue, napi);

+ q->desc = dmam_alloc_coherent(eth->dev, q->ndesc * sizeof(*q->desc),

+ netif_napi_add(eth->napi_dev, &q->napi, airoha_qdma_rx_napi_poll);

+ airoha_qdma_set(qdma, REG_RX_SCATTER_CFG(qid), RX_RING_SG_EN_MASK);

+static int airoha_qdma_tx_napi_poll(struct napi_struct *napi, int budget)

+ q->desc = dmam_alloc_coherent(eth->dev, q->ndesc * sizeof(*q->desc),

+static int airoha_qdma_tx_irq_init(struct airoha_tx_irq_queue *irq_q,

+ buf_size = id ? AIROHA_MAX_PACKET_SIZE / 2 : AIROHA_MAX_PACKET_SIZE;

+ airoha_qdma_rmw(qdma, REG_FWD_DSCP_LOW_THR, FWD_DSCP_LOW_THR_MASK,

+ airoha_qdma_clear(qdma, REG_TXWRR_MODE_CFG, TWRR_WEIGHT_SCALE_MASK);

+ airoha_qdma_set(qdma, REG_TXWRR_MODE_CFG, TWRR_WEIGHT_BASE_MASK);

+ airoha_qdma_rmw(qdma, REG_GLB_TRTCM_CFG, GLB_SLOW_TICK_RATIO_MASK,

+ airoha_qdma_set(qdma, REG_EGRESS_TRTCM_CFG, EGRESS_TRTCM_EN_MASK);

+ airoha_qdma_rmw(qdma, REG_EGRESS_TRTCM_CFG, EGRESS_FAST_TICK_MASK,

+ airoha_qdma_set(qdma, REG_INGRESS_TRTCM_CFG, INGRESS_TRTCM_EN_MASK);

+ airoha_qdma_rmw(qdma, REG_INGRESS_TRTCM_CFG, INGRESS_FAST_TICK_MASK,

+ airoha_qdma_rmw(qdma, REG_SLA_TRTCM_CFG, SLA_SLOW_TICK_RATIO_MASK,

+static irqreturn_t airoha_irq_handler(int irq, void *dev_instance)

+static int airoha_qdma_init_irq_banks(struct platform_device *pdev,

+ err = reset_control_bulk_assert(eth->soc->num_xsi_rsts, eth->xsi_rsts);

+ err = reset_control_bulk_assert(ARRAY_SIZE(eth->rsts), eth->rsts);

+ err = reset_control_bulk_deassert(ARRAY_SIZE(eth->rsts), eth->rsts);

+ val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_H(port->id));

+ val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_L(port->id));

+ val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_CRC_ERR_CNT(port->id));

+ val = airoha_fe_rr(eth, REG_FE_GDM_RX_OVERFLOW_DROP_CNT(port->id));

+ val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_H(port->id));

+ val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_L(port->id));

+static int airoha_dev_set_macaddr(struct net_device *dev, void *p)

+static int airhoha_set_gdm2_loopback(struct airoha_gdm_port *port)

+ chan = port->id == AIROHA_GDM3_IDX ? airoha_is_7581(eth) ? 4 : 3 : 0;

+ nbq = port->id == AIROHA_GDM3_IDX && airoha_is_7581(eth) ? 4 : 0;

+ airoha_set_gdm_port_fwd_cfg(eth, REG_GDM_FWD_CFG(port->id), pse_port);

+static u16 airoha_dev_select_queue(struct net_device *dev, struct sk_buff *skb,

+ /* For dsa device select QoS channel according to the dsa user port

+ * index, rely on port id otherwise. Select QoS queue based on the

+ channel = netdev_uses_dsa(dev) ? skb_get_queue_mapping(skb) : port->id;

+ queue = (skb->priority - 1) % AIROHA_NUM_QOS_QUEUES; /* QoS queue */

+static u32 airoha_get_dsa_tag(struct sk_buff *skb, struct net_device *dev)

+ strscpy(info->driver, eth->dev->driver->name, sizeof(info->driver));

+ strscpy(info->bus_info, dev_name(eth->dev), sizeof(info->bus_info));

+static const struct ethtool_rmon_hist_range airoha_ethtool_rmon_ranges[] = {

+static int airoha_qdma_set_chan_tx_sched(struct airoha_gdm_port *port,

+static int airoha_qdma_set_tx_prio_sched(struct airoha_gdm_port *port,

+ return airoha_qdma_set_chan_tx_sched(port, channel, TC_SCH_SP, w,

+static int airoha_qdma_set_tx_ets_sched(struct airoha_gdm_port *port,

+ struct tc_ets_qopt_offload_replace_params *p = &opt->replace_params;

+ /* EN7581 SoC supports fixed QoS band priority where WRR queues have

+static int airoha_qdma_get_tx_ets_stats(struct airoha_gdm_port *port,

+static int airoha_tc_setup_qdisc_ets(struct airoha_gdm_port *port,

+static int airoha_qdma_get_rl_param(struct airoha_qdma *qdma, int queue_id,

+ u32 idx = QDMA_METER_IDX(queue_id), group = QDMA_METER_GROUP(queue_id);

+ u32 val, config = FIELD_PREP(RATE_LIMIT_PARAM_TYPE_MASK, param) |

+static int airoha_qdma_set_rl_param(struct airoha_qdma *qdma, int queue_id,

+ u32 idx = QDMA_METER_IDX(queue_id), group = QDMA_METER_GROUP(queue_id);

+static int airoha_qdma_set_rl_config(struct airoha_qdma *qdma, int queue_id,

+ err = airoha_qdma_get_rl_param(qdma, queue_id, addr, TRTCM_MISC_MODE,

+ return airoha_qdma_set_rl_param(qdma, queue_id, addr, TRTCM_MISC_MODE,

+static int airoha_qdma_set_rl_token_bucket(struct airoha_qdma *qdma,

+ err = airoha_qdma_get_rl_param(qdma, queue_id, REG_INGRESS_TRTCM_CFG,

+ err = airoha_qdma_set_rl_param(qdma, queue_id, REG_INGRESS_TRTCM_CFG,

+ return airoha_qdma_set_rl_param(qdma, queue_id, REG_INGRESS_TRTCM_CFG,

+static int airoha_qdma_init_rl_config(struct airoha_qdma *qdma, int queue_id,

+ err = airoha_qdma_set_rl_config(qdma, queue_id, REG_INGRESS_TRTCM_CFG,

+ return airoha_qdma_set_rl_config(qdma, queue_id, REG_INGRESS_TRTCM_CFG,

+static int airoha_qdma_get_trtcm_param(struct airoha_qdma *qdma, int channel,

+ u32 idx = QDMA_METER_IDX(channel), group = QDMA_METER_GROUP(channel);

+static int airoha_qdma_set_trtcm_param(struct airoha_qdma *qdma, int channel,

+ u32 idx = QDMA_METER_IDX(channel), group = QDMA_METER_GROUP(channel);

+static int airoha_qdma_set_trtcm_config(struct airoha_qdma *qdma, int channel,

+ if (airoha_qdma_get_trtcm_param(qdma, channel, addr, TRTCM_MISC_MODE,

+ return airoha_qdma_set_trtcm_param(qdma, channel, addr, TRTCM_MISC_MODE,

+static int airoha_qdma_set_trtcm_token_bucket(struct airoha_qdma *qdma,

+ if (airoha_qdma_get_trtcm_param(qdma, channel, addr, TRTCM_MISC_MODE,

+static int airoha_qdma_set_tx_rate_limit(struct airoha_gdm_port *port,

+static int airoha_tc_htb_alloc_leaf_queue(struct airoha_gdm_port *port,

+ err = airoha_qdma_set_tx_rate_limit(port, channel, rate, opt->quantum);

+static int airoha_tc_matchall_act_validate(struct tc_cls_matchall_offload *f)

+static int airoha_dev_setup_tc_block(struct airoha_gdm_port *port,

+static void airoha_tc_remove_htb_queue(struct airoha_gdm_port *port, int queue)

+static int airoha_tc_htb_delete_leaf_queue(struct airoha_gdm_port *port,

+static int airoha_tc_get_htb_get_leaf_queue(struct airoha_gdm_port *port,

+static int airoha_tc_setup_qdisc_htb(struct airoha_gdm_port *port,

+static int airoha_dev_tc_setup(struct net_device *dev, enum tc_setup_type type,

+static int airoha_metadata_dst_alloc(struct airoha_gdm_port *port)

+static void airoha_metadata_dst_free(struct airoha_gdm_port *port)

+ eth->fe_regs = devm_platform_ioremap_resource_byname(pdev, "fe");

+ strscpy(eth->napi_dev->name, "qdma_eth", sizeof(eth->napi_dev->name));

+static int airoha_en7581_get_src_port_id(struct airoha_gdm_port *port, int nbq)

+static int airoha_an7583_get_src_port_id(struct airoha_gdm_port *port, int nbq)

diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h
new file mode 100644
index 000000000000..fbbc58133364
--- /dev/null
+++ b/drivers/net/ethernet/airoha/airoha_eth.h

+u32 airoha_rmw(void __iomem *base, u32 offset, u32 mask, u32 val);

+static inline bool airhoa_is_lan_gdm_port(struct airoha_gdm_port *port)

+void airoha_ppe_check_skb(struct airoha_ppe_dev *dev, struct sk_buff *skb,

+int airoha_ppe_setup_tc_block_cb(struct airoha_ppe_dev *dev, void *type_data);

+struct airoha_foe_entry *airoha_ppe_foe_get_entry(struct airoha_ppe *ppe,

+void airoha_ppe_foe_entry_get_stats(struct airoha_ppe *ppe, u32 hash,

diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c
new file mode 100644
index 000000000000..68b7f9684dc7
--- /dev/null
+++ b/drivers/net/ethernet/airoha/airoha_npu.c

+#define REG_CR_BOOT_BASE(_n) (NPU_CLUSTER_BASE_ADDR + 0x020 + ((_n) << 2))

+#define REG_CR_MBOX_INT_MASK(_n) (NPU_MBOX_BASE_ADDR + 0x004 + ((_n) << 2))

+#define REG_CR_MBQ0_CTRL(_n) (NPU_MBOX_BASE_ADDR + 0x030 + ((_n) << 2))

+#define REG_CR_MBQ8_CTRL(_n) (NPU_MBOX_BASE_ADDR + 0x0b0 + ((_n) << 2))

+#define REG_CR_NPU_MIB(_n) (NPU_MBOX_BASE_ADDR + 0x140 + ((_n) << 2))

+#define REG_IRQ_RXDONE(_n) (NPU_WLAN_BASE_ADDR + ((_n) << 2) + 0x034)

+#define REG_TX_BASE(_n) (NPU_WLAN_BASE_ADDR + ((_n) << 4) + 0x080)

+#define REG_TX_DSCP_NUM(_n) (NPU_WLAN_BASE_ADDR + ((_n) << 4) + 0x084)

+#define REG_TX_CPU_IDX(_n) (NPU_WLAN_BASE_ADDR + ((_n) << 4) + 0x088)

+#define REG_TX_DMA_IDX(_n) (NPU_WLAN_BASE_ADDR + ((_n) << 4) + 0x08c)

+#define REG_RX_BASE(_n) (NPU_WLAN_BASE_ADDR + ((_n) << 4) + 0x180)

+#define REG_RX_DSCP_NUM(_n) (NPU_WLAN_BASE_ADDR + ((_n) << 4) + 0x184)

+#define REG_RX_CPU_IDX(_n) (NPU_WLAN_BASE_ADDR + ((_n) << 4) + 0x188)

+#define REG_RX_DMA_IDX(_n) (NPU_WLAN_BASE_ADDR + ((_n) << 4) + 0x18c)

+#define REG_WDT_TIMER_CTRL(_n) (NPU_TIMER_BASE_ADDR + ((_n) * 0x100))

+static int airoha_npu_send_msg(struct airoha_npu *npu, int func_id,

+ regmap_write(npu->regmap, REG_CR_MBQ0_CTRL(0) + offset, dma_addr);

+ regmap_write(npu->regmap, REG_CR_MBQ0_CTRL(2) + offset, val + 1);

+static int airoha_npu_load_firmware(struct device *dev, void __iomem *addr,

+static int airoha_npu_run_firmware(struct device *dev, void __iomem *base,

+static irqreturn_t airoha_npu_mbox_handler(int irq, void *npu_instance)

+ regmap_bulk_read(npu->regmap, REG_PC_DBG(c), val, ARRAY_SIZE(val));

+static irqreturn_t airoha_npu_wdt_handler(int irq, void *core_instance)

+ regmap_set_bits(npu->regmap, REG_WDT_TIMER_CTRL(c), WDT_INTR_MASK);

+static int airoha_npu_ppe_flush_sram_entries(struct airoha_npu *npu,

+static int airoha_npu_wlan_msg_send(struct airoha_npu *npu, int ifindex,

+static int airoha_npu_wlan_msg_get(struct airoha_npu *npu, int ifindex,

+ err = of_reserved_mem_region_to_resource_byname(dev->of_node, name,

+ enum airoha_npu_wlan_set_cmd cmd = WLAN_FUNC_SET_WAIT_NPU_BAND0_ONCPU;

+ err = airoha_npu_wlan_set_reserved_memory(npu, 0, "tx-bufid", cmd);

+ err = airoha_npu_wlan_set_reserved_memory(npu, 0, "tx-pkt", cmd);

+static u32 airoha_npu_wlan_queue_addr_get(struct airoha_npu *npu, int qid,

+static void airoha_npu_wlan_irq_status_set(struct airoha_npu *npu, u32 val)

+static u32 airoha_npu_wlan_irq_status_get(struct airoha_npu *npu, int q)

+static void airoha_npu_wlan_irq_enable(struct airoha_npu *npu, int q)

+ regmap_set_bits(npu->regmap, REG_IRQ_RXDONE(q), NPU_IRQ_RX_MASK(q));

+static void airoha_npu_wlan_irq_disable(struct airoha_npu *npu, int q)

+ regmap_clear_bits(npu->regmap, REG_IRQ_RXDONE(q), NPU_IRQ_RX_MASK(q));

+ if (!device_link_add(dev, &pdev->dev, DL_FLAG_AUTOREMOVE_SUPPLIER)) {

+ { .compatible = "airoha,en7581-npu", .data = &en7581_npu_soc_data },

+ { .compatible = "airoha,an7583-npu", .data = &an7583_npu_soc_data },

+ npu->ops.ppe_flush_sram_entries = airoha_npu_ppe_flush_sram_entries;

+ npu->ops.wlan_init_reserved_memory = airoha_npu_wlan_init_memory;

+ regmap_write(npu->regmap, REG_CR_NPU_MIB(11), 0x40000); /* SRAM 256K */

diff --git a/drivers/net/ethernet/airoha/airoha_ppe.c b/drivers/net/ethernet/airoha/airoha_ppe.c
new file mode 100644
index 000000000000..0caabb0c3aa0
--- /dev/null
+++ b/drivers/net/ethernet/airoha/airoha_ppe.c

+static const struct rhashtable_params airoha_flow_table_params = {

+static const struct rhashtable_params airoha_l2_flow_table_params = {

+ .head_offset = offsetof(struct airoha_flow_table_entry, l2_node),

+ .key_offset = offsetof(struct airoha_flow_table_entry, data.bridge),

+static int airoha_ppe_get_num_stats_entries(struct airoha_ppe *ppe)

+static int airoha_ppe_get_total_num_stats_entries(struct airoha_ppe *ppe)

+static u32 airoha_ppe_get_total_sram_num_entries(struct airoha_ppe *ppe)

+ u32 sram_num_entries = airoha_ppe_get_total_sram_num_entries(ppe);

+ return airoha_fe_rr(eth, REG_PPE_GLO_CFG(index)) & PPE_GLO_CFG_EN_MASK;

+ u32 sram_ppe_num_data_entries = PPE_SRAM_NUM_ENTRIES, sram_num_entries;

+ sram_tb_size = sram_num_entries * sizeof(struct airoha_foe_entry);

+ dram_num_entries = PPE_RAM_NUM_ENTRIES_SHIFT(PPE_DRAM_NUM_ENTRIES);

+static void airoha_ppe_flow_mangle_eth(const struct flow_action_entry *act, void *eth)

+static int airoha_ppe_flow_mangle_ports(const struct flow_action_entry *act,

+static int airoha_ppe_flow_mangle_ipv4(const struct flow_action_entry *act,

+static int airoha_ppe_get_wdma_info(struct net_device *dev, const u8 *addr,

+static void airoha_ppe_foe_set_bridge_addrs(struct airoha_foe_bridge *br,

+ u32 qdata = FIELD_PREP(AIROHA_FOE_SHAPER_ID, 0x7f), ports_pad, val;

+ val = FIELD_PREP(AIROHA_FOE_IB1_BIND_STATE, AIROHA_FOE_STATE_BIND) |

+static int airoha_ppe_foe_entry_set_ipv4_tuple(struct airoha_foe_entry *hwe,

+static int airoha_ppe_foe_entry_set_ipv6_tuple(struct airoha_foe_entry *hwe,

+static int airoha_ppe_foe_get_flow_stats_index(struct airoha_ppe *ppe,

+ ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);

+ *index = hash >= ppe_num_stats_entries ? hash - PPE_STATS_NUM_ENTRIES

+static void airoha_ppe_foe_flow_stat_entry_reset(struct airoha_ppe *ppe,

+static void airoha_ppe_foe_flow_stats_reset(struct airoha_ppe *ppe,

+ ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);

+static void airoha_ppe_foe_flow_stats_update(struct airoha_ppe *ppe,

+ ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);

+ u32 sram_num_entries = airoha_ppe_get_total_sram_num_entries(ppe);

+struct airoha_foe_entry *airoha_ppe_foe_get_entry(struct airoha_ppe *ppe,

+static bool airoha_ppe_foe_compare_entry(struct airoha_flow_table_entry *e,

+ int type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, e->data.ib1);

+static int airoha_ppe_foe_commit_sram_entry(struct airoha_ppe *ppe, u32 hash)

+ u32 sram_num_entries = airoha_ppe_get_total_sram_num_entries(ppe);

+static void airoha_ppe_foe_flow_remove_entry(struct airoha_ppe *ppe,

+ u32 mask = AIROHA_FOE_IB1_BIND_PACKET_TYPE | AIROHA_FOE_IB1_BIND_UDP;

+ prev = rhashtable_lookup_get_insert_fast(&ppe->l2_flows, &e->l2_node,

+static int airoha_ppe_foe_flow_commit_entry(struct airoha_ppe *ppe,

+ int type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, e->data.ib1);

+static int airoha_ppe_get_entry_idle_time(struct airoha_ppe *ppe, u32 ib1)

+ hlist_for_each_entry_safe(iter, n, &e->l2_flows, l2_subflow_node) {

+static void airoha_ppe_foe_flow_entry_update(struct airoha_ppe *ppe,

+static int airoha_ppe_flow_offload_replace(struct airoha_eth *eth,

+ err = airoha_ppe_foe_entry_prepare(eth, &hwe, odev, offload_type,

+static int airoha_ppe_flow_offload_destroy(struct airoha_eth *eth,

+void airoha_ppe_foe_entry_get_stats(struct airoha_ppe *ppe, u32 hash,

+ ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);

+ u32 sram_num_entries = airoha_ppe_get_total_sram_num_entries(ppe);

+static struct airoha_npu *airoha_ppe_npu_get(struct airoha_eth *eth)

+ ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);

+int airoha_ppe_setup_tc_block_cb(struct airoha_ppe_dev *dev, void *type_data)

+void airoha_ppe_check_skb(struct airoha_ppe_dev *dev, struct sk_buff *skb,

+ val = (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) | addr[5];

+ if (!device_link_add(dev, &pdev->dev, DL_FLAG_AUTOREMOVE_SUPPLIER)) {

+ ppe->foe = dmam_alloc_coherent(eth->dev, foe_size, &ppe->foe_dma,

+ ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);

+ err = rhashtable_init(&eth->flow_table, &airoha_flow_table_params);

+ err = rhashtable_init(&ppe->l2_flows, &airoha_l2_flow_table_params);

diff --git a/drivers/net/ethernet/airoha/airoha_ppe_debugfs.c b/drivers/net/ethernet/airoha/airoha_ppe_debugfs.c
new file mode 100644
index 000000000000..0112c41150bb
--- /dev/null
+++ b/drivers/net/ethernet/airoha/airoha_ppe_debugfs.c

+static int airoha_ppe_debugfs_foe_show(struct seq_file *m, void *private,

+static int airoha_ppe_debugfs_foe_all_show(struct seq_file *m, void *private)

+static int airoha_ppe_debugfs_foe_bind_show(struct seq_file *m, void *private)

diff --git a/drivers/net/ethernet/airoha/airoha_regs.h b/drivers/net/ethernet/airoha/airoha_regs.h
new file mode 100644
index 000000000000..ed4e3407f4a0
--- /dev/null
+++ b/drivers/net/ethernet/airoha/airoha_regs.h

+#define REG_CDM_CRSN_QSEL(_n, _m) (CDM_BASE(_n) + 0x10 + ((_m) << 2))

+#define REG_FE_GDM_RX_OVERFLOW_DROP_CNT(_n) (GDM_BASE(_n) + 0x154)

+#define REG_PPE_GLO_CFG(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x200)

+#define REG_PPE_PPE_FLOW_CFG(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x204)

+#define REG_PPE_IP_PROTO_CHK(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x208)

+#define REG_PPE_TB_CFG(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x21c)

+#define REG_PPE_TB_BASE(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x220)

+#define REG_PPE_BIND_RATE(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x228)

+#define REG_PPE_BIND_LIMIT0(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x22c)

+#define REG_PPE_BIND_LIMIT1(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x230)

+#define REG_PPE_BND_AGE0(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x23c)

+#define REG_PPE_UNBIND_AGE(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x238)

+#define REG_PPE_BND_AGE1(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x240)

+#define REG_PPE_HASH_SEED(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x244)

+#define REG_PPE_DFT_CPORT0(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x248)

+#define REG_PPE_DFT_CPORT1(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x24c)

+#define REG_PPE_TB_HASH_CFG(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x250)

+#define REG_PPE_MTU_BASE(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x304)

+#define REG_PPE_RAM_CTRL(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x31c)

+#define REG_PPE_RAM_BASE(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x320)

+#define REG_PPE_RAM_ENTRY(_m, _n) (REG_PPE_RAM_BASE(_m) + ((_n) << 2))

+#define REG_UPDMEM_CTRL(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x370)

+#define REG_UPDMEM_DATA(_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x374)

+#define RX_NO_CPU_DSCP_LOW_OFFSET __ffs(RX_NO_CPU_DSCP_LOW_INT_MASK)

+ ((((_n) << RX_NO_CPU_DSCP_LOW_OFFSET) & RX_NO_CPU_DSCP_LOW_INT_MASK) | \

+ ((RX_DONE_HIGH_INT_MASK << RX_DONE_HIGH_OFFSET) | RX_DONE_LOW_INT_MASK)

+ (((_n) < 16) ? 0x0200 + ((_n) << 5) : 0x0e00 + (((_n) - 16) << 5))

+ (((_n) < 16) ? 0x0204 + ((_n) << 5) : 0x0e04 + (((_n) - 16) << 5))

+ (((_n) < 16) ? 0x0208 + ((_n) << 5) : 0x0e08 + (((_n) - 16) << 5))

+ (((_n) < 16) ? 0x020c + ((_n) << 5) : 0x0e0c + (((_n) - 16) << 5))

+ (((_n) < 16) ? 0x0210 + ((_n) << 5) : 0x0e10 + (((_n) - 16) << 5))

+ (((_n) < 16) ? 0x0214 + ((_n) << 5) : 0x0e14 + (((_n) - 16) << 5))

+#define TXQ_DISABLE_CHAN_QUEUE_MASK(_n, _m) BIT((_m) + (((_n) & 0x3) << 3))

+#define REG_TXQ_DIS_CFG(_n, _m) (REG_TXQ_DIS_CFG_BASE((_n)) + (_m) << 2)

+#define CHAN_QOS_MODE_MASK(_n) GENMASK(2 + ((_n) << 2), (_n) << 2)

+#define QDMA_ETH_TXMSG_METER_MASK GENMASK(30, 24) /* 0x7f no meters */

+#define QDMA_ETH_TXMSG_ACNT_G1_MASK GENMASK(10, 6) /* 0x1f do not count */

+#define QDMA_ETH_TXMSG_ACNT_G0_MASK GENMASK(5, 0) /* 0x3f do not count */

diff --git a/drivers/net/ethernet/alacritech/slic.h b/drivers/net/ethernet/alacritech/slic.h
index 3add305d34b4..82071d0e5f7f 100644
--- a/drivers/net/ethernet/alacritech/slic.h
+++ b/drivers/net/ethernet/alacritech/slic.h

diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c
index 696517eae77f..f62851708d4f 100644
--- a/drivers/net/ethernet/alacritech/slicoss.c
+++ b/drivers/net/ethernet/alacritech/slicoss.c

@@ -1008,7 +1008,7 @@ static void slic_set_link_autoneg(struct slic_device *sdev)

@@ -1520,10 +1520,8 @@ static void slic_get_ethtool_stats(struct net_device *dev,

static void slic_get_strings(struct net_device *dev, u32 stringset, u8 *data)

@@ -1531,8 +1529,8 @@ static void slic_get_drvinfo(struct net_device *dev,

- strlcpy(info->bus_info, pci_name(sdev->pdev), sizeof(info->bus_info));

+ strscpy(info->bus_info, pci_name(sdev->pdev), sizeof(info->bus_info));

@@ -1660,7 +1658,7 @@ static int slic_read_eeprom(struct slic_device *sdev)

dma_free_coherent(&sdev->pdev->dev, SLIC_EEPROM_SIZE, eeprom, paddr);

@@ -1680,17 +1678,15 @@ static int slic_init(struct slic_device *sdev)

/* we need the shared memory to read EEPROM so set it up temporarily */

@@ -1743,10 +1739,9 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

@@ -1803,7 +1798,7 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index 037baea1c738..2f516b950f4e 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c

@@ -96,9 +106,9 @@ static void emac_update_speed(struct net_device *dev)

@@ -206,12 +216,123 @@ static void emac_inblk_32bit(void __iomem *reg, void *data, int count)

- strlcpy(info->bus_info, dev_name(&dev->dev), sizeof(info->bus_info));

+ strscpy(info->bus_info, dev_name(&dev->dev), sizeof(info->bus_info));

@@ -308,7 +429,7 @@ static unsigned int emac_powerup(struct net_device *ndev)

@@ -320,8 +441,8 @@ static unsigned int emac_powerup(struct net_device *ndev)

@@ -356,7 +477,7 @@ static int emac_set_mac_address(struct net_device *dev, void *p)

@@ -385,7 +506,7 @@ static void emac_init_device(struct net_device *dev)

+ reg_val |= (EMAC_INT_CTL_TX_EN | EMAC_INT_CTL_TX_ABRT_EN | EMAC_INT_CTL_RX_EN);

+ /* re enable cpu receive. then try to receive by emac_inblk_32bit */

@@ -666,18 +787,23 @@ static irqreturn_t emac_interrupt(int irq, void *dev_id)

+ reg_val |= (EMAC_INT_CTL_TX_EN | EMAC_INT_CTL_TX_ABRT_EN | EMAC_INT_CTL_RX_EN);

@@ -782,6 +908,58 @@ static const struct net_device_ops emac_netdev_ops = {

+ netdev_info(ndev, "get io resource from device: %pa, size = %u\n",

@@ -824,6 +1002,9 @@ static int emac_probe(struct platform_device *pdev)

@@ -852,7 +1033,7 @@ static int emac_probe(struct platform_device *pdev)

@@ -914,7 +1101,6 @@ static int emac_remove(struct platform_device *pdev)

static int emac_suspend(struct platform_device *dev, pm_message_t state)

diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.h b/drivers/net/ethernet/allwinner/sun4i-emac.h
index 38c72d9ec600..90bd9ad77607 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.h
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.h

+#define EMAC_INT_CTL_TX_EN (EMAC_INT_CTL_TX0_EN | EMAC_INT_CTL_TX1_EN)

+#define EMAC_INT_CTL_TX_ABRT_EN (EMAC_INT_CTL_TX0_ABRT_EN | EMAC_INT_CTL_TX1_ABRT_EN)

+#define EMAC_INT_STA_TX_COMPLETE (EMAC_INT_STA_TX0_COMPLETE | EMAC_INT_STA_TX1_COMPLETE)

+#define EMAC_INT_STA_TX_ABRT (EMAC_INT_STA_TX0_ABRT | EMAC_INT_STA_TX1_ABRT)

diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index 9dc12b13061f..9e6f91df2ba0 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c

@@ -589,8 +589,7 @@ static int acenic_probe_one(struct pci_dev *pdev,

@@ -1563,9 +1560,9 @@ static void ace_watchdog(struct net_device *data, unsigned int txqueue)

@@ -1598,7 +1595,7 @@ static void ace_tasklet(struct tasklet_struct *t)

@@ -1620,7 +1617,7 @@ static void ace_dump_trace(struct ace_private *ap)

* Loading rings is safe without holding the spin lock since this is

static void ace_load_std_rx_ring(struct net_device *dev, int nr_bufs)

@@ -2163,7 +2160,7 @@ static irqreturn_t ace_interrupt(int irq, void *dev_id)

@@ -2175,7 +2172,7 @@ static irqreturn_t ace_interrupt(int irq, void *dev_id)

@@ -2191,7 +2188,7 @@ static irqreturn_t ace_interrupt(int irq, void *dev_id)

@@ -2208,12 +2205,12 @@ static irqreturn_t ace_interrupt(int irq, void *dev_id)

@@ -2543,7 +2539,7 @@ static int ace_change_mtu(struct net_device *dev, int new_mtu)

@@ -2694,12 +2690,12 @@ static void ace_get_drvinfo(struct net_device *dev,

@@ -2712,15 +2708,15 @@ static int ace_set_mac_addr(struct net_device *dev, void *p)

diff --git a/drivers/net/ethernet/alteon/acenic.h b/drivers/net/ethernet/alteon/acenic.h
index 265fa601a258..0e45a97b9c9b 100644
--- a/drivers/net/ethernet/alteon/acenic.h
+++ b/drivers/net/ethernet/alteon/acenic.h

diff --git a/drivers/net/ethernet/altera/Kconfig b/drivers/net/ethernet/altera/Kconfig
index 914e56b91467..4ef819a9a1ad 100644
--- a/drivers/net/ethernet/altera/Kconfig
+++ b/drivers/net/ethernet/altera/Kconfig

diff --git a/drivers/net/ethernet/altera/altera_sgdma.c b/drivers/net/ethernet/altera/altera_sgdma.c
index db97170da8c7..7f247ccbe6ba 100644
--- a/drivers/net/ethernet/altera/altera_sgdma.c
+++ b/drivers/net/ethernet/altera/altera_sgdma.c

@@ -513,7 +513,7 @@ static int sgdma_txbusy(struct altera_tse_private *priv)

diff --git a/drivers/net/ethernet/altera/altera_tse.h b/drivers/net/ethernet/altera/altera_tse.h
index f17acfb579a0..e5a56bb989da 100644
--- a/drivers/net/ethernet/altera/altera_tse.h
+++ b/drivers/net/ethernet/altera/altera_tse.h

#define MAC_CMDCFG_DISABLE_READ_TIMEOUT_GET(v) GET_BIT_VALUE(v, 27)

diff --git a/drivers/net/ethernet/altera/altera_tse_ethtool.c b/drivers/net/ethernet/altera/altera_tse_ethtool.c
index 4299f1301149..81313c85833e 100644
--- a/drivers/net/ethernet/altera/altera_tse_ethtool.c
+++ b/drivers/net/ethernet/altera/altera_tse_ethtool.c

static void tse_get_regs(struct net_device *dev, struct ethtool_regs *regs,

@@ -221,6 +221,22 @@ static void tse_get_regs(struct net_device *dev, struct ethtool_regs *regs,

@@ -231,8 +247,9 @@ static const struct ethtool_ops tse_ethtool_ops = {

diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
index 1c00d719e5d7..ca55c5fd11df 100644
--- a/drivers/net/ethernet/altera/altera_tse_main.c
+++ b/drivers/net/ethernet/altera/altera_tse_main.c

@@ -72,41 +75,18 @@ MODULE_PARM_DESC(dma_tx_num, "Number of descriptors in the TX list");

-static u16 sgmii_pcs_read(struct altera_tse_private *priv, int regnum)

-static void sgmii_pcs_write(struct altera_tse_private *priv, int regnum,

- csrwr32(value, priv->mac_dev, tse_csroffs(mdio_phy0) + regnum * 4);

-static int sgmii_pcs_scratch_test(struct altera_tse_private *priv, u16 value)

static int altera_tse_mdio_read(struct mii_bus *bus, int mii_id, int regnum)

@@ -141,10 +121,10 @@ static int altera_tse_mdio_write(struct mii_bus *bus, int mii_id, int regnum,

static int altera_tse_mdio_create(struct net_device *dev, unsigned int id)

@@ -163,7 +143,8 @@ static int altera_tse_mdio_create(struct net_device *dev, unsigned int id)

@@ -180,6 +161,7 @@ static int altera_tse_mdio_create(struct net_device *dev, unsigned int id)

@@ -189,6 +171,8 @@ static int altera_tse_mdio_create(struct net_device *dev, unsigned int id)

@@ -232,8 +216,8 @@ static int tse_init_rx_buffer(struct altera_tse_private *priv,

@@ -354,6 +338,7 @@ static inline void tse_rx_vlan(struct net_device *dev, struct sk_buff *skb)

@@ -367,10 +352,10 @@ static inline void tse_rx_vlan(struct net_device *dev, struct sk_buff *skb)

@@ -390,7 +375,7 @@ static int tse_rx(struct altera_tse_private *priv, int limit)

@@ -444,10 +429,10 @@ static int tse_rx(struct altera_tse_private *priv, int limit)

@@ -493,8 +478,8 @@ static int tse_poll(struct napi_struct *napi, int budget)

@@ -557,13 +542,13 @@ static irqreturn_t altera_isr(int irq, void *dev_id)

static netdev_tx_t tse_start_xmit(struct sk_buff *skb, struct net_device *dev)

- * information through variables in the phydev structure, and this

-static struct phy_device *connect_local_phy(struct net_device *dev)

static int altera_tse_phy_get_addr_mdio_create(struct net_device *dev)

@@ -764,92 +638,7 @@ static int altera_tse_phy_get_addr_mdio_create(struct net_device *dev)

- phynode = of_parse_phandle(priv->device->of_node, "phy-handle", 0);

- * MDIO line, which results in reads to non-existent devices returning

- * 0 rather than 0xffff. Catch this here and treat 0 as a non-existent

- * device as well. If a fixed-link is used the phy_id is always 0.

- * Note: phydev->phy_id is the result of reading the UID PHY registers.

-static void tse_update_mac_addr(struct altera_tse_private *priv, u8 *addr)

+static void tse_update_mac_addr(struct altera_tse_private *priv, const u8 *addr)

@@ -999,7 +788,7 @@ static int tse_change_mtu(struct net_device *dev, int new_mtu)

@@ -1008,8 +797,8 @@ static int tse_change_mtu(struct net_device *dev, int new_mtu)

@@ -1044,7 +833,7 @@ static void altera_tse_set_mcfilterall(struct net_device *dev)

@@ -1064,7 +853,7 @@ static void tse_set_rx_mode_hashfilter(struct net_device *dev)

@@ -1083,74 +872,14 @@ static void tse_set_rx_mode(struct net_device *dev)

/* Note that reset_mac will fail if the clocks are gated by the PHY

+ ret = phylink_of_phy_connect(priv->phylink, priv->device->of_node, 0);

@@ -1313,11 +1033,73 @@ static struct net_device_ops altera_tse_netdev_ops = {

+static void alt_tse_mac_config(struct phylink_config *config, unsigned int mode,

+ ctrl &= ~(MAC_CMDCFG_ENA_10 | MAC_CMDCFG_ETH_SPEED | MAC_CMDCFG_HD_ENA);

+static struct phylink_pcs *alt_tse_select_pcs(struct phylink_config *config,

static int request_and_map(struct platform_device *pdev, const char *name,

@@ -1346,13 +1128,18 @@ static int request_and_map(struct platform_device *pdev, const char *name,

@@ -1361,17 +1148,14 @@ static int altera_tse_probe(struct platform_device *pdev)

@@ -1430,16 +1214,19 @@ static int altera_tse_probe(struct platform_device *pdev)

- if (!dma_set_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask)))

+ if (!dma_set_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask))) {

@@ -1460,6 +1247,40 @@ static int altera_tse_probe(struct platform_device *pdev)

+ /* SGMII PCS address space. The location can vary depending on how the

+ * IP is integrated. We can have a resource dedicated to it at a specific

+ * address space, but if it's not the case, we fallback to the mdiophy0

+ /* Create a regmap for the PCS so that it can be used by the PCS driver */

@@ -1524,7 +1345,7 @@ static int altera_tse_probe(struct platform_device *pdev)

@@ -1559,40 +1380,73 @@ static int altera_tse_probe(struct platform_device *pdev)

+ snprintf(mrc.name, MII_BUS_ID_SIZE, "%s-pcs-mii", dev_name(&pdev->dev));

+ phy_interface_set_rgmii(priv->phylink_config.supported_interfaces);

dev_info(&pdev->dev, "Altera TSE MAC version %d.%d at 0x%08lx irq %d/%d\n",

diff --git a/drivers/net/ethernet/altera/altera_utils.h b/drivers/net/ethernet/altera/altera_utils.h
index b7d772f2dcbb..3c2e32fb7389 100644
--- a/drivers/net/ethernet/altera/altera_utils.h
+++ b/drivers/net/ethernet/altera/altera_utils.h

void tse_clear_bit(void __iomem *ioaddr, size_t offs, u32 bit_mask);

int tse_bit_is_set(void __iomem *ioaddr, size_t offs, u32 bit_mask);

diff --git a/drivers/net/ethernet/amazon/Kconfig b/drivers/net/ethernet/amazon/Kconfig
index c37fa393b99e..95dcc3969f0c 100644
--- a/drivers/net/ethernet/amazon/Kconfig
+++ b/drivers/net/ethernet/amazon/Kconfig

diff --git a/drivers/net/ethernet/amazon/ena/Makefile b/drivers/net/ethernet/amazon/ena/Makefile
index f1f752a8f7bb..6d8036bc1823 100644
--- a/drivers/net/ethernet/amazon/ena/Makefile
+++ b/drivers/net/ethernet/amazon/ena/Makefile

+ena-y := ena_netdev.o ena_com.o ena_eth_com.o ena_ethtool.o ena_xdp.o ena_phc.o ena_devlink.o ena_debugfs.o

diff --git a/drivers/net/ethernet/amazon/ena/ena_admin_defs.h b/drivers/net/ethernet/amazon/ena/ena_admin_defs.h
index f5ec35fa4c63..898ecd96b96a 100644
--- a/drivers/net/ethernet/amazon/ena/ena_admin_defs.h
+++ b/drivers/net/ethernet/amazon/ena/ena_admin_defs.h

+ /* A bitmap representing the reported customer metrics according to

-/* When hint value is 0, driver should use it's own predefined value */

+/* When hint value is 0, driver should use its own predefined value */

+ /* PHC requests block period, blocking starts if PHC request expired

@@ -1080,6 +1215,23 @@ struct ena_admin_ena_mmio_req_read_less_resp {

@@ -1176,6 +1328,10 @@ struct ena_admin_ena_mmio_req_read_less_resp {

#define ENA_ADMIN_HOST_INFO_RSS_CONFIGURABLE_FUNCTION_KEY_MASK BIT(4)

diff --git a/drivers/net/ethernet/amazon/ena/ena_com.c b/drivers/net/ethernet/amazon/ena/ena_com.c
index ab413fc1f68e..e67b592e5697 100644
--- a/drivers/net/ethernet/amazon/ena/ena_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_com.c

/*****************************************************************************/

@@ -88,8 +96,7 @@ static int ena_com_admin_init_sq(struct ena_com_admin_queue *admin_queue)

+ sq->entries = dma_alloc_coherent(admin_queue->q_dmadev, size, &sq->dma_addr, GFP_KERNEL);

@@ -111,8 +118,7 @@ static int ena_com_admin_init_cq(struct ena_com_admin_queue *admin_queue)

+ cq->entries = dma_alloc_coherent(admin_queue->q_dmadev, size, &cq->dma_addr, GFP_KERNEL);

@@ -134,8 +140,7 @@ static int ena_com_admin_init_aenq(struct ena_com_dev *ena_dev,

+ aenq->entries = dma_alloc_coherent(ena_dev->dmadev, size, &aenq->dma_addr, GFP_KERNEL);

@@ -153,14 +158,13 @@ static int ena_com_admin_init_aenq(struct ena_com_dev *ena_dev,

aenq_caps |= ena_dev->aenq.q_depth & ENA_REGS_AENQ_CAPS_AENQ_DEPTH_MASK;

+ (sizeof(struct ena_admin_aenq_entry) << ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_SHIFT) &

+ netdev_err(ena_dev->net_device, "AENQ handlers pointer is NULL\n");

@@ -187,14 +191,12 @@ static struct ena_comp_ctx *get_comp_ctxt(struct ena_com_admin_queue *admin_queu

+ netdev_err(admin_queue->ena_dev->net_device, "Completion context is NULL\n");

if (unlikely(admin_queue->comp_ctx[command_id].occupied && capture)) {

+ netdev_err(admin_queue->ena_dev->net_device, "Completion context is occupied\n");

@@ -224,8 +226,7 @@ static struct ena_comp_ctx *__ena_com_submit_admin_cmd(struct ena_com_admin_queu

+ netdev_dbg(admin_queue->ena_dev->net_device, "Admin queue is full.\n");

@@ -272,8 +273,7 @@ static int ena_com_init_comp_ctxt(struct ena_com_admin_queue *admin_queue)

+ admin_queue->comp_ctx = devm_kzalloc(admin_queue->q_dmadev, size, GFP_KERNEL);

@@ -318,7 +318,6 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,

@@ -331,23 +330,17 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,

+ dma_alloc_coherent(ena_dev->dmadev, size, &io_sq->desc_addr.phys_addr,

@@ -360,21 +353,16 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,

+ io_sq->bounce_buf_ctrl.base_buffer = devm_kzalloc(ena_dev->dmadev, size, GFP_KERNEL);

+ netdev_err(ena_dev->net_device, "Bounce buffer memory allocation failed\n");

@@ -408,7 +396,6 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev,

@@ -420,16 +407,11 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev,

+ dma_alloc_coherent(ena_dev->dmadev, size, &io_cq->cdesc_addr.phys_addr, GFP_KERNEL);

+ dma_alloc_coherent(ena_dev->dmadev, size, &io_cq->cdesc_addr.phys_addr,

@@ -512,8 +494,8 @@ static int ena_com_comp_status_to_errno(struct ena_com_admin_queue *admin_queue,

+ netdev_err(admin_queue->ena_dev->net_device, "Admin command failed[%u]\n",

@@ -536,6 +518,7 @@ static int ena_com_comp_status_to_errno(struct ena_com_admin_queue *admin_queue,

static void ena_delay_exponential_backoff_us(u32 exp, u32 delay_us)

delay_us = min_t(u32, delay_us * (1U << exp), ENA_MAX_ADMIN_POLL_US);

@@ -577,8 +560,7 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c

+ netdev_err(admin_queue->ena_dev->net_device, "Command was aborted\n");

@@ -586,8 +568,7 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c

- WARN(comp_ctx->status != ENA_CMD_COMPLETED, "Invalid comp status %d\n",

+ WARN(comp_ctx->status != ENA_CMD_COMPLETED, "Invalid comp status %d\n", comp_ctx->status);

ret = ena_com_comp_status_to_errno(admin_queue, comp_ctx->comp_status);

@@ -631,8 +612,7 @@ static int ena_com_set_llq(struct ena_com_dev *ena_dev)

+ netdev_err(ena_dev->net_device, "Failed to set LLQ configurations: %d\n", ret);

@@ -655,8 +635,7 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,

+ "Invalid header location control, supported: 0x%x\n", supported_feat);

@@ -678,8 +657,8 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,

"Default llq stride ctrl is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",

@@ -701,8 +680,7 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,

@@ -747,8 +725,8 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,

"Default llq num descs before header is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",

@@ -764,8 +742,7 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Cannot set LLQ configuration: %d\n", rc);

@@ -777,8 +754,7 @@ static int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *com

@@ -793,26 +769,16 @@ static int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *com

- "The ena device sent a completion but the driver didn't receive a MSI-X interrupt (cmd %d), autopolling mode is %s\n",

+ "The ena device sent a completion but the driver didn't receive a MSI-X interrupt (cmd %d)\n",

"The ena device didn't send a completion for the admin cmd %d status %d\n",

- * and autopolling mode is enabled. Continuing normal execution in such case

ret = ena_com_comp_status_to_errno(admin_queue, comp_ctx->comp_status);

@@ -864,15 +830,13 @@ static u32 ena_com_reg_bar_read32(struct ena_com_dev *ena_dev, u16 offset)

"Reading reg failed for timeout. expected: req id[%u] offset[%u] actual: req id[%u] offset[%u]\n",

+ mmio_read->seq_num, offset, read_resp->req_id, read_resp->reg_off);

+ netdev_err(ena_dev->net_device, "Read failure: wrong offset provided\n");

@@ -931,8 +895,7 @@ static int ena_com_destroy_io_sq(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Failed to destroy io sq error: %d\n", ret);

@@ -946,8 +909,7 @@ static void ena_com_io_queue_free(struct ena_com_dev *ena_dev,

+ dma_free_coherent(ena_dev->dmadev, size, io_cq->cdesc_addr.virt_addr,

@@ -956,8 +918,7 @@ static void ena_com_io_queue_free(struct ena_com_dev *ena_dev,

+ dma_free_coherent(ena_dev->dmadev, size, io_sq->desc_addr.virt_addr,

@@ -982,8 +943,7 @@ static int wait_for_reset_state(struct ena_com_dev *ena_dev, u32 timeout,

@@ -1023,8 +983,7 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,

+ netdev_dbg(ena_dev->net_device, "Feature %d isn't supported\n", feature_id);

@@ -1061,8 +1020,7 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,

+ "Failed to submit get_feature command %d error: %d\n", feature_id, ret);

@@ -1101,13 +1059,11 @@ static int ena_com_hash_key_allocate(struct ena_com_dev *ena_dev)

+ if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_RSS_HASH_FUNCTION))

+ rss->hash_key = dma_alloc_coherent(ena_dev->dmadev, sizeof(*rss->hash_key),

@@ -1120,8 +1076,8 @@ static void ena_com_hash_key_destroy(struct ena_com_dev *ena_dev)

+ dma_free_coherent(ena_dev->dmadev, sizeof(*rss->hash_key), rss->hash_key,

@@ -1129,9 +1085,8 @@ static int ena_com_hash_ctrl_init(struct ena_com_dev *ena_dev)

+ rss->hash_ctrl = dma_alloc_coherent(ena_dev->dmadev, sizeof(*rss->hash_ctrl),

@@ -1144,8 +1099,8 @@ static void ena_com_hash_ctrl_destroy(struct ena_com_dev *ena_dev)

+ dma_free_coherent(ena_dev->dmadev, sizeof(*rss->hash_ctrl), rss->hash_ctrl,

@@ -1174,15 +1129,13 @@ static int ena_com_indirect_table_allocate(struct ena_com_dev *ena_dev,

+ rss->rss_ind_tbl = dma_alloc_coherent(ena_dev->dmadev, tbl_size, &rss->rss_ind_tbl_dma_addr,

+ rss->host_rss_ind_tbl = devm_kzalloc(ena_dev->dmadev, tbl_size, GFP_KERNEL);

+ dma_free_coherent(ena_dev->dmadev, tbl_size, rss->rss_ind_tbl, rss->rss_ind_tbl_dma_addr);

@@ -1258,8 +1210,7 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev,

@@ -1270,8 +1221,7 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Failed to create IO SQ. error: %d\n", ret);

@@ -1281,16 +1231,12 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev,

+ netdev_dbg(ena_dev->net_device, "Created sq[%u], depth[%u]\n", io_sq->idx, io_sq->q_depth);

@@ -1417,8 +1363,7 @@ int ena_com_create_io_cq(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Failed to create IO CQ. error: %d\n", ret);

@@ -1427,18 +1372,12 @@ int ena_com_create_io_cq(struct ena_com_dev *ena_dev,

+ netdev_dbg(ena_dev->net_device, "Created cq[%u], depth[%u]\n", io_cq->idx, io_cq->q_depth);

@@ -1448,8 +1387,7 @@ int ena_com_get_io_handlers(struct ena_com_dev *ena_dev, u16 qid,

+ netdev_err(ena_dev->net_device, "Invalid queue number %d but the max is %d\n", qid,

@@ -1489,8 +1427,7 @@ void ena_com_wait_for_abort_completion(struct ena_com_dev *ena_dev)

+ ena_delay_exponential_backoff_us(exp++, ena_dev->ena_min_poll_delay_us);

@@ -1516,8 +1453,7 @@ int ena_com_destroy_io_cq(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Failed to destroy IO CQ. error: %d\n", ret);

@@ -1585,8 +1521,7 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag)

+ netdev_err(ena_dev->net_device, "Failed to config AENQ ret: %d\n", ret);

@@ -1607,8 +1542,7 @@ int ena_com_get_dma_width(struct ena_com_dev *ena_dev)

+ netdev_err(ena_dev->net_device, "DMA width illegal value: %d\n", width);

@@ -1630,19 +1564,16 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev)

+ if (unlikely((ver == ENA_MMIO_READ_TIMEOUT) || (ctrl_ver == ENA_MMIO_READ_TIMEOUT))) {

+ (ver & ENA_REGS_VERSION_MAJOR_VERSION_MASK) >> ENA_REGS_VERSION_MAJOR_VERSION_SHIFT,

+ dev_info(ena_dev->dmadev, "ENA controller version: %d.%d.%d implementation version %d\n",

@@ -1691,20 +1622,17 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)

+ dma_free_coherent(ena_dev->dmadev, size, sq->entries, sq->dma_addr);

+ dma_free_coherent(ena_dev->dmadev, size, cq->entries, cq->dma_addr);

+ dma_free_coherent(ena_dev->dmadev, size, aenq->entries, aenq->dma_addr);

@@ -1719,10 +1647,265 @@ void ena_com_set_admin_polling_mode(struct ena_com_dev *ena_dev, bool polling)

-void ena_com_set_admin_auto_polling_mode(struct ena_com_dev *ena_dev,

+ return ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_PHC_CONFIG);

+ /* Allocate shared mem used PHC timestamp retrieved from device */

+ phc->expire_timeout_usec = (get_feat_resp.u.phc.expire_timeout_usec) ?

+ phc->block_timeout_usec = (get_feat_resp.u.phc.block_timeout_usec) ?

+ /* Sanity check - expire timeout must not exceed block timeout */

+ set_feat_cmd.aq_common_descriptor.opcode = ENA_ADMIN_SET_FEATURE;

+ netdev_dbg(ena_dev->net_device, "PHC is active in the device\n");

+ /* In case PHC is not supported by the device, silently exiting */

+int ena_com_phc_get_timestamp(struct ena_com_dev *ena_dev, u64 *timestamp)

+ volatile struct ena_admin_phc_resp *resp = ena_dev->phc.virt_addr;

+ netdev_err(ena_dev->net_device, "PHC feature is not active in the device\n");

+ if (unlikely(ktime_compare(phc->system_time, zero_system_time))) {

+ block_time = ktime_add_us(phc->system_time, phc->block_timeout_usec);

+ expire_time = ktime_add_us(phc->system_time, phc->expire_timeout_usec);

int ena_com_mmio_reg_read_request_init(struct ena_com_dev *ena_dev)

@@ -1730,10 +1913,8 @@ int ena_com_mmio_reg_read_request_init(struct ena_com_dev *ena_dev)

+ mmio_read->read_resp = dma_alloc_coherent(ena_dev->dmadev, sizeof(*mmio_read->read_resp),

@@ -1764,8 +1945,8 @@ void ena_com_mmio_reg_read_request_destroy(struct ena_com_dev *ena_dev)

- dma_free_coherent(ena_dev->dmadev, sizeof(*mmio_read->read_resp),

+ dma_free_coherent(ena_dev->dmadev, sizeof(*mmio_read->read_resp), mmio_read->read_resp,

@@ -1797,8 +1978,7 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Device isn't ready, abort com init\n");

@@ -1875,8 +2055,7 @@ int ena_com_create_io_queue(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Qid (%d) is bigger than max num of queues (%d)\n",

@@ -1902,8 +2081,7 @@ int ena_com_create_io_queue(struct ena_com_dev *ena_dev,

+ io_sq->tx_max_header_size = min_t(u32, ena_dev->tx_max_header_size, SZ_256);

@@ -1935,8 +2113,7 @@ void ena_com_destroy_io_queue(struct ena_com_dev *ena_dev, u16 qid)

+ netdev_err(ena_dev->net_device, "Qid (%d) is bigger than max num of queues (%d)\n",

@@ -1956,6 +2133,56 @@ int ena_com_get_link_params(struct ena_com_dev *ena_dev,

return ena_com_get_feature(ena_dev, resp, ENA_ADMIN_LINK_CONFIG, 0);

+ netdev_err(ena_dev->net_device, "Failed to get stats. error: %d\n", ret);

+static void ena_com_set_supported_customer_metrics(struct ena_com_dev *ena_dev)

+ customer_metrics->supported_metrics = ENA_ADMIN_CUSTOMER_METRICS_MIN_SUPPORT_MASK;

+ ctx.get_cmd.requested_metrics = ENA_ADMIN_CUSTOMER_METRICS_SUPPORT_MASK;

+ ret = ena_get_dev_stats(ena_dev, &ctx, ENA_ADMIN_GET_STATS_TYPE_CUSTOMER_METRICS);

@@ -1971,6 +2198,7 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,

ena_dev->supported_features = get_resp.u.dev_attr.supported_features;

@@ -1979,8 +2207,7 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,

+ if (get_resp.u.max_queue_ext.version != ENA_FEATURE_MAX_QUEUE_EXT_VER)

@@ -2021,23 +2248,22 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,

rc = ena_com_get_feature(ena_dev, &get_resp, ENA_ADMIN_HW_HINTS, 0);

+ memcpy(&get_feat_ctx->hw_hints, &get_resp.u.hw_hints, sizeof(get_resp.u.hw_hints));

+ memset(&get_feat_ctx->hw_hints, 0x0, sizeof(get_feat_ctx->hw_hints));

+ memcpy(&get_feat_ctx->llq, &get_resp.u.llq, sizeof(get_resp.u.llq));

@@ -2080,8 +2306,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *ena_dev, void *data)

+ while ((READ_ONCE(aenq_common->flags) & ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) == phase) {

@@ -2090,8 +2315,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *ena_dev, void *data)

+ netdev_dbg(ena_dev->net_device, "AENQ! Group[%x] Syndrome[%x] timestamp: [%llus]\n",

@@ -2120,8 +2344,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *ena_dev, void *data)

+ writel_relaxed((u32)aenq->head, ena_dev->reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF);

@@ -2133,15 +2356,13 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev,

+ if (unlikely((stat == ENA_MMIO_READ_TIMEOUT) || (cap == ENA_MMIO_READ_TIMEOUT))) {

+ netdev_err(ena_dev->net_device, "Device isn't ready, can't reset device\n");

@@ -2164,8 +2385,7 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Reset indication didn't turn on\n");

@@ -2173,8 +2393,7 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Reset indication didn't turn off\n");

@@ -2189,60 +2408,88 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Capability %d isn't supported\n",

+ ret = ena_get_dev_stats(ena_dev, &ctx, ENA_ADMIN_GET_STATS_TYPE_ENI);

+ netdev_err(ena_dev->net_device, "Capability %d isn't supported\n",

- ret = ena_get_dev_stats(ena_dev, &ctx, ENA_ADMIN_GET_STATS_TYPE_ENI);

+ ret = ena_get_dev_stats(ena_dev, &ctx, ENA_ADMIN_GET_STATS_TYPE_ENA_SRD);

+int ena_com_get_customer_metrics(struct ena_com_dev *ena_dev, char *buffer, u32 len)

+ netdev_err(ena_dev->net_device, "Capability %d not supported.\n",

+ netdev_err(ena_dev->net_device, "No supported customer metrics.\n");

- ret = ena_get_dev_stats(ena_dev, &ctx, ENA_ADMIN_GET_STATS_TYPE_BASIC);

+ get_cmd->u.control_buffer.length = ena_dev->customer_metrics.buffer_len;

+ get_cmd->requested_metrics = ena_dev->customer_metrics.supported_metrics;

+ ret = ena_get_dev_stats(ena_dev, &ctx, ENA_ADMIN_GET_STATS_TYPE_CUSTOMER_METRICS);

+ netdev_err(ena_dev->net_device, "Failed to get customer metrics. error: %d\n", ret);

@@ -2255,8 +2502,7 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu)

+ netdev_dbg(ena_dev->net_device, "Feature %d isn't supported\n", ENA_ADMIN_MTU);

@@ -2275,31 +2521,11 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu)

+ netdev_err(ena_dev->net_device, "Failed to set mtu %d. error: %d\n", mtu, ret);

@@ -2309,8 +2535,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)

+ if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_RSS_HASH_FUNCTION)) {

@@ -2323,8 +2548,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)

if (!(get_resp.u.flow_hash_func.supported_func & BIT(rss->hash_func))) {

+ netdev_err(ena_dev->net_device, "Func hash %d isn't supported by device, abort\n",

@@ -2354,8 +2578,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)

+ netdev_err(ena_dev->net_device, "Failed to set hash function %d. error: %d\n",

@@ -2387,34 +2610,22 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Flow hash function %d isn't supported\n", func);

+ "key len (%u) doesn't equal the supported size (%zu)\n", key_len,

@@ -2495,8 +2706,7 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev)

+ if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_RSS_HASH_INPUT)) {

@@ -2527,8 +2737,7 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev)

+ netdev_err(ena_dev->net_device, "Failed to set hash input. error: %d\n", ret);

@@ -2605,8 +2814,7 @@ int ena_com_fill_hash_ctrl(struct ena_com_dev *ena_dev,

+ netdev_err(ena_dev->net_device, "Invalid proto num (%u)\n", proto);

@@ -2658,8 +2866,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev)

+ if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG)) {

@@ -2699,8 +2906,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev)

+ netdev_err(ena_dev->net_device, "Failed to set indirect table. error: %d\n", ret);

@@ -2779,9 +2985,8 @@ int ena_com_allocate_host_info(struct ena_com_dev *ena_dev)

+ host_attr->host_info = dma_alloc_coherent(ena_dev->dmadev, SZ_4K,

@@ -2810,6 +3015,24 @@ int ena_com_allocate_debug_area(struct ena_com_dev *ena_dev,

+int ena_com_allocate_customer_metrics_buffer(struct ena_com_dev *ena_dev)

+ struct ena_customer_metrics *customer_metrics = &ena_dev->customer_metrics;

+ dma_alloc_coherent(ena_dev->dmadev, customer_metrics->buffer_len,

@@ -2827,12 +3050,24 @@ void ena_com_delete_debug_area(struct ena_com_dev *ena_dev)

+ host_attr->debug_area_virt_addr, host_attr->debug_area_dma_addr);

+void ena_com_delete_customer_metrics_buffer(struct ena_com_dev *ena_dev)

+ struct ena_customer_metrics *customer_metrics = &ena_dev->customer_metrics;

@@ -2877,8 +3112,7 @@ int ena_com_set_host_attributes(struct ena_com_dev *ena_dev)

+ netdev_err(ena_dev->net_device, "Failed to set host attributes: %d\n", ret);

@@ -2896,8 +3130,7 @@ static int ena_com_update_nonadaptive_moderation_interval(struct ena_com_dev *en

+ netdev_err(ena_dev->net_device, "Illegal interrupt delay granularity value\n");

@@ -2935,14 +3168,12 @@ int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev)

@@ -2990,8 +3221,7 @@ int ena_com_config_dev_mode(struct ena_com_dev *ena_dev,

(llq_info->descs_num_before_header * sizeof(struct ena_eth_io_tx_desc));

+ netdev_err(ena_dev->net_device, "The size of the LLQ entry is smaller than needed\n");

diff --git a/drivers/net/ethernet/amazon/ena/ena_com.h b/drivers/net/ethernet/amazon/ena/ena_com.h
index 73b03ce59412..64df2c48c9a6 100644
--- a/drivers/net/ethernet/amazon/ena/ena_com.h
+++ b/drivers/net/ethernet/amazon/ena/ena_com.h

#define ADMIN_CQ_SIZE(depth) ((depth) * sizeof(struct ena_admin_acq_entry))

#define ADMIN_AENQ_SIZE(depth) ((depth) * sizeof(struct ena_admin_aenq_entry))

/*****************************************************************************/

+ * Max time for valid PHC retrieval, passing this threshold will fail

+ * the get time request and block new PHC requests for block_timeout_usec

+ * PHC requests block period, blocking starts once PHC request expired

u16 stats_func; /* Selected function for extended statistic dump */

int ena_com_mmio_reg_read_request_init(struct ena_com_dev *ena_dev);

+/* ena_com_phc_supported - Return if PHC feature is supported by the device

+ * @note: This method must be called after getting supported features

+int ena_com_phc_get_timestamp(struct ena_com_dev *ena_dev, u64 *timestamp);

/* ena_com_set_mmio_read_mode - Enable/disable the indirect mmio reg read mechanism

@@ -483,17 +574,6 @@ bool ena_com_get_admin_running_state(struct ena_com_dev *ena_dev);

void ena_com_set_admin_polling_mode(struct ena_com_dev *ena_dev, bool polling);

-/* ena_com_set_admin_auto_polling_mode - Enable autoswitch to polling mode

- * In case of missing interrupt when data is available switch to polling.

-void ena_com_set_admin_auto_polling_mode(struct ena_com_dev *ena_dev,

/* ena_com_admin_q_comp_intr_handler - admin queue interrupt handler

@@ -581,40 +661,40 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag);

+/* ena_com_get_eni_stats - Get extended network interface statistics

-/* ena_com_get_eni_stats - Get extended network interface statistics

+/* ena_com_get_ena_srd_info - Get ENA SRD network interface statistics

+/* ena_com_get_customer_metrics - Get customer metrics for network interface

+int ena_com_get_customer_metrics(struct ena_com_dev *ena_dev, char *buffer, u32 len);

-/* ena_com_get_offload_settings - Retrieve the device offloads capabilities

@@ -809,6 +889,13 @@ int ena_com_allocate_host_info(struct ena_com_dev *ena_dev);

+/* ena_com_allocate_customer_metrics_buffer - Allocate customer metrics resources.

+int ena_com_allocate_customer_metrics_buffer(struct ena_com_dev *ena_dev);

@@ -823,6 +910,13 @@ void ena_com_delete_debug_area(struct ena_com_dev *ena_dev);

+/* ena_com_delete_customer_metrics_buffer - Free the customer metrics resources.

+void ena_com_delete_customer_metrics_buffer(struct ena_com_dev *ena_dev);

@@ -967,6 +1061,40 @@ static inline void ena_com_disable_adaptive_moderation(struct ena_com_dev *ena_d

+/* ena_com_get_customer_metric_support - query whether device supports a given customer metric.

+ * @return - true if customer metric is supported or false otherwise

+static inline bool ena_com_get_customer_metric_support(struct ena_com_dev *ena_dev,

+ return !!(ena_dev->customer_metrics.supported_metrics & BIT(metric_id));

+/* ena_com_get_customer_metric_count - return the number of supported customer metrics.

+static inline int ena_com_get_customer_metric_count(struct ena_com_dev *ena_dev)

diff --git a/drivers/net/ethernet/amazon/ena/ena_debugfs.c b/drivers/net/ethernet/amazon/ena/ena_debugfs.c
new file mode 100644
index 000000000000..46ed80986724
--- /dev/null
+++ b/drivers/net/ethernet/amazon/ena/ena_debugfs.c

diff --git a/drivers/net/ethernet/amazon/ena/ena_debugfs.h b/drivers/net/ethernet/amazon/ena/ena_debugfs.h
new file mode 100644
index 000000000000..dc61dd998867
--- /dev/null
+++ b/drivers/net/ethernet/amazon/ena/ena_debugfs.h

+static inline void ena_debugfs_terminate(struct net_device *dev) {}

diff --git a/drivers/net/ethernet/amazon/ena/ena_devlink.c b/drivers/net/ethernet/amazon/ena/ena_devlink.c
new file mode 100644
index 000000000000..ac81c24016dd
--- /dev/null
+++ b/drivers/net/ethernet/amazon/ena/ena_devlink.c

+static int ena_devlink_enable_phc_validate(struct devlink *devlink, u32 id,

+ netdev_err(adapter->netdev, "Failed to register devlink params\n");

+static void ena_devlink_configure_params_clean(struct devlink *devlink)

+void ena_devlink_register(struct devlink *devlink, struct device *dev)

diff --git a/drivers/net/ethernet/amazon/ena/ena_devlink.h b/drivers/net/ethernet/amazon/ena/ena_devlink.h
new file mode 100644
index 000000000000..7a19ce4830d9
--- /dev/null
+++ b/drivers/net/ethernet/amazon/ena/ena_devlink.h

+void ena_devlink_register(struct devlink *devlink, struct device *dev);

diff --git a/drivers/net/ethernet/amazon/ena/ena_eth_com.c b/drivers/net/ethernet/amazon/ena/ena_eth_com.c
index 3d6f0a466a9e..4c6e07aa4bbb 100644
--- a/drivers/net/ethernet/amazon/ena/ena_eth_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_eth_com.c

@@ -18,8 +18,7 @@ static struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(

cdesc = (struct ena_eth_io_rx_cdesc_base *)(io_cq->cdesc_addr.virt_addr

+ desc_phase = (READ_ONCE(cdesc->status) & ENA_ETH_IO_RX_CDESC_BASE_PHASE_MASK) >>

@@ -65,8 +64,8 @@ static int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq,

+ "Decreasing entries_in_tx_burst_left of queue %d to %d\n", io_sq->qid,

@@ -75,8 +74,8 @@ static int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq,

+ __iowrite64_copy(io_sq->desc_addr.pbuf_dev_addr + dst_offset, bounce_buffer,

@@ -102,16 +101,14 @@ static int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq,

+ if (unlikely((header_offset + header_len) > llq_info->desc_list_entry_size)) {

+ netdev_err(ena_com_io_sq_to_ena_dev(io_sq)->net_device, "Bounce buffer is NULL\n");

@@ -129,8 +126,7 @@ static void *get_sq_desc_llq(struct ena_com_io_sq *io_sq)

+ netdev_err(ena_com_io_sq_to_ena_dev(io_sq)->net_device, "Bounce buffer is NULL\n");

@@ -265,11 +273,11 @@ static u16 ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,

"ENA q_id: %d packets were completed. first desc idx %u descs# %d\n",

@@ -328,9 +336,6 @@ static int ena_com_create_and_store_tx_meta_desc(struct ena_com_io_sq *io_sq,

@@ -372,9 +377,8 @@ static void ena_com_rx_set_flags(struct ena_com_io_cq *io_cq,

"l3_proto %d l4_proto %d l3_csum_err %d l4_csum_err %d hash %d frag %d cdesc_status %x\n",

+ ena_rx_ctx->l3_proto, ena_rx_ctx->l4_proto, ena_rx_ctx->l3_csum_err,

+ ena_rx_ctx->l4_csum_err, ena_rx_ctx->hash, ena_rx_ctx->frag, cdesc->status);

/*****************************************************************************/

@@ -406,13 +410,12 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq,

- if (unlikely(io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV &&

+ if (unlikely(io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV && !buffer_to_push)) {

@@ -549,23 +552,25 @@ int ena_com_rx_pkt(struct ena_com_io_cq *io_cq,

WARN(io_cq->direction != ENA_COM_IO_QUEUE_DIRECTION_RX, "wrong Q type");

+ "Fetch rx packet: queue %d completed desc: %d\n", io_cq->qid, nb_hw_desc);

+ "Too many RX cdescs (%d) > MAX(%d)\n", nb_hw_desc, ena_rx_ctx->max_bufs);

@@ -589,8 +594,8 @@ int ena_com_rx_pkt(struct ena_com_io_cq *io_cq,

@@ -627,8 +632,8 @@ int ena_com_add_single_rx_desc(struct ena_com_io_sq *io_sq,

+ "[%s] Adding single RX desc, Queue: %u, req_id: %u\n", __func__, io_sq->qid,

diff --git a/drivers/net/ethernet/amazon/ena/ena_eth_com.h b/drivers/net/ethernet/amazon/ena/ena_eth_com.h
index 689313ee25a8..449bc4960ccc 100644
--- a/drivers/net/ethernet/amazon/ena/ena_eth_com.h
+++ b/drivers/net/ethernet/amazon/ena/ena_eth_com.h

-/* head update threshold in units of (queue size / ENA_COMP_HEAD_THRESH) */

+#define ENA_LLQ_ENTRY_DESC_CHUNK_SIZE (2 * sizeof(struct ena_eth_io_tx_desc))

+#define ENA_LLQ_LARGE_HEADER (256UL - ENA_LLQ_ENTRY_DESC_CHUNK_SIZE)

@@ -141,8 +143,8 @@ static inline bool ena_com_is_doorbell_needed(struct ena_com_io_sq *io_sq,

+ "Queue: %d num_descs: %d num_entries_needed: %d\n", io_sq->qid, num_descs,

@@ -153,43 +155,20 @@ static inline int ena_com_write_sq_doorbell(struct ena_com_io_sq *io_sq)

+ "Write submission queue doorbell for queue: %d tail: %d\n", io_sq->qid, tail);

+ "Reset available entries in tx burst for queue %d to %d\n", io_sq->qid,

-static inline int ena_com_update_dev_comp_head(struct ena_com_io_cq *io_cq)

- need_update = unreported_comp > (io_cq->q_depth / ENA_COMP_HEAD_THRESH);

static inline void ena_com_update_numa_node(struct ena_com_io_cq *io_cq,

@@ -244,8 +223,8 @@ static inline int ena_com_tx_comp_req_id_get(struct ena_com_io_cq *io_cq,

+ netdev_err(ena_com_io_cq_to_ena_dev(io_cq)->net_device, "Invalid req id %d\n",

diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
index 27dae632efcb..fe3479b84a1f 100644
--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c

.stat_offset = offsetof(struct ena_com_stats_admin, stat) / sizeof(u64) \

+ .stat_offset = offsetof(struct ena_admin_ena_srd_info, flags) / sizeof(u64) \

@@ -48,8 +67,12 @@ static const struct ena_stats ena_stats_global_strings[] = {

+ * with type ENA_ADMIN_GET_STATS_TYPE_CUSTOMER_METRICS is not supported

@@ -58,6 +81,23 @@ static const struct ena_stats ena_stats_eni_strings[] = {

@@ -82,7 +122,7 @@ static const struct ena_stats ena_stats_rx_strings[] = {

@@ -110,8 +150,9 @@ static const struct ena_stats ena_stats_ena_com_strings[] = {

#define ENA_STATS_ARRAY_ENA_COM ARRAY_SIZE(ena_stats_ena_com_strings)

- (ARRAY_SIZE(ena_stats_eni_strings) * (adapter)->eni_stats_supported)

@@ -119,9 +160,60 @@ static void ena_safe_update_stat(u64 *src, u64 *dst,

+static void ena_metrics_stats(struct ena_adapter *adapter, u64 **data)

+ supported_metrics_count = ena_com_get_customer_metric_count(dev);

+ /* Updating regardless of rc - once we told ethtool how many stats we have

+ * it will print that much stats. We can't leave holes in the stats

+ * additional offset of the ENA SRD mode that was already processed

static void ena_queue_stats(struct ena_adapter *adapter, u64 **data)

@@ -178,7 +270,7 @@ static void ena_dev_admin_queue_stats(struct ena_adapter *adapter, u64 **data)

@@ -192,17 +284,8 @@ static void ena_get_stats(struct ena_adapter *adapter,

@@ -214,7 +297,19 @@ static void ena_get_ethtool_stats(struct net_device *netdev,

@@ -226,7 +321,17 @@ static int ena_get_sw_stats_count(struct ena_adapter *adapter)

+ count = ENA_STATS_ARRAY_ENA_SRD * ena_com_get_cap(dev, ENA_ADMIN_ENA_SRD_INFO);

@@ -242,6 +347,35 @@ int ena_get_sset_count(struct net_device *netdev, int sset)

+static void ena_metrics_stats_strings(struct ena_adapter *adapter, u8 **data)

static void ena_queue_strings(struct ena_adapter *adapter, u8 **data)

@@ -260,17 +394,14 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data)

@@ -319,7 +446,7 @@ static void ena_get_ethtool_strings(struct net_device *netdev,

@@ -357,7 +484,9 @@ static int ena_get_link_ksettings(struct net_device *netdev,

@@ -402,7 +531,9 @@ static void ena_update_rx_rings_nonadaptive_intr_moderation(struct ena_adapter *

@@ -454,28 +585,56 @@ static void ena_get_drvinfo(struct net_device *dev,

+ ret = strscpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));

+ if (adapter->ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {

+ kernel_ring->tx_push_buf_len = adapter->ena_dev->tx_max_header_size;

@@ -485,11 +644,51 @@ static int ena_set_ringparam(struct net_device *netdev,

+ if ((adapter->ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) !=

+ NL_SET_ERR_MSG_MOD(extack, "Push mode state cannot be modified");

+ /* Validate that the push buffer is supported on the underlying device */

+ changed |= new_tx_push_buf_len != adapter->ena_dev->tx_max_header_size;

- return ena_update_queue_sizes(adapter, new_tx_size, new_rx_size);

+ return ena_update_queue_params(adapter, new_tx_size, new_rx_size,

@@ -536,9 +735,11 @@ static u16 ena_flow_data_to_flow_hash(u32 hash_fields)

@@ -587,9 +788,12 @@ static int ena_get_rss_hash(struct ena_com_dev *ena_dev,

@@ -631,26 +835,6 @@ static int ena_set_rss_hash(struct ena_com_dev *ena_dev,

-static int ena_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info)

static int ena_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info,

@@ -662,9 +846,6 @@ static int ena_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info,

@@ -684,7 +865,10 @@ static u32 ena_get_rxfh_indir_size(struct net_device *netdev)

@@ -735,15 +919,15 @@ static int ena_indirection_table_get(struct ena_adapter *adapter, u32 *indir)

-static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,

@@ -758,7 +942,7 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,

@@ -775,27 +959,27 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,

-static int ena_set_rxfh(struct net_device *netdev, const u32 *indir,

@@ -807,12 +991,12 @@ static int ena_set_rxfh(struct net_device *netdev, const u32 *indir,

@@ -839,11 +1023,20 @@ static int ena_set_channels(struct net_device *netdev,

@@ -876,11 +1069,7 @@ static int ena_set_tunable(struct net_device *netdev,

@@ -893,6 +1082,8 @@ static int ena_set_tunable(struct net_device *netdev,

@@ -906,16 +1097,17 @@ static const struct ethtool_ops ena_ethtool_ops = {

@@ -937,22 +1129,18 @@ static void ena_dump_stats_ex(struct ena_adapter *adapter, u8 *buf)

@@ -974,8 +1162,8 @@ static void ena_dump_stats_ex(struct ena_adapter *adapter, u8 *buf)

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 0e43000614ab..92d149d4f091 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c

#define ENA_MAX_RINGS min_t(unsigned int, ENA_MAX_NUM_IO_QUEUES, num_possible_cpus())

#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | \

static void check_for_admin_com_state(struct ena_adapter *adapter);

-static void ena_destroy_device(struct ena_adapter *adapter, bool graceful);

-static void ena_init_napi_in_range(struct ena_adapter *adapter, int first_index,

-static void ena_del_napi_in_range(struct ena_adapter *adapter, int first_index,

-static int ena_setup_tx_resources(struct ena_adapter *adapter, int qid);

-static int ena_setup_tx_resources_in_range(struct ena_adapter *adapter,

-static int ena_create_io_tx_queue(struct ena_adapter *adapter, int qid);

-static void ena_free_tx_resources(struct ena_adapter *adapter, int qid);

-static int ena_clean_xdp_irq(struct ena_ring *xdp_ring, u32 budget);

-static void ena_destroy_all_tx_queues(struct ena_adapter *adapter);

-static void ena_free_all_io_tx_resources(struct ena_adapter *adapter);

-static void ena_napi_disable_in_range(struct ena_adapter *adapter,

-static int ena_create_io_tx_queues_in_range(struct ena_adapter *adapter,

-/* Increase a stat by cnt while holding syncp seqlock on 32bit machines */

- ena_increase_stat(&tx_ring->tx_stats.doorbells, 1, &tx_ring->syncp);

static void ena_tx_timeout(struct net_device *dev, unsigned int txqueue)

+ enum ena_regs_reset_reason_types reset_reason = ENA_REGS_RESET_OS_NETDEV_WD;

+ time_since_last_napi = jiffies_to_usecs(jiffies - tx_ring->tx_stats.last_napi_jiffies);

+ "TX q %d is paused for too long (threshold %u). Time since last napi %u usec. napi scheduled: %d\n",

+ "napi handler hasn't been called for a long time but is scheduled\n");

ena_increase_stat(&adapter->dev_stats.tx_timeout, 1, &adapter->syncp);

static void update_rx_ring_mtu(struct ena_adapter *adapter, int mtu)

@@ -126,7 +105,7 @@ static int ena_change_mtu(struct net_device *dev, int new_mtu)

@@ -135,19 +114,18 @@ static int ena_change_mtu(struct net_device *dev, int new_mtu)

"llq tx max burst size of queue %d achieved, writing doorbell to send burst\n",

@@ -162,15 +140,11 @@ static int ena_xmit_common(struct net_device *dev,

* ena_com_prepare_tx() are fatal and therefore require a device reset.

+ ena_increase_stat(&ring->tx_stats.prepare_ctx_err, 1, &ring->syncp);

@@ -180,6 +154,7 @@ static int ena_xmit_common(struct net_device *dev,

@@ -188,482 +163,6 @@ static int ena_xmit_common(struct net_device *dev,

-/* This is the XDP napi callback. XDP queues use a separate napi callback

- struct ena_napi *ena_napi = container_of(napi, struct ena_napi, napi);

- if (unlikely(!test_bit(ENA_FLAG_DEV_UP, &xdp_ring->adapter->flags))) {

- if (xdp_ring->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {

- netif_warn(adapter, tx_queued, adapter->netdev, "Failed to map xdp buff\n");

-static int ena_xdp_execute(struct ena_ring *rx_ring, struct xdp_buff *xdp)

-static int ena_setup_and_create_all_xdp_queues(struct ena_adapter *adapter)

- rc = ena_setup_tx_resources_in_range(adapter, adapter->xdp_first_ring,

- rc = xdp_rxq_info_reg(&rx_ring->xdp_rxq, rx_ring->netdev, rx_ring->qid, 0);

- "Failed to register xdp rx queue info. RX queue num %d rc: %d\n",

- rc = xdp_rxq_info_reg_mem_model(&rx_ring->xdp_rxq, MEM_TYPE_PAGE_SHARED,

- "Failed to register xdp rx queue info memory model. RX queue num %d rc: %d\n",

-static void ena_xdp_exchange_program_rx_in_range(struct ena_adapter *adapter,

- struct bpf_prog *old_bpf_prog = xchg(&adapter->xdp_bpf_prog, prog);

-static int ena_destroy_and_free_all_xdp_queues(struct ena_adapter *adapter)

-static int ena_xdp_set(struct net_device *netdev, struct netdev_bpf *bpf)

- "Failed to set xdp program, the current MTU (%d) is larger than the maximum allowed MTU (%lu) while xdp is on",

- "Failed to set xdp program, the current MTU is larger than the maximum allowed MTU. Check the dmesg for more info");

- "Failed to set xdp program, the Rx/Tx channel count should be at most half of the maximum allowed channel count. The current queue count (%d), the maximal queue count (%d)\n",

- "Failed to set xdp program, there is no enough space for allocating XDP queues, Check the dmesg for more info");

-/* This is the main xdp callback, it's used by the kernel to set/unset the xdp

-static int ena_xdp(struct net_device *netdev, struct netdev_bpf *bpf)

- adapter->netdev->rx_cpu_rmap = alloc_irq_cpu_rmap(adapter->num_io_queues);

@@ -676,12 +175,13 @@ static void ena_init_io_rings_common(struct ena_adapter *adapter,

@@ -779,6 +279,7 @@ static int ena_setup_tx_resources(struct ena_adapter *adapter, int qid)

@@ -811,9 +312,8 @@ static void ena_free_tx_resources(struct ena_adapter *adapter, int qid)

-static int ena_setup_tx_resources_in_range(struct ena_adapter *adapter,

-static void ena_free_all_io_tx_resources_in_range(struct ena_adapter *adapter,

+void ena_free_all_io_tx_resources_in_range(struct ena_adapter *adapter,

@@ -850,7 +350,7 @@ static void ena_free_all_io_tx_resources_in_range(struct ena_adapter *adapter,

-static void ena_free_all_io_tx_resources(struct ena_adapter *adapter)

@@ -911,6 +411,7 @@ static int ena_setup_rx_resources(struct ena_adapter *adapter,

@@ -984,8 +485,7 @@ static struct page *ena_alloc_map_page(struct ena_ring *rx_ring,

+ ena_increase_stat(&rx_ring->rx_stats.page_alloc_fail, 1, &rx_ring->syncp);

@@ -1014,7 +514,7 @@ static int ena_alloc_rx_buffer(struct ena_ring *rx_ring,

/* restore page offset value in case it has been changed by device */

@@ -1022,7 +522,7 @@ static int ena_alloc_rx_buffer(struct ena_ring *rx_ring,

@@ -1031,6 +531,8 @@ static int ena_alloc_rx_buffer(struct ena_ring *rx_ring,

@@ -1038,14 +540,12 @@ static int ena_alloc_rx_buffer(struct ena_ring *rx_ring,

- dma_unmap_page(rx_ring->dev, ena_buf->paddr - rx_ring->rx_headroom,

+ dma_unmap_page_attrs(rx_ring->dev, rx_info->dma_addr, ENA_PAGE_SIZE, DMA_BIDIRECTIONAL,

@@ -1059,7 +559,7 @@ static void ena_free_rx_page(struct ena_ring *rx_ring,

@@ -1159,8 +659,8 @@ static void ena_free_all_rx_bufs(struct ena_adapter *adapter)

@@ -1195,8 +695,11 @@ static void ena_unmap_tx_buff(struct ena_ring *tx_ring,

@@ -1216,10 +719,15 @@ static void ena_free_tx_bufs(struct ena_ring *tx_ring)

@@ -1252,6 +760,7 @@ static void ena_destroy_all_rx_queues(struct ena_adapter *adapter)

@@ -1262,56 +771,39 @@ static void ena_destroy_all_io_queues(struct ena_adapter *adapter)

-static int handle_invalid_req_id(struct ena_ring *ring, u16 req_id,

static int validate_tx_req_id(struct ena_ring *tx_ring, u16 req_id)

-static int validate_xdp_req_id(struct ena_ring *xdp_ring, u16 req_id)

@@ -1332,9 +824,13 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget)

@@ -1354,7 +850,7 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget)

@@ -1366,7 +862,6 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget)

@@ -1398,15 +893,14 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget)

-static struct sk_buff *ena_alloc_skb(struct ena_ring *rx_ring, void *first_frag)

+static struct sk_buff *ena_alloc_skb(struct ena_ring *rx_ring, void *first_frag, u16 len)

@@ -1415,23 +909,47 @@ static struct sk_buff *ena_alloc_skb(struct ena_ring *rx_ring, void *first_frag)

+static bool ena_try_rx_buf_page_reuse(struct ena_rx_buffer *rx_info, u16 buf_len,

+ if (SKB_DATA_ALIGN(len + pkt_offset) + ENA_MIN_RX_BUF_SIZE <= ena_buf->len) {

@@ -1439,8 +957,11 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,

+ ena_increase_stat(&rx_ring->rx_stats.bad_req_id, 1, &rx_ring->syncp);

@@ -1448,34 +969,25 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,

@@ -1483,14 +995,21 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,

+ ena_unmap_rx_buff_attrs(rx_ring, rx_info, DMA_ATTR_SKIP_CPU_SYNC);

@@ -1499,7 +1018,8 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,

@@ -1514,10 +1034,27 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,

+ ena_unmap_rx_buff_attrs(rx_ring, rx_info, DMA_ATTR_SKIP_CPU_SYNC);

@@ -1550,7 +1087,7 @@ static void ena_rx_checksum(struct ena_ring *rx_ring,

@@ -1562,7 +1099,7 @@ static void ena_rx_checksum(struct ena_ring *rx_ring,

@@ -1608,31 +1145,35 @@ static void ena_set_rx_hash(struct ena_ring *rx_ring,

-static int ena_xdp_handle_buff(struct ena_ring *rx_ring, struct xdp_buff *xdp)

+static int ena_xdp_handle_buff(struct ena_ring *rx_ring, struct xdp_buff *xdp, u16 num_descs)

+ ena_increase_stat(&rx_ring->rx_stats.xdp_drop, 1, &rx_ring->syncp);

@@ -1656,6 +1197,7 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,

@@ -1665,7 +1207,7 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,

@@ -1682,18 +1224,24 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,

"rx_poll: q %d got packet from ena. descs #: %d l3 proto %d l4 proto %d hash: %x\n",

+ xdp_verdict = ena_xdp_handle_buff(rx_ring, &xdp, ena_rx_ctx.descs);

@@ -1711,14 +1259,16 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,

@@ -1757,31 +1307,30 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,

+ ena_increase_stat(&rx_ring->rx_stats.bad_desc_num, 1, &rx_ring->syncp);

+ ena_reset_device(adapter, ENA_REGS_RESET_RX_DESCRIPTOR_MALFORMED);

@@ -1811,16 +1360,17 @@ static void ena_adjust_adaptive_rx_intr_moderation(struct ena_napi *ena_napi)

@@ -1848,8 +1398,8 @@ static void ena_unmask_interrupt(struct ena_ring *tx_ring,

@@ -1858,83 +1408,32 @@ static void ena_update_ring_numa_node(struct ena_ring *tx_ring,

-static int ena_clean_xdp_irq(struct ena_ring *xdp_ring, u32 budget)

struct ena_napi *ena_napi = container_of(napi, struct ena_napi, napi);

@@ -1987,11 +1486,10 @@ static int ena_io_poll(struct napi_struct *napi, int budget)

@@ -2075,7 +1573,7 @@ static int ena_enable_msix(struct ena_adapter *adapter)

+ if (netif_enable_cpu_rmap(adapter->netdev, adapter->num_io_queues))

@@ -2156,9 +1654,9 @@ static int ena_request_mgmnt_irq(struct ena_adapter *adapter)

u32 io_queue_count = adapter->num_io_queues + adapter->xdp_num_queues;

@@ -2184,6 +1682,16 @@ static int ena_request_io_irq(struct ena_adapter *adapter)

+ /* Now that IO IRQs have been successfully allocated map them to the

+ * corresponding IO NAPI instance. Note that the mgmnt IRQ does not

+ * have a NAPI, so care must be taken to correctly map IRQs to NAPIs.

@@ -2211,16 +1719,13 @@ static void ena_free_io_irq(struct ena_adapter *adapter)

for (i = ENA_IO_IRQ_FIRST_IDX; i < ENA_MAX_MSIX_VEC(io_queue_count); i++) {

@@ -2252,30 +1757,36 @@ static void ena_del_napi_in_range(struct ena_adapter *adapter,

+ netif_napi_add_config(adapter->netdev, &napi->napi, napi_handler, i);

@@ -2284,20 +1795,40 @@ static void ena_napi_disable_in_range(struct ena_adapter *adapter,

@@ -2310,8 +1841,7 @@ static int ena_rss_configure(struct ena_adapter *adapter)

+ netif_err(adapter, ifup, adapter->netdev, "Failed to init RSS rc: %d\n", rc);

@@ -2378,7 +1908,7 @@ static int ena_create_io_tx_queue(struct ena_adapter *adapter, int qid)

@@ -2403,8 +1933,8 @@ static int ena_create_io_tx_queue(struct ena_adapter *adapter, int qid)

-static int ena_create_io_tx_queues_in_range(struct ena_adapter *adapter,

@@ -2446,7 +1976,7 @@ static int ena_create_io_rx_queue(struct ena_adapter *adapter, int qid)

@@ -2484,12 +2014,15 @@ static int ena_create_all_io_rx_queues(struct ena_adapter *adapter)

@@ -2630,6 +2163,12 @@ static int ena_up(struct ena_adapter *adapter)

int io_queue_count = adapter->num_io_queues + adapter->xdp_num_queues;

@@ -2693,8 +2232,6 @@ static void ena_down(struct ena_adapter *adapter)

@@ -2790,11 +2327,13 @@ static int ena_close(struct net_device *netdev)

@@ -2804,7 +2343,39 @@ int ena_update_queue_sizes(struct ena_adapter *adapter,

+ adapter->large_llq_header_enabled = !adapter->large_llq_header_enabled;

+int ena_set_rx_copybreak(struct ena_adapter *adapter, u32 rx_copybreak)

+ if (rx_copybreak > min_t(u16, adapter->netdev->mtu, ENA_PAGE_SIZE))

int ena_update_queue_count(struct ena_adapter *adapter, u32 new_channel_count)

@@ -3050,8 +2621,6 @@ static netdev_tx_t ena_start_xmit(struct sk_buff *skb, struct net_device *dev)

@@ -3073,7 +2642,7 @@ static netdev_tx_t ena_start_xmit(struct sk_buff *skb, struct net_device *dev)

@@ -3115,6 +2684,8 @@ static netdev_tx_t ena_start_xmit(struct sk_buff *skb, struct net_device *dev)

-static u16 ena_select_queue(struct net_device *dev, struct sk_buff *skb,

- /* we suspect that this is good for in--kernel network services that

- * want to loop incoming skb rx to tx in normal user generated traffic,

static void ena_config_host_info(struct ena_com_dev *ena_dev, struct pci_dev *pdev)

@@ -3163,14 +2719,22 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev, struct pci_dev *pd

+ "OS distribution string will be truncated, status = %zd\n", ret);

@@ -3182,7 +2746,9 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev, struct pci_dev *pd

@@ -3225,8 +2791,7 @@ static void ena_config_debug_area(struct ena_adapter *adapter)

+ netif_warn(adapter, drv, adapter->netdev, "Cannot set host attributes\n");

- rc = ena_com_get_eni_stats(adapter->ena_dev, &adapter->eni_stats);

@@ -3264,39 +2817,45 @@ static void ena_get_stats64(struct net_device *netdev,

+ for (i = 0; i < adapter->num_io_queues + adapter->xdp_num_queues; i++) {

@@ -3317,16 +2876,120 @@ static const struct net_device_ops ena_netdev_ops = {

+ /* If this function is called after driver load, the ring sizes have already

+ * been configured. Take it into account when recalculating ring size.

+ if (ena_dev->supported_features & BIT(ENA_ADMIN_MAX_QUEUES_EXT)) {

+ if (ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)

+ netdev_err(adapter->netdev, "Device max TX queue size: %d < minimum: %d\n",

+ netdev_err(adapter->netdev, "Device max RX queue size: %d < minimum: %d\n",

+ /* When forcing large headers, we multiply the entry size by 2, and therefore divide

+ * the queue size by 2, leaving the amount of memory used by the queues unchanged.

+ if ((llq->entry_size_ctrl_supported & ENA_ADMIN_LIST_ENTRY_SIZE_256B) &&

+ "Forcing large headers and decreasing maximum TX queue size to %d\n",

+ "Forcing large headers failed: LLQ is disabled or device does not support large headers\n");

@@ -3350,13 +3013,30 @@ static int ena_device_validate_params(struct ena_adapter *adapter,

-static void set_default_llq_configurations(struct ena_llq_configurations *llq_config)

+static void set_default_llq_configurations(struct ena_adapter *adapter,

llq_config->llq_num_decs_before_header = ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_2;

- llq_config->llq_ring_entry_size = ENA_ADMIN_LIST_ENTRY_SIZE_128B;

+ if ((llq->entry_size_ctrl_supported & ENA_ADMIN_LIST_ENTRY_SIZE_256B) &&

+ llq_config->llq_ring_entry_size = ENA_ADMIN_LIST_ENTRY_SIZE_256B;

+ llq_config->llq_ring_entry_size = ENA_ADMIN_LIST_ENTRY_SIZE_128B;

@@ -3375,6 +3055,13 @@ static int ena_set_queues_placement_policy(struct pci_dev *pdev,

+ "LLQ is advertised as supported but device doesn't expose mem bar\n");

rc = ena_com_config_dev_mode(ena_dev, llq, llq_default_configurations);

@@ -3390,15 +3077,8 @@ static int ena_map_llq_mem_bar(struct pci_dev *pdev, struct ena_com_dev *ena_dev

- if (ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {

- "ENA device does not expose LLQ bar. Fallback to host mode policy.\n");

@@ -3410,10 +3090,12 @@ static int ena_map_llq_mem_bar(struct pci_dev *pdev, struct ena_com_dev *ena_dev

-static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,

+static int ena_device_init(struct ena_adapter *adapter, struct pci_dev *pdev,

@@ -3458,6 +3140,8 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,

@@ -3498,18 +3182,28 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,

+ set_default_llq_configurations(adapter, &llq_config, &get_feat_ctx->llq);

rc = ena_set_queues_placement_policy(pdev, ena_dev, &get_feat_ctx->llq,

+ netdev_err(netdev, "Cannot set queues placement policy rc= %d\n", rc);

-static void ena_destroy_device(struct ena_adapter *adapter, bool graceful)

+int ena_destroy_device(struct ena_adapter *adapter, bool graceful)

/* Stop the device from sending AENQ events (in case reset flag is set

if (!(test_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags) && dev_up))

@@ -3587,6 +3282,8 @@ static void ena_destroy_device(struct ena_adapter *adapter, bool graceful)

@@ -3594,24 +3291,34 @@ static void ena_destroy_device(struct ena_adapter *adapter, bool graceful)

- rc = ena_device_init(ena_dev, adapter->pdev, &get_feat_ctx, &wd_state);

+ rc = ena_device_init(adapter, adapter->pdev, &get_feat_ctx, &wd_state);

@@ -3641,8 +3348,6 @@ static int ena_restore_device(struct ena_adapter *adapter)

+ dev_err(&adapter->pdev->dev, "Device reset completed successfully\n");

@@ -3694,9 +3405,8 @@ static int check_for_rx_interrupt_queue(struct ena_adapter *adapter,

@@ -3707,14 +3417,18 @@ static int check_missing_comp_in_tx_queue(struct ena_adapter *adapter,

struct ena_napi *ena_napi = container_of(tx_ring->napi, struct ena_napi, napi);

+ enum ena_regs_reset_reason_types reset_reason = ENA_REGS_RESET_MISS_TX_CMPL;

+ missing_tx_comp_to = jiffies_to_msecs(adapter->missing_tx_completion_to);

@@ -3733,9 +3447,7 @@ static int check_missing_comp_in_tx_queue(struct ena_adapter *adapter,

@@ -3743,27 +3455,45 @@ static int check_missing_comp_in_tx_queue(struct ena_adapter *adapter,

- time_since_last_napi = jiffies_to_usecs(jiffies - tx_ring->tx_stats.last_napi_jiffies);

- missing_tx_comp_to = jiffies_to_msecs(adapter->missing_tx_completion_to);

- "Found a Tx that wasn't completed on time, qid %d, index %d. %u usecs have passed since last napi execution. Missing Tx timeout value %u msecs\n",

+ if (missing_tx_comp_to < time_since_last_napi && napi_scheduled) {

+ "TX hasn't completed, qid %d, index %d. %u usecs from last napi execution, napi scheduled: %d\n",

if (unlikely(missed_tx > adapter->missing_tx_completion_threshold)) {

- "The number of lost tx completions is above the threshold (%d > %d). Reset the device\n",

+ "Lost TX completions are above the threshold (%d > %d). Completion transmission timeout: %u.\n",

@@ -3777,10 +3507,11 @@ static void check_for_missing_completions(struct ena_adapter *adapter)

/* Make sure the driver doesn't turn the device in other process */

@@ -3793,27 +3524,29 @@ static void check_for_missing_completions(struct ena_adapter *adapter)

- for (i = adapter->last_monitored_tx_qid; i < io_queue_count; i++) {

@@ -3884,8 +3617,7 @@ static void check_for_missing_keep_alive(struct ena_adapter *adapter)

@@ -3896,8 +3628,7 @@ static void check_for_admin_com_state(struct ena_adapter *adapter)

@@ -3950,7 +3681,8 @@ static void ena_update_host_info(struct ena_admin_host_info *host_info,

- struct ena_adapter *adapter = from_timer(adapter, t, timer_service);

@@ -4013,10 +3745,6 @@ static u32 ena_calc_max_io_queue_num(struct pci_dev *pdev,

max_num_io_queues = min_t(u32, max_num_io_queues, pci_msix_vec_count(pdev) - 1);

@@ -4073,7 +3801,7 @@ static void ena_set_conf_feat_params(struct ena_adapter *adapter,

@@ -4101,14 +3829,14 @@ static int ena_rss_init_default(struct ena_adapter *adapter)

- rc = ena_com_fill_hash_function(ena_dev, ENA_ADMIN_TOEPLITZ, NULL,

+ rc = ena_com_fill_hash_function(ena_dev, ENA_ADMIN_TOEPLITZ, NULL, ENA_HASH_KEY_SIZE,

@@ -4136,73 +3864,6 @@ static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev)

-static int ena_calc_io_queue_size(struct ena_calc_queue_size_ctx *ctx)

- struct ena_admin_feature_llq_desc *llq = &ctx->get_feat_ctx->llq;

- if (ena_dev->supported_features & BIT(ENA_ADMIN_MAX_QUEUES_EXT)) {

- if (ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)

@@ -4215,12 +3876,12 @@ static int ena_calc_io_queue_size(struct ena_calc_queue_size_ctx *ctx)

static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

@@ -4286,23 +3947,39 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

+ netdev_err(netdev, "ena_com_allocate_customer_metrics_buffer failed\n");

@@ -4311,8 +3988,7 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

ena_dev->intr_moder_rx_interval = ENA_INTR_INITIAL_RX_INTERVAL_USECS;

ena_dev->intr_delay_resolution = ENA_DEFAULT_INTR_DELAY_RESOLUTION;

max_num_io_queues = ena_calc_max_io_queue_num(pdev, ena_dev, &get_feat_ctx);

@@ -4321,13 +3997,6 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

@@ -4351,6 +4020,7 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

@@ -4378,10 +4048,9 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

memcpy(adapter->netdev->perm_addr, adapter->mac_addr, netdev->addr_len);

@@ -4393,6 +4062,8 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

@@ -4414,6 +4085,12 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

@@ -4460,22 +4143,23 @@ static void __ena_shutoff(struct pci_dev *pdev, bool shutdown)

@@ -4492,6 +4176,8 @@ static void __ena_shutoff(struct pci_dev *pdev, bool shutdown)

@@ -4574,13 +4260,19 @@ static struct pci_driver ena_pci_driver = {

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
index 0c39fc2fa345..006f9a3acea6 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h

-/* The max MTU size is configured to be the ethernet frame size without

- * the overhead of the ethernet header, which can have a VLAN header, and

- * The buffer size we share with the device is defined to be ENA_PAGE_SIZE

-#define ENA_XDP_MAX_MTU (ENA_PAGE_SIZE - ETH_HLEN - ETH_FCS_LEN - \

-#define ENA_IS_XDP_INDEX(adapter, index) (((index) >= (adapter)->xdp_first_ring) && \

- ((index) < (adapter)->xdp_first_ring + (adapter)->xdp_num_queues))

/* Used for detect missing tx packets to limit the number of prints */

@@ -396,48 +403,67 @@ void ena_dump_stats_to_dmesg(struct ena_adapter *adapter);

int ena_update_queue_count(struct ena_adapter *adapter, u32 new_channel_count);

+int ena_set_rx_copybreak(struct ena_adapter *adapter, u32 rx_copybreak);

+int ena_destroy_device(struct ena_adapter *adapter, bool graceful);

-static inline bool ena_xdp_legal_queue_count(struct ena_adapter *adapter,

+/* Increase a stat by cnt while holding syncp seqlock on 32bit machines */

-static inline enum ena_xdp_errors_t ena_xdp_allowed(struct ena_adapter *adapter)

- else if (!ena_xdp_legal_queue_count(adapter, adapter->num_io_queues))

+ ena_increase_stat(&tx_ring->tx_stats.doorbells, 1, &tx_ring->syncp);

+void ena_free_all_io_tx_resources_in_range(struct ena_adapter *adapter,

+void ena_unmask_interrupt(struct ena_ring *tx_ring, struct ena_ring *rx_ring);

diff --git a/drivers/net/ethernet/amazon/ena/ena_phc.c b/drivers/net/ethernet/amazon/ena/ena_phc.c
new file mode 100644
index 000000000000..7867e893fd15
--- /dev/null
+++ b/drivers/net/ethernet/amazon/ena/ena_phc.c

+static int ena_phc_adjtime(struct ptp_clock_info *clock_info, s64 delta)

+static int ena_phc_adjfine(struct ptp_clock_info *clock_info, long scaled_ppm)

+static int ena_phc_feature_enable(struct ptp_clock_info *clock_info,

+/* Enable/Disable PHC by the kernel, affects on the next init flow */

+ netdev_err(adapter->netdev, "Failed registering ptp clock, error: %d\n",

+ netdev_dbg(netdev, "PHC feature is not supported by the device\n");

+ netdev_dbg(netdev, "PHC feature is not enabled by the kernel\n");

diff --git a/drivers/net/ethernet/amazon/ena/ena_phc.h b/drivers/net/ethernet/amazon/ena/ena_phc.h
new file mode 100644
index 000000000000..7364fe714e44
--- /dev/null
+++ b/drivers/net/ethernet/amazon/ena/ena_phc.h

diff --git a/drivers/net/ethernet/amazon/ena/ena_regs_defs.h b/drivers/net/ethernet/amazon/ena/ena_regs_defs.h
index 1e007a41a525..51068dc1cc2a 100644
--- a/drivers/net/ethernet/amazon/ena/ena_regs_defs.h
+++ b/drivers/net/ethernet/amazon/ena/ena_regs_defs.h

diff --git a/drivers/net/ethernet/amazon/ena/ena_xdp.c b/drivers/net/ethernet/amazon/ena/ena_xdp.c
new file mode 100644
index 000000000000..5b175e7e92a1
--- /dev/null
+++ b/drivers/net/ethernet/amazon/ena/ena_xdp.c

+static int validate_xdp_req_id(struct ena_ring *tx_ring, u16 req_id)

+ if (tx_ring->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {

+ netif_warn(adapter, tx_queued, adapter->netdev, "Failed to map xdp buff\n");

+int ena_setup_and_create_all_xdp_queues(struct ena_adapter *adapter)

+ rc = ena_setup_tx_resources_in_range(adapter, xdp_first_ring, xdp_num_queues);

+ rc = ena_create_io_tx_queues_in_range(adapter, xdp_first_ring, xdp_num_queues);

+ ena_free_all_io_tx_resources_in_range(adapter, xdp_first_ring, xdp_num_queues);

+ rc = xdp_rxq_info_reg(&rx_ring->xdp_rxq, rx_ring->netdev, rx_ring->qid, 0);

+ netif_dbg(rx_ring->adapter, ifup, rx_ring->netdev, "Registering RX info for queue %d",

+ "Failed to register xdp rx queue info. RX queue num %d rc: %d\n",

+ rc = xdp_rxq_info_reg_mem_model(&rx_ring->xdp_rxq, MEM_TYPE_PAGE_SHARED, NULL);

+ "Failed to register xdp rx queue info memory model. RX queue num %d rc: %d\n",

+void ena_xdp_exchange_program_rx_in_range(struct ena_adapter *adapter,

+ struct bpf_prog *old_bpf_prog = xchg(&adapter->xdp_bpf_prog, prog);

+static int ena_destroy_and_free_all_xdp_queues(struct ena_adapter *adapter)

+static int ena_xdp_set(struct net_device *netdev, struct netdev_bpf *bpf)

+ netif_dbg(adapter, drv, adapter->netdev, "Set a new XDP program\n");

+ netif_dbg(adapter, drv, adapter->netdev, "Removing XDP program\n");

+ "Failed to set xdp program, the current MTU (%d) is larger than the maximum allowed MTU (%lu) while xdp is on",

+ "Failed to set xdp program, the current MTU is larger than the maximum allowed MTU. Check the dmesg for more info");

+ "Failed to set xdp program, the Rx/Tx channel count should be at most half of the maximum allowed channel count. The current queue count (%d), the maximal queue count (%d)\n",

+ "Failed to set xdp program, there is no enough space for allocating XDP queues, Check the dmesg for more info");

+/* This is the main xdp callback, it's used by the kernel to set/unset the xdp

+static int ena_clean_xdp_irq(struct ena_ring *tx_ring, u32 budget)

+ "tx_poll: q %d pkt #%d req_id %d\n", tx_ring->qid, tx_pkts, req_id);

+/* This is the XDP napi callback. XDP queues use a separate napi callback

+ struct ena_napi *ena_napi = container_of(napi, struct ena_napi, napi);

+ if (unlikely(!test_bit(ENA_FLAG_DEV_UP, &tx_ring->adapter->flags))) {

diff --git a/drivers/net/ethernet/amazon/ena/ena_xdp.h b/drivers/net/ethernet/amazon/ena/ena_xdp.h
new file mode 100644
index 000000000000..cfd82728486a
--- /dev/null
+++ b/drivers/net/ethernet/amazon/ena/ena_xdp.h

+/* The max MTU size is configured to be the ethernet frame size without

+ * the overhead of the ethernet header, which can have a VLAN header, and

+ * The buffer size we share with the device is defined to be ENA_PAGE_SIZE

+#define ENA_XDP_MAX_MTU (ENA_PAGE_SIZE - ETH_HLEN - ETH_FCS_LEN - \

+#define ENA_IS_XDP_INDEX(adapter, index) (((index) >= (adapter)->xdp_first_ring) && \

+ ((index) < (adapter)->xdp_first_ring + (adapter)->xdp_num_queues))

+int ena_setup_and_create_all_xdp_queues(struct ena_adapter *adapter);

+void ena_xdp_exchange_program_rx_in_range(struct ena_adapter *adapter,

+static inline bool ena_xdp_legal_queue_count(struct ena_adapter *adapter,

+static inline enum ena_xdp_errors_t ena_xdp_allowed(struct ena_adapter *adapter)

+ else if (!ena_xdp_legal_queue_count(adapter, adapter->num_io_queues))

+static inline int ena_xdp_execute(struct ena_ring *rx_ring, struct xdp_buff *xdp)

diff --git a/drivers/net/ethernet/amd/7990.c b/drivers/net/ethernet/amd/7990.c
index ef512cf89abf..27792a52b6cf 100644
--- a/drivers/net/ethernet/amd/7990.c
+++ b/drivers/net/ethernet/amd/7990.c

diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index c6a3abec86f5..d54dca3074eb 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig

Say Y here if you intend to attach a New Media Ethernet or LiveWire

To compile this driver as a module, choose M here: the module will be

+ This enables the support for the AMD/Pensando Core device family of

+ <file:Documentation/networking/device_drivers/ethernet/amd/pds_core.rst>.

diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile
index 0d2f478b49a5..2dcfb84731e1 100644
--- a/drivers/net/ethernet/amd/Makefile
+++ b/drivers/net/ethernet/amd/Makefile

diff --git a/drivers/net/ethernet/amd/a2065.c b/drivers/net/ethernet/amd/a2065.c
index 2f808dbc8b0e..ce9445425045 100644
--- a/drivers/net/ethernet/amd/a2065.c
+++ b/drivers/net/ethernet/amd/a2065.c

@@ -636,7 +636,7 @@ static void lance_set_multicast(struct net_device *dev)

+ struct lance_private *lp = timer_container_of(lp, t, multicast_timer);

@@ -706,17 +707,18 @@ static int a2065_init_one(struct zorro_dev *z,

diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 92e4246dc359..76e8c13d5985 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c

- 3. Bug fix: Fixed mismach in actual receive buffer lenth and lenth

+ 3. Bug fix: Fixed mismach in actual receive buffer length and length

4. Modified amd8111e_rx() routine to receive all the received packets

@@ -185,24 +185,23 @@ static void amd8111e_set_ext_phy(struct net_device *dev)

@@ -237,7 +236,7 @@ static int amd8111e_free_skbs(struct net_device *dev)

@@ -1084,7 +1083,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id)

@@ -1109,7 +1108,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id)

@@ -1174,7 +1173,7 @@ static int amd8111e_close(struct net_device *dev)

@@ -1364,10 +1363,10 @@ static void amd8111e_get_drvinfo(struct net_device *dev,

- strlcpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info));

+ strscpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info));

@@ -1500,7 +1499,7 @@ static int amd8111e_set_mac_address(struct net_device *dev, void *p)

@@ -1521,9 +1520,9 @@ static int amd8111e_change_mtu(struct net_device *dev, int new_mtu)

@@ -1532,7 +1531,7 @@ static int amd8111e_change_mtu(struct net_device *dev, int new_mtu)

@@ -1554,7 +1553,7 @@ static int amd8111e_enable_magicpkt(struct amd8111e_priv *lp)

@@ -1599,7 +1598,7 @@ static int __maybe_unused amd8111e_suspend(struct device *dev_d)

@@ -1642,7 +1641,8 @@ static int __maybe_unused amd8111e_resume(struct device *dev_d)

- struct amd8111e_priv *lp = from_timer(lp, t, ipg_data.ipg_timer);

@@ -1743,6 +1743,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,

@@ -1796,7 +1797,6 @@ static int amd8111e_probe_one(struct pci_dev *pdev,

@@ -1809,7 +1809,8 @@ static int amd8111e_probe_one(struct pci_dev *pdev,

@@ -1826,11 +1827,8 @@ static int amd8111e_probe_one(struct pci_dev *pdev,

- dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;

diff --git a/drivers/net/ethernet/amd/amd8111e.h b/drivers/net/ethernet/amd/amd8111e.h
index 37da79da5f5e..e4ee4c28800c 100644
--- a/drivers/net/ethernet/amd/amd8111e.h
+++ b/drivers/net/ethernet/amd/amd8111e.h

-/* Assume contoller gets data 10 times the maximum processing time */

+/* Assume controller gets data 10 times the maximum processing time */

diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index 5e0f645f5bde..fa201da567ed 100644
--- a/drivers/net/ethernet/amd/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c

if (lowb(priv->rx_ring[(entry + i) % RX_RING_SIZE]->RMD1) & RF_OWN)

@@ -441,11 +441,11 @@ static int ariadne_open(struct net_device *dev)

@@ -717,6 +717,7 @@ static int ariadne_init_one(struct zorro_dev *z,

@@ -730,7 +731,7 @@ static int ariadne_init_one(struct zorro_dev *z,

@@ -740,12 +741,13 @@ static int ariadne_init_one(struct zorro_dev *z,

@@ -788,4 +790,5 @@ static void __exit ariadne_cleanup_module(void)

diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index 9d2f49fd945e..8c8cc7d0f42d 100644
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c

@@ -367,7 +368,7 @@ static void *slow_memcpy( void *dst, const void *src, size_t len )

@@ -471,6 +472,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,

@@ -580,19 +582,21 @@ static unsigned long __init lance_probe1( struct net_device *dev,

@@ -821,7 +825,7 @@ lance_start_xmit(struct sk_buff *skb, struct net_device *dev)

while( lp->cur_tx >= TX_RING_SIZE && lp->dirty_tx >= TX_RING_SIZE ) {

@@ -851,7 +855,7 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id )

DPRINTK( 1, ( "lance_interrupt(): interrupt for unknown device.\n" ));

@@ -1123,7 +1127,7 @@ static int lance_set_mac_address( struct net_device *dev, void *addr )

diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index 9c1636222b99..9d35ac348ebe 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c

@@ -571,7 +571,7 @@ static struct db_dest *au1000_GetFreeDB(struct au1000_private *aup)

-void au1000_ReleaseDB(struct au1000_private *aup, struct db_dest *pDB)

+static void au1000_ReleaseDB(struct au1000_private *aup, struct db_dest *pDB)

@@ -650,7 +650,7 @@ au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

snprintf(info->bus_info, sizeof(info->bus_info), "%s %d", DRV_NAME,

@@ -996,7 +996,7 @@ static netdev_tx_t au1000_tx(struct sk_buff *skb, struct net_device *dev)

@@ -1131,9 +1131,9 @@ static int au1000_probe(struct platform_device *pdev)

@@ -1178,7 +1178,7 @@ static int au1000_probe(struct platform_device *pdev)

@@ -1199,7 +1199,7 @@ static int au1000_probe(struct platform_device *pdev)

@@ -1234,8 +1234,8 @@ static int au1000_probe(struct platform_device *pdev)

@@ -1246,7 +1246,7 @@ static int au1000_probe(struct platform_device *pdev)

@@ -1255,7 +1255,7 @@ static int au1000_probe(struct platform_device *pdev)

@@ -1284,7 +1284,7 @@ static int au1000_probe(struct platform_device *pdev)

dma_free_coherent(&pdev->dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),

@@ -1343,7 +1343,7 @@ static int au1000_remove(struct platform_device *pdev)

dma_free_coherent(&pdev->dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),

@@ -1359,8 +1359,6 @@ static int au1000_remove(struct platform_device *pdev)

diff --git a/drivers/net/ethernet/amd/au1000_eth.h b/drivers/net/ethernet/amd/au1000_eth.h
index e3a3ed29db61..2489c2f4fd8a 100644
--- a/drivers/net/ethernet/amd/au1000_eth.h
+++ b/drivers/net/ethernet/amd/au1000_eth.h

diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index 493b0cefcc2a..8d05a0c5f2d5 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c

@@ -1004,7 +1004,7 @@ static void lance_set_multicast(struct net_device *dev)

+ struct lance_private *lp = timer_container_of(lp, t, multicast_timer);

@@ -1032,6 +1032,7 @@ static int dec_lance_probe(struct device *bdev, const int type)

@@ -1228,7 +1229,8 @@ static int dec_lance_probe(struct device *bdev, const int type)

diff --git a/drivers/net/ethernet/amd/hplance.c b/drivers/net/ethernet/amd/hplance.c
index 6784f8748638..df42294530cb 100644
--- a/drivers/net/ethernet/amd/hplance.c
+++ b/drivers/net/ethernet/amd/hplance.c

@@ -129,6 +129,7 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d)

@@ -144,9 +145,10 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d)

- dev->dev_addr[i] = ((in_8(va + HPLANCE_NVRAMOFF + i*4 + 1) & 0xF) << 4)

@@ -232,4 +234,5 @@ static void __exit hplance_cleanup_module(void)

diff --git a/drivers/net/ethernet/amd/lance.c b/drivers/net/ethernet/amd/lance.c
index 945bf1d87507..b1e6620ad41d 100644
--- a/drivers/net/ethernet/amd/lance.c
+++ b/drivers/net/ethernet/amd/lance.c

@@ -59,6 +59,7 @@ static const char version[] = "lance.c:v1.16 2006/11/09 dplatt@3do.com, becker@c

@@ -480,6 +482,7 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int

@@ -541,7 +544,8 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int

@@ -878,7 +882,7 @@ lance_init_ring(struct net_device *dev, gfp_t gfp)

@@ -999,7 +1003,7 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb,

skb_copy_from_linear_data(skb, &lp->tx_bounce_buffs[entry], skb->len);

((u32)isa_virt_to_bus((lp->tx_bounce_buffs + entry)) & 0xffffff) | 0x83000000;

lp->tx_ring[entry].base = ((u32)isa_virt_to_bus(skb->data) & 0xffffff) | 0x83000000;

diff --git a/drivers/net/ethernet/amd/mvme147.c b/drivers/net/ethernet/amd/mvme147.c
index da97fccea9ea..f19b04b92fa9 100644
--- a/drivers/net/ethernet/amd/mvme147.c
+++ b/drivers/net/ethernet/amd/mvme147.c

@@ -74,6 +74,7 @@ static struct net_device * __init mvme147lance_probe(void)

@@ -93,19 +94,16 @@ static struct net_device * __init mvme147lance_probe(void)

@@ -136,6 +134,9 @@ static struct net_device * __init mvme147lance_probe(void)

+ netdev_info(dev, "MVME147 at 0x%08lx, irq %d, Hardware Address %pM\n",

@@ -176,6 +177,7 @@ static int m147lance_close(struct net_device *dev)

diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c
deleted file mode 100644
index b5df7ad5a83f..000000000000
--- a/drivers/net/ethernet/amd/ni65.c
+++ /dev/null

- * This driver can handle the old ni6510 board and the newer ni6510

- * This is an extension to the Linux operating system, and is covered by the

- * some things are from the 'ni6510-packet-driver for dos by Russ Nelson'

- * - on some PCI boards (including my own) the card/board/ISA-bridge has

- * the XMT and RCV_VIA_SKB option .. this reduces driver performance.

- * Or just play with your BIOS options to optimize ISA-DMA access.

- * Maybe you also wanna play with the LOW_PERFORAMCE and MID_PERFORMANCE

- * - Harald reported for ASUS SP3G mainboards, that you should use

- * lot of debug runs with ASUS SP3G Boards (Intel Saturn) by Harald Koenig

- * simple performance test: (486DX-33/Ni6510-EB receives from 486DX4-100/Ni6510-EB)

- * (no RCV_VIA_SKB,no XMT_VIA_SKB,PARANOIA_CHECK,4 XMIT BUFS, 8 RCV_BUFFS)

- * (RCV_VIA_SKB,XMT_VIA_SKB,no PARANOIA_CHECK,1(!) XMIT BUF, 16 RCV BUFFS)

- * 99.Jun.8: added support for /proc/net/dev byte count for xosview (HK)

- * 96.April.5/6: a lot of performance tests. Got it stable now (hopefully) (MH)

- * 96.April.1: (no joke ;) .. added EtherBlaster and Module support (MH)

- * 96.Feb.19: fixed a few bugs .. cleanups .. tested for 1.3.66 (MH)

- * 94.Aug.22: changes in xmit_intr (ack more than one xmitted-packet), ni65_send_packet (p->lock) (MH)

- * 'invert' the defines for max. performance. This may cause DMA problems

- * reg-number into L_ADDRREG, then you can access it using L_DATAREG

-#define writereg(val,reg) {outw(reg,PORT+L_ADDRREG);inw(PORT+L_ADDRREG); \

-#define readreg(reg) (outw(reg,PORT+L_ADDRREG),inw(PORT+L_ADDRREG),\

-#define writedatareg(val) {outw(val,PORT+L_DATAREG);inw(PORT+L_DATAREG);}

-#define writereg(val,reg) {outw(reg,PORT+L_ADDRREG);outw(val,PORT+L_DATAREG);}

-#define readreg(reg) (outw(reg,PORT+L_ADDRREG),inw(PORT+L_DATAREG))

-static void ni65_init_lance(struct priv *p,unsigned char*,int,int);

-static void ni65_timeout(struct net_device *dev, unsigned int txqueue);

-static int irqtab[] __initdata = { 9,12,15,5 }; /* irq config-translate */

-static int dmatab[] __initdata = { 0,3,5,6,7 }; /* dma config-translate and autodetect */

- outw((short)isa0,PORT+L_BUSIF); /* write ISA 0: DMA_R : isa0 * 50ns */

- outw((short)isa1,PORT+L_BUSIF); /* write ISA 1: DMA_W : isa1 * 50ns */

- if (dev->base_addr > 0x1ff) { /* Check a single specified location. */

- if(!request_region(ioaddr, cards[i].total_size, cards[i].cardname))

- printk(KERN_INFO "%s: %s found at %#3x, ", dev->name, cards[p->cardno].cardname , ioaddr);

- outw(inw(PORT+L_RESET),PORT+L_RESET); /* first: reset the card */

- printk("IRQ %d (from card), DMA %d (from card).\n",dev->irq,dev->dma);

- ni65_init_lance(p,dev->dev_addr,0,0); /* trigger memory access */

- printk(KERN_ERR "%s: Can't request dma-channel %d\n",dev->name,(int) dev->dma);

-static void ni65_init_lance(struct priv *p,unsigned char *daddr,int filter,int mode)

-static void *ni65_alloc_mem(struct net_device *dev,char *what,int size,int type)

- printk(KERN_WARNING "%s: unable to allocate %s memory.\n",dev->name,what);

- skb_put(skb,R_BUF_SIZE); /* grab the whole space .. (not necessary) */

- printk(KERN_WARNING "%s: unable to allocate %s memory in lower 16MB!\n",dev->name,what);

- p = dev->ml_priv = (struct priv *) (((unsigned long) ptr + 7) & ~0x7);

-static void ni65_stop_start(struct net_device *dev,struct priv *p)

- p->tmdhead[i].u.buffer = (u32) isa_virt_to_bus((char *)buffer[num]); /* status is part of buffer field */

- disable_dma(dev->dma); /* I've never worked with dma, but we do it like the packetdriver */

- outw(inw(PORT+L_RESET),PORT+L_RESET); /* first: reset the card */

- * NOW, WE WILL NEVER CHANGE THE L_ADDRREG, CSR0 IS ALWAYS SELECTED

- printk(KERN_ERR "%s: can't init lance, status: %04x\n",dev->name,(int) inw(PORT+L_DATAREG));

- writedatareg( (csr0 & CSR0_CLRALL) ); /* ack interrupts, disable int. */

- writedatareg( (csr0 & CSR0_CLRALL) | CSR0_INEA ); /* ack interrupts, interrupts enabled */

- printk(KERN_ERR "%s: Ooops .. memory error: %04x.\n",dev->name,csr0);

- sprintf(buf1,"%02x ",(p->rmdhead[k].u.s.status)); /* & RCV_OWN) ); */

- printk(KERN_ERR "%s: Ooops, receive ring corrupted %2d %2d | %s\n",dev->name,p->rmdnum,i,buf);

- if( (csr0 & (CSR0_RXON | CSR0_TXON)) != (CSR0_RXON | CSR0_TXON) ) {

- printk(KERN_DEBUG "%s: RX or TX was offline -> restart\n",dev->name);

- printk(KERN_ERR "%s: tdr-problems (e.g. no resistor)\n",dev->name);

- tmdp->u.s.status = XMIT_OWN | XMIT_START | XMIT_END; /* test: resend this frame */

- printk(KERN_ERR "%s: xmit-error: %04x %02x-%04x\n",dev->name,csr0,(int) tmdstat,(int) tmdp->status2);

- if( (rmdstat & (RCV_START | RCV_END | RCV_ERR)) != (RCV_START | RCV_END) ) /* error or oversized? */

- printk(KERN_ERR "%s: recv, packet too long: %d\n",dev->name,rmdp->mlen & 0x0fff);

- printk(KERN_ERR "%s: receive-error: %04x, lance-status: %04x/%04x\n",

- skb_copy_to_linear_data(skb, (unsigned char *)(p->recv_skb[p->rmdnum]->data),len);

- skb_copy_to_linear_data(skb, (unsigned char *) p->recvbounce[p->rmdnum],len);

-static void ni65_timeout(struct net_device *dev, unsigned int txqueue)

- printk(KERN_ERR "%s: xmitter timed out, try to restart!\n",dev->name);

- memset((char *)p->tmdbounce[p->tmdbouncenum]+skb->len, 0, len-skb->len);

- tmdp->u.buffer = (u32) isa_virt_to_bus(p->tmdbounce[p->tmdbouncenum]);

- writedatareg(CSR0_TDMD | CSR0_INEA); /* enable xmit & interrupt */

- printk(KERN_ERR "%s: Can't switch card into MC mode!\n",dev->name);

-MODULE_PARM_DESC(irq, "ni6510 IRQ number (ignored for some cards)");

-MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)");

diff --git a/drivers/net/ethernet/amd/ni65.h b/drivers/net/ethernet/amd/ni65.h
deleted file mode 100644
index e6217e35edf0..000000000000
--- a/drivers/net/ethernet/amd/ni65.h
+++ /dev/null

- * This is an extension to the Linux operating system, and is covered by

-#define CSR0_BABL 0x4000 /* Babble transmitter timeout error (RC) */

diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
index 4019cab87505..37054a670407 100644
--- a/drivers/net/ethernet/amd/nmclan_cs.c
+++ b/drivers/net/ethernet/amd/nmclan_cs.c

@@ -485,10 +485,10 @@ static int mace_read(mace_private *lp, unsigned int ioaddr, int reg)

@@ -512,10 +512,10 @@ static void mace_write(mace_private *lp, unsigned int ioaddr, int reg,

@@ -529,7 +529,8 @@ static void mace_write(mace_private *lp, unsigned int ioaddr, int reg,

---------------------------------------------------------------------------- */

-static int mace_init(mace_private *lp, unsigned int ioaddr, char *enet_addr)

@@ -566,13 +567,13 @@ static int mace_init(mace_private *lp, unsigned int ioaddr, char *enet_addr)

/* ASEL Auto Select. When set, the PORTSEL[1-0] bits are overridden,

@@ -635,7 +636,7 @@ static int nmclan_config(struct pcmcia_device *link)

@@ -650,7 +651,7 @@ static int nmclan_config(struct pcmcia_device *link)

@@ -759,7 +760,7 @@ static int mace_config(struct net_device *dev, struct ifmap *map)

@@ -917,7 +918,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)

@@ -1101,7 +1102,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt)

diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index 70d76fdb9f56..9eaefa0f5e80 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c

@@ -462,7 +462,7 @@ static void pcnet32_netif_start(struct net_device *dev)

@@ -488,7 +488,7 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,

new_dma_addr_list = kcalloc(entries, sizeof(dma_addr_t), GFP_ATOMIC);

@@ -547,7 +547,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,

new_dma_addr_list = kcalloc(entries, sizeof(dma_addr_t), GFP_ATOMIC);

@@ -797,9 +797,9 @@ static void pcnet32_get_drvinfo(struct net_device *dev,

@@ -860,7 +860,9 @@ static int pcnet32_nway_reset(struct net_device *dev)

@@ -871,7 +873,9 @@ static void pcnet32_get_ringparam(struct net_device *dev,

@@ -885,6 +889,7 @@ static int pcnet32_set_ringparam(struct net_device *dev,

@@ -916,6 +921,7 @@ static int pcnet32_set_ringparam(struct net_device *dev,

@@ -981,6 +987,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)

@@ -1245,7 +1253,7 @@ static void pcnet32_rx_entry(struct net_device *dev,

@@ -1595,6 +1603,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)

@@ -1760,9 +1769,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)

@@ -1775,13 +1785,16 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)

/* if the ethernet address is not valid, force to 00:00:00:00:00:00 */

@@ -1872,7 +1885,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)

- netif_napi_add(dev, &lp->napi, pcnet32_poll, lp->rx_ring_size / 2);

@@ -2008,7 +2022,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name)

@@ -2016,7 +2030,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name)

@@ -2091,6 +2105,7 @@ static int pcnet32_open(struct net_device *dev)

@@ -2256,7 +2271,7 @@ static int pcnet32_open(struct net_device *dev)

@@ -2290,6 +2305,7 @@ static int pcnet32_open(struct net_device *dev)

@@ -2355,7 +2372,7 @@ static int pcnet32_init_ring(struct net_device *dev)

@@ -2613,7 +2630,7 @@ static int pcnet32_close(struct net_device *dev)

@@ -2888,7 +2905,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)

+ struct pcnet32_private *lp = timer_container_of(lp, t, watchdog_timer);

diff --git a/drivers/net/ethernet/amd/pds_core/Makefile b/drivers/net/ethernet/amd/pds_core/Makefile
new file mode 100644
index 000000000000..8239742e681f
--- /dev/null
+++ b/drivers/net/ethernet/amd/pds_core/Makefile

diff --git a/drivers/net/ethernet/amd/pds_core/adminq.c b/drivers/net/ethernet/amd/pds_core/adminq.c
new file mode 100644
index 000000000000..097bb092bdb8
--- /dev/null
+++ b/drivers/net/ethernet/amd/pds_core/adminq.c

+ struct pdsc_qcq *qcq = container_of(work, struct pdsc_qcq, work);

+ dev_dbg(pdsc->dev, "%s: post wait failed - fw not running %#02x:\n",

+ if (time_after_eq(time_done, time_limit) && !completion_done(wc)) {

+ dev_dbg(pdsc->dev, "read admin queue completion idx %d:\n", index);

diff --git a/drivers/net/ethernet/amd/pds_core/auxbus.c b/drivers/net/ethernet/amd/pds_core/auxbus.c
new file mode 100644
index 000000000000..92f359f2b449
--- /dev/null
+++ b/drivers/net/ethernet/amd/pds_core/auxbus.c

+ dev_info(pf->dev, "register dev_name %s with DSC failed, status %d: %pe\n",

+ dev_info(pf->dev, "unregister client_id %d failed, status %d: %pe\n",

+ * pds_client_adminq_cmd - Process an adminq request for the client

+ cp_len = min_t(size_t, req_len, sizeof(cmd.client_request.client_cmd));

+static struct pds_auxiliary_dev *pdsc_auxbus_dev_register(struct pdsc *cf,

+ dev_err(pf->dev, "%s: can't add dev, VF client in bad state %#lx\n",

diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c
new file mode 100644
index 000000000000..076dfe2910c7
--- /dev/null
+++ b/drivers/net/ethernet/amd/pds_core/core.c

+ pds_core_intr_mask(&pdsc->intr_ctrl[index], PDS_CORE_INTR_MASK_SET);

+ err = request_irq(intr_info->vector, handler, 0, intr_info->name, data);

+static void pdsc_qcq_intr_free(struct pdsc *pdsc, struct pdsc_qcq *qcq)

+static int pdsc_qcq_intr_alloc(struct pdsc *pdsc, struct pdsc_qcq *qcq)

+static void pdsc_q_map(struct pdsc_queue *q, void *base, dma_addr_t base_pa)

+static void pdsc_cq_map(struct pdsc_cq *cq, void *base, dma_addr_t base_pa)

+int pdsc_qcq_alloc(struct pdsc *pdsc, unsigned int type, unsigned int index,

+ dma_free_coherent(dev, qcq->q_size, qcq->q_base, qcq->q_base_pa);

+ cidi.flags = cpu_to_le32(PDS_CORE_QINIT_F_IRQ | PDS_CORE_QINIT_F_ENA);

+ err = pdsc_devcmd_locked(pdsc, &cmd, &comp, pdsc->devcmd_timeout);

+ pdsc->adminqcq.q.dbval = PDS_CORE_DBELL_QID(pdsc->adminqcq.q.hw_index);

+ pdsc->notifyqcq.q.dbval = PDS_CORE_DBELL_QID(pdsc->notifyqcq.q.hw_index);

+ pdsc->viftype_status = kcalloc(ARRAY_SIZE(pdsc_viftype_defaults),

+static void pdsc_adminq_wait_and_dec_once_unused(struct pdsc *pdsc)

+ /* The driver initializes the adminq_refcnt to 1 when the adminq is

+ * allocated and ready for use. Other users/requesters will increment

+ * the refcnt while in use. If the refcnt is down to 1 then the adminq

+ * is not in use and the refcnt can be cleared and adminq freed. Before

+ * calling this function the driver will set PDSC_S_FW_DEAD, which

+ * prevent subsequent attempts to use the adminq and increment the

+ * refcnt to fail. This guarantees that this function will eventually

+ devlink_health_report(pdsc->fw_reporter, "FW down reported", pdsc);

+ struct pdsc *pdsc = container_of(work, struct pdsc, pci_reset_work);

+ /* prevent deadlock between pdsc_reset_prepare and pdsc_health_thread */

+ struct pdsc *pdsc = container_of(work, struct pdsc, health_work);

+ dev_dbg(pdsc->dev, "%s: health %d fw_status %#02x fw_heartbeat %d\n",

+ pdsc->fw_generation = pdsc->fw_status & PDS_CORE_FW_STS_F_GENERATION;

diff --git a/drivers/net/ethernet/amd/pds_core/core.h b/drivers/net/ethernet/amd/pds_core/core.h
new file mode 100644
index 000000000000..4a6b35c84dab
--- /dev/null
+++ b/drivers/net/ethernet/amd/pds_core/core.h

+ struct mutex config_lock; /* lock for configuration operations */

+/** enum pds_core_dbell_bits - bitwise composition of dbell values.

+ * @PDS_CORE_DBELL_QID_MASK: unshifted mask of valid queue id bits.

+ * @PDS_CORE_DBELL_QID_SHIFT: queue id shift amount in dbell value.

+ * @PDS_CORE_DBELL_QID: macro to build QID component of dbell value.

+ * @PDS_CORE_DBELL_RING: macro to build ring component of dbell value.

+ * @PDS_CORE_DBELL_INDEX_MASK: bit mask of valid index bits, no shift needed.

+ (((u64)(n) & PDS_CORE_DBELL_QID_MASK) << PDS_CORE_DBELL_QID_SHIFT)

+ (((u64)(n) & PDS_CORE_DBELL_RING_MASK) << PDS_CORE_DBELL_RING_SHIFT)

+int pdsc_fw_reporter_diagnose(struct devlink_health_reporter *reporter,

+int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req,

+void pdsc_debugfs_add_qcq(struct pdsc *pdsc, struct pdsc_qcq *qcq);

+int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,

+int pdsc_qcq_alloc(struct pdsc *pdsc, unsigned int type, unsigned int index,

+int pdsc_firmware_update(struct pdsc *pdsc, const struct firmware *fw,

diff --git a/drivers/net/ethernet/amd/pds_core/debugfs.c b/drivers/net/ethernet/amd/pds_core/debugfs.c
new file mode 100644
index 000000000000..04c5e3abd8d7
--- /dev/null
+++ b/drivers/net/ethernet/amd/pds_core/debugfs.c

+ pdsc->dentry = debugfs_create_dir(pci_name(pdsc->pdev), pdsc_dir);

+void pdsc_debugfs_add_qcq(struct pdsc *pdsc, struct pdsc_qcq *qcq)

+ debugfs_create_x64("q_base_pa", 0400, qcq_dentry, &qcq->q_base_pa);

+ debugfs_create_x64("cq_base_pa", 0400, qcq_dentry, &qcq->cq_base_pa);

+ debugfs_create_x32("accum_work", 0400, qcq_dentry, &qcq->accum_work);

+ debugfs_create_u32("num_descs", 0400, cq_dentry, &cq->num_descs);

+ debugfs_create_u32("desc_size", 0400, cq_dentry, &cq->desc_size);

+ debugfs_create_bool("done_color", 0400, cq_dentry, &cq->done_color);

diff --git a/drivers/net/ethernet/amd/pds_core/dev.c b/drivers/net/ethernet/amd/pds_core/dev.c
new file mode 100644
index 000000000000..495ef4ef8c10
--- /dev/null
+++ b/drivers/net/ethernet/amd/pds_core/dev.c

+static int pdsc_devcmd_wait(struct pdsc *pdsc, u8 opcode, int max_seconds)

+ dev_err(dev, "DEVCMD %d %s timeout, done %d timeout %d max_seconds=%d\n",

+int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,

+ return pdsc_devcmd_locked(pdsc, &cmd, &comp, pdsc->devcmd_timeout);

+ dev_dbg(pdsc->dev, "fw_version %s\n", pdsc->dev_info.fw_version);

+ dev_info(pdsc->dev, "FW: (invalid string) 0x%02x 0x%02x 0x%02x 0x%02x ...\n",

+ pdsc->intr_info = kcalloc(nintrs, sizeof(*pdsc->intr_info), GFP_KERNEL);

+ err = pci_alloc_irq_vectors(pdsc->pdev, nintrs, nintrs, PCI_IRQ_MSIX);

diff --git a/drivers/net/ethernet/amd/pds_core/devlink.c b/drivers/net/ethernet/amd/pds_core/devlink.c
new file mode 100644
index 000000000000..b576be626a29
--- /dev/null
+++ b/drivers/net/ethernet/amd/pds_core/devlink.c

+int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req,

+ err = pdsc_devcmd_locked(pdsc, &cmd, &comp, pdsc->devcmd_timeout * 2);

+ listlen = min(fw_list.num_fw_slots, ARRAY_SIZE(fw_list.fw_names));

+ return devlink_info_serial_number_put(req, pdsc->dev_info.serial_num);

+int pdsc_fw_reporter_diagnose(struct devlink_health_reporter *reporter,

+ devlink_fmsg_u32_pair_put(fmsg, "Generation", pdsc->fw_generation >> 4);

+ devlink_fmsg_u32_pair_put(fmsg, "Recoveries", pdsc->fw_recoveries);

diff --git a/drivers/net/ethernet/amd/pds_core/fw.c b/drivers/net/ethernet/amd/pds_core/fw.c
new file mode 100644
index 000000000000..fa626719e68d
--- /dev/null
+++ b/drivers/net/ethernet/amd/pds_core/fw.c

+/* The worst case wait for the install activity is about 25 minutes when

+ * installing a new CPLD, which is very seldom. Normal is about 30-35

+ * seconds. Since the driver can't tell if a CPLD update will happen we

+static int pdsc_devcmd_fw_download_locked(struct pdsc *pdsc, u64 addr,

+ return pdsc_devcmd_locked(pdsc, &cmd, &comp, pdsc->devcmd_timeout);

+int pdsc_firmware_update(struct pdsc *pdsc, const struct firmware *fw,

+ dev_info(pdsc->dev, "Firmware update completed, slot %d\n", fw_slot);

diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c
new file mode 100644
index 000000000000..c7a2eff57632
--- /dev/null
+++ b/drivers/net/ethernet/amd/pds_core/main.c

+ pdsc->info_regs = bar->vaddr + PDS_CORE_BAR0_DEV_INFO_REGS_OFFSET;

+ pdsc->intr_status = bar->vaddr + PDS_CORE_BAR0_INTR_STATUS_OFFSET;

+static int pdsc_sriov_configure(struct pci_dev *pdev, int num_vfs)

+static const struct devlink_health_reporter_ops pdsc_fw_reporter_ops = {

+ snprintf(wq_name, sizeof(wq_name), "%s.%d", PDS_CORE_DRV_NAME, pdsc->uid);

+ err = pdsc_auxbus_dev_add(pdsc, pdsc, PDS_DEV_TYPE_FWCTL, &pdsc->padev);

+ hr = devl_health_reporter_create(dl, &pdsc_fw_reporter_ops, pdsc);

+ mod_timer(&pdsc->wdtimer, round_jiffies(jiffies + pdsc->wdtimer_period));

+static int pdsc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

+ err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(PDS_CORE_ADDR_LEN));

+ dev_err(dev, "Unable to obtain 64-bit DMA for consistent allocations, aborting: %pe\n",

+static pci_ers_result_t pdsc_pci_error_detected(struct pci_dev *pdev,

diff --git a/drivers/net/ethernet/amd/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c
index 4a845bc071b2..c60df4a21158 100644
--- a/drivers/net/ethernet/amd/sun3lance.c
+++ b/drivers/net/ethernet/amd/sun3lance.c

@@ -305,7 +306,6 @@ static int __init lance_probe( struct net_device *dev)

@@ -342,7 +342,7 @@ static int __init lance_probe( struct net_device *dev)

@@ -373,8 +373,7 @@ static int __init lance_probe( struct net_device *dev)

diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index ddece276ae23..0b273327f5a6 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c

@@ -530,7 +530,7 @@ static void lance_rx_dvma(struct net_device *dev)

@@ -700,7 +700,7 @@ static void lance_rx_pio(struct net_device *dev)

@@ -1246,7 +1246,7 @@ static void lance_set_multicast(struct net_device *dev)

+ struct lance_private *lp = timer_container_of(lp, t, multicast_timer);

@@ -1276,7 +1276,7 @@ static void lance_free_hwresources(struct lance_private *lp)

static void sparc_lance_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

@@ -1301,7 +1301,6 @@ static int sparc_lance_probe_one(struct platform_device *op,

@@ -1315,8 +1314,7 @@ static int sparc_lance_probe_one(struct platform_device *op,

@@ -1489,7 +1487,7 @@ static int sunlance_sbus_probe(struct platform_device *op)

@@ -1499,8 +1497,6 @@ static int sunlance_sbus_remove(struct platform_device *op)

diff --git a/drivers/net/ethernet/amd/xgbe/Makefile b/drivers/net/ethernet/amd/xgbe/Makefile
index 620785ffbd51..5992f7fd4d9b 100644
--- a/drivers/net/ethernet/amd/xgbe/Makefile
+++ b/drivers/net/ethernet/amd/xgbe/Makefile

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
index b2cd3bdba9f8..62b01de93db4 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h

- * This file is available to you under your choice of the following two

- * This file is free software; you may copy, redistribute and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation, either version 2 of the License, or (at

- * This file is distributed in the hope that it will be useful, but

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

- * You should have received a copy of the GNU General Public License

- * along with this program. If not, see <http://www.gnu.org/licenses/>.

- * This file incorporates work covered by the following copyright and

- * (hereinafter "Software") is an unsupported proprietary work of Synopsys,

- * Inc. unless otherwise expressly agreed to in writing between Synopsys

- * The Software IS NOT an item of Licensed Software or Licensed Product

- * under any End User Software License Agreement or Agreement for Licensed

- * Product with Synopsys or any supplement thereto. Permission is hereby

- * granted, free of charge, to any person obtaining a copy of this software

- * annotated with this license and the Software, to deal in the Software

- * without restriction, including without limitation the rights to use,

- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies

- * of the Software, and to permit persons to whom the Software is furnished

- * The above copyright notice and this permission notice shall be included

- * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"

- * BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

- * PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS

- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- * * Redistributions of source code must retain the above copyright

- * * Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- * names of its contributors may be used to endorse or promote products

- * derived from this software without specific prior written permission.

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.