Commit 7ba189ac authored by Petr Pavlu's avatar Petr Pavlu Committed by David S. Miller
Browse files

mlx4: Use 'void *' as the event param of mlx4_dispatch_event() 



Function mlx4_dispatch_event() takes an 'unsigned long' as its event
parameter. The actual value is none (MLX4_DEV_EVENT_CATASTROPHIC_ERROR),
a pointer to mlx4_eqe (MLX4_DEV_EVENT_PORT_MGMT_CHANGE), or a 32-bit
integer (remaining events).

In preparation to switch mlx4_en and mlx4_ib to be an auxiliary device,
the mlx4_interface.event callback is replaced with a notifier and
function mlx4_dispatch_event() gets updated to invoke
atomic_notifier_call_chain(). This requires forwarding the input 'param'
value from the former function to the latter. A problem is that the
notifier call takes 'void *' as its 'param' value, compared to
'unsigned long' used by mlx4_dispatch_event(). Re-passing the value
would need either punning it to 'void *' or passing down the address of
the input 'param'. Both approaches create a number of unnecessary casts.

Change instead the input 'param' of mlx4_dispatch_event() from
'unsigned long' to 'void *'. A mlx4_eqe pointer can be passed directly,
callers using an int value are adjusted to pass its address.

Signed-off-by: default avatarPetr Pavlu <petr.pavlu@suse.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef5617e3

drivers/infiniband/hw/mlx4/main.c

+10 −4
Original line number Diff line number Diff line
@@ -3174,7 +3174,7 @@ void mlx4_sched_ib_sl2vl_update_work(struct mlx4_ib_dev *ibdev, 
}



static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr,

			  enum mlx4_dev_event event, unsigned long param)

			  enum mlx4_dev_event event, void *param)

{

	struct ib_event ibev;

	struct mlx4_ib_dev *ibdev = to_mdev((struct ib_device *) ibdev_ptr);
@@ -3194,10 +3194,16 @@ static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr, 
		return;

	}



	if (event == MLX4_DEV_EVENT_PORT_MGMT_CHANGE)

	switch (event) {

	case MLX4_DEV_EVENT_CATASTROPHIC_ERROR:

		break;

	case MLX4_DEV_EVENT_PORT_MGMT_CHANGE:

		eqe = (struct mlx4_eqe *)param;

	else

		p = (int) param;

		break;

	default:

		p = *(int *)param;

		break;

	}



	switch (event) {

	case MLX4_DEV_EVENT_PORT_UP:

drivers/net/ethernet/mellanox/mlx4/catas.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ void mlx4_enter_error_state(struct mlx4_dev_persistent *persist) 
	mutex_unlock(&persist->device_state_mutex);



	/* At that step HW was already reset, now notify clients */

	mlx4_dispatch_event(dev, MLX4_DEV_EVENT_CATASTROPHIC_ERROR, 0);

	mlx4_dispatch_event(dev, MLX4_DEV_EVENT_CATASTROPHIC_ERROR, NULL);

	mlx4_cmd_wake_completions(dev);

	return;

drivers/net/ethernet/mellanox/mlx4/cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -2113,7 +2113,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd, 
		if (MLX4_COMM_CMD_FLR == slave_state[slave].last_cmd)

			goto inform_slave_state;



		mlx4_dispatch_event(dev, MLX4_DEV_EVENT_SLAVE_SHUTDOWN, slave);

		mlx4_dispatch_event(dev, MLX4_DEV_EVENT_SLAVE_SHUTDOWN, &slave);



		/* write the version in the event field */

		reply |= mlx4_comm_get_version();
@@ -2152,7 +2152,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd, 
		if (mlx4_master_activate_admin_state(priv, slave))

				goto reset_slave;

		slave_state[slave].active = true;

		mlx4_dispatch_event(dev, MLX4_DEV_EVENT_SLAVE_INIT, slave);

		mlx4_dispatch_event(dev, MLX4_DEV_EVENT_SLAVE_INIT, &slave);

		break;

	case MLX4_COMM_CMD_VHCR_POST:

		if ((slave_state[slave].last_cmd != MLX4_COMM_CMD_VHCR_EN) &&

drivers/net/ethernet/mellanox/mlx4/en_main.c

+15 −2
Original line number Diff line number Diff line
@@ -184,10 +184,22 @@ static void mlx4_en_get_profile(struct mlx4_en_dev *mdev) 
}



static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr,

			  enum mlx4_dev_event event, unsigned long port)

			  enum mlx4_dev_event event, void *param)

