Commit 8e653455 authored by Kashyap Desai's avatar Kashyap Desai Committed by Martin K. Petersen
Browse files

scsi: mpi3mr: Add support for PCIe device event handling 

Implement support for the following PCIe-related MPI events:

 - MPI3_EVENT_PCIE_TOPOLOGY_CHANGE_LIST
 - MPI3_EVENT_PCIE_ENUMERATION

Link: https://lore.kernel.org/r/20210520152545.2710479-8-kashyap.desai@broadcom.com


Cc: sathya.prakash@broadcom.com
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 13ef29ea

drivers/scsi/mpi3mr/mpi3mr_fw.c

+2 −0
Original line number Diff line number Diff line
@@ -2728,6 +2728,8 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) 
	mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_TOPOLOGY_CHANGE_LIST);

	mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_DISCOVERY);

	mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_DEVICE_DISCOVERY_ERROR);

	mpi3mr_unmask_events(mrioc, MPI3_EVENT_PCIE_TOPOLOGY_CHANGE_LIST);

	mpi3mr_unmask_events(mrioc, MPI3_EVENT_PCIE_ENUMERATION);



	retval = mpi3mr_issue_event_notification(mrioc);

	if (retval) {

drivers/scsi/mpi3mr/mpi3mr_os.c

+201 −0
Original line number Diff line number Diff line
@@ -562,6 +562,40 @@ static int mpi3mr_report_tgtdev_to_host(struct mpi3mr_ioc *mrioc, 
	return retval;

}



/**

 * mpi3mr_update_sdev - Update SCSI device information

 * @sdev: SCSI device reference

 * @data: target device reference

 *

 * This is an iterator function called for each SCSI device in a

 * target to update the target specific information into each

 * SCSI device.

 *

 * Return: Nothing.

 */

static void

mpi3mr_update_sdev(struct scsi_device *sdev, void *data)

{

	struct mpi3mr_tgt_dev *tgtdev;



	tgtdev = (struct mpi3mr_tgt_dev *)data;

	if (!tgtdev)

		return;



	switch (tgtdev->dev_type) {

	case MPI3_DEVICE_DEVFORM_PCIE:

		/*The block layer hw sector size = 512*/

		blk_queue_max_hw_sectors(sdev->request_queue,

		    tgtdev->dev_spec.pcie_inf.mdts / 512);

		blk_queue_virt_boundary(sdev->request_queue,

		    ((1 << tgtdev->dev_spec.pcie_inf.pgsz) - 1));



		break;

	default:

		break;

	}

}



/**

 * mpi3mr_rfresh_tgtdevs - Refresh target device exposure

 * @mrioc: Adapter instance reference
@@ -650,6 +684,33 @@ static void mpi3mr_update_tgtdev(struct mpi3mr_ioc *mrioc, 
			tgtdev->is_hidden = 1;

		break;

	}

	case MPI3_DEVICE_DEVFORM_PCIE:

	{

		struct mpi3_device0_pcie_format *pcieinf =

		    &dev_pg0->device_specific.pcie_format;

		u16 dev_info = le16_to_cpu(pcieinf->device_info);



		tgtdev->dev_spec.pcie_inf.capb =

		    le32_to_cpu(pcieinf->capabilities);

		tgtdev->dev_spec.pcie_inf.mdts = MPI3MR_DEFAULT_MDTS;

		/* 2^12 = 4096 */

		tgtdev->dev_spec.pcie_inf.pgsz = 12;

		if (dev_pg0->access_status == MPI3_DEVICE0_ASTATUS_NO_ERRORS) {

			tgtdev->dev_spec.pcie_inf.mdts =

			    le32_to_cpu(pcieinf->maximum_data_transfer_size);

			tgtdev->dev_spec.pcie_inf.pgsz = pcieinf->page_size;

			tgtdev->dev_spec.pcie_inf.reset_to =

			    pcieinf->controller_reset_to;

			tgtdev->dev_spec.pcie_inf.abort_to =

			    pcieinf->nv_me_abort_to;

		}

		if (tgtdev->dev_spec.pcie_inf.mdts > (1024 * 1024))

			tgtdev->dev_spec.pcie_inf.mdts = (1024 * 1024);

		if ((dev_info & MPI3_DEVICE0_PCIE_DEVICE_INFO_TYPE_MASK) !=

		    MPI3_DEVICE0_PCIE_DEVICE_INFO_TYPE_NVME_DEVICE)

			tgtdev->is_hidden = 1;

		break;

	}

	case MPI3_DEVICE_DEVFORM_VD:

	{

		struct mpi3_device0_vd_format *vdinf =
@@ -759,6 +820,9 @@ static void mpi3mr_devinfochg_evt_bh(struct mpi3mr_ioc *mrioc, 
		mpi3mr_report_tgtdev_to_host(mrioc, perst_id);

	if (tgtdev->is_hidden && tgtdev->host_exposed)

		mpi3mr_remove_tgtdev_from_host(mrioc, tgtdev);

	if (!tgtdev->is_hidden && tgtdev->host_exposed && tgtdev->starget)

		starget_for_each_device(tgtdev->starget, (void *)tgtdev,

		    mpi3mr_update_sdev);

out:

	if (tgtdev)

		mpi3mr_tgtdev_put(tgtdev);
@@ -811,6 +875,53 @@ static void mpi3mr_sastopochg_evt_bh(struct mpi3mr_ioc *mrioc, 
	}

}



/**

 * mpi3mr_pcietopochg_evt_bh - PCIeTopologyChange evt bottomhalf

 * @mrioc: Adapter instance reference

 * @fwevt: Firmware event reference

 *

 * Prints information about the PCIe topology change event and

 * for "not responding" event code, removes the device from the

 * upper layers.

 *

 * Return: Nothing.

 */

static void mpi3mr_pcietopochg_evt_bh(struct mpi3mr_ioc *mrioc,

	struct mpi3mr_fwevt *fwevt)

{

	struct mpi3_event_data_pcie_topology_change_list *event_data =

	    (struct mpi3_event_data_pcie_topology_change_list *)fwevt->event_data;

	int i;

	u16 handle;

	u8 reason_code;

	struct mpi3mr_tgt_dev *tgtdev = NULL;



	for (i = 0; i < event_data->num_entries; i++) {

		handle =

		    le16_to_cpu(event_data->port_entry[i].attached_dev_handle);

		if (!handle)

			continue;

		tgtdev = mpi3mr_get_tgtdev_by_handle(mrioc, handle);

		if (!tgtdev)

			continue;



		reason_code = event_data->port_entry[i].port_status;



		switch (reason_code) {

		case MPI3_EVENT_PCIE_TOPO_PS_NOT_RESPONDING:

			if (tgtdev->host_exposed)

				mpi3mr_remove_tgtdev_from_host(mrioc, tgtdev);

			mpi3mr_tgtdev_del_from_list(mrioc, tgtdev);

			mpi3mr_tgtdev_put(tgtdev);

			break;

		default:

			break;

		}

		if (tgtdev)

			mpi3mr_tgtdev_put(tgtdev);

	}

}



/**

 * mpi3mr_fwevt_bh - Firmware event bottomhalf handler

 * @mrioc: Adapter instance reference
@@ -858,6 +969,11 @@ static void mpi3mr_fwevt_bh(struct mpi3mr_ioc *mrioc, 
		mpi3mr_sastopochg_evt_bh(mrioc, fwevt);

		break;

	}

	case MPI3_EVENT_PCIE_TOPOLOGY_CHANGE_LIST:

	{

		mpi3mr_pcietopochg_evt_bh(mrioc, fwevt);

		break;

	}

	default:

		break;

	}
@@ -1161,6 +1277,72 @@ static void mpi3mr_dev_rmhs_send_tm(struct mpi3mr_ioc *mrioc, u16 handle, 
	clear_bit(cmd_idx, mrioc->devrem_bitmap);

}



/**

 * mpi3mr_pcietopochg_evt_th - PCIETopologyChange evt tophalf

 * @mrioc: Adapter instance reference

 * @event_reply: event data

 *

 * Checks for the reason code and based on that either block I/O

 * to device, or unblock I/O to the device, or start the device

 * removal handshake with reason as remove with the firmware for

 * PCIe devices.

 *

 * Return: Nothing

 */

static void mpi3mr_pcietopochg_evt_th(struct mpi3mr_ioc *mrioc,

	struct mpi3_event_notification_reply *event_reply)

{

	struct mpi3_event_data_pcie_topology_change_list *topo_evt =

	    (struct mpi3_event_data_pcie_topology_change_list *)event_reply->event_data;

	int i;

	u16 handle;

	u8 reason_code;

	struct mpi3mr_tgt_dev *tgtdev = NULL;

	struct mpi3mr_stgt_priv_data *scsi_tgt_priv_data = NULL;



	for (i = 0; i < topo_evt->num_entries; i++) {

		handle = le16_to_cpu(topo_evt->port_entry[i].attached_dev_handle);

		if (!handle)

			continue;

		reason_code = topo_evt->port_entry[i].port_status;

		scsi_tgt_priv_data =  NULL;

		tgtdev = mpi3mr_get_tgtdev_by_handle(mrioc, handle);

		if (tgtdev && tgtdev->starget && tgtdev->starget->hostdata)

			scsi_tgt_priv_data = (struct mpi3mr_stgt_priv_data *)

			    tgtdev->starget->hostdata;

		switch (reason_code) {

		case MPI3_EVENT_PCIE_TOPO_PS_NOT_RESPONDING:

			if (scsi_tgt_priv_data) {

				scsi_tgt_priv_data->dev_removed = 1;

				scsi_tgt_priv_data->dev_removedelay = 0;

				atomic_set(&scsi_tgt_priv_data->block_io, 0);

			}

			mpi3mr_dev_rmhs_send_tm(mrioc, handle, NULL,

			    MPI3_CTRL_OP_REMOVE_DEVICE);

			break;

		case MPI3_EVENT_PCIE_TOPO_PS_DELAY_NOT_RESPONDING:

			if (scsi_tgt_priv_data) {

				scsi_tgt_priv_data->dev_removedelay = 1;

				atomic_inc(&scsi_tgt_priv_data->block_io);

			}

			break;

		case MPI3_EVENT_PCIE_TOPO_PS_RESPONDING:

			if (scsi_tgt_priv_data &&

			    scsi_tgt_priv_data->dev_removedelay) {

				scsi_tgt_priv_data->dev_removedelay = 0;

				atomic_dec_if_positive

				    (&scsi_tgt_priv_data->block_io);

			}

			break;

		case MPI3_EVENT_PCIE_TOPO_PS_PORT_CHANGED:

		default:

			break;

		}

		if (tgtdev)

			mpi3mr_tgtdev_put(tgtdev);

	}

}



/**

 * mpi3mr_sastopochg_evt_th - SASTopologyChange evt tophalf

 * @mrioc: Adapter instance reference
@@ -1354,6 +1536,12 @@ void mpi3mr_os_handle_events(struct mpi3mr_ioc *mrioc, 
		mpi3mr_sastopochg_evt_th(mrioc, event_reply);

		break;

	}

	case MPI3_EVENT_PCIE_TOPOLOGY_CHANGE_LIST:

	{

		process_evt_bh = 1;

		mpi3mr_pcietopochg_evt_th(mrioc, event_reply);

		break;

	}

	case MPI3_EVENT_DEVICE_INFO_CHANGED:

	{

		process_evt_bh = 1;
@@ -1362,6 +1550,7 @@ void mpi3mr_os_handle_events(struct mpi3mr_ioc *mrioc, 
	case MPI3_EVENT_ENCL_DEVICE_STATUS_CHANGE:

	case MPI3_EVENT_SAS_DISCOVERY:

	case MPI3_EVENT_SAS_DEVICE_DISCOVERY_ERROR:

	case MPI3_EVENT_PCIE_ENUMERATION:

		break;

	default:

		ioc_info(mrioc, "%s :event 0x%02x is not handled\n",
@@ -1934,6 +2123,18 @@ static int mpi3mr_slave_configure(struct scsi_device *sdev) 
	if (!tgt_dev)

		return -ENXIO;



	switch (tgt_dev->dev_type) {

	case MPI3_DEVICE_DEVFORM_PCIE:

		/*The block layer hw sector size = 512*/

		blk_queue_max_hw_sectors(sdev->request_queue,

		    tgt_dev->dev_spec.pcie_inf.mdts / 512);

		blk_queue_virt_boundary(sdev->request_queue,

		    ((1 << tgt_dev->dev_spec.pcie_inf.pgsz) - 1));

		break;

	default:

		break;

	}



	mpi3mr_tgtdev_put(tgt_dev);



	return retval;