[lkml]   [2010]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH 01/97] SCSI: ipr: fix EEH recovery
    From: Kleber Sacilotto de Souza <>

    commit 99c965dd9ee1a004efc083c3d760ba982bb76adf upstream.

    After commits c82f63e411f1b58427c103bd95af2863b1c96dd1 (PCI: check saved
    state before restore) and 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff (PCI:
    Clear saved_state after the state has been restored) PCI drivers are
    prevented from restoring the device standard configuration registers
    twice in a row. These changes introduced a regression on ipr EEH

    The ipr device driver saves the PCI state only during the device probe
    and restores it on ipr_reset_restore_cfg_space() during IOA resets. This
    behavior is causing the EEH recovery to fail after the second error
    detected, since the registers are not being restored.

    One possible solution would be saving the registers after restoring
    them. The problem with this approach is that while recovering from an
    EEH error if pci_save_state() results in an EEH error, the adapter/slot
    will be reset, and end up back in ipr_reset_restore_cfg_space(), but it
    won't have a valid saved state to restore, so pci_restore_state() will

    The following patch introduces a workaround for this problem, hacking
    around the PCI API by setting pdev->state_saved = true before we do the
    restore. It fixes the EEH regression and prevents that we hit another
    EEH error during EEH recovery.

    [jejb: fix is a hack ... Jesse and Rafael will fix properly]
    Signed-off-by: Kleber Sacilotto de Souza <>
    Acked-by: Brian King <>
    Cc: Jesse Barnes <>
    Signed-off-by: James Bottomley <>
    Signed-off-by: Greg Kroah-Hartman <>
    drivers/scsi/ipr.c | 1 +
    1 files changed, 1 insertions(+), 0 deletions(-)

    diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
    index 76d294f..c3ff9a6 100644
    --- a/drivers/scsi/ipr.c
    +++ b/drivers/scsi/ipr.c
    @@ -6516,6 +6516,7 @@ static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd)
    int rc;

    + ioa_cfg->pdev->state_saved = true;
    rc = pci_restore_state(ioa_cfg->pdev);

    if (rc != PCIBIOS_SUCCESSFUL) {

     \ /
      Last update: 2010-01-05 01:37    [W:0.019 / U:25.956 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site