Commit eeee1086 authored by Niklas Cassel's avatar Niklas Cassel Committed by Martin K. Petersen
Browse files

scsi: pm80xx: Restore support for expanders 



Commit 0f630c58 ("scsi: pm80xx: Do not use libsas port ID") broke
support for expanders. After the commit, devices behind an expander are
no longer detected.

Simply reverting the commit restores support for devices behind an
expander.

Instead of reverting the commit (and reintroducing a helper to get the
port), get the port directly from the lldd_port pointer in struct
asd_sas_port.

Fixes: 0f630c58 ("scsi: pm80xx: Do not use libsas port ID")
Suggested-by: default avatarIgor Pylypiv <ipylypiv@google.com>
Reviewed-by: default avatarIgor Pylypiv <ipylypiv@google.com>
Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
Link: https://lore.kernel.org/r/20250814173215.1765055-13-cassel@kernel.org


Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Tested-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8f5ae30d

drivers/scsi/pm8001/pm8001_sas.c

+2 −3
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ int pm8001_queue_command(struct sas_task *task, gfp_t gfp_flags) 
	struct pm8001_device *pm8001_dev = dev->lldd_dev;

	bool internal_abort = sas_is_internal_abort(task);

	struct pm8001_hba_info *pm8001_ha;

	struct pm8001_port *port = NULL;

	struct pm8001_port *port;

	struct pm8001_ccb_info *ccb;

	unsigned long flags;

	u32 n_elem = 0;
@@ -502,8 +502,7 @@ int pm8001_queue_command(struct sas_task *task, gfp_t gfp_flags) 


	spin_lock_irqsave(&pm8001_ha->lock, flags);



	pm8001_dev = dev->lldd_dev;

	port = pm8001_ha->phy[pm8001_dev->attached_phy].port;

	port = dev->port->lldd_port;



	if (!internal_abort &&

	    (DEV_IS_GONE(pm8001_dev) || !port || !port->port_attached)) {