mlxsw: Move PCI id table definitions into driver modules (1d20d23c) · Commits · 戴 / test

drivers/net/ethernet/mellanox/mlxsw/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ config MLXSW_PCI

		config MLXSW_SWITCHX2
		tristate "Mellanox Technologies SwitchX-2 support"
		depends on MLXSW_CORE && NET_SWITCHDEV
		depends on MLXSW_CORE && MLXSW_PCI && NET_SWITCHDEV
		default m
		---help---
		This driver supports Mellanox Technologies SwitchX-2 Ethernet
		@@ -42,7 +42,7 @@ config MLXSW_SWITCHX2

		config MLXSW_SPECTRUM
		tristate "Mellanox Technologies Spectrum support"
		depends on MLXSW_CORE && NET_SWITCHDEV && VLAN_8021Q
		depends on MLXSW_CORE && MLXSW_PCI && NET_SWITCHDEV && VLAN_8021Q
		default m
		---help---
		This driver supports Mellanox Technologies Spectrum Ethernet

drivers/net/ethernet/mellanox/mlxsw/core.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -823,17 +823,6 @@ static struct mlxsw_driver mlxsw_core_driver_get(const char kind)

		spin_lock(&mlxsw_core_driver_list_lock);
		mlxsw_driver = __driver_find(kind);
		if (!mlxsw_driver) {
		spin_unlock(&mlxsw_core_driver_list_lock);
		request_module(MLXSW_MODULE_ALIAS_PREFIX "%s", kind);
		spin_lock(&mlxsw_core_driver_list_lock);
		mlxsw_driver = __driver_find(kind);
		}
		if (mlxsw_driver) {
		if (!try_module_get(mlxsw_driver->owner))
		mlxsw_driver = NULL;
		}

		spin_unlock(&mlxsw_core_driver_list_lock);
		return mlxsw_driver;
		}
		@@ -845,9 +834,6 @@ static void mlxsw_core_driver_put(const char *kind)
		spin_lock(&mlxsw_core_driver_list_lock);
		mlxsw_driver = __driver_find(kind);
		spin_unlock(&mlxsw_core_driver_list_lock);
		if (!mlxsw_driver)
		return;
		module_put(mlxsw_driver->owner);
		}

		static int mlxsw_core_debugfs_init(struct mlxsw_core *mlxsw_core)

