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

Commit b09fcd09 authored by Xiaofei Tan's avatar Xiaofei Tan Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Add v2 hw force PHY function for internal ATA command 



This patch adds a force PHY function for internal ATA command for v2 hw.

Because there is an SoC bug in v2 hw, and need send an IO through each PHY
of a port to work around a bug which occurs after a controller reset.

This force PHY function will be used in the later patch.

Signed-off-by: default avatarXiaofei Tan <tanxiaofei@huawei.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 78bd2b4f

drivers/scsi/hisi_sas/hisi_sas.h

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ struct hisi_sas_device { 
};



struct hisi_sas_tmf_task {

	int force_phy;

	int phy_id;

	u8 tmf;

	u16 tag_of_task_to_be_managed;

};

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+11 −0
Original line number Diff line number Diff line
@@ -296,6 +296,10 @@ 
#define CMD_HDR_RESP_REPORT_MSK		(0x1 << CMD_HDR_RESP_REPORT_OFF)

#define CMD_HDR_TLR_CTRL_OFF		6

#define CMD_HDR_TLR_CTRL_MSK		(0x3 << CMD_HDR_TLR_CTRL_OFF)

#define CMD_HDR_PHY_ID_OFF		8

#define CMD_HDR_PHY_ID_MSK		(0x1ff << CMD_HDR_PHY_ID_OFF)

#define CMD_HDR_FORCE_PHY_OFF		17

#define CMD_HDR_FORCE_PHY_MSK		(0x1 << CMD_HDR_FORCE_PHY_OFF)

#define CMD_HDR_PORT_OFF		18

#define CMD_HDR_PORT_MSK		(0xf << CMD_HDR_PORT_OFF)

#define CMD_HDR_PRIORITY_OFF		27
@@ -2512,6 +2516,7 @@ static void prep_ata_v2_hw(struct hisi_hba *hisi_hba, 
	struct hisi_sas_cmd_hdr *hdr = slot->cmd_hdr;

	struct asd_sas_port *sas_port = device->port;

	struct hisi_sas_port *port = to_hisi_sas_port(sas_port);

	struct hisi_sas_tmf_task *tmf = slot->tmf;

	u8 *buf_cmd;

	int has_data = 0, hdr_tag = 0;

	u32 dw1 = 0, dw2 = 0;
@@ -2524,6 +2529,12 @@ static void prep_ata_v2_hw(struct hisi_hba *hisi_hba, 
	else

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



	if (tmf && tmf->force_phy) {

		hdr->dw0 |= CMD_HDR_FORCE_PHY_MSK;

		hdr->dw0 |= cpu_to_le32((1 << tmf->phy_id)

				<< CMD_HDR_PHY_ID_OFF);

	}



	/* dw1 */

	switch (task->data_dir) {

	case DMA_TO_DEVICE: