hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/scsi/qla2xxx/qla_def.h
....@@ -396,6 +396,7 @@
396396 } b;
397397 } port_id_t;
398398 #define INVALID_PORT_ID 0xFFFFFF
399
+#define ISP_REG16_DISCONNECT 0xFFFF
399400
400401 static inline le_id_t be_id_to_le(be_id_t id)
401402 {
....@@ -639,7 +640,6 @@
639640 struct iocb_resource iores;
640641 struct kref cmd_kref; /* need to migrate ref_count over to this */
641642 void *priv;
642
- wait_queue_head_t nvme_ls_waitq;
643643 struct fc_port *fcport;
644644 struct scsi_qla_host *vha;
645645 unsigned int start_timer:1;
....@@ -3849,6 +3849,13 @@
38493849 u32 num_mpi_reset;
38503850 };
38513851
3852
+/* refer to pcie_do_recovery reference */
3853
+typedef enum {
3854
+ QLA_PCI_RESUME,
3855
+ QLA_PCI_ERR_DETECTED,
3856
+ QLA_PCI_MMIO_ENABLED,
3857
+ QLA_PCI_SLOT_RESET,
3858
+} pci_error_state_t;
38523859 /*
38533860 * Qlogic host adapter specific data structure.
38543861 */
....@@ -4193,7 +4200,6 @@
41934200 uint8_t aen_mbx_count;
41944201 atomic_t num_pend_mbx_stage1;
41954202 atomic_t num_pend_mbx_stage2;
4196
- atomic_t num_pend_mbx_stage3;
41974203 uint16_t frame_payload_size;
41984204
41994205 uint32_t login_retry_count;
....@@ -4587,6 +4593,7 @@
45874593 #define DEFAULT_ZIO_THRESHOLD 5
45884594
45894595 struct qla_hw_data_stat stat;
4596
+ pci_error_state_t pci_error_state;
45904597 };
45914598
45924599 struct active_regions {
....@@ -4707,7 +4714,7 @@
47074714 #define FX00_CRITEMP_RECOVERY 25
47084715 #define FX00_HOST_INFO_RESEND 26
47094716 #define QPAIR_ONLINE_CHECK_NEEDED 27
4710
-#define SET_NVME_ZIO_THRESHOLD_NEEDED 28
4717
+#define DO_EEH_RECOVERY 28
47114718 #define DETECT_SFP_CHANGE 29
47124719 #define N2N_LOGIN_NEEDED 30
47134720 #define IOCB_WORK_ACTIVE 31