: PCI Err: IPR scsi device driver recovery
Subsystems (2)
PATCH 3/13 : PCI Err: IPR scsi device driver recovery
pci-err-3-ipr.patch
Adds PCI error recovery callbacks to the IPR SCSI controller driver. Tested, seems to work well, a variant of this ships already in the Novell/SUSE SLES9 SP2 kernel.
Signed-off-by Linas Vepstas <[email protected]>
drivers/scsi/ipr.c renamed from drivers/scsi/ipr.c.linas-orig +86 -0
@@ -5326,6 +5326,88 @@ static void ipr_initiate_ioa_reset(struc shutdown_type); } +#ifdef CONFIG_SCSI_IPR_EEH_RECOVERY + +/** If the PCI slot is frozen, hold off all i/o +* activity; then, as soon as the slot is available again, +* initiate an adapter reset. +*/ +static int ipr_reset_freeze (struct ipr_cmnd *ipr_cmd) +{ +list_add_tail (&ipr_cmd->queue, &ipr_cmd->ioa_cfg->pending_q); + ipr_cmd->done = ipr_reset_ioa_job; +return IPR_RC_JOB_RETURN ; +} + +/** ipr_eeh_frozen -- called when slot has experience PCI bus error. +* This routine is called to tell us that the PCI bus is down. +* Can't do anything here, except put the device driver into a +* holding pattern, waiting for the PCI bus to come back. +*/ +static void ipr_eeh_frozen (struct pci_dev *pdev) +{ +unsigned long flags =0 ; +struct ipr_ioa_cfg *ioa_cfg =pci_get_drvdata (pdev); + +spin_lock_irqsave (ioa_cfg->host->host_lock, flags); +_ipr_initiate_ioa_reset (ioa_cfg, ipr_reset_freeze,IPR_SHUTDOWN_NONE ); +spin_unlock_irqrestore (ioa_cfg->host->host_lock, flags); +} + +/** ipr_eeh_slot_reset - called when pci slot has been reset. +* +* This routine is called by the pci error recovery recovery +* code after the PCI slot has been reset, just before we +* should resume normal operations. +*/ +static int ipr_eeh_slot_reset (struct pci_dev *pdev) +{ +unsigned long flags =0 ; +struct ipr_ioa_cfg *ioa_cfg =pci_get_drvdata (pdev); + +pci_enable_device (pdev); +pci_set_master (pdev); +enable_irq (pdev->irq); +spin_lock_irqsave (ioa_cfg->host->host_lock, flags); +_ipr_initiate_ioa_reset (ioa_cfg, ipr_reset_restore_cfg_space, +IPR_SHUTDOWN_NONE ); +spin_unlock_irqrestore (ioa_cfg->host->host_lock, flags); + +return PCIERR_RESULT_RECOVERED ; +} + +/** This routine is called when the PCI bus has permanently +* failed. This routine should purge all pending I/O and +* shut down the device driver (close and unload). +* XXX Needs to be implemented. +*/ +static void ipr_eeh_perm_failure (struct pci_dev *pdev) +{ +#if 0 // XXXXXXXXXXXXXXXXXXXXXXX + ipr_cmd->job_step = ipr_reset_shutdown_ioa; + rc =IPR_RC_JOB_CONTINUE ; +#endif +} + +static int ipr_eeh_error_detected (struct pci_dev *pdev, +enum pci_channel_state state) +{ +switch (state) { +case pci_channel_io_frozen: +ipr_eeh_frozen (pdev); +return PCIERR_RESULT_NEED_RESET ; + +case pci_channel_io_perm_failure: +ipr_eeh_perm_failure (pdev); +return PCIERR_RESULT_DISCONNECT ; +break ; +default : +break ; + } +return PCIERR_RESULT_NEED_RESET ; +} +#endif +/** * ipr_probe_ioa_part2 - Initializes IOAs found in ipr_probe_ioa(..) * @ioa_cfg: ioa cfg struct
@@ -6068,6 +6150,10 @@ static struct pci_driver ipr_driver = { .id_table = ipr_pci_table, .probe = ipr_probe, .remove = ipr_remove, + .err_handler = { + .error_detected = ipr_eeh_error_detected, + .slot_reset = ipr_eeh_slot_reset, + }, .driver = { .shutdown = ipr_shutdown, },
drivers/scsi/Kconfig renamed from drivers/scsi/Kconfig.linas-orig +8 -0
@@ -1065,6 +1065,14 @@ config SCSI_IPR_DUMP If you enable this support, the iprdump daemon can be used to capture adapter failure analysis information. +config SCSI_IPR_EEH_RECOVERY + bool "Enable PCI bus error recovery" + depends on SCSI_IPR && PPC_PSERIES + help + If you say Y here, the driver will be able to recover from + PCI bus errors on many PowerPC platforms. IBM pSeries users + should answer Y. + config SCSI_ZALON tristate "Zalon SCSI support" depends on GSC && SCSI
arch/ppc64/configs/pSeries_defconfig renamed from arch/ppc64/configs/pSeries_defconfig.linas-orig +1 -0
@@ -314,6 +314,7 @@ CONFIG_SCSI_IPR CONFIG_SCSI_IPR=y CONFIG_SCSI_IPR_TRACE=y CONFIG_SCSI_IPR_DUMP=y +CONFIG_SCSI_IPR_EEH_RECOVERY=y # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set CONFIG_SCSI_QLA2XXX=y
Brian King
maintainerdrivers/scsi/ipr.c static void ipr_initiate_ioa_reset(struc · line 5390
Quoted 12 lines · Linas Vepstas
drivers/scsi/ipr.c renamed from drivers/scsi/ipr.c.linas-orig +12
-0+/** This routine is called when the PCI bus has permanently +* failed. This routine should purge all pending I/O and +* shut down the device driver (close and unload). +* XXX Needs to be implemented. +*/ +static void ipr_eeh_perm_failure (struct pci_dev *pdev) +{ +#if 0 // XXXXXXXXXXXXXXXXXXXXXXX + ipr_cmd->job_step = ipr_reset_shutdown_ioa; + rc =IPR_RC_JOB_CONTINUE ; +#endif +}
What were your plans here? What can the device driver rely on here? Are interrupts disabled? Will pci config accesses all fail? Should the driver attempt to talk to the pci adapter at all, or should it simply clean up after it?
Signature · 3 lines
Brian King eServer Storage I/O IBM Linux Technology Center