add hotplug support, take 2
PATCH 1/13 libata-hp: implement ata_eh_detach_dev()
In reply to Tejun HeoImplement ata_eh_detach_dev(). This function is responsible for detaching an ATA device and offlining the associated SCSI device atomically so that the detached device is not accessed after ATA detach is complete.
---
drivers/scsi/libata-eh.c | 28 ++++++++++++++++++++++++++++ drivers/scsi/libata-scsi.c | 24 ++++++++++++++++++++++++ drivers/scsi/libata.h | 1 + 3 files changed, 53 insertions(+), 0 deletions(-)
064a05349cac2d33c2810d5455efd0eef396c285
drivers/scsi/libata-eh.c +28 -0
@@ -634,6 +634,34 @@ void ata_eh_qc_retry(struct ata_queued_c }/** +* ata_eh_detach_dev - detach ATA device +* @dev: ATA device to detach +* +* Detach @dev. +* +* LOCKING: +* None. +*/ +static void ata_eh_detach_dev (struct ata_device *dev) +{ +struct ata_port *ap = dev->ap; +unsigned long flags; + +ata_dev_disable (dev); + +spin_lock_irqsave (&ap->host_set->lock, flags); + + dev->flags &= ~ATA_DFLAG_DETACH ; + +if (ata_scsi_offline_dev (dev)) { + dev->flags |=ATA_DFLAG_DETACHED ; + ap->flags |=ATA_FLAG_SCSI_HOTPLUG ; + } + +spin_unlock_irqrestore (&ap->host_set->lock, flags); +} + +/** * ata_eh_about_to_do - about to perform eh_action * @ap: target ATA port * @action: action about to be performed
drivers/scsi/libata-scsi.c +24 -0
@@ -2759,6 +2759,30 @@ void ata_scsi_scan_host(struct ata_port }/** +* ata_scsi_offline_dev - offline attached SCSI device +* @dev: ATA device to offline attached SCSI device for +* +* This function is called from ata_eh_hotplug() and responsible +* for taking the SCSI device attached to @dev offline. This +* function is called with host_set lock which protects dev->sdev +* against clearing. +* +* LOCKING: +* spin_lock_irqsave(host_set lock) +* +* RETURNS: +* 1 if attached SCSI device exists, 0 otherwise. +*/ +int ata_scsi_offline_dev (struct ata_device *dev) +{ +if (dev->sdev) { +scsi_device_set_state (dev->sdev,SDEV_OFFLINE ); +return 1 ; + } +return 0 ; +} + +/** * ata_schedule_scsi_eh - schedule EH for SCSI host * @shost: SCSI host to invoke error handling on. *
drivers/scsi/libata.h +1 -0
@@ -75,6 +75,7 @@ extern int ata_cmd_ioctl(struct scsi_devextern struct scsi_transport_template ata_scsi_transport_template;extern void ata_scsi_scan_host (struct ata_port *ap); +extern int ata_scsi_offline_dev (struct ata_device *dev);extern unsigned int ata_scsiop_inq_std (struct ata_scsi_args *args,u8 *rbuf,unsigned int buflen);
Signature · 1 line
1.2.4
PATCH 2/13 libata-hp: implement hotplug
In reply to Tejun HeoImplement ATA part of hotplug. To avoid probing broken devices over and over again, disabled devices are not automatically detached. They are detached only if probing is requested for the device or the associated port is offline. Also, to avoid infinite probing loop, Each device is probed only once per EH run.
As SATA PHY status is fragile, devices are detached only after it has used up its recovery chances unless explicitly requested by LLDD or user (LLDD may request direct detach if, for example, it supports cold presence detection).
---
drivers/scsi/libata-eh.c | 118 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 101 insertions(+), 17 deletions(-)
d68c358b60321f81cbb29687668f9a0c43d43900
drivers/scsi/libata-eh.c +101 -17
@@ -903,6 +903,7 @@ static void ata_eh_analyze_serror(structif (serror & (SERR_PHYRDY_CHG |SERR_DEV_XCHG )) { err_mask |=AC_ERR_ATA_BUS ; action |=ATA_EH_HARDRESET ; + ehc->i.probe_mask |=1 ; } ehc->i.err_mask |= err_mask;
@@ -1439,11 +1440,12 @@ static int ata_eh_reset(struct ata_portreturn rc; } -static int ata_eh_revalidate (struct ata_port *ap, -struct ata_device **r_failed_dev) +static int ata_eh_revalidate_and_attach (struct ata_port *ap, +struct ata_device **r_failed_dev) {struct ata_eh_context *ehc = &ap->eh_context;struct ata_device *dev; +unsigned long flags;int i, rc =0 ;DPRINTK ("ENTER\n" );
@@ -1465,6 +1467,23 @@ static int ata_eh_revalidate(struct ata_break ; ehc->i.action &= ~ATA_EH_REVALIDATE ; + }else if (dev->class ==ATA_DEV_UNKNOWN && + ehc->tries[dev->devno] && +ata_class_enabled (ehc->classes[dev->devno])) { + dev->class = ehc->classes[dev->devno]; + + rc =ata_dev_read_id (dev, &dev->class,1 , dev->id); +if (rc ==0 ) + rc =ata_dev_configure (dev,1 ); + +if (rc) { + dev->class =ATA_DEV_UNKNOWN ; +break ; + } + +spin_lock_irqsave (&ap->host_set->lock, flags); + ap->flags |=ATA_FLAG_SCSI_HOTPLUG ; +spin_unlock_irqrestore (&ap->host_set->lock, flags); } }
@@ -1485,6 +1504,36 @@ static int ata_port_nr_enabled(struct atreturn cnt; } +static int ata_port_nr_vacant (struct ata_port *ap) +{ +int i, cnt =0 ; + +for (i =0 ; i <ATA_MAX_DEVICES ; i++) +if (ap->device[i].class ==ATA_DEV_UNKNOWN ) + cnt++; +return cnt; +} + +static int ata_eh_skip_recovery (struct ata_port *ap) +{ +struct ata_eh_context *ehc = &ap->eh_context; +int i; + +if (ap->flags &ATA_FLAG_FROZEN ||ata_port_nr_enabled (ap)) +return 0 ; + +/* skip if class codes for all vacant slots are ATA_DEV_NONE */ +for (i =0 ; i <ATA_MAX_DEVICES ; i++) { +struct ata_device *dev = &ap->device[i]; + +if (dev->class ==ATA_DEV_UNKNOWN && + ehc->classes[dev->devno] !=ATA_DEV_NONE ) +return 0 ; + } + +return 1 ; +} +/** * ata_eh_recover - recover host port after error * @ap: host port to recover
@@ -1495,9 +1544,10 @@ static int ata_port_nr_enabled(struct at* * This is the alpha and omega, eum and yang, heart and soul of * libata exception handling. On entry, actions required to -* recover each devices are recorded in eh_context. This -* function executes all the operations with appropriate retrials -* and fallbacks to resurrect failed devices. +* recover the port and hotplug requests are recorded in +* eh_context. This function executes all the operations with +* appropriate retrials and fallbacks to resurrect failed +* devices, detach goners and greet newcomers. * * LOCKING: * Kernel thread context (may sleep).
@@ -1520,6 +1570,19 @@ static int ata_eh_recover(struct ata_por dev = &ap->device[i]; ehc->tries[dev->devno] =ATA_EH_DEV_TRIES ; + +/* process hotplug request */ +if (dev->flags &ATA_DFLAG_DETACH ) +ata_eh_detach_dev (dev); + +if (!ata_dev_enabled (dev) && + (ehc->i.probe_mask & (1 << dev->devno) && + !(ehc->did_probe_mask & (1 << dev->devno)))) { +ata_eh_detach_dev (dev); +ata_dev_init (dev); + ehc->did_probe_mask |= (1 << dev->devno); + ehc->i.action |=ATA_EH_SOFTRESET ; + } } retry:
@@ -1527,15 +1590,18 @@ static int ata_eh_recover(struct ata_por rc =0 ;/* skip EH if possible. */ -if (!ata_port_nr_enabled (ap) && !(ap->flags &ATA_FLAG_FROZEN )) +if (ata_eh_skip_recovery (ap)) ehc->i.action =0 ; +for (i =0 ; i <ATA_MAX_DEVICES ; i++) + ehc->classes[i] =ATA_DEV_UNKNOWN ; +/* reset */ if (ehc->i.action &ATA_EH_RESET_MASK ) {ata_eh_freeze_port (ap); - rc =ata_eh_reset (ap,0 , prereset, softreset, hardreset, - postreset); + rc =ata_eh_reset (ap,ata_port_nr_vacant (ap), prereset, + softreset, hardreset, postreset);if (rc) {ata_port_printk (ap,KERN_ERR ,"reset failed, giving up\n" );
@@ -1545,8 +1611,8 @@ static int ata_eh_recover(struct ata_porata_eh_thaw_port (ap); } -/* revalidate existing devices */ - rc =ata_eh_revalidate (ap, &dev); +/* revalidate existing devices and attach new ones */ + rc =ata_eh_revalidate_and_attach (ap, &dev);if (rc) goto dev_fail;
@@ -1564,6 +1630,8 @@ static int ata_eh_recover(struct ata_por dev_fail:switch (rc) {case -ENODEV : +/* device missing, schedule probing */ + ehc->i.probe_mask |= (1 << dev->devno);case -EINVAL : ehc->tries[dev->devno] =0 ;break ;
@@ -1576,15 +1644,31 @@ static int ata_eh_recover(struct ata_por ehc->tries[dev->devno] =0 ; } -/* disable device if it has used up all its chances */ -if (ata_dev_enabled (dev) && !ehc->tries[dev->devno]) +if (ata_dev_enabled (dev) && !ehc->tries[dev->devno]) { +/* disable device if it has used up all its chances */ ata_dev_disable (dev); -/* soft didn't work? be haaaaard */ -if (ehc->flags &ATA_EHC_DID_RESET ) - ehc->i.action |=ATA_EH_HARDRESET ; -else - ehc->i.action |=ATA_EH_SOFTRESET ; +/* detach if offline */ +if (ata_port_offline (ap)) +ata_eh_detach_dev (dev); + +/* probe if requested */ +if (ehc->i.probe_mask & (1 << dev->devno) && + !(ehc->did_probe_mask & (1 << dev->devno))) { +ata_eh_detach_dev (dev); +ata_dev_init (dev); + + ehc->tries[dev->devno] =ATA_EH_DEV_TRIES ; + ehc->did_probe_mask |= (1 << dev->devno); + ehc->i.action |=ATA_EH_SOFTRESET ; + } + }else { +/* soft didn't work? be haaaaard */ +if (ehc->flags &ATA_EHC_DID_RESET ) + ehc->i.action |=ATA_EH_HARDRESET ; +else + ehc->i.action |=ATA_EH_SOFTRESET ; + }if (ata_port_nr_enabled (ap)) { ata_port_printk(ap, KERN_WARNING, "failed to recover some "
Signature · 1 line
1.2.4
PATCH 3/13 libata-hp: implement SCSI part of hotplug
In reply to Tejun HeoImplement SCSI part of hotplug.
This must be done in a separate context as SCSI makes use of EH during probing. Unfortunately, SCSI probing fails silently if EH is active. ata_eh_scsi_hotplug() does its best to avoid such conditions but, theoretically, it may fail to associate SCSI device to newly found ATA device; however, the chance is pretty slim and I haven't experienced any such event during testing.
Also, device removal synchronization is clumsy resulting in complex ata_scsi_remove_dev(), but I think I've got it right and haven't seen it malfunction yet.
---
drivers/scsi/libata-core.c | 1 + drivers/scsi/libata-eh.c | 70 +++++++++++++++++++++++++++++++++++++++++++- drivers/scsi/libata-scsi.c | 59 +++++++++++++++++++++++++++++++++++++ drivers/scsi/libata.h | 2 + include/linux/libata.h | 2 + 5 files changed, 132 insertions(+), 2 deletions(-)
03a1a07f8057e7e79efb56332d1b6c5b20867d0c
drivers/scsi/libata-core.c +1 -0
@@ -5310,6 +5310,7 @@ static void ata_host_init(struct ata_por ap->last_ctl =0xFF ;INIT_WORK (&ap->port_task,NULL ,NULL ); +INIT_WORK (&ap->hotplug_task, ata_eh_scsi_hotplug, ap);INIT_LIST_HEAD (&ap->eh_done_q);/* set cable type */
drivers/scsi/libata-eh.c +69 -1
84 lines not on this page · raw message
drivers/scsi/libata-scsi.c +59 -0
65 lines not on this page · raw message
drivers/scsi/libata.h +2 -0
@@ -76,6 +76,7 @@ extern struct scsi_transport_template atextern void ata_scsi_scan_host (struct ata_port *ap);extern int ata_scsi_offline_dev (struct ata_device *dev); +extern void ata_scsi_remove_dev (struct ata_device *dev);extern unsigned int ata_scsiop_inq_std (struct ata_scsi_args *args,u8 *rbuf,unsigned int buflen);
@@ -111,5 +112,6 @@ extern void ata_ering_init(struct ata_erextern enum scsi_eh_timer_return ata_scsi_timed_out (struct scsi_cmnd *cmd);extern void ata_scsi_error (struct Scsi_Host *host);extern void ata_qc_schedule_eh (struct ata_queued_cmd *qc); +extern void ata_eh_scsi_hotplug (void *data);#endif /* __LIBATA_H__ */
include/linux/libata.h +1 -1
@@ -512,7 +512,7 @@ struct ata_port {struct ata_host_set *host_set;struct device *dev; -struct work_struct port_task; +struct work_struct port_task, hotplug_task;unsigned int hsm_task_state;
Signature · 1 line
1.2.4
PATCH 4/13 libata-hp: implement warmplug
In reply to Tejun HeoImplement warmplug. User-initiated unplug can be detected by hostt->slave_destroy() and plug by transportt->user_scan(). This patch only implements the two callbacks. The next function will hook them.
---
drivers/scsi/libata-core.c | 1 drivers/scsi/libata-scsi.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/libata.h | 1 3 files changed, 91 insertions(+), 0 deletions(-)
eb1340c1bf8b9df924357e79f0cef2dcad5b4daf
drivers/scsi/libata-core.c +1 -0
@@ -5876,6 +5876,7 @@ EXPORT_SYMBOL_GPL(ata_port_queue_task);EXPORT_SYMBOL_GPL (ata_scsi_ioctl);EXPORT_SYMBOL_GPL (ata_scsi_queuecmd);EXPORT_SYMBOL_GPL (ata_scsi_slave_config); +EXPORT_SYMBOL_GPL (ata_scsi_slave_destroy);EXPORT_SYMBOL_GPL (ata_scsi_change_queue_depth);EXPORT_SYMBOL_GPL (ata_scsi_release);EXPORT_SYMBOL_GPL (ata_host_intr);
drivers/scsi/libata-scsi.c +89 -0
107 lines not on this page · raw message
include/linux/libata.h +1 -0
@@ -715,6 +715,7 @@ extern int ata_std_bios_param(struct scsstruct block_device *bdev, sector_t capacity, int geom[]);extern int ata_scsi_slave_config (struct scsi_device *sdev); +extern void ata_scsi_slave_destroy (struct scsi_device *sdev);extern int ata_scsi_change_queue_depth (struct scsi_device *sdev,int queue_depth);extern struct ata_device *ata_dev_pair (struct ata_device *adev);
Signature · 1 line
1.2.4
PATCH 8/11 add hotplug support, take 2
Hi.
This is part of patchset series described in [T].
This is the second take of add-hotplug-support patchset. Changes from the last take[L] are
* No ap->hotplug_flags and no atomic bitops helpers. All are handled via dev->dflags and ap->eh_info. Things are much simpler now.
* Tighter event handling. Unless a new device is plugged in the middle of reset (there's no generic and reliable way to handle this), no hotplug event is lost.
* Stronger SCSI synchronization. There still is a race condition during SCSI scan after hotplugging, but the window is really tiny and there doesn't seem to be a waterproof way to fix it. I don't think the race will ever get triggered and even if it does the worst that can happen is not attaching a SCSI device for a newly detected ATA device. Other than this race condition, everything should be watertight.
* Disabled devices are not automatically rescanned on user scan request unless the user explicitly requests scan of the device by specifying the device ID or using wild card.
* Probing during driver loading and detaching while unloading are all handled by hotplug. There is only one probing/detaching path now.
* Unused ->probe_init, ->probe_reset and all related functions killed.
This patchset is against
upstream (acc696d93dcf993dec123d69d599979e1456ffec)
+ [1] prep-for-new-EH patchset
+ [2] new-EH-framework patchset, take 3
+ [3] new-EH-implementation patchset, take 3
+ [4] merge-irq-pio patchset
+ [5] add-NCQ-support patchset, take 3
+ [6] prep-for-hotplug support, take 2
+ [7] prep-LLDDs-for-hotplug-support, take 1
--
tejun
[T] http://article.gmane.org/gmane.linux.ide/9957
[L] http://article.gmane.org/gmane.linux.ide/9587
[1] http://article.gmane.org/gmane.linux.ide/9959
[2] http://article.gmane.org/gmane.linux.ide/9984
[3] http://article.gmane.org/gmane.linux.ide/9995
[4] http://article.gmane.org/gmane.linux.ide/10005
[5] http://article.gmane.org/gmane.linux.ide/10011
[6] http://article.gmane.org/gmane.linux.ide/10028
[7] http://article.gmane.org/gmane.linux.ide/10063
PATCH 5/13 libata-hp: hook warmplug
Hook transportt->user_scan() and hostt->slave_destroy().
---
drivers/scsi/ahci.c | 1 + drivers/scsi/ata_piix.c | 1 + drivers/scsi/libata-scsi.c | 1 + drivers/scsi/pdc_adma.c | 1 + drivers/scsi/sata_mv.c | 1 + drivers/scsi/sata_nv.c | 1 + drivers/scsi/sata_promise.c | 1 + drivers/scsi/sata_qstor.c | 1 + drivers/scsi/sata_sil.c | 1 + drivers/scsi/sata_sil24.c | 1 + drivers/scsi/sata_sis.c | 1 + drivers/scsi/sata_svw.c | 1 + drivers/scsi/sata_sx4.c | 1 + drivers/scsi/sata_uli.c | 1 + drivers/scsi/sata_via.c | 1 + drivers/scsi/sata_vsc.c | 1 + 16 files changed, 16 insertions(+), 0 deletions(-)
8da7e7f1680dbf6de49b2d7cdbc2f0d0b02c2608
drivers/scsi/ahci.c +1 -0
@@ -226,6 +226,7 @@ static struct scsi_host_template ahci_sh .proc_name = DRV_NAME, .dma_boundary = AHCI_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/ata_piix.c +1 -0
@@ -218,6 +218,7 @@ static struct scsi_host_template piix_sh .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, .resume = ata_scsi_device_resume, .suspend = ata_scsi_device_suspend,
drivers/scsi/libata-scsi.c +1 -0
@@ -107,6 +107,7 @@ static const u8 def_control_mpage[CONTROstruct scsi_transport_template ata_scsi_transport_template = { .eh_strategy_handler = ata_scsi_error, .eh_timed_out = ata_scsi_timed_out, + .user_scan = ata_scsi_user_scan, };
drivers/scsi/pdc_adma.c +1 -0
@@ -152,6 +152,7 @@ static struct scsi_host_template adma_at .proc_name = DRV_NAME, .dma_boundary = ADMA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_mv.c +1 -0
@@ -387,6 +387,7 @@ static struct scsi_host_template mv_sht .proc_name = DRV_NAME, .dma_boundary = MV_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_nv.c +1 -0
@@ -210,6 +210,7 @@ static struct scsi_host_template nv_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_promise.c +1 -0
@@ -121,6 +121,7 @@ static struct scsi_host_template pdc_ata .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_qstor.c +1 -0
@@ -142,6 +142,7 @@ static struct scsi_host_template qs_ata_ .proc_name = DRV_NAME, .dma_boundary = QS_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_sil.c +1 -0
@@ -174,6 +174,7 @@ static struct scsi_host_template sil_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_sil24.c +1 -0
@@ -367,6 +367,7 @@ static struct scsi_host_template sil24_s .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_sis.c +1 -0
@@ -96,6 +96,7 @@ static struct scsi_host_template sis_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_svw.c +1 -0
@@ -299,6 +299,7 @@ static struct scsi_host_template k2_sata .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy,#ifdef CONFIG_PPC_OF .proc_info = k2_sata_proc_info,#endif
drivers/scsi/sata_sx4.c +1 -0
@@ -191,6 +191,7 @@ static struct scsi_host_template pdc_sat .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_uli.c +1 -0
@@ -90,6 +90,7 @@ static struct scsi_host_template uli_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_via.c +1 -0
@@ -103,6 +103,7 @@ static struct scsi_host_template svia_sh .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/scsi/sata_vsc.c +1 -0
@@ -279,6 +279,7 @@ static struct scsi_host_template vsc_sat .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
Signature · 1 line
1.2.4
PATCH 6/13 libata-hp: implement bootplug
In reply to Tejun HeoImplement bootplug - boot probing via hotplug path. While loading, ata_host_add() simply schedules probing and invokes EH. After EH completes, ata_host_add() scans and assicates them with SCSI devices. EH path is slightly modified to handle this (e.g. no autopsy during bootplug). The SCSI part is left in ata_host_add() because it's shared with legacy path and to keep probing order as before (ATA scan all ports in host_set then attach all).
---
drivers/scsi/libata-core.c | 58 +++++++++++++++++++++++++++++++++----------- drivers/scsi/libata-eh.c | 29 +++++++++++++++------- 2 files changed, 63 insertions(+), 24 deletions(-)
c47e6b5a71f6126e77c7aa339b4ff366d581f303
drivers/scsi/libata-core.c +43 -15
@@ -5358,7 +5358,7 @@ static struct ata_port * ata_host_add(coDPRINTK ("ENTER\n" ); -if (!ent->port_ops->probe_reset && +if (!ent->port_ops->probe_reset && !ent->port_ops->error_handler && !(ent->host_flags & (ATA_FLAG_SATA_RESET |ATA_FLAG_SRST ))) {printk (KERN_ERR "ata%u: no reset mechanism available\n" , port_no);
@@ -5386,6 +5386,12 @@ err_out:return NULL ; } +static int ata_boot_probe_wait (void *dummy) +{ +schedule (); +return 0 ; +} +/** * ata_device_add - Register hardware device with ATA and SCSI layers * @ent: Probe information describing hardware device to be registered
@@ -5404,7 +5410,6 @@ err_out:* RETURNS: * Number of ports registered. Zero on error (no ports registered). */ -int ata_device_add (const struct ata_probe_ent *ent) {unsigned int count =0 , i;
@@ -5481,19 +5486,6 @@ int ata_device_add(const struct ata_prob } ap->sata_spd_limit = ap->hw_sata_spd_limit; -DPRINTK ("ata%u: bus probe begin\n" , ap->id); - rc =ata_bus_probe (ap); -DPRINTK ("ata%u: bus probe end\n" , ap->id); - -if (rc) { -/* FIXME: do something useful here? -* Current libata behavior will -* tear down everything when -* the module is removed -* or the h/w is unplugged. -*/ - } - rc =scsi_add_host (ap->host, dev);if (rc) {ata_port_printk (ap,KERN_ERR ,"scsi_add_host failed\n" );
@@ -5503,6 +5495,42 @@ int ata_device_add(const struct ata_prob* at the very least */ } + +if (!ap->ops->probe_reset) { +int bit =fls (ATA_FLAG_LOADING ) -1 ; +unsigned long flags; + +ata_port_probe (ap); + +spin_lock_irqsave (&ap->host_set->lock, flags); + + ap->eh_info.probe_mask = (1 <<ATA_MAX_DEVICES ) -1 ; + ap->eh_info.action |=ATA_EH_SOFTRESET ; + +set_bit (bit, &ap->flags); +ata_port_schedule_eh (ap); + +spin_unlock_irqrestore (&ap->host_set->lock, flags); + +wait_on_bit (&ap->flags, bit, ata_boot_probe_wait, +TASK_UNINTERRUPTIBLE ); + +while (scsi_host_in_recovery (ap->host)) +msleep (10 ); + }else { +DPRINTK ("ata%u: bus probe begin\n" , ap->id); + rc =ata_bus_probe (ap); +DPRINTK ("ata%u: bus probe end\n" , ap->id); + +if (rc) { +/* FIXME: do something useful here? +* Current libata behavior will +* tear down everything when +* the module is removed +* or the h/w is unplugged. +*/ + } + } }/* probes are done, now scan each port's disk(s) */
drivers/scsi/libata-eh.c +20 -9
@@ -291,11 +291,16 @@ void ata_scsi_error(struct Scsi_Host *ho/* clean up */ spin_lock_irqsave (hs_lock, flags); -if (ap->flags &ATA_FLAG_SCSI_HOTPLUG ) -queue_work (ata_hotplug_wq, &ap->hotplug_task); - -if (ap->flags &ATA_FLAG_RECOVERED ) -ata_port_printk (ap,KERN_INFO ,"EH complete\n" ); +if (ap->flags &ATA_FLAG_LOADING ) { +int bit =fls (ATA_FLAG_LOADING ) -1 ; +clear_bit (bit, &ap->flags); +wake_up_bit (&ap->flags, bit); + }else { +if (ap->flags &ATA_FLAG_SCSI_HOTPLUG ) +queue_work (ata_hotplug_wq, &ap->hotplug_task); +if (ap->flags &ATA_FLAG_RECOVERED ) +ata_port_printk (ap,KERN_INFO ,"EH complete\n" ); + } ap->flags &= ~(ATA_FLAG_SCSI_HOTPLUG |ATA_FLAG_RECOVERED );
@@ -1336,6 +1341,7 @@ static int ata_eh_reset(struct ata_portstruct ata_eh_context *ehc = &ap->eh_context;unsigned int *classes = ehc->classes;int tries =ATA_EH_RESET_TRIES ; +int verbose = !(ap->flags &ATA_FLAG_LOADING );unsigned int action;ata_reset_fn_t reset;int i, did_followup_srst, rc;
@@ -1375,8 +1381,10 @@ static int ata_eh_reset(struct ata_port } retry: -ata_port_printk (ap,KERN_INFO ,"%s resetting port\n" , - reset == softreset ?"soft" :"hard" ); +/* shut up during boot probing */ +if (verbose) +ata_port_printk (ap,KERN_INFO ,"%s resetting port\n" , + reset == softreset ?"soft" :"hard" );/* reset */ ata_eh_about_to_do (ap,ATA_EH_RESET_MASK );
@@ -1818,8 +1826,11 @@ void ata_do_eh(struct ata_port *ap, ata_ ata_reset_fn_t softreset, ata_reset_fn_t hardreset, ata_postreset_fn_t postreset) { -ata_eh_autopsy (ap ); -ata_eh_report (ap); + if (!(ap->flags & ATA_FLAG_LOADING)) { + ata_eh_autopsy(ap); +ata_eh_report (ap); + } +ata_eh_recover (ap, prereset, softreset, hardreset, postreset);ata_eh_finish (ap); }
Signature · 1 line
1.2.4
PATCH 7/13 libata-hp: implement unload-unplug
In reply to Tejun HeoImplement unload unplug - driver unloading / PCI removal via hot unplug path. This is done by ata_port_detach() which requests detach of all devices, schedules EH and wait for it to complete. EH path is slightly modified to handle this (e.g. force zero eh_info during unloading). With this patch, EH and unloading are properly synchronized and unloading should be safe under any circumstances.
---
drivers/scsi/ahci.c | 1 + drivers/scsi/libata-core.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ drivers/scsi/libata-eh.c | 7 ++++--- include/linux/libata.h | 1 + 4 files changed, 53 insertions(+), 3 deletions(-)
8c2ce9c4c4f5499bc88b1514a791a6038cfaf80e
drivers/scsi/ahci.c +1 -0
@@ -1390,6 +1390,7 @@ static void ahci_remove_one (struct pci_for (i =0 ; i < host_set->n_ports; i++) { ap = host_set->ports[i]; +ata_port_detach (ap);scsi_remove_host (ap->host); }
drivers/scsi/libata-core.c +47 -0
65 lines not on this page · raw message
drivers/scsi/libata-eh.c +4 -3
@@ -239,7 +239,8 @@ void ata_scsi_error(struct Scsi_Host *hospin_lock_irqsave (hs_lock, flags);memset (&ap->eh_context,0 ,sizeof (ap->eh_context)); - ap->eh_context.i = ap->eh_info; +if (!(ap->flags &ATA_FLAG_UNLOADING )) + ap->eh_context.i = ap->eh_info;memset (&ap->eh_info,0 ,sizeof (ap->eh_info)); ap->flags &= ~ATA_FLAG_EH_PENDING ;
@@ -295,7 +296,7 @@ void ata_scsi_error(struct Scsi_Host *hoint bit =fls (ATA_FLAG_LOADING ) -1 ;clear_bit (bit, &ap->flags);wake_up_bit (&ap->flags, bit); - }else { + }else if (!(ap->flags &ATA_FLAG_UNLOADING )) {if (ap->flags &ATA_FLAG_SCSI_HOTPLUG )queue_work (ata_hotplug_wq, &ap->hotplug_task);if (ap->flags &ATA_FLAG_RECOVERED )
@@ -1826,7 +1827,7 @@ void ata_do_eh(struct ata_port *ap, ata_ ata_reset_fn_t softreset, ata_reset_fn_t hardreset, ata_postreset_fn_t postreset) { - if (!(ap->flags & ATA_FLAG_LOADING)) { + if (!(ap->flags & (ATA_FLAG_LOADING | ATA_FLAG_UNLOADING))) { ata_eh_autopsy(ap);ata_eh_report (ap); }
include/linux/libata.h +1 -0
@@ -635,6 +635,7 @@ extern int ata_pci_device_resume(structextern int ata_pci_clear_simplex (struct pci_dev *pdev);#endif /* CONFIG_PCI */ extern int ata_device_add (const struct ata_probe_ent *ent); +extern void ata_port_detach (struct ata_port *ap);extern void ata_host_set_remove (struct ata_host_set *host_set);extern int ata_scsi_detect (struct scsi_host_template *sht);extern int ata_scsi_ioctl (struct scsi_device *dev,int cmd,void __user *arg);
Signature · 1 line
1.2.4
PATCH 13/13 libata-hp: move ata_do_reset() to libata-eh.c
In reply to Tejun HeoWith ops->probe_init() gone, no user is left in libata-core.c. Move ata_do_reset() to libata-eh.c and make it static.
---
drivers/scsi/libata-core.c | 28 ---------------------------- drivers/scsi/libata-eh.c | 28 ++++++++++++++++++++++++++++ drivers/scsi/libata.h | 2 -- 3 files changed, 28 insertions(+), 30 deletions(-)
9b268696e656ec9b14ff744801889c6b7f2a06e1
drivers/scsi/libata-core.c +0 -28
@@ -2747,34 +2747,6 @@ void ata_std_postreset(struct ata_port *DPRINTK ("EXIT\n" ); } -int ata_do_reset (struct ata_port *ap,ata_reset_fn_t reset, -unsigned int *classes) -{ -int i, rc; - -for (i =0 ; i <ATA_MAX_DEVICES ; i++) - classes[i] =ATA_DEV_UNKNOWN ; - - rc =reset (ap, classes); -if (rc) -return rc; - -/* If any class isn't ATA_DEV_UNKNOWN, consider classification -* is complete and convert all ATA_DEV_UNKNOWN to -* ATA_DEV_NONE. -*/ -for (i =0 ; i <ATA_MAX_DEVICES ; i++) -if (classes[i] !=ATA_DEV_UNKNOWN ) -break ; - -if (i <ATA_MAX_DEVICES ) -for (i =0 ; i <ATA_MAX_DEVICES ; i++) -if (classes[i] ==ATA_DEV_UNKNOWN ) - classes[i] =ATA_DEV_NONE ; - -return 0 ; -} -/** * ata_dev_same_device - Determine whether new ID matches configured device * @dev: device to compare against
drivers/scsi/libata-eh.c +28 -0
@@ -1323,6 +1323,34 @@ static void ata_eh_report(struct ata_por } } +static int ata_do_reset (struct ata_port *ap,ata_reset_fn_t reset, +unsigned int *classes) +{ +int i, rc; + +for (i =0 ; i <ATA_MAX_DEVICES ; i++) + classes[i] =ATA_DEV_UNKNOWN ; + + rc =reset (ap, classes); +if (rc) +return rc; + +/* If any class isn't ATA_DEV_UNKNOWN, consider classification +* is complete and convert all ATA_DEV_UNKNOWN to +* ATA_DEV_NONE. +*/ +for (i =0 ; i <ATA_MAX_DEVICES ; i++) +if (classes[i] !=ATA_DEV_UNKNOWN ) +break ; + +if (i <ATA_MAX_DEVICES ) +for (i =0 ; i <ATA_MAX_DEVICES ; i++) +if (classes[i] ==ATA_DEV_UNKNOWN ) + classes[i] =ATA_DEV_NONE ; + +return 0 ; +} +static int ata_eh_followup_srst_needed (int rc,int classify,const unsigned int *classes) {
drivers/scsi/libata.h +0 -2
@@ -57,8 +57,6 @@ extern int ata_down_sata_spd_limit(strucextern int ata_set_sata_spd_needed (struct ata_port *ap);extern int ata_down_xfermask_limit (struct ata_device *dev,int force_pio0);extern int ata_set_mode (struct ata_port *ap,struct ata_device **r_failed_dev); -extern int ata_do_reset (struct ata_port *ap,ata_reset_fn_t reset, -unsigned int *classes);extern void ata_qc_free (struct ata_queued_cmd *qc);extern void ata_qc_issue (struct ata_queued_cmd *qc);extern void __ata_qc_complete (struct ata_queued_cmd *qc);
Signature · 1 line
1.2.4
PATCH 12/13 libata-hp: killl ops->probe_reset
In reply to Tejun HeoNow that all drivers implementing new EH are converted to new probing mechanism, ops->probe_reset doesn't have any user. Kill it.
---
drivers/scsi/libata-core.c | 185 +++----------------------------------------- include/linux/libata.h | 8 -- 2 files changed, 13 insertions(+), 180 deletions(-)
4ab4ceecd22b795a66133fe621bfa75ed80bad33
drivers/scsi/libata-core.c +13 -172
@@ -1489,31 +1489,21 @@ static int ata_bus_probe(struct ata_port down_xfermask =0 ;/* reset and determine device classes */ -for (i =0 ; i <ATA_MAX_DEVICES ; i++) - classes[i] =ATA_DEV_UNKNOWN ; + ap->ops->phy_reset (ap); -if (ap->ops->probe_reset) { - rc = ap->ops->probe_reset (ap, classes); -if (rc) { -ata_port_printk (ap,KERN_ERR , -"reset failed (errno=%d)\n" , rc); -return rc; - } - }else { - ap->ops->phy_reset (ap); +for (i =0 ; i <ATA_MAX_DEVICES ; i++) { + dev = &ap->device[i]; -for (i =0 ; i <ATA_MAX_DEVICES ; i++) { -if (!(ap->flags &ATA_FLAG_DISABLED )) - classes[i] = ap->device[i].class; - ap->device[i].class =ATA_DEV_UNKNOWN ; - } +if (!(ap->flags &ATA_FLAG_DISABLED ) && + dev->class !=ATA_DEV_UNKNOWN ) + classes[dev->devno] = dev->class; +else + classes[dev->devno] =ATA_DEV_NONE ; -ata_port_probe (ap); + dev->class =ATA_DEV_UNKNOWN ; } -for (i =0 ; i <ATA_MAX_DEVICES ; i++) -if (classes[i] ==ATA_DEV_UNKNOWN ) - classes[i] =ATA_DEV_NONE ; +ata_port_probe (ap);/* read IDENTIFY page and configure devices */ for (i =0 ; i <ATA_MAX_DEVICES ; i++) {
@@ -2574,35 +2564,11 @@ int ata_std_prereset(struct ata_port *ap }/** -* ata_std_probeinit - initialize probing -* @ap: port to be probed -* -* @ap is about to be probed. Initialize it. This function is -* to be used as standard callback for ata_drive_probe_reset(). -* -* NOTE!!! Do not use this function as probeinit if a low level -* driver implements only hardreset. Just pass NULL as probeinit -* in that case. Using this function is probably okay but doing -* so makes reset sequence different from the original -* ->phy_reset implementation and Jeff nervous. :-P -*/ -void ata_std_probeinit (struct ata_port *ap) -{ -/* resume link */ -sata_phy_resume (ap,1 ); - -/* wait for device */ -if (ata_port_online (ap)) -ata_busy_sleep (ap,ATA_TMOUT_BOOT_QUICK ,ATA_TMOUT_BOOT ); -} - -/** * ata_std_softreset - reset host port via ATA SRST * @ap: port to reset * @classes: resulting classes of attached devices * -* Reset host port using ATA SRST. This function is to be used -* as standard callback for ata_drive_*_reset() functions. +* Reset host port using ATA SRST. * * LOCKING: * Kernel thread context (may sleep)
@@ -2657,8 +2623,6 @@ int ata_std_softreset(struct ata_port *a* @class: resulting class of attached device * * SATA phy-reset host port using DET bits of SControl register. -* This function is to be used as standard callback for -* ata_drive_*_reset(). * * LOCKING: * Kernel thread context (may sleep)
@@ -2737,9 +2701,6 @@ int sata_std_hardreset(struct ata_port ** the device might have been reset more than once using * different reset methods before postreset is invoked. * -* This function is to be used as standard callback for -* ata_drive_*_reset(). -* * LOCKING: * Kernel thread context (may sleep) */
@@ -2786,32 +2747,6 @@ void ata_std_postreset(struct ata_port *DPRINTK ("EXIT\n" ); } -/** -* ata_std_probe_reset - standard probe reset method -* @ap: prot to perform probe-reset -* @classes: resulting classes of attached devices -* -* The stock off-the-shelf ->probe_reset method. -* -* LOCKING: -* Kernel thread context (may sleep) -* -* RETURNS: -* 0 on success, -errno otherwise. -*/ -int ata_std_probe_reset (struct ata_port *ap,unsigned int *classes) -{ -ata_reset_fn_t hardreset; - - hardreset =NULL ; -if (ata_scr_valid (ap)) - hardreset = sata_std_hardreset; - -return ata_drive_probe_reset (ap, ata_std_probeinit, - ata_std_softreset, hardreset, - ata_std_postreset, classes); -} -int ata_do_reset (struct ata_port *ap,ata_reset_fn_t reset,unsigned int *classes) {
@@ -2841,97 +2776,6 @@ int ata_do_reset(struct ata_port *ap, at }/** -* ata_drive_probe_reset - Perform probe reset with given methods -* @ap: port to reset -* @probeinit: probeinit method (can be NULL) -* @softreset: softreset method (can be NULL) -* @hardreset: hardreset method (can be NULL) -* @postreset: postreset method (can be NULL) -* @classes: resulting classes of attached devices -* -* Reset the specified port and classify attached devices using -* given methods. This function prefers softreset but tries all -* possible reset sequences to reset and classify devices. This -* function is intended to be used for constructing ->probe_reset -* callback by low level drivers. -* -* Reset methods should follow the following rules. -* -* - Return 0 on sucess, -errno on failure. -* - If classification is supported, fill classes[] with -* recognized class codes. -* - If classification is not supported, leave classes[] alone. -* -* LOCKING: -* Kernel thread context (may sleep) -* -* RETURNS: -* 0 on success, -EINVAL if no reset method is avaliable, -ENODEV -* if classification fails, and any error code from reset -* methods. -*/ -int ata_drive_probe_reset (struct ata_port *ap,ata_probeinit_fn_t probeinit, -ata_reset_fn_t softreset,ata_reset_fn_t hardreset, -ata_postreset_fn_t postreset,unsigned int *classes) -{ -int rc = -EINVAL ; - -ata_eh_freeze_port (ap); - -if (probeinit) -probeinit (ap); - -if (softreset && !ata_set_sata_spd_needed (ap)) { - rc =ata_do_reset (ap, softreset, classes); -if (rc ==0 && classes[0 ] !=ATA_DEV_UNKNOWN ) - goto done; -ata_port_printk (ap,KERN_INFO ,"softreset failed, " -"will try hardreset in 5 secs\n" ); -ssleep (5 ); - } - -if (!hardreset) - goto done; - -while (1 ) { - rc =ata_do_reset (ap, hardreset, classes); -if (rc ==0 ) { -if (classes[0 ] !=ATA_DEV_UNKNOWN ) - goto done; -break ; - } - -if (ata_down_sata_spd_limit (ap)) - goto done; - -ata_port_printk (ap,KERN_INFO ,"hardreset failed, " -"will retry in 5 secs\n" ); -ssleep (5 ); - } - -if (softreset) { -ata_port_printk (ap,KERN_INFO , -"hardreset succeeded without classification, " -"will retry softreset in 5 secs\n" ); -ssleep (5 ); - - rc =ata_do_reset (ap, softreset, classes); - } - - done: -if (rc ==0 ) { -if (postreset) -postreset (ap, classes); - -ata_eh_thaw_port (ap); - -if (classes[0 ] ==ATA_DEV_UNKNOWN ) - rc = -ENODEV ; - } -return rc; -} - -/** * ata_dev_same_device - Determine whether new ID matches configured device * @dev: device to compare against * @new_class: class of the new device
@@ -5358,7 +5202,7 @@ static struct ata_port * ata_host_add(coDPRINTK ("ENTER\n" ); -if (!ent->port_ops->probe_reset && !ent->port_ops->error_handler && +if (!ent->port_ops->error_handler && !(ent->host_flags & (ATA_FLAG_SATA_RESET |ATA_FLAG_SRST ))) {printk (KERN_ERR "ata%u: no reset mechanism available\n" , port_no);
@@ -5496,7 +5340,7 @@ int ata_device_add(const struct ata_prob*/ } -if (!ap->ops->probe_reset) { +if (ap->ops->error_handler) {int bit =fls (ATA_FLAG_LOADING ) -1 ;unsigned long flags;
@@ -5933,13 +5777,10 @@ EXPORT_SYMBOL_GPL(__sata_phy_reset);EXPORT_SYMBOL_GPL (ata_bus_reset);EXPORT_SYMBOL_GPL (sata_phy_debounce);EXPORT_SYMBOL_GPL (sata_phy_resume); -EXPORT_SYMBOL_GPL (ata_std_probeinit);EXPORT_SYMBOL_GPL (ata_std_prereset);EXPORT_SYMBOL_GPL (ata_std_softreset);EXPORT_SYMBOL_GPL (sata_std_hardreset);EXPORT_SYMBOL_GPL (ata_std_postreset); -EXPORT_SYMBOL_GPL (ata_std_probe_reset); -EXPORT_SYMBOL_GPL (ata_drive_probe_reset);EXPORT_SYMBOL_GPL (ata_dev_revalidate);EXPORT_SYMBOL_GPL (ata_dev_classify);EXPORT_SYMBOL_GPL (ata_dev_pair);
include/linux/libata.h +0 -8
@@ -296,7 +296,6 @@ struct ata_queued_cmd;/* typedefs */ typedef void (*ata_qc_cb_t ) (struct ata_queued_cmd *qc); -typedef void (*ata_probeinit_fn_t )(struct ata_port *ap);typedef int (*ata_prereset_fn_t )(struct ata_port *ap);typedef int (*ata_reset_fn_t )(struct ata_port *ap,unsigned int *classes);typedef void (*ata_postreset_fn_t )(struct ata_port *ap,unsigned int *classes);
@@ -543,7 +542,6 @@ struct ata_port_operations {void (*phy_reset) (struct ata_port *ap);/* obsolete */ void (*set_mode) (struct ata_port *ap); -int (*probe_reset) (struct ata_port *ap,unsigned int *classes);void (*post_set_mode) (struct ata_port *ap);
@@ -614,11 +612,6 @@ extern int sata_phy_debounce(struct ata_unsigned long duration_msec, unsigned long timeout_msec);extern int sata_phy_resume (struct ata_port *ap,int quick); -extern int ata_drive_probe_reset (struct ata_port *ap, -ata_probeinit_fn_t probeinit, -ata_reset_fn_t softreset,ata_reset_fn_t hardreset, -ata_postreset_fn_t postreset,unsigned int *classes); -extern void ata_std_probeinit (struct ata_port *ap);extern int ata_std_prereset (struct ata_port *ap);extern int ata_std_softreset (struct ata_port *ap,unsigned int *classes);extern int sata_std_hardreset (struct ata_port *ap,unsigned int *class);
@@ -675,7 +668,6 @@ extern void ata_std_dev_select (struct aextern u8 ata_check_status (struct ata_port *ap);extern u8 ata_altstatus (struct ata_port *ap);extern void ata_exec_command (struct ata_port *ap,const struct ata_taskfile *tf); -extern int ata_std_probe_reset (struct ata_port *ap,unsigned int *classes);extern int ata_port_start (struct ata_port *ap);extern void ata_port_stop (struct ata_port *ap);extern void ata_host_stop (struct ata_host_set *host_set);
Signature · 1 line
1.2.4
PATCH 8/13 ata_piix: convert ata_piix to new probing mechanism
In reply to Tejun HeoConvert ata_piix to new probing mechanism. Automatic hotplug is not supported due to hardware limitation (no PHY event interrupt), but warm plugging works.
---
drivers/scsi/ata_piix.c | 89 +++++++++++++++++------------------------------ 1 files changed, 32 insertions(+), 57 deletions(-)
2823178289c03f9f8ebe3fc9541788a92b830016
drivers/scsi/ata_piix.c +32 -57
@@ -146,11 +146,10 @@ struct piix_map_db {static int piix_init_one (struct pci_dev *pdev,const struct pci_device_id *ent); - -static int piix_pata_probe_reset (struct ata_port *ap,unsigned int *classes); -static int piix_sata_probe_reset (struct ata_port *ap,unsigned int *classes);static void piix_set_piomode (struct ata_port *ap,struct ata_device *adev);static void piix_set_dmamode (struct ata_port *ap,struct ata_device *adev); +static void piix_pata_error_handler (struct ata_port *ap); +static void piix_sata_error_handler (struct ata_port *ap);static unsigned int in_module_init =1 ;
@@ -235,8 +234,6 @@ static const struct ata_port_operations .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, - .probe_reset = piix_pata_probe_reset, - .bmdma_setup = ata_bmdma_setup, .bmdma_start = ata_bmdma_start, .bmdma_stop = ata_bmdma_stop,
@@ -246,7 +243,7 @@ static const struct ata_port_operations .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, + .error_handler = piix_pata_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd, .irq_handler = ata_interrupt,
@@ -266,8 +263,6 @@ static const struct ata_port_operations .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, - .probe_reset = piix_sata_probe_reset, - .bmdma_setup = ata_bmdma_setup, .bmdma_start = ata_bmdma_start, .bmdma_stop = ata_bmdma_stop,
@@ -277,7 +272,7 @@ static const struct ata_port_operations .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, + .error_handler = piix_sata_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd, .irq_handler = ata_interrupt,
@@ -462,59 +457,50 @@ cbl40: }/** -* piix_pata_probeinit - probeinit for PATA host controller +* piix_pata_prereset - prereset for PATA host controller * @ap: Target port * -* Probeinit including cable detection. -* -* LOCKING: -* None (inherited from caller). -*/ -static void piix_pata_probeinit (struct ata_port *ap) -{ -piix_pata_cbl_detect (ap); -ata_std_probeinit (ap); -} - -/** -* piix_pata_probe_reset - Perform reset on PATA port and classify -* @ap: Port to reset -* @classes: Resulting classes of attached devices -* -* Reset PATA phy and classify attached devices. +* Prereset including cable detection. * * LOCKING: * None (inherited from caller). */ -static int piix_pata_probe_reset (struct ata_port *ap,unsigned int *classes) +static int piix_pata_prereset (struct ata_port *ap) {struct pci_dev *pdev =to_pci_dev (ap->host_set->dev);if (!pci_test_config_bits (pdev, &piix_enable_bits[ap->hard_port_no])) {ata_port_printk (ap,KERN_INFO ,"port disabled. ignoring.\n" ); -return 0 ; +return -ENODEV ; } -return ata_drive_probe_reset (ap, piix_pata_probeinit, - ata_std_softreset,NULL , - ata_std_postreset, classes); +piix_pata_cbl_detect (ap); + +return ata_std_prereset (ap); +} + +static void piix_pata_error_handler (struct ata_port *ap) +{ +ata_bmdma_drive_eh (ap, piix_pata_prereset, ata_std_softreset,NULL , + ata_std_postreset); }/** -* piix_sata_probe - Probe PCI device for present SATA devices -* @ap: Port associated with the PCI device we wish to probe +* piix_sata_prereset - prereset for SATA host controller +* @ap: Target port * * Reads and configures SATA PCI device's PCI config register * Port Configuration and Status (PCS) to determine port and -* device availability. +* device availability. Return -ENODEV to skip reset if no +* device is present. * * LOCKING: * None (inherited from caller). * * RETURNS: -* Mask of avaliable devices on the port. +* 0 if device is present, -ENODEV otherwise. */ -static unsigned int piix_sata_probe (struct ata_port *ap) +static int piix_sata_prereset (struct ata_port *ap) {struct pci_dev *pdev =to_pci_dev (ap->host_set->dev);const unsigned int *map = ap->host_set->private_data;
@@ -556,29 +542,18 @@ static unsigned int piix_sata_probe (strDPRINTK ("ata%u: LEAVE, pcs=0x%x present_mask=0x%x\n" , ap->id, pcs, present_mask); -return present_mask; -} - -/** -* piix_sata_probe_reset - Perform reset on SATA port and classify -* @ap: Port to reset -* @classes: Resulting classes of attached devices -* -* Reset SATA phy and classify attached devices. -* -* LOCKING: -* None (inherited from caller). -*/ -static int piix_sata_probe_reset (struct ata_port *ap,unsigned int *classes) -{ -if (!piix_sata_probe (ap)) { +if (!present_mask) {ata_port_printk (ap,KERN_INFO ,"SATA port has no device.\n" ); -return 0 ; +return -ENODEV ; } -return ata_drive_probe_reset (ap, ata_std_probeinit, - ata_std_softreset,NULL , - ata_std_postreset, classes); +return ata_std_prereset (ap); +} + +static void piix_sata_error_handler (struct ata_port *ap) +{ +ata_bmdma_drive_eh (ap, piix_sata_prereset, ata_std_softreset,NULL , + ata_std_postreset); }/**
Signature · 1 line
1.2.4
PATCH 9/13 sata_sil: convert to new probing mechanism and add hotplug support
In reply to Tejun HeoConvert to new probing mechanism and add hotplug support by enabling SATA IRQ for SError.N and scheduling EH if the interrupt occurs. Standard EH will do the right thing and schedule probe after analyzing SError.
---
drivers/scsi/sata_sil.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
be041aa12b2f059e3d1f87b7d2932282e4c63f13
drivers/scsi/sata_sil.c +8 -8
@@ -186,7 +186,6 @@ static const struct ata_port_operations .check_status = ata_check_status, .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, - .probe_reset = ata_std_probe_reset, .post_set_mode = sil_post_set_mode, .bmdma_setup = ata_bmdma_setup, .bmdma_start = ata_bmdma_start,
@@ -343,7 +342,7 @@ static void sil_host_intr(struct ata_porstruct ata_queued_cmd *qc =ata_qc_from_tag (ap, ap->active_tag);u8 status; -if (unlikely (!qc || qc->tf.ctl &ATA_NIEN )) +if (unlikely (bmdma2 &SIL_DMA_SATA_IRQ || !qc || qc->tf.ctl &ATA_NIEN )) goto freeze;/* Check whether we are expecting interrupt in this state */
@@ -416,7 +415,7 @@ static irqreturn_t sil_interrupt(int irqif (unlikely (!ap || ap->flags &ATA_FLAG_DISABLED ))continue ; -if (!(bmdma2 &SIL_DMA_COMPLETE )) +if (!(bmdma2 & (SIL_DMA_COMPLETE |SIL_DMA_SATA_IRQ )))continue ;sil_host_intr (ap, bmdma2);
@@ -433,6 +432,9 @@ static void sil_freeze(struct ata_port *void __iomem *mmio_base = ap->host_set->mmio_base;u32 tmp; +/* global IRQ mask doesn't block SATA IRQ, turn off explicitly */ +writel (0 , mmio_base + sil_port[ap->port_no].sien); +/* plug IRQ */ tmp =readl (mmio_base +SIL_SYSCFG ); tmp |=SIL_MASK_IDE0_INT << ap->port_no;
@@ -449,6 +451,9 @@ static void sil_thaw(struct ata_port *apata_chk_status (ap); ap->ops->irq_clear (ap); +/* turn on SATA IRQ */ +writel (SIL_SIEN_N , mmio_base + sil_port[ap->port_no].sien); +/* turn on IRQ */ tmp =readl (mmio_base +SIL_SYSCFG ); tmp &= ~(SIL_MASK_IDE0_INT << ap->port_no);
@@ -622,11 +627,6 @@ static int sil_init_one (struct pci_dev mmio_base + sil_port[2].bmdma); } -/* mask all SATA phy-related interrupts */ -/* TODO: unmask bit 6 (SError N bit) for hotplug */ -for (i =0 ; i < probe_ent->n_ports; i++) -writel (0 , mmio_base + sil_port[i].sien); -pci_set_master (pdev);/* FIXME: check ata_device_add return value */
Signature · 1 line
1.2.4
PATCH 10/13 ahci: convert to new probing mechanism and add hotplug support
In reply to Tejun HeoConvert to new probing mechanism and add hotplug support by enabling PORT_IRQ_PHYRDY. Standard EH will do the right thing and schedule probe after analyzing SError.
---
drivers/scsi/ahci.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-)
214b9d988fe2db84de1d825d5c57e11ae2ffa28a
drivers/scsi/ahci.c +13 -17
@@ -136,6 +136,7 @@ enum {PORT_IRQ_FREEZE =PORT_IRQ_HBUS_ERR |PORT_IRQ_IF_ERR |PORT_IRQ_CONNECT | +PORT_IRQ_PHYRDY |PORT_IRQ_UNK_FIS ,PORT_IRQ_ERROR =PORT_IRQ_FREEZE | PORT_IRQ_TF_ERR |
@@ -200,7 +201,6 @@ static void ahci_scr_write (struct ata_pstatic int ahci_init_one (struct pci_dev *pdev,const struct pci_device_id *ent);static unsigned int ahci_qc_issue (struct ata_queued_cmd *qc);static irqreturn_t ahci_interrupt (int irq,void *dev_instance,struct pt_regs *regs); -static int ahci_probe_reset (struct ata_port *ap,unsigned int *classes);static void ahci_irq_clear (struct ata_port *ap);static int ahci_port_start (struct ata_port *ap);static void ahci_port_stop (struct ata_port *ap);
@@ -239,8 +239,6 @@ static const struct ata_port_operations .tf_read = ahci_tf_read, - .probe_reset = ahci_probe_reset, - .qc_prep = ahci_qc_prep, .qc_issue = ahci_qc_issue,
@@ -564,6 +562,17 @@ static int ahci_clo(struct ata_port *ap)return 0 ; } +static int ahci_prereset (struct ata_port *ap) +{ +if ((ap->flags &AHCI_FLAG_RESET_NEEDS_CLO ) && + (ata_busy_wait (ap,ATA_BUSY ,1000 ) &ATA_BUSY )) { +/* ATA_BUSY hasn't cleared, so send a CLO */ +ahci_clo (ap); + } + +return ata_std_prereset (ap); +} +static int ahci_softreset (struct ata_port *ap,unsigned int *class) {struct ahci_port_priv *pp = ap->private_data;
@@ -715,19 +724,6 @@ static void ahci_postreset(struct ata_po } } -static int ahci_probe_reset (struct ata_port *ap,unsigned int *classes) -{ -if ((ap->flags &AHCI_FLAG_RESET_NEEDS_CLO ) && - (ata_busy_wait (ap,ATA_BUSY ,1000 ) &ATA_BUSY )) { -/* ATA_BUSY hasn't cleared, so send a CLO */ -ahci_clo (ap); - } - -return ata_drive_probe_reset (ap, ata_std_probeinit, - ahci_softreset, ahci_hardreset, - ahci_postreset, classes); -} -static u8 ahci_check_status (struct ata_port *ap) {void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr;
@@ -1018,7 +1014,7 @@ static void ahci_error_handler(struct at }/* perform recovery */ -ata_do_eh (ap, ata_std_prereset, ahci_softreset, ahci_hardreset, +ata_do_eh (ap, ahci_prereset, ahci_softreset, ahci_hardreset, ahci_postreset); }
Signature · 1 line
1.2.4
Re: [PATCH 08/13] ata_piix: convert ata_piix to new probing mechanism
In reply to Tejun HeoQuoted 3 lines · Tejun Heo
Convert
ata_piixto new probing mechanism. Automatic hotplug is not supported due to hardware limitation (no PHY event interrupt), but warm plugging works.
True for the SATA ports but don't try it on the PATA ones. The PATA side requires the right buffers are present, and also in some situations that IORDY is not in use before the unplug.
Alan
PATCH 11/13 sata_sil24: convert to new probing mechanism and add hotplug support
In reply to Tejun HeoConvert to new probing mechanism and add hotplug support by enabling PORT_IRQ_PHYRDY_CHG and scheduling probe when either of PORT_IRQ_PHYRDY_CHG or PORT_IRQ_DEV_XCHG happens. Probing is requested explicitly as sil24's SError doesn't always reflect DEV_XCHG and PHYRDY_CHG conditions properly.
---
drivers/scsi/sata_sil24.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-)
f9c5769cf121692502bd0aa4c7a609d0ea604f07
drivers/scsi/sata_sil24.c +9 -13
@@ -159,7 +159,8 @@ enum {PORT_IRQ_SDB_NOTIFY = (1 <<11 ),/* SDB notify received */ DEF_PORT_IRQ =PORT_IRQ_COMPLETE |PORT_IRQ_ERROR | -PORT_IRQ_DEV_XCHG |PORT_IRQ_UNK_FIS , +PORT_IRQ_PHYRDY_CHG |PORT_IRQ_DEV_XCHG | +PORT_IRQ_UNK_FIS ,/* bits[27:16] are unmasked (raw) */ PORT_IRQ_RAW_SHIFT = 16,
@@ -322,7 +323,6 @@ struct sil24_host_priv {static void sil24_dev_config (struct ata_port *ap,struct ata_device *dev);static u32 sil24_scr_read (struct ata_port *ap,unsigned sc_reg);static void sil24_scr_write (struct ata_port *ap,unsigned sc_reg,u32 val); -static int sil24_probe_reset (struct ata_port *ap,unsigned int *classes);static void sil24_qc_prep (struct ata_queued_cmd *qc);static unsigned int sil24_qc_issue (struct ata_queued_cmd *qc);static void sil24_irq_clear (struct ata_port *ap);
@@ -380,8 +380,6 @@ static const struct ata_port_operations .check_altstatus = ata_noop_check_status, .dev_select = ata_noop_dev_select, - .probe_reset = sil24_probe_reset, - .qc_prep = sil24_qc_prep, .qc_issue = sil24_qc_issue,
@@ -620,13 +618,6 @@ static int sil24_hardreset(struct ata_poreturn -EIO ; } -static int sil24_probe_reset (struct ata_port *ap,unsigned int *classes) -{ -return ata_drive_probe_reset (ap, ata_std_probeinit, - sil24_softreset, sil24_hardreset, - ata_std_postreset, classes); -} -static inline void sil24_fill_sg (struct ata_queued_cmd *qc,struct sil24_sge *sge) {
@@ -757,13 +748,18 @@ static void sil24_error_intr(struct ata_ata_ehi_push_desc (ehi,"irq_stat 0x%08x" , irq_stat); -if (irq_stat &PORT_IRQ_DEV_XCHG ) { +if (irq_stat & (PORT_IRQ_PHYRDY_CHG |PORT_IRQ_DEV_XCHG )) { ehi->err_mask |=AC_ERR_ATA_BUS ;/* sil24 doesn't recover very well from phy * disconnection with a softreset. Force hardreset. */ ehi->action |=ATA_EH_HARDRESET ; -ata_ehi_push_desc (ehi,", device_exchanged" ); +ata_ehi_push_desc (ehi,", %s" , + irq_stat &PORT_IRQ_PHYRDY_CHG ? +"PHY RDY changed" :"device exchanged" ); + +/* sil24 SError isn't reliable, request probing explicitly */ + ehi->probe_mask =1 ; freeze =1 ; }
Signature · 1 line
1.2.4
Re: [PATCH 08/13] ata_piix: convert ata_piix to new probing mechanism
In reply to Alan CoxQuoted 9 lines · Alan Cox
Quoted 3 lines · Tejun Heo
Convert
ata_piixto new probing mechanism. Automatic hotplug is not supported due to hardware limitation (no PHY event interrupt), but warm plugging works.True for the SATA ports but don't try it on the PATA ones. The PATA side requires the right buffers are present, and also in some situations that IORDY is not in use before the unplug.
Yeap, also the power plug is troublesome too. It doesn't have spike protection and the machine goes out quite often if hot plugged. ata_piix PATA warm plugging is mainly for notebook users with hotswap bays and people with PATA->SATA bridges attached.
In the long term, we need to establish use cases and conventions for warm/hot plugging. Even SATA hot plugging can destroy filesystems on unrelated disks if power supply cannot hold 12v steady while the hot plugged drive spins up. To be on the safe side, disks need to be flushed and held before hotplugging and released after the new device reaches stable state. Sturdy machines including most servers with decent power supplies should be okay though.
So, kernel IO holding support and nice CLI/GUI programs to show the current configuration and drive plugging sequence would be nice, I think.
Signature · 1 line
tejun
Re: [PATCH 08/13] ata_piix: convert ata_piix to new probing mechanism
In reply to Alan CoxHi Alan,
Quoted 8 lines · Alan Cox
Quoted 3 lines · Tejun Heo
Convert
ata_piixto new probing mechanism. Automatic hotplug is not supported due to hardware limitation (no PHY event interrupt), but warm plugging works.True for the SATA ports but don't try it on the PATA ones. The PATA side requires the right buffers are present, and also in some situations that IORDY is not in use before the unplug.
I'm not sure what you mean but the successful ThinkPad UltraBay hotplugging which I reported earlier is with PATA DVD and PATA HDD, on ICH6M with ata_piix. I tried it many times, with no problems or unexpected dmesg entries.
As mentioned, it takes an extra ACPI command to electrically turn off the port.
Shem
Re: [PATCH 08/13] ata_piix: convert ata_piix to new probing mechanism
Quoted 12 lines · Shem Multinymous
Hi Alan,
Quoted 8 lines · Alan Cox
Quoted 3 lines · Tejun Heo
Convert
ata_piixto new probing mechanism. Automatic hotplug is not supported due to hardware limitation (no PHY event interrupt), but warm plugging works.True for the SATA ports but don't try it on the PATA ones. The PATA side requires the right buffers are present, and also in some situations that IORDY is not in use before the unplug.
Quoted 6 lines
I'm not sure what you mean but the successful ThinkPad UltraBay hotplugging which I reported earlier is with PATA DVD and PATA HDD, on ICH6M with
ata_piix. I tried it many times, with no problems or unexpected dmesg entries.As mentioned, it takes an extra ACPI command to electrically turn off the port.
Yeap, notebooks are special. Those hotbays are equipped with special power/signal connectors, circuits and switches to prevent things from burning, but, in general, hot plugging/unplugging PATA devices can fry the device and the controller.
Signature · 1 line
tejun
Quoted 7 lines · Tejun Heo
Hi.
This is part of patchset series described in [T].
This is the second take of add-hotplug-support patchset. Changes from the last take[L] are
One problem found here. On hotplugs where power is applied at the same time, prereset() doesn't wait enough and the first reset often fails causing unnecessary delays. I have fixed this in my repository by debouncing for 5 secs in prereset before probing resets.
Signature · 1 line
tejun