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

scsi: aic94xx: 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-15-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 872a90b5

drivers/scsi/aic94xx/aic94xx_scb.c

+13 −16
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void asd_phy_event_tasklet(struct asd_ascb *ascb, 
		ASD_DPRINTK("phy%d: device unplugged\n", phy_id);

		asd_turn_led(asd_ha, phy_id, 0);

		sas_phy_disconnected(&phy->sas_phy);

		sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_LOSS_OF_SIGNAL,

		sas_notify_phy_event(&phy->sas_phy, PHYE_LOSS_OF_SIGNAL,

				     GFP_ATOMIC);

		break;

	case CURRENT_OOB_DONE:
@@ -89,13 +89,12 @@ static void asd_phy_event_tasklet(struct asd_ascb *ascb, 
		get_lrate_mode(phy, oob_mode);

		ASD_DPRINTK("phy%d device plugged: lrate:0x%x, proto:0x%x\n",

			    phy_id, phy->sas_phy.linkrate, phy->sas_phy.iproto);

		sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_OOB_DONE,

					 GFP_ATOMIC);

		sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE, GFP_ATOMIC);

		break;

	case CURRENT_SPINUP_HOLD:

		/* hot plug SATA, no COMWAKE sent */

		asd_turn_led(asd_ha, phy_id, 1);

		sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_SPINUP_HOLD,

		sas_notify_phy_event(&phy->sas_phy, PHYE_SPINUP_HOLD,

				     GFP_ATOMIC);

		break;

	case CURRENT_GTO_TIMEOUT:
@@ -104,8 +103,7 @@ static void asd_phy_event_tasklet(struct asd_ascb *ascb, 
			    dl->status_block[1]);

		asd_turn_led(asd_ha, phy_id, 0);

		sas_phy_disconnected(&phy->sas_phy);

		sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_OOB_ERROR,

					 GFP_ATOMIC);

		sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_ERROR, GFP_ATOMIC);

		break;

	}

}
@@ -236,7 +234,7 @@ static void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb, 
	spin_unlock_irqrestore(&phy->sas_phy.frame_rcvd_lock, flags);

	asd_dump_frame_rcvd(phy, dl);

	asd_form_port(ascb->ha, phy);

	sas_notify_port_event_gfp(&phy->sas_phy, PORTE_BYTES_DMAED, GFP_ATOMIC);

	sas_notify_port_event(&phy->sas_phy, PORTE_BYTES_DMAED, GFP_ATOMIC);

}



static void asd_link_reset_err_tasklet(struct asd_ascb *ascb,
@@ -272,7 +270,7 @@ static void asd_link_reset_err_tasklet(struct asd_ascb *ascb, 
	asd_turn_led(asd_ha, phy_id, 0);

	sas_phy_disconnected(sas_phy);

	asd_deform_port(asd_ha, phy);

	sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, GFP_ATOMIC);

	sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR, GFP_ATOMIC);



	if (retries_left == 0) {

		int num = 1;
@@ -317,7 +315,7 @@ static void asd_primitive_rcvd_tasklet(struct asd_ascb *ascb, 
			spin_lock_irqsave(&sas_phy->sas_prim_lock, flags);

			sas_phy->sas_prim = ffs(cont);

			spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags);

			sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD,

			sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,

					      GFP_ATOMIC);

			break;
@@ -339,7 +337,7 @@ static void asd_primitive_rcvd_tasklet(struct asd_ascb *ascb, 
			/* The sequencer disables all phys on that port.

			 * We have to re-enable the phys ourselves. */

			asd_deform_port(asd_ha, phy);

			sas_notify_port_event_gfp(sas_phy, PORTE_HARD_RESET,

			sas_notify_port_event(sas_phy, PORTE_HARD_RESET,

					      GFP_ATOMIC);

			break;
@@ -571,8 +569,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb, 
		/* the device is gone */

		sas_phy_disconnected(sas_phy);

		asd_deform_port(asd_ha, phy);

		sas_notify_port_event_gfp(sas_phy, PORTE_TIMER_EVENT,

					  GFP_ATOMIC);

		sas_notify_port_event(sas_phy, PORTE_TIMER_EVENT, GFP_ATOMIC);

		break;

	default:

		ASD_DPRINTK("%s: phy%d: unknown event:0x%x\n", __func__,