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

Commit 2b48992f authored by Sawan Chandak's avatar Sawan Chandak Committed by James Bottomley
Browse files

qla2xxx: Add pci device id 0x2261. 



Signed-off-by: default avatarSawan Chandak <sawan.chandak@qlogic.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent a1d0285e

drivers/scsi/qla2xxx/qla_def.h

+5 −2
Original line number Diff line number Diff line
@@ -3059,6 +3059,7 @@ struct qla_hw_data { 
#define PCI_DEVICE_ID_QLOGIC_ISP2031	0x2031

#define PCI_DEVICE_ID_QLOGIC_ISP2071	0x2071

#define PCI_DEVICE_ID_QLOGIC_ISP2271	0x2271

#define PCI_DEVICE_ID_QLOGIC_ISP2261	0x2261



	uint32_t	device_type;

#define DT_ISP2100                      BIT_0
@@ -3082,7 +3083,8 @@ struct qla_hw_data { 
#define DT_ISP8044			BIT_18

#define DT_ISP2071			BIT_19

#define DT_ISP2271			BIT_20

#define DT_ISP_LAST			(DT_ISP2271 << 1)

#define DT_ISP2261			BIT_21

#define DT_ISP_LAST			(DT_ISP2261 << 1)



#define DT_T10_PI                       BIT_25

#define DT_IIDMA                        BIT_26
@@ -3114,6 +3116,7 @@ struct qla_hw_data { 
#define IS_QLAFX00(ha)	(DT_MASK(ha) & DT_ISPFX00)

#define IS_QLA2071(ha)	(DT_MASK(ha) & DT_ISP2071)

#define IS_QLA2271(ha)	(DT_MASK(ha) & DT_ISP2271)

#define IS_QLA2261(ha)	(DT_MASK(ha) & DT_ISP2261)



#define IS_QLA23XX(ha)  (IS_QLA2300(ha) || IS_QLA2312(ha) || IS_QLA2322(ha) || \

			IS_QLA6312(ha) || IS_QLA6322(ha))
@@ -3122,7 +3125,7 @@ struct qla_hw_data { 
#define IS_QLA25XX(ha)  (IS_QLA2532(ha))

#define IS_QLA83XX(ha)	(IS_QLA2031(ha) || IS_QLA8031(ha))

#define IS_QLA84XX(ha)  (IS_QLA8432(ha))

#define IS_QLA27XX(ha)  (IS_QLA2071(ha) || IS_QLA2271(ha))

#define IS_QLA27XX(ha)  (IS_QLA2071(ha) || IS_QLA2271(ha) || IS_QLA2261(ha))

#define IS_QLA24XX_TYPE(ha)     (IS_QLA24XX(ha) || IS_QLA54XX(ha) || \

				IS_QLA84XX(ha))

#define IS_CNA_CAPABLE(ha)	(IS_QLA81XX(ha) || IS_QLA82XX(ha) || \

drivers/scsi/qla2xxx/qla_os.c

+10 −1
Original line number Diff line number Diff line
@@ -2208,6 +2208,13 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha) 
		ha->device_type |= DT_IIDMA;

		ha->fw_srisc_address = RISC_START_ADDRESS_2400;

		break;

	case PCI_DEVICE_ID_QLOGIC_ISP2261:

		ha->device_type |= DT_ISP2261;

		ha->device_type |= DT_ZIO_SUPPORTED;

		ha->device_type |= DT_FWI2;

		ha->device_type |= DT_IIDMA;

		ha->fw_srisc_address = RISC_START_ADDRESS_2400;

		break;

	}



	if (IS_QLA82XX(ha))
@@ -2285,7 +2292,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISPF001 ||

	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8044 ||

	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2071 ||

	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2271) {

	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2271 ||

	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2261) {

		bars = pci_select_bars(pdev, IORESOURCE_MEM);

		mem_only = 1;

		ql_dbg_pci(ql_dbg_init, pdev, 0x0007,
@@ -5697,6 +5705,7 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) },

	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2071) },

	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) },

	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) },

	{ 0 },

};

MODULE_DEVICE_TABLE(pci, qla2xxx_pci_tbl);