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

scsi: libsas: Drop SAS_DPRINTK() and revise logs levels 



Like sas_printk() did previously, SAS_DPRINTK() offers little value now
that libsas logs already have the "sas" prefix through pr_fmt(fmt). So it
can be dropped.

However, after reviewing some logs in libsas, it is noticed that debug
level is too low in many instances.

So this change drops SAS_DPRINTK() and revises some logs to a more
appropriate level. However many stay at debug level, although some
are significantly promoted.

We add -DDEBUG for compilation so that we keep the debug messages by
default, as before.

All the pre-existing checkpatch errors for spanning messages across
multiple lines are also fixed.

Finally, all other references to printk() [apart from special formatting
in sas_ata.c] are removed and replaced with appropriate pr_xxx().

Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 71a4a992

drivers/scsi/libsas/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -32,3 +32,5 @@ libsas-y += sas_init.o \ 
		sas_task.o

libsas-$(CONFIG_SCSI_SAS_ATA) +=	sas_ata.o

libsas-$(CONFIG_SCSI_SAS_HOST_SMP) +=	sas_host_smp.o



ccflags-y := -DDEBUG

drivers/scsi/libsas/sas_ata.c

+11 −13
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static enum ata_completion_errors sas_to_ata_err(struct task_status_struct *ts) 


		case SAS_OPEN_TO:

		case SAS_OPEN_REJECT:

			SAS_DPRINTK("%s: Saw error %d.  What to do?\n",

			pr_warn("%s: Saw error %d.  What to do?\n",

				__func__, ts->stat);

			return AC_ERR_OTHER;
@@ -151,8 +151,7 @@ static void sas_ata_task_done(struct sas_task *task) 
	} else {

		ac = sas_to_ata_err(stat);

		if (ac) {

			SAS_DPRINTK("%s: SAS error %x\n", __func__,

				    stat->stat);

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

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

			if (!link->sactive) {

				qc->err_mask = ac;
@@ -237,7 +236,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) 


	ret = i->dft->lldd_execute_task(task, GFP_ATOMIC);

	if (ret) {

		SAS_DPRINTK("lldd_execute_task returned: %d\n", ret);

		pr_debug("lldd_execute_task returned: %d\n", ret);



		if (qc->scsicmd)

			ASSIGN_SAS_TASK(qc->scsicmd, NULL);
@@ -282,8 +281,8 @@ int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy) 
		res = sas_get_report_phy_sata(dev->parent, phy->phy_id,

					      &dev->sata_dev.rps_resp);

		if (res) {

			SAS_DPRINTK("report phy sata to %016llx:0x%x returned "

				    "0x%x\n", SAS_ADDR(dev->parent->sas_addr),

			pr_debug("report phy sata to %016llx:0x%x returned 0x%x\n",

				 SAS_ADDR(dev->parent->sas_addr),

				 phy->phy_id, res);

			return res;

		}
@@ -431,8 +430,7 @@ static void sas_ata_internal_abort(struct sas_task *task) 
	if (task->task_state_flags & SAS_TASK_STATE_ABORTED ||

	    task->task_state_flags & SAS_TASK_STATE_DONE) {

		spin_unlock_irqrestore(&task->task_state_lock, flags);

		SAS_DPRINTK("%s: Task %p already finished.\n", __func__,

			    task);

		pr_debug("%s: Task %p already finished.\n", __func__, task);

		goto out;

	}

	task->task_state_flags |= SAS_TASK_STATE_ABORTED;
@@ -452,7 +450,7 @@ static void sas_ata_internal_abort(struct sas_task *task) 
	 * aborted ata tasks, otherwise we (likely) leak the sas task

	 * here

	 */

	SAS_DPRINTK("%s: Task %p leaked.\n", __func__, task);

	pr_warn("%s: Task %p leaked.\n", __func__, task);



	if (!(task->task_state_flags & SAS_TASK_STATE_DONE))

		task->task_state_flags &= ~SAS_TASK_STATE_ABORTED;
@@ -558,7 +556,7 @@ int sas_ata_init(struct domain_device *found_dev) 


	ata_host = kzalloc(sizeof(*ata_host), GFP_KERNEL);

	if (!ata_host)	{

		SAS_DPRINTK("ata host alloc failed.\n");

		pr_err("ata host alloc failed.\n");

		return -ENOMEM;

	}
@@ -566,7 +564,7 @@ int sas_ata_init(struct domain_device *found_dev) 


	ap = ata_sas_port_alloc(ata_host, &sata_port_info, shost);

	if (!ap) {

		SAS_DPRINTK("ata_sas_port_alloc failed.\n");

		pr_err("ata_sas_port_alloc failed.\n");

		rc = -ENODEV;

		goto free_host;

	}

drivers/scsi/libsas/sas_discover.c

+16 −17
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int sas_get_port_device(struct asd_sas_port *port) 
					  SAS_FANOUT_EXPANDER_DEVICE);

		break;

	default:

		printk("ERROR: Unidentified device type %d\n", dev->dev_type);

		pr_warn("ERROR: Unidentified device type %d\n", dev->dev_type);

		rphy = NULL;

		break;

	}
@@ -186,8 +186,7 @@ int sas_notify_lldd_dev_found(struct domain_device *dev) 


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

	if (res) {

		printk("sas: driver on pcidev %s cannot handle "

		       "device %llx, error:%d\n",

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

			dev_name(sas_ha->dev),

			SAS_ADDR(dev->sas_addr), res);

	}
@@ -456,7 +455,7 @@ static void sas_discover_domain(struct work_struct *work) 
		return;

	dev = port->port_dev;



	SAS_DPRINTK("DOING DISCOVERY on port %d, pid:%d\n", port->id,

	pr_debug("DOING DISCOVERY on port %d, pid:%d\n", port->id,

		 task_pid_nr(current));



	switch (dev->dev_type) {
@@ -473,12 +472,12 @@ static void sas_discover_domain(struct work_struct *work) 
		error = sas_discover_sata(dev);

		break;

#else

		SAS_DPRINTK("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n");

		pr_notice("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n");

		/* Fall through */

#endif

	default:

		error = -ENXIO;

		SAS_DPRINTK("unhandled device %d\n", dev->dev_type);

		pr_err("unhandled device %d\n", dev->dev_type);

		break;

	}
@@ -495,7 +494,7 @@ static void sas_discover_domain(struct work_struct *work) 


	sas_probe_devices(port);



	SAS_DPRINTK("DONE DISCOVERY on port %d, pid:%d, result:%d\n", port->id,

	pr_debug("DONE DISCOVERY on port %d, pid:%d, result:%d\n", port->id,

		 task_pid_nr(current), error);

}
@@ -510,21 +509,21 @@ static void sas_revalidate_domain(struct work_struct *work) 
	/* prevent revalidation from finding sata links in recovery */

	mutex_lock(&ha->disco_mutex);

	if (test_bit(SAS_HA_ATA_EH_ACTIVE, &ha->state)) {

		SAS_DPRINTK("REVALIDATION DEFERRED on port %d, pid:%d\n",

		pr_debug("REVALIDATION DEFERRED on port %d, pid:%d\n",

			 port->id, task_pid_nr(current));

		goto out;

	}



	clear_bit(DISCE_REVALIDATE_DOMAIN, &port->disc.pending);



	SAS_DPRINTK("REVALIDATING DOMAIN on port %d, pid:%d\n", port->id,

	pr_debug("REVALIDATING DOMAIN on port %d, pid:%d\n", port->id,

		 task_pid_nr(current));



	if (ddev && (ddev->dev_type == SAS_FANOUT_EXPANDER_DEVICE ||

		     ddev->dev_type == SAS_EDGE_EXPANDER_DEVICE))

		res = sas_ex_revalidate_domain(ddev);



	SAS_DPRINTK("done REVALIDATING DOMAIN on port %d, pid:%d, res 0x%x\n",

	pr_debug("done REVALIDATING DOMAIN on port %d, pid:%d, res 0x%x\n",

		 port->id, task_pid_nr(current), res);

 out:

	mutex_unlock(&ha->disco_mutex);

drivers/scsi/libsas/sas_expander.c

+100 −114
Original line number Diff line number Diff line
@@ -99,17 +99,17 @@ static int smp_execute_task_sg(struct domain_device *dev, 


		if (res) {

			del_timer(&task->slow_task->timer);

			SAS_DPRINTK("executing SMP task failed:%d\n", res);

			pr_notice("executing SMP task failed:%d\n", res);

			break;

		}



		wait_for_completion(&task->slow_task->completion);

		res = -ECOMM;

		if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {

			SAS_DPRINTK("smp task timed out or aborted\n");

			pr_notice("smp task timed out or aborted\n");

			i->dft->lldd_abort_task(task);

			if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {

				SAS_DPRINTK("SMP task aborted and not done\n");

				pr_notice("SMP task aborted and not done\n");

				break;

			}

		}
@@ -134,8 +134,8 @@ static int smp_execute_task_sg(struct domain_device *dev, 
		    task->task_status.stat == SAS_DEVICE_UNKNOWN)

			break;

		else {

			SAS_DPRINTK("%s: task to dev %016llx response: 0x%x "

				    "status 0x%x\n", __func__,

			pr_notice("%s: task to dev %016llx response: 0x%x status 0x%x\n",

				  __func__,

				  SAS_ADDR(dev->sas_addr),

				  task->task_status.resp,

				  task->task_status.stat);
@@ -347,7 +347,7 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, void *rsp) 
	if (test_bit(SAS_HA_ATA_EH_ACTIVE, &ha->state))

		set_bit(DISCE_REVALIDATE_DOMAIN, &dev->port->disc.pending);



	SAS_DPRINTK("%sex %016llx phy%02d:%c:%X attached: %016llx (%s)\n",

	pr_debug("%sex %016llx phy%02d:%c:%X attached: %016llx (%s)\n",

		 test_bit(SAS_HA_ATA_EH_ACTIVE, &ha->state) ? "ata: " : "",

		 SAS_ADDR(dev->sas_addr), phy->phy_id,

		 sas_route_char(dev, phy), phy->linkrate,
@@ -500,11 +500,11 @@ static int sas_ex_general(struct domain_device *dev) 
				       RG_RESP_SIZE);



		if (res) {

			SAS_DPRINTK("RG to ex %016llx failed:0x%x\n",

			pr_notice("RG to ex %016llx failed:0x%x\n",

				  SAS_ADDR(dev->sas_addr), res);

			goto out;

		} else if (rg_resp->result != SMP_RESP_FUNC_ACC) {

			SAS_DPRINTK("RG:ex %016llx returned SMP result:0x%x\n",

			pr_debug("RG:ex %016llx returned SMP result:0x%x\n",

				 SAS_ADDR(dev->sas_addr), rg_resp->result);

			res = rg_resp->result;

			goto out;
@@ -513,7 +513,7 @@ static int sas_ex_general(struct domain_device *dev) 
		ex_assign_report_general(dev, rg_resp);



		if (dev->ex_dev.configuring) {

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

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

				 SAS_ADDR(dev->sas_addr));

			schedule_timeout_interruptible(5*HZ);

		} else
@@ -568,11 +568,11 @@ static int sas_ex_manuf_info(struct domain_device *dev) 


	res = smp_execute_task(dev, mi_req, MI_REQ_SIZE, mi_resp,MI_RESP_SIZE);

	if (res) {

		SAS_DPRINTK("MI: ex %016llx failed:0x%x\n",

		pr_notice("MI: ex %016llx failed:0x%x\n",

			  SAS_ADDR(dev->sas_addr), res);

		goto out;

	} else if (mi_resp[2] != SMP_RESP_FUNC_ACC) {

		SAS_DPRINTK("MI ex %016llx returned SMP result:0x%x\n",

		pr_debug("MI ex %016llx returned SMP result:0x%x\n",

			 SAS_ADDR(dev->sas_addr), mi_resp[2]);

		goto out;

	}
@@ -836,8 +836,7 @@ static struct domain_device *sas_ex_discover_end_dev( 


		res = sas_discover_sata(child);

		if (res) {

			SAS_DPRINTK("sas_discover_sata() for device %16llx at "

				    "%016llx:0x%x returned 0x%x\n",

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

				  SAS_ADDR(child->sas_addr),

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

			goto out_list_del;
@@ -861,14 +860,13 @@ static struct domain_device *sas_ex_discover_end_dev( 


		res = sas_discover_end_dev(child);

		if (res) {

			SAS_DPRINTK("sas_discover_end_dev() for device %16llx "

				    "at %016llx:0x%x returned 0x%x\n",

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

				  SAS_ADDR(child->sas_addr),

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

			goto out_list_del;

		}

	} else {

		SAS_DPRINTK("target proto 0x%x at %016llx:0x%x not handled\n",

		pr_notice("target proto 0x%x at %016llx:0x%x not handled\n",

			  phy->attached_tproto, SAS_ADDR(parent->sas_addr),

			  phy_id);

		goto out_free;
@@ -927,8 +925,7 @@ static struct domain_device *sas_ex_discover_expander( 
	int res;



	if (phy->routing_attr == DIRECT_ROUTING) {

		SAS_DPRINTK("ex %016llx:0x%x:D <--> ex %016llx:0x%x is not "

			    "allowed\n",

		pr_warn("ex %016llx:0x%x:D <--> ex %016llx:0x%x is not allowed\n",

			SAS_ADDR(parent->sas_addr), phy_id,

			SAS_ADDR(phy->attached_sas_addr),

			phy->attached_phy_id);
@@ -1038,8 +1035,8 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id) 
	    ex_phy->attached_dev_type != SAS_FANOUT_EXPANDER_DEVICE &&

	    ex_phy->attached_dev_type != SAS_EDGE_EXPANDER_DEVICE &&

	    ex_phy->attached_dev_type != SAS_SATA_PENDING) {

		SAS_DPRINTK("unknown device type(0x%x) attached to ex %016llx "

			    "phy 0x%x\n", ex_phy->attached_dev_type,

		pr_warn("unknown device type(0x%x) attached to ex %016llx phy 0x%x\n",

			ex_phy->attached_dev_type,

			SAS_ADDR(dev->sas_addr),

			phy_id);

		return 0;
@@ -1047,15 +1044,14 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id) 


	res = sas_configure_routing(dev, ex_phy->attached_sas_addr);

	if (res) {

		SAS_DPRINTK("configure routing for dev %016llx "

			    "reported 0x%x. Forgotten\n",

		pr_notice("configure routing for dev %016llx reported 0x%x. Forgotten\n",

			  SAS_ADDR(ex_phy->attached_sas_addr), res);

		sas_disable_routing(dev, ex_phy->attached_sas_addr);

		return res;

	}



	if (sas_ex_join_wide_port(dev, phy_id)) {

		SAS_DPRINTK("Attaching ex phy%d to wide port %016llx\n",

		pr_debug("Attaching ex phy%d to wide port %016llx\n",

			 phy_id, SAS_ADDR(ex_phy->attached_sas_addr));

		return res;

	}
@@ -1067,8 +1063,7 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id) 
		break;

	case SAS_FANOUT_EXPANDER_DEVICE:

		if (SAS_ADDR(dev->port->disc.fanout_sas_addr)) {

			SAS_DPRINTK("second fanout expander %016llx phy 0x%x "

				    "attached to ex %016llx phy 0x%x\n",

			pr_debug("second fanout expander %016llx phy 0x%x attached to ex %016llx phy 0x%x\n",

				 SAS_ADDR(ex_phy->attached_sas_addr),

				 ex_phy->attached_phy_id,

				 SAS_ADDR(dev->sas_addr),
@@ -1101,9 +1096,8 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id) 
			    SAS_ADDR(child->sas_addr)) {

				ex->ex_phy[i].phy_state= PHY_DEVICE_DISCOVERED;

				if (sas_ex_join_wide_port(dev, i))

					SAS_DPRINTK("Attaching ex phy%d to wide port %016llx\n",

					pr_debug("Attaching ex phy%d to wide port %016llx\n",

						 i, SAS_ADDR(ex->ex_phy[i].attached_sas_addr));



			}

		}

	}
@@ -1154,9 +1148,7 @@ static int sas_check_level_subtractive_boundary(struct domain_device *dev) 
			if (sas_find_sub_addr(child, s2) &&

			    (SAS_ADDR(sub_addr) != SAS_ADDR(s2))) {



				SAS_DPRINTK("ex %016llx->%016llx-?->%016llx "

					    "diverges from subtractive "

					    "boundary %016llx\n",

				pr_notice("ex %016llx->%016llx-?->%016llx diverges from subtractive boundary %016llx\n",

					  SAS_ADDR(dev->sas_addr),

					  SAS_ADDR(child->sas_addr),

					  SAS_ADDR(s2),
@@ -1239,9 +1231,7 @@ static int sas_check_ex_subtractive_boundary(struct domain_device *dev) 
			else if (SAS_ADDR(sub_sas_addr) !=

				 SAS_ADDR(phy->attached_sas_addr)) {



				SAS_DPRINTK("ex %016llx phy 0x%x "

					    "diverges(%016llx) on subtractive "

					    "boundary(%016llx). Disabled\n",

				pr_notice("ex %016llx phy 0x%x diverges(%016llx) on subtractive boundary(%016llx). Disabled\n",

					  SAS_ADDR(dev->sas_addr), i,

					  SAS_ADDR(phy->attached_sas_addr),

					  SAS_ADDR(sub_sas_addr));
@@ -1284,8 +1274,7 @@ static int sas_check_eeds(struct domain_device *child, 


	if (SAS_ADDR(parent->port->disc.fanout_sas_addr) != 0) {

		res = -ENODEV;

		SAS_DPRINTK("edge ex %016llx phy S:0x%x <--> edge ex %016llx "

			    "phy S:0x%x, while there is a fanout ex %016llx\n",

		pr_warn("edge ex %016llx phy S:0x%x <--> edge ex %016llx phy S:0x%x, while there is a fanout ex %016llx\n",

			SAS_ADDR(parent->sas_addr),

			parent_phy->phy_id,

			SAS_ADDR(child->sas_addr),
@@ -1308,8 +1297,7 @@ static int sas_check_eeds(struct domain_device *child, 
		;

	else {

		res = -ENODEV;

		SAS_DPRINTK("edge ex %016llx phy 0x%x <--> edge ex %016llx "

			    "phy 0x%x link forms a third EEDS!\n",

		pr_warn("edge ex %016llx phy 0x%x <--> edge ex %016llx phy 0x%x link forms a third EEDS!\n",

			SAS_ADDR(parent->sas_addr),

			parent_phy->phy_id,

			SAS_ADDR(child->sas_addr),
@@ -1427,14 +1415,13 @@ static int sas_configure_present(struct domain_device *dev, int phy_id, 
			goto out;

		res = rri_resp[2];

		if (res == SMP_RESP_NO_INDEX) {

			SAS_DPRINTK("overflow of indexes: dev %016llx "

				    "phy 0x%x index 0x%x\n",

			pr_warn("overflow of indexes: dev %016llx phy 0x%x index 0x%x\n",

				SAS_ADDR(dev->sas_addr), phy_id, i);

			goto out;

		} else if (res != SMP_RESP_FUNC_ACC) {

			SAS_DPRINTK("%s: dev %016llx phy 0x%x index 0x%x "

				    "result 0x%x\n", __func__,

				    SAS_ADDR(dev->sas_addr), phy_id, i, res);

			pr_notice("%s: dev %016llx phy 0x%x index 0x%x result 0x%x\n",

				  __func__, SAS_ADDR(dev->sas_addr), phy_id,

				  i, res);

			goto out;

		}

		if (SAS_ADDR(sas_addr) != 0) {
@@ -1498,8 +1485,7 @@ static int sas_configure_set(struct domain_device *dev, int phy_id, 
		goto out;

	res = cri_resp[2];

	if (res == SMP_RESP_NO_INDEX) {

		SAS_DPRINTK("overflow of indexes: dev %016llx phy 0x%x "

			    "index 0x%x\n",

		pr_warn("overflow of indexes: dev %016llx phy 0x%x index 0x%x\n",

			SAS_ADDR(dev->sas_addr), phy_id, index);

	}

out:
@@ -1547,7 +1533,7 @@ static int sas_configure_parent(struct domain_device *parent, 
	}



	if (ex_parent->conf_route_table == 0) {

		SAS_DPRINTK("ex %016llx has self-configuring routing table\n",

		pr_debug("ex %016llx has self-configuring routing table\n",

			 SAS_ADDR(parent->sas_addr));

		return 0;

	}
@@ -1609,7 +1595,7 @@ static int sas_discover_expander(struct domain_device *dev) 


	res = sas_expander_discover(dev);

	if (res) {

		SAS_DPRINTK("expander %016llx discovery failed(0x%x)\n",

		pr_warn("expander %016llx discovery failed(0x%x)\n",

			SAS_ADDR(dev->sas_addr), res);

		goto out_err;

	}
@@ -1854,10 +1840,10 @@ static int sas_find_bcast_dev(struct domain_device *dev, 
		if (phy_id != -1) {

			*src_dev = dev;

			ex->ex_change_count = ex_change_count;

			SAS_DPRINTK("Expander phy change count has changed\n");

			pr_info("Expander phy change count has changed\n");

			return res;

		} else

			SAS_DPRINTK("Expander phys DID NOT change\n");

			pr_info("Expander phys DID NOT change\n");

	}

	list_for_each_entry(ch, &ex->children, siblings) {

		if (ch->dev_type == SAS_EDGE_EXPANDER_DEVICE || ch->dev_type == SAS_FANOUT_EXPANDER_DEVICE) {
@@ -1967,7 +1953,7 @@ static int sas_discover_new(struct domain_device *dev, int phy_id) 
	struct domain_device *child;

	int res;



	SAS_DPRINTK("ex %016llx phy%d new device attached\n",

	pr_debug("ex %016llx phy%d new device attached\n",

		 SAS_ADDR(dev->sas_addr), phy_id);

	res = sas_ex_phy_discover(dev, phy_id);

	if (res)
@@ -2046,13 +2032,13 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last) 


		if (ata_dev && phy->attached_dev_type == SAS_SATA_PENDING)

			action = ", needs recovery";

		SAS_DPRINTK("ex %016llx phy 0x%x broadcast flutter%s\n",

		pr_debug("ex %016llx phy 0x%x broadcast flutter%s\n",

			 SAS_ADDR(dev->sas_addr), phy_id, action);

		return res;

	}



	/* we always have to delete the old device when we went here */

	SAS_DPRINTK("ex %016llx phy 0x%x replace %016llx\n",

	pr_info("ex %016llx phy 0x%x replace %016llx\n",

		SAS_ADDR(dev->sas_addr), phy_id,

		SAS_ADDR(phy->attached_sas_addr));

	sas_unregister_devs_sas_addr(dev, phy_id, last);
@@ -2082,7 +2068,7 @@ static int sas_rediscover(struct domain_device *dev, const int phy_id) 
	int i;

	bool last = true;	/* is this the last phy of the port */



	SAS_DPRINTK("ex %016llx phy%d originated BROADCAST(CHANGE)\n",

	pr_debug("ex %016llx phy%d originated BROADCAST(CHANGE)\n",

		 SAS_ADDR(dev->sas_addr), phy_id);



	if (SAS_ADDR(changed_phy->attached_sas_addr) != 0) {
@@ -2093,8 +2079,8 @@ static int sas_rediscover(struct domain_device *dev, const int phy_id) 
				continue;

			if (SAS_ADDR(phy->attached_sas_addr) ==

			    SAS_ADDR(changed_phy->attached_sas_addr)) {

				SAS_DPRINTK("phy%d part of wide port with "

					    "phy%d\n", phy_id, i);

				pr_debug("phy%d part of wide port with phy%d\n",

					 phy_id, i);

				last = false;

				break;

			}
@@ -2152,21 +2138,21 @@ void sas_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, 
	case SAS_FANOUT_EXPANDER_DEVICE:

		break;

	default:

		printk("%s: can we send a smp request to a device?\n",

		pr_err("%s: can we send a smp request to a device?\n",

		       __func__);

		goto out;

	}



	dev = sas_find_dev_by_rphy(rphy);

	if (!dev) {

		printk("%s: fail to find a domain_device?\n", __func__);

		pr_err("%s: fail to find a domain_device?\n", __func__);

		goto out;

	}



	/* do we need to support multiple segments? */

	if (job->request_payload.sg_cnt > 1 ||

	    job->reply_payload.sg_cnt > 1) {

		printk("%s: multiple segments req %u, rsp %u\n",

		pr_info("%s: multiple segments req %u, rsp %u\n",

			__func__, job->request_payload.payload_len,

			job->reply_payload.payload_len);

		goto out;

drivers/scsi/libsas/sas_init.c

+3 −3
Original line number Diff line number Diff line
@@ -128,19 +128,19 @@ int sas_register_ha(struct sas_ha_struct *sas_ha) 


	error = sas_register_phys(sas_ha);

	if (error) {

		printk(KERN_NOTICE "couldn't register sas phys:%d\n", error);

		pr_notice("couldn't register sas phys:%d\n", error);

		return error;

	}



	error = sas_register_ports(sas_ha);

	if (error) {

		printk(KERN_NOTICE "couldn't register sas ports:%d\n", error);

		pr_notice("couldn't register sas ports:%d\n", error);

		goto Undo_phys;

	}



	error = sas_init_events(sas_ha);

	if (error) {

		printk(KERN_NOTICE "couldn't start event thread:%d\n", error);

		pr_notice("couldn't start event thread:%d\n", error);

		goto Undo_ports;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE