Commit 121181f3 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: libsas: Remove notifier indirection 

LLDDs report events to libsas with .notify_port_event and .notify_phy_event
callbacks.

These callbacks are fixed and so there is no reason why the functions
cannot be called directly, so do that.

This neatens the code slightly, makes it more obvious, and reduces function
pointer usage, which is generally a good thing. Downside is that there are
2x more symbol exports.

[a.darwish@linutronix.de: Remove the now unused "sas_ha" local variables]

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


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-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 3f901c81

Documentation/scsi/libsas.rst

+2 −6
Original line number Diff line number Diff line
@@ -189,12 +189,8 @@ num_phys 
The event interface::



	/* LLDD calls these to notify the class of an event. */

	void (*notify_port_event)(struct sas_phy *, enum port_event);

	void (*notify_phy_event)(struct sas_phy *, enum phy_event);



When sas_register_ha() returns, those are set and can be

called by the LLDD to notify the SAS layer of such events

the SAS layer.

	void sas_notify_port_event(struct sas_phy *, enum port_event);

	void sas_notify_phy_event(struct sas_phy *, enum phy_event);



The port notification::

drivers/scsi/aic94xx/aic94xx_scb.c

+9 −11
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ static void asd_phy_event_tasklet(struct asd_ascb *ascb, 
					 struct done_list_struct *dl)

{

	struct asd_ha_struct *asd_ha = ascb->ha;

	struct sas_ha_struct *sas_ha = &asd_ha->sas_ha;

	int phy_id = dl->status_block[0] & DL_PHY_MASK;

	struct asd_phy *phy = &asd_ha->phys[phy_id];
@@ -81,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_ha->notify_phy_event(&phy->sas_phy, PHYE_LOSS_OF_SIGNAL);

		sas_notify_phy_event(&phy->sas_phy, PHYE_LOSS_OF_SIGNAL);

		break;

	case CURRENT_OOB_DONE:

		/* hot plugged device */
@@ -89,12 +88,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_ha->notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE);

		sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE);

		break;

	case CURRENT_SPINUP_HOLD:

		/* hot plug SATA, no COMWAKE sent */

		asd_turn_led(asd_ha, phy_id, 1);

		sas_ha->notify_phy_event(&phy->sas_phy, PHYE_SPINUP_HOLD);

		sas_notify_phy_event(&phy->sas_phy, PHYE_SPINUP_HOLD);

		break;

	case CURRENT_GTO_TIMEOUT:

	case CURRENT_OOB_ERROR:
@@ -102,7 +101,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_ha->notify_phy_event(&phy->sas_phy, PHYE_OOB_ERROR);

		sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_ERROR);

		break;

	}

}
@@ -222,7 +221,6 @@ static void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb, 
	int edb_el = edb_id + ascb->edb_index;

	struct asd_dma_tok *edb = ascb->ha->seq.edb_arr[edb_el];

	struct asd_phy *phy = &ascb->ha->phys[phy_id];

	struct sas_ha_struct *sas_ha = phy->sas_phy.ha;

	u16 size = ((dl->status_block[3] & 7) << 8) | dl->status_block[2];



	size = min(size, (u16) sizeof(phy->frame_rcvd));
@@ -234,7 +232,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_ha->notify_port_event(&phy->sas_phy, PORTE_BYTES_DMAED);

	sas_notify_port_event(&phy->sas_phy, PORTE_BYTES_DMAED);

}



static void asd_link_reset_err_tasklet(struct asd_ascb *ascb,
@@ -270,7 +268,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_ha->notify_port_event(sas_phy, PORTE_LINK_RESET_ERR);

	sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR);



	if (retries_left == 0) {

		int num = 1;
@@ -315,7 +313,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_ha->notify_port_event(sas_phy,PORTE_BROADCAST_RCVD);

			sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD);

			break;



		case LmUNKNOWNP:
@@ -336,7 +334,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_ha->notify_port_event(sas_phy, PORTE_HARD_RESET);

			sas_notify_port_event(sas_phy, PORTE_HARD_RESET);

			break;



		default:
