et131x: Add PCIe gigabit ethernet driver et131x to drivers/net
Subsystems (4)
Mark Einon
maintainerPATCH 1/1 et131x: Add PCIe gigabit ethernet driver et131x to drivers/net
This adds the ethernet driver for Agere et131x devices to drivers/net/ethernet.
The driver being added has been in the staging tree for some time, and will be removed from there in a seperate patch. This one merely disables the staging version to prevent two instances being built.
--- MAINTAINERS | 10 +- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/agere/Kconfig | 31 + drivers/net/ethernet/agere/Makefile | 5 + drivers/net/ethernet/agere/et131x.c | 4121 +++++++++++++++++++++++++++++++++++ drivers/net/ethernet/agere/et131x.h | 1433 ++++++++++++ drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - 9 files changed, 5597 insertions(+), 8 deletions(-) create mode 100644 drivers/net/ethernet/agere/Kconfig create mode 100644 drivers/net/ethernet/agere/Makefile create mode 100644 drivers/net/ethernet/agere/et131x.c create mode 100644 drivers/net/ethernet/agere/et131x.h
MAINTAINERS +5 -5
@@ -3551,6 +3551,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git F: drivers/video/fbdev/s1d13xxxfb.c F: include/video/s1d13xxxfb.h +ET131X NETWORK DRIVER +M: Mark Einon <[email protected]> +S: Odd Fixes +F: drivers/net/ethernet/agere/ + ETHERNET BRIDGE M: Stephen Hemminger <[email protected]> L: [email protected]
@@ -8696,11 +8701,6 @@ M: H Hartley Sweeten <[email protected]> S: Odd Fixes F: drivers/staging/comedi/ -STAGING - ET131X NETWORK DRIVER -M: Mark Einon <[email protected]> -S: Odd Fixes -F: drivers/staging/et131x/ - STAGING - FLARION FT1000 DRIVERS M: Marek Belisko <[email protected]> S: Odd Fixes
drivers/net/ethernet/Kconfig +1 -0
@@ -20,6 +20,7 @@ config SUNGEM_PHY source "drivers/net/ethernet/3com/Kconfig" source "drivers/net/ethernet/adaptec/Kconfig" source "drivers/net/ethernet/aeroflex/Kconfig" +source "drivers/net/ethernet/agere/Kconfig" source "drivers/net/ethernet/allwinner/Kconfig" source "drivers/net/ethernet/alteon/Kconfig" source "drivers/net/ethernet/altera/Kconfig"
drivers/net/ethernet/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/ obj-$(CONFIG_GRETH) += aeroflex/ +obj-$(CONFIG_NET_VENDOR_AGERE) += agere/ obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/ obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/ obj-$(CONFIG_ALTERA_TSE) += altera/
drivers/net/ethernet/agere/Kconfig new file +31 -0
@@ -0,0 +1,31 @@ +# +# Agere device configuration +# + +config NET_VENDOR_AGERE + bool "Agere devices" + default y + depends on PCI + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about Agere devices. If you say Y, you will be asked + for your specific card in the following questions. + +if NET_VENDOR_AGERE + +config ET131X + tristate "Agere ET-1310 Gigabit Ethernet support" + depends on PCI + select PHYLIB + ---help--- + This driver supports Agere ET-1310 ethernet adapters. + + To compile this driver as a module, choose M here. The module + will be called et131x. + +endif # NET_VENDOR_AGERE
drivers/net/ethernet/agere/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# +# Makefile for the Agere ET-131x ethernet driver +# + +obj-$(CONFIG_ET131X) += et131x.o
drivers/net/ethernet/agere/et131x.c new file +4121 -0
2,928 lines not on this page · raw message
drivers/net/ethernet/agere/et131x.h new file +1433 -0
1,433 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.1.1
Part of the diff is not shown here. View the raw message.
Quoted 24 lines · Mark Einon
This adds the ethernet driver for Agere et131x devices to
drivers/net/ethernet.The driver being added has been in the staging tree for some time, and will be removed from there in a seperate patch. This one merely disables the staging version to prevent two instances being built.
Signed-off-by Mark Einon <[email protected]>--- MAINTAINERS | 10 +- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/agere/Kconfig | 31 + drivers/net/ethernet/agere/Makefile | 5 + drivers/net/ethernet/agere/et131x.c | 4121 +++++++++++++++++++++++++++++++++++ drivers/net/ethernet/agere/et131x.h | 1433 ++++++++++++ drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - 9 files changed, 5597 insertions(+), 8 deletions(-) create mode 100644 drivers/net/ethernet/agere/Kconfig create mode 100644 drivers/net/ethernet/agere/Makefile create mode 100644 drivers/net/ethernet/agere/et131x.c create mode 100644 drivers/net/ethernet/agere/et131x.h
[...]
Quoted 5 lines
drivers/net/ethernet/agere/et131x.c new file +0
-0
[...]
drivers/net/ethernet/agere/et131x.c line 3952
Quoted 12 lines
drivers/net/ethernet/agere/et131x.c new file +12
-0+static int et131x_pci_setup (struct pci_dev *pdev, +const struct pci_device_id *ent) +{ +struct net_device *netdev; +struct et131x_adapter *adapter; +int rc; +int ii; + + rc =pci_enable_device (pdev); +if (rc <0 ) { +dev_err (&pdev->dev,"pci_enable_device() failed\n" ); + goto out;
Nit: Just return rc here.
Quoted 141 lines
drivers/net/ethernet/agere/et131x.c new file +141
-0+ } + +/* Perform some basic PCI checks */ +if (!(pci_resource_flags (pdev,0 ) &IORESOURCE_MEM )) { +dev_err (&pdev->dev,"Can't find PCI device's base address\n" ); + rc = -ENODEV ; + goto err_disable; + } + + rc =pci_request_regions (pdev,DRIVER_NAME ); +if (rc <0 ) { +dev_err (&pdev->dev,"Can't get PCI resources\n" ); + goto err_disable; + } + +pci_set_master (pdev); + +/* Check the DMA addressing support of this device */ +if (dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (64 )) && +dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 ))) { +dev_err (&pdev->dev,"No usable DMA addressing method\n" ); + rc = -EIO ; + goto err_release_res; + } + + netdev =alloc_etherdev (sizeof (struct et131x_adapter )); +if (!netdev) { +dev_err (&pdev->dev,"Couldn't alloc netdev struct\n" ); + rc = -ENOMEM ; + goto err_release_res; + } + + netdev->watchdog_timeo =ET131X_TX_TIMEOUT ; + netdev->netdev_ops = &et131x_netdev_ops; + +SET_NETDEV_DEV (netdev, &pdev->dev); + netdev->ethtool_ops = &et131x_ethtool_ops; + + adapter =et131x_adapter_init (netdev, pdev); + + rc =et131x_pci_init (adapter, pdev); +if (rc <0 ) + goto err_free_dev; + +/* Map the bus-relative registers to system virtual memory */ + adapter->regs =pci_ioremap_bar (pdev,0 ); +if (!adapter->regs) { +dev_err (&pdev->dev,"Cannot map device registers\n" ); + rc = -ENOMEM ; + goto err_free_dev; + } + +/* If Phy COMA mode was enabled when we went down, disable it here. */ +writel (ET_PMCSR_INIT , &adapter->regs->global.pm_csr); + +et131x_soft_reset (adapter); +et131x_disable_interrupts (adapter); + + rc =et131x_adapter_memory_alloc (adapter); +if (rc <0 ) { +dev_err (&pdev->dev,"Could not alloc adapter memory (DMA)\n" ); + goto err_iounmap; + } + +et131x_init_send (adapter); + +netif_napi_add (netdev, &adapter->napi, et131x_poll,64 ); + +ether_addr_copy (netdev->dev_addr, adapter->addr); + + rc = -ENOMEM ; + + adapter->mii_bus =mdiobus_alloc (); +if (!adapter->mii_bus) { +dev_err (&pdev->dev,"Alloc of mii_bus struct failed\n" ); + goto err_mem_free; + } + + adapter->mii_bus->name ="et131x_eth_mii" ; +snprintf (adapter->mii_bus->id,MII_BUS_ID_SIZE ,"%x" , + (adapter->pdev->bus->number <<8 ) | adapter->pdev->devfn); + adapter->mii_bus->priv = netdev; + adapter->mii_bus->read = et131x_mdio_read; + adapter->mii_bus->write = et131x_mdio_write; + adapter->mii_bus->irq =kmalloc_array (PHY_MAX_ADDR ,sizeof (int ), +GFP_KERNEL ); +if (!adapter->mii_bus->irq) + goto err_mdio_free; + +for (ii =0 ; ii <PHY_MAX_ADDR ; ii++) + adapter->mii_bus->irq[ii] =PHY_POLL ; + + rc =mdiobus_register (adapter->mii_bus); +if (rc <0 ) { +dev_err (&pdev->dev,"failed to register MII bus\n" ); + goto err_mdio_free_irq; + } + + rc =et131x_mii_probe (netdev); +if (rc <0 ) { +dev_err (&pdev->dev,"failed to probe MII bus\n" ); + goto err_mdio_unregister; + } + +et131x_adapter_setup (adapter); + +/* Init variable for counting how long we do not have link status */ + adapter->boot_coma =0 ; +et1310_disable_phy_coma (adapter); + +/* We can enable interrupts now +* +* NOTE - Because registration of interrupt handler is done in the +* device's open(), defer enabling device interrupts to that +* point +*/ + + rc =register_netdev (netdev); +if (rc <0 ) { +dev_err (&pdev->dev,"register_netdev() failed\n" ); + goto err_phy_disconnect; + } + +/* Register the net_device struct with the PCI subsystem. Save a copy +* of the PCI config space for this device now that the device has +* been initialized, just in case it needs to be quickly restored. +*/ +pci_set_drvdata (pdev, netdev); +out: +return rc; + +err_phy_disconnect: +phy_disconnect (adapter->phydev); +err_mdio_unregister: +mdiobus_unregister (adapter->mii_bus); +err_mdio_free_irq: +kfree (adapter->mii_bus->irq); +err_mdio_free: +mdiobus_free (adapter->mii_bus); +err_mem_free: +et131x_adapter_memory_free (adapter);
drivers/net/ethernet/agere/et131x.c line 4103
Quoted 10 lines
drivers/net/ethernet/agere/et131x.c new file +10
-0+err_iounmap: +iounmap (adapter->regs); +err_free_dev: +pci_dev_put (pdev); +free_netdev (netdev); +err_release_res: +pci_release_regions (pdev); +err_disable: +pci_disable_device (pdev); + goto out;
Same here, directly return rc. Then you can also get rid of the `out' label.
Quoted 18 lines
drivers/net/ethernet/agere/et131x.c new file +18
-0+} + +static const struct pci_device_id et131x_pci_table[] = { + {PCI_VDEVICE (ATT ,ET131X_PCI_DEVICE_ID_GIG ),0UL }, + {PCI_VDEVICE (ATT ,ET131X_PCI_DEVICE_ID_FAST ),0UL }, + {0 ,} +}; +MODULE_DEVICE_TABLE (pci, et131x_pci_table); + +static struct pci_driver et131x_driver = { + .name =DRIVER_NAME , + .id_table = et131x_pci_table, + .probe = et131x_pci_setup, + .remove = et131x_pci_remove, + .driver.pm = &et131x_pm_ops, +}; + +module_pci_driver (et131x_driver);
Quoted 3 lines · Tobias Klauser
Quoted 2 lines · Mark Einon
This adds the ethernet driver for Agere et131x devices to
drivers/net/ethernet.
[]
Quoted 1 line
drivers/net/ethernet/agere/et131x.c
Quoted 1 line
drivers/net/ethernet/agere/et131x.c +0
-0
[]
Quoted 6 lines
drivers/net/ethernet/agere/et131x.c line 3952
Quoted 4 lines
drivers/net/ethernet/agere/et131x.c +4
-0+ rc =pci_enable_device (pdev); +if (rc <0 ) { +dev_err (&pdev->dev,"pci_enable_device() failed\n" ); + goto out;Nit: Just return rc here.
I don't think it matters at all.
It's a predictable style to use common exit blocks.
It's a maintainer's right to do it in whatever
fashion is desired.
Quoted 7 lines · Joe Perches
Quoted 3 lines · Tobias Klauser
Quoted 2 lines · Mark Einon
This adds the ethernet driver for Agere et131x devices to
drivers/net/ethernet.[]
Quoted 1 line
drivers/net/ethernet/agere/et131x.c
Quoted 1 line
drivers/net/ethernet/agere/et131x.c +0
-0[]
Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/agere/et131x.c line 3952
Quoted 4 lines
drivers/net/ethernet/agere/et131x.c +4
-0+ rc =pci_enable_device (pdev); +if (rc <0 ) { +dev_err (&pdev->dev,"pci_enable_device() failed\n" ); + goto out;Nit: Just return rc here.
I don't think it matters at all.
Combined with my second remark this change makes the `out' label unnecessary. If Mark decides to keep the goto here, at least the position of the label should be changed to the end of the function, to remain predictable and avoid jumping back.
Quoted 15 lines · Tobias Klauser
Quoted 14 lines · Joe Perches
Quoted 3 lines · Tobias Klauser
Quoted 2 lines · Mark Einon
This adds the ethernet driver for Agere et131x devices to
drivers/net/ethernet.[]
Quoted 1 line
drivers/net/ethernet/agere/et131x.c
Quoted 1 line
drivers/net/ethernet/agere/et131x.c +0
-0[]
Quoted 6 lines
drivers/net/ethernet/agere/et131x.c line 3952
Quoted 4 lines
drivers/net/ethernet/agere/et131x.c +4
-0+ rc =pci_enable_device (pdev); +if (rc <0 ) { +dev_err (&pdev->dev,"pci_enable_device() failed\n" ); + goto out;Nit: Just return rc here.
Quoted 6 lines
Quoted 1 line
I don't think it matters at all.
Combined with my second remark this change makes the `out' label unnecessary. If Mark decides to keep the goto here, at least the position of the label should be changed to the end of the function, to remain predictable and avoid jumping back.
Hi Tobias, Thanks for the review. Yes, I think it is a bit nit-picking, and I'd prefer to have just one return in the function. I don't think replacing the return with a goto adds much and in the interests of keeping churn down, I won't be making the change unless it prevents the driver moving out of staging.
Cheers,
Mark
Applied, thanks.