Commit df57caba authored by Himanshu Madhani's avatar Himanshu Madhani Committed by Christoph Hellwig
Browse files

qla2xxx: Add FDMI-2 functionality. 



Add support for the FDMI-2 fabric switch feature.

Since FDMI-2 uses code from FDMI-1, some of the existing code
needed to be repaired to prevent fields from being overflowed.

Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent e475f9c0

drivers/scsi/qla2xxx/qla_attr.c

+3 −2
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ qla2x00_fw_version_show(struct device *dev, 
	char fw_str[128];



	return scnprintf(buf, PAGE_SIZE, "%s\n",

	    ha->isp_ops->fw_version_str(vha, fw_str));

	    ha->isp_ops->fw_version_str(vha, fw_str, sizeof(fw_str)));

}



static ssize_t
@@ -1924,7 +1924,8 @@ qla2x00_get_host_symbolic_name(struct Scsi_Host *shost) 
{

	scsi_qla_host_t *vha = shost_priv(shost);



	qla2x00_get_sym_node_name(vha, fc_host_symbolic_name(shost));

	qla2x00_get_sym_node_name(vha, fc_host_symbolic_name(shost),

	    sizeof(fc_host_symbolic_name(shost)));

}



static void

drivers/scsi/qla2xxx/qla_dbg.c

+2 −2
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
 * |                              |                    | 0x1115-0x1116  |

 * |                              |                    | 0x111a-0x111b	|

 * |                              |                    | 0x1155-0x1158  |

 * | Device Discovery             |       0x2095       | 0x2020-0x2022, |

 * | Device Discovery             |       0x2016       | 0x2020-0x2022, |

 * |                              |                    | 0x2011-0x2012, |

 * |                              |                    | 0x2016         |

 * |                              |                    | 0x2099-0x20a4  |

 * | Queue Command and IO tracing |       0x3059       | 0x3006-0x300b  |

 * |                              |                    | 0x3027-0x3028  |

 * |                              |                    | 0x303d-0x3041  |

drivers/scsi/qla2xxx/qla_def.h

