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

scsi: libsas: aic94xx: hisi_sas: mvsas: pm8001: Use dev_is_expander() 



Many times in libsas, and in LLDDs which use libsas, the check for an
expander device is re-implemented or open coded.

Use dev_is_expander() instead. We rename this from
sas_dev_type_is_expander() to not spill so many lines in referencing.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Reviewed-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 895d8860

drivers/scsi/aic94xx/aic94xx_dev.c

+1 −3
Original line number Diff line number Diff line
@@ -187,9 +187,7 @@ static int asd_init_target_ddb(struct domain_device *dev) 
			}

		} else {

			flags |= CONCURRENT_CONN_SUPP;

			if (!dev->parent &&

			    (dev->dev_type == SAS_EDGE_EXPANDER_DEVICE ||

			     dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE))

			if (!dev->parent && dev_is_expander(dev->dev_type))

				asd_ddbsite_write_byte(asd_ha, ddb, MAX_CCONN,

						       4);

			else

drivers/scsi/hisi_sas/hisi_sas.h

+0 −4
Original line number Diff line number Diff line
@@ -66,10 +66,6 @@ 
#define HISI_SAS_MAX_SMP_RESP_SZ 1028

#define HISI_SAS_MAX_STP_RESP_SZ 28



#define DEV_IS_EXPANDER(type) \

	((type == SAS_EDGE_EXPANDER_DEVICE) || \

	(type == SAS_FANOUT_EXPANDER_DEVICE))



#define HISI_SAS_SATA_PROTOCOL_NONDATA		0x1

#define HISI_SAS_SATA_PROTOCOL_PIO			0x2

#define HISI_SAS_SATA_PROTOCOL_DMA			0x4

drivers/scsi/hisi_sas/hisi_sas_main.c

+4 −4
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ static int hisi_sas_dev_found(struct domain_device *device) 
	device->lldd_dev = sas_dev;

	hisi_hba->hw->setup_itct(hisi_hba, sas_dev);



	if (parent_dev && DEV_IS_EXPANDER(parent_dev->dev_type)) {

	if (parent_dev && dev_is_expander(parent_dev->dev_type)) {

		int phy_no;

		u8 phy_num = parent_dev->ex_dev.num_phys;

		struct ex_phy *phy;
@@ -1451,7 +1451,7 @@ static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 old_state, 


				_sas_port = sas_port;



				if (DEV_IS_EXPANDER(dev->dev_type))

				if (dev_is_expander(dev->dev_type))

					sas_ha->notify_port_event(sas_phy,

							PORTE_BROADCAST_RCVD);

			}
@@ -1538,7 +1538,7 @@ static void hisi_sas_terminate_stp_reject(struct hisi_hba *hisi_hba) 
		struct domain_device *port_dev = sas_port->port_dev;

		struct domain_device *device;



		if (!port_dev || !DEV_IS_EXPANDER(port_dev->dev_type))

		if (!port_dev || !dev_is_expander(port_dev->dev_type))

			continue;



		/* Try to find a SATA device */
@@ -1908,7 +1908,7 @@ static int hisi_sas_clear_nexus_ha(struct sas_ha_struct *sas_ha) 
		struct domain_device *device = sas_dev->sas_device;



		if ((sas_dev->dev_type == SAS_PHY_UNUSED) || !device ||

		    DEV_IS_EXPANDER(device->dev_type))

		    dev_is_expander(device->dev_type))

			continue;



		rc = hisi_sas_debug_I_T_nexus_reset(device);

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ static void setup_itct_v2_hw(struct hisi_hba *hisi_hba, 
		break;

	case SAS_SATA_DEV:

	case SAS_SATA_PENDING:

		if (parent_dev && DEV_IS_EXPANDER(parent_dev->dev_type))

		if (parent_dev && dev_is_expander(parent_dev->dev_type))

			qw0 = HISI_SAS_DEV_TYPE_STP << ITCT_HDR_DEV_TYPE_OFF;

		else

			qw0 = HISI_SAS_DEV_TYPE_SATA << ITCT_HDR_DEV_TYPE_OFF;
@@ -2531,7 +2531,7 @@ static void prep_ata_v2_hw(struct hisi_hba *hisi_hba, 
	/* create header */

	/* dw0 */

	dw0 = port->id << CMD_HDR_PORT_OFF;

	if (parent_dev && DEV_IS_EXPANDER(parent_dev->dev_type))

	if (parent_dev && dev_is_expander(parent_dev->dev_type))

		dw0 |= 3 << CMD_HDR_CMD_OFF;

	else

		dw0 |= 4 << CMD_HDR_CMD_OFF;

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ static void setup_itct_v3_hw(struct hisi_hba *hisi_hba, 
		break;

	case SAS_SATA_DEV:

	case SAS_SATA_PENDING:

		if (parent_dev && DEV_IS_EXPANDER(parent_dev->dev_type))

		if (parent_dev && dev_is_expander(parent_dev->dev_type))

			qw0 = HISI_SAS_DEV_TYPE_STP << ITCT_HDR_DEV_TYPE_OFF;

		else

			qw0 = HISI_SAS_DEV_TYPE_SATA << ITCT_HDR_DEV_TYPE_OFF;
@@ -1358,7 +1358,7 @@ static void prep_ata_v3_hw(struct hisi_hba *hisi_hba, 
	u32 dw1 = 0, dw2 = 0;



	hdr->dw0 = cpu_to_le32(port->id << CMD_HDR_PORT_OFF);

	if (parent_dev && DEV_IS_EXPANDER(parent_dev->dev_type))

	if (parent_dev && dev_is_expander(parent_dev->dev_type))

		hdr->dw0 |= cpu_to_le32(3 << CMD_HDR_CMD_OFF);

	else

		hdr->dw0 |= cpu_to_le32(4U << CMD_HDR_CMD_OFF);

CRA Git | Maintained and supported by SUSTech CRA and CCSE