drivers/net/ethernet/mellanox/mlxsw/core.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -51,13 +51,6 @@
		#include "cmd.h"
		#include "resources.h"

		#define MLXSW_MODULE_ALIAS_PREFIX "mlxsw-driver-"
		#define MODULE_MLXSW_DRIVER_ALIAS(kind) \
		MODULE_ALIAS(MLXSW_MODULE_ALIAS_PREFIX kind)

		#define MLXSW_DEVICE_KIND_SWITCHX2 "switchx2"
		#define MLXSW_DEVICE_KIND_SPECTRUM "spectrum"

		struct mlxsw_core;
		struct mlxsw_driver;
		struct mlxsw_bus;
		@@ -221,7 +214,6 @@ struct mlxsw_config_profile {
		struct mlxsw_driver {
		struct list_head list;
		const char *kind;
		struct module *owner;
		size_t priv_size;
		int (init)(struct mlxsw_core mlxsw_core,
		const struct mlxsw_bus_info *mlxsw_bus_info);

drivers/net/ethernet/mellanox/mlxsw/pci.c

+18 −38

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@
		#include <linux/string.h>

		#include "pci_hw.h"
		#include "pci.h"
		#include "core.h"
		#include "cmd.h"
		#include "port.h"
		@@ -56,26 +57,8 @@

		static const char mlxsw_pci_driver_name[] = "mlxsw_pci";

		static const struct pci_device_id mlxsw_pci_id_table[] = {
		{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SWITCHX2), 0},
		{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SPECTRUM), 0},
		{0, }
		};

		static struct dentry *mlxsw_pci_dbg_root;

		static const char mlxsw_pci_device_kind_get(const struct pci_device_id id)
		{
		switch (id->device) {
		case PCI_DEVICE_ID_MELLANOX_SWITCHX2:
		return MLXSW_DEVICE_KIND_SWITCHX2;
		case PCI_DEVICE_ID_MELLANOX_SPECTRUM:
		return MLXSW_DEVICE_KIND_SPECTRUM;
		default:
		BUG();
		}
		}

		#define mlxsw_pci_write32(mlxsw_pci, reg, val) \
		iowrite32be(val, (mlxsw_pci)->hw_addr + (MLXSW_PCI_ ## reg))
		#define mlxsw_pci_read32(mlxsw_pci, reg) \
		@@ -1553,7 +1536,7 @@ static int mlxsw_pci_init(void bus_priv, struct mlxsw_core mlxsw_core,

		err = request_irq(mlxsw_pci->msix_entry.vector,
		mlxsw_pci_eq_irq_handler, 0,
		mlxsw_pci_driver_name, mlxsw_pci);
		mlxsw_pci->bus_info.device_kind, mlxsw_pci);
		if (err) {
		dev_err(&pdev->dev, "IRQ request failed\n");
		goto err_request_eq_irq;
		@@ -1793,6 +1776,7 @@ static int mlxsw_pci_sw_reset(struct mlxsw_pci *mlxsw_pci)

		static int mlxsw_pci_probe(struct pci_dev pdev, const struct pci_device_id id)
		{
		const char *driver_name = pdev->driver->name;
		struct mlxsw_pci *mlxsw_pci;
		int err;

		@@ -1806,7 +1790,7 @@ static int mlxsw_pci_probe(struct pci_dev pdev, const struct pci_device_id id)
		goto err_pci_enable_device;
		}

		err = pci_request_regions(pdev, mlxsw_pci_driver_name);
		err = pci_request_regions(pdev, driver_name);
		if (err) {
		dev_err(&pdev->dev, "pci_request_regions failed\n");
		goto err_pci_request_regions;
		@@ -1857,7 +1841,7 @@ static int mlxsw_pci_probe(struct pci_dev pdev, const struct pci_device_id id)
		goto err_msix_init;
		}

		mlxsw_pci->bus_info.device_kind = mlxsw_pci_device_kind_get(id);
		mlxsw_pci->bus_info.device_kind = driver_name;
		mlxsw_pci->bus_info.device_name = pci_name(mlxsw_pci->pdev);
		mlxsw_pci->bus_info.dev = &pdev->dev;

		@@ -1909,33 +1893,30 @@ static void mlxsw_pci_remove(struct pci_dev *pdev)
		kfree(mlxsw_pci);
		}

		static struct pci_driver mlxsw_pci_driver = {
		.name = mlxsw_pci_driver_name,
		.id_table = mlxsw_pci_id_table,
		.probe = mlxsw_pci_probe,
		.remove = mlxsw_pci_remove,
		};
		int mlxsw_pci_driver_register(struct pci_driver *pci_driver)
		{
		pci_driver->probe = mlxsw_pci_probe;
		pci_driver->remove = mlxsw_pci_remove;
		return pci_register_driver(pci_driver);
		}
		EXPORT_SYMBOL(mlxsw_pci_driver_register);

		static int __init mlxsw_pci_module_init(void)
		void mlxsw_pci_driver_unregister(struct pci_driver *pci_driver)
		{
		int err;
		pci_unregister_driver(pci_driver);
		}
		EXPORT_SYMBOL(mlxsw_pci_driver_unregister);

		static int __init mlxsw_pci_module_init(void)
		{
		mlxsw_pci_dbg_root = debugfs_create_dir(mlxsw_pci_driver_name, NULL);
		if (!mlxsw_pci_dbg_root)
		return -ENOMEM;
		err = pci_register_driver(&mlxsw_pci_driver);
		if (err)
		goto err_register_driver;
		return 0;

		err_register_driver:
		debugfs_remove_recursive(mlxsw_pci_dbg_root);
		return err;
		}

		static void __exit mlxsw_pci_module_exit(void)
		{
		pci_unregister_driver(&mlxsw_pci_driver);
		debugfs_remove_recursive(mlxsw_pci_dbg_root);
		}

		@@ -1945,4 +1926,3 @@ module_exit(mlxsw_pci_module_exit);
		MODULE_LICENSE("Dual BSD/GPL");
		MODULE_AUTHOR("Jiri Pirko <jiri@mellanox.com>");
		MODULE_DESCRIPTION("Mellanox switch PCI interface driver");
		MODULE_DEVICE_TABLE(pci, mlxsw_pci_id_table);

drivers/net/ethernet/mellanox/mlxsw/pci.h

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		/*
		* drivers/net/ethernet/mellanox/mlxsw/pci.h
		* Copyright (c) 2016 Mellanox Technologies. All rights reserved.
		* Copyright (c) 2016 Jiri Pirko <jiri@mellanox.com>
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions are met:
		*
		* 1. Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* 2. 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.
		* 3. Neither the names of the copyright holders nor the names of its
		* contributors may be used to endorse or promote products derived from
		* this software without specific prior written permission.
		*
		* Alternatively, this software may be distributed under the terms of the
		* GNU General Public License ("GPL") version 2 as published by the Free
		* Software Foundation.
		*
		* 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
		*/

		#ifndef _MLXSW_PCI_H
		#define _MLXSW_PCI_H

		#include <linux/pci.h>

		#define PCI_DEVICE_ID_MELLANOX_SWITCHX2 0xc738
		#define PCI_DEVICE_ID_MELLANOX_SPECTRUM 0xcb84

		#if IS_ENABLED(CONFIG_MLXSW_PCI)

		int mlxsw_pci_driver_register(struct pci_driver *pci_driver);
		void mlxsw_pci_driver_unregister(struct pci_driver *pci_driver);

		#else

		static inline int
		mlxsw_pci_driver_register(struct pci_driver *pci_driver)
		{
		return 0;
		}

		static inline void
		mlxsw_pci_driver_unregister(struct pci_driver *pci_driver)
		{
		}

		#endif

		#endif

Admin message