This is a note to let you know that I've just added the patch titled
ata: libata-core: Do not register PM operations for SAS ports
to the 6.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ata-libata-core-do-not-register-pm-operations-for-sas-ports.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 75e2bd5f1ede42a2bc88aa34b431e1ace8e0bea0 Mon Sep 17 00:00:00 2001
From: Damien Le Moal <dlemoal@xxxxxxxxxx>
Date: Fri, 8 Sep 2023 20:04:52 +0900
Subject: ata: libata-core: Do not register PM operations for SAS ports
From: Damien Le Moal <dlemoal@xxxxxxxxxx>
commit 75e2bd5f1ede42a2bc88aa34b431e1ace8e0bea0 upstream.
libsas does its own domain based power management of ports. For such
ports, libata should not use a device type defining power management
operations as executing these operations for suspend/resume in addition
to libsas calls to ata_sas_port_suspend() and ata_sas_port_resume() is
not necessary (and likely dangerous to do, even though problems are not
seen currently).
Introduce the new ata_port_sas_type device_type for ports managed by
libsas. This new device type is used in ata_tport_add() and is defined
without power management operations.
Fixes: 2fcbdcb4c802 ("[SCSI] libata: export ata_port suspend/resume infrastructure for sas")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Damien Le Moal <dlemoal@xxxxxxxxxx>
Reviewed-by: Hannes Reinecke <hare@xxxxxxx>
Tested-by: Chia-Lin Kao (AceLan) <acelan.kao@xxxxxxxxxxxxx>
Tested-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Reviewed-by: John Garry <john.g.garry@xxxxxxxxxx>
Reviewed-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/ata/libata-core.c | 2 +-
drivers/ata/libata-transport.c | 9 ++++++++-
drivers/ata/libata.h | 2 ++
3 files changed, 11 insertions(+), 2 deletions(-)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5396,7 +5396,7 @@ EXPORT_SYMBOL_GPL(ata_host_resume);
#endif
const struct device_type ata_port_type = {
- .name = "ata_port",
+ .name = ATA_PORT_TYPE_NAME,
#ifdef CONFIG_PM
.pm = &ata_port_pm_ops,
#endif
--- a/drivers/ata/libata-transport.c
+++ b/drivers/ata/libata-transport.c
@@ -266,6 +266,10 @@ void ata_tport_delete(struct ata_port *a
put_device(dev);
}
+static const struct device_type ata_port_sas_type = {
+ .name = ATA_PORT_TYPE_NAME,
+};
+
/** ata_tport_add - initialize a transport ATA port structure
*
* @parent: parent device
@@ -283,7 +287,10 @@ int ata_tport_add(struct device *parent,
struct device *dev = &ap->tdev;
device_initialize(dev);
- dev->type = &ata_port_type;
+ if (ap->flags & ATA_FLAG_SAS_HOST)
+ dev->type = &ata_port_sas_type;
+ else
+ dev->type = &ata_port_type;
dev->parent = parent;
ata_host_get(ap->host);
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -30,6 +30,8 @@ enum {
ATA_DNXFER_QUIET = (1 << 31),
};
+#define ATA_PORT_TYPE_NAME "ata_port"
+
extern atomic_t ata_print_id;
extern int atapi_passthru16;
extern int libata_fua;
Patches currently in stable-queue which might be from dlemoal@xxxxxxxxxx are
queue-6.5/scsi-sd-do-not-issue-commands-to-suspended-disks-on-shutdown.patch
queue-6.5/scsi-sd-differentiate-system-and-runtime-start-stop-management.patch
queue-6.5/ata-libata-core-do-not-register-pm-operations-for-sas-ports.patch
queue-6.5/ata-libata-sata-increase-pmp-srst-timeout-to-10s.patch
queue-6.5/ata-sata_mv-fix-incorrect-string-length-computation-.patch
queue-6.5/ata-libata-scsi-ignore-reserved-bits-for-report-supported-operation-codes.patch
queue-6.5/ata-libata-core-fix-ata_port_request_pm-locking.patch
queue-6.5/ata-libata-eh-do-not-thaw-the-port-twice-in-ata_eh_r.patch
queue-6.5/ata-libata-scsi-link-ata-port-and-scsi-device.patch
queue-6.5/scsi-core-ata-do-no-try-to-probe-for-cdl-on-old-drives.patch
queue-6.5/ata-libata-eh-do-not-clear-ata_pflag_eh_pending-in-a.patch
queue-6.5/ata-libata-core-fix-port-and-device-removal.patch
