Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

hisi_sas: Add dev_found and dev_gone 



Add functions to deal with lldd_dev_found and lldd_dev_gone.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 27a3f229

drivers/scsi/hisi_sas/hisi_sas.h

+13 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#define HISI_SAS_NAME_LEN 32



struct hisi_hba;



enum {

	PORT_TYPE_SAS = (1U << 1),
@@ -49,6 +50,13 @@ enum dev_status { 
	HISI_SAS_DEV_NORMAL,

	HISI_SAS_DEV_EH,

};



enum hisi_sas_dev_type {

	HISI_SAS_DEV_TYPE_STP = 0,

	HISI_SAS_DEV_TYPE_SSP,

	HISI_SAS_DEV_TYPE_SATA,

};



struct hisi_sas_phy {

	struct hisi_hba	*hisi_hba;

	struct hisi_sas_port	*port;
@@ -81,6 +89,9 @@ struct hisi_sas_cq { 


struct hisi_sas_device {

	enum sas_device_type	dev_type;

	struct hisi_hba		*hisi_hba;

	struct domain_device	*sas_device;

	u64 attached_phy;

	u64 device_id;

	u64 running_req;

	u8 dev_status;
@@ -113,6 +124,8 @@ struct hisi_sas_tmf_task { 


struct hisi_sas_hw {

	int (*hw_init)(struct hisi_hba *hisi_hba);

	void (*setup_itct)(struct hisi_hba *hisi_hba,

			   struct hisi_sas_device *device);

	void (*sl_notify)(struct hisi_hba *hisi_hba, int phy_no);

	int (*get_free_slot)(struct hisi_hba *hisi_hba, int *q, int *s);

	void (*start_delivery)(struct hisi_hba *hisi_hba);

drivers/scsi/hisi_sas/hisi_sas_main.c

+88 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
#include "hisi_sas.h"

#define DRV_NAME "hisi_sas"



#define DEV_IS_EXPANDER(type) \

	((type == SAS_EDGE_EXPANDER_DEVICE) || \

	(type == SAS_FANOUT_EXPANDER_DEVICE))



#define DEV_IS_GONE(dev) \

	((!dev) || (dev->dev_type == SAS_PHY_UNUSED))
@@ -325,6 +328,72 @@ static void hisi_sas_bytes_dmaed(struct hisi_hba *hisi_hba, int phy_no) 
	sas_ha->notify_port_event(sas_phy, PORTE_BYTES_DMAED);

}



static struct hisi_sas_device *hisi_sas_alloc_dev(struct domain_device *device)

{

	struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);

	struct hisi_sas_device *sas_dev = NULL;

	int i;



	spin_lock(&hisi_hba->lock);

	for (i = 0; i < HISI_SAS_MAX_DEVICES; i++) {

		if (hisi_hba->devices[i].dev_type == SAS_PHY_UNUSED) {

			hisi_hba->devices[i].device_id = i;

			sas_dev = &hisi_hba->devices[i];

			sas_dev->dev_status = HISI_SAS_DEV_NORMAL;

			sas_dev->dev_type = device->dev_type;

			sas_dev->hisi_hba = hisi_hba;

			sas_dev->sas_device = device;

			break;

		}

	}

	spin_unlock(&hisi_hba->lock);



	return sas_dev;

}



static int hisi_sas_dev_found(struct domain_device *device)

{

	struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);

	struct domain_device *parent_dev = device->parent;

	struct hisi_sas_device *sas_dev;

	struct device *dev = &hisi_hba->pdev->dev;



	sas_dev = hisi_sas_alloc_dev(device);

	if (!sas_dev) {

		dev_err(dev, "fail alloc dev: max support %d devices\n",

			HISI_SAS_MAX_DEVICES);

		return -EINVAL;

	}



	device->lldd_dev = sas_dev;

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



	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;



		for (phy_no = 0; phy_no < phy_num; phy_no++) {

			phy = &parent_dev->ex_dev.ex_phy[phy_no];

			if (SAS_ADDR(phy->attached_sas_addr) ==

				SAS_ADDR(device->sas_addr)) {

				sas_dev->attached_phy = phy_no;

				break;

			}

		}



		if (phy_no == phy_num) {

			dev_info(dev, "dev found: no attached "

				 "dev:%016llx at ex:%016llx\n",

				 SAS_ADDR(device->sas_addr),

				 SAS_ADDR(parent_dev->sas_addr));

			return -EINVAL;

		}

	}



	return 0;

}



static void hisi_sas_phyup_work(struct work_struct *work)

{

	struct hisi_sas_phy *phy =
@@ -362,6 +431,23 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no) 
	INIT_WORK(&phy->phyup_ws, hisi_sas_phyup_work);

}



static void hisi_sas_dev_gone(struct domain_device *device)

{

	struct hisi_sas_device *sas_dev = device->lldd_dev;

	struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);

