| Message ID | fc10753d211fe7782c8173f27cfb7b8586adf583.1722356015.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Add second QDMA support for EN7581 eth controller | expand |
On Tue, 30 Jul 2024 18:22:46 +0200 Lorenzo Bianconi wrote: > Run airoha_hw_cleanup routine for both QDMA controllers available on > EN7581 SoC removing airoha_eth module or in airoha_probe error path. > This is a preliminary patch to support multi-QDMA controllers. Doesn't this have to be squashed with the previous patch?
> On Tue, 30 Jul 2024 18:22:46 +0200 Lorenzo Bianconi wrote: > > Run airoha_hw_cleanup routine for both QDMA controllers available on > > EN7581 SoC removing airoha_eth module or in airoha_probe error path. > > This is a preliminary patch to support multi-QDMA controllers. > > Doesn't this have to be squashed with the previous patch? ack, I will fix it in v2. Regards, Lorenzo
diff --git a/drivers/net/ethernet/mediatek/airoha_eth.c b/drivers/net/ethernet/mediatek/airoha_eth.c index 498c65b4e449..2e21577f9ce2 100644 --- a/drivers/net/ethernet/mediatek/airoha_eth.c +++ b/drivers/net/ethernet/mediatek/airoha_eth.c @@ -2096,9 +2096,8 @@ static int airoha_hw_init(struct platform_device *pdev, return 0; } -static void airoha_hw_cleanup(struct airoha_eth *eth) +static void airoha_hw_cleanup(struct airoha_qdma *qdma) { - struct airoha_qdma *qdma = ð->qdma[0]; int i; for (i = 0; i < ARRAY_SIZE(qdma->q_rx); i++) { @@ -2714,7 +2713,9 @@ static int airoha_probe(struct platform_device *pdev) return 0; error: - airoha_hw_cleanup(eth); + for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) + airoha_hw_cleanup(ð->qdma[i]); + for (i = 0; i < ARRAY_SIZE(eth->ports); i++) { struct airoha_gdm_port *port = eth->ports[i]; @@ -2732,7 +2733,9 @@ static void airoha_remove(struct platform_device *pdev) struct airoha_eth *eth = platform_get_drvdata(pdev); int i; - airoha_hw_cleanup(eth); + for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) + airoha_hw_cleanup(ð->qdma[i]); + for (i = 0; i < ARRAY_SIZE(eth->ports); i++) { struct airoha_gdm_port *port = eth->ports[i];
Run airoha_hw_cleanup routine for both QDMA controllers available on EN7581 SoC removing airoha_eth module or in airoha_probe error path. This is a preliminary patch to support multi-QDMA controllers. Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- drivers/net/ethernet/mediatek/airoha_eth.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)