sfc: Add a basic Siena module

Make the (un)load message more specific to differentiate it from
the sfc.ko messages.

Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig
index 846fff16fa48320e4ce6676d543ed33c8a174ce6..98db551ba2b7efd4629e1840e8c491bb516998d7 100644 (file)
--- a/drivers/net/ethernet/sfc/Kconfig
+++ b/drivers/net/ethernet/sfc/Kconfig
@@ -65,5 +65,6 @@ config SFC_MCDI_LOGGING
          a sysfs file 'mcdi_logging' under the PCI device.
 
 source "drivers/net/ethernet/sfc/falcon/Kconfig"
+source "drivers/net/ethernet/sfc/siena/Kconfig"
 
 endif # NET_VENDOR_SOLARFLARE

diff --git a/drivers/net/ethernet/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile
index 9b3374cf793703dccfc3df6a5e6450f9a3e0a9a2..b9298031ea51ceca21bbdc57d1fe0b6e7e77da99 100644 (file)
--- a/drivers/net/ethernet/sfc/Makefile
+++ b/drivers/net/ethernet/sfc/Makefile
@@ -13,3 +13,4 @@ sfc-$(CONFIG_SFC_SRIOV)       += sriov.o ef10_sriov.o ef100_sriov.o
 obj-$(CONFIG_SFC)      += sfc.o
 
 obj-$(CONFIG_SFC_FALCON) += falcon/
+obj-$(CONFIG_SFC_SIENA) += siena/

diff --git a/drivers/net/ethernet/sfc/siena/Kconfig b/drivers/net/ethernet/sfc/siena/Kconfig
new file mode 100644 (file)
index 0000000..3d52aee
--- /dev/null
+++ b/drivers/net/ethernet/sfc/siena/Kconfig
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config SFC_SIENA
+       tristate "Solarflare SFC9000 support"
+       depends on PCI
+       select MDIO
+       select CRC32
+       help
+         This driver supports 10-gigabit Ethernet cards based on
+         the Solarflare SFC9000 controller.
+
+         To compile this driver as a module, choose M here.  The module
+         will be called sfc-siena.

diff --git a/drivers/net/ethernet/sfc/siena/Makefile b/drivers/net/ethernet/sfc/siena/Makefile
new file mode 100644 (file)
index 0000000..74cb8b7
--- /dev/null
+++ b/drivers/net/ethernet/sfc/siena/Makefile
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0
+sfc-siena-y            += farch.o siena.o \
+                          efx.o efx_common.o efx_channels.o nic.o \
+                          tx.o tx_common.o rx.o rx_common.o \
+                          selftest.o ethtool.o ethtool_common.o ptp.o \
+                          mcdi.o mcdi_port.o mcdi_port_common.o \
+                          mcdi_mon.o
+sfc-siena-$(CONFIG_SFC_MTD)    += mtd.o
+sfc-siena-$(CONFIG_SFC_SRIOV)  += siena_sriov.o
+
+obj-$(CONFIG_SFC_SIENA)        += sfc-siena.o

diff --git a/drivers/net/ethernet/sfc/siena/efx.c b/drivers/net/ethernet/sfc/siena/efx.c
index d937704e416b6d780a8a3e991c2a941c05d92f2f..3f6e732f5fdc28ac53bbd0d562144c4c11af2837 100644 (file)
--- a/drivers/net/ethernet/sfc/siena/efx.c
+++ b/drivers/net/ethernet/sfc/siena/efx.c
@@ -1265,7 +1265,7 @@ static int __init efx_init_module(void)
 {
        int rc;
 
-       printk(KERN_INFO "Solarflare NET driver\n");
+       pr_info("Solarflare Siena driver\n");
 
        rc = register_netdevice_notifier(&efx_netdev_notifier);
        if (rc)
@@ -1291,7 +1291,7 @@ static int __init efx_init_module(void)
 
 static void __exit efx_exit_module(void)
 {
-       printk(KERN_INFO "Solarflare NET driver unloading\n");
+       pr_info("Solarflare Siena driver unloading\n");
 
        pci_unregister_driver(&efx_pci_driver);
        efx_siena_destroy_reset_workqueue();
@@ -1304,6 +1304,6 @@ module_exit(efx_exit_module);
 
 MODULE_AUTHOR("Solarflare Communications and "
              "Michael Brown <mbrown@fensystems.co.uk>");
-MODULE_DESCRIPTION("Solarflare network driver");
+MODULE_DESCRIPTION("Solarflare Siena network driver");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, efx_pci_table);