linas wrote: > Hi James, > Please review the patch below, and forward upstream. I've been > bouncing it to various mailing lists for the last half-year, > it has been living in an -mm tree for a while, and was a part of > GregKH's patchset for a while. I'd like to get it propely upstream. Sorry I didn't notice this before.. Couple minor nits below > > +/* --------------- PCI Error Recovery infrastructure ----------- */ Kill this comment line. > +/** 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. > + */ Fix to be proper kerneldoc format. The same applies for all the added functions. > +static int ipr_reset_freeze(struct ipr_cmnd *ipr_cmd) > +{ > + /* Disallow new interrupts, avoid loop */ > + ipr_cmd->ioa_cfg->allow_interrupts = 0; > + 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 pci_ers_result_t ipr_eeh_error_detected(struct pci_dev *pdev, > + pci_channel_state_t state) > +{ > + switch (state) { > + case pci_channel_io_frozen: > + ipr_eeh_frozen (pdev); > + return PCI_ERS_RESULT_NEED_RESET; > + > + case pci_channel_io_perm_failure: > + ipr_eeh_perm_failure (pdev); > + return PCI_ERS_RESULT_DISCONNECT; > + break; > + default: > + break; > + } > + return PCI_ERS_RESULT_NEED_RESET; > +} > + > +/* ------------- end of PCI Error Recovery suport ----------- */ Kill this line as well. Thanks, Brian -- Brian King eServer Storage I/O IBM Linux Technology Center - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html