Commit e4e5ce82 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Paolo Abeni
Browse files

net: airoha: Add AN7583 SoC support 



Introduce support for AN7583 ethernet controller to airoha-eth dirver.

Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20251017-an7583-eth-support-v3-13-f28319666667@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 63f283d3

drivers/net/ethernet/airoha/airoha_eth.c

+63 −5
Original line number Diff line number Diff line
@@ -1684,10 +1684,8 @@ static int airoha_dev_set_macaddr(struct net_device *dev, void *p) 


static int airhoha_set_gdm2_loopback(struct airoha_gdm_port *port)

{

	u32 val, pse_port, chan = port->id == AIROHA_GDM3_IDX ? 4 : 0;

	struct airoha_eth *eth = port->qdma->eth;

	/* XXX: handle XSI_USB_PORT and XSI_PCE1_PORT */

	u32 nbq = port->id == AIROHA_GDM3_IDX ? 4 : 0;

	u32 val, pse_port, chan, nbq;

	int src_port;



	/* Forward the traffic to the proper GDM port */
@@ -1699,6 +1697,8 @@ static int airhoha_set_gdm2_loopback(struct airoha_gdm_port *port) 
	/* Enable GDM2 loopback */

	airoha_fe_wr(eth, REG_GDM_TXCHN_EN(2), 0xffffffff);

	airoha_fe_wr(eth, REG_GDM_RXCHN_EN(2), 0xffff);



	chan = port->id == AIROHA_GDM3_IDX ? airoha_is_7581(eth) ? 4 : 3 : 0;

	airoha_fe_rmw(eth, REG_GDM_LPBK_CFG(2),

		      LPBK_CHAN_MASK | LPBK_MODE_MASK | LPBK_EN_MASK,

		      FIELD_PREP(LPBK_CHAN_MASK, chan) |
@@ -1713,6 +1713,8 @@ static int airhoha_set_gdm2_loopback(struct airoha_gdm_port *port) 
	airoha_fe_clear(eth, REG_FE_VIP_PORT_EN, BIT(2));

	airoha_fe_clear(eth, REG_FE_IFC_PORT_EN, BIT(2));



	/* XXX: handle XSI_USB_PORT and XSI_PCE1_PORT */

	nbq = port->id == AIROHA_GDM3_IDX && airoha_is_7581(eth) ? 4 : 0;

	src_port = eth->soc->ops.get_src_port_id(port, nbq);

	if (src_port < 0)

		return src_port;
@@ -1726,7 +1728,7 @@ static int airhoha_set_gdm2_loopback(struct airoha_gdm_port *port) 
		      SP_CPORT_MASK(val),

		      FE_PSE_PORT_CDM2 << __ffs(SP_CPORT_MASK(val)));



	if (port->id != AIROHA_GDM3_IDX)

	if (port->id != AIROHA_GDM3_IDX && airoha_is_7581(eth))

		airoha_fe_rmw(eth, REG_SRC_PORT_FC_MAP6,

			      FC_ID_OF_SRC_PORT24_MASK,

			      FIELD_PREP(FC_ID_OF_SRC_PORT24_MASK, 2));
@@ -1895,6 +1897,22 @@ static bool airoha_dev_tx_queue_busy(struct airoha_queue *q, u32 nr_frags) 
	return index >= tail;

}



static int airoha_get_fe_port(struct airoha_gdm_port *port)

{

	struct airoha_qdma *qdma = port->qdma;

	struct airoha_eth *eth = qdma->eth;



	switch (eth->soc->version) {

	case 0x7583:

		return port->id == AIROHA_GDM3_IDX ? FE_PSE_PORT_GDM3

						   : port->id;

	case 0x7581:

	default:

		return port->id == AIROHA_GDM4_IDX ? FE_PSE_PORT_GDM4

						   : port->id;

	}

}



static netdev_tx_t airoha_dev_xmit(struct sk_buff *skb,

				   struct net_device *dev)

