niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

scsi: smartpqi: Update deleting a LUN via sysfs

Browse source 
Change removing a LUN using sysfs from an internal driver function
pqi_remove_all_scsi_devices() to using the .slave_destroy entry in the
scsi_host_template.

A LUN can be deleted via sysfs using this syntax:

echo 1 > /sys/block/sdX/device/delete

Link: https://lore.kernel.org/r/165730607154.177165.9723066932202995774.stgit@brunhilda
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Kevin Barnett 2022-07-08 13:47:51 -05:00 • committed by Martin K. Petersen
parent cf15c3e734
commit 2d80f4054f
1 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
drivers/scsi/smartpqi/smartpqi_init.c
View file

@ -2536,23 +2536,6 @@ out:
return rc; return rc;
} }
static void pqi_remove_all_scsi_devices(struct pqi_ctrl_info *ctrl_info)
{
unsigned long flags;
struct pqi_scsi_dev *device;
struct pqi_scsi_dev *next;
list_for_each_entry_safe(device, next, &ctrl_info->scsi_device_list,
scsi_device_list_entry) {
if (pqi_is_device_added(device))
pqi_remove_device(ctrl_info, device);
spin_lock_irqsave(&ctrl_info->scsi_device_list_lock, flags);
list_del(&device->scsi_device_list_entry);
pqi_free_device(device);
spin_unlock_irqrestore(&ctrl_info->scsi_device_list_lock, flags);
}
}
static int pqi_scan_scsi_devices(struct pqi_ctrl_info *ctrl_info) static int pqi_scan_scsi_devices(struct pqi_ctrl_info *ctrl_info)
{ {
int rc; int rc;
@ -6476,6 +6459,35 @@ static int pqi_slave_configure(struct scsi_device *sdev)
return rc; return rc;
} }
static void pqi_slave_destroy(struct scsi_device *sdev)
{
struct pqi_ctrl_info *ctrl_info;
struct pqi_scsi_dev *device;
int mutex_acquired;
unsigned long flags;
ctrl_info = shost_to_hba(sdev->host);
mutex_acquired = mutex_trylock(&ctrl_info->scan_mutex);
if (!mutex_acquired)
return;
device = sdev->hostdata;
if (!device) {
mutex_unlock(&ctrl_info->scan_mutex);
return;
}
spin_lock_irqsave(&ctrl_info->scsi_device_list_lock, flags);
list_del(&device->scsi_device_list_entry);
spin_unlock_irqrestore(&ctrl_info->scsi_device_list_lock, flags);
mutex_unlock(&ctrl_info->scan_mutex);
pqi_dev_info(ctrl_info, "removed", device);
pqi_free_device(device);
}
static int pqi_getpciinfo_ioctl(struct pqi_ctrl_info *ctrl_info, void __user *arg) static int pqi_getpciinfo_ioctl(struct pqi_ctrl_info *ctrl_info, void __user *arg)
{ {
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
@ -7363,6 +7375,7 @@ static struct scsi_host_template pqi_driver_template = {
.ioctl = pqi_ioctl, .ioctl = pqi_ioctl,
.slave_alloc = pqi_slave_alloc, .slave_alloc = pqi_slave_alloc,
.slave_configure = pqi_slave_configure, .slave_configure = pqi_slave_configure,
.slave_destroy = pqi_slave_destroy,
.map_queues = pqi_map_queues, .map_queues = pqi_map_queues,
.sdev_groups = pqi_sdev_groups, .sdev_groups = pqi_sdev_groups,
.shost_groups = pqi_shost_groups, .shost_groups = pqi_shost_groups,
@ -8649,7 +8662,6 @@ static void pqi_remove_ctrl(struct pqi_ctrl_info *ctrl_info)
pqi_fail_all_outstanding_requests(ctrl_info); pqi_fail_all_outstanding_requests(ctrl_info);
ctrl_info->pqi_mode_enabled = false; ctrl_info->pqi_mode_enabled = false;
} }
pqi_remove_all_scsi_devices(ctrl_info);
pqi_unregister_scsi(ctrl_info); pqi_unregister_scsi(ctrl_info);
if (ctrl_info->pqi_mode_enabled) if (ctrl_info->pqi_mode_enabled)
pqi_revert_to_sis_mode(ctrl_info); pqi_revert_to_sis_mode(ctrl_info);