lkml.org 
[lkml]   [2020]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 18/24] iommu/mediatek: Support master use iova over 32bit
    Date
    After extending v7s, our pagetable already support iova reach
    16GB(34bit). the master got the iova via dma_alloc_attrs may reach
    34bits, but its HW register still is 32bit. then how to set the
    bit32/bit33 iova? this depend on a SMI larb setting(bank_sel).

    we separate whole 16GB iova to four banks:
    bank: 0: 0~4G; 1: 4~8G; 2: 8-12G; 3: 12-16G;
    The bank number is (iova >> 32).

    We will preassign which bank the larbs belong to. currently we don't
    have a interface for master to adjust its bank number.

    Each a bank is a iova_region which is a independent iommu-domain.
    the iova range for each iommu-domain can't cross 4G.

    Signed-off-by: Yong Wu <yong.wu@mediatek.com>
    Acked-by: Krzysztof Kozlowski <krzk@kernel.org> # memory part
    ---
    drivers/iommu/mtk_iommu.c | 12 +++++++++---
    drivers/memory/mtk-smi.c | 7 +++++++
    include/soc/mediatek/smi.h | 1 +
    3 files changed, 17 insertions(+), 3 deletions(-)

    diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
    index a7727a3899d1..46c9143703a9 100644
    --- a/drivers/iommu/mtk_iommu.c
    +++ b/drivers/iommu/mtk_iommu.c
    @@ -308,17 +308,23 @@ static void mtk_iommu_config(struct mtk_iommu_data *data,
    struct device *dev, bool enable)
    {
    struct mtk_smi_larb_iommu *larb_mmu;
    - unsigned int larbid, portid;
    + unsigned int larbid, portid, domid;
    struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
    + const struct mtk_iommu_iova_region *region;
    int i;

    for (i = 0; i < fwspec->num_ids; ++i) {
    larbid = MTK_M4U_TO_LARB(fwspec->ids[i]);
    portid = MTK_M4U_TO_PORT(fwspec->ids[i]);
    + domid = MTK_M4U_TO_DOM(fwspec->ids[i]);
    +
    larb_mmu = &data->larb_imu[larbid];
    + region = data->plat_data->iova_region + domid;
    + larb_mmu->bank[portid] = upper_32_bits(region->iova_base);

    - dev_dbg(dev, "%s iommu port: %d\n",
    - enable ? "enable" : "disable", portid);
    + dev_dbg(dev, "%s iommu for larb(%s) port %d dom %d bank %d.\n",
    + enable ? "enable" : "disable", dev_name(larb_mmu->dev),
    + portid, domid, larb_mmu->bank[portid]);

    if (enable)
    larb_mmu->mmu |= MTK_SMI_MMU_EN(portid);
    diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
    index a02ce091005d..935b72d60e9c 100644
    --- a/drivers/memory/mtk-smi.c
    +++ b/drivers/memory/mtk-smi.c
    @@ -44,6 +44,10 @@
    /* mt2712 */
    #define SMI_LARB_NONSEC_CON(id) (0x380 + ((id) * 4))
    #define F_MMU_EN BIT(0)
    +#define BANK_SEL(id) ({ \
    + u32 _id = (id) & 0x3; \
    + (_id << 8 | _id << 10 | _id << 12 | _id << 14); \
    +})

    /* SMI COMMON */
    #define SMI_BUS_SEL 0x220
    @@ -88,6 +92,7 @@ struct mtk_smi_larb { /* larb: local arbiter */
    const struct mtk_smi_larb_gen *larb_gen;
    int larbid;
    u32 *mmu;
    + unsigned char *bank;
    };

    static int mtk_smi_clk_enable(const struct mtk_smi *smi)
    @@ -154,6 +159,7 @@ mtk_smi_larb_bind(struct device *dev, struct device *master, void *data)
    if (dev == larb_mmu[i].dev) {
    larb->larbid = i;
    larb->mmu = &larb_mmu[i].mmu;
    + larb->bank = larb_mmu[i].bank;
    return 0;
    }
    }
    @@ -172,6 +178,7 @@ static void mtk_smi_larb_config_port_gen2_general(struct device *dev)
    for_each_set_bit(i, (unsigned long *)larb->mmu, 32) {
    reg = readl_relaxed(larb->base + SMI_LARB_NONSEC_CON(i));
    reg |= F_MMU_EN;
    + reg |= BANK_SEL(larb->bank[i]);
    writel(reg, larb->base + SMI_LARB_NONSEC_CON(i));
    }
    }
    diff --git a/include/soc/mediatek/smi.h b/include/soc/mediatek/smi.h
    index 9371bf572ab8..4cf445dbbdaa 100644
    --- a/include/soc/mediatek/smi.h
    +++ b/include/soc/mediatek/smi.h
    @@ -16,6 +16,7 @@
    struct mtk_smi_larb_iommu {
    struct device *dev;
    unsigned int mmu;
    + unsigned char bank[32];
    };

    /*
    --
    2.18.0
    \
     
     \ /
      Last update: 2020-11-11 13:41    [W:3.783 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site