Skip to content

Commit 463fc69

Browse files
bjking1James Bottomley
bjking1
authored and
James Bottomley
committed
[SCSI] ipr: Use PCI-E reset API for new ipr adapter
Use a newly added PCI API to issue a PCI Fundamental reset (warm reset) to a new ipr PCI-E adapter. Typically, the ipr adapter uses the start BIST bit in config space to reset an adapter. Issuing start BIST on this particular adapter results in the PCI-E logic on the card losing sync, which causes PCI-E errors, making the card unusable. The only reset mechanism that exists on this hardware that does not have this problem is PCI Fundamental reset (warm reset). Signed-off-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
1 parent d24f8e8 commit 463fc69

File tree

2 files changed

+72
-6
lines changed

2 files changed

+72
-6
lines changed

‎drivers/scsi/ipr.c

Lines changed: 65 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6640,6 +6640,48 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)
66406640
return rc;
66416641
}
66426642

6643+
/**
6644+
* ipr_reset_slot_reset_done - Clear PCI reset to the adapter
6645+
* @ipr_cmd: ipr command struct
6646+
*
6647+
* Description: This clears PCI reset to the adapter and delays two seconds.
6648+
*
6649+
* Return value:
6650+
* IPR_RC_JOB_RETURN
6651+
**/
6652+
static int ipr_reset_slot_reset_done(struct ipr_cmnd *ipr_cmd)
6653+
{
6654+
ENTER;
6655+
pci_set_pcie_reset_state(ipr_cmd->ioa_cfg->pdev, pcie_deassert_reset);
6656+
ipr_cmd->job_step = ipr_reset_bist_done;
6657+
ipr_reset_start_timer(ipr_cmd, IPR_WAIT_FOR_BIST_TIMEOUT);
6658+
LEAVE;
6659+
return IPR_RC_JOB_RETURN;
6660+
}
6661+
6662+
/**
6663+
* ipr_reset_slot_reset - Reset the PCI slot of the adapter.
6664+
* @ipr_cmd: ipr command struct
6665+
*
6666+
* Description: This asserts PCI reset to the adapter.
6667+
*
6668+
* Return value:
6669+
* IPR_RC_JOB_RETURN
6670+
**/
6671+
static int ipr_reset_slot_reset(struct ipr_cmnd *ipr_cmd)
6672+
{
6673+
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
6674+
struct pci_dev *pdev = ioa_cfg->pdev;
6675+
6676+
ENTER;
6677+
pci_block_user_cfg_access(pdev);
6678+
pci_set_pcie_reset_state(pdev, pcie_warm_reset);
6679+
ipr_cmd->job_step = ipr_reset_slot_reset_done;
6680+
ipr_reset_start_timer(ipr_cmd, IPR_PCI_RESET_TIMEOUT);
6681+
LEAVE;
6682+
return IPR_RC_JOB_RETURN;
6683+
}
6684+
66436685
/**
66446686
* ipr_reset_allowed - Query whether or not IOA can be reset
66456687
* @ioa_cfg: ioa config struct
@@ -6679,7 +6721,7 @@ static int ipr_reset_wait_to_start_bist(struct ipr_cmnd *ipr_cmd)
66796721
ipr_cmd->u.time_left -= IPR_CHECK_FOR_RESET_TIMEOUT;
66806722
ipr_reset_start_timer(ipr_cmd, IPR_CHECK_FOR_RESET_TIMEOUT);
66816723
} else {
6682-
ipr_cmd->job_step = ipr_reset_start_bist;
6724+
ipr_cmd->job_step = ioa_cfg->reset;
66836725
rc = IPR_RC_JOB_CONTINUE;
66846726
}
66856727

@@ -6712,7 +6754,7 @@ static int ipr_reset_alert(struct ipr_cmnd *ipr_cmd)
67126754
writel(IPR_UPROCI_RESET_ALERT, ioa_cfg->regs.set_uproc_interrupt_reg);
67136755
ipr_cmd->job_step = ipr_reset_wait_to_start_bist;
67146756
} else {
6715-
ipr_cmd->job_step = ipr_reset_start_bist;
6757+
ipr_cmd->job_step = ioa_cfg->reset;
67166758
}
67176759

67186760
ipr_cmd->u.time_left = IPR_WAIT_FOR_RESET_TIMEOUT;
@@ -6994,8 +7036,11 @@ static pci_ers_result_t ipr_pci_slot_reset(struct pci_dev *pdev)
69947036
struct ipr_ioa_cfg *ioa_cfg = pci_get_drvdata(pdev);
69957037

69967038
spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
6997-
_ipr_initiate_ioa_reset(ioa_cfg, ipr_reset_restore_cfg_space,
6998-
IPR_SHUTDOWN_NONE);
7039+
if (ioa_cfg->needs_warm_reset)
7040+
ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NONE);
7041+
else
7042+
_ipr_initiate_ioa_reset(ioa_cfg, ipr_reset_restore_cfg_space,
7043+
IPR_SHUTDOWN_NONE);
69997044
spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
70007045
return PCI_ERS_RESULT_RECOVERED;
70017046
}
@@ -7483,6 +7528,14 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
74837528
else
74847529
ioa_cfg->transop_timeout = IPR_OPERATIONAL_TIMEOUT;
74857530

7531+
rc = pci_read_config_byte(pdev, PCI_REVISION_ID, &ioa_cfg->revid);
7532+
7533+
if (rc != PCIBIOS_SUCCESSFUL) {
7534+
dev_err(&pdev->dev, "Failed to read PCI revision ID\n");
7535+
rc = -EIO;
7536+
goto out_scsi_host_put;
7537+
}
7538+
74867539
ipr_regs_pci = pci_resource_start(pdev, 0);
74877540

74887541
rc = pci_request_regions(pdev, IPR_NAME);
@@ -7569,6 +7622,13 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
75697622
goto cleanup_nolog;
75707623
}
75717624

7625+
if ((dev_id->driver_data & IPR_USE_PCI_WARM_RESET) ||
7626+
(dev_id->device == PCI_DEVICE_ID_IBM_OBSIDIAN_E && !ioa_cfg->revid)) {
7627+
ioa_cfg->needs_warm_reset = 1;
7628+
ioa_cfg->reset = ipr_reset_slot_reset;
7629+
} else
7630+
ioa_cfg->reset = ipr_reset_start_bist;
7631+
75727632
spin_lock(&ipr_driver_lock);
75737633
list_add_tail(&ioa_cfg->queue, &ipr_ioa_head);
75747634
spin_unlock(&ipr_driver_lock);
@@ -7835,7 +7895,7 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = {
78357895
PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B3, 0, 0, 0 },
78367896
{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
78377897
PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7, 0, 0,
7838-
IPR_USE_LONG_TRANSOP_TIMEOUT },
7898+
IPR_USE_LONG_TRANSOP_TIMEOUT | IPR_USE_PCI_WARM_RESET },
78397899
{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE,
78407900
PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2780, 0, 0, 0 },
78417901
{ PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,

‎drivers/scsi/ipr.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/*
3838
* Literals
3939
*/
40-
#define IPR_DRIVER_VERSION "2.4.0"
40+
#define IPR_DRIVER_VERSION "2.4.1"
4141
#define IPR_DRIVER_DATE "(April 24, 2007)"
4242

