| Message ID | 4ff45223ff7ecff8e20a722ffd2db77fe51fea00.1614327185.git.objelf@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | [1/2] mt76: mt7921: fix the base of PCIe interrupt | expand |
> From: Sean Wang <sean.wang@mediatek.com> > > Should use 0x10000 as the base to operate PCIe interrupt according > to the vendor reference driver. > > Fixes: ffa1bf97425b ("mt76: mt7921: introduce PM support") > Co-developed-by: YN Chen <YN.Chen@mediatek.com> > Signed-off-by: YN Chen <YN.Chen@mediatek.com> > Signed-off-by: Sean Wang <sean.wang@mediatek.com> For the series: Tested-by: Lorenzo Bianconi <lorenzo@kernel.org> > --- > drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 4 ++-- > drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c > index 3e430c04c97e..def8b7816609 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c > @@ -137,7 +137,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, > > mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0); > > - mt7921_l1_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); > + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); > > ret = devm_request_irq(mdev->dev, pdev->irq, mt7921_irq_handler, > IRQF_SHARED, KBUILD_MODNAME, dev); > @@ -248,7 +248,7 @@ static int mt7921_pci_resume(struct pci_dev *pdev) > return 0; > > /* enable interrupt */ > - mt7921_l1_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); > + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); > mt7921_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL | > MT_INT_MCU_CMD); > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h > index 419add751980..c4bd31cc81cb 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h > @@ -391,7 +391,7 @@ > #define MT_HW_CHIPID 0x70010200 > #define MT_HW_REV 0x70010204 > > -#define MT_PCIE_MAC_BASE 0x74030000 > +#define MT_PCIE_MAC_BASE 0x10000 > #define MT_PCIE_MAC(ofs) (MT_PCIE_MAC_BASE + (ofs)) > #define MT_PCIE_MAC_INT_ENABLE MT_PCIE_MAC(0x188) > > -- > 2.25.1 >
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c index 3e430c04c97e..def8b7816609 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c @@ -137,7 +137,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0); - mt7921_l1_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); ret = devm_request_irq(mdev->dev, pdev->irq, mt7921_irq_handler, IRQF_SHARED, KBUILD_MODNAME, dev); @@ -248,7 +248,7 @@ static int mt7921_pci_resume(struct pci_dev *pdev) return 0; /* enable interrupt */ - mt7921_l1_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); mt7921_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL | MT_INT_MCU_CMD); diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h index 419add751980..c4bd31cc81cb 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h @@ -391,7 +391,7 @@ #define MT_HW_CHIPID 0x70010200 #define MT_HW_REV 0x70010204 -#define MT_PCIE_MAC_BASE 0x74030000 +#define MT_PCIE_MAC_BASE 0x10000 #define MT_PCIE_MAC(ofs) (MT_PCIE_MAC_BASE + (ofs)) #define MT_PCIE_MAC_INT_ENABLE MT_PCIE_MAC(0x188)