Commit d5a14ff0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-next' 



Jiri Pirko says:

====================
mlxsw: small driver update

For details, see individual patches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1d005788 71fac305

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
@@ -48,6 +48,7 @@ 
#include <linux/seq_file.h>

#include <linux/string.h>



#include "pci_hw.h"

#include "pci.h"

#include "core.h"

#include "cmd.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

+19 −187
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2015 Mellanox Technologies. All rights reserved.

 * Copyright (c) 2015 Jiri Pirko <jiri@mellanox.com>

 * 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:
@@ -35,197 +35,29 @@ 
#ifndef _MLXSW_PCI_H

#define _MLXSW_PCI_H



#include <linux/bitops.h>



#include "item.h"

#include <linux/pci.h>



#define PCI_DEVICE_ID_MELLANOX_SWITCHX2		0xc738

#define PCI_DEVICE_ID_MELLANOX_SPECTRUM		0xcb84

#define MLXSW_PCI_BAR0_SIZE		(1024 * 1024) /* 1MB */

#define MLXSW_PCI_PAGE_SIZE		4096



#define MLXSW_PCI_CIR_BASE			0x71000

#define MLXSW_PCI_CIR_IN_PARAM_HI		MLXSW_PCI_CIR_BASE

#define MLXSW_PCI_CIR_IN_PARAM_LO		(MLXSW_PCI_CIR_BASE + 0x04)

#define MLXSW_PCI_CIR_IN_MODIFIER		(MLXSW_PCI_CIR_BASE + 0x08)

#define MLXSW_PCI_CIR_OUT_PARAM_HI		(MLXSW_PCI_CIR_BASE + 0x0C)

#define MLXSW_PCI_CIR_OUT_PARAM_LO		(MLXSW_PCI_CIR_BASE + 0x10)

#define MLXSW_PCI_CIR_TOKEN			(MLXSW_PCI_CIR_BASE + 0x14)

#define MLXSW_PCI_CIR_CTRL			(MLXSW_PCI_CIR_BASE + 0x18)

#define MLXSW_PCI_CIR_CTRL_GO_BIT		BIT(23)

#define MLXSW_PCI_CIR_CTRL_EVREQ_BIT		BIT(22)

#define MLXSW_PCI_CIR_CTRL_OPCODE_MOD_SHIFT	12

#define MLXSW_PCI_CIR_CTRL_STATUS_SHIFT		24

#define MLXSW_PCI_CIR_TIMEOUT_MSECS		1000



#define MLXSW_PCI_SW_RESET			0xF0010

#define MLXSW_PCI_SW_RESET_RST_BIT		BIT(0)

#define MLXSW_PCI_SW_RESET_TIMEOUT_MSECS	5000

#define MLXSW_PCI_FW_READY			0xA1844

#define MLXSW_PCI_FW_READY_MASK			0xFF

#define MLXSW_PCI_FW_READY_MAGIC		0x5E



#define MLXSW_PCI_DOORBELL_SDQ_OFFSET		0x000

#define MLXSW_PCI_DOORBELL_RDQ_OFFSET		0x200

#define MLXSW_PCI_DOORBELL_CQ_OFFSET		0x400

#define MLXSW_PCI_DOORBELL_EQ_OFFSET		0x600

#define MLXSW_PCI_DOORBELL_ARM_CQ_OFFSET	0x800

#define MLXSW_PCI_DOORBELL_ARM_EQ_OFFSET	0xA00



#define MLXSW_PCI_DOORBELL(offset, type_offset, num)	\

	((offset) + (type_offset) + (num) * 4)

#if IS_ENABLED(CONFIG_MLXSW_PCI)



#define MLXSW_PCI_CQS_MAX	96

#define MLXSW_PCI_EQS_COUNT	2

#define MLXSW_PCI_EQ_ASYNC_NUM	0

#define MLXSW_PCI_EQ_COMP_NUM	1

int mlxsw_pci_driver_register(struct pci_driver *pci_driver);

void mlxsw_pci_driver_unregister(struct pci_driver *pci_driver);



#define MLXSW_PCI_AQ_PAGES	8

#define MLXSW_PCI_AQ_SIZE	(MLXSW_PCI_PAGE_SIZE * MLXSW_PCI_AQ_PAGES)

#define MLXSW_PCI_WQE_SIZE	32 /* 32 bytes per element */

#define MLXSW_PCI_CQE_SIZE	16 /* 16 bytes per element */

#define MLXSW_PCI_EQE_SIZE	16 /* 16 bytes per element */

#define MLXSW_PCI_WQE_COUNT	(MLXSW_PCI_AQ_SIZE / MLXSW_PCI_WQE_SIZE)

#define MLXSW_PCI_CQE_COUNT	(MLXSW_PCI_AQ_SIZE / MLXSW_PCI_CQE_SIZE)

#define MLXSW_PCI_EQE_COUNT	(MLXSW_PCI_AQ_SIZE / MLXSW_PCI_EQE_SIZE)

#define MLXSW_PCI_EQE_UPDATE_COUNT	0x80

#else



#define MLXSW_PCI_WQE_SG_ENTRIES	3

#define MLXSW_PCI_WQE_TYPE_ETHERNET	0xA

static inline int