{
@@ -1935,7 +1953,7 @@ static netdev_tx_t airoha_dev_xmit(struct sk_buff *skb, 
		}

	}



	fport = port->id == 4 ? FE_PSE_PORT_GDM4 : port->id;

	fport = airoha_get_fe_port(port);

	msg1 = FIELD_PREP(QDMA_ETH_TXMSG_FPORT_MASK, fport) |

	       FIELD_PREP(QDMA_ETH_TXMSG_METER_MASK, 0x7f);
@@ -3098,6 +3116,35 @@ static int airoha_en7581_get_src_port_id(struct airoha_gdm_port *port, int nbq) 
	return -EINVAL;

}



static const char * const an7583_xsi_rsts_names[] = {

	"xsi-mac",

	"hsi0-mac",

	"hsi1-mac",

	"xfp-mac",

};



static int airoha_an7583_get_src_port_id(struct airoha_gdm_port *port, int nbq)

{

	switch (port->id) {

	case 3:

		/* 7583 SoC supports eth serdes on GDM3 port */

		if (!nbq)

			return HSGMII_LAN_7583_ETH_SRCPORT;

		break;

	case 4:

		/* 7583 SoC supports PCIe and USB serdes on GDM4 port */

		if (!nbq)

			return HSGMII_LAN_7583_PCIE_SRCPORT;

		if (nbq == 1)

			return HSGMII_LAN_7583_USB_SRCPORT;

		break;

	default:

		break;

	}



	return -EINVAL;

}



static const struct airoha_eth_soc_data en7581_soc_data = {

	.version = 0x7581,

	.xsi_rsts_names = en7581_xsi_rsts_names,
@@ -3108,8 +3155,19 @@ static const struct airoha_eth_soc_data en7581_soc_data = { 
	},

};



static const struct airoha_eth_soc_data an7583_soc_data = {

	.version = 0x7583,

	.xsi_rsts_names = an7583_xsi_rsts_names,

	.num_xsi_rsts = ARRAY_SIZE(an7583_xsi_rsts_names),

	.num_ppe = 1,

	.ops = {

		.get_src_port_id = airoha_an7583_get_src_port_id,

	},

};



static const struct of_device_id of_airoha_match[] = {

	{ .compatible = "airoha,en7581-eth", .data = &en7581_soc_data },

	{ .compatible = "airoha,an7583-eth", .data = &an7583_soc_data },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, of_airoha_match);

drivers/net/ethernet/airoha/airoha_eth.h

+11 −0
Original line number Diff line number Diff line
@@ -73,6 +73,12 @@ enum { 
	HSGMII_LAN_7581_USB_SRCPORT,

};



enum {

	HSGMII_LAN_7583_ETH_SRCPORT	= 0x16,

	HSGMII_LAN_7583_PCIE_SRCPORT	= 0x18,

	HSGMII_LAN_7583_USB_SRCPORT,

};



enum {

	XSI_PCIE0_VIP_PORT_MASK	= BIT(22),

	XSI_PCIE1_VIP_PORT_MASK	= BIT(23),
@@ -629,6 +635,11 @@ static inline bool airoha_is_7581(struct airoha_eth *eth) 
	return eth->soc->version == 0x7581;

}



static inline bool airoha_is_7583(struct airoha_eth *eth)

{

	return eth->soc->version == 0x7583;

}



bool airoha_is_valid_gdm_port(struct airoha_eth *eth,

			      struct airoha_gdm_port *port);

drivers/net/ethernet/airoha/airoha_ppe.c

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ static int airoha_ppe_get_num_stats_entries(struct airoha_ppe *ppe) 
	if (!IS_ENABLED(CONFIG_NET_AIROHA_FLOW_STATS))

		return -EOPNOTSUPP;



	if (airoha_is_7583(ppe->eth))

		return -EOPNOTSUPP;



	return PPE_STATS_NUM_ENTRIES;

}