Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9467d95 authored by Yong Wu's avatar Yong Wu Committed by Joerg Roedel
Browse files

iommu/mediatek: Move MTK_M4U_TO_LARB/PORT into mtk_iommu.c 



The definition of MTK_M4U_TO_LARB and MTK_M4U_TO_PORT are shared by
all the gen2 M4U HWs. Thus, Move them out from mt8173-larb-port.h,
and put them into the c file.

Suggested-by: default avatarHonghui Zhang <honghui.zhang@mediatek.com>
Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 894901b5

drivers/iommu/mtk_iommu.c

+7 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/slab.h>

#include <linux/spinlock.h>

#include <asm/barrier.h>

#include <dt-bindings/memory/mt8173-larb-port.h>

#include <soc/mediatek/smi.h>



#include "mtk_iommu.h"
@@ -93,6 +92,13 @@ 


#define MTK_PROTECT_PA_ALIGN			128



/*

 * Get the local arbiter ID and the portid within the larb arbiter

 * from mtk_m4u_id which is defined by MTK_M4U_ID.

 */

#define MTK_M4U_TO_LARB(id)		(((id) >> 5) & 0x7)

#define MTK_M4U_TO_PORT(id)		((id) & 0x1f)



struct mtk_iommu_domain {

	spinlock_t			pgtlock; /* lock for page table */

include/dt-bindings/memory/mt8173-larb-port.h

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
#define __DTS_IOMMU_PORT_MT8173_H



#define MTK_M4U_ID(larb, port)		(((larb) << 5) | (port))

/* Local arbiter ID */

#define MTK_M4U_TO_LARB(id)		(((id) >> 5) & 0x7)

/* PortID within the local arbiter */

#define MTK_M4U_TO_PORT(id)		((id) & 0x1f)



#define M4U_LARB0_ID			0

#define M4U_LARB1_ID			1