mlxsw_pci_driver_register(struct pci_driver *pci_driver)

{

	return 0;

}



/* pci_wqe_c

 * If set it indicates that a completion should be reported upon

 * execution of this descriptor.

 */

MLXSW_ITEM32(pci, wqe, c, 0x00, 31, 1);



/* pci_wqe_lp

 * Local Processing, set if packet should be processed by the local

 * switch hardware:

 * For Ethernet EMAD (Direct Route and non Direct Route) -

 * must be set if packet destination is local device

 * For InfiniBand CTL - must be set if packet destination is local device

 * Otherwise it must be clear

 * Local Process packets must not exceed the size of 2K (including payload

 * and headers).

 */

MLXSW_ITEM32(pci, wqe, lp, 0x00, 30, 1);



/* pci_wqe_type

 * Packet type.

 */

MLXSW_ITEM32(pci, wqe, type, 0x00, 23, 4);



/* pci_wqe_byte_count

 * Size of i-th scatter/gather entry, 0 if entry is unused.

 */

MLXSW_ITEM16_INDEXED(pci, wqe, byte_count, 0x02, 0, 14, 0x02, 0x00, false);



/* pci_wqe_address

 * Physical address of i-th scatter/gather entry.

 * Gather Entries must be 2Byte aligned.

 */

MLXSW_ITEM64_INDEXED(pci, wqe, address, 0x08, 0, 64, 0x8, 0x0, false);



/* pci_cqe_lag

 * Packet arrives from a port which is a LAG

 */

MLXSW_ITEM32(pci, cqe, lag, 0x00, 23, 1);



/* pci_cqe_system_port/lag_id

 * When lag=0: System port on which the packet was received

 * When lag=1:

 * bits [15:4] LAG ID on which the packet was received

 * bits [3:0] sub_port on which the packet was received

 */

MLXSW_ITEM32(pci, cqe, system_port, 0x00, 0, 16);

MLXSW_ITEM32(pci, cqe, lag_id, 0x00, 4, 12);

MLXSW_ITEM32(pci, cqe, lag_port_index, 0x00, 0, 4);



/* pci_cqe_wqe_counter

 * WQE count of the WQEs completed on the associated dqn

 */

MLXSW_ITEM32(pci, cqe, wqe_counter, 0x04, 16, 16);



/* pci_cqe_byte_count

 * Byte count of received packets including additional two

 * Reserved Bytes that are append to the end of the frame.

 * Reserved for Send CQE.

 */

MLXSW_ITEM32(pci, cqe, byte_count, 0x04, 0, 14);



/* pci_cqe_trap_id

 * Trap ID that captured the packet.

 */

MLXSW_ITEM32(pci, cqe, trap_id, 0x08, 0, 8);



/* pci_cqe_crc

 * Length include CRC. Indicates the length field includes

 * the packet's CRC.

 */

MLXSW_ITEM32(pci, cqe, crc, 0x0C, 8, 1);

static inline void

mlxsw_pci_driver_unregister(struct pci_driver *pci_driver)

{

}



/* pci_cqe_e

 * CQE with Error.

 */

MLXSW_ITEM32(pci, cqe, e, 0x0C, 7, 1);



/* pci_cqe_sr

 * 1 - Send Queue

 * 0 - Receive Queue

 */

MLXSW_ITEM32(pci, cqe, sr, 0x0C, 6, 1);



/* pci_cqe_dqn

 * Descriptor Queue (DQ) Number.

 */

MLXSW_ITEM32(pci, cqe, dqn, 0x0C, 1, 5);



/* pci_cqe_owner

 * Ownership bit.

 */

MLXSW_ITEM32(pci, cqe, owner, 0x0C, 0, 1);



/* pci_eqe_event_type

 * Event type.

 */

MLXSW_ITEM32(pci, eqe, event_type, 0x0C, 24, 8);

#define MLXSW_PCI_EQE_EVENT_TYPE_COMP	0x00

#define MLXSW_PCI_EQE_EVENT_TYPE_CMD	0x0A



/* pci_eqe_event_sub_type

 * Event type.

 */

MLXSW_ITEM32(pci, eqe, event_sub_type, 0x0C, 16, 8);



/* pci_eqe_cqn

 * Completion Queue that triggeret this EQE.

 */

MLXSW_ITEM32(pci, eqe, cqn, 0x0C, 8, 7);



/* pci_eqe_owner

 * Ownership bit.

 */

MLXSW_ITEM32(pci, eqe, owner, 0x0C, 0, 1);



/* pci_eqe_cmd_token

 * Command completion event - token

 */

MLXSW_ITEM32(pci, eqe, cmd_token, 0x08, 16, 16);



/* pci_eqe_cmd_status

 * Command completion event - status

 */

MLXSW_ITEM32(pci, eqe, cmd_status, 0x08, 0, 8);



/* pci_eqe_cmd_out_param_h

 * Command completion event - output parameter - higher part

 */

MLXSW_ITEM32(pci, eqe, cmd_out_param_h, 0x0C, 0, 32);



/* pci_eqe_cmd_out_param_l

 * Command completion event - output parameter - lower part

 */

MLXSW_ITEM32(pci, eqe, cmd_out_param_l, 0x10, 0, 32);

#endif



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE