Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9cccde93fed1ca988eb2fb17ab9194bf7b5ed1b0

Authored by Rajashekhara, Mahesh
Committed by James Bottomley
1 parent da3cc679b2
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[SCSI] aacraid: add an ifdef'd device delete case instead of taking the device offline 

Problem description:
--------------------

The problem reported by one of the customer was when a logical array
is deleted(from the SDK, from the GUI, from arcconf) then the
corresponding physical device (/dev/sdb, for example) is not removed
from the Linux namespace. So you end up with a "dead" device
entry. And some of the linux tools go slightly wonky.

Solution:
---------

Based on the notification from FW, the driver calls
"scsi_remove_device" for the DELETED drive. This call not only informs
the scsi device status to the SCSI mid layer and also it will remove
corresponding scsi device entries from the Linux sysfs.

Signed-off-by: Mahesh Rajashekhara <aacraid@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

Showing 2 changed files with 11 additions and 1 deletions Side-by-side Diff

drivers/scsi/aacraid/aacraid.h
Diff comments   View file @ 9cccde9
... ... @@ -12,7 +12,7 @@
12 12 *----------------------------------------------------------------------------*/
13 13  
14 14 #ifndef AAC_DRIVER_BUILD
15   -# define AAC_DRIVER_BUILD 26000
  15 +# define AAC_DRIVER_BUILD 26400
16 16 # define AAC_DRIVER_BRANCH "-ms"
17 17 #endif
18 18 #define MAXIMUM_NUM_CONTAINERS 32
... ... @@ -25,6 +25,8 @@
25 25  
26 26 #define AAC_MAX_HOSTPHYSMEMPAGES (0xfffff)
27 27 #define AAC_MAX_32BIT_SGBCOUNT ((unsigned short)256)
  28 +
  29 +#define AAC_DEBUG_INSTRUMENT_AIF_DELETE
28 30  
29 31 /*
30 32 * These macros convert from physical channels to virtual channels
drivers/scsi/aacraid/commsup.c
Diff comments   View file @ 9cccde9
... ... @@ -1133,6 +1133,9 @@
1133 1133 if (device) {
1134 1134 switch (device_config_needed) {
1135 1135 case DELETE:
  1136 +#if (defined(AAC_DEBUG_INSTRUMENT_AIF_DELETE))
  1137 + scsi_remove_device(device);
  1138 +#else
1136 1139 if (scsi_device_online(device)) {
1137 1140 scsi_device_set_state(device, SDEV_OFFLINE);
1138 1141 sdev_printk(KERN_INFO, device,
... ... @@ -1141,6 +1144,7 @@
1141 1144 "array deleted" :
1142 1145 "enclosure services event");
1143 1146 }
  1147 +#endif
1144 1148 break;
1145 1149 case ADD:
1146 1150 if (!scsi_device_online(device)) {
1147 1151  
... ... @@ -1155,12 +1159,16 @@
1155 1159 case CHANGE:
1156 1160 if ((channel == CONTAINER_CHANNEL)
1157 1161 && (!dev->fsa_dev[container].valid)) {
  1162 +#if (defined(AAC_DEBUG_INSTRUMENT_AIF_DELETE))
  1163 + scsi_remove_device(device);
  1164 +#else
1158 1165 if (!scsi_device_online(device))
1159 1166 break;
1160 1167 scsi_device_set_state(device, SDEV_OFFLINE);
1161 1168 sdev_printk(KERN_INFO, device,
1162 1169 "Device offlined - %s\n",
1163 1170 "array failed");
  1171 +#endif
1164 1172 break;
1165 1173 }
1166 1174 scsi_rescan_device(&device->sdev_gendev);