Skip to content

L
linux
Commit db2b6d05 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files
Options

[PATCH] qla1280: cleanup firmware loading, add pio-based loading 

The ISP1040 needs to load firmware by PIO, and while we're at it clean
the convoluted mess of firmware loading up by splitting it into
managable subroutines.
Signed-off-by: default avatarJes Sorensen <jes@wildopensource.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 94d4911b
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 224 deletions
drivers/scsi/qla1280.c
View file @ db2b6d05
...@@ -509,9 +509,7 @@ static int qla1280_setup(char *s) __init; ...@@ -509,9 +509,7 @@ static int qla1280_setup(char *s) __init;
/* /*
* QLogic ISP1280 Hardware Support Function Prototypes. * QLogic ISP1280 Hardware Support Function Prototypes.
*/ */
static int qla1280_isp_firmware(struct scsi_qla_host *); static int qla1280_load_firmware(struct scsi_qla_host *);
static int qla1280_chip_diag(struct scsi_qla_host *);
static int qla1280_setup_chip(struct scsi_qla_host *);
static int qla1280_init_rings(struct scsi_qla_host *); static int qla1280_init_rings(struct scsi_qla_host *);
static int qla1280_nvram_config(struct scsi_qla_host *); static int qla1280_nvram_config(struct scsi_qla_host *);
static int qla1280_mailbox_command(struct scsi_qla_host *, static int qla1280_mailbox_command(struct scsi_qla_host *,
...@@ -1802,17 +1800,8 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha) ...@@ -1802,17 +1800,8 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
*/ */
spin_lock_irqsave(HOST_LOCK, flags); spin_lock_irqsave(HOST_LOCK, flags);
#endif #endif
/* If firmware needs to be loaded */
if (qla1280_isp_firmware(ha)) {
if (!(status = qla1280_chip_diag(ha))) {
status = qla1280_setup_chip(ha);
}
} else {
printk(KERN_ERR "scsi(%li): isp_firmware() failed!\n",
ha->host_no);
status = 1;
}
status = qla1280_load_firmware(ha);
if (status) { if (status) {
printk(KERN_ERR "scsi(%li): initialize: pci probe failed!\n", printk(KERN_ERR "scsi(%li): initialize: pci probe failed!\n",
ha->host_no); ha->host_no);
...@@ -1945,13 +1934,13 @@ qla1280_chip_diag(struct scsi_qla_host *ha) ...@@ -1945,13 +1934,13 @@ qla1280_chip_diag(struct scsi_qla_host *ha)
int status = 0; int status = 0;
int cnt; int cnt;
uint16_t data; uint16_t data;
dprintk(3, "qla1280_chip_diag: testing device at 0x%p \n", &reg->id_l); dprintk(3, "qla1280_chip_diag: testing device at 0x%p \n", &reg->id_l);
dprintk(1, "scsi(%ld): Verifying chip\n", ha->host_no); dprintk(1, "scsi(%ld): Verifying chip\n", ha->host_no);
/* Soft reset chip and wait for it to finish. */ /* Soft reset chip and wait for it to finish. */
WRT_REG_WORD(&reg->ictrl, ISP_RESET); WRT_REG_WORD(&reg->ictrl, ISP_RESET);
/* /*
* We can't do a traditional PCI write flush here by reading * We can't do a traditional PCI write flush here by reading
* back the register. The card will not respond once the reset * back the register. The card will not respond once the reset
...@@ -1969,145 +1958,138 @@ qla1280_chip_diag(struct scsi_qla_host *ha) ...@@ -1969,145 +1958,138 @@ qla1280_chip_diag(struct scsi_qla_host *ha)
data = RD_REG_WORD(&reg->ictrl); data = RD_REG_WORD(&reg->ictrl);
} }
if (cnt) { if (!cnt)
/* Reset register cleared by chip reset. */ goto fail;
dprintk(3, "qla1280_chip_diag: reset register cleared by "
"chip reset\n");
WRT_REG_WORD(&reg->cfg_1, 0); /* Reset register cleared by chip reset. */
dprintk(3, "qla1280_chip_diag: reset register cleared by chip reset\n");
/* Reset RISC and disable BIOS which WRT_REG_WORD(&reg->cfg_1, 0);
allows RISC to execute out of RAM. */
#if 0
WRT_REG_WORD(&reg->host_cmd, HC_RESET_RISC);
RD_REG_WORD(&reg->id_l); /* Flush PCI write */
WRT_REG_WORD(&reg->host_cmd, HC_RELEASE_RISC);
RD_REG_WORD(&reg->id_l); /* Flush PCI write */
WRT_REG_WORD(&reg->host_cmd, HC_DISABLE_BIOS);
#else
WRT_REG_WORD(&reg->host_cmd, HC_RESET_RISC |
HC_RELEASE_RISC | HC_DISABLE_BIOS);
#endif
RD_REG_WORD(&reg->id_l); /* Flush PCI write */
data = qla1280_debounce_register(&reg->mailbox0);
/*
* I *LOVE* this code!
*/
for (cnt = 1000000; cnt && data == MBS_BUSY; cnt--) {
udelay(5);
data = RD_REG_WORD(&reg->mailbox0);
}
if (cnt) { /* Reset RISC and disable BIOS which
/* Check product ID of chip */ allows RISC to execute out of RAM. */
dprintk(3, "qla1280_chip_diag: Checking product " WRT_REG_WORD(&reg->host_cmd, HC_RESET_RISC |
"ID of chip\n"); HC_RELEASE_RISC | HC_DISABLE_BIOS);
if (RD_REG_WORD(&reg->mailbox1) != PROD_ID_1 || RD_REG_WORD(&reg->id_l); /* Flush PCI write */
(RD_REG_WORD(&reg->mailbox2) != PROD_ID_2 && data = qla1280_debounce_register(&reg->mailbox0);
RD_REG_WORD(&reg->mailbox2) != PROD_ID_2a) ||
RD_REG_WORD(&reg->mailbox3) != PROD_ID_3 || /*
RD_REG_WORD(&reg->mailbox4) != PROD_ID_4) { * I *LOVE* this code!
printk(KERN_INFO "qla1280: Wrong product ID = " */
"0x%x,0x%x,0x%x,0x%x\n", for (cnt = 1000000; cnt && data == MBS_BUSY; cnt--) {
RD_REG_WORD(&reg->mailbox1), udelay(5);
RD_REG_WORD(&reg->mailbox2), data = RD_REG_WORD(&reg->mailbox0);
RD_REG_WORD(&reg->mailbox3), }
RD_REG_WORD(&reg->mailbox4));
status = 1; if (!cnt)
} else { goto fail;
/*
* Enable ints early!!! /* Check product ID of chip */
*/ dprintk(3, "qla1280_chip_diag: Checking product ID of chip\n");
qla1280_enable_intrs(ha);
if (RD_REG_WORD(&reg->mailbox1) != PROD_ID_1 ||
dprintk(1, "qla1280_chip_diag: Checking " (RD_REG_WORD(&reg->mailbox2) != PROD_ID_2 &&
"mailboxes of chip\n"); RD_REG_WORD(&reg->mailbox2) != PROD_ID_2a) ||
/* Wrap Incoming Mailboxes Test. */ RD_REG_WORD(&reg->mailbox3) != PROD_ID_3 ||
mb[0] = MBC_MAILBOX_REGISTER_TEST; RD_REG_WORD(&reg->mailbox4) != PROD_ID_4) {
mb[1] = 0xAAAA; printk(KERN_INFO "qla1280: Wrong product ID = "
mb[2] = 0x5555; "0x%x,0x%x,0x%x,0x%x\n",
mb[3] = 0xAA55; RD_REG_WORD(&reg->mailbox1),
mb[4] = 0x55AA; RD_REG_WORD(&reg->mailbox2),
mb[5] = 0xA5A5; RD_REG_WORD(&reg->mailbox3),
mb[6] = 0x5A5A; RD_REG_WORD(&reg->mailbox4));
mb[7] = 0x2525; goto fail;
if (!(status = qla1280_mailbox_command(ha, }
0xff,
&mb
[0]))) {
if (mb[1] != 0xAAAA ||
mb[2] != 0x5555 ||
mb[3] != 0xAA55 ||
mb[4] != 0x55AA ||
mb[5] != 0xA5A5 ||
mb[6] != 0x5A5A ||
mb[7] != 0x2525) {
status = 1;
printk(KERN_INFO "qla1280: "
"Failed mbox check\n");
}
}
}
} else
status = 1;
} else
status = 1;
/*
* Enable ints early!!!
*/
qla1280_enable_intrs(ha);
dprintk(1, "qla1280_chip_diag: Checking mailboxes of chip\n");
/* Wrap Incoming Mailboxes Test. */
mb[0] = MBC_MAILBOX_REGISTER_TEST;
mb[1] = 0xAAAA;
mb[2] = 0x5555;
mb[3] = 0xAA55;
mb[4] = 0x55AA;
mb[5] = 0xA5A5;
mb[6] = 0x5A5A;
mb[7] = 0x2525;
status = qla1280_mailbox_command(ha, 0xff, mb);
if (status) if (status)
dprintk(2, "qla1280_chip_diag: **** FAILED ****\n"); goto fail;
else
dprintk(3, "qla1280_chip_diag: exiting normally\n");
if (mb[1] != 0xAAAA || mb[2] != 0x5555 || mb[3] != 0xAA55 ||
mb[4] != 0x55AA || mb[5] != 0xA5A5 || mb[6] != 0x5A5A ||
mb[7] != 0x2525) {
printk(KERN_INFO "qla1280: Failed mbox check\n");
goto fail;
}
dprintk(3, "qla1280_chip_diag: exiting normally\n");
return 0;
fail:
dprintk(2, "qla1280_chip_diag: **** FAILED ****\n");
return status; return status;
} }
/*
* Setup chip
* Load and start RISC firmware.
*
* Input:
* ha = adapter block pointer.
*
* Returns:
* 0 = success.
*/
#define DUMP_IT_BACK 0 /* for debug of RISC loading */
static int static int
qla1280_setup_chip(struct scsi_qla_host *ha) qla1280_load_firmware_pio(struct scsi_qla_host *ha)
{ {
int status = 0; uint16_t risc_address, *risc_code_address, risc_code_size;
uint16_t risc_address; uint16_t mb[MAILBOX_REGISTER_COUNT], i;
uint16_t *risc_code_address; int err;
int risc_code_size;
uint16_t mb[MAILBOX_REGISTER_COUNT];
uint16_t cnt;
int num, i;
#if DUMP_IT_BACK
uint8_t *sp;
uint8_t *tbuf;
dma_addr_t p_tbuf;
#endif
ENTER("qla1280_setup_chip"); /* Load RISC code. */
risc_address = *ql1280_board_tbl[ha->devnum].fwstart;
risc_code_address = ql1280_board_tbl[ha->devnum].fwcode;
risc_code_size = *ql1280_board_tbl[ha->devnum].fwlen;
for (i = 0; i < risc_code_size; i++) {
mb[0] = MBC_WRITE_RAM_WORD;
mb[1] = risc_address + i;
mb[2] = risc_code_address[i];
err = qla1280_mailbox_command(ha, BIT_0 | BIT_1 | BIT_2, mb);
if (err) {
printk(KERN_ERR "scsi(%li): Failed to load firmware\n",
ha->host_no);
return err;
}
}
dprintk(1, "scsi(%ld): Setup chip\n", ha->host_no); return 0;
}
#define DUMP_IT_BACK 0 /* for debug of RISC loading */
static int
qla1280_load_firmware_dma(struct scsi_qla_host *ha)
{
uint16_t risc_address, *risc_code_address, risc_code_size;
uint16_t mb[MAILBOX_REGISTER_COUNT], cnt;
int err = 0, num, i;
#if DUMP_IT_BACK #if DUMP_IT_BACK
/* get consistent memory allocated for setup_chip */ uint8_t *sp, *tbuf;
dma_addr_t p_tbuf;
tbuf = pci_alloc_consistent(ha->pdev, 8000, &p_tbuf); tbuf = pci_alloc_consistent(ha->pdev, 8000, &p_tbuf);
if (!tbuf)
return -ENOMEM;
#endif #endif
/* Load RISC code. */ /* Load RISC code. */
risc_address = *ql1280_board_tbl[ha->devnum].fwstart; risc_address = *ql1280_board_tbl[ha->devnum].fwstart;
risc_code_address = ql1280_board_tbl[ha->devnum].fwcode; risc_code_address = ql1280_board_tbl[ha->devnum].fwcode;
risc_code_size = (int) *ql1280_board_tbl[ha->devnum].fwlen; risc_code_size = *ql1280_board_tbl[ha->devnum].fwlen;
dprintk(1, "qla1280_setup_chip: DMA RISC code (%i) words\n", dprintk(1, "%s: DMA RISC code (%i) words\n",
risc_code_size); __FUNCTION__, risc_code_size);
num = 0; num = 0;
while (risc_code_size > 0 && !status) { while (risc_code_size > 0) {
int warn __attribute__((unused)) = 0; int warn __attribute__((unused)) = 0;
cnt = 2000 >> 1; cnt = 2000 >> 1;
...@@ -2129,15 +2111,16 @@ qla1280_setup_chip(struct scsi_qla_host *ha) ...@@ -2129,15 +2111,16 @@ qla1280_setup_chip(struct scsi_qla_host *ha)
mb[2] = (ha->request_dma >> 16) & 0xffff; mb[2] = (ha->request_dma >> 16) & 0xffff;
mb[7] = pci_dma_hi32(ha->request_dma) & 0xffff; mb[7] = pci_dma_hi32(ha->request_dma) & 0xffff;
mb[6] = pci_dma_hi32(ha->request_dma) >> 16; mb[6] = pci_dma_hi32(ha->request_dma) >> 16;
dprintk(2, "qla1280_setup_chip: op=%d 0x%p = 0x%4x,0x%4x," dprintk(2, "%s: op=%d 0x%p = 0x%4x,0x%4x,0x%4x,0x%4x\n",
"0x%4x,0x%4x\n", mb[0], (void *)(long)ha->request_dma, __FUNCTION__, mb[0],
mb[6], mb[7], mb[2], mb[3]); (void *)(long)ha->request_dma,
if ((status = qla1280_mailbox_command(ha, BIT_4 | BIT_3 | mb[6], mb[7], mb[2], mb[3]);
BIT_2 | BIT_1 | BIT_0, err = qla1280_mailbox_command(ha, BIT_4 | BIT_3 | BIT_2 |
&mb[0]))) { BIT_1 | BIT_0, mb);
if (err) {
printk(KERN_ERR "scsi(%li): Failed to load partial " printk(KERN_ERR "scsi(%li): Failed to load partial "
"segment of f\n", ha->host_no); "segment of f\n", ha->host_no);
break; goto out;
} }
#if DUMP_IT_BACK #if DUMP_IT_BACK
...@@ -2149,22 +2132,22 @@ qla1280_setup_chip(struct scsi_qla_host *ha) ...@@ -2149,22 +2132,22 @@ qla1280_setup_chip(struct scsi_qla_host *ha)
mb[7] = pci_dma_hi32(p_tbuf) & 0xffff; mb[7] = pci_dma_hi32(p_tbuf) & 0xffff;
mb[6] = pci_dma_hi32(p_tbuf) >> 16; mb[6] = pci_dma_hi32(p_tbuf) >> 16;
if ((status = qla1280_mailbox_command(ha, err = qla1280_mailbox_command(ha, BIT_4 | BIT_3 | BIT_2 |
BIT_4 | BIT_3 | BIT_2 | BIT_1 | BIT_0, mb);
BIT_1 | BIT_0, if (err) {
&mb[0]))) {
printk(KERN_ERR printk(KERN_ERR
"Failed to dump partial segment of f/w\n"); "Failed to dump partial segment of f/w\n");
break; goto out;
} }
sp = (uint8_t *)ha->request_ring; sp = (uint8_t *)ha->request_ring;
for (i = 0; i < (cnt << 1); i++) { for (i = 0; i < (cnt << 1); i++) {
if (tbuf[i] != sp[i] && warn++ < 10) { if (tbuf[i] != sp[i] && warn++ < 10) {
printk(KERN_ERR "qla1280_setup_chip: FW " printk(KERN_ERR "%s: FW compare error @ "
"compare error @ byte(0x%x) loop#=%x\n", "byte(0x%x) loop#=%x\n",
i, num); __FUNCTION__, i, num);
printk(KERN_ERR "setup_chip: FWbyte=%x " printk(KERN_ERR "%s: FWbyte=%x "
"FWfromChip=%x\n", sp[i], tbuf[i]); "FWfromChip=%x\n",
__FUNCTION__, sp[i], tbuf[i]);
/*break; */ /*break; */
} }
} }
...@@ -2175,37 +2158,69 @@ qla1280_setup_chip(struct scsi_qla_host *ha) ...@@ -2175,37 +2158,69 @@ qla1280_setup_chip(struct scsi_qla_host *ha)
num++; num++;
} }
out:
#if DUMP_IT_BACK
pci_free_consistent(ha->pdev, 8000, tbuf, p_tbuf);
#endif
return err;
}
static int
qla1280_start_firmware(struct scsi_qla_host *ha)
{
uint16_t mb[MAILBOX_REGISTER_COUNT];
int err;
dprintk(1, "%s: Verifying checksum of loaded RISC code.\n",
__FUNCTION__);
/* Verify checksum of loaded RISC code. */ /* Verify checksum of loaded RISC code. */
if (!status) { mb[0] = MBC_VERIFY_CHECKSUM;
dprintk(1, "qla1280_setup_chip: Verifying checksum of " /* mb[1] = ql12_risc_code_addr01; */
"loaded RISC code.\n"); mb[1] = *ql1280_board_tbl[ha->devnum].fwstart;
mb[0] = MBC_VERIFY_CHECKSUM; err = qla1280_mailbox_command(ha, BIT_1 | BIT_0, mb);
/* mb[1] = ql12_risc_code_addr01; */ if (err) {
mb[1] = *ql1280_board_tbl[ha->devnum].fwstart; printk(KERN_ERR "scsi(%li): Failed checksum\n", ha->host_no);
return err;
}
if (!(status = /* Start firmware execution. */
qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]))) { dprintk(1, "%s: start firmware running.\n", __FUNCTION__);
/* Start firmware execution. */ mb[0] = MBC_EXECUTE_FIRMWARE;
dprintk(1, mb[1] = *ql1280_board_tbl[ha->devnum].fwstart;
"qla1280_setup_chip: start firmware running.\n"); err = qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]);
mb[0] = MBC_EXECUTE_FIRMWARE; if (err) {
mb[1] = *ql1280_board_tbl[ha->devnum].fwstart; printk(KERN_ERR "scsi(%li): Failed to start firmware\n",
qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]); ha->host_no);
} else
printk(KERN_ERR "scsi(%li): qla1280_setup_chip: "
"Failed checksum\n", ha->host_no);
} }
#if DUMP_IT_BACK return err;
/* free consistent memory allocated for setup_chip */ }
pci_free_consistent(ha->pdev, 8000, tbuf, p_tbuf);
#endif
if (status) static int
dprintk(2, "qla1280_setup_chip: **** FAILED ****\n"); qla1280_load_firmware(struct scsi_qla_host *ha)
{
int err = -ENODEV;
LEAVE("qla1280_setup_chip"); /* If firmware needs to be loaded */
return status; if (!qla1280_isp_firmware(ha)) {
printk(KERN_ERR "scsi(%li): isp_firmware() failed!\n",
ha->host_no);
goto out;
}
err = qla1280_chip_diag(ha);
if (err)
goto out;
if (IS_ISP1040(ha))
err = qla1280_load_firmware_pio(ha);
else
err = qla1280_load_firmware_dma(ha);
if (err)
goto out;
err = qla1280_start_firmware(ha);
out:
return err;
} }
/* /*
...@@ -4227,6 +4242,7 @@ qla1280_error_entry(struct scsi_qla_host *ha, struct response *pkt, ...@@ -4227,6 +4242,7 @@ qla1280_error_entry(struct scsi_qla_host *ha, struct response *pkt,
static int static int
qla1280_abort_isp(struct scsi_qla_host *ha) qla1280_abort_isp(struct scsi_qla_host *ha)
{ {
struct device_reg *reg = ha->iobase;
struct srb *sp; struct srb *sp;
int status = 0; int status = 0;
int cnt; int cnt;
...@@ -4234,69 +4250,53 @@ qla1280_abort_isp(struct scsi_qla_host *ha) ...@@ -4234,69 +4250,53 @@ qla1280_abort_isp(struct scsi_qla_host *ha)
ENTER("qla1280_abort_isp"); ENTER("qla1280_abort_isp");
if (!ha->flags.abort_isp_active && ha->flags.online) { if (ha->flags.abort_isp_active || !ha->flags.online)
struct device_reg *reg = ha->iobase; goto out;
ha->flags.abort_isp_active = 1;
ha->flags.abort_isp_active = 1;
/* Disable ISP interrupts. */
qla1280_disable_intrs(ha);
WRT_REG_WORD(&reg->host_cmd, HC_PAUSE_RISC);
RD_REG_WORD(&reg->id_l);
printk(KERN_INFO "scsi(%li): dequeuing outstanding commands\n", /* Disable ISP interrupts. */
ha->host_no); qla1280_disable_intrs(ha);
/* Dequeue all commands in outstanding command list. */ WRT_REG_WORD(&reg->host_cmd, HC_PAUSE_RISC);
for (cnt = 0; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) { RD_REG_WORD(&reg->id_l);
struct scsi_cmnd *cmd;
sp = ha->outstanding_cmds[cnt];
if (sp) {
cmd = sp->cmd; printk(KERN_INFO "scsi(%li): dequeuing outstanding commands\n",
CMD_RESULT(cmd) = DID_RESET << 16; ha->host_no);
/* Dequeue all commands in outstanding command list. */
for (cnt = 0; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
struct scsi_cmnd *cmd;
sp = ha->outstanding_cmds[cnt];
if (sp) {
sp->cmd = NULL; cmd = sp->cmd;
ha->outstanding_cmds[cnt] = NULL; CMD_RESULT(cmd) = DID_RESET << 16;
(*cmd->scsi_done)(cmd); sp->cmd = NULL;
ha->outstanding_cmds[cnt] = NULL;
sp->flags = 0; (*cmd->scsi_done)(cmd);
}
}
/* If firmware needs to be loaded */ sp->flags = 0;
if (qla1280_isp_firmware (ha)) {
if (!(status = qla1280_chip_diag(ha)))
status = qla1280_setup_chip(ha);
} }
}
if (!status) { status = qla1280_load_firmware(ha);
/* Setup adapter based on NVRAM parameters. */ if (status)
qla1280_nvram_config (ha); goto out;
if (!(status = qla1280_init_rings(ha))) { /* Setup adapter based on NVRAM parameters. */
/* Issue SCSI reset. */ qla1280_nvram_config (ha);
for (bus = 0; bus < ha->ports; bus++) {
qla1280_bus_reset(ha, bus);
}
/*
* qla1280_bus_reset() will do the marker
* dance - no reason to repeat here!
*/
#if 0
/* Issue marker command. */
ha->flags.reset_marker = 0;
for (bus = 0; bus < ha->ports; bus++) {
ha->bus_settings[bus].
reset_marker = 0;
qla1280_marker(ha, bus, 0, 0,
MK_SYNC_ALL);
}
#endif
ha->flags.abort_isp_active = 0;
}
}
}
status = qla1280_init_rings(ha);
if (status)
goto out;
/* Issue SCSI reset. */
for (bus = 0; bus < ha->ports; bus++)
qla1280_bus_reset(ha, bus);
ha->flags.abort_isp_active = 0;
out:
if (status) { if (status) {
printk(KERN_WARNING printk(KERN_WARNING
"qla1280: ISP error recovery failed, board disabled"); "qla1280: ISP error recovery failed, board disabled");
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7