admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: airoha: Fix error path in airoha_probe()

Browse Source 
Do not run napi_disable() if airoha_hw_init() fails since Tx/Rx napi
has not been started yet. In order to fix the issue, introduce
airoha_qdma_stop_napi routine and remove napi_disable in
airoha_hw_cleanup().

Fixes: 23020f0493 ("net: airoha: Introduce ethernet support for EN7581 SoC")
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20241216-airoha_probe-error-path-fix-v2-1-6b10e04e9a5c@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Lorenzo Bianconi
2024-12-16 18:47:33 +01:00
committed by Jakub Kicinski
parent 5fde7edade
commit 0c7469ee71
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/net/ethernet/mediatek/airoha_eth.c
View File

@@ -2138,17 +2138,14 @@ static void airoha_hw_cleanup(struct airoha_qdma *qdma)
if (!qdma->q_rx[i].ndesc) if (!qdma->q_rx[i].ndesc)
continue; continue;
napi_disable(&qdma->q_rx[i].napi);
netif_napi_del(&qdma->q_rx[i].napi); netif_napi_del(&qdma->q_rx[i].napi);
airoha_qdma_cleanup_rx_queue(&qdma->q_rx[i]); airoha_qdma_cleanup_rx_queue(&qdma->q_rx[i]);
if (qdma->q_rx[i].page_pool) if (qdma->q_rx[i].page_pool)
page_pool_destroy(qdma->q_rx[i].page_pool); page_pool_destroy(qdma->q_rx[i].page_pool);
} }
for (i = 0; i < ARRAY_SIZE(qdma->q_tx_irq); i++) { for (i = 0; i < ARRAY_SIZE(qdma->q_tx_irq); i++)
napi_disable(&qdma->q_tx_irq[i].napi);
netif_napi_del(&qdma->q_tx_irq[i].napi); netif_napi_del(&qdma->q_tx_irq[i].napi);
}
for (i = 0; i < ARRAY_SIZE(qdma->q_tx); i++) { for (i = 0; i < ARRAY_SIZE(qdma->q_tx); i++) {
if (!qdma->q_tx[i].ndesc) if (!qdma->q_tx[i].ndesc)
@@ -2173,6 +2170,21 @@ static void airoha_qdma_start_napi(struct airoha_qdma *qdma)
} }
} }
static void airoha_qdma_stop_napi(struct airoha_qdma *qdma)
{
int i;
for (i = 0; i < ARRAY_SIZE(qdma->q_tx_irq); i++)
napi_disable(&qdma->q_tx_irq[i].napi);
for (i = 0; i < ARRAY_SIZE(qdma->q_rx); i++) {
if (!qdma->q_rx[i].ndesc)
continue;
napi_disable(&qdma->q_rx[i].napi);
}
}
static void airoha_update_hw_stats(struct airoha_gdm_port *port) static void airoha_update_hw_stats(struct airoha_gdm_port *port)
{ {
struct airoha_eth *eth = port->qdma->eth; struct airoha_eth *eth = port->qdma->eth;
@@ -2738,7 +2750,7 @@ static int airoha_probe(struct platform_device *pdev)
err = airoha_hw_init(pdev, eth); err = airoha_hw_init(pdev, eth);
if (err) if (err)
goto error; goto error_hw_cleanup;
for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
airoha_qdma_start_napi(&eth->qdma[i]); airoha_qdma_start_napi(&eth->qdma[i]);
@@ -2753,13 +2765,16 @@ static int airoha_probe(struct platform_device *pdev)
err = airoha_alloc_gdm_port(eth, np); err = airoha_alloc_gdm_port(eth, np);
if (err) { if (err) {
of_node_put(np); of_node_put(np);
goto error; goto error_napi_stop;
} }
} }
return 0; return 0;
error: error_napi_stop:
for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
airoha_qdma_stop_napi(&eth->qdma[i]);
error_hw_cleanup:
for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
airoha_hw_cleanup(&eth->qdma[i]); airoha_hw_cleanup(&eth->qdma[i]);
@@ -2780,8 +2795,10 @@ static void airoha_remove(struct platform_device *pdev)
struct airoha_eth *eth = platform_get_drvdata(pdev); struct airoha_eth *eth = platform_get_drvdata(pdev);
int i; int i;
for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) {
airoha_qdma_stop_napi(&eth->qdma[i]);
airoha_hw_cleanup(&eth->qdma[i]); airoha_hw_cleanup(&eth->qdma[i]);
}
for (i = 0; i < ARRAY_SIZE(eth->ports); i++) { for (i = 0; i < ARRAY_SIZE(eth->ports); i++) {
struct airoha_gdm_port *port = eth->ports[i]; struct airoha_gdm_port *port = eth->ports[i];