From: Greg Kroah-Hartman Date: Sun, 16 Oct 2022 11:38:51 +0000 (+0200) Subject: drop 592642e6b11e620e4b43189f8072752429fc8dc3 from 5.4 4.14 and 4.19 X-Git-Tag: v5.4.219~136 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afeeea11ac532c809e266f152c4c8639796c919b;p=thirdparty%2Fkernel%2Fstable-queue.git drop 592642e6b11e620e4b43189f8072752429fc8dc3 from 5.4 4.14 and 4.19 --- diff --git a/queue-4.14/scsi-qedf-populate-sysfs-attributes-for-vport.patch b/queue-4.14/scsi-qedf-populate-sysfs-attributes-for-vport.patch deleted file mode 100644 index 7f2ea69159f..00000000000 --- a/queue-4.14/scsi-qedf-populate-sysfs-attributes-for-vport.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 592642e6b11e620e4b43189f8072752429fc8dc3 Mon Sep 17 00:00:00 2001 -From: Saurav Kashyap -Date: Mon, 19 Sep 2022 06:44:34 -0700 -Subject: scsi: qedf: Populate sysfs attributes for vport - -From: Saurav Kashyap - -commit 592642e6b11e620e4b43189f8072752429fc8dc3 upstream. - -Few vport parameters were displayed by systool as 'Unknown' or 'NULL'. -Copy speed, supported_speed, frame_size and update port_type for NPIV port. - -Link: https://lore.kernel.org/r/20220919134434.3513-1-njavali@marvell.com -Cc: stable@vger.kernel.org -Tested-by: Guangwu Zhang -Reviewed-by: John Meneghini -Signed-off-by: Saurav Kashyap -Signed-off-by: Nilesh Javali -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/qedf/qedf_main.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - ---- a/drivers/scsi/qedf/qedf_main.c -+++ b/drivers/scsi/qedf/qedf_main.c -@@ -1631,6 +1631,27 @@ static int qedf_vport_create(struct fc_v - fc_vport_setlink(vn_port); - } - -+ /* Set symbolic node name */ -+ if (base_qedf->pdev->device == QL45xxx) -+ snprintf(fc_host_symbolic_name(vn_port->host), 256, -+ "Marvell FastLinQ 45xxx FCoE v%s", QEDF_VERSION); -+ -+ if (base_qedf->pdev->device == QL41xxx) -+ snprintf(fc_host_symbolic_name(vn_port->host), 256, -+ "Marvell FastLinQ 41xxx FCoE v%s", QEDF_VERSION); -+ -+ /* Set supported speed */ -+ fc_host_supported_speeds(vn_port->host) = n_port->link_supported_speeds; -+ -+ /* Set speed */ -+ vn_port->link_speed = n_port->link_speed; -+ -+ /* Set port type */ -+ fc_host_port_type(vn_port->host) = FC_PORTTYPE_NPIV; -+ -+ /* Set maxframe size */ -+ fc_host_maxframe_size(vn_port->host) = n_port->mfs; -+ - QEDF_INFO(&(base_qedf->dbg_ctx), QEDF_LOG_NPIV, "vn_port=%p.\n", - vn_port); - diff --git a/queue-4.14/series b/queue-4.14/series index 8c91be1cd61..23f78ed1c66 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -61,4 +61,3 @@ revert-fs-check-fmode_lseek-to-control-internal-pipe.patch parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch um-cpuinfo-fix-a-warning-for-config_cpumask_offstack.patch pci-sanitise-firmware-bar-assignments-behind-a-pci-pci-bridge.patch -scsi-qedf-populate-sysfs-attributes-for-vport.patch diff --git a/queue-4.19/scsi-qedf-populate-sysfs-attributes-for-vport.patch b/queue-4.19/scsi-qedf-populate-sysfs-attributes-for-vport.patch deleted file mode 100644 index a684cf7d777..00000000000 --- a/queue-4.19/scsi-qedf-populate-sysfs-attributes-for-vport.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 592642e6b11e620e4b43189f8072752429fc8dc3 Mon Sep 17 00:00:00 2001 -From: Saurav Kashyap -Date: Mon, 19 Sep 2022 06:44:34 -0700 -Subject: scsi: qedf: Populate sysfs attributes for vport - -From: Saurav Kashyap - -commit 592642e6b11e620e4b43189f8072752429fc8dc3 upstream. - -Few vport parameters were displayed by systool as 'Unknown' or 'NULL'. -Copy speed, supported_speed, frame_size and update port_type for NPIV port. - -Link: https://lore.kernel.org/r/20220919134434.3513-1-njavali@marvell.com -Cc: stable@vger.kernel.org -Tested-by: Guangwu Zhang -Reviewed-by: John Meneghini -Signed-off-by: Saurav Kashyap -Signed-off-by: Nilesh Javali -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/qedf/qedf_main.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - ---- a/drivers/scsi/qedf/qedf_main.c -+++ b/drivers/scsi/qedf/qedf_main.c -@@ -1667,6 +1667,27 @@ static int qedf_vport_create(struct fc_v - fc_vport_setlink(vn_port); - } - -+ /* Set symbolic node name */ -+ if (base_qedf->pdev->device == QL45xxx) -+ snprintf(fc_host_symbolic_name(vn_port->host), 256, -+ "Marvell FastLinQ 45xxx FCoE v%s", QEDF_VERSION); -+ -+ if (base_qedf->pdev->device == QL41xxx) -+ snprintf(fc_host_symbolic_name(vn_port->host), 256, -+ "Marvell FastLinQ 41xxx FCoE v%s", QEDF_VERSION); -+ -+ /* Set supported speed */ -+ fc_host_supported_speeds(vn_port->host) = n_port->link_supported_speeds; -+ -+ /* Set speed */ -+ vn_port->link_speed = n_port->link_speed; -+ -+ /* Set port type */ -+ fc_host_port_type(vn_port->host) = FC_PORTTYPE_NPIV; -+ -+ /* Set maxframe size */ -+ fc_host_maxframe_size(vn_port->host) = n_port->mfs; -+ - QEDF_INFO(&(base_qedf->dbg_ctx), QEDF_LOG_NPIV, "vn_port=%p.\n", - vn_port); - diff --git a/queue-4.19/series b/queue-4.19/series index 834be5a463e..eb22ea48fc2 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -51,4 +51,3 @@ parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch riscv-allow-prot_write-only-mmap.patch um-cpuinfo-fix-a-warning-for-config_cpumask_offstack.patch pci-sanitise-firmware-bar-assignments-behind-a-pci-pci-bridge.patch -scsi-qedf-populate-sysfs-attributes-for-vport.patch diff --git a/queue-5.4/scsi-qedf-populate-sysfs-attributes-for-vport.patch b/queue-5.4/scsi-qedf-populate-sysfs-attributes-for-vport.patch deleted file mode 100644 index fb32067ba98..00000000000 --- a/queue-5.4/scsi-qedf-populate-sysfs-attributes-for-vport.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 592642e6b11e620e4b43189f8072752429fc8dc3 Mon Sep 17 00:00:00 2001 -From: Saurav Kashyap -Date: Mon, 19 Sep 2022 06:44:34 -0700 -Subject: scsi: qedf: Populate sysfs attributes for vport - -From: Saurav Kashyap - -commit 592642e6b11e620e4b43189f8072752429fc8dc3 upstream. - -Few vport parameters were displayed by systool as 'Unknown' or 'NULL'. -Copy speed, supported_speed, frame_size and update port_type for NPIV port. - -Link: https://lore.kernel.org/r/20220919134434.3513-1-njavali@marvell.com -Cc: stable@vger.kernel.org -Tested-by: Guangwu Zhang -Reviewed-by: John Meneghini -Signed-off-by: Saurav Kashyap -Signed-off-by: Nilesh Javali -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/qedf/qedf_main.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - ---- a/drivers/scsi/qedf/qedf_main.c -+++ b/drivers/scsi/qedf/qedf_main.c -@@ -1818,6 +1818,27 @@ static int qedf_vport_create(struct fc_v - fc_vport_setlink(vn_port); - } - -+ /* Set symbolic node name */ -+ if (base_qedf->pdev->device == QL45xxx) -+ snprintf(fc_host_symbolic_name(vn_port->host), 256, -+ "Marvell FastLinQ 45xxx FCoE v%s", QEDF_VERSION); -+ -+ if (base_qedf->pdev->device == QL41xxx) -+ snprintf(fc_host_symbolic_name(vn_port->host), 256, -+ "Marvell FastLinQ 41xxx FCoE v%s", QEDF_VERSION); -+ -+ /* Set supported speed */ -+ fc_host_supported_speeds(vn_port->host) = n_port->link_supported_speeds; -+ -+ /* Set speed */ -+ vn_port->link_speed = n_port->link_speed; -+ -+ /* Set port type */ -+ fc_host_port_type(vn_port->host) = FC_PORTTYPE_NPIV; -+ -+ /* Set maxframe size */ -+ fc_host_maxframe_size(vn_port->host) = n_port->mfs; -+ - QEDF_INFO(&(base_qedf->dbg_ctx), QEDF_LOG_NPIV, "vn_port=%p.\n", - vn_port); - diff --git a/queue-5.4/series b/queue-5.4/series index 0adaa81f188..c3db2a0c37e 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -31,4 +31,3 @@ riscv-pass-mno-relax-only-on-lld-15.0.0.patch um-cpuinfo-fix-a-warning-for-config_cpumask_offstack.patch pci-sanitise-firmware-bar-assignments-behind-a-pci-pci-bridge.patch powerpc-boot-explicitly-disable-usage-of-spe-instructions.patch -scsi-qedf-populate-sysfs-attributes-for-vport.patch