	struct device *dev = &hisi_hba->pdev->dev;

	u64 dev_id = sas_dev->device_id;



	dev_info(dev, "found dev[%lld:%x] is gone\n",

		 sas_dev->device_id, sas_dev->dev_type);



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

	device->lldd_dev = NULL;

	memset(sas_dev, 0, sizeof(*sas_dev));

	sas_dev->device_id = dev_id;

	sas_dev->dev_type = SAS_PHY_UNUSED;

	sas_dev->dev_status = HISI_SAS_DEV_NORMAL;

}



static int hisi_sas_queue_command(struct sas_task *task, gfp_t gfp_flags)

{
@@ -390,6 +476,8 @@ static struct scsi_host_template hisi_sas_sht = { 
};



static struct sas_domain_function_template hisi_sas_transport_ops = {

	.lldd_dev_found		= hisi_sas_dev_found,

	.lldd_dev_gone		= hisi_sas_dev_gone,

	.lldd_execute_task	= hisi_sas_queue_command,

};

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+41 −0
Original line number Diff line number Diff line
@@ -498,6 +498,46 @@ static void init_id_frame_v1_hw(struct hisi_hba *hisi_hba) 
		config_id_frame_v1_hw(hisi_hba, i);

}



static void setup_itct_v1_hw(struct hisi_hba *hisi_hba,

			     struct hisi_sas_device *sas_dev)

{

	struct domain_device *device = sas_dev->sas_device;

	struct device *dev = &hisi_hba->pdev->dev;

	u64 qw0, device_id = sas_dev->device_id;

	struct hisi_sas_itct *itct = &hisi_hba->itct[device_id];



	memset(itct, 0, sizeof(*itct));



	/* qw0 */

	qw0 = 0;

	switch (sas_dev->dev_type) {

	case SAS_END_DEVICE:

	case SAS_EDGE_EXPANDER_DEVICE:

	case SAS_FANOUT_EXPANDER_DEVICE:

		qw0 = HISI_SAS_DEV_TYPE_SSP << ITCT_HDR_DEV_TYPE_OFF;

		break;

	default:

		dev_warn(dev, "setup itct: unsupported dev type (%d)\n",

			 sas_dev->dev_type);

	}



	qw0 |= ((1 << ITCT_HDR_VALID_OFF) |

		(1 << ITCT_HDR_AWT_CONTROL_OFF) |

		(device->max_linkrate << ITCT_HDR_MAX_CONN_RATE_OFF) |

		(1 << ITCT_HDR_VALID_LINK_NUM_OFF) |

		(device->port->id << ITCT_HDR_PORT_ID_OFF));

	itct->qw0 = cpu_to_le64(qw0);



	/* qw1 */

	memcpy(&itct->sas_addr, device->sas_addr, SAS_ADDR_SIZE);

	itct->sas_addr = __swab64(itct->sas_addr);



	/* qw2 */

	itct->qw2 = cpu_to_le64((500 < ITCT_HDR_IT_NEXUS_LOSS_TL_OFF) |

				(0xff00 < ITCT_HDR_BUS_INACTIVE_TL_OFF) |

				(0xff00 < ITCT_HDR_MAX_CONN_TL_OFF) |

				(0xff00 < ITCT_HDR_REJ_OPEN_TL_OFF));

}



static void free_device_v1_hw(struct hisi_hba *hisi_hba,

			      struct hisi_sas_device *sas_dev)
@@ -1452,6 +1492,7 @@ static int hisi_sas_v1_init(struct hisi_hba *hisi_hba) 


static const struct hisi_sas_hw hisi_sas_v1_hw = {

	.hw_init = hisi_sas_v1_init,

	.setup_itct = setup_itct_v1_hw,

	.sl_notify = sl_notify_v1_hw,

	.free_device = free_device_v1_hw,

	.prep_ssp = prep_ssp_v1_hw,