Skip to content

Commit

Permalink
[SCSI] qla4xxx: allow hba to be online when initiator ip address is u…
Browse files Browse the repository at this point in the history
…ninitialized

This patch provides the following:

1. remove warning ignoring the return value of pci_set_mwi()
2. allows HBA to be online when the initiator ip address is uninitialized.

Signed-off-by: David Somayajulu <david.somayajulu@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
  • Loading branch information
David C Somayajulu authored and James Bottomley committed Jun 17, 2007
1 parent a1f6e02 commit 46235e6
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions drivers/scsi/qla4xxx/ql4_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -883,11 +883,12 @@ static int qla4xxx_config_nvram(struct scsi_qla_host *ha)
static void qla4x00_pci_config(struct scsi_qla_host *ha)
{
uint16_t w;
int status;

dev_info(&ha->pdev->dev, "Configuring PCI space...\n");

pci_set_master(ha->pdev);
pci_set_mwi(ha->pdev);
status = pci_set_mwi(ha->pdev);
/*
* We want to respect framework's setting of PCI configuration space
* command register and also want to make sure that all bits of
Expand Down Expand Up @@ -1143,32 +1144,30 @@ int qla4xxx_initialize_adapter(struct scsi_qla_host *ha,

/* Initialize the Host adapter request/response queues and firmware */
if (qla4xxx_start_firmware(ha) == QLA_ERROR)
return status;
goto exit_init_hba;

if (qla4xxx_validate_mac_address(ha) == QLA_ERROR)
return status;
goto exit_init_hba;

if (qla4xxx_init_local_data(ha) == QLA_ERROR)
return status;
goto exit_init_hba;

status = qla4xxx_init_firmware(ha);
if (status == QLA_ERROR)
return status;
goto exit_init_hba;

/*
* FW is waiting to get an IP address from DHCP server: Skip building
* the ddb_list and wait for DHCP lease acquired aen to come in
* followed by 0x8014 aen" to trigger the tgt discovery process.
*/
if (ha->firmware_state & FW_STATE_DHCP_IN_PROGRESS){
set_bit(AF_ONLINE, &ha->flags);
return status;
}
if (ha->firmware_state & FW_STATE_DHCP_IN_PROGRESS)
goto exit_init_online;

/* Skip device discovery if ip and subnet is zero */
if (memcmp(ha->ip_address, ip_address, IP_ADDR_LEN) == 0 ||
memcmp(ha->subnet_mask, ip_address, IP_ADDR_LEN) == 0)
return status;
goto exit_init_online;

if (renew_ddb_list == PRESERVE_DDB_LIST) {
/*
Expand Down Expand Up @@ -1197,10 +1196,10 @@ int qla4xxx_initialize_adapter(struct scsi_qla_host *ha,
ha->host_no));
}

exit_init_online:
set_bit(AF_ONLINE, &ha->flags);
exit_init_hba:
exit_init_hba:
return status;

}

/**
Expand Down

0 comments on commit 46235e6

Please sign in to comment.