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

scsi: mvsas: 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-19-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 c1220866

drivers/scsi/mvsas/mv_sas.c

+4 −4
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void mvs_bytes_dmaed(struct mvs_info *mvi, int i, gfp_t gfp_flags) 
		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;
@@ -261,7 +261,7 @@ static void mvs_bytes_dmaed(struct mvs_info *mvi, int i, gfp_t gfp_flags) 


	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);

}



void mvs_scan_start(struct Scsi_Host *shost)
@@ -1892,7 +1892,7 @@ static void mvs_work_queue(struct work_struct *work) 
			if (!(tmp & PHY_READY_MASK)) {

				sas_phy_disconnected(sas_phy);

				mvs_phy_disconnected(phy);

				sas_notify_phy_event_gfp(sas_phy,

				sas_notify_phy_event(sas_phy,

					PHYE_LOSS_OF_SIGNAL, GFP_ATOMIC);

				mv_dprintk("phy%d Removed Device\n", phy_no);

			} else {
@@ -1905,7 +1905,7 @@ static void mvs_work_queue(struct work_struct *work) 
		}

	} else if (mwq->handler & EXP_BRCT_CHG) {

		phy->phy_event &= ~EXP_BRCT_CHG;

		sas_notify_port_event_gfp(sas_phy,

		sas_notify_port_event(sas_phy,

				PORTE_BROADCAST_RCVD, GFP_ATOMIC);

		mv_dprintk("phy%d Got Broadcast Change\n", phy_no);

	}