Merge branch 'mlxsw-cosmetics' (3c66d1c7) · Commits · 戴 / test

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -1043,13 +1043,6 @@ MLXSW_ITEM32(cmd_mbox, sw2hw_cq, cv, 0x00, 28, 4);
		*/
		MLXSW_ITEM32(cmd_mbox, sw2hw_cq, c_eqn, 0x00, 24, 1);

		/* cmd_mbox_sw2hw_cq_oi
		* When set, overrun ignore is enabled. When set, updates of
		* CQ consumer counter (poll for completion) or Request completion
		* notifications (Arm CQ) DoorBells should not be rung on that CQ.
		*/
		MLXSW_ITEM32(cmd_mbox, sw2hw_cq, oi, 0x00, 12, 1);

		/* cmd_mbox_sw2hw_cq_st
		* Event delivery state machine
		* 0x0 - FIRED
		@@ -1132,11 +1125,6 @@ static inline int mlxsw_cmd_sw2hw_eq(struct mlxsw_core *mlxsw_core,
		*/
		MLXSW_ITEM32(cmd_mbox, sw2hw_eq, int_msix, 0x00, 24, 1);

		/* cmd_mbox_sw2hw_eq_oi
		* When set, overrun ignore is enabled.
		*/
		MLXSW_ITEM32(cmd_mbox, sw2hw_eq, oi, 0x00, 12, 1);

		/* cmd_mbox_sw2hw_eq_st
		* Event delivery state machine
		* 0x0 - FIRED

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -580,7 +580,6 @@ static int mlxsw_pci_cq_init(struct mlxsw_pci mlxsw_pci, char mbox,

		mlxsw_cmd_mbox_sw2hw_cq_cv_set(mbox, 0); /* CQE ver 0 */
		mlxsw_cmd_mbox_sw2hw_cq_c_eqn_set(mbox, MLXSW_PCI_EQ_COMP_NUM);
		mlxsw_cmd_mbox_sw2hw_cq_oi_set(mbox, 0);
		mlxsw_cmd_mbox_sw2hw_cq_st_set(mbox, 0);
		mlxsw_cmd_mbox_sw2hw_cq_log_cq_size_set(mbox, ilog2(q->count));
		for (i = 0; i < MLXSW_PCI_AQ_PAGES; i++) {
		@@ -755,7 +754,6 @@ static int mlxsw_pci_eq_init(struct mlxsw_pci mlxsw_pci, char mbox,
		}

		mlxsw_cmd_mbox_sw2hw_eq_int_msix_set(mbox, 1); /* MSI-X used */
		mlxsw_cmd_mbox_sw2hw_eq_oi_set(mbox, 0);
		mlxsw_cmd_mbox_sw2hw_eq_st_set(mbox, 1); /* armed */
		mlxsw_cmd_mbox_sw2hw_eq_log_eq_size_set(mbox, ilog2(q->count));
		for (i = 0; i < MLXSW_PCI_AQ_PAGES; i++) {

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

+12 −11

Original line number	Diff line number	Diff line
		@@ -3326,13 +3326,13 @@ bool mlxsw_sp_port_dev_check(const struct net_device *dev)
		return dev->netdev_ops == &mlxsw_sp_port_netdev_ops;
		}

		static int mlxsw_lower_dev_walk(struct net_device lower_dev, void data)
		static int mlxsw_sp_lower_dev_walk(struct net_device lower_dev, void data)
		{
		struct mlxsw_sp_port **port = data;
		struct mlxsw_sp_port **p_mlxsw_sp_port = data;
		int ret = 0;

		if (mlxsw_sp_port_dev_check(lower_dev)) {
		*port = netdev_priv(lower_dev);
		*p_mlxsw_sp_port = netdev_priv(lower_dev);
		ret = 1;
		}

		@@ -3341,15 +3341,15 @@ static int mlxsw_lower_dev_walk(struct net_device lower_dev, void data)

		static struct mlxsw_sp_port mlxsw_sp_port_dev_lower_find(struct net_device dev)
		{
		struct mlxsw_sp_port *port;
		struct mlxsw_sp_port *mlxsw_sp_port;

		if (mlxsw_sp_port_dev_check(dev))
		return netdev_priv(dev);

		port = NULL;
		netdev_walk_all_lower_dev(dev, mlxsw_lower_dev_walk, &port);
		mlxsw_sp_port = NULL;
		netdev_walk_all_lower_dev(dev, mlxsw_sp_lower_dev_walk, &mlxsw_sp_port);

		return port;
		return mlxsw_sp_port;
		}

		static struct mlxsw_sp mlxsw_sp_lower_get(struct net_device dev)
		@@ -3362,15 +3362,16 @@ static struct mlxsw_sp mlxsw_sp_lower_get(struct net_device dev)

		static struct mlxsw_sp_port mlxsw_sp_port_dev_lower_find_rcu(struct net_device dev)
		{
		struct mlxsw_sp_port *port;
		struct mlxsw_sp_port *mlxsw_sp_port;

		if (mlxsw_sp_port_dev_check(dev))
		return netdev_priv(dev);

		port = NULL;
		netdev_walk_all_lower_dev_rcu(dev, mlxsw_lower_dev_walk, &port);
		mlxsw_sp_port = NULL;
		netdev_walk_all_lower_dev_rcu(dev, mlxsw_sp_lower_dev_walk,
		&mlxsw_sp_port);

		return port;
		return mlxsw_sp_port;
		}

		struct mlxsw_sp_port mlxsw_sp_port_lower_dev_hold(struct net_device dev)

Admin message