diff mbox series

[10/17] lpfc: Move handling of reset congestion statistics events

Message ID 20240131003549.147784-11-justintee8345@gmail.com (mailing list archive)
State Superseded
Headers show
Series lpfc: Update lpfc to revision 14.4.0.0 | expand

Commit Message

Justin Tee Jan. 31, 2024, 12:35 a.m. UTC 
The ACQE notification event to reset congestion statistics should be moved
into the specific lpfc_sli4_async_sli_evt routine instead of being
processed from the generic lpfc_sli4_async_event_proc routine.

Signed-off-by: Justin Tee <justin.tee@broadcom.com>
---
 drivers/scsi/lpfc/lpfc_hw4.h  | 2 +-
 drivers/scsi/lpfc/lpfc_init.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

Comments

Himanshu Madhani Jan. 31, 2024, 2:40 a.m. UTC | #1 
On 1/30/24 16:35, Justin Tee wrote:
> The ACQE notification event to reset congestion statistics should be moved
> into the specific lpfc_sli4_async_sli_evt routine instead of being
> processed from the generic lpfc_sli4_async_event_proc routine.
> 
> Signed-off-by: Justin Tee <justin.tee@broadcom.com>
> ---
>   drivers/scsi/lpfc/lpfc_hw4.h  | 2 +-
>   drivers/scsi/lpfc/lpfc_init.c | 9 ++++++---
>   2 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
> index 5d4f9f27084d..f6b1168304f3 100644
> --- a/drivers/scsi/lpfc/lpfc_hw4.h
> +++ b/drivers/scsi/lpfc/lpfc_hw4.h
> @@ -4069,7 +4069,6 @@ struct lpfc_mcqe {
>   #define LPFC_TRAILER_CODE_GRP5	0x5
>   #define LPFC_TRAILER_CODE_FC	0x10
>   #define LPFC_TRAILER_CODE_SLI	0x11
> -#define LPFC_TRAILER_CODE_CMSTAT        0x13
>   };
>   
>   struct lpfc_acqe_link {
> @@ -4339,6 +4338,7 @@ struct lpfc_acqe_sli {
>   #define LPFC_SLI_EVENT_TYPE_EEPROM_FAILURE	0x10
>   #define LPFC_SLI_EVENT_TYPE_CGN_SIGNAL		0x11
>   #define LPFC_SLI_EVENT_TYPE_RD_SIGNAL           0x12
> +#define LPFC_SLI_EVENT_TYPE_RESET_CM_STATS      0x13
>   };
>   
>   /*
> diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
> index 70bcee64bc8c..8e84ba0f7721 100644
> --- a/drivers/scsi/lpfc/lpfc_init.c
> +++ b/drivers/scsi/lpfc/lpfc_init.c
> @@ -94,6 +94,7 @@ static void lpfc_sli4_oas_verify(struct lpfc_hba *phba);
>   static uint16_t lpfc_find_cpu_handle(struct lpfc_hba *, uint16_t, int);
>   static void lpfc_setup_bg(struct lpfc_hba *, struct Scsi_Host *);
>   static int lpfc_sli4_cgn_parm_chg_evt(struct lpfc_hba *);
> +static void lpfc_sli4_async_cmstat_evt(struct lpfc_hba *phba);
>   static void lpfc_sli4_prep_dev_for_reset(struct lpfc_hba *phba);
>   
>   static struct scsi_transport_template *lpfc_transport_template = NULL;
> @@ -6636,6 +6637,11 @@ lpfc_sli4_async_sli_evt(struct lpfc_hba *phba, struct lpfc_acqe_sli *acqe_sli)
>   				acqe_sli->event_data1, acqe_sli->event_data2,
>   				acqe_sli->event_data3);
>   		break;
> +	case LPFC_SLI_EVENT_TYPE_RESET_CM_STATS:
> +		lpfc_printf_log(phba, KERN_INFO, LOG_CGN_MGMT,
> +				"2905 Reset CM statistics\n");
> +		lpfc_sli4_async_cmstat_evt(phba);
> +		break;
>   	default:
>   		lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
>   				"3193 Unrecognized SLI event, type: 0x%x",
> @@ -7346,9 +7352,6 @@ void lpfc_sli4_async_event_proc(struct lpfc_hba *phba)
>   		case LPFC_TRAILER_CODE_SLI:
>   			lpfc_sli4_async_sli_evt(phba, &cq_event->cqe.acqe_sli);
>   			break;
> -		case LPFC_TRAILER_CODE_CMSTAT:
> -			lpfc_sli4_async_cmstat_evt(phba);
> -			break;
>   		default:
>   			lpfc_printf_log(phba, KERN_ERR,
>   					LOG_TRACE_EVENT,

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
diff mbox series

Patch

diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index 5d4f9f27084d..f6b1168304f3 100644
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -4069,7 +4069,6 @@  struct lpfc_mcqe {
 #define LPFC_TRAILER_CODE_GRP5	0x5
 #define LPFC_TRAILER_CODE_FC	0x10
 #define LPFC_TRAILER_CODE_SLI	0x11
-#define LPFC_TRAILER_CODE_CMSTAT        0x13
 };
 
 struct lpfc_acqe_link {
@@ -4339,6 +4338,7 @@  struct lpfc_acqe_sli {
 #define LPFC_SLI_EVENT_TYPE_EEPROM_FAILURE	0x10
 #define LPFC_SLI_EVENT_TYPE_CGN_SIGNAL		0x11
 #define LPFC_SLI_EVENT_TYPE_RD_SIGNAL           0x12
+#define LPFC_SLI_EVENT_TYPE_RESET_CM_STATS      0x13
 };
 
 /*
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 70bcee64bc8c..8e84ba0f7721 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -94,6 +94,7 @@  static void lpfc_sli4_oas_verify(struct lpfc_hba *phba);
 static uint16_t lpfc_find_cpu_handle(struct lpfc_hba *, uint16_t, int);
 static void lpfc_setup_bg(struct lpfc_hba *, struct Scsi_Host *);
 static int lpfc_sli4_cgn_parm_chg_evt(struct lpfc_hba *);
+static void lpfc_sli4_async_cmstat_evt(struct lpfc_hba *phba);
 static void lpfc_sli4_prep_dev_for_reset(struct lpfc_hba *phba);
 
 static struct scsi_transport_template *lpfc_transport_template = NULL;
@@ -6636,6 +6637,11 @@  lpfc_sli4_async_sli_evt(struct lpfc_hba *phba, struct lpfc_acqe_sli *acqe_sli)
 				acqe_sli->event_data1, acqe_sli->event_data2,
 				acqe_sli->event_data3);
 		break;
+	case LPFC_SLI_EVENT_TYPE_RESET_CM_STATS:
+		lpfc_printf_log(phba, KERN_INFO, LOG_CGN_MGMT,
+				"2905 Reset CM statistics\n");
+		lpfc_sli4_async_cmstat_evt(phba);
+		break;
 	default:
 		lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
 				"3193 Unrecognized SLI event, type: 0x%x",
@@ -7346,9 +7352,6 @@  void lpfc_sli4_async_event_proc(struct lpfc_hba *phba)
 		case LPFC_TRAILER_CODE_SLI:
 			lpfc_sli4_async_sli_evt(phba, &cq_event->cqe.acqe_sli);
 			break;
-		case LPFC_TRAILER_CODE_CMSTAT:
-			lpfc_sli4_async_cmstat_evt(phba);
-			break;
 		default:
 			lpfc_printf_log(phba, KERN_ERR,
 					LOG_TRACE_EVENT,