enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c
..
..
@@ -72,8 +72,7 @@
72
72
 	u16 sz, event_data_sz;
73
73
 	unsigned long flags;
74
74
 
75
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT "%s: enter\n",
76
-	    ioc->name, __func__));
75
+	dTriggerDiagPrintk(ioc, ioc_info(ioc, "%s: enter\n", __func__));
77
76
 
78
77
 	sz = offsetof(Mpi2EventNotificationReply_t, EventData) +
79
78
 	    sizeof(struct SL_WH_TRIGGERS_EVENT_DATA_T) + 4;
..
..
@@ -85,23 +84,23 @@
85
84
 	mpi_reply->EventDataLength = cpu_to_le16(event_data_sz);
86
85
 	memcpy(&mpi_reply->EventData, event_data,
87
86
 	    sizeof(struct SL_WH_TRIGGERS_EVENT_DATA_T));
88
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
89
-		"%s: add to driver event log\n",
90
-		ioc->name, __func__));
87
+	dTriggerDiagPrintk(ioc,
88
+			   ioc_info(ioc, "%s: add to driver event log\n",
89
+				    __func__));
91
90
 	mpt3sas_ctl_add_to_event_log(ioc, mpi_reply);
92
91
 	kfree(mpi_reply);
93
92
  out:
94
93
 
95
94
 	/* clearing the diag_trigger_active flag */
96
95
 	spin_lock_irqsave(&ioc->diag_trigger_lock, flags);
97
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
98
-		"%s: clearing diag_trigger_active flag\n",
99
-		ioc->name, __func__));
96
+	dTriggerDiagPrintk(ioc,
97
+			   ioc_info(ioc, "%s: clearing diag_trigger_active flag\n",
98
+				    __func__));
100
99
 	ioc->diag_trigger_active = 0;
101
100
 	spin_unlock_irqrestore(&ioc->diag_trigger_lock, flags);
102
101
 
103
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT "%s: exit\n", ioc->name,
104
-	    __func__));
102
+	dTriggerDiagPrintk(ioc, ioc_info(ioc, "%s: exit\n",
103
+					 __func__));
105
104
 }
106
105
 
107
106
 /**
..
..
@@ -114,23 +113,29 @@
114
113
 	struct SL_WH_TRIGGERS_EVENT_DATA_T *event_data)
115
114
 {
116
115
 	u8 issue_reset = 0;
116
+	u32 *trig_data = (u32 *)&event_data->u.master;
117
117
 
118
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT "%s: enter\n",
119
-	    ioc->name, __func__));
118
+	dTriggerDiagPrintk(ioc, ioc_info(ioc, "%s: enter\n", __func__));
120
119
 
121
120
 	/* release the diag buffer trace */
122
121
 	if ((ioc->diag_buffer_status[MPI2_DIAG_BUF_TYPE_TRACE] &
123
122
 	    MPT3_DIAG_BUFFER_IS_RELEASED) == 0) {
124
-		dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
125
-		"%s: release trace diag buffer\n", ioc->name, __func__));
123
+		/*
124
+		 * add a log message so that user knows which event caused
125
+		 * the release
126
+		 */
127
+		ioc_info(ioc,
128
+		    "%s: Releasing the trace buffer. Trigger_Type 0x%08x, Data[0] 0x%08x, Data[1] 0x%08x\n",
129
+		    __func__, event_data->trigger_type,
130
+		    trig_data[0], trig_data[1]);
126
131
 		mpt3sas_send_diag_release(ioc, MPI2_DIAG_BUF_TYPE_TRACE,
127
132
 		    &issue_reset);
128
133
 	}
129
134
 
130
135
 	_mpt3sas_raise_sigio(ioc, event_data);
131
136
 
132
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT "%s: exit\n", ioc->name,
133
-	    __func__));
137
+	dTriggerDiagPrintk(ioc, ioc_info(ioc, "%s: exit\n",
138
+					 __func__));
134
139
 }
