Skip to content

Commit e3d6bfd

Browse files
LorenzoBianconikuba-moo
authored andcommitted
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 <[email protected]> Link: https://patch.msgid.link/1e40c3cb973881c0eb3c3c247c78550da62054ab.1722522582.git.lorenzo@kernel.org Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 9a2500a commit e3d6bfd

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/net/ethernet/mediatek/airoha_eth.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,8 +1973,7 @@ static int airoha_qdma_hw_init(struct airoha_qdma *qdma)
19731973

19741974
static irqreturn_t airoha_irq_handler(int irq, void *dev_instance)
19751975
{
1976-
struct airoha_eth *eth = dev_instance;
1977-
struct airoha_qdma *qdma = &eth->qdma[0];
1976+
struct airoha_qdma *qdma = dev_instance;
19781977
u32 intr[ARRAY_SIZE(qdma->irqmask)];
19791978
int i;
19801979

@@ -1984,7 +1983,7 @@ static irqreturn_t airoha_irq_handler(int irq, void *dev_instance)
19841983
airoha_qdma_wr(qdma, REG_INT_STATUS(i), intr[i]);
19851984
}
19861985

1987-
if (!test_bit(DEV_STATE_INITIALIZED, &eth->state))
1986+
if (!test_bit(DEV_STATE_INITIALIZED, &qdma->eth->state))
19881987
return IRQ_NONE;
19891988

19901989
if (intr[1] & RX_DONE_INT_MASK) {
@@ -2037,7 +2036,7 @@ static int airoha_qdma_init(struct platform_device *pdev,
20372036
return qdma->irq;
20382037

20392038
err = devm_request_irq(eth->dev, qdma->irq, airoha_irq_handler,
2040-
IRQF_SHARED, KBUILD_MODNAME, eth);
2039+
IRQF_SHARED, KBUILD_MODNAME, qdma);
20412040
if (err)
20422041
return err;
20432042

0 commit comments

Comments
 (0)