Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d55ca66 authored by Atul Deshmukh's avatar Atul Deshmukh Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Wrong PCIe(2.5Gb/s x8) speed in the kerenel message for ISP82xx. 



qla2xxx show wrong PCIe(2.5Gb/s x8) speed in the kerenel message. It should be
5.0Gb/s.

Signed-off-by: default avatarAtul Deshmukh <atul.deshmukh@qlogic.com>
Signed-off-by: default avatarChad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent a6171297

drivers/scsi/qla2xxx/qla_gbl.h

+0 −1
Original line number Diff line number Diff line
@@ -558,7 +558,6 @@ extern void qla24xx_wrt_rsp_reg(struct qla_hw_data *, uint16_t, uint16_t); 
/* PCI related functions */

extern int qla82xx_pci_config(struct scsi_qla_host *);

extern int qla82xx_pci_mem_read_2M(struct qla_hw_data *, u64, void *, int);

extern char *qla82xx_pci_info_str(struct scsi_qla_host *, char *);

extern int qla82xx_pci_region_offset(struct pci_dev *, int);

extern int qla82xx_iospace_config(struct qla_hw_data *);

drivers/scsi/qla2xxx/qla_nx.c

+0 −19
Original line number Diff line number Diff line
@@ -1612,25 +1612,6 @@ qla82xx_get_fw_offs(struct qla_hw_data *ha) 
}



/* PCI related functions */

char *

qla82xx_pci_info_str(struct scsi_qla_host *vha, char *str)

{

	int pcie_reg;

	struct qla_hw_data *ha = vha->hw;

	char lwstr[6];

	uint16_t lnk;



	pcie_reg = pci_pcie_cap(ha->pdev);

	pci_read_config_word(ha->pdev, pcie_reg + PCI_EXP_LNKSTA, &lnk);

	ha->link_width = (lnk >> 4) & 0x3f;



	strcpy(str, "PCIe (");

	strcat(str, "2.5Gb/s ");

	snprintf(lwstr, sizeof(lwstr), "x%d)", ha->link_width);

	strcat(str, lwstr);

	return str;

}



int qla82xx_pci_region_offset(struct pci_dev *pdev, int region)

{

	unsigned long val = 0;

drivers/scsi/qla2xxx/qla_os.c

+1 −1
Original line number Diff line number Diff line
@@ -1919,7 +1919,7 @@ static struct isp_operations qla82xx_isp_ops = { 
	.nvram_config		= qla81xx_nvram_config,

	.update_fw_options	= qla24xx_update_fw_options,

	.load_risc		= qla82xx_load_risc,

	.pci_info_str		= qla82xx_pci_info_str,

	.pci_info_str		= qla24xx_pci_info_str,

	.fw_version_str		= qla24xx_fw_version_str,

	.intr_handler		= qla82xx_intr_handler,

	.enable_intrs		= qla82xx_enable_intrs,