qla2xxx: Updates for the driver
Subsystems (2)
cover qla2xxx: Updates for the driver
Hi Martin,
This series addes enhancements to the driver in the area of FDMI commands and adding support for RDP command. This series also adds support for Beacon LED/D-Port SysFS nodes.
There are few other patches which are cleanup to improve readability as well as consolidates code.
Please apply this series to 5.7.0/scsi-misc at your earliest convenience.
Thanks,
Himanshu
Anil Gurumurthy (1):
qla2xxx: Remove all DIX-0 references
Himanshu Madhani (8):
qla2xxx: Display message for FCE enabled
qla2xxx: Show correct port speed capabilities for RDP command
qla2xxx: Fix RDP response size
qla2xxx: Save rscn_gen for new fcport
qla2xxx: Fix control flags for login/logout IOCB
qla2xxx: Add fixes for mailbox command
qla2xxx: Use QLA_FW_STOPPED macro to propagate flag
qla2xxx: Update driver version to 10.01.00.24-k
Joe Carnuccio (15):
qla2xxx: Add beacon LED config sysfs interface
qla2xxx: Move free of fcport out of interrupt context
qla2xxx: Add sysfs node for D-Port Diagnostics AEN data
qla2xxx: Add endianizer macro calls to fc host stats
qla2xxx: Add changes in preparation for vendor extended FDMI/RDP
qla2xxx: Add vendor extended RDP additions and amendments
qla2xxx: Add ql2xrdpenable module parameter for RDP
qla2xxx: Add vendor extended FDMI commands
qla2xxx: Cleanup ELS/PUREX iocb fields
qla2xxx: Add deferred queue for processing ABTS and RDP
qla2xxx: Handle cases for limiting RDP response payload length
qla2xxx: Use endian macros to assign static fields in fwdump header
qla2xxx: Correction to selection of loopback/echo test
qla2xxx: Fix qla2x00_echo_test() based on ISP type
qla2xxx: Print portname for logging in qla24xx_logio_entry()
Quinn Tran (1):
qla2xxx: Use correct ISP28xx active FW region
drivers/scsi/qla2xxx/qla_attr.c | 136 ++- drivers/scsi/qla2xxx/qla_bsg.c | 27 +- drivers/scsi/qla2xxx/qla_def.h | 357 +++++--- drivers/scsi/qla2xxx/qla_fw.h | 170 +++- drivers/scsi/qla2xxx/qla_gbl.h | 19 +- drivers/scsi/qla2xxx/qla_gs.c | 1703 ++++++++++++++++-------------------- drivers/scsi/qla2xxx/qla_init.c | 51 +- drivers/scsi/qla2xxx/qla_iocb.c | 20 +- drivers/scsi/qla2xxx/qla_isr.c | 179 +++- drivers/scsi/qla2xxx/qla_mbx.c | 257 +++++- drivers/scsi/qla2xxx/qla_mid.c | 10 + drivers/scsi/qla2xxx/qla_os.c | 648 +++++++++++++- drivers/scsi/qla2xxx/qla_tmpl.c | 17 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- 14 files changed, 2453 insertions(+), 1143 deletions(-)
Signature · 1 line
2.12.0
PATCH 1/25 qla2xxx: Add beacon LED config sysfs interface
From: Joe Carnuccio <[email protected]>
This patch Provides interface to do the following (using MBC 0x3B):
- Displays (in hex) the LED config words for all three LEDs.
- Programs the config words for one LED or for all three LEDs.
The sysfs node defined is named beacon_config.
First, to allow driver to gain LED control, do this:
# echo 1 > /sys/class/scsi_host/host#/beacon
Then, to display config words for all three LEDs do this:
# cat /sys/class/scsi_host/host#/beacon_config
To set config words for all three LEDs do this:
# echo 3 xxxx yyyy zzzz > /sys/class/scsi_host/host#/beacon_config
Or, to set config word for a specific single LED n do this:
# echo n xxxx > /sys/class/scsi_host/host#/beacon_config where n is the LED number (0, 1, 2)
Finally, to restore LED control back to firmware, do this:
# echo 0 > /sys/class/scsi_host/host#/beacon
--- drivers/scsi/qla2xxx/qla_attr.c | 76 +++++++++++++++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/qla_def.h | 1 + drivers/scsi/qla2xxx/qla_gbl.h | 1 + drivers/scsi/qla2xxx/qla_mbx.c | 57 +++++++++++++++++++++++++++++++ 4 files changed, 135 insertions(+)
drivers/scsi/qla2xxx/qla_attr.c +76 -0
@@ -1324,6 +1324,79 @@ qla2x00_beacon_store(struct device *dev, struct device_attribute *attr, }static ssize_t +qla2x00_beacon_config_show (struct device *dev,struct device_attribute *attr, +char *buf) +{ +scsi_qla_host_t *vha =shost_priv (class_to_shost (dev)); +struct qla_hw_data *ha = vha->hw; +uint16_t led[3 ] = {0 }; + +if (!IS_QLA2031 (ha) && !IS_QLA27XX (ha) && !IS_QLA28XX (ha)) +return -EPERM ; + +if (ql26xx_led_config (vha,0 , led)) +return scnprintf (buf,PAGE_SIZE ,"\n" ); + +return scnprintf (buf,PAGE_SIZE ,"%#04hx %#04hx %#04hx\n" , + led[0 ], led[1 ], led[2 ]); +} + +static ssize_t +qla2x00_beacon_config_store (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) +{ +scsi_qla_host_t *vha =shost_priv (class_to_shost (dev)); +struct qla_hw_data *ha = vha->hw; +uint16_t options =BIT_0 ; +uint16_t led[3 ] = {0 }; +uint16_t word[4 ]; +int n; + +if (!IS_QLA2031 (ha) && !IS_QLA27XX (ha) && !IS_QLA28XX (ha)) +return -EPERM ; + + n =sscanf (buf,"%hx %hx %hx %hx" , word+0 , word+1 , word+2 , word+3 ); +if (n ==4 ) { +if (word[0 ] ==3 ) { + options |=BIT_3 |BIT_2 |BIT_1 ; + led[0 ] = word[1 ]; + led[1 ] = word[2 ]; + led[2 ] = word[3 ]; + goto write; + } +return -EINVAL ; + } + +if (n ==2 ) { +/* check led index */ +if (word[0 ] ==0 ) { + options |=BIT_2 ; + led[0 ] = word[1 ]; + goto write; + } +if (word[0 ] ==1 ) { + options |=BIT_3 ; + led[1 ] = word[1 ]; + goto write; + } +if (word[0 ] ==2 ) { + options |=BIT_1 ; + led[2 ] = word[1 ]; + goto write; + } +return -EINVAL ; + } + +return -EINVAL ; + +write: +if (ql26xx_led_config (vha, options, led)) +return -EFAULT ; + +return count; +} + +static ssize_t qla2x00_optrom_bios_version_show (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -2264,6 +2337,8 @@ static DEVICE_ATTR(zio_timer, S_IRUGO | S_IWUSR, qla2x00_zio_timer_show, qla2x00_zio_timer_store); static DEVICE_ATTR(beacon, S_IRUGO | S_IWUSR, qla2x00_beacon_show, qla2x00_beacon_store); +static DEVICE_ATTR(beacon_config, 0644, qla2x00_beacon_config_show, + qla2x00_beacon_config_store); static DEVICE_ATTR(optrom_bios_version, S_IRUGO, qla2x00_optrom_bios_version_show, NULL); static DEVICE_ATTR(optrom_efi_version, S_IRUGO,
@@ -2327,6 +2402,7 @@ struct device_attribute *qla2x00_host_attrs[] = { &dev_attr_zio, &dev_attr_zio_timer, &dev_attr_beacon, + &dev_attr_beacon_config, &dev_attr_optrom_bios_version, &dev_attr_optrom_efi_version, &dev_attr_optrom_fcode_version,
drivers/scsi/qla2xxx/qla_def.h +1 -0
@@ -1134,6 +1134,7 @@ static inline bool qla2xxx_is_valid_mbs(unsigned int mbs)#define MBC_GET_FIRMWARE_OPTION 0x28/* Get Firmware Options. */ #define MBC_GET_MEM_OFFLOAD_CNTRL_STAT 0x34/* Memory Offload ctrl/Stat*/ #define MBC_SET_FIRMWARE_OPTION 0x38/* Set Firmware Options. */ +#define MBC_SET_GET_FC_LED_CONFIG 0x3b/* Set/Get FC LED config */ #define MBC_LOOP_PORT_BYPASS 0x40/* Loop Port Bypass. */ #define MBC_LOOP_PORT_ENABLE 0x41/* Loop Port Enable. */ #define MBC_GET_RESOURCE_COUNTS 0x42/* Get Resource Counts. */
drivers/scsi/qla2xxx/qla_gbl.h +1 -0
@@ -844,6 +844,7 @@ extern void qla82xx_clear_pending_mbx(scsi_qla_host_t *);extern int qla82xx_read_temperature (scsi_qla_host_t *);extern int qla8044_read_temperature (scsi_qla_host_t *);extern int qla2x00_read_sfp_dev (struct scsi_qla_host *,char *,int ); +extern int ql26xx_led_config (scsi_qla_host_t *,uint16_t ,uint16_t *);/* BSG related functions */ extern int qla24xx_bsg_request (struct bsg_job *);
drivers/scsi/qla2xxx/qla_mbx.c +57 -0
60 lines not on this page · raw message
Signature · 1 line
2.12.0
PATCH 2/25 qla2xxx: Move free of fcport out of interrupt context
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This patch moves freeing of fcport out of interrupt context
--- drivers/scsi/qla2xxx/qla_bsg.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_bsg.c +12 -2
@@ -11,6 +11,14 @@#include <linux/delay.h> #include <linux/bsg-lib.h> +static void qla2xxx_free_fcport_work (struct work_struct *work) +{ +struct fc_port *fcport =container_of (work,typeof (*fcport), + free_work); + +qla2x00_free_fcport (fcport); +} +/* BSG support for ELS/CT pass through */ void qla2x00_bsg_job_done (srb_t *sp,int res) {
@@ -53,8 +61,10 @@ void qla2x00_bsg_sp_free(srb_t *sp)if (sp->type ==SRB_CT_CMD || sp->type ==SRB_FXIOCB_BCMD || - sp->type ==SRB_ELS_CMD_HST ) -qla2x00_free_fcport (sp->fcport); + sp->type ==SRB_ELS_CMD_HST ) { +INIT_WORK (&sp->fcport->free_work, qla2xxx_free_fcport_work); +queue_work (ha->wq, &sp->fcport->free_work); + }qla2x00_rel_sp (sp); }
Signature · 1 line
2.12.0
PATCH 3/25 qla2xxx: Add sysfs node for D-Port Diagnostics AEN data
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This patch adds SysFS node to show D-Port diag data.
--- drivers/scsi/qla2xxx/qla_attr.c | 21 +++++++++++++++++++++ drivers/scsi/qla2xxx/qla_def.h | 1 + drivers/scsi/qla2xxx/qla_isr.c | 1 + 3 files changed, 23 insertions(+)
drivers/scsi/qla2xxx/qla_attr.c +21 -0
@@ -2323,6 +2323,26 @@ qla2x00_port_no_show(struct device *dev, struct device_attribute *attr,return scnprintf (buf,PAGE_SIZE ,"%u\n" , vha->hw->port_no); } +static ssize_t +qla2x00_dport_diagnostics_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +scsi_qla_host_t *vha =shost_priv (class_to_shost (dev)); + +if (!IS_QLA83XX (vha->hw) && !IS_QLA27XX (vha->hw) && + !IS_QLA28XX (vha->hw)) +return scnprintf (buf,PAGE_SIZE ,"\n" ); + +if (!*vha->dport_data) +return scnprintf (buf,PAGE_SIZE ,"\n" ); + +return scnprintf (buf,PAGE_SIZE ,"%04x %04x %04x %04x\n" , + vha->dport_data[0 ], vha->dport_data[1 ], + vha->dport_data[2 ], vha->dport_data[3 ]); +} +static DEVICE_ATTR(dport_diagnostics, 0444, + qla2x00_dport_diagnostics_show, NULL); + static DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_driver_version_show, NULL); static DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL); static DEVICE_ATTR(serial_num, S_IRUGO, qla2x00_serial_num_show, NULL);
@@ -2431,6 +2451,7 @@ struct device_attribute *qla2x00_host_attrs[] = { &dev_attr_port_speed, &dev_attr_port_no, &dev_attr_fw_attr, + &dev_attr_dport_diagnostics,NULL ,/* reserve for qlini_mode */ NULL ,/* reserve for ql2xiniexchg */ NULL, /* reserve for ql2xexchoffld */
drivers/scsi/qla2xxx/qla_def.h +1 -0
@@ -4541,6 +4541,7 @@ typedef struct scsi_qla_host {uint8_t n2n_node_name[WWN_SIZE ];uint8_t n2n_port_name[WWN_SIZE ];uint16_t n2n_id; +__le16 dport_data[4 ];struct list_head gpnid_list;struct fab_scan scan;
drivers/scsi/qla2xxx/qla_isr.c +1 -0
@@ -1254,6 +1254,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)ql_dbg (ql_dbg_async, vha,0x5052 ,"D-Port Diagnostics: %04x %04x %04x %04x\n" , mb[0 ], mb[1 ], mb[2 ], mb[3 ]); +memcpy (vha->dport_data, mb,sizeof (vha->dport_data));if (IS_QLA83XX (ha) ||IS_QLA27XX (ha) ||IS_QLA28XX (ha)) {static char *results[] = {"start" ,"done(pass)" ,"done(error)" ,"undefined" };
Signature · 1 line
2.12.0
PATCH 4/25 qla2xxx: Remove all DIX-0 references
In reply to Himanshu MadhaniFrom: Anil Gurumurthy <[email protected]>
This patch removes DIX-0 refrence from the source
as its not used anymore and should not be allowed
as supported option.
--- drivers/scsi/qla2xxx/qla_attr.c | 3 +-- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_os.c | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +1 -2
@@ -2942,8 +2942,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable) guard =SHOST_DIX_GUARD_CRC ; -if (IS_PI_IPGUARD_CAPABLE (ha) && - (ql2xenabledif >1 ||IS_PI_DIFB_DIX0_CAPABLE (ha))) +if (IS_PI_IPGUARD_CAPABLE (ha) && ql2xenabledif) guard |=SHOST_DIX_GUARD_IP ;scsi_host_set_guard (vha->host, guard);
drivers/scsi/qla2xxx/qla_def.h +0 -1
@@ -3906,7 +3906,6 @@ struct qla_hw_data { ((ha)->fw_attributes_ext[0] & BIT_0))#define IS_PI_UNINIT_CAPABLE (ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha))#define IS_PI_IPGUARD_CAPABLE (ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha)) -#define IS_PI_DIFB_DIX0_CAPABLE (ha) (0)#define IS_PI_SPLIT_DET_CAPABLE_HBA (ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha) || \ IS_QLA28XX(ha))#define IS_PI_SPLIT_DET_CAPABLE (ha) (IS_PI_SPLIT_DET_CAPABLE_HBA(ha) && \
drivers/scsi/qla2xxx/qla_os.c +1 -3
@@ -132,7 +132,6 @@ MODULE_PARM_DESC(ql2xenabledif," Enable T10-CRC-DIF:\n" " Default is 2.\n" " 0 -- No DIF Support\n" -" 1 -- Enable DIF for all types\n" " 2 -- Enable DIF for all types, except Type 0.\n");#if (IS_ENABLED (CONFIG_NVME_FC ))
@@ -3370,8 +3369,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) guard =SHOST_DIX_GUARD_CRC ; -if (IS_PI_IPGUARD_CAPABLE (ha) && - (ql2xenabledif >1 ||IS_PI_DIFB_DIX0_CAPABLE (ha))) +if (IS_PI_IPGUARD_CAPABLE (ha) && ql2xenabledif) guard |=SHOST_DIX_GUARD_IP ;if (ql2xprotguard)
Signature · 1 line
2.12.0
PATCH 5/25 qla2xxx: Add endianizer macro calls to fc host stats
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This patch fixes endian warning for fc_host_stats
--- drivers/scsi/qla2xxx/qla_attr.c | 36 ++++++++++++--------- drivers/scsi/qla2xxx/qla_def.h | 69 ++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 51 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +21 -15
@@ -2745,22 +2745,28 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)if (rval !=QLA_SUCCESS ) goto done_free; - p->link_failure_count = stats->link_fail_cnt; - p->loss_of_sync_count = stats->loss_sync_cnt; - p->loss_of_signal_count = stats->loss_sig_cnt; - p->prim_seq_protocol_err_count = stats->prim_seq_err_cnt; - p->invalid_tx_word_count = stats->inval_xmit_word_cnt; - p->invalid_crc_count = stats->inval_crc_cnt; + p->link_failure_count =le32_to_cpu (stats->link_fail_cnt); + p->loss_of_sync_count =le32_to_cpu (stats->loss_sync_cnt); + p->loss_of_signal_count =le32_to_cpu (stats->loss_sig_cnt); + p->prim_seq_protocol_err_count =le32_to_cpu (stats->prim_seq_err_cnt); + p->invalid_tx_word_count =le32_to_cpu (stats->inval_xmit_word_cnt); + p->invalid_crc_count =le32_to_cpu (stats->inval_crc_cnt);if (IS_FWI2_CAPABLE (ha)) { - p->lip_count = stats->lip_cnt; - p->tx_frames = stats->tx_frames; - p->rx_frames = stats->rx_frames; - p->dumped_frames = stats->discarded_frames; - p->nos_count = stats->nos_rcvd; + p->lip_count =le32_to_cpu (stats->lip_cnt); + p->tx_frames =le32_to_cpu (stats->tx_frames); + p->rx_frames =le32_to_cpu (stats->rx_frames); + p->dumped_frames =le32_to_cpu (stats->discarded_frames); + p->nos_count =le32_to_cpu (stats->nos_rcvd); p->error_frames = - stats->dropped_frames + stats->discarded_frames; - p->rx_words = vha->qla_stats.input_bytes; - p->tx_words = vha->qla_stats.output_bytes; +le32_to_cpu (stats->dropped_frames) + +le32_to_cpu (stats->discarded_frames); +if (IS_QLA83XX (ha) ||IS_QLA27XX (ha) ||IS_QLA28XX (ha)) { + p->rx_words =le64_to_cpu (stats->fpm_recv_word_cnt); + p->tx_words =le64_to_cpu (stats->fpm_xmit_word_cnt); + }else { + p->rx_words = vha->qla_stats.input_bytes; + p->tx_words = vha->qla_stats.output_bytes; + } } p->fcp_control_requests = vha->qla_stats.control_requests; p->fcp_input_requests = vha->qla_stats.input_requests;
@@ -2768,7 +2774,7 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost) p->fcp_input_megabytes = vha->qla_stats.input_bytes >>20 ; p->fcp_output_megabytes = vha->qla_stats.output_bytes >>20 ; p->seconds_since_last_reset = -get_jiffies_64 () - vha->qla_stats.jiffies_at_last_reset; +get_jiffies_64 () - vha->qla_stats.jiffies_at_last_reset;do_div (p->seconds_since_last_reset,HZ ); done_free:
drivers/scsi/qla2xxx/qla_def.h +33 -36
80 lines not on this page · raw message
Signature · 1 line
2.12.0
PATCH 6/25 qla2xxx: Add changes in preparation for vendor extended FDMI/RDP
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This patch prepares code for implementing Vendor specific extended FDMI/RDP commands. It also addes support for MBC_GET_PORT_DATABASE and MBC_GET_RNID_PARAMS commands.
--- drivers/scsi/qla2xxx/qla_def.h | 3 + drivers/scsi/qla2xxx/qla_fw.h | 4 ++ drivers/scsi/qla2xxx/qla_gbl.h | 12 +++- drivers/scsi/qla2xxx/qla_gs.c | 15 +++-- drivers/scsi/qla2xxx/qla_init.c | 28 +++++++--- drivers/scsi/qla2xxx/qla_mbx.c | 121 ++++++++++++++++++++++++++++++++++------ drivers/scsi/qla2xxx/qla_mid.c | 3 + drivers/scsi/qla2xxx/qla_os.c | 4 +- 8 files changed, 155 insertions(+), 35 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +3 -0
@@ -1261,7 +1261,9 @@ static inline bool qla2xxx_is_valid_mbs(unsigned int mbs)#define MBX_1 BIT_1#define MBX_0 BIT_0 +#define RNID_TYPE_ELS_CMD 0x5#define RNID_TYPE_PORT_LOGIN 0x7 +#define RNID_BUFFER_CREDITS 0x8#define RNID_TYPE_SET_VERSION 0x9#define RNID_TYPE_ASIC_TEMP 0xC
@@ -4458,6 +4460,7 @@ typedef struct scsi_qla_host {uint8_t node_name[WWN_SIZE ];uint8_t port_name[WWN_SIZE ];uint8_t fabric_node_name[WWN_SIZE ]; +uint8_t fabric_port_name[WWN_SIZE ];struct nvme_fc_local_port *nvme_local_port;struct completion nvme_del_done;
drivers/scsi/qla2xxx/qla_fw.h +4 -0
@@ -31,6 +31,9 @@#define PDO_FORCE_ADISC BIT_1#define PDO_FORCE_PLOGI BIT_0 +struct buffer_credit_24xx { +u32 parameter[28 ]; +};#define PORT_DATABASE_24XX_SIZE 64struct port_database_24xx {
@@ -1883,6 +1886,7 @@ struct nvram_81xx {* BIT 6-15 = Unused */ uint16_t enhanced_features; +uint16_t reserved_24[4 ];/* Offset 416. */
drivers/scsi/qla2xxx/qla_gbl.h +11 -1
@@ -32,6 +32,8 @@ extern int qla81xx_nvram_config(struct scsi_qla_host *);extern void qla2x00_update_fw_options (struct scsi_qla_host *);extern void qla24xx_update_fw_options (scsi_qla_host_t *);extern void qla81xx_update_fw_options (scsi_qla_host_t *); +extern void qla83xx_update_fw_options (scsi_qla_host_t *); +extern int qla2x00_load_risc (struct scsi_qla_host *,uint32_t *);extern int qla24xx_load_risc (scsi_qla_host_t *,uint32_t *);extern int qla81xx_load_risc (scsi_qla_host_t *,uint32_t *);
@@ -142,6 +144,7 @@ extern int qlport_down_retry;extern int ql2xplogiabsentdevice;extern int ql2xloginretrycount;extern int ql2xfdmienable; +extern int ql2xsmartsan;extern int ql2xallocfwdump;extern int ql2xextended_error_logging;extern int ql2xiidmaenable;
@@ -354,6 +357,9 @@ extern int qla2x00_get_port_database(scsi_qla_host_t *, fc_port_t *, uint8_t);extern int +qla24xx_get_port_database (scsi_qla_host_t *,u16 ,struct port_database_24xx *); + +extern int qla2x00_get_firmware_state (scsi_qla_host_t *,uint16_t *); extern int
@@ -452,6 +458,10 @@ extern int qla25xx_set_driver_version(scsi_qla_host_t *, char *);extern int +qla24xx_get_buffer_credits (scsi_qla_host_t *,struct buffer_credit_24xx *, +dma_addr_t ); + +extern int qla2x00_read_sfp (scsi_qla_host_t *,dma_addr_t ,uint8_t *,uint16_t ,uint16_t ,uint16_t ,uint16_t );
@@ -656,7 +666,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 *,size_t ); +extern size_t qla2x00_get_sym_node_name (scsi_qla_host_t *,uint8_t *,size_t );extern int qla2x00_chk_ms_status (scsi_qla_host_t *,ms_iocb_entry_t *,struct ct_sns_rsp *,const char *);extern void qla2x00_async_iocb_timeout (void *data);
drivers/scsi/qla2xxx/qla_gs.c +7 -8
@@ -844,19 +844,18 @@ static int qla_async_rnnid(scsi_qla_host_t *vha, port_id_t *d_id,return rval; } -void +size_t qla2x00_get_sym_node_name (scsi_qla_host_t *vha,uint8_t *snn,size_t size) {struct qla_hw_data *ha = vha->hw;if (IS_QLAFX00 (ha)) -snprintf (snn, size,"%s FW:v%s DVR:v%s" , ha->model_number, - ha->mr.fw_version, qla2x00_version_str); -else -snprintf (snn, size, -"%s FW:v%d.%02d.%02d DVR:v%s" , ha->model_number, - ha->fw_major_version, ha->fw_minor_version, - ha->fw_subminor_version, qla2x00_version_str); +return scnprintf (snn, size,"%s FW:v%s DVR:v%s" , + ha->model_number, ha->mr.fw_version, qla2x00_version_str); + +return scnprintf (snn, size,"%s FW:v%d.%02d.%02d DVR:v%s" , + ha->model_number, ha->fw_major_version, ha->fw_minor_version, + ha->fw_subminor_version, qla2x00_version_str); }/**
drivers/scsi/qla2xxx/qla_init.c +20 -8
@@ -5541,24 +5541,22 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha) } vha->device_flags |=SWITCH_FOUND ; + rval =qla2x00_get_port_name (vha, loop_id, vha->fabric_port_name,0 ); +if (rval !=QLA_SUCCESS ) +ql_dbg (ql_dbg_disc, vha,0x20ff , +"Failed to get Fabric Port Name\n" );if (qla_tgt_mode_enabled (vha) ||qla_dual_mode_enabled (vha)) { rval =qla2x00_send_change_request (vha,0x3 ,0 );if (rval !=QLA_SUCCESS )ql_log (ql_log_warn, vha,0x121 , -"Failed to enable receiving of RSCN requests: 0x%x.\n" , - rval); +"Failed to enable receiving of RSCN requests: 0x%x.\n" , + rval); } - do { qla2x00_mgmt_svr_login(vha); - /* FDMI support. */ - if (ql2xfdmienable && - test_and_clear_bit(REGISTER_FDMI_NEEDED, &vha->dpc_flags)) - qla2x00_fdmi_register(vha); - /* Ensure we are logged into the SNS. */ loop_id = NPH_SNS_LID(ha); rval = ha->isp_ops->fabric_login(vha, loop_id, 0xff, 0xff,
@@ -5570,6 +5568,12 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)set_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags);return rval; } + +/* FDMI support. */ +if (ql2xfdmienable && +test_and_clear_bit (REGISTER_FDMI_NEEDED , &vha->dpc_flags)) +qla2x00_fdmi_register (vha); +if (test_and_clear_bit (REGISTER_FC4_NEEDED , &vha->dpc_flags)) {if (qla2x00_rft_id (vha)) {/* EMPTY */
@@ -8664,6 +8668,14 @@ qla82xx_restart_isp(scsi_qla_host_t *vha) }void +qla83xx_update_fw_options (scsi_qla_host_t *vha) +{ +struct qla_hw_data *ha = vha->hw; + +qla2x00_set_fw_options (vha, ha->fw_options); +} + +void qla81xx_update_fw_options (scsi_qla_host_t *vha) {struct qla_hw_data *ha = vha->hw;
drivers/scsi/qla2xxx/qla_mbx.c +105 -16
191 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_mid.c +3 -0
@@ -509,6 +509,9 @@ qla24xx_create_vhost(struct fc_vport *fc_vport) vha->mgmt_svr_loop_id =qla2x00_reserve_mgmt_server_loop_id (vha); vha->dpc_flags =0L ; + ha->dpc_active =0 ; +set_bit (REGISTER_FDMI_NEEDED , &vha->dpc_flags); +set_bit (REGISTER_FC4_NEEDED , &vha->dpc_flags);/* * To fix the issue of processing a parent's RSCN for the vport before
drivers/scsi/qla2xxx/qla_os.c +2 -2
@@ -2286,7 +2286,7 @@ static struct isp_operations qla81xx_isp_ops = { .config_rings = qla24xx_config_rings, .reset_adapter = qla24xx_reset_adapter, .nvram_config = qla81xx_nvram_config, - .update_fw_options = qla81xx_update_fw_options, + .update_fw_options = qla83xx_update_fw_options, .load_risc = qla81xx_load_risc, .pci_info_str = qla24xx_pci_info_str, .fw_version_str = qla24xx_fw_version_str,
@@ -2403,7 +2403,7 @@ static struct isp_operations qla83xx_isp_ops = { .config_rings = qla24xx_config_rings, .reset_adapter = qla24xx_reset_adapter, .nvram_config = qla81xx_nvram_config, - .update_fw_options = qla81xx_update_fw_options, + .update_fw_options = qla83xx_update_fw_options, .load_risc = qla81xx_load_risc, .pci_info_str = qla24xx_pci_info_str, .fw_version_str = qla24xx_fw_version_str,
Signature · 1 line
2.12.0
PATCH 7/25 qla2xxx: Add vendor extended RDP additions and amendments
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This patch adds RDP command support in the driver. with the help of new ql2xsmartsan parameter, driver will use PUREX IOCB mode to send RDP command to switch and will be able to receive various diagnostic data.
--- drivers/scsi/qla2xxx/qla_def.h | 135 ++++++++++ drivers/scsi/qla2xxx/qla_fw.h | 44 ++++ drivers/scsi/qla2xxx/qla_gbl.h | 3 + drivers/scsi/qla2xxx/qla_init.c | 15 +- drivers/scsi/qla2xxx/qla_isr.c | 10 + drivers/scsi/qla2xxx/qla_mbx.c | 58 +++++ drivers/scsi/qla2xxx/qla_os.c | 546 +++++++++++++++++++++++++++++++++++++++- 7 files changed, 807 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +135 -0
@@ -1267,6 +1267,9 @@ static inline bool qla2xxx_is_valid_mbs(unsigned int mbs)#define RNID_TYPE_SET_VERSION 0x9#define RNID_TYPE_ASIC_TEMP 0xC +#define ELS_CMD_MAP_SIZE 32 +#define ELS_COMMAND_RDP 0x18 +/* * Firmware state codes from get firmware state mailbox command */
@@ -3562,6 +3565,133 @@ struct qlfc_fw {uint32_t len; }; +struct rdp_req_payload { +uint32_t els_request; +uint32_t desc_list_len; + +/* NPIV descriptor */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint8_t reserved; +uint8_t nport_id[3 ]; + } npiv_desc; +}; + +struct rdp_rsp_payload { +struct { +uint32_t cmd; +uint32_t len; + } hdr; + +/* LS Request Info descriptor */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint32_t req_payload_word_0; + } ls_req_info_desc; + +/* LS Request Info descriptor */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint32_t req_payload_word_0; + } ls_req_info_desc2; + +/* SFP diagnostic param descriptor */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint16_t temperature; +uint16_t vcc; +uint16_t tx_bias; +uint16_t tx_power; +uint16_t rx_power; +uint16_t sfp_flags; + } sfp_diag_desc; + +/* Port Speed Descriptor */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint16_t speed_capab; +uint16_t operating_speed; + } port_speed_desc; + +/* Link Error Status Descriptor */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint32_t link_fail_cnt; +uint32_t loss_sync_cnt; +uint32_t loss_sig_cnt; +uint32_t prim_seq_err_cnt; +uint32_t inval_xmit_word_cnt; +uint32_t inval_crc_cnt; +uint8_t pn_port_phy_type; +uint8_t reserved[3 ]; + } ls_err_desc; + +/* Port name description with diag param */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint8_t WWNN[WWN_SIZE ]; +uint8_t WWPN[WWN_SIZE ]; + } port_name_diag_desc; + +/* Port Name desc for Direct attached Fx_Port or Nx_Port */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint8_t WWNN[WWN_SIZE ]; +uint8_t WWPN[WWN_SIZE ]; + } port_name_direct_desc; + +/* Buffer Credit descriptor */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint32_t fcport_b2b; +uint32_t attached_fcport_b2b; +uint32_t fcport_rtt; + } buffer_credit_desc; + +/* Optical Element Data Descriptor */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint16_t high_alarm; +uint16_t low_alarm; +uint16_t high_warn; +uint16_t low_warn; +uint32_t element_flags; + } optical_elmt_desc[5 ]; + +/* Optical Product Data Descriptor */ +struct { +uint32_t desc_tag; +uint32_t desc_len; +uint8_t vendor_name[16 ]; +uint8_t part_number[16 ]; +uint8_t serial_number[16 ]; +uint8_t revision[4 ]; +uint8_t date[8 ]; + } optical_prod_desc; +}; + +#define RDP_DESC_LEN (obj) \ + (sizeof(obj) - sizeof((obj).desc_tag) - sizeof((obj).desc_len)) + +#define RDP_PORT_SPEED_1GB BIT_15 +#define RDP_PORT_SPEED_2GB BIT_14 +#define RDP_PORT_SPEED_4GB BIT_13 +#define RDP_PORT_SPEED_10GB BIT_12 +#define RDP_PORT_SPEED_8GB BIT_11 +#define RDP_PORT_SPEED_16GB BIT_10 +#define RDP_PORT_SPEED_32GB BIT_9 +#define RDP_PORT_SPEED_UNKNOWN BIT_0 +struct scsi_qlt_host {void *target_lport_ptr;struct mutex tgt_mutex;
@@ -3964,6 +4094,8 @@ struct qla_hw_data {#define SFP_DEV_SIZE 512#define SFP_BLOCK_SIZE 64 +#define SFP_RTDI_LEN SFP_BLOCK_SIZE +void *sfp_data;dma_addr_t sfp_data_dma;
@@ -4423,6 +4555,8 @@ typedef struct scsi_qla_host {#define ISP_ABORT_TO_ROM 33#define VPORT_DELETE 34 +#define PROCESS_PUREX_IOCB 63 +unsigned long pci_flags;#define PFLG_DISCONNECTED 0/* PCI device removed */ #define PFLG_DRIVER_REMOVING 1/* PCI driver .remove */
@@ -4531,6 +4665,7 @@ typedef struct scsi_qla_host {uint16_t ql2xexchoffld;uint16_t ql2xiniexchg; +void *purex_data;struct name_list_extended gnl;/* Count of active session/fcport */ int fcport_count;
drivers/scsi/qla2xxx/qla_fw.h +44 -0
50 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_gbl.h +3 -0
@@ -458,6 +458,9 @@ extern int qla25xx_set_driver_version(scsi_qla_host_t *, char *);extern int +qla25xx_set_els_cmds_supported (scsi_qla_host_t *); + +extern int qla24xx_get_buffer_credits (scsi_qla_host_t *,struct buffer_credit_24xx *,dma_addr_t );
drivers/scsi/qla2xxx/qla_init.c +14 -1
@@ -3708,6 +3708,10 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) "ISP Firmware failed checksum.\n"); goto failed; } + +/* Enable PUREX PASSTHRU */ +if (ql2xsmartsan) +qla25xx_set_els_cmds_supported (vha); }else goto failed;
@@ -3929,7 +3933,7 @@ qla24xx_update_fw_options(scsi_qla_host_t *vha)/* Update Serial Link options. */ if ((le16_to_cpu (ha->fw_seriallink_options24[0 ]) &BIT_0 ) ==0 ) -return ; + goto enable_purex; rval = qla2x00_set_serdes_params(vha, le16_to_cpu(ha->fw_seriallink_options24[1]),
@@ -3939,6 +3943,12 @@ qla24xx_update_fw_options(scsi_qla_host_t *vha)ql_log (ql_log_warn, vha,0x0104 ,"Unable to update Serial Link options (%x).\n" , rval); } + +enable_purex: +if (ql2xsmartsan) + ha->fw_options[1 ] |=ADD_FO1_ENABLE_PUREX_IOCB ; + +qla2x00_set_fw_options (vha, ha->fw_options); }void
@@ -8672,6 +8682,9 @@ qla83xx_update_fw_options(scsi_qla_host_t *vha) {struct qla_hw_data *ha = vha->hw; +if (ql2xsmartsan) + ha->fw_options[1 ] |=ADD_FO1_ENABLE_PUREX_IOCB ; +qla2x00_set_fw_options (vha, ha->fw_options); }
drivers/scsi/qla2xxx/qla_isr.c +10 -0
@@ -31,6 +31,13 @@ const char *const port_state_str[] = { "ONLINE" }; +static void qla24xx_purex_iocb (scsi_qla_host_t *vha,struct req_que *req, +struct sts_entry_24xx *pkt) +{ +memcpy (vha->purex_data, pkt,PUREX_ENTRY_SIZE ); +set_bit (PROCESS_PUREX_IOCB , &vha->dpc_flags); +} +/** * qla2100_intr_handler() - Process interrupts for the ISP2100 and ISP2200. * @irq: interrupt number
@@ -3128,6 +3135,9 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,qla_ctrlvp_completed (vha, rsp->req, (struct vp_ctrl_entry_24xx *)pkt);break ; +case PUREX_IOCB_TYPE : +qla24xx_purex_iocb (vha, rsp->req, pkt); +break ;default :/* Type Not Supported. */ ql_dbg(ql_dbg_async, vha, 0x5042,
drivers/scsi/qla2xxx/qla_mbx.c +58 -0
64 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_os.c +543 -3
604 lines not on this page · raw message
Signature · 1 line
2.12.0
PATCH 8/25 qla2xxx: Add ql2xrdpenable module parameter for RDP
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This patch provides separate module parameter ql2xrdpenable to turn on/off RDP capability in the driver. However, if ql2xsmartsan parameter is enabled, it will also turn on ql2xfdmienable parameter since its required for RDP to work.
--- drivers/scsi/qla2xxx/qla_gbl.h | 1 + drivers/scsi/qla2xxx/qla_init.c | 12 +++++++++--- drivers/scsi/qla2xxx/qla_os.c | 10 +++++++++- 3 files changed, 19 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_gbl.h +1 -0
@@ -144,6 +144,7 @@ extern int qlport_down_retry;extern int ql2xplogiabsentdevice;extern int ql2xloginretrycount;extern int ql2xfdmienable; +extern int ql2xrdpenable;extern int ql2xsmartsan;extern int ql2xallocfwdump;extern int ql2xextended_error_logging;
drivers/scsi/qla2xxx/qla_init.c +9 -3
@@ -2270,6 +2270,12 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)ql_dbg (ql_dbg_init, vha,0x0078 ,"Verifying loaded RISC code...\n" ); +/* If smartsan enabled then require fdmi and rdp enabled */ +if (ql2xsmartsan) { + ql2xfdmienable =1 ; + ql2xrdpenable =1 ; + } +if (qla2x00_isp_firmware (vha) !=QLA_SUCCESS ) { rval = ha->isp_ops->chip_diag (vha);if (rval)
@@ -3710,7 +3716,7 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) }/* Enable PUREX PASSTHRU */ -if (ql2xsmartsan) +if (ql2xrdpenable)qla25xx_set_els_cmds_supported (vha); }else goto failed;
@@ -3945,7 +3951,7 @@ qla24xx_update_fw_options(scsi_qla_host_t *vha) } enable_purex: -if (ql2xsmartsan) +if (ql2xrdpenable) ha->fw_options[1 ] |=ADD_FO1_ENABLE_PUREX_IOCB ;qla2x00_set_fw_options (vha, ha->fw_options);
@@ -8682,7 +8688,7 @@ qla83xx_update_fw_options(scsi_qla_host_t *vha) {struct qla_hw_data *ha = vha->hw; -if (ql2xsmartsan) +if (ql2xrdpenable) ha->fw_options[1 ] |=ADD_FO1_ENABLE_PUREX_IOCB ;qla2x00_set_fw_options (vha, ha->fw_options);
drivers/scsi/qla2xxx/qla_os.c +9 -1
@@ -113,7 +113,8 @@ module_param(ql2xfdmienable, int, S_IRUGO|S_IWUSR);module_param_named (fdmi, ql2xfdmienable, int,S_IRUGO |S_IWUSR );MODULE_PARM_DESC (ql2xfdmienable,"Enables FDMI registrations. " -"0 - no FDMI. Default is 1 - perform FDMI." ); +"0 - no FDMI registrations. " +"1 - provide FDMI registrations (default)." );#define MAX_Q_DEPTH 64static int ql2xmaxqdepth =MAX_Q_DEPTH ;
@@ -313,6 +314,13 @@ MODULE_PARM_DESC(ql2xsmartsan," Default is 0 - No SmartSAN registration," " 1 - Register SmartSAN Management Attributes."); +int ql2xrdpenable; +module_param (ql2xrdpenable, int,0444 ); +module_param_named (rdpenable, ql2xrdpenable, int,0444 ); +MODULE_PARM_DESC (ql2xrdpenable, +"Enables RDP responses. " +"0 - no RDP responses (default). " +"1 - provide RDP responses." );static void qla2x00_clear_drv_active (struct qla_hw_data *);static void qla2x00_free_device (scsi_qla_host_t *);
Signature · 1 line
2.12.0
PATCH 9/25 qla2xxx: Add vendor extended FDMI commands
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This patch adds support for extended FDMI commands and cleans up code to reduce duplication.
--- drivers/scsi/qla2xxx/qla_def.h | 134 ++-- drivers/scsi/qla2xxx/qla_gs.c | 1687 ++++++++++++++++++---------------------- 2 files changed, 830 insertions(+), 991 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +66 -68
@@ -2627,10 +2627,11 @@ static const char * const port_dstate_str[] = {#define GFF_ID_RSP_SIZE (16 + 128)/* -* HBA attribute types. +* FDMI HBA attribute types. */ -#define FDMI_HBA_ATTR_COUNT 9 -#define FDMIV2_HBA_ATTR_COUNT 17 +#define FDMI1_HBA_ATTR_COUNT 9 +#define FDMI2_HBA_ATTR_COUNT 17 +#define FDMI_HBA_NODE_NAME 0x1#define FDMI_HBA_MANUFACTURER 0x2#define FDMI_HBA_SERIAL_NUMBER 0x3
@@ -2642,12 +2643,13 @@ static const char * const port_dstate_str[] = {#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_VENDOR_SPECIFIC_INFO 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 +#define FDMI_HBA_VENDOR_IDENTIFIER 0xe0struct ct_fdmi_hba_attr {uint16_t type;
@@ -2664,31 +2666,9 @@ struct ct_fdmi_hba_attr {uint8_t fw_version[32 ];uint8_t os_version[128 ];uint32_t max_ct_len; - } a; -}; - -struct ct_fdmi_hba_attributes { -uint32_t count; -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[64 ]; -uint8_t serial_num[32 ]; -uint8_t model[16 +1 ]; -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 vendor_specific_info;uint32_t num_ports;uint8_t fabric_name[WWN_SIZE ];uint8_t bios_name[32 ];
@@ -2696,22 +2676,30 @@ struct ct_fdmiv2_hba_attr { } a; }; -struct ct_fdmiv2_hba_attributes { +struct ct_fdmi1_hba_attributes {uint32_t count; -struct ct_fdmiv2_hba_attr entry[FDMIV2_HBA_ATTR_COUNT ]; +struct ct_fdmi_hba_attr entry[FDMI1_HBA_ATTR_COUNT ]; +}; + +struct ct_fdmi2_hba_attributes { +uint32_t count; +struct ct_fdmi_hba_attr entry[FDMI2_HBA_ATTR_COUNT ]; };/* -* Port attribute types. +* FDMI Port attribute types. */ -#define FDMI_PORT_ATTR_COUNT 6 -#define FDMIV2_PORT_ATTR_COUNT 16 +#define FDMI1_PORT_ATTR_COUNT 6 +#define FDMI2_PORT_ATTR_COUNT 16 +#define FDMI2_SMARTSAN_PORT_ATTR_COUNT 23 +#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
@@ -2721,7 +2709,15 @@ struct ct_fdmiv2_hba_attributes {#define FDMI_PORT_FC4_TYPE 0xd#define FDMI_PORT_STATE 0x101#define FDMI_PORT_COUNT 0x102 -#define FDMI_PORT_ID 0x103 +#define FDMI_PORT_IDENTIFIER 0x103 + +#define FDMI_SMARTSAN_SERVICE 0xF100 +#define FDMI_SMARTSAN_GUID 0xF101 +#define FDMI_SMARTSAN_VERSION 0xF102 +#define FDMI_SMARTSAN_PROD_NAME 0xF103 +#define FDMI_SMARTSAN_PORT_INFO 0xF104 +#define FDMI_SMARTSAN_QOS_SUPPORT 0xF105 +#define FDMI_SMARTSAN_SECURITY_SUPPORT 0xF106#define FDMI_PORT_SPEED_1GB 0x1#define FDMI_PORT_SPEED_2GB 0x2
@@ -2737,7 +2733,7 @@ struct ct_fdmiv2_hba_attributes {#define FC_CLASS_3 0x08#define FC_CLASS_2_3 0x0C -struct ct_fdmiv2_port_attr { +struct ct_fdmi_port_attr {uint16_t type;uint16_t len;union {
@@ -2747,6 +2743,7 @@ struct ct_fdmiv2_port_attr {uint32_t max_frame_size;uint8_t os_dev_name[32 ];uint8_t host_name[256 ]; +uint8_t node_name[WWN_SIZE ];uint8_t port_name[WWN_SIZE ];uint8_t port_sym_name[128 ];
@@ -2757,35 +2754,38 @@ struct ct_fdmiv2_port_attr {uint32_t port_state;uint32_t num_ports;uint32_t port_id; + +uint8_t smartsan_service[24 ]; +uint8_t smartsan_guid[16 ]; +uint8_t smartsan_version[24 ]; +uint8_t smartsan_prod_name[16 ]; +uint32_t smartsan_port_info; +uint32_t smartsan_qos_support; +uint32_t smartsan_security_support; } a; }; -/* -* Port Attribute Block. -*/ -struct ct_fdmiv2_port_attributes { +struct ct_fdmi1_port_attributes {uint32_t count; -struct ct_fdmiv2_port_attr entry[FDMIV2_PORT_ATTR_COUNT ]; +struct ct_fdmi_port_attr entry[FDMI1_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[256 ]; - } a; -}; - -struct ct_fdmi_port_attributes { +struct ct_fdmi2_port_attributes {uint32_t count; -struct ct_fdmi_port_attr entry[FDMI_PORT_ATTR_COUNT ]; +struct ct_fdmi_port_attr entry[FDMI2_PORT_ATTR_COUNT ]; }; +#define FDMI_ATTR_TYPELEN (obj) \ + (sizeof((obj)->type) + sizeof((obj)->len)) + +#define FDMI_ATTR_ALIGNMENT (len) \ + (4 - ((len) & 3)) + +/* FDMI register call options */ +#define CALLOPT_FDMI1 0 +#define CALLOPT_FDMI2 1 +#define CALLOPT_FDMI2_SMARTSAN 2 +/* FDMI definitions. */ #define GRHL_CMD 0x100#define GHAT_CMD 0x101
@@ -2796,10 +2796,13 @@ struct ct_fdmi_port_attributes {#define RHBA_RSP_SIZE 16#define RHAT_CMD 0x201 +#define RPRT_CMD 0x210 +#define RPRT_RSP_SIZE 24#define RPA_CMD 0x211#define RPA_RSP_SIZE 16 +#define SMARTSAN_RPA_RSP_SIZE 24#define DHBA_CMD 0x300#define DHBA_REQ_SIZE (16 + 8)
@@ -2882,30 +2885,24 @@ struct ct_sns_req {uint8_t hba_identifier[8 ];uint32_t entry_count;uint8_t port_name[8 ]; -struct ct_fdmi_hba_attributes attrs; +struct ct_fdmi2_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; +struct ct_fdmi1_hba_attributes attrs; } rhat;struct {uint8_t port_name[8 ]; -struct ct_fdmi_port_attributes attrs; +struct ct_fdmi2_port_attributes attrs; } rpa;struct { +uint8_t hba_identifier[8 ];uint8_t port_name[8 ]; -struct ct_fdmiv2_port_attributes attrs; - } rpa2; +struct ct_fdmi2_port_attributes attrs; + } rprt;struct {uint8_t port_name[8 ];
@@ -3019,7 +3016,7 @@ struct ct_sns_rsp {struct {uint32_t entry_count;uint8_t port_name[8 ]; -struct ct_fdmi_hba_attributes attrs; +struct ct_fdmi1_hba_attributes attrs; } ghat;struct {
@@ -3690,6 +3687,7 @@ struct rdp_rsp_payload {#define RDP_PORT_SPEED_8GB BIT_11#define RDP_PORT_SPEED_16GB BIT_10#define RDP_PORT_SPEED_32GB BIT_9 +#define RDP_PORT_SPEED_64GB BIT_8#define RDP_PORT_SPEED_UNKNOWN BIT_0struct scsi_qlt_host {
drivers/scsi/qla2xxx/qla_gs.c +764 -923
1,924 lines not on this page · raw message
Signature · 1 line
2.12.0
PATCH 10/25 qla2xxx: Display message for FCE enabled
In reply to Himanshu MadhaniDuring Link up phase and Data rate MBX command response, print message indicating FCE is enabled.
--- drivers/scsi/qla2xxx/qla_isr.c | 6 ++++++ drivers/scsi/qla2xxx/qla_mbx.c | 9 +++++++++ 2 files changed, 15 insertions(+)
drivers/scsi/qla2xxx/qla_isr.c +6 -0
@@ -820,6 +820,12 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)"LOOP UP detected (%s Gbps).\n" , qla2x00_get_link_speed_str(ha, ha->link_data_rate)); +if (IS_QLA83XX (ha) ||IS_QLA27XX (ha) ||IS_QLA28XX (ha)) { +if (mb[2 ] &BIT_0 ) +ql_log (ql_log_info, vha,0x11a0 , +"FEC=enabled (link up).\n" ); + } + vha->flags.management_server_logged_in =0 ;qla2x00_post_aen_work (vha,FCH_EVT_LINKUP , ha->link_data_rate);
drivers/scsi/qla2xxx/qla_mbx.c +9 -0
@@ -5554,6 +5554,15 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)ql_dbg (ql_dbg_mbx, vha,0x1107 ,"Failed=%x mb[0]=%x.\n" , rval, mcp->mb[0 ]); }else { +if (mcp->mb[1 ] !=0x7 ) + ha->link_data_rate = mcp->mb[1 ]; + +if (IS_QLA83XX (ha) ||IS_QLA27XX (ha) ||IS_QLA28XX (ha)) { +if (mcp->mb[4 ] &BIT_0 ) +ql_log (ql_log_info, vha,0x11a2 , +"FEC=enabled (data rate).\n" ); + } +ql_dbg (ql_dbg_mbx + ql_dbg_verbose, vha,0x1108 ,"Done %s.\n" , __func__);if (mcp->mb[1 ] !=0x7 )
Signature · 1 line
2.12.0
PATCH 11/25 qla2xxx: Show correct port speed capabilities for RDP command
In reply to Himanshu MadhaniThis patch correctly displays Port speed capabiltiy and current speed for RDP command.
--- drivers/scsi/qla2xxx/qla_os.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +35 -6
@@ -5762,13 +5762,39 @@ qla25xx_rdp_port_speed_capability(struct qla_hw_data *ha)if (IS_CNA_CAPABLE (ha))return RDP_PORT_SPEED_10GB ; -if (IS_QLA27XX (ha)) { -if (FW_ABILITY_MAX_SPEED (ha) ==FW_ABILITY_MAX_SPEED_32G ) -return RDP_PORT_SPEED_32GB |RDP_PORT_SPEED_16GB | -RDP_PORT_SPEED_8GB ; +if (IS_QLA27XX (ha) ||IS_QLA28XX (ha)) { +unsigned int speeds =0 ; -return RDP_PORT_SPEED_16GB |RDP_PORT_SPEED_8GB | -RDP_PORT_SPEED_4GB ; +if (ha->max_supported_speed ==2 ) { +if (ha->min_supported_speed <=6 ) + speeds |=RDP_PORT_SPEED_64GB ; + } + +if (ha->max_supported_speed ==2 || + ha->max_supported_speed ==1 ) { +if (ha->min_supported_speed <=5 ) + speeds |=RDP_PORT_SPEED_32GB ; + } + +if (ha->max_supported_speed ==2 || + ha->max_supported_speed ==1 || + ha->max_supported_speed ==0 ) { +if (ha->min_supported_speed <=4 ) + speeds |=RDP_PORT_SPEED_16GB ; + } + +if (ha->max_supported_speed ==1 || + ha->max_supported_speed ==0 ) { +if (ha->min_supported_speed <=3 ) + speeds |=RDP_PORT_SPEED_8GB ; + } + +if (ha->max_supported_speed ==0 ) { +if (ha->min_supported_speed <=2 ) + speeds |=RDP_PORT_SPEED_4GB ; + } + +return speeds; }if (IS_QLA2031 (ha))
@@ -5814,6 +5840,9 @@ qla25xx_rdp_port_speed_currently(struct qla_hw_data *ha)case PORT_SPEED_32GB :return RDP_PORT_SPEED_32GB ; +case PORT_SPEED_64GB : +return RDP_PORT_SPEED_64GB ; +default :return RDP_PORT_SPEED_UNKNOWN ; }
Signature · 1 line
2.12.0
PATCH 12/25 qla2xxx: Cleanup ELS/PUREX iocb fields
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This patch does following to improve RDP processing
- Rename field port_id to d_id in ELS and PUREX iocb structs to match FW spec.
- Remove redundant comments from ELS and PUREX iocb structs.
- Refactor fields in ELS iocb struct for error subcode common access.
- Properly use error subcode fields in rdp processing routine.
- Add print logs for alloc failure in purex rdp processing routine.
--- drivers/scsi/qla2xxx/qla_fw.h | 39 +++++++++++++++++++++++++-------------- drivers/scsi/qla2xxx/qla_iocb.c | 12 ++++++------ drivers/scsi/qla2xxx/qla_os.c | 28 +++++++++++++++++----------- 3 files changed, 48 insertions(+), 31 deletions(-)
drivers/scsi/qla2xxx/qla_fw.h +25 -14
@@ -779,9 +779,8 @@ struct els_entry_24xx {uint32_t handle;/* System handle. */ -uint16_t reserved_1; - -uint16_t nport_handle;/* N_PORT handle. */ +uint16_t comp_status;/* response only */ +uint16_t nport_handle;uint16_t tx_dsd_count;
@@ -796,7 +795,7 @@ struct els_entry_24xx {uint8_t opcode;uint8_t reserved_2; -uint8_t port_id[3 ]; +uint8_t d_id[3 ];uint8_t s_id[3 ];uint16_t control_flags;/* Control flags. */
@@ -808,13 +807,24 @@ struct els_entry_24xx {#define ECF_CLR_PASSTHRU_PEND BIT_12#define ECF_INCL_FRAME_HDR BIT_11 -__le32 rx_byte_count; -__le32 tx_byte_count; +union { +struct { +__le32 rx_byte_count; +__le32 tx_byte_count; - __le64 tx_address __packed; /* Data segment 0 address. */ -__le32 tx_len;/* Data segment 0 length. */ - __le64 rx_address __packed; /* Data segment 1 address. */ -__le32 rx_len;/* Data segment 1 length. */ + __le64 tx_address __packed; /* DSD 0 address. */ +__le32 tx_len;/* DSD 0 length. */ + + __le64 rx_address __packed; /* DSD 1 address. */ +__le32 rx_len;/* DSD 1 length. */ + }; +struct { +uint32_t total_byte_count; +uint32_t error_subcode_1; +uint32_t error_subcode_2; +uint32_t error_subcode_3; + }; + }; };struct els_sts_entry_24xx {
@@ -840,15 +850,16 @@ struct els_sts_entry_24xx {uint8_t opcode;uint8_t reserved_3; -uint8_t port_id[3 ]; -uint8_t reserved_4; - -uint16_t reserved_5; +uint8_t d_id[3 ]; +uint8_t s_id[3 ];uint16_t control_flags;/* Control flags. */ uint32_t total_byte_count;uint32_t error_subcode_1;uint32_t error_subcode_2; +uint32_t error_subcode_3; + +uint32_t reserved_4[4 ]; };/* * ISP queue - Mailbox Command entry structure definition.
drivers/scsi/qla2xxx/qla_iocb.c +6 -6
@@ -2684,9 +2684,9 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) els_iocb->rx_dsd_count =0 ; els_iocb->opcode = elsio->u.els_logo.els_cmd; - els_iocb->port_id[0 ] = sp->fcport->d_id.b.al_pa; - els_iocb->port_id[1 ] = sp->fcport->d_id.b.area; - els_iocb->port_id[2 ] = sp->fcport->d_id.b.domain; + els_iocb->d_id[0 ] = sp->fcport->d_id.b.al_pa; + els_iocb->d_id[1 ] = sp->fcport->d_id.b.area; + els_iocb->d_id[2 ] = sp->fcport->d_id.b.domain;/* For SID the byte order is different than DID */ els_iocb->s_id[1 ] = vha->d_id.b.al_pa; els_iocb->s_id[2 ] = vha->d_id.b.area;
@@ -3030,9 +3030,9 @@ qla24xx_els_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) sp->type ==SRB_ELS_CMD_RPT ? bsg_request->rqst_data.r_els.els_code : bsg_request->rqst_data.h_els.command_code; - els_iocb->port_id[0 ] = sp->fcport->d_id.b.al_pa; - els_iocb->port_id[1 ] = sp->fcport->d_id.b.area; - els_iocb->port_id[2 ] = sp->fcport->d_id.b.domain; + els_iocb->d_id[0 ] = sp->fcport->d_id.b.al_pa; + els_iocb->d_id[1 ] = sp->fcport->d_id.b.area; + els_iocb->d_id[2 ] = sp->fcport->d_id.b.domain; els_iocb->control_flags =0 ; els_iocb->rx_byte_count =cpu_to_le32 (bsg_job->reply_payload.payload_len);
drivers/scsi/qla2xxx/qla_os.c +17 -11
@@ -5886,13 +5886,19 @@ static int qla24xx_process_purex_iocb(struct scsi_qla_host *vha, void *pkt) rsp_els =dma_alloc_coherent (&ha->pdev->dev,sizeof (*rsp_els), &rsp_els_dma,GFP_KERNEL ); -if (!rsp_els) +if (!rsp_els) { +ql_log (ql_log_warn, vha,0x0183 , +"Failed allocate dma buffer ELS RSP.\n" ); goto dealloc; + } rsp_payload =dma_alloc_coherent (&ha->pdev->dev,sizeof (*rsp_payload), &rsp_payload_dma,GFP_KERNEL ); -if (!rsp_payload) +if (!rsp_payload) { +ql_log (ql_log_warn, vha,0x0184 , +"Failed allocate dma buffer ELS RSP payload.\n" ); goto dealloc; + } sfp =dma_alloc_coherent (&ha->pdev->dev,SFP_RTDI_LEN , &sfp_dma,GFP_KERNEL );
@@ -5918,9 +5924,9 @@ static int qla24xx_process_purex_iocb(struct scsi_qla_host *vha, void *pkt) rsp_els->rx_dsd_count =0 ; rsp_els->opcode = purex->els_frame_payload[0 ]; - rsp_els->port_id[0 ] = purex->s_id[0 ]; - rsp_els->port_id[1 ] = purex->s_id[1 ]; - rsp_els->port_id[2 ] = purex->s_id[2 ]; + rsp_els->d_id[0 ] = purex->s_id[0 ]; + rsp_els->d_id[1 ] = purex->s_id[1 ]; + rsp_els->d_id[2 ] = purex->s_id[2 ]; rsp_els->control_flags =EPD_ELS_ACC ; rsp_els->rx_byte_count =0 ;
@@ -6263,14 +6269,14 @@ static int qla24xx_process_purex_iocb(struct scsi_qla_host *vha, void *pkt) rval =qla2x00_issue_iocb (vha, rsp_els, rsp_els_dma,0 ); -if (rval !=QLA_SUCCESS ) { +if (rval) {ql_log (ql_log_warn, vha,0x0188 , -"%s: failed to issue IOCB (%x).\n" , __func__, rval); - }else if (rsp_els->entry_status !=0 ) { +"%s: iocb failed to execute -> %x\n" , __func__, rval); + }else if (rsp_els->comp_status) {ql_log (ql_log_warn, vha,0x0189 , -"%s: failed to complete IOCB -- error status (%x).\n" , - __func__, rsp_els->entry_status); - rval =QLA_FUNCTION_FAILED ; +"%s: iocb failed to complete -> completion=%#x subcode=(%#x,%#x)\n" , + __func__, rsp_els->comp_status, + rsp_els->error_subcode_1, rsp_els->error_subcode_2); }else {ql_dbg (ql_dbg_init, vha,0x018a ,"%s: done.\n" , __func__); }
Signature · 1 line
2.12.0
PATCH 13/25 qla2xxx: Add deferred queue for processing ABTS and RDP
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This patch adds deferred queue for processing aborts and RDP in the driver.
--- drivers/scsi/qla2xxx/qla_def.h | 15 +++- drivers/scsi/qla2xxx/qla_fw.h | 91 ++++++++++++++++++++++-- drivers/scsi/qla2xxx/qla_gbl.h | 2 + drivers/scsi/qla2xxx/qla_isr.c | 154 +++++++++++++++++++++++++++++++++++++++-- drivers/scsi/qla2xxx/qla_mid.c | 7 ++ drivers/scsi/qla2xxx/qla_os.c | 62 ++++++++++++----- 6 files changed, 304 insertions(+), 27 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +14 -1
@@ -4473,6 +4473,15 @@ struct active_regions {#define QLA_SET_DATA_RATE_NOLR 1#define QLA_SET_DATA_RATE_LR 2/* Set speed and initiate LR */ +struct purex_item { +struct list_head list; +struct scsi_qla_host *vha; +void (*process_item)(struct scsi_qla_host *vha,void *pkt); +struct { +uint8_t iocb[64 ]; + } iocb; +}; +/* * Qlogic scsi host structure */
@@ -4663,7 +4672,11 @@ typedef struct scsi_qla_host {uint16_t ql2xexchoffld;uint16_t ql2xiniexchg; -void *purex_data; +struct purex_list { +struct list_head head; +spinlock_t lock; + } purex_list; +struct name_list_extended gnl;/* Count of active session/fcport */ int fcport_count;
drivers/scsi/qla2xxx/qla_fw.h +87 -4
109 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_gbl.h +2 -0
@@ -230,6 +230,7 @@ void qla2x00_handle_login_done_event(struct scsi_qla_host *, fc_port_t *,int qla24xx_post_gnl_work (struct scsi_qla_host *,fc_port_t *);int qla24xx_post_relogin_work (struct scsi_qla_host *vha);void qla2x00_wait_for_sess_deletion (scsi_qla_host_t *); +void qla24xx_process_purex_rdp (struct scsi_qla_host *vha,void *pkt);/* * Global Functions in qla_mid.c source file.
@@ -928,6 +929,7 @@ void qlt_remove_target_resources(struct qla_hw_data *);void qlt_clr_qp_table (struct scsi_qla_host *vha);void qlt_set_mode (struct scsi_qla_host *);int qla2x00_set_data_rate (scsi_qla_host_t *vha,uint16_t mode); +extern void qla24xx_process_purex_list (struct purex_list *);/* nvme.c */ void qla_nvme_unregister_remote_port (struct fc_port *fcport);
drivers/scsi/qla2xxx/qla_isr.c +150 -4
177 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_mid.c +7 -0
@@ -361,6 +361,13 @@ qla2x00_do_dpc_vp(scsi_qla_host_t *vha) } } +if (test_bit (PROCESS_PUREX_IOCB , &vha->dpc_flags)) { +if (atomic_read (&vha->loop_state) ==LOOP_READY ) { +qla24xx_process_purex_list (&vha->purex_list); +clear_bit (PROCESS_PUREX_IOCB , &vha->dpc_flags); + } + } +if (test_bit (FCPORT_UPDATE_NEEDED , &vha->dpc_flags)) {ql_dbg (ql_dbg_dpc, vha,0x4016 ,"FCPort update scheduled.\n" );
drivers/scsi/qla2xxx/qla_os.c +44 -18
129 lines not on this page · raw message
Signature · 1 line
2.12.0
PATCH 14/25 qla2xxx: Handle cases for limiting RDP response payload length
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This patch reduces RDP response payload length, if requesting port is a domain Controller (sid 0xfffc01) and fw is earlier than 8.09.00 and fw is not 8.05.65 then limit the RDP response payload length to maximum of 256 bytes by terminating the response just before the optical element descriptor.
--- drivers/scsi/qla2xxx/qla_os.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +40 -2
@@ -5767,6 +5767,32 @@ qla83xx_idc_lock(scsi_qla_host_t *base_vha, uint16_t requester_id)return ; } +static bool +qla25xx_rdp_rsp_reduce_size (struct scsi_qla_host *vha, +struct purex_entry_24xx *purex) +{ +char fwstr[16 ]; +u32 sid = purex->s_id[2 ] <<16 | purex->s_id[1 ] <<8 | purex->s_id[0 ]; + +/* Domain Controller is always logged-out. */ +/* if RDP request is not from Domain Controller: */ +if (sid !=0xfffc01 ) +return false; + +ql_dbg (ql_dbg_init, vha,0x0181 ,"%s: s_id=%#x\n" , __func__, sid); + + vha->hw->isp_ops->fw_version_str (vha, fwstr,sizeof (fwstr)); + fwstr[strcspn (fwstr," " )] =0 ; +/* if FW version allows RDP response length upto 2048 bytes: */ +if (strcmp (fwstr,"8.09.00" ) >0 ||strcmp (fwstr,"8.05.65" ) ==0 ) +return false; + +ql_dbg (ql_dbg_init, vha,0x0181 ,"%s: fw=%s\n" , __func__, fwstr); + +/* RDP response length is to be reduced to maximum 256 bytes */ +return true; +} +static uint qla25xx_rdp_port_speed_capability (struct qla_hw_data *ha) {
@@ -5885,6 +5911,7 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt)struct buffer_credit_24xx *bbc =NULL ;uint8_t *sfp =NULL ;uint16_t sfp_flags =0 ; +uint rsp_payload_length =sizeof (*rsp_payload);int rval; ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x0180,
@@ -5895,6 +5922,14 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt)ql_dump_buffer (ql_dbg_init + ql_dbg_verbose, vha,0x0182 , (void *)purex,sizeof (*purex)); +if (qla25xx_rdp_rsp_reduce_size (vha, purex)) { + rsp_payload_length = + offsetof(typeof(*rsp_payload), optical_elmt_desc); +ql_dbg (ql_dbg_init, vha,0x0181 , +"Reducing RSP payload length to %u bytes...\n" , + rsp_payload_length); + } + rsp_els =dma_alloc_coherent (&ha->pdev->dev,sizeof (*rsp_els), &rsp_els_dma,GFP_KERNEL );if (!rsp_els) {
@@ -5941,7 +5976,7 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt) rsp_els->control_flags =EPD_ELS_ACC ; rsp_els->rx_byte_count =0 ; - rsp_els->tx_byte_count =cpu_to_le32 (sizeof (*rsp_payload)); + rsp_els->tx_byte_count =cpu_to_le32 (rsp_payload_length);put_unaligned_le64 (rsp_payload_dma, &rsp_els->tx_address); rsp_els->tx_len = rsp_els->tx_byte_count;
@@ -6116,6 +6151,9 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt) } } +if (rsp_payload_length <sizeof (*rsp_payload)) + goto send; +if (sfp) {memset (sfp,0 ,SFP_RTDI_LEN ); rval =qla2x00_read_sfp (vha, sfp_dma, sfp,0xa2 ,0 ,64 ,0 );
@@ -6276,7 +6314,7 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt)ql_dbg (ql_dbg_init + ql_dbg_verbose, vha,0x0186 ,"-------- ELS RSP PAYLOAD -------\n" );ql_dump_buffer (ql_dbg_init + ql_dbg_verbose, vha,0x0187 , - (void *)rsp_payload, rsp_els->tx_byte_count); + (void *)rsp_payload, rsp_payload_length); rval =qla2x00_issue_iocb (vha, rsp_els, rsp_els_dma,0 );
Signature · 1 line
2.12.0
PATCH 15/25 qla2xxx: Fix RDP response size
In reply to Himanshu MadhaniThis patch fixes RDP length in case when driver
needs to reduce length of RDP response
--- drivers/scsi/qla2xxx/qla_os.c | 53 ++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 34 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +19 -34
@@ -5773,6 +5773,7 @@ qla25xx_rdp_rsp_reduce_size(struct scsi_qla_host *vha, {char fwstr[16 ];u32 sid = purex->s_id[2 ] <<16 | purex->s_id[1 ] <<8 | purex->s_id[0 ]; +struct port_database_24xx *pdb;/* Domain Controller is always logged-out. */ /* if RDP request is not from Domain Controller: */
@@ -5781,6 +5782,24 @@ qla25xx_rdp_rsp_reduce_size(struct scsi_qla_host *vha,ql_dbg (ql_dbg_init, vha,0x0181 ,"%s: s_id=%#x\n" , __func__, sid); + pdb =kzalloc (sizeof (*pdb),GFP_KERNEL ); +if (!pdb) { +ql_dbg (ql_dbg_init, vha,0x0181 , +"%s: Failed allocate pdb\n" , __func__); + }else if (qla24xx_get_port_database (vha, purex->nport_handle, pdb)) { +ql_dbg (ql_dbg_init, vha,0x0181 , +"%s: Failed get pdb sid=%x\n" , __func__, sid); + }else if (pdb->current_login_state !=PDS_PLOGI_COMPLETE && + pdb->current_login_state !=PDS_PRLI_COMPLETE ) { +ql_dbg (ql_dbg_init, vha,0x0181 , +"%s: Port not logged in sid=%#x\n" , __func__, sid); + }else { +/* RDP request is from logged in port */ +kfree (pdb); +return false; + } +kfree (pdb); + vha->hw->isp_ops->fw_version_str (vha, fwstr,sizeof (fwstr)); fwstr[strcspn (fwstr," " )] =0 ;/* if FW version allows RDP response length upto 2048 bytes: */
@@ -5899,7 +5918,6 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt) {struct qla_hw_data *ha = vha->hw;struct purex_entry_24xx *purex = pkt; -struct port_database_24xx *pdb =NULL ;dma_addr_t rsp_els_dma;dma_addr_t rsp_payload_dma;dma_addr_t stat_dma;
@@ -5984,34 +6002,6 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt) rsp_els->rx_address =0 ; rsp_els->rx_len =0 ; -if (sizeof (*rsp_payload) <=0x100 ) - goto accept; - - pdb =kzalloc (sizeof (*pdb),GFP_KERNEL ); -if (!pdb) - goto reduce; - - rval =qla24xx_get_port_database (vha, purex->nport_handle, pdb); -if (rval) - goto reduce; - -if (pdb->port_id[0 ] != purex->s_id[2 ] || - pdb->port_id[1 ] != purex->s_id[1 ] || - pdb->port_id[2 ] != purex->s_id[0 ]) - goto reduce; - -if (pdb->current_login_state ==PDS_PLOGI_COMPLETE || - pdb->current_login_state ==PDS_PRLI_COMPLETE ) - goto accept; - -reduce: -ql_dbg (ql_dbg_init, vha,0x016e ,"Requesting port is not logged in.\n" ); - rsp_els->tx_byte_count = rsp_els->tx_len = - offsetof(struct rdp_rsp_payload , buffer_credit_desc); -ql_dbg (ql_dbg_init, vha,0x016f ,"Reduced response payload size %u.\n" , - rsp_els->tx_byte_count); - -accept:/* Prepare Response Payload */ rsp_payload->hdr.cmd =cpu_to_be32 (0x2 <<24 );/* LS_ACC */ rsp_payload->hdr.len = cpu_to_be32(
@@ -6129,9 +6119,6 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt) vha->fabric_port_name, sizeof(rsp_payload->port_name_direct_desc.WWPN)); -if (rsp_els->tx_byte_count <sizeof (*rsp_payload)) - goto send; -if (bbc) {memset (bbc,0 ,sizeof (*bbc)); rval =qla24xx_get_buffer_credits (vha, bbc, bbc_dma);
@@ -6331,8 +6318,6 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt) } dealloc: -kfree (pdb); -if (bbc)dma_free_coherent (&ha->pdev->dev,sizeof (*bbc), bbc, bbc_dma);
Signature · 1 line
2.12.0
PATCH 16/25 qla2xxx: Use endian macros to assign static fields in fwdump header
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This takes care of big endian architectures.
--- drivers/scsi/qla2xxx/qla_tmpl.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/scsi/qla2xxx/qla_tmpl.c +9 -8
@@ -870,7 +870,7 @@ qla27xx_walk_template(struct scsi_qla_host *vha,static void qla27xx_time_stamp (struct qla27xx_fwdt_template *tmp) { - tmp->capture_timestamp = jiffies; + tmp->capture_timestamp =cpu_to_le32 (jiffies); } static void
@@ -882,9 +882,10 @@ qla27xx_driver_info(struct qla27xx_fwdt_template *tmp)"%hhu.%hhu.%hhu.%hhu.%hhu.%hhu" , v+0, v+1, v+2, v+3, v+4, v+5) != 6); - tmp->driver_info[0 ] = v[3 ] <<24 | v[2 ] <<16 | v[1 ] <<8 | v[0 ]; - tmp->driver_info[1 ] = v[5 ] <<8 | v[4 ]; - tmp->driver_info[2 ] =0x12345678 ; + tmp->driver_info[0 ] =cpu_to_le32 ( + v[3 ] <<24 | v[2 ] <<16 | v[1 ] <<8 | v[0 ]); + tmp->driver_info[1 ] =cpu_to_le32 (v[5 ] <<8 | v[4 ]); + tmp->driver_info[2 ] =__constant_cpu_to_le32 (0x12345678 ); } static void
@@ -894,10 +895,10 @@ qla27xx_firmware_info(struct scsi_qla_host *vha, tmp->firmware_version[0 ] = vha->hw->fw_major_version; tmp->firmware_version[1 ] = vha->hw->fw_minor_version; tmp->firmware_version[2 ] = vha->hw->fw_subminor_version; - tmp->firmware_version[3 ] = - vha->hw->fw_attributes_h <<16 | vha->hw->fw_attributes; - tmp->firmware_version[4 ] = - vha->hw->fw_attributes_ext[1 ] <<16 | vha->hw->fw_attributes_ext[0 ]; + tmp->firmware_version[3 ] =cpu_to_le32 ( + vha->hw->fw_attributes_h <<16 | vha->hw->fw_attributes); + tmp->firmware_version[4 ] =cpu_to_le32 ( + vha->hw->fw_attributes_ext[1 ] <<16 | vha->hw->fw_attributes_ext[0 ]); } static void
Signature · 1 line
2.12.0
PATCH 17/25 qla2xxx: Correction to selection of loopback/echo test
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
This Fixes loopback and echo test options
--- drivers/scsi/qla2xxx/qla_bsg.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/scsi/qla2xxx/qla_bsg.c +6 -5
@@ -728,7 +728,7 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)uint16_t response[MAILBOX_REGISTER_COUNT ];uint16_t config[4 ], new_config[4 ];uint8_t *fw_sts_ptr; -uint8_t *req_data =NULL ; +void *req_data =NULL ;dma_addr_t req_data_dma;uint32_t req_data_len;uint8_t *rsp_data =NULL ;
@@ -806,10 +806,11 @@ qla2x00_process_loopback(struct bsg_job *bsg_job) bsg_request->rqst_data.h_vendor.vendor_cmd[2 ];if (atomic_read (&vha->loop_state) ==LOOP_READY && - (ha->current_topology ==ISP_CFG_F || - (get_unaligned_le32 (req_data) ==ELS_OPCODE_BYTE && - req_data_len ==MAX_ELS_FRAME_PAYLOAD )) && - elreq.options ==EXTERNAL_LOOPBACK ) { + ((ha->current_topology ==ISP_CFG_F && (elreq.options &7 ) >=2 ) || + ((IS_QLA81XX (ha) ||IS_QLA8031 (ha) ||IS_QLA8044 (ha)) && +get_unaligned_le32 (req_data) ==ELS_OPCODE_BYTE && + req_data_len ==MAX_ELS_FRAME_PAYLOAD && + elreq.options ==EXTERNAL_LOOPBACK ))) { type ="FC_BSG_HST_VENDOR_ECHO_DIAG" ;ql_dbg (ql_dbg_user, vha,0x701e ,"BSG request type: %s.\n" , type);
Signature · 1 line
2.12.0
PATCH 18/25 qla2xxx: Fix qla2x00_echo_test() based on ISP type
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
Ths patch fixes MBX in-direction for setting right bits for qla2x00_echo_test()
--- drivers/scsi/qla2xxx/qla_mbx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_mbx.c +4 -3
@@ -5317,10 +5317,11 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq, mcp->out_mb |=MBX_2 ; mcp->in_mb =MBX_0 ; -if (IS_QLA24XX_TYPE (ha) ||IS_QLA25XX (ha) || -IS_CNA_CAPABLE (ha) ||IS_QLA2031 (ha)) +if (IS_CNA_CAPABLE (ha) ||IS_QLA24XX_TYPE (ha) ||IS_QLA25XX (ha) || +IS_QLA2031 (ha) ||IS_QLA27XX (ha) ||IS_QLA28XX (ha)) mcp->in_mb |=MBX_1 ; -if (IS_CNA_CAPABLE (ha) ||IS_QLA2031 (ha)) +if (IS_CNA_CAPABLE (ha) ||IS_QLA2031 (ha) ||IS_QLA27XX (ha) || +IS_QLA28XX (ha)) mcp->in_mb |=MBX_3 ; mcp->tov =MBX_TOV_SECONDS ;
Signature · 1 line
2.12.0
PATCH 19/25 qla2xxx: Print portname for logging in qla24xx_logio_entry()
In reply to Himanshu MadhaniFrom: Joe Carnuccio <[email protected]>
Add port name in the messages file to help debugging of Login/Logout IOCBs
--- drivers/scsi/qla2xxx/qla_isr.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/scsi/qla2xxx/qla_isr.c +6 -10
@@ -1899,11 +1899,9 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req, }if (le16_to_cpu (logio->comp_status) ==CS_COMPLETE ) { -ql_dbg (ql_dbg_async, fcport->vha,0x5036 , -"Async-%s complete - %8phC hdl=%x portid=%02x%02x%02x " -"iop0=%x.\n" , type, fcport->port_name, sp->handle, - fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa, +ql_dbg (ql_dbg_async, sp->vha,0x5036 , +"Async-%s complete: handle=%x pid=%06x wwpn=%8phC iop0=%x\n" , + type, sp->handle, fcport->d_id.b24, fcport->port_name,le32_to_cpu (logio->io_parameter[0 ])); vha->hw->exch_starvation =0 ;
@@ -1982,11 +1980,9 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,break ; } -ql_dbg (ql_dbg_async, fcport->vha,0x5037 , -"Async-%s failed - %8phC hdl=%x portid=%02x%02x%02x comp=%x " -"iop0=%x iop1=%x.\n" , type, fcport->port_name, - sp->handle, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa, +ql_dbg (ql_dbg_async, sp->vha,0x5037 , +"Async-%s failed: handle=%x pid=%06x wwpn=%8phC comp_status=%x iop0=%x iop1=%x\n" , + type, sp->handle, fcport->d_id.b24, fcport->port_name,le16_to_cpu (logio->comp_status),le32_to_cpu (logio->io_parameter[0 ]),le32_to_cpu (logio->io_parameter[1 ]));
Signature · 1 line
2.12.0
PATCH 20/25 qla2xxx: Use correct ISP28xx active FW region
In reply to Himanshu MadhaniFrom: Quinn Tran <[email protected]>
For ISP28xx, use 28xx call to retrieve active FW region.
--- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_bsg.c +1 -1
@@ -2415,7 +2415,7 @@ qla2x00_get_flash_image_status(struct bsg_job *bsg_job) regions.global_image = active_regions.global;if (IS_QLA28XX (ha)) { -qla27xx_get_active_image (vha, &active_regions); +qla28xx_get_aux_images (vha, &active_regions); regions.board_config = active_regions.aux.board_config; regions.vpd_nvram = active_regions.aux.vpd_nvram; regions.npiv_config_0_1 = active_regions.aux.npiv_config_0_1;
Signature · 1 line
2.12.0
PATCH 21/25 qla2xxx: Save rscn_gen for new fcport
In reply to Himanshu MadhaniAdd missing rscn_gen when creating new fcport.
--- drivers/scsi/qla2xxx/qla_gs.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qla2xxx/qla_gs.c +1 -0
@@ -3487,6 +3487,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)if (memcmp (rp->port_name, fcport->port_name,WWN_SIZE ))continue ; fcport->scan_state =QLA_FCPORT_FOUND ; + fcport->last_rscn_gen = fcport->rscn_gen; found = true;/* * If device was not a fabric device before.
Signature · 1 line
2.12.0
PATCH 22/25 qla2xxx: Fix control flags for login/logout IOCB
In reply to Himanshu MadhaniThis patch fixes control flag options for login/logout IOCB.
--- drivers/scsi/qla2xxx/qla_iocb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_iocb.c +5 -3
@@ -2362,6 +2362,8 @@ qla24xx_login_iocb(srb_t *sp, struct logio_entry_24xx *logio)struct srb_iocb *lio = &sp->u.iocb_cmd; logio->entry_type =LOGINOUT_PORT_IOCB_TYPE ; + logio->control_flags =cpu_to_le16 (LCF_COMMAND_PLOGI ); +if (lio->u.logio.flags &SRB_LOGIN_PRLI_ONLY ) { logio->control_flags =cpu_to_le16 (LCF_COMMAND_PRLI ); }else {
@@ -2939,7 +2941,6 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, sp->fcport = fcport; elsio->timeout = qla2x00_els_dcmd2_iocb_timeout; -init_completion (&elsio->u.els_plogi.comp);if (wait) sp->flags =SRB_WAKEUP_ON_COMP ;
@@ -2949,7 +2950,7 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, elsio->u.els_plogi.tx_size = elsio->u.els_plogi.rx_size =DMA_POOL_SIZE ; ptr = elsio->u.els_plogi.els_plogi_pyld = -dma_alloc_coherent (&ha->pdev->dev,DMA_POOL_SIZE , +dma_alloc_coherent (&ha->pdev->dev, elsio->u.els_plogi.tx_size, &elsio->u.els_plogi.els_plogi_pyld_dma,GFP_KERNEL );if (!elsio->u.els_plogi.els_plogi_pyld) {
@@ -2958,7 +2959,7 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, } resp_ptr = elsio->u.els_plogi.els_resp_pyld = -dma_alloc_coherent (&ha->pdev->dev,DMA_POOL_SIZE , +dma_alloc_coherent (&ha->pdev->dev, elsio->u.els_plogi.rx_size, &elsio->u.els_plogi.els_resp_pyld_dma,GFP_KERNEL );if (!elsio->u.els_plogi.els_resp_pyld) {
@@ -2982,6 +2983,7 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, (uint8_t *)elsio->u.els_plogi.els_plogi_pyld, sizeof(*elsio->u.els_plogi.els_plogi_pyld)); +init_completion (&elsio->u.els_plogi.comp); rval =qla2x00_start_sp (sp);if (rval !=QLA_SUCCESS ) { rval =QLA_FUNCTION_FAILED ;
Signature · 1 line
2.12.0
PATCH 23/25 qla2xxx: Add fixes for mailbox command
In reply to Himanshu MadhaniThis patch aded following fix
- qla2x00_issue_iocb_timeout will now return if chip is down
- only check for sp->qpair in abort handling
--- drivers/scsi/qla2xxx/qla_mbx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_mbx.c +4 -1
@@ -1404,6 +1404,9 @@ qla2x00_issue_iocb_timeout(scsi_qla_host_t *vha, void *buffer,mbx_cmd_t mc;mbx_cmd_t *mcp = &mc; +if (qla2x00_chip_is_down (vha)) +return QLA_INVALID_COMMAND ; +ql_dbg (ql_dbg_mbx + ql_dbg_verbose, vha,0x1038 ,"Entered %s.\n" , __func__);
@@ -1475,7 +1478,7 @@ qla2x00_abort_command(srb_t *sp)ql_dbg (ql_dbg_mbx + ql_dbg_verbose, vha,0x103b ,"Entered %s.\n" , __func__); -if (vha->flags.qpairs_available && sp->qpair) +if (sp->qpair) req = sp->qpair->req;else req = vha->req;
Signature · 1 line
2.12.0
PATCH 24/25 qla2xxx: Use QLA_FW_STOPPED macro to propagate flag
In reply to Himanshu MadhaniThis patch uses QLA_FW_STOPPED macro, so that flag is propogated to all the QPairs.
--- drivers/scsi/qla2xxx/qla_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_init.c +1 -1
@@ -6676,7 +6676,7 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha) ha->flags.n2n_ae =0 ; ha->flags.lip_ae =0 ; ha->current_topology =0 ; - ha->flags.fw_started =0 ; +QLA_FW_STOPPED (ha); ha->flags.fw_init_done =0 ; ha->chip_reset++; ha->base_qpair->chip_reset = ha->chip_reset;
Signature · 1 line
2.12.0
PATCH 25/25 qla2xxx: Update driver version to 10.01.00.24-k
In reply to Himanshu Madhani--- drivers/scsi/qla2xxx/qla_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_version.h +1 -1
@@ -7,7 +7,7 @@/* * Driver version */ -#define QLA2XXX_VERSION "10.01.00.22-k" +#define QLA2XXX_VERSION "10.01.00.24-k"#define QLA_DRIVER_MAJOR_VER 10#define QLA_DRIVER_MINOR_VER 1
Signature · 1 line
2.12.0
Martin K. Petersen
AppliedHimanshu,
Quoted 9 lines
This series addes enhancements to the driver in the area of FDMI commands and adding support for RDP command. This series also adds support for Beacon LED/D-Port SysFS nodes.
There are few other patches which are cleanup to improve readability as well as consolidates code.
Please apply this series to 5.7.0/scsi-misc at your earliest convenience.
Applied to 5.7/scsi-queue. This series lit up like a Xmas tree in checkpatch. Next time, please verify before posting.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Himanshu Madhani
AppliedOn 2/21/20, 5:33 PM, "[email protected] on behalf of Martin K. Petersen" <[email protected] on behalf of [email protected]> wrote:
Himanshu,
> This series addes enhancements to the driver in the area of FDMI > commands and adding support for RDP command. This series also adds > support for Beacon LED/D-Port SysFS nodes.
>
> There are few other patches which are cleanup to improve readability > as well as consolidates code.
>
> Please apply this series to 5.7.0/scsi-misc at your earliest > convenience.
Applied to 5.7/scsi-queue. This series lit up like a Xmas tree in checkpatch. Next time, please verify before posting.
Will do.
Thanks,
Himanshu
--
Martin K. Petersen Oracle Linux Engineering
Quoted 2 lines · Martin K. Petersen
Applied to 5.7/scsi-queue. This series lit up like a Xmas tree in checkpatch. Next time, please verify before posting.
Hi Martin,
Have these changes already been pushed out? It seems like it has been a few days since your 5.7/scsi-queue branch has been published:
$ git fetch mkp-scsi && git show mkp-scsi/5.7/scsi-queue | head commit b417107a659e9745f9ff905196ddff70cbe4eaa7 Author: Gustavo A. R. Silva <[email protected]> Date: Wed Feb 12 18:02:11 2020 -0600
scsi: advansys: Replace zero-length array with flexible-array member
Thanks,
Bart.