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

net: airoha: Add airoha_eth_soc_data struct 



Introduce airoha_eth_soc_data struct to contain differences between
various SoC. Move XSI reset names in airoha_eth_soc_data. This is a
preliminary patch to enable AN7583 ethernet controller support in
airoha-eth driver.

Co-developed-by: default avatarChristian Marangi <ansuelsmth@gmail.com>
Signed-off-by: default avatarChristian Marangi <ansuelsmth@gmail.com>
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-4-f28319666667@kernel.org


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

drivers/net/ethernet/airoha/airoha_eth.c

+33 −9
Original line number Diff line number Diff line
@@ -1387,8 +1387,7 @@ static int airoha_hw_init(struct platform_device *pdev, 
	int err, i;



	/* disable xsi */

	err = reset_control_bulk_assert(ARRAY_SIZE(eth->xsi_rsts),

					eth->xsi_rsts);

	err = reset_control_bulk_assert(eth->soc->num_xsi_rsts, eth->xsi_rsts);

	if (err)

		return err;
@@ -2922,6 +2921,7 @@ static int airoha_alloc_gdm_port(struct airoha_eth *eth, 


static int airoha_probe(struct platform_device *pdev)

{

	struct reset_control_bulk_data *xsi_rsts;

	struct device_node *np;

	struct airoha_eth *eth;

	int i, err;
@@ -2930,6 +2930,10 @@ static int airoha_probe(struct platform_device *pdev) 
	if (!eth)

		return -ENOMEM;



	eth->soc = of_device_get_match_data(&pdev->dev);

	if (!eth->soc)

		return -EINVAL;



	eth->dev = &pdev->dev;



	err = dma_set_mask_and_coherent(eth->dev, DMA_BIT_MASK(32));
@@ -2954,13 +2958,18 @@ static int airoha_probe(struct platform_device *pdev) 
		return err;

	}



	eth->xsi_rsts[0].id = "xsi-mac";

	eth->xsi_rsts[1].id = "hsi0-mac";

	eth->xsi_rsts[2].id = "hsi1-mac";

	eth->xsi_rsts[3].id = "hsi-mac";

	eth->xsi_rsts[4].id = "xfp-mac";

	xsi_rsts = devm_kzalloc(eth->dev,

				eth->soc->num_xsi_rsts * sizeof(*xsi_rsts),

				GFP_KERNEL);

	if (err)

		return err;



	eth->xsi_rsts = xsi_rsts;

	for (i = 0; i < eth->soc->num_xsi_rsts; i++)

		eth->xsi_rsts[i].id = eth->soc->xsi_rsts_names[i];



	err = devm_reset_control_bulk_get_exclusive(eth->dev,

						    ARRAY_SIZE(eth->xsi_rsts),

						    eth->soc->num_xsi_rsts,

						    eth->xsi_rsts);

	if (err) {

		dev_err(eth->dev, "failed to get bulk xsi reset lines\n");
@@ -3048,8 +3057,23 @@ static void airoha_remove(struct platform_device *pdev) 
	platform_set_drvdata(pdev, NULL);

}



static const char * const en7581_xsi_rsts_names[] = {

	"xsi-mac",

	"hsi0-mac",

	"hsi1-mac",

	"hsi-mac",

	"xfp-mac",

};



static const struct airoha_eth_soc_data en7581_soc_data = {

	.version = 0x7581,

	.xsi_rsts_names = en7581_xsi_rsts_names,

	.num_xsi_rsts = ARRAY_SIZE(en7581_xsi_rsts_names),

	.num_ppe = 2,

};



static const struct of_device_id of_airoha_match[] = {

	{ .compatible = "airoha,en7581-eth" },

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

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, of_airoha_match);

drivers/net/ethernet/airoha/airoha_eth.h

+15 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#define AIROHA_MAX_NUM_IRQ_BANKS	4

#define AIROHA_MAX_DSA_PORTS		7

#define AIROHA_MAX_NUM_RSTS		3

#define AIROHA_MAX_NUM_XSI_RSTS		5

#define AIROHA_MAX_MTU			9216

#define AIROHA_MAX_PACKET_SIZE		2048

#define AIROHA_NUM_QOS_CHANNELS		4
@@ -556,9 +555,18 @@ struct airoha_ppe { 
	struct dentry *debugfs_dir;

};



struct airoha_eth_soc_data {

	u16 version;

	const char * const *xsi_rsts_names;

	int num_xsi_rsts;

	int num_ppe;

};



struct airoha_eth {

	struct device *dev;



	const struct airoha_eth_soc_data *soc;



	unsigned long state;

	void __iomem *fe_regs;
@@ -568,7 +576,7 @@ struct airoha_eth { 
	struct rhashtable flow_table;



	struct reset_control_bulk_data rsts[AIROHA_MAX_NUM_RSTS];

	struct reset_control_bulk_data xsi_rsts[AIROHA_MAX_NUM_XSI_RSTS];

	struct reset_control_bulk_data *xsi_rsts;



	struct net_device *napi_dev;
@@ -611,6 +619,11 @@ static inline bool airhoa_is_lan_gdm_port(struct airoha_gdm_port *port) 
	return port->id == 1;

}



static inline bool airoha_is_7581(struct airoha_eth *eth)

{

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

}



bool airoha_is_valid_gdm_port(struct airoha_eth *eth,

			      struct airoha_gdm_port *port);