Unverified Commit da264e28 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14258 v2 scsi: hisi_sas: Enable force phy when SATA disk directly connected 

Merge Pull Request from: @ci-robot 
 
PR sync from: Junhao He <hejunhao3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MMYIAINHVUOG5LLCSJ2F2GX3XHWWQ74Z/ 
 
https://gitee.com/openeuler/kernel/issues/IBCOG7 
 
Link:https://gitee.com/openeuler/kernel/pulls/14258

 

Reviewed-by: default avatarYihang Li <liyihang9@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents c949b128 cd982c1a

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+7 −2
Original line number Diff line number Diff line
@@ -2508,10 +2508,15 @@ 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

	} else {

		int phy_id = device->phy->identify.phy_identifier;



		dw0 |= (1U << phy_id) << CMD_HDR_PHY_ID_OFF;

		dw0 |= CMD_HDR_FORCE_PHY_MSK;

		dw0 |= 4 << CMD_HDR_CMD_OFF;

	}



	if (tmf && ata_task->force_phy) {

		dw0 |= CMD_HDR_FORCE_PHY_MSK;

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+12 −2
Original line number Diff line number Diff line
@@ -359,6 +359,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		(0x1U << 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
@@ -1434,10 +1438,16 @@ 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

	} else {

		int phy_id = device->phy->identify.phy_identifier;



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

				<< CMD_HDR_PHY_ID_OFF);

		hdr->dw0 |= CMD_HDR_FORCE_PHY_MSK;

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

	}



	switch (task->data_dir) {

	case DMA_TO_DEVICE: