? pscsi.diff Index: arch/ia64/configs/zx1_defconfig =================================================================== RCS file: /var/cvs/linux-2.6/arch/ia64/configs/zx1_defconfig,v retrieving revision 1.14 diff -u -p -r1.14 zx1_defconfig --- arch/ia64/configs/zx1_defconfig 20 Mar 2006 14:23:20 -0000 1.14 +++ arch/ia64/configs/zx1_defconfig 10 May 2006 18:10:48 -0000 @@ -379,7 +379,7 @@ CONFIG_BLK_DEV_GENERIC=y # CONFIG_BLK_DEV_OPTI621 is not set CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set -# CONFIG_IDEDMA_PCI_AUTO is not set +CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set # CONFIG_BLK_DEV_AMD74XX is not set Index: drivers/scsi/scsi_scan.c =================================================================== RCS file: /var/cvs/linux-2.6/drivers/scsi/scsi_scan.c,v retrieving revision 1.38 diff -u -p -r1.38 scsi_scan.c --- drivers/scsi/scsi_scan.c 19 Apr 2006 04:55:59 -0000 1.38 +++ drivers/scsi/scsi_scan.c 10 May 2006 18:10:50 -0000 @@ -30,7 +30,9 @@ #include #include #include -#include +#include +#include +#include #include #include @@ -109,6 +111,10 @@ MODULE_PARM_DESC(inq_timeout, "Timeout (in seconds) waiting for devices to answer INQUIRY." " Default is 5. Some non-compliant devices need more."); +/* Scanning flags */ +#define scan_rescan(sflags) (sflags & 1) +#define scan_async(sflags) (sflags & 2) + /** * scsi_unlock_floptical - unlock device via a special MODE SENSE command * @sdev: scsi device to send command to @@ -629,7 +635,8 @@ static int scsi_probe_lun(struct scsi_de * SCSI_SCAN_NO_RESPONSE: could not allocate or setup a scsi_device * SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized **/ -static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags) +static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, + int *bflags, int sflags) { /* * XXX do not save the inquiry, since it can change underneath us, @@ -802,7 +809,7 @@ static int scsi_add_lun(struct scsi_devi * register it and tell the rest of the kernel * about it. */ - if (scsi_sysfs_add_sdev(sdev) != 0) + if (!scan_async(sflags) && scsi_sysfs_add_sdev(sdev) != 0) return SCSI_SCAN_NO_RESPONSE; return SCSI_SCAN_LUN_PRESENT; @@ -837,7 +844,7 @@ static inline void scsi_destroy_sdev(str **/ static int scsi_probe_and_add_lun(struct scsi_target *starget, uint lun, int *bflagsp, - struct scsi_device **sdevp, int rescan, + struct scsi_device **sdevp, int sflags, void *hostdata) { struct scsi_device *sdev; @@ -851,7 +858,7 @@ static int scsi_probe_and_add_lun(struct */ sdev = scsi_device_lookup_by_target(starget, lun); if (sdev) { - if (rescan || sdev->sdev_state != SDEV_CREATED) { + if (scan_rescan(sflags) || sdev->sdev_state != SDEV_CREATED) { SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: device exists on %s\n", sdev->sdev_gendev.bus_id)); @@ -914,7 +921,7 @@ static int scsi_probe_and_add_lun(struct goto out_free_result; } - res = scsi_add_lun(sdev, result, &bflags); + res = scsi_add_lun(sdev, result, &bflags, sflags); if (res == SCSI_SCAN_LUN_PRESENT) { if (bflags & BLIST_KEY) { sdev->lockable = 0; @@ -957,7 +964,7 @@ static int scsi_probe_and_add_lun(struct **/ static void scsi_sequential_lun_scan(struct scsi_target *starget, int bflags, int lun0_res, int scsi_level, - int rescan) + int sflags) { unsigned int sparse_lun, lun, max_dev_lun; struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); @@ -1025,7 +1032,7 @@ static void scsi_sequential_lun_scan(str * sparse_lun. */ for (lun = 1; lun < max_dev_lun; ++lun) - if ((scsi_probe_and_add_lun(starget, lun, NULL, NULL, rescan, + if ((scsi_probe_and_add_lun(starget, lun, NULL, NULL, sflags, NULL) != SCSI_SCAN_LUN_PRESENT) && !sparse_lun) return; @@ -1110,7 +1117,7 @@ EXPORT_SYMBOL(int_to_scsilun); * 1: no report lun scan, or not configured **/ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, - int rescan) + int sflags) { char devname[64]; unsigned char scsi_cmd[MAX_COMMAND_SIZE]; @@ -1278,7 +1285,7 @@ static int scsi_report_lun_scan(struct s int res; res = scsi_probe_and_add_lun(starget, - lun, NULL, NULL, rescan, NULL); + lun, NULL, NULL, sflags, NULL); if (res == SCSI_SCAN_NO_RESPONSE) { /* * Got some results, but now none, abort. @@ -1357,7 +1364,7 @@ void scsi_rescan_device(struct device *d EXPORT_SYMBOL(scsi_rescan_device); static void __scsi_scan_target(struct device *parent, unsigned int channel, - unsigned int id, unsigned int lun, int rescan) + unsigned int id, unsigned int lun, int sflags) { struct Scsi_Host *shost = dev_to_shost(parent); int bflags = 0; @@ -1379,7 +1386,7 @@ static void __scsi_scan_target(struct de /* * Scan for a specific host/chan/id/lun. */ - scsi_probe_and_add_lun(starget, lun, NULL, NULL, rescan, NULL); + scsi_probe_and_add_lun(starget, lun, NULL, NULL, sflags, NULL); goto out_reap; } @@ -1387,15 +1394,15 @@ static void __scsi_scan_target(struct de * Scan LUN 0, if there is some response, scan further. Ideally, we * would not configure LUN 0 until all LUNs are scanned. */ - res = scsi_probe_and_add_lun(starget, 0, &bflags, NULL, rescan, NULL); + res = scsi_probe_and_add_lun(starget, 0, &bflags, NULL, sflags, NULL); if (res == SCSI_SCAN_LUN_PRESENT || res == SCSI_SCAN_TARGET_PRESENT) { - if (scsi_report_lun_scan(starget, bflags, rescan) != 0) + if (scsi_report_lun_scan(starget, bflags, sflags) != 0) /* * The REPORT LUN did not scan the target, * do a sequential scan. */ scsi_sequential_lun_scan(starget, bflags, - res, starget->scsi_level, rescan); + res, starget->scsi_level, sflags); } out_reap: @@ -1413,7 +1420,7 @@ static void __scsi_scan_target(struct de * @channel: channel to scan * @id: target id to scan * @lun: Specific LUN to scan or SCAN_WILD_CARD - * @rescan: passed to LUN scanning routines + * @sflags: passed to LUN scanning routines * * Description: * Scan the target id on @parent, @channel, and @id. Scan at least LUN 0, @@ -1423,19 +1430,19 @@ static void __scsi_scan_target(struct de * sequential scan of LUNs on the target id. **/ void scsi_scan_target(struct device *parent, unsigned int channel, - unsigned int id, unsigned int lun, int rescan) + unsigned int id, unsigned int lun, int sflags) { struct Scsi_Host *shost = dev_to_shost(parent); mutex_lock(&shost->scan_mutex); if (scsi_host_scan_allowed(shost)) - __scsi_scan_target(parent, channel, id, lun, rescan); + __scsi_scan_target(parent, channel, id, lun, sflags); mutex_unlock(&shost->scan_mutex); } EXPORT_SYMBOL(scsi_scan_target); static void scsi_scan_channel(struct Scsi_Host *shost, unsigned int channel, - unsigned int id, unsigned int lun, int rescan) + unsigned int id, unsigned int lun, int sflags) { uint order_id; @@ -1458,15 +1465,15 @@ static void scsi_scan_channel(struct Scs else order_id = id; __scsi_scan_target(&shost->shost_gendev, channel, - order_id, lun, rescan); + order_id, lun, sflags); } else __scsi_scan_target(&shost->shost_gendev, channel, - id, lun, rescan); + id, lun, sflags); } int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel, - unsigned int id, unsigned int lun, int rescan) + unsigned int id, unsigned int lun, int sflags) { SCSI_LOG_SCAN_BUS(3, shost_printk (KERN_INFO, shost, "%s: <%u:%u:%u>\n", @@ -1483,25 +1490,95 @@ int scsi_scan_host_selected(struct Scsi_ for (channel = 0; channel <= shost->max_channel; channel++) scsi_scan_channel(shost, channel, id, lun, - rescan); + sflags); else - scsi_scan_channel(shost, channel, id, lun, rescan); + scsi_scan_channel(shost, channel, id, lun, sflags); } mutex_unlock(&shost->scan_mutex); return 0; } +/* The error handling here is pretty yucky. Do we want an + * shost_for_each_device_safe() iterator? + */ +static void scsi_sysfs_add_devices(struct Scsi_Host *shost) +{ + struct scsi_device *sdev; + shost_for_each_device(sdev, shost) { + int err; + next: + err = scsi_sysfs_add_sdev(sdev); + if (err) { + struct scsi_device *tmp = sdev; + sdev = __scsi_iterate_devices(shost, sdev); + scsi_destroy_sdev(tmp); + goto next; + } + } +} + +struct async_scan_data { + struct list_head list; + struct Scsi_Host *shost; + struct completion prev_finished; +}; + +static spinlock_t async_scan_lock = SPIN_LOCK_UNLOCKED; +static LIST_HEAD(scanning_hosts); + +static int do_scan_async(void *_data) +{ + struct async_scan_data *data = _data; + scsi_scan_host_selected(data->shost, SCAN_WILD_CARD, SCAN_WILD_CARD, + SCAN_WILD_CARD, 2); + + wait_for_completion(&data->prev_finished); + + scsi_sysfs_add_devices(data->shost); + + spin_lock(&async_scan_lock); + list_del(&data->list); + spin_unlock(&async_scan_lock); + if (!list_empty(&scanning_hosts)) { + struct async_scan_data *next = list_entry(scanning_hosts.next, + struct async_scan_data, list); + complete(&next->prev_finished); + } + + kfree(data); + return 0; +} + /** * scsi_scan_host - scan the given adapter * @shost: adapter to scan **/ void scsi_scan_host(struct Scsi_Host *shost) { - scsi_scan_host_selected(shost, SCAN_WILD_CARD, SCAN_WILD_CARD, - SCAN_WILD_CARD, 0); + struct async_scan_data *data = kmalloc(sizeof(*data), GFP_KERNEL); + data->shost = shost; + init_completion(&data->prev_finished); + + spin_lock(&async_scan_lock); + if (list_empty(&scanning_hosts)) + complete(&data->prev_finished); + list_add_tail(&data->list, &scanning_hosts); + spin_unlock(&async_scan_lock); + + kthread_run(do_scan_async, data, "scsi_scan_%d", shost->host_no); } EXPORT_SYMBOL(scsi_scan_host); + +int scsi_all_hosts_scanned(void) +{ + while (!list_empty(&scanning_hosts)) { + printk("scsi: waiting for bus probes to complete ...\n"); + ssleep(1); + } + return 0; +} +late_initcall(scsi_all_hosts_scanned); void scsi_forget_host(struct Scsi_Host *shost) {