4343
/*
@@ -112,6 +112,7 @@
112112

113113
/* Driver data flags */
114114
#define IPR_USE_LONG_TRANSOP_TIMEOUT 0x00000001
115+
#define IPR_USE_PCI_WARM_RESET 0x00000002
115116

116117
#define IPR_DEFAULT_MAX_ERROR_DUMP 984
117118
#define IPR_NUM_LOG_HCAMS 2
@@ -193,6 +194,7 @@
193194
#define IPR_WAIT_FOR_RESET_TIMEOUT (2 * HZ)
194195
#define IPR_CHECK_FOR_RESET_TIMEOUT (HZ / 10)
195196
#define IPR_WAIT_FOR_BIST_TIMEOUT (2 * HZ)
197+
#define IPR_PCI_RESET_TIMEOUT (HZ / 2)
196198
#define IPR_DUMP_TIMEOUT (15 * HZ)
197199

198200
/*
@@ -1091,6 +1093,9 @@ struct ipr_ioa_cfg {
10911093
u8 allow_ml_add_del:1;
10921094
u8 needs_hard_reset:1;
10931095
u8 dual_raid:1;
1096+
u8 needs_warm_reset:1;
1097+
1098+
u8 revid;
10941099

10951100
enum ipr_cache_state cache_state;
10961101
u16 type; /* CCIN of the card */
@@ -1184,6 +1189,7 @@ struct ipr_ioa_cfg {
11841189
struct pci_pool *ipr_cmd_pool;
11851190

11861191
struct ipr_cmnd *reset_cmd;
1192+
int (*reset) (struct ipr_cmnd *);
11871193

11881194
struct ata_host ata_host;
11891195
char ipr_cmd_label[8];

0 commit comments

Comments
 (0)