135
140
 
136
141
 /**
..
..
@@ -168,9 +173,9 @@
168
173
 
169
174
  by_pass_checks:
170
175
 
171
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
172
-		"%s: enter - trigger_bitmask = 0x%08x\n",
173
-		ioc->name, __func__, trigger_bitmask));
176
+	dTriggerDiagPrintk(ioc,
177
+			   ioc_info(ioc, "%s: enter - trigger_bitmask = 0x%08x\n",
178
+				    __func__, trigger_bitmask));
174
179
 
175
180
 	/* don't send trigger if an trigger is currently active */
176
181
 	if (ioc->diag_trigger_active) {
..
..
@@ -182,9 +187,9 @@
182
187
 	if (ioc->diag_trigger_master.MasterData & trigger_bitmask) {
183
188
 		found_match = 1;
184
189
 		ioc->diag_trigger_active = 1;
185
-		dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
186
-		"%s: setting diag_trigger_active flag\n",
187
-		ioc->name, __func__));
190
+		dTriggerDiagPrintk(ioc,
191
+				   ioc_info(ioc, "%s: setting diag_trigger_active flag\n",
192
+					    __func__));
188
193
 	}
189
194
 	spin_unlock_irqrestore(&ioc->diag_trigger_lock, flags);
190
195
 
..
..
@@ -202,8 +207,8 @@
202
207
 		mpt3sas_send_trigger_data_event(ioc, &event_data);
203
208
 
204
209
  out:
205
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT "%s: exit\n", ioc->name,
206
-	    __func__));
210
+	dTriggerDiagPrintk(ioc, ioc_info(ioc, "%s: exit\n",
211
+					 __func__));
207
212
 }
208
213
 
209
214
 /**
..
..
@@ -239,9 +244,9 @@
239
244
 		return;
240
245
 	}
241
246
 
242
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
243
-		"%s: enter - event = 0x%04x, log_entry_qualifier = 0x%04x\n",
244
-		ioc->name, __func__, event, log_entry_qualifier));
247
+	dTriggerDiagPrintk(ioc,
248
+			   ioc_info(ioc, "%s: enter - event = 0x%04x, log_entry_qualifier = 0x%04x\n",
249
+				    __func__, event, log_entry_qualifier));
245
250
 
246
251
 	/* don't send trigger if an trigger is currently active */
247
252
 	if (ioc->diag_trigger_active) {
..
..
@@ -263,26 +268,26 @@
263
268
 		}
264
269
 		found_match = 1;
265
270
 		ioc->diag_trigger_active = 1;
266
-		dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
267
-			"%s: setting diag_trigger_active flag\n",
268
-			ioc->name, __func__));
271
+		dTriggerDiagPrintk(ioc,
272
+				   ioc_info(ioc, "%s: setting diag_trigger_active flag\n",
273
+					    __func__));
269
274
 	}
270
275
 	spin_unlock_irqrestore(&ioc->diag_trigger_lock, flags);
271
276
 
272
277
 	if (!found_match)
273
278
 		goto out;
274
279
 
275
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
276
-		"%s: setting diag_trigger_active flag\n",
277
-		ioc->name, __func__));
280
+	dTriggerDiagPrintk(ioc,
281
+			   ioc_info(ioc, "%s: setting diag_trigger_active flag\n",
282
+				    __func__));
278
283
 	memset(&event_data, 0, sizeof(struct SL_WH_TRIGGERS_EVENT_DATA_T));
279
284
 	event_data.trigger_type = MPT3SAS_TRIGGER_EVENT;
280
285
 	event_data.u.event.EventValue = event;
281
286
 	event_data.u.event.LogEntryQualifier = log_entry_qualifier;
282
287
 	mpt3sas_send_trigger_data_event(ioc, &event_data);
283
288
  out:
