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

Commit 59a8f6e9 authored by Rob Herring's avatar Rob Herring Committed by Mark Salyzyn
Browse files

UPSTREAM: iommu: Allow io-pgtable to be used outside of drivers/iommu/ 



Move io-pgtable.h to include/linux/ and export alloc_io_pgtable_ops
and free_io_pgtable_ops. This enables drivers outside drivers/iommu/ to
use the page table library. Specifically, some ARM Mali GPUs use the
ARM page table formats.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: iommu@lists.linux-foundation.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-arm-msm@vger.kernel.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>

(cherry picked from commit b77cf11f094136a9d7d0ee6a56cf49db1f412871)
Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Bug: 145919068
Change-Id: I09a0d1a83bd4788297d36cbee248119252452d4c
parent d1210240

drivers/iommu/arm-smmu-v3.c

+1 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/dma-iommu.h>

#include <linux/err.h>

#include <linux/interrupt.h>

#include <linux/io-pgtable.h>

#include <linux/iommu.h>

#include <linux/iopoll.h>

#include <linux/module.h>
@@ -42,8 +43,6 @@ 


#include <linux/amba/bus.h>



#include "io-pgtable.h"



/* MMIO registers */

#define ARM_SMMU_IDR0			0x0

#define IDR0_ST_LVL			GENMASK(28, 27)

drivers/iommu/arm-smmu.c

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

#include <linux/io.h>

#include <linux/io-64-nonatomic-hi-lo.h>

#include <linux/io-pgtable.h>

#include <linux/iommu.h>

#include <linux/iopoll.h>

#include <linux/module.h>
@@ -53,7 +54,6 @@ 


#include <linux/amba/bus.h>



#include "io-pgtable.h"

#include "arm-smmu-regs.h"



/*

drivers/iommu/io-pgtable-arm-v7s.c

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

#include <linux/dma-mapping.h>

#include <linux/gfp.h>

#include <linux/io-pgtable.h>

#include <linux/iommu.h>

#include <linux/kernel.h>

#include <linux/kmemleak.h>
@@ -45,8 +46,6 @@ 


#include <asm/barrier.h>



#include "io-pgtable.h"



/* Struct accessors */

#define io_pgtable_to_data(x)						\

	container_of((x), struct arm_v7s_io_pgtable, iop)

drivers/iommu/io-pgtable-arm.c

+1 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include <linux/atomic.h>

#include <linux/bitops.h>

#include <linux/io-pgtable.h>

#include <linux/iommu.h>

#include <linux/kernel.h>

#include <linux/sizes.h>
@@ -31,8 +32,6 @@ 


#include <asm/barrier.h>



#include "io-pgtable.h"



#define ARM_LPAE_MAX_ADDR_BITS		52

#define ARM_LPAE_S2_MAX_CONCAT_PAGES	16

#define ARM_LPAE_MAX_LEVELS		4

drivers/iommu/io-pgtable.c

+3 −2
Original line number Diff line number Diff line
@@ -19,11 +19,10 @@ 
 */



#include <linux/bug.h>

#include <linux/io-pgtable.h>

#include <linux/kernel.h>

#include <linux/types.h>



#include "io-pgtable.h"



static const struct io_pgtable_init_fns *

io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] = {

#ifdef CONFIG_IOMMU_IO_PGTABLE_LPAE
@@ -61,6 +60,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt, 


	return &iop->ops;

}

EXPORT_SYMBOL_GPL(alloc_io_pgtable_ops);



/*

 * It is the IOMMU driver's responsibility to ensure that the page table
@@ -77,3 +77,4 @@ void free_io_pgtable_ops(struct io_pgtable_ops *ops) 
	io_pgtable_tlb_flush_all(iop);

	io_pgtable_init_table[iop->fmt]->free(iop);

}

EXPORT_SYMBOL_GPL(free_io_pgtable_ops);