@@ -567,7 +565,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_ha->notify_port_event(sas_phy, PORTE_TIMER_EVENT);

		sas_notify_port_event(sas_phy, PORTE_TIMER_EVENT);

		break;

	default:

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

drivers/scsi/hisi_sas/hisi_sas_main.c

+4 −8
Original line number Diff line number Diff line
@@ -616,7 +616,6 @@ static void hisi_sas_bytes_dmaed(struct hisi_hba *hisi_hba, int phy_no) 
{

	struct hisi_sas_phy *phy = &hisi_hba->phy[phy_no];

	struct asd_sas_phy *sas_phy = &phy->sas_phy;

	struct sas_ha_struct *sas_ha;



	if (!phy->phy_attached)

		return;
@@ -627,8 +626,7 @@ static void hisi_sas_bytes_dmaed(struct hisi_hba *hisi_hba, int phy_no) 
		return;

	}



	sas_ha = &hisi_hba->sha;

	sas_ha->notify_phy_event(sas_phy, PHYE_OOB_DONE);

	sas_notify_phy_event(sas_phy, PHYE_OOB_DONE);



	if (sas_phy->phy) {

		struct sas_phy *sphy = sas_phy->phy;
@@ -656,7 +654,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_ha->notify_port_event(sas_phy, PORTE_BYTES_DMAED);

	sas_notify_port_event(sas_phy, PORTE_BYTES_DMAED);

}



static struct hisi_sas_device *hisi_sas_alloc_dev(struct domain_device *device)
@@ -1411,7 +1409,6 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba) 


static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state)

{

	struct sas_ha_struct *sas_ha = &hisi_hba->sha;

	struct asd_sas_port *_sas_port = NULL;

	int phy_no;
@@ -1432,7 +1429,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_ha->notify_port_event(sas_phy,

					sas_notify_port_event(sas_phy,

							PORTE_BROADCAST_RCVD);

			}

		} else {
@@ -2194,7 +2191,6 @@ void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy) 
{

	struct hisi_sas_phy *phy = &hisi_hba->phy[phy_no];

	struct asd_sas_phy *sas_phy = &phy->sas_phy;

	struct sas_ha_struct *sas_ha = &hisi_hba->sha;

	struct device *dev = hisi_hba->dev;



	if (rdy) {
@@ -2210,7 +2206,7 @@ void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy) 
			return;

		}

		/* Phy down and not ready */

		sas_ha->notify_phy_event(sas_phy, PHYE_LOSS_OF_SIGNAL);

		sas_notify_phy_event(sas_phy, PHYE_LOSS_OF_SIGNAL);

		sas_phy_disconnected(sas_phy);



		if (port) {

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+1 −2
Original line number Diff line number Diff line
@@ -1408,7 +1408,6 @@ static irqreturn_t int_bcast_v1_hw(int irq, void *p) 
	struct hisi_sas_phy *phy = p;

	struct hisi_hba *hisi_hba = phy->hisi_hba;

	struct asd_sas_phy *sas_phy = &phy->sas_phy;

	struct sas_ha_struct *sha = &hisi_hba->sha;

	struct device *dev = hisi_hba->dev;

	int phy_no = sas_phy->id;

	u32 irq_value;
@@ -1424,7 +1423,7 @@ static irqreturn_t int_bcast_v1_hw(int irq, void *p) 
	}



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

		sha->notify_port_event(sas_phy, PORTE_BROADCAST_RCVD);

		sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD);



end:

	hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT2,

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+1 −2
Original line number Diff line number Diff line
@@ -2818,14 +2818,13 @@ static void phy_bcast_v2_hw(int phy_no, struct hisi_hba *hisi_hba) 
{

	struct hisi_sas_phy *phy = &hisi_hba->phy[phy_no];

	struct asd_sas_phy *sas_phy = &phy->sas_phy;

	struct sas_ha_struct *sas_ha = &hisi_hba->sha;

	u32 bcast_status;



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

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

		sas_ha->notify_port_event(sas_phy, PORTE_BROADCAST_RCVD);

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

	hisi_sas_phy_write32(hisi_hba, phy_no, SL_RX_BCAST_CHK_MSK, 0);