284
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT "%s: exit\n", ioc->name,
285
-	    __func__));
289
+	dTriggerDiagPrintk(ioc, ioc_info(ioc, "%s: exit\n",
290
+					 __func__));
286
291
 }
287
292
 
288
293
 /**
..
..
@@ -319,9 +324,9 @@
319
324
 		return;
320
325
 	}
321
326
 
322
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
323
-		"%s: enter - sense_key = 0x%02x, asc = 0x%02x, ascq = 0x%02x\n",
324
-		ioc->name, __func__, sense_key, asc, ascq));
327
+	dTriggerDiagPrintk(ioc,
328
+			   ioc_info(ioc, "%s: enter - sense_key = 0x%02x, asc = 0x%02x, ascq = 0x%02x\n",
329
+				    __func__, sense_key, asc, ascq));
325
330
 
326
331
 	/* don't send trigger if an trigger is currently active */
327
332
 	if (ioc->diag_trigger_active) {
..
..
@@ -347,9 +352,9 @@
347
352
 	if (!found_match)
348
353
 		goto out;
349
354
 
350
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
351
-		"%s: setting diag_trigger_active flag\n",
352
-		ioc->name, __func__));
355
+	dTriggerDiagPrintk(ioc,
356
+			   ioc_info(ioc, "%s: setting diag_trigger_active flag\n",
357
+				    __func__));
353
358
 	memset(&event_data, 0, sizeof(struct SL_WH_TRIGGERS_EVENT_DATA_T));
354
359
 	event_data.trigger_type = MPT3SAS_TRIGGER_SCSI;
355
360
 	event_data.u.scsi.SenseKey = sense_key;
..
..
@@ -357,8 +362,8 @@
357
362
 	event_data.u.scsi.ASCQ = ascq;
358
363
 	mpt3sas_send_trigger_data_event(ioc, &event_data);
359
364
  out:
360
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT "%s: exit\n", ioc->name,
361
-	    __func__));
365
+	dTriggerDiagPrintk(ioc, ioc_info(ioc, "%s: exit\n",
366
+					 __func__));
362
367
 }
363
368
 
364
369
 /**
..
..
@@ -393,9 +398,9 @@
393
398
 		return;
394
399
 	}
395
400
 
396
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
397
-		"%s: enter - ioc_status = 0x%04x, loginfo = 0x%08x\n",
398
-		ioc->name, __func__, ioc_status, loginfo));
401
+	dTriggerDiagPrintk(ioc,
402
+			   ioc_info(ioc, "%s: enter - ioc_status = 0x%04x, loginfo = 0x%08x\n",
403
+				    __func__, ioc_status, loginfo));
399
404
 
400
405
 	/* don't send trigger if an trigger is currently active */
401
406
 	if (ioc->diag_trigger_active) {
..
..
@@ -420,15 +425,15 @@
420
425
 	if (!found_match)
421
426
 		goto out;
422
427
 
423
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT
424
-		"%s: setting diag_trigger_active flag\n",
425
-		ioc->name, __func__));
428
+	dTriggerDiagPrintk(ioc,
429
+			   ioc_info(ioc, "%s: setting diag_trigger_active flag\n",
430
+				    __func__));
426
431
 	memset(&event_data, 0, sizeof(struct SL_WH_TRIGGERS_EVENT_DATA_T));
427
432
 	event_data.trigger_type = MPT3SAS_TRIGGER_MPI;
428
433
 	event_data.u.mpi.IOCStatus = ioc_status;
429
434
 	event_data.u.mpi.IocLogInfo = loginfo;
430
435
 	mpt3sas_send_trigger_data_event(ioc, &event_data);
431
436
  out:
432
-	dTriggerDiagPrintk(ioc, pr_info(MPT3SAS_FMT "%s: exit\n", ioc->name,
433
-	    __func__));
437
+	dTriggerDiagPrintk(ioc, ioc_info(ioc, "%s: exit\n",
438
+					 __func__));
434
439
 }