Commit 872a90b5 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Switch back to original libsas event notifiers 

libsas event notifiers required an extension where gfp_t flags must be
explicitly passed. For bisectability, a temporary _gfp() variant of such
functions were added. All call sites then got converted use the _gfp()
variants and explicitly pass GFP context. Having no callers left, the
original libsas notifiers were then modified to accept gfp_t flags by
default.

Switch back to the original libas API, while still passing GFP context.
The libsas _gfp() variants will be removed afterwards.

Link: https://lore.kernel.org/r/20210118100955.1761652-14-a.darwish@linutronix.de


Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarAhmed S. Darwish <a.darwish@linutronix.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5d6a75a1

drivers/scsi/hisi_sas/hisi_sas_main.c

+4 −5
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static void hisi_sas_bytes_dmaed(struct hisi_hba *hisi_hba, int phy_no, 
		return;

	}



	sas_notify_phy_event_gfp(sas_phy, PHYE_OOB_DONE, gfp_flags);

	sas_notify_phy_event(sas_phy, PHYE_OOB_DONE, gfp_flags);



	if (sas_phy->phy) {

		struct sas_phy *sphy = sas_phy->phy;
@@ -655,7 +655,7 @@ static void hisi_sas_bytes_dmaed(struct hisi_hba *hisi_hba, int phy_no, 
	}



	sas_phy->frame_rcvd_size = phy->frame_rcvd_size;

	sas_notify_port_event_gfp(sas_phy, PORTE_BYTES_DMAED, gfp_flags);

	sas_notify_port_event(sas_phy, PORTE_BYTES_DMAED, gfp_flags);

}



static struct hisi_sas_device *hisi_sas_alloc_dev(struct domain_device *device)
@@ -1430,7 +1430,7 @@ static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state) 
				_sas_port = sas_port;



				if (dev_is_expander(dev->dev_type))

					sas_notify_port_event_gfp(sas_phy,

					sas_notify_port_event(sas_phy,

							PORTE_BROADCAST_RCVD,

							GFP_KERNEL);

			}
@@ -2209,8 +2209,7 @@ void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy, 
			return;

		}

		/* Phy down and not ready */

		sas_notify_phy_event_gfp(sas_phy,

					 PHYE_LOSS_OF_SIGNAL, gfp_flags);

		sas_notify_phy_event(sas_phy, PHYE_LOSS_OF_SIGNAL, gfp_flags);

		sas_phy_disconnected(sas_phy);



		if (port) {

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -1423,7 +1423,7 @@ static irqreturn_t int_bcast_v1_hw(int irq, void *p) 
	}



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

		sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD,

		sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,

				      GFP_ATOMIC);



end:

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -2825,7 +2825,7 @@ static void phy_bcast_v2_hw(int phy_no, struct hisi_hba *hisi_hba) 
	bcast_status = hisi_sas_phy_read32(hisi_hba, phy_no, RX_PRIMS_STATUS);

	if ((bcast_status & RX_BCAST_CHG_MSK) &&

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

		sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD,

		sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,

				      GFP_ATOMIC);

	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 −2
Original line number Diff line number Diff line
@@ -1602,7 +1602,7 @@ static irqreturn_t phy_bcast_v3_hw(int phy_no, struct hisi_hba *hisi_hba) 
	bcast_status = hisi_sas_phy_read32(hisi_hba, phy_no, RX_PRIMS_STATUS);

	if ((bcast_status & RX_BCAST_CHG_MSK) &&

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

		sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD,

		sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,

				      GFP_ATOMIC);

	hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0,

			     CHL_INT0_SL_RX_BCST_ACK_MSK);