[SCSI] lpfc 8.3.35: Fixed Linux generic firmware download on SLI4 devices with longer module names
Signed-off-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
82c3e9bafa
commit
5402a31581
|
@ -27,6 +27,8 @@
|
||||||
|
|
||||||
struct lpfc_sli2_slim;
|
struct lpfc_sli2_slim;
|
||||||
|
|
||||||
|
#define ELX_MODEL_NAME_SIZE 80
|
||||||
|
|
||||||
#define LPFC_PCI_DEV_LP 0x1
|
#define LPFC_PCI_DEV_LP 0x1
|
||||||
#define LPFC_PCI_DEV_OC 0x2
|
#define LPFC_PCI_DEV_OC 0x2
|
||||||
|
|
||||||
|
|
|
@ -9428,7 +9428,7 @@ lpfc_pci_probe_one_s4(struct pci_dev *pdev, const struct pci_device_id *pid)
|
||||||
int mcnt;
|
int mcnt;
|
||||||
int adjusted_fcp_io_channel;
|
int adjusted_fcp_io_channel;
|
||||||
const struct firmware *fw;
|
const struct firmware *fw;
|
||||||
uint8_t file_name[16];
|
uint8_t file_name[ELX_MODEL_NAME_SIZE];
|
||||||
|
|
||||||
/* Allocate memory for HBA structure */
|
/* Allocate memory for HBA structure */
|
||||||
phba = lpfc_hba_alloc(pdev);
|
phba = lpfc_hba_alloc(pdev);
|
||||||
|
@ -9574,7 +9574,8 @@ lpfc_pci_probe_one_s4(struct pci_dev *pdev, const struct pci_device_id *pid)
|
||||||
/* check for firmware upgrade or downgrade (if_type 2 only) */
|
/* check for firmware upgrade or downgrade (if_type 2 only) */
|
||||||
if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) ==
|
if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) ==
|
||||||
LPFC_SLI_INTF_IF_TYPE_2) {
|
LPFC_SLI_INTF_IF_TYPE_2) {
|
||||||
snprintf(file_name, 16, "%s.grp", phba->ModelName);
|
snprintf(file_name, ELX_MODEL_NAME_SIZE, "%s.grp",
|
||||||
|
phba->ModelName);
|
||||||
error = request_firmware(&fw, file_name, &phba->pcidev->dev);
|
error = request_firmware(&fw, file_name, &phba->pcidev->dev);
|
||||||
if (!error) {
|
if (!error) {
|
||||||
lpfc_write_firmware(phba, fw);
|
lpfc_write_firmware(phba, fw);
|
||||||
|
|
Loading…
Reference in a new issue