46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From e3d6bfdfc0aeb8c1d7965413b1050ec07f9761e5 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Thu, 1 Aug 2024 16:35:07 +0200
|
|
Subject: [PATCH 5/8] net: airoha: Use qdma pointer as private structure in
|
|
airoha_irq_handler routine
|
|
|
|
This is a preliminary patch to support multi-QDMA controllers.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/1e40c3cb973881c0eb3c3c247c78550da62054ab.1722522582.git.lorenzo@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/airoha_eth.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/mediatek/airoha_eth.c
|
|
@@ -1974,8 +1974,7 @@ static int airoha_qdma_hw_init(struct ai
|
|
|
|
static irqreturn_t airoha_irq_handler(int irq, void *dev_instance)
|
|
{
|
|
- struct airoha_eth *eth = dev_instance;
|
|
- struct airoha_qdma *qdma = ð->qdma[0];
|
|
+ struct airoha_qdma *qdma = dev_instance;
|
|
u32 intr[ARRAY_SIZE(qdma->irqmask)];
|
|
int i;
|
|
|
|
@@ -1985,7 +1984,7 @@ static irqreturn_t airoha_irq_handler(in
|
|
airoha_qdma_wr(qdma, REG_INT_STATUS(i), intr[i]);
|
|
}
|
|
|
|
- if (!test_bit(DEV_STATE_INITIALIZED, ð->state))
|
|
+ if (!test_bit(DEV_STATE_INITIALIZED, &qdma->eth->state))
|
|
return IRQ_NONE;
|
|
|
|
if (intr[1] & RX_DONE_INT_MASK) {
|
|
@@ -2038,7 +2037,7 @@ static int airoha_qdma_init(struct platf
|
|
return qdma->irq;
|
|
|
|
err = devm_request_irq(eth->dev, qdma->irq, airoha_irq_handler,
|
|
- IRQF_SHARED, KBUILD_MODNAME, eth);
|
|
+ IRQF_SHARED, KBUILD_MODNAME, qdma);
|
|
if (err)
|
|
return err;
|
|
|