diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c --- a/drivers/scsi/arcmsr/arcmsr_hba.c 2013-02-08 13:55:04.814477574 +0800 +++ b/drivers/scsi/arcmsr/arcmsr_hba.c 2013-02-08 13:55:18.557754617 +0800 @@ -89,11 +89,18 @@ static int arcmsr_bios_param(struct scsi static int arcmsr_queue_command(struct Scsi_Host *h, struct scsi_cmnd *cmd); static int arcmsr_probe(struct pci_dev *pdev, const struct pci_device_id *id); +#ifdef CONFIG_PM + static int arcmsr_suspend(struct pci_dev *pdev, + pm_message_t state); + static int arcmsr_resume(struct pci_dev *pdev); +#endif static void arcmsr_remove(struct pci_dev *pdev); static void arcmsr_shutdown(struct pci_dev *pdev); static void arcmsr_iop_init(struct AdapterControlBlock *acb); static void arcmsr_free_ccb_pool(struct AdapterControlBlock *acb); static u32 arcmsr_disable_outbound_ints(struct AdapterControlBlock *acb); +static void arcmsr_enable_outbound_ints(struct AdapterControlBlock *acb, + u32 orig_mask); static void arcmsr_stop_adapter_bgrb(struct AdapterControlBlock *acb); static void arcmsr_hbaA_flush_cache(struct AdapterControlBlock *acb); static void arcmsr_hbaB_flush_cache(struct AdapterControlBlock *acb); @@ -166,6 +173,10 @@ static struct pci_driver arcmsr_pci_driv .id_table = arcmsr_device_id_table, .probe = arcmsr_probe, .remove = arcmsr_remove, + #ifdef CONFIG_PM + .suspend = arcmsr_suspend, + .resume = arcmsr_resume, + #endif .shutdown = arcmsr_shutdown, }; /* @@ -553,10 +564,10 @@ arcmsr_message_isr_bh_fn(struct work_str psdev = scsi_device_lookup(acb->host, 0, target, lun); - if (psdev != NULL) { - scsi_remove_device(psdev); - scsi_device_put(psdev); - } + if (psdev != NULL) { + scsi_remove_device(psdev); + scsi_device_put(psdev); + } } temp >>= 1; diff >>= 1; @@ -663,6 +674,85 @@ arcmsr_message_isr_bh_fn(struct work_str } } +#ifdef CONFIG_PM + static int + arcmsr_suspend(struct pci_dev *pdev, pm_message_t state) + { + uint32_t intmask_org; + struct Scsi_Host *host = pci_get_drvdata(pdev); + struct AdapterControlBlock *acb = + (struct AdapterControlBlock *)host->hostdata; + + intmask_org = arcmsr_disable_outbound_ints(acb); + free_irq(pdev->irq, acb); + del_timer_sync(&acb->eternal_timer); + flush_scheduled_work(); + arcmsr_stop_adapter_bgrb(acb); + arcmsr_flush_adapter_cache(acb); + arcmsr_enable_outbound_ints(acb, intmask_org); + pci_set_drvdata(pdev, host); + pci_save_state(pdev); + pci_disable_device(pdev); + pci_set_power_state(pdev, pci_choose_state(pdev, state)); + return 0; + } + + static int + arcmsr_resume(struct pci_dev *pdev) + { + int error; + struct Scsi_Host *host = pci_get_drvdata(pdev); + struct AdapterControlBlock *acb = + (struct AdapterControlBlock *)host->hostdata; + pci_set_power_state(pdev, PCI_D0); + pci_enable_wake(pdev, PCI_D0, 0); + pci_restore_state(pdev); + if (pci_enable_device(pdev)) { + printk("%s: pci_enable_device error\n", __func__); + return -ENODEV; + } + error = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); + if (error) { + error = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); + if (error) { + pr_warn("scsi%d: No suitable DMA mask available\n", + host->host_no); + goto controller_unregister; + } + } + pci_set_master(pdev); + arcmsr_iop_init(acb); + if (request_irq(pdev->irq, arcmsr_do_interrupt, + IRQF_SHARED, "arcmsr", acb)) { + goto controller_stop; + } + INIT_WORK(&acb->arcmsr_do_message_isr_bh, + arcmsr_message_isr_bh_fn); + atomic_set(&acb->rq_map_token, 16); + atomic_set(&acb->ante_token_value, 16); + acb->fw_flag = FW_NORMAL; + init_timer(&acb->eternal_timer); + acb->eternal_timer.expires = jiffies + + msecs_to_jiffies(6 * HZ); + acb->eternal_timer.data = (unsigned long) acb; + acb->eternal_timer.function = + &arcmsr_request_device_map; + add_timer(&acb->eternal_timer); + return 0; +controller_stop: + arcmsr_stop_adapter_bgrb(acb); + arcmsr_flush_adapter_cache(acb); +controller_unregister: + scsi_remove_host(host); + arcmsr_free_ccb_pool(acb); + arcmsr_unmap_pciregion(acb); + pci_release_regions(pdev); + scsi_host_put(host); + pci_disable_device(pdev); + return -ENODEV; + } +#endif + static int arcmsr_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct Scsi_Host *host; @@ -680,8 +770,7 @@ static int arcmsr_probe(struct pci_dev * if (error) { error = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); if (error) { - printk(KERN_WARNING - "scsi%d: No suitable DMA mask available\n", + pr_warn("scsi%d: No suitable DMA mask available\n", host->host_no); goto scsi_host_release; } @@ -960,12 +1049,12 @@ arcmsr_report_ccb_state(struct AdapterCo default: pr_notice("arcmsr%d: scsi id = %d lun = %d" - "isr get command error done, but got unknown" - "DeviceStatus = 0x%x\n" - , acb->host->host_no - , id - , lun - , ccb->arcmsr_cdb.DeviceStatus); + "isr get command error done, but got unknown" + "DeviceStatus = 0x%x\n" + , acb->host->host_no + , id + , lun + , ccb->arcmsr_cdb.DeviceStatus); acb->devstate[id][lun] = ARECA_RAID_GONE; ccb->pcmd->result = DID_NO_CONNECT << 16; arcmsr_ccb_complete(ccb); @@ -996,7 +1085,7 @@ struct CommandControlBlock *pCCB, bool e pr_notice("arcmsr%d: isr get an illegal ccb command" "done acb = '0x%p'" "ccb = '0x%p' ccbacb = '0x%p' startdone = 0x%x" - " ccboutstandingcount = %d\n" + "ccboutstandingcount = %d\n" , acb->host->host_no , acb , pCCB @@ -1023,6 +1112,7 @@ arcmsr_done4abort_postqueue(struct Adapt uint32_t outbound_intstatus; outbound_intstatus = readl(®->outbound_intstatus) & acb->outbound_int_enable; + /*clear and abort all outbound posted Q*/ writel(outbound_intstatus, ®->outbound_intstatus); while (((flag_ccb = readl(®->outbound_queueport)) != 0xFFFFFFFF) @@ -2262,8 +2352,8 @@ arcmsr_hbaA_get_config(struct AdapterCon ®->inbound_msgaddr0); if (!arcmsr_hbaA_wait_msgint_ready(acb)) { pr_notice("arcmsr%d: wait 'get adapter firmware" - "miscellaneous data' timeout\n", - acb->host->host_no); + "miscellaneous data' timeout\n", + acb->host->host_no); return false; } count = 8; @@ -3368,8 +3458,8 @@ arcmsr_abort(struct scsi_cmnd *cmd) int rtn = FAILED; pr_notice("arcmsr%d: abort device command of" "scsi id = %d lun = %d\n", - acb->host->host_no, - cmd->device->id, cmd->device->lun); + acb->host->host_no, + cmd->device->id, cmd->device->lun); acb->acb_flags |= ACB_F_ABORT; acb->num_aborts++; /*