+128 −26
Original line number Diff line number Diff line
@@ -2060,6 +2060,17 @@ static const char * const port_state_str[] = { 
#define CT_REASON_CANNOT_PERFORM		0x09

#define CT_REASON_COMMAND_UNSUPPORTED		0x0b

#define CT_EXPL_ALREADY_REGISTERED		0x10

#define CT_EXPL_HBA_ATTR_NOT_REGISTERED		0x11

#define CT_EXPL_MULTIPLE_HBA_ATTR		0x12

#define CT_EXPL_INVALID_HBA_BLOCK_LENGTH	0x13

#define CT_EXPL_MISSING_REQ_HBA_ATTR		0x14

#define CT_EXPL_PORT_NOT_REGISTERED_		0x15

#define CT_EXPL_MISSING_HBA_ID_PORT_LIST	0x16

#define CT_EXPL_HBA_NOT_REGISTERED		0x17

#define CT_EXPL_PORT_ATTR_NOT_REGISTERED	0x20

#define CT_EXPL_PORT_NOT_REGISTERED		0x21

#define CT_EXPL_MULTIPLE_PORT_ATTR		0x22

#define CT_EXPL_INVALID_PORT_BLOCK_LENGTH	0x23



#define NS_N_PORT_TYPE	0x01

#define NS_NL_PORT_TYPE	0x02
@@ -2116,33 +2127,40 @@ static const char * const port_state_str[] = { 
 * HBA attribute types.

 */

#define FDMI_HBA_ATTR_COUNT			9

#define FDMI_HBA_NODE_NAME			1

#define FDMI_HBA_MANUFACTURER			2

#define FDMI_HBA_SERIAL_NUMBER			3

#define FDMI_HBA_MODEL				4

#define FDMI_HBA_MODEL_DESCRIPTION		5

#define FDMI_HBA_HARDWARE_VERSION		6

#define FDMI_HBA_DRIVER_VERSION			7

#define FDMI_HBA_OPTION_ROM_VERSION		8

#define FDMI_HBA_FIRMWARE_VERSION		9

#define FDMIV2_HBA_ATTR_COUNT			17

#define FDMI_HBA_NODE_NAME			0x1

#define FDMI_HBA_MANUFACTURER			0x2

#define FDMI_HBA_SERIAL_NUMBER			0x3

#define FDMI_HBA_MODEL				0x4

#define FDMI_HBA_MODEL_DESCRIPTION		0x5

#define FDMI_HBA_HARDWARE_VERSION		0x6

#define FDMI_HBA_DRIVER_VERSION			0x7

#define FDMI_HBA_OPTION_ROM_VERSION		0x8

#define FDMI_HBA_FIRMWARE_VERSION		0x9

#define FDMI_HBA_OS_NAME_AND_VERSION		0xa

#define FDMI_HBA_MAXIMUM_CT_PAYLOAD_LENGTH	0xb

#define FDMI_HBA_NODE_SYMBOLIC_NAME		0xc

#define FDMI_HBA_VENDOR_ID			0xd

#define FDMI_HBA_NUM_PORTS			0xe

#define FDMI_HBA_FABRIC_NAME			0xf

#define FDMI_HBA_BOOT_BIOS_NAME			0x10

#define FDMI_HBA_TYPE_VENDOR_IDENTIFIER		0xe0



struct ct_fdmi_hba_attr {

	uint16_t type;

	uint16_t len;

	union {

		uint8_t node_name[WWN_SIZE];

		uint8_t manufacturer[32];

		uint8_t serial_num[8];

		uint8_t manufacturer[64];

		uint8_t serial_num[32];

		uint8_t model[16];

		uint8_t model_desc[80];

		uint8_t hw_version[16];

		uint8_t hw_version[32];

		uint8_t driver_version[32];

		uint8_t orom_version[16];

		uint8_t fw_version[16];

		uint8_t fw_version[32];

		uint8_t os_version[128];

		uint8_t max_ct_len[4];

		uint32_t max_ct_len;

	} a;

};
@@ -2151,16 +2169,56 @@ struct ct_fdmi_hba_attributes { 
	struct ct_fdmi_hba_attr entry[FDMI_HBA_ATTR_COUNT];

};



struct ct_fdmiv2_hba_attr {

	uint16_t type;

	uint16_t len;

	union {

		uint8_t node_name[WWN_SIZE];

		uint8_t manufacturer[32];

		uint8_t serial_num[32];

		uint8_t model[16];

		uint8_t model_desc[80];

		uint8_t hw_version[16];

		uint8_t driver_version[32];

		uint8_t orom_version[16];

		uint8_t fw_version[32];

		uint8_t os_version[128];

		uint32_t max_ct_len;

		uint8_t sym_name[256];

		uint32_t vendor_id;

		uint32_t num_ports;

		uint8_t fabric_name[WWN_SIZE];

		uint8_t bios_name[32];

		uint8_t vendor_indentifer[8];

	} a;

};



struct ct_fdmiv2_hba_attributes {

	uint32_t count;

	struct ct_fdmiv2_hba_attr entry[FDMIV2_HBA_ATTR_COUNT];

};



/*

 * Port attribute types.

 */

#define FDMI_PORT_ATTR_COUNT		6

#define FDMI_PORT_FC4_TYPES		1

#define FDMI_PORT_SUPPORT_SPEED		2

#define FDMI_PORT_CURRENT_SPEED		3

#define FDMI_PORT_MAX_FRAME_SIZE	4

#define FDMI_PORT_OS_DEVICE_NAME	5

#define FDMI_PORT_HOST_NAME		6

#define FDMIV2_PORT_ATTR_COUNT		16

#define FDMI_PORT_FC4_TYPES		0x1

#define FDMI_PORT_SUPPORT_SPEED		0x2

#define FDMI_PORT_CURRENT_SPEED		0x3

#define FDMI_PORT_MAX_FRAME_SIZE	0x4

#define FDMI_PORT_OS_DEVICE_NAME	0x5

#define FDMI_PORT_HOST_NAME		0x6

#define FDMI_PORT_NODE_NAME		0x7

#define FDMI_PORT_NAME			0x8

#define FDMI_PORT_SYM_NAME		0x9

#define FDMI_PORT_TYPE			0xa

#define FDMI_PORT_SUPP_COS		0xb

#define FDMI_PORT_FABRIC_NAME		0xc

#define FDMI_PORT_FC4_TYPE		0xd

#define FDMI_PORT_STATE			0x101

#define FDMI_PORT_COUNT			0x102

#define FDMI_PORT_ID			0x103



#define FDMI_PORT_SPEED_1GB		0x1

#define FDMI_PORT_SPEED_2GB		0x2
@@ -2171,7 +2229,11 @@ struct ct_fdmi_hba_attributes { 
#define FDMI_PORT_SPEED_32GB		0x40

#define FDMI_PORT_SPEED_UNKNOWN		0x8000



struct ct_fdmi_port_attr {

#define FC_CLASS_2	0x04

#define FC_CLASS_3	0x08

#define FC_CLASS_2_3	0x0C



struct ct_fdmiv2_port_attr {

	uint16_t type;

	uint16_t len;

	union {
@@ -2181,12 +2243,40 @@ struct ct_fdmi_port_attr { 
		uint32_t max_frame_size;

		uint8_t os_dev_name[32];

		uint8_t host_name[32];

		uint8_t node_name[WWN_SIZE];

		uint8_t port_name[WWN_SIZE];

		uint8_t port_sym_name[128];

		uint32_t port_type;

		uint32_t port_supported_cos;

		uint8_t fabric_name[WWN_SIZE];

		uint8_t port_fc4_type[32];

		uint32_t port_state;

		uint32_t num_ports;

		uint32_t port_id;

	} a;

};



/*

 * Port Attribute Block.

 */

struct ct_fdmiv2_port_attributes {

	uint32_t count;

	struct ct_fdmiv2_port_attr entry[FDMIV2_PORT_ATTR_COUNT];

};



struct ct_fdmi_port_attr {

	uint16_t type;

	uint16_t len;

	union {

		uint8_t fc4_types[32];

		uint32_t sup_speed;

		uint32_t cur_speed;

		uint32_t max_frame_size;

		uint8_t os_dev_name[32];

		uint8_t host_name[32];

	} a;

};



struct ct_fdmi_port_attributes {

	uint32_t count;

	struct ct_fdmi_port_attr entry[FDMI_PORT_ATTR_COUNT];
@@ -2284,6 +2374,13 @@ struct ct_sns_req { 
			struct ct_fdmi_hba_attributes attrs;

		} rhba;



		struct {

			uint8_t hba_identifier[8];

			uint32_t entry_count;

			uint8_t port_name[8];

			struct ct_fdmiv2_hba_attributes attrs;

		} rhba2;



		struct {

			uint8_t hba_identifier[8];

			struct ct_fdmi_hba_attributes attrs;
@@ -2294,6 +2391,11 @@ struct ct_sns_req { 
			struct ct_fdmi_port_attributes attrs;

		} rpa;



		struct {

			uint8_t port_name[8];

			struct ct_fdmiv2_port_attributes attrs;

		} rpa2;



		struct {

			uint8_t port_name[8];

		} dhba;
@@ -2522,7 +2624,7 @@ struct isp_operations { 
	int (*load_risc) (struct scsi_qla_host *, uint32_t *);



	char * (*pci_info_str) (struct scsi_qla_host *, char *);

	char * (*fw_version_str) (struct scsi_qla_host *, char *);

	char * (*fw_version_str)(struct scsi_qla_host *, char *, size_t);



	irq_handler_t intr_handler;

	void (*enable_intrs) (struct qla_hw_data *);

drivers/scsi/qla2xxx/qla_gbl.h

+2 −2
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ extern void *qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *, uint32_t, uint32_t); 
extern int qla2x00_fdmi_register(scsi_qla_host_t *);

extern int qla2x00_gfpn_id(scsi_qla_host_t *, sw_info_t *);

extern int qla2x00_gpsc(scsi_qla_host_t *, sw_info_t *);

extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);

extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);



/*

 * Global Function Prototypes in qla_attr.c source file.
@@ -614,7 +614,7 @@ extern void qlafx00_soft_reset(scsi_qla_host_t *); 
extern int qlafx00_chip_diag(scsi_qla_host_t *);

extern void qlafx00_config_rings(struct scsi_qla_host *);

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

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

extern char *qlafx00_fw_version_str(struct scsi_qla_host *, char *, size_t);

extern irqreturn_t qlafx00_intr_handler(int, void *);

extern void qlafx00_enable_intrs(struct qla_hw_data *);

extern void qlafx00_disable_intrs(struct qla_hw_data *);

drivers/scsi/qla2xxx/qla_gs.c

+824 −119

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE