Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / drivers / net / wireless / mediatek / mt76 / mt7921 / dma.c

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
index cdff1fd..39d6ce4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
@@ -78,110 +78,6 @@ static void mt7921_dma_prefetch(struct mt7921_dev *dev)
        mt76_wr(dev, MT_WFDMA0_TX_RING17_EXT_CTRL, PREFETCH(0x380, 0x4));
 }
 
-static u32 __mt7921_reg_addr(struct mt7921_dev *dev, u32 addr)
-{
-       static const struct {
-               u32 phys;
-               u32 mapped;
-               u32 size;
-       } fixed_map[] = {
-               { 0x820d0000, 0x30000, 0x10000 }, /* WF_LMAC_TOP (WF_WTBLON) */
-               { 0x820ed000, 0x24800, 0x0800 }, /* WF_LMAC_TOP BN0 (WF_MIB) */
-               { 0x820e4000, 0x21000, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_TMAC) */
-               { 0x820e7000, 0x21e00, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_DMA) */
-               { 0x820eb000, 0x24200, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_LPON) */
-               { 0x820e2000, 0x20800, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_AGG) */
-               { 0x820e3000, 0x20c00, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_ARB) */
-               { 0x820e5000, 0x21400, 0x0800 }, /* WF_LMAC_TOP BN0 (WF_RMAC) */
-               { 0x00400000, 0x80000, 0x10000 }, /* WF_MCU_SYSRAM */
-               { 0x00410000, 0x90000, 0x10000 }, /* WF_MCU_SYSRAM (configure register) */
-               { 0x40000000, 0x70000, 0x10000 }, /* WF_UMAC_SYSRAM */
-               { 0x54000000, 0x02000, 0x1000 }, /* WFDMA PCIE0 MCU DMA0 */
-               { 0x55000000, 0x03000, 0x1000 }, /* WFDMA PCIE0 MCU DMA1 */
-               { 0x58000000, 0x06000, 0x1000 }, /* WFDMA PCIE1 MCU DMA0 (MEM_DMA) */
-               { 0x59000000, 0x07000, 0x1000 }, /* WFDMA PCIE1 MCU DMA1 */
-               { 0x7c000000, 0xf0000, 0x10000 }, /* CONN_INFRA */
-               { 0x7c020000, 0xd0000, 0x10000 }, /* CONN_INFRA, WFDMA */
-               { 0x7c060000, 0xe0000, 0x10000 }, /* CONN_INFRA, conn_host_csr_top */
-               { 0x80020000, 0xb0000, 0x10000 }, /* WF_TOP_MISC_OFF */
-               { 0x81020000, 0xc0000, 0x10000 }, /* WF_TOP_MISC_ON */
-               { 0x820c0000, 0x08000, 0x4000 }, /* WF_UMAC_TOP (PLE) */
-               { 0x820c8000, 0x0c000, 0x2000 }, /* WF_UMAC_TOP (PSE) */
-               { 0x820cc000, 0x0e000, 0x1000 }, /* WF_UMAC_TOP (PP) */
-               { 0x820cd000, 0x0f000, 0x1000 }, /* WF_MDP_TOP */
-               { 0x820ce000, 0x21c00, 0x0200 }, /* WF_LMAC_TOP (WF_SEC) */
-               { 0x820cf000, 0x22000, 0x1000 }, /* WF_LMAC_TOP (WF_PF) */
-               { 0x820e0000, 0x20000, 0x0400 }, /* WF_LMAC_TOP BN0 (WF_CFG) */
-               { 0x820e1000, 0x20400, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_TRB) */
-               { 0x820e9000, 0x23400, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_WTBLOFF) */
-               { 0x820ea000, 0x24000, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_ETBF) */
-               { 0x820ec000, 0x24600, 0x0200 }, /* WF_LMAC_TOP BN0 (WF_INT) */
-               { 0x820f0000, 0xa0000, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_CFG) */
-               { 0x820f1000, 0xa0600, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_TRB) */
-               { 0x820f2000, 0xa0800, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_AGG) */
-               { 0x820f3000, 0xa0c00, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_ARB) */
-               { 0x820f4000, 0xa1000, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_TMAC) */
-               { 0x820f5000, 0xa1400, 0x0800 }, /* WF_LMAC_TOP BN1 (WF_RMAC) */
-               { 0x820f7000, 0xa1e00, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_DMA) */
-               { 0x820f9000, 0xa3400, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_WTBLOFF) */
-               { 0x820fa000, 0xa4000, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_ETBF) */
-               { 0x820fb000, 0xa4200, 0x0400 }, /* WF_LMAC_TOP BN1 (WF_LPON) */
-               { 0x820fc000, 0xa4600, 0x0200 }, /* WF_LMAC_TOP BN1 (WF_INT) */
-               { 0x820fd000, 0xa4800, 0x0800 }, /* WF_LMAC_TOP BN1 (WF_MIB) */
-       };
-       int i;
-
-       if (addr < 0x100000)
-               return addr;
-
-       for (i = 0; i < ARRAY_SIZE(fixed_map); i++) {
-               u32 ofs;
-
-               if (addr < fixed_map[i].phys)
-                       continue;
-
-               ofs = addr - fixed_map[i].phys;
-               if (ofs > fixed_map[i].size)
-                       continue;
-
-               return fixed_map[i].mapped + ofs;
-       }
-
-       if ((addr >= 0x18000000 && addr < 0x18c00000) ||
-           (addr >= 0x70000000 && addr < 0x78000000) ||
-           (addr >= 0x7c000000 && addr < 0x7c400000))
-               return mt7921_reg_map_l1(dev, addr);
-
-       dev_err(dev->mt76.dev, "Access currently unsupported address %08x\n",
-               addr);
-
-       return 0;
-}
-
-static u32 mt7921_rr(struct mt76_dev *mdev, u32 offset)
-{
-       struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);
-       u32 addr = __mt7921_reg_addr(dev, offset);
-
-       return dev->bus_ops->rr(mdev, addr);
-}
-
-static void mt7921_wr(struct mt76_dev *mdev, u32 offset, u32 val)
-{
-       struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);
-       u32 addr = __mt7921_reg_addr(dev, offset);
-
-       dev->bus_ops->wr(mdev, addr, val);
-}
-
-static u32 mt7921_rmw(struct mt76_dev *mdev, u32 offset, u32 mask, u32 val)
-{
-       struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);
-       u32 addr = __mt7921_reg_addr(dev, offset);
-
-       return dev->bus_ops->rmw(mdev, addr, mask, val);
-}
-
 static int mt7921_dma_disable(struct mt7921_dev *dev, bool force)
 {
        if (force) {
@@ -341,23 +237,8 @@ int mt7921_wpdma_reinit_cond(struct mt7921_dev *dev)
 
 int mt7921_dma_init(struct mt7921_dev *dev)
 {
-       struct mt76_bus_ops *bus_ops;
        int ret;
 
-       dev->phy.dev = dev;
-       dev->phy.mt76 = &dev->mt76.phy;
-       dev->mt76.phy.priv = &dev->phy;
-       dev->bus_ops = dev->mt76.bus;
-       bus_ops = devm_kmemdup(dev->mt76.dev, dev->bus_ops, sizeof(*bus_ops),
-                              GFP_KERNEL);
-       if (!bus_ops)
-               return -ENOMEM;
-
-       bus_ops->rr = mt7921_rr;
-       bus_ops->wr = mt7921_wr;
-       bus_ops->rmw = mt7921_rmw;
-       dev->mt76.bus = bus_ops;
-
        mt76_dma_attach(&dev->mt76);
 
        ret = mt7921_dma_disable(dev, true);