Commit b3e3d4c6 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: libsas: Tidy SAS address print format 

Currently we use a mixture of %016llx, %llx, and %16llx when printing a SAS
address.

Since the most significant nibble of the SAS address is always 5 - as per
standard - this formatting is not so important; but some fake SAS addresses
for SATA devices may not be. And we have mangled/invalid address to
consider also. And it's better to be consistent in the code, so use a fixed
format.

The SAS address is a fixed size at 64b, so we want to 0 byte extend to 16
nibbles, so use %016llx globally.

Also make some prints to be explicitly hex, and tidy some whitespace issue.

Link: https://lore.kernel.org/r/1576758957-227350-1-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6d67e847

drivers/scsi/libsas/sas_ata.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void sas_ata_task_done(struct sas_task *task) 
	} else {

		ac = sas_to_ata_err(stat);

		if (ac) {

			pr_warn("%s: SAS error %x\n", __func__, stat->stat);

			pr_warn("%s: SAS error 0x%x\n", __func__, stat->stat);

			/* We saw a SAS error. Send a vague error. */

			if (!link->sactive) {

				qc->err_mask = ac;

drivers/scsi/libsas/sas_discover.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ int sas_notify_lldd_dev_found(struct domain_device *dev) 


	res = i->dft->lldd_dev_found(dev);

	if (res) {

		pr_warn("driver on host %s cannot handle device %llx, error:%d\n",

		pr_warn("driver on host %s cannot handle device %016llx, error:%d\n",

			dev_name(sas_ha->dev),

			SAS_ADDR(dev->sas_addr), res);

	}

drivers/scsi/libsas/sas_expander.c

+2 −2
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static int sas_ex_general(struct domain_device *dev) 
		ex_assign_report_general(dev, rg_resp);



		if (dev->ex_dev.configuring) {

			pr_debug("RG: ex %llx self-configuring...\n",

			pr_debug("RG: ex %016llx self-configuring...\n",

				 SAS_ADDR(dev->sas_addr));

			schedule_timeout_interruptible(5*HZ);

		} else
@@ -881,7 +881,7 @@ static struct domain_device *sas_ex_discover_end_dev( 


		res = sas_discover_end_dev(child);

		if (res) {

			pr_notice("sas_discover_end_dev() for device %16llx at %016llx:%02d returned 0x%x\n",

			pr_notice("sas_discover_end_dev() for device %016llx at %016llx:%02d returned 0x%x\n",

				  SAS_ADDR(child->sas_addr),

				  SAS_ADDR(parent->sas_addr), phy_id, res);

			goto out_list_del;

drivers/scsi/libsas/sas_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static inline void sas_smp_host_handler(struct bsg_job *job, 


static inline void sas_fail_probe(struct domain_device *dev, const char *func, int err)

{

	pr_warn("%s: for %s device %16llx returned %d\n",

	pr_warn("%s: for %s device %016llx returned %d\n",

		func, dev->parent ? "exp-attached" :

		"direct-attached",

		SAS_ADDR(dev->sas_addr), err);

drivers/scsi/libsas/sas_port.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void sas_form_port(struct asd_sas_phy *phy) 
	}

	sas_port_add_phy(port->port, phy->phy);



	pr_debug("%s added to %s, phy_mask:0x%x (%16llx)\n",

	pr_debug("%s added to %s, phy_mask:0x%x (%016llx)\n",

		 dev_name(&phy->phy->dev), dev_name(&port->port->dev),

		 port->phy_mask,

		 SAS_ADDR(port->attached_sas_addr));

CRA Git | Maintained and supported by SUSTech CRA and CCSE