Commit 4f2ddba3 authored by HighPoint Linux Team's avatar HighPoint Linux Team Committed by James Bottomley

[SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver

Updates:
- don't bypass SYNCHRONIZE_CACHE command
- return SCSI_MLQUEUE_HOST_BUSY when no free request slots
- move scsi_remove_host() to the begin of hpt_remove(), or it will
  not work after resources being released.
Signed-off-by: default avatarHighPoint Linux Team <linux@highpoint-tech.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent a623e14d
...@@ -504,19 +504,10 @@ static int hptiop_queuecommand(struct scsi_cmnd *scp, ...@@ -504,19 +504,10 @@ static int hptiop_queuecommand(struct scsi_cmnd *scp,
BUG_ON(!done); BUG_ON(!done);
scp->scsi_done = done; scp->scsi_done = done;
/*
* hptiop_shutdown will flash controller cache.
*/
if (scp->cmnd[0] == SYNCHRONIZE_CACHE) {
scp->result = DID_OK<<16;
goto cmd_done;
}
_req = get_req(hba); _req = get_req(hba);
if (_req == NULL) { if (_req == NULL) {
dprintk("hptiop_queuecmd : no free req\n"); dprintk("hptiop_queuecmd : no free req\n");
scp->result = DID_BUS_BUSY << 16; return SCSI_MLQUEUE_HOST_BUSY;
goto cmd_done;
} }
_req->scp = scp; _req->scp = scp;
...@@ -1429,6 +1420,8 @@ static void hptiop_remove(struct pci_dev *pcidev) ...@@ -1429,6 +1420,8 @@ static void hptiop_remove(struct pci_dev *pcidev)
dprintk("scsi%d: hptiop_remove\n", hba->host->host_no); dprintk("scsi%d: hptiop_remove\n", hba->host->host_no);
scsi_remove_host(host);
spin_lock(&hptiop_hba_list_lock); spin_lock(&hptiop_hba_list_lock);
list_del_init(&hba->link); list_del_init(&hba->link);
spin_unlock(&hptiop_hba_list_lock); spin_unlock(&hptiop_hba_list_lock);
...@@ -1448,7 +1441,6 @@ static void hptiop_remove(struct pci_dev *pcidev) ...@@ -1448,7 +1441,6 @@ static void hptiop_remove(struct pci_dev *pcidev)
pci_set_drvdata(hba->pcidev, NULL); pci_set_drvdata(hba->pcidev, NULL);
pci_disable_device(hba->pcidev); pci_disable_device(hba->pcidev);
scsi_remove_host(host);
scsi_host_put(host); scsi_host_put(host);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment