Andrew Lukoshko
b9d46fff46
Add the RHEL 211.17.1..211.18.1 backports (1162-1244) from centos-stream-10 and upstream, on top of 211.16.1. Includes the lpfc 14.4.0.x revert batch and the RHEL-only lpfc_nlp_get UAF guard. Bump to 211.18.1.
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
Subject: [PATCH] Revert "scsi: lpfc: Update debugfs trace ring initialization messages"
|
|
# reverse of cs10 0bacc04f93bb5b7334c7197ce716e378e9887081
|
|
|
|
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
|
|
index 061a5e4e525d..3fd1aa5cc78c 100644
|
|
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
|
|
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
|
|
@@ -6227,9 +6227,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
|
|
i++;
|
|
}
|
|
lpfc_debugfs_max_slow_ring_trc = (1 << i);
|
|
- pr_info("lpfc_debugfs_max_slow_ring_trc "
|
|
- "changed to %d\n",
|
|
- lpfc_debugfs_max_slow_ring_trc);
|
|
+ pr_err("lpfc_debugfs_max_disc_trc changed to "
|
|
+ "%d\n", lpfc_debugfs_max_disc_trc);
|
|
}
|
|
}
|
|
|
|
@@ -6261,7 +6260,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
|
|
atomic_set(&phba->nvmeio_trc_cnt, 0);
|
|
if (lpfc_debugfs_max_nvmeio_trc) {
|
|
num = lpfc_debugfs_max_nvmeio_trc - 1;
|
|
- if (num & lpfc_debugfs_max_nvmeio_trc) {
|
|
+ if (num & lpfc_debugfs_max_disc_trc) {
|
|
/* Change to be a power of 2 */
|
|
num = lpfc_debugfs_max_nvmeio_trc;
|
|
i = 0;
|
|
@@ -6270,9 +6269,10 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
|
|
i++;
|
|
}
|
|
lpfc_debugfs_max_nvmeio_trc = (1 << i);
|
|
- pr_info("lpfc_debugfs_max_nvmeio_trc changed "
|
|
- "to %d\n",
|
|
- lpfc_debugfs_max_nvmeio_trc);
|
|
+ lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
|
|
+ "0575 lpfc_debugfs_max_nvmeio_trc "
|
|
+ "changed to %d\n",
|
|
+ lpfc_debugfs_max_nvmeio_trc);
|
|
}
|
|
phba->nvmeio_trc_size = lpfc_debugfs_max_nvmeio_trc;
|
|
|
|
@@ -6317,8 +6317,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
|
|
i++;
|
|
}
|
|
lpfc_debugfs_max_disc_trc = (1 << i);
|
|
- pr_info("lpfc_debugfs_max_disc_trc changed to %d\n",
|
|
- lpfc_debugfs_max_disc_trc);
|
|
+ pr_err("lpfc_debugfs_max_disc_trc changed to %d\n",
|
|
+ lpfc_debugfs_max_disc_trc);
|
|
}
|
|
}
|
|
|