| Message ID | 20240605232608.65471-2-fujita.tomonori@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | add ethernet driver for Tehuti Networks TN40xx chips | expand |
On 06.06.2024 01.26, FUJITA Tomonori wrote: > + > +static const struct pci_device_id tn40_id_table[] = { > + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, > + PCI_VENDOR_ID_TEHUTI, 0x3015) }, > + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, > + PCI_VENDOR_ID_DLINK, 0x4d00) }, > + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, > + PCI_VENDOR_ID_ASUSTEK, 0x8709) }, > + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, > + PCI_VENDOR_ID_EDIMAX, 0x8103) }, > + { } > +}; > + Now that it seems we will have another revision of your patches, maybe we can also continue to do a bit of cleanup: Is there any reason why you specifically detail every single card with vendor ids? Couldn't it just do with the generic Tehuti device number, i.e.: static const struct pci_device_id tn40_id_table[] = { { PCI_VDEVICE(TEHUTI, 0x4022), 0}, { } }; > --- /dev/null > +++ b/drivers/net/ethernet/tehuti/tn40.h > @@ -0,0 +1,11 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* Copyright (c) Tehuti Networks Ltd. */ > + > +#ifndef _TN40_H_ > +#define _TN40_H_ > + > +#define TN40_DRV_NAME "tn40xx" > + > +#define PCI_VENDOR_ID_EDIMAX 0x1432 with my suggestion above, the definition of the vendor EDIMAX would become obsolete. If needed, it should probably anyway rather be placed in include/linux/pci_ids.h > + > +#endif /* _TN40XX_H */
On Sun, 9 Jun 2024 13:17:30 +0200 Hans-Frieder Vogt <hfdevel@gmx.net> wrote: > On 06.06.2024 01.26, FUJITA Tomonori wrote: >> + >> +static const struct pci_device_id tn40_id_table[] = { >> + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, >> + PCI_VENDOR_ID_TEHUTI, 0x3015) }, >> + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, >> + PCI_VENDOR_ID_DLINK, 0x4d00) }, >> + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, >> + PCI_VENDOR_ID_ASUSTEK, 0x8709) }, >> + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, >> + PCI_VENDOR_ID_EDIMAX, 0x8103) }, >> + { } >> +}; >> + > > Now that it seems we will have another revision of your patches, maybe > we can also continue to do a bit of cleanup: > > Is there any reason why you specifically detail every single card with > vendor ids? > Couldn't it just do with the generic Tehuti device number, i.e.: > > static const struct pci_device_id tn40_id_table[] = { > { PCI_VDEVICE(TEHUTI, 0x4022), 0}, > { } > }; The original driver tells that different hardware initialization routines are required depending on the type of PHY hardware (e.g., mdio speed, register value for interrupt). I plan to add such information to driver_data in the id table when I add new PHY support. Seems that you could add AQR105 PHY soon so I'll update the table to put QT2025 PHY specific info into the table. >> --- /dev/null >> +++ b/drivers/net/ethernet/tehuti/tn40.h >> @@ -0,0 +1,11 @@ >> +/* SPDX-License-Identifier: GPL-2.0+ */ >> +/* Copyright (c) Tehuti Networks Ltd. */ >> + >> +#ifndef _TN40_H_ >> +#define _TN40_H_ >> + >> +#define TN40_DRV_NAME "tn40xx" >> + >> +#define PCI_VENDOR_ID_EDIMAX 0x1432 > with my suggestion above, the definition of the vendor EDIMAX would > become obsolete. If needed, it should probably anyway rather be placed > in include/linux/pci_ids.h Surely, I'll put it in include/linux/pci_ids.h in v10.
diff --git a/MAINTAINERS b/MAINTAINERS index 7538152be2f1..ec7970203ee6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22141,7 +22141,13 @@ TEHUTI ETHERNET DRIVER M: Andy Gospodarek <andy@greyhouse.net> L: netdev@vger.kernel.org S: Supported -F: drivers/net/ethernet/tehuti/* +F: drivers/net/ethernet/tehuti/tehuti.* + +TEHUTI TN40XX ETHERNET DRIVER +M: FUJITA Tomonori <fujita.tomonori@gmail.com> +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/ethernet/tehuti/tn40* TELECOM CLOCK DRIVER FOR MCPL0010 M: Mark Gross <markgross@kernel.org> diff --git a/drivers/net/ethernet/tehuti/Kconfig b/drivers/net/ethernet/tehuti/Kconfig index 8735633765a1..849e3b4a71c1 100644 --- a/drivers/net/ethernet/tehuti/Kconfig +++ b/drivers/net/ethernet/tehuti/Kconfig @@ -23,4 +23,16 @@ config TEHUTI help Tehuti Networks 10G Ethernet NIC +config TEHUTI_TN40 + tristate "Tehuti Networks TN40xx 10G Ethernet adapters" + depends on PCI + help + This driver supports 10G Ethernet adapters using Tehuti Networks + TN40xx chips. Currently, adapters with Applied Micro Circuits + Corporation QT2025 are supported; Tehuti Networks TN9310, + DLink DXE-810S, ASUS XG-C100F, and Edimax EN-9320. + + To compile this driver as a module, choose M here: the module + will be called tn40xx. + endif # NET_VENDOR_TEHUTI diff --git a/drivers/net/ethernet/tehuti/Makefile b/drivers/net/ethernet/tehuti/Makefile index 13a0ddd62088..1c468d99e476 100644 --- a/drivers/net/ethernet/tehuti/Makefile +++ b/drivers/net/ethernet/tehuti/Makefile @@ -4,3 +4,6 @@ # obj-$(CONFIG_TEHUTI) += tehuti.o + +tn40xx-y := tn40.o +obj-$(CONFIG_TEHUTI_TN40) += tn40xx.o diff --git a/drivers/net/ethernet/tehuti/tn40.c b/drivers/net/ethernet/tehuti/tn40.c new file mode 100644 index 000000000000..6ec436120d18 --- /dev/null +++ b/drivers/net/ethernet/tehuti/tn40.c @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) Tehuti Networks Ltd. */ + +#include <linux/pci.h> + +#include "tn40.h" + +static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +{ + int ret; + + ret = pci_enable_device(pdev); + if (ret) + return ret; + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); + if (ret) { + dev_err(&pdev->dev, "failed to set DMA mask.\n"); + goto err_disable_device; + } + return 0; +err_disable_device: + pci_disable_device(pdev); + return ret; +} + +static void tn40_remove(struct pci_dev *pdev) +{ + pci_disable_device(pdev); +} + +static const struct pci_device_id tn40_id_table[] = { + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, + PCI_VENDOR_ID_TEHUTI, 0x3015) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, + PCI_VENDOR_ID_DLINK, 0x4d00) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, + PCI_VENDOR_ID_ASUSTEK, 0x8709) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, + PCI_VENDOR_ID_EDIMAX, 0x8103) }, + { } +}; + +static struct pci_driver tn40_driver = { + .name = TN40_DRV_NAME, + .id_table = tn40_id_table, + .probe = tn40_probe, + .remove = tn40_remove, +}; + +module_pci_driver(tn40_driver); + +MODULE_DEVICE_TABLE(pci, tn40_id_table); +MODULE_AUTHOR("Tehuti networks"); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Tehuti Network TN40xx Driver"); diff --git a/drivers/net/ethernet/tehuti/tn40.h b/drivers/net/ethernet/tehuti/tn40.h new file mode 100644 index 000000000000..a5c5b558f56c --- /dev/null +++ b/drivers/net/ethernet/tehuti/tn40.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* Copyright (c) Tehuti Networks Ltd. */ + +#ifndef _TN40_H_ +#define _TN40_H_ + +#define TN40_DRV_NAME "tn40xx" + +#define PCI_VENDOR_ID_EDIMAX 0x1432 + +#endif /* _TN40XX_H */
This just adds the scaffolding for an ethernet driver for Tehuti Networks TN40xx chips. Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com> --- MAINTAINERS | 8 +++- drivers/net/ethernet/tehuti/Kconfig | 12 ++++++ drivers/net/ethernet/tehuti/Makefile | 3 ++ drivers/net/ethernet/tehuti/tn40.c | 55 ++++++++++++++++++++++++++++ drivers/net/ethernet/tehuti/tn40.h | 11 ++++++ 5 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/tehuti/tn40.c create mode 100644 drivers/net/ethernet/tehuti/tn40.h