Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'mlxsw-next' 



Jiri Pirko says:

====================
mlxsw: small driver update + one tiny devlink dependency

Cosmetics, in preparation to sharedbuffer patchset.
First patch is here to allow patch number two.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 24d390b2 9efc8f65

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

+36 −20
Original line number Diff line number Diff line
@@ -114,6 +114,12 @@ struct mlxsw_core { 
	/* driver_priv has to be always the last item */

};



void *mlxsw_core_driver_priv(struct mlxsw_core *mlxsw_core)

{

	return mlxsw_core->driver_priv;

}

EXPORT_SYMBOL(mlxsw_core_driver_priv);



struct mlxsw_rx_listener_item {

	struct list_head list;

	struct mlxsw_rx_listener rxl;
@@ -381,7 +387,7 @@ static int __mlxsw_emad_transmit(struct mlxsw_core *mlxsw_core, 


	mlxsw_core->emad.trans_active = true;



	err = mlxsw_core_skb_transmit(mlxsw_core->driver_priv, skb, tx_info);

	err = mlxsw_core_skb_transmit(mlxsw_core, skb, tx_info);

	if (err) {

		dev_err(mlxsw_core->bus_info->dev, "Failed to transmit EMAD (tid=%llx)\n",

			mlxsw_core->emad.tid);
@@ -795,8 +801,7 @@ static int mlxsw_devlink_port_split(struct devlink *devlink, 
		return -EINVAL;

	if (!mlxsw_core->driver->port_split)

		return -EOPNOTSUPP;

	return mlxsw_core->driver->port_split(mlxsw_core->driver_priv,

					      port_index, count);

	return mlxsw_core->driver->port_split(mlxsw_core, port_index, count);

}



static int mlxsw_devlink_port_unsplit(struct devlink *devlink,
@@ -808,8 +813,7 @@ static int mlxsw_devlink_port_unsplit(struct devlink *devlink, 
		return -EINVAL;

	if (!mlxsw_core->driver->port_unsplit)

		return -EOPNOTSUPP;

	return mlxsw_core->driver->port_unsplit(mlxsw_core->driver_priv,

						port_index);

	return mlxsw_core->driver->port_unsplit(mlxsw_core, port_index);

}



static const struct devlink_ops mlxsw_devlink_ops = {
@@ -880,8 +884,7 @@ int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
	if (err)

		goto err_devlink_register;



	err = mlxsw_driver->init(mlxsw_core->driver_priv, mlxsw_core,

				 mlxsw_bus_info);

	err = mlxsw_driver->init(mlxsw_core, mlxsw_bus_info);

	if (err)

		goto err_driver_init;
@@ -892,7 +895,7 @@ int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
	return 0;



err_debugfs_init:

	mlxsw_core->driver->fini(mlxsw_core->driver_priv);

	mlxsw_core->driver->fini(mlxsw_core);

err_driver_init:

	devlink_unregister(devlink);

err_devlink_register:
@@ -918,7 +921,7 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core) 
	struct devlink *devlink = priv_to_devlink(mlxsw_core);



	mlxsw_core_debugfs_fini(mlxsw_core);

	mlxsw_core->driver->fini(mlxsw_core->driver_priv);

	mlxsw_core->driver->fini(mlxsw_core);

	devlink_unregister(devlink);

	mlxsw_emad_fini(mlxsw_core);

	mlxsw_core->bus->fini(mlxsw_core->bus_priv);
@@ -929,26 +932,17 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core) 
}

EXPORT_SYMBOL(mlxsw_core_bus_device_unregister);



static struct mlxsw_core *__mlxsw_core_get(void *driver_priv)

{

	return container_of(driver_priv, struct mlxsw_core, driver_priv);

}



bool mlxsw_core_skb_transmit_busy(void *driver_priv,

bool mlxsw_core_skb_transmit_busy(struct mlxsw_core *mlxsw_core,

				  const struct mlxsw_tx_info *tx_info)

{

	struct mlxsw_core *mlxsw_core = __mlxsw_core_get(driver_priv);



	return mlxsw_core->bus->skb_transmit_busy(mlxsw_core->bus_priv,

						  tx_info);

}

EXPORT_SYMBOL(mlxsw_core_skb_transmit_busy);



int mlxsw_core_skb_transmit(void *driver_priv, struct sk_buff *skb,

int mlxsw_core_skb_transmit(struct mlxsw_core *mlxsw_core, struct sk_buff *skb,

			    const struct mlxsw_tx_info *tx_info)

{

	struct mlxsw_core *mlxsw_core = __mlxsw_core_get(driver_priv);



	return mlxsw_core->bus->skb_transmit(mlxsw_core->bus_priv, skb,

					     tx_info);

}
@@ -1358,6 +1352,28 @@ void mlxsw_core_lag_mapping_clear(struct mlxsw_core *mlxsw_core, 
}

EXPORT_SYMBOL(mlxsw_core_lag_mapping_clear);



int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core,

			 struct mlxsw_core_port *mlxsw_core_port, u8 local_port,

			 struct net_device *dev, bool split, u32 split_group)

{

	struct devlink *devlink = priv_to_devlink(mlxsw_core);

	struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port;



	if (split)

		devlink_port_split_set(devlink_port, split_group);

	devlink_port_type_eth_set(devlink_port, dev);

	return devlink_port_register(devlink, devlink_port, local_port);

}

EXPORT_SYMBOL(mlxsw_core_port_init);



void mlxsw_core_port_fini(struct mlxsw_core_port *mlxsw_core_port)

{

	struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port;



	devlink_port_unregister(devlink_port);

}

EXPORT_SYMBOL(mlxsw_core_port_fini);



int mlxsw_cmd_exec(struct mlxsw_core *mlxsw_core, u16 opcode, u8 opcode_mod,

		   u32 in_mod, bool out_mbox_direct,

		   char *in_mbox, size_t in_mbox_size,

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

+19 −7
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <linux/gfp.h>

#include <linux/types.h>

#include <linux/skbuff.h>

#include <net/devlink.h>



#include "trap.h"

#include "reg.h"
@@ -61,6 +62,8 @@ struct mlxsw_driver; 
struct mlxsw_bus;

struct mlxsw_bus_info;



void *mlxsw_core_driver_priv(struct mlxsw_core *mlxsw_core);



int mlxsw_core_driver_register(struct mlxsw_driver *mlxsw_driver);

void mlxsw_core_driver_unregister(struct mlxsw_driver *mlxsw_driver);
@@ -74,10 +77,9 @@ struct mlxsw_tx_info { 
	bool is_emad;

};



bool mlxsw_core_skb_transmit_busy(void *driver_priv,

bool mlxsw_core_skb_transmit_busy(struct mlxsw_core *mlxsw_core,

				  const struct mlxsw_tx_info *tx_info);



int mlxsw_core_skb_transmit(void *driver_priv, struct sk_buff *skb,

int mlxsw_core_skb_transmit(struct mlxsw_core *mlxsw_core, struct sk_buff *skb,

			    const struct mlxsw_tx_info *tx_info);



struct mlxsw_rx_listener {
@@ -131,6 +133,15 @@ u8 mlxsw_core_lag_mapping_get(struct mlxsw_core *mlxsw_core, 
void mlxsw_core_lag_mapping_clear(struct mlxsw_core *mlxsw_core,

				  u16 lag_id, u8 local_port);



struct mlxsw_core_port {

	struct devlink_port devlink_port;

};



int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core,

			 struct mlxsw_core_port *mlxsw_core_port, u8 local_port,

			 struct net_device *dev, bool split, u32 split_group);

void mlxsw_core_port_fini(struct mlxsw_core_port *mlxsw_core_port);



#define MLXSW_CONFIG_PROFILE_SWID_COUNT 8



struct mlxsw_swid_config {
@@ -183,11 +194,12 @@ struct mlxsw_driver { 
	const char *kind;

	struct module *owner;

	size_t priv_size;

	int (*init)(void *driver_priv, struct mlxsw_core *mlxsw_core,

	int (*init)(struct mlxsw_core *mlxsw_core,

		    const struct mlxsw_bus_info *mlxsw_bus_info);

	void (*fini)(void *driver_priv);

	int (*port_split)(void *driver_priv, u8 local_port, unsigned int count);

	int (*port_unsplit)(void *driver_priv, u8 local_port);

	void (*fini)(struct mlxsw_core *mlxsw_core);

	int (*port_split)(struct mlxsw_core *mlxsw_core, u8 local_port,

			  unsigned int count);

	int (*port_unsplit)(struct mlxsw_core *mlxsw_core, u8 local_port);

	void (*txhdr_construct)(struct sk_buff *skb,

				const struct mlxsw_tx_info *tx_info);

	u8 txhdr_len;

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

+9 −18
Original line number Diff line number Diff line
@@ -3476,9 +3476,10 @@ static const struct mlxsw_reg_info mlxsw_reg_sbpr = { 
	.len = MLXSW_REG_SBPR_LEN,

};



enum mlxsw_reg_sbpr_dir {

	MLXSW_REG_SBPR_DIR_INGRESS,

	MLXSW_REG_SBPR_DIR_EGRESS,

/* shared direstion enum for SBPR, SBCM, SBPM */

enum mlxsw_reg_sbxx_dir {

	MLXSW_REG_SBXX_DIR_INGRESS,

	MLXSW_REG_SBXX_DIR_EGRESS,

};



/* reg_sbpr_dir
@@ -3511,7 +3512,7 @@ enum mlxsw_reg_sbpr_mode { 
MLXSW_ITEM32(reg, sbpr, mode, 0x08, 0, 4);



static inline void mlxsw_reg_sbpr_pack(char *payload, u8 pool,

				       enum mlxsw_reg_sbpr_dir dir,

				       enum mlxsw_reg_sbxx_dir dir,

				       enum mlxsw_reg_sbpr_mode mode, u32 size)

{

	MLXSW_REG_ZERO(sbpr, payload);
@@ -3553,11 +3554,6 @@ MLXSW_ITEM32(reg, sbcm, local_port, 0x00, 16, 8); 
 */

MLXSW_ITEM32(reg, sbcm, pg_buff, 0x00, 8, 6);



enum mlxsw_reg_sbcm_dir {

	MLXSW_REG_SBCM_DIR_INGRESS,

	MLXSW_REG_SBCM_DIR_EGRESS,

};



/* reg_sbcm_dir

 * Direction.

 * Access: Index
@@ -3590,7 +3586,7 @@ MLXSW_ITEM32(reg, sbcm, max_buff, 0x1C, 0, 24); 
MLXSW_ITEM32(reg, sbcm, pool, 0x24, 0, 4);



static inline void mlxsw_reg_sbcm_pack(char *payload, u8 local_port, u8 pg_buff,

				       enum mlxsw_reg_sbcm_dir dir,

				       enum mlxsw_reg_sbxx_dir dir,

				       u32 min_buff, u32 max_buff, u8 pool)

{

	MLXSW_REG_ZERO(sbcm, payload);
@@ -3602,8 +3598,8 @@ static inline void mlxsw_reg_sbcm_pack(char *payload, u8 local_port, u8 pg_buff, 
	mlxsw_reg_sbcm_pool_set(payload, pool);

}



/* SBPM - Shared Buffer Class Management Register

 * ----------------------------------------------

/* SBPM - Shared Buffer Port Management Register

 * ---------------------------------------------

 * The SBPM register configures and retrieves the shared buffer allocation

 * and configuration according to Port-Pool, including the definition

 * of the associated quota.
@@ -3630,11 +3626,6 @@ MLXSW_ITEM32(reg, sbpm, local_port, 0x00, 16, 8); 
 */

MLXSW_ITEM32(reg, sbpm, pool, 0x00, 8, 4);



enum mlxsw_reg_sbpm_dir {

	MLXSW_REG_SBPM_DIR_INGRESS,

	MLXSW_REG_SBPM_DIR_EGRESS,

};



/* reg_sbpm_dir

 * Direction.

 * Access: Index
@@ -3661,7 +3652,7 @@ MLXSW_ITEM32(reg, sbpm, min_buff, 0x18, 0, 24); 
MLXSW_ITEM32(reg, sbpm, max_buff, 0x1C, 0, 24);



static inline void mlxsw_reg_sbpm_pack(char *payload, u8 local_port, u8 pool,

				       enum mlxsw_reg_sbpm_dir dir,

				       enum mlxsw_reg_sbxx_dir dir,

				       u32 min_buff, u32 max_buff)

{

	MLXSW_REG_ZERO(sbpm, payload);

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

+22 −30
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include <linux/bitops.h>

#include <linux/list.h>

#include <linux/dcbnl.h>

#include <net/devlink.h>

#include <net/switchdev.h>

#include <generated/utsrelease.h>
@@ -391,7 +390,7 @@ static netdev_tx_t mlxsw_sp_port_xmit(struct sk_buff *skb, 
	u64 len;

	int err;



	if (mlxsw_core_skb_transmit_busy(mlxsw_sp, &tx_info))

	if (mlxsw_core_skb_transmit_busy(mlxsw_sp->core, &tx_info))

		return NETDEV_TX_BUSY;



	if (unlikely(skb_headroom(skb) < MLXSW_TXHDR_LEN)) {
@@ -415,7 +414,7 @@ static netdev_tx_t mlxsw_sp_port_xmit(struct sk_buff *skb, 
	/* Due to a race we might fail here because of a full queue. In that

	 * unlikely case we simply drop the packet.

	 */

	err = mlxsw_core_skb_transmit(mlxsw_sp, skb, &tx_info);

	err = mlxsw_core_skb_transmit(mlxsw_sp->core, skb, &tx_info);



	if (!err) {

		pcpu_stats = this_cpu_ptr(mlxsw_sp_port->pcpu_stats);
@@ -1685,9 +1684,7 @@ static int mlxsw_sp_port_ets_init(struct mlxsw_sp_port *mlxsw_sp_port) 
static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,

				  bool split, u8 module, u8 width)

{

	struct devlink *devlink = priv_to_devlink(mlxsw_sp->core);

	struct mlxsw_sp_port *mlxsw_sp_port;

	struct devlink_port *devlink_port;

	struct net_device *dev;

	size_t bytes;

	int err;
@@ -1740,16 +1737,6 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	 */

	dev->hard_header_len += MLXSW_TXHDR_LEN;



	devlink_port = &mlxsw_sp_port->devlink_port;

	if (mlxsw_sp_port->split)

		devlink_port_split_set(devlink_port, module);

	err = devlink_port_register(devlink, devlink_port, local_port);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to register devlink port\n",

			mlxsw_sp_port->local_port);

		goto err_devlink_port_register;

	}



	err = mlxsw_sp_port_system_port_mapping_set(mlxsw_sp_port);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to set system port mapping\n",
@@ -1812,7 +1799,14 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
		goto err_register_netdev;

	}



	devlink_port_type_eth_set(devlink_port, dev);

	err = mlxsw_core_port_init(mlxsw_sp->core, &mlxsw_sp_port->core_port,

				   mlxsw_sp_port->local_port, dev,

				   mlxsw_sp_port->split, module);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to init core port\n",

			mlxsw_sp_port->local_port);

		goto err_core_port_init;

	}



	err = mlxsw_sp_port_vlan_init(mlxsw_sp_port);

	if (err)
@@ -1822,6 +1816,8 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	return 0;



err_port_vlan_init:

	mlxsw_core_port_fini(&mlxsw_sp_port->core_port);

err_core_port_init:

	unregister_netdev(dev);

err_register_netdev:

err_port_dcb_init:
@@ -1832,8 +1828,6 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
err_port_speed_by_width_set:

err_port_swid_set:

err_port_system_port_mapping_set:

	devlink_port_unregister(&mlxsw_sp_port->devlink_port);

err_devlink_port_register:

err_dev_addr_init:

	free_percpu(mlxsw_sp_port->pcpu_stats);

err_alloc_stats:
@@ -1887,16 +1881,13 @@ static void mlxsw_sp_port_vports_fini(struct mlxsw_sp_port *mlxsw_sp_port) 
static void mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port)

{

	struct mlxsw_sp_port *mlxsw_sp_port = mlxsw_sp->ports[local_port];

	struct devlink_port *devlink_port;



	if (!mlxsw_sp_port)

		return;

	mlxsw_sp->ports[local_port] = NULL;

	devlink_port = &mlxsw_sp_port->devlink_port;

	devlink_port_type_clear(devlink_port);

	mlxsw_core_port_fini(&mlxsw_sp_port->core_port);

	unregister_netdev(mlxsw_sp_port->dev); /* This calls ndo_stop */

	mlxsw_sp_port_dcb_fini(mlxsw_sp_port);

	devlink_port_unregister(devlink_port);

	mlxsw_sp_port_vports_fini(mlxsw_sp_port);

	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_swid_set(mlxsw_sp_port, MLXSW_PORT_SWID_DISABLED_PORT);
@@ -1957,9 +1948,10 @@ static u8 mlxsw_sp_cluster_base_port_get(u8 local_port) 
	return local_port - offset;

}



static int mlxsw_sp_port_split(void *priv, u8 local_port, unsigned int count)

static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,

			       unsigned int count)

{

	struct mlxsw_sp *mlxsw_sp = priv;

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	struct mlxsw_sp_port *mlxsw_sp_port;

	u8 width = MLXSW_PORT_MODULE_MAX_WIDTH / count;

	u8 module, cur_width, base_port;
@@ -2031,9 +2023,9 @@ static int mlxsw_sp_port_split(void *priv, u8 local_port, unsigned int count) 
	return err;

}



static int mlxsw_sp_port_unsplit(void *priv, u8 local_port)

static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u8 local_port)

{

	struct mlxsw_sp *mlxsw_sp = priv;

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	struct mlxsw_sp_port *mlxsw_sp_port;

	u8 module, cur_width, base_port;

	unsigned int count;
@@ -2378,10 +2370,10 @@ static int mlxsw_sp_lag_init(struct mlxsw_sp *mlxsw_sp) 
	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(slcr), slcr_pl);

}



static int mlxsw_sp_init(void *priv, struct mlxsw_core *mlxsw_core,

static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core,

			 const struct mlxsw_bus_info *mlxsw_bus_info)

{

	struct mlxsw_sp *mlxsw_sp = priv;

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	int err;



	mlxsw_sp->core = mlxsw_core;
@@ -2452,9 +2444,9 @@ static int mlxsw_sp_init(void *priv, struct mlxsw_core *mlxsw_core, 
	return err;

}



static void mlxsw_sp_fini(void *priv)

static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core)

{

	struct mlxsw_sp *mlxsw_sp = priv;

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);



	mlxsw_sp_switchdev_fini(mlxsw_sp);

	mlxsw_sp_traps_fini(mlxsw_sp);

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

+1 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#include <linux/list.h>

#include <linux/dcbnl.h>

#include <net/switchdev.h>

#include <net/devlink.h>



#include "port.h"

#include "core.h"
@@ -166,6 +165,7 @@ struct mlxsw_sp_port_pcpu_stats { 
};



struct mlxsw_sp_port {

	struct mlxsw_core_port core_port; /* must be first */

	struct net_device *dev;

	struct mlxsw_sp_port_pcpu_stats __percpu *pcpu_stats;

	struct mlxsw_sp *mlxsw_sp;
@@ -198,7 +198,6 @@ struct mlxsw_sp_port { 
	unsigned long *untagged_vlans;

	/* VLAN interfaces */

	struct list_head vports_list;

	struct devlink_port devlink_port;

};



static inline bool