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

scsi: hisi_sas: Add a flag to filter PHY events during reset 



During reset, we don't want PHY events reported to libsas for PHYs which
were previously attached prior to reset.

So check hisi_hba->flags for HISI_SAS_RESET_BIT to filter PHY events during
reset.

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 214e702d

drivers/scsi/hisi_sas/hisi_sas_main.c

+2 −1
Original line number Diff line number Diff line
@@ -1927,7 +1927,8 @@ void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy) 
	} else {

		struct hisi_sas_port *port  = phy->port;



		if (phy->in_reset) {

		if (test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags) ||

		    phy->in_reset) {

			dev_info(dev, "ignore flutter phy%d down\n", phy_no);

			return;

		}

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -1469,6 +1469,7 @@ static irqreturn_t int_bcast_v1_hw(int irq, void *p) 
		goto end;

	}



	if (!test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))

		sha->notify_port_event(sas_phy, PORTE_BROADCAST_RCVD);



end:

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -2840,7 +2840,8 @@ static void phy_bcast_v2_hw(int phy_no, struct hisi_hba *hisi_hba) 


	hisi_sas_phy_write32(hisi_hba, phy_no, SL_RX_BCAST_CHK_MSK, 1);

	bcast_status = hisi_sas_phy_read32(hisi_hba, phy_no, RX_PRIMS_STATUS);

	if (bcast_status & RX_BCAST_CHG_MSK)

	if ((bcast_status & RX_BCAST_CHG_MSK) &&

	    !test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))

		sas_ha->notify_port_event(sas_phy, PORTE_BROADCAST_RCVD);

	hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0,

			     CHL_INT0_SL_RX_BCST_ACK_MSK);

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -1263,7 +1263,8 @@ static irqreturn_t phy_bcast_v3_hw(int phy_no, struct hisi_hba *hisi_hba) 


	hisi_sas_phy_write32(hisi_hba, phy_no, SL_RX_BCAST_CHK_MSK, 1);

	bcast_status = hisi_sas_phy_read32(hisi_hba, phy_no, RX_PRIMS_STATUS);

	if (bcast_status & RX_BCAST_CHG_MSK)

	if ((bcast_status & RX_BCAST_CHG_MSK) &&

	    !test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))

		sas_ha->notify_port_event(sas_phy, PORTE_BROADCAST_RCVD);

	hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0,

			     CHL_INT0_SL_RX_BCST_ACK_MSK);

CRA Git | Maintained and supported by SUSTech CRA and CCSE