{

	struct mlx4_en_dev *mdev = (struct mlx4_en_dev *) endev_ptr;

	struct mlx4_en_priv *priv;

	int port;



	switch (event) {

	case MLX4_DEV_EVENT_CATASTROPHIC_ERROR:

	case MLX4_DEV_EVENT_PORT_MGMT_CHANGE:

	case MLX4_DEV_EVENT_SLAVE_INIT:

	case MLX4_DEV_EVENT_SLAVE_SHUTDOWN:

		break;

	default:

		port = *(int *)param;

		break;

	}



	switch (event) {

	case MLX4_DEV_EVENT_PORT_UP:
@@ -205,6 +217,7 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr, 
		mlx4_err(mdev, "Internal error detected, restarting device\n");

		break;



	case MLX4_DEV_EVENT_PORT_MGMT_CHANGE:

	case MLX4_DEV_EVENT_SLAVE_INIT:

	case MLX4_DEV_EVENT_SLAVE_SHUTDOWN:

		break;
@@ -213,7 +226,7 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr, 
		    !mdev->pndev[port])

			return;

		mlx4_warn(mdev, "Unhandled event %d for port %d\n", event,

			  (int) port);

			  port);

	}

}

drivers/net/ethernet/mellanox/mlx4/eq.c

+8 −7
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) 
	int port;

	int slave = 0;

	int ret;

	u32 flr_slave;

	int flr_slave;

	u8 update_slave_state;

	int i;

	enum slave_port_gen_event gen_event;
@@ -606,8 +606,8 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) 
			port = be32_to_cpu(eqe->event.port_change.port) >> 28;

			slaves_port = mlx4_phys_to_slaves_pport(dev, port);

			if (eqe->subtype == MLX4_PORT_CHANGE_SUBTYPE_DOWN) {

				mlx4_dispatch_event(dev, MLX4_DEV_EVENT_PORT_DOWN,

						    port);

				mlx4_dispatch_event(

					dev, MLX4_DEV_EVENT_PORT_DOWN, &port);

				mlx4_priv(dev)->sense.do_sense_port[port] = 1;

				if (!mlx4_is_master(dev))

					break;
@@ -647,7 +647,8 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) 
					}

				}

			} else {

				mlx4_dispatch_event(dev, MLX4_DEV_EVENT_PORT_UP, port);

				mlx4_dispatch_event(dev, MLX4_DEV_EVENT_PORT_UP,

						    &port);



				mlx4_priv(dev)->sense.do_sense_port[port] = 0;
@@ -758,7 +759,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) 
			}

			spin_unlock_irqrestore(&priv->mfunc.master.slave_state_lock, flags);

			mlx4_dispatch_event(dev, MLX4_DEV_EVENT_SLAVE_SHUTDOWN,

					    flr_slave);

					    &flr_slave);

			queue_work(priv->mfunc.master.comm_wq,

				   &priv->mfunc.master.slave_flr_event_work);

			break;
@@ -787,8 +788,8 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) 
			break;



		case MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT:

			mlx4_dispatch_event(dev, MLX4_DEV_EVENT_PORT_MGMT_CHANGE,

					    (unsigned long) eqe);

			mlx4_dispatch_event(

				dev, MLX4_DEV_EVENT_PORT_MGMT_CHANGE, eqe);

			break;



		case MLX4_EVENT_TYPE_RECOVERABLE_ERROR_EVENT: