msm: kgsl: Change the prototype of MMU function pointers
Change the prototype of the MMU function pointers to take the mmu
pointer as an argument instead of the device pointer.
Change-Id: I4ecafefcc8f755c23dac6e3a15a1a74a74e3db00
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
diff --git a/drivers/gpu/msm/adreno_ringbuffer.c b/drivers/gpu/msm/adreno_ringbuffer.c
index f6d3cad..a992059 100644
--- a/drivers/gpu/msm/adreno_ringbuffer.c
+++ b/drivers/gpu/msm/adreno_ringbuffer.c
@@ -857,7 +857,7 @@
*cmds++ = cp_nop_packet(1);
*cmds++ = KGSL_END_OF_IB_IDENTIFIER;
- kgsl_setstate(device,
+ kgsl_setstate(&device->mmu,
kgsl_mmu_pt_get_flags(device->mmu.hwpagetable,
device->id));
diff --git a/drivers/gpu/msm/kgsl_gpummu.c b/drivers/gpu/msm/kgsl_gpummu.c
index 65bcb09..1d80a30 100644
--- a/drivers/gpu/msm/kgsl_gpummu.c
+++ b/drivers/gpu/msm/kgsl_gpummu.c
@@ -397,15 +397,15 @@
return baseptr[pte] & GSL_PT_PAGE_ADDR_MASK;
}
-static void kgsl_gpummu_pagefault(struct kgsl_device *device)
+static void kgsl_gpummu_pagefault(struct kgsl_mmu *mmu)
{
unsigned int reg;
unsigned int ptbase;
- kgsl_regread(device, MH_MMU_PAGE_FAULT, ®);
- kgsl_regread(device, MH_MMU_PT_BASE, &ptbase);
+ kgsl_regread(mmu->device, MH_MMU_PAGE_FAULT, ®);
+ kgsl_regread(mmu->device, MH_MMU_PT_BASE, &ptbase);
- KGSL_MEM_CRIT(device,
+ KGSL_MEM_CRIT(mmu->device,
"mmu page fault: page=0x%lx pt=%d op=%s axi=%d\n",
reg & ~(PAGE_SIZE - 1),
kgsl_mmu_get_ptname_from_ptbase(ptbase),
@@ -460,7 +460,7 @@
return NULL;
}
-static void kgsl_gpummu_default_setstate(struct kgsl_device *device,
+static void kgsl_gpummu_default_setstate(struct kgsl_mmu *mmu,
uint32_t flags)
{
struct kgsl_gpummu_pt *gpummu_pt;
@@ -468,23 +468,21 @@
return;
if (flags & KGSL_MMUFLAGS_PTUPDATE) {
- kgsl_idle(device, KGSL_TIMEOUT_DEFAULT);
- gpummu_pt = device->mmu.hwpagetable->priv;
- kgsl_regwrite(device, MH_MMU_PT_BASE,
+ kgsl_idle(mmu->device, KGSL_TIMEOUT_DEFAULT);
+ gpummu_pt = mmu->hwpagetable->priv;
+ kgsl_regwrite(mmu->device, MH_MMU_PT_BASE,
gpummu_pt->base.gpuaddr);
}
if (flags & KGSL_MMUFLAGS_TLBFLUSH) {
/* Invalidate all and tc */
- kgsl_regwrite(device, MH_MMU_INVALIDATE, 0x00000003);
+ kgsl_regwrite(mmu->device, MH_MMU_INVALIDATE, 0x00000003);
}
}
-static void kgsl_gpummu_setstate(struct kgsl_device *device,
+static void kgsl_gpummu_setstate(struct kgsl_mmu *mmu,
struct kgsl_pagetable *pagetable)
{
- struct kgsl_mmu *mmu = &device->mmu;
-
if (mmu->flags & KGSL_FLAGS_STARTED) {
/* page table not current, then setup mmu to use new
* specified page table
@@ -497,13 +495,13 @@
kgsl_mmu_pt_get_flags(pagetable, mmu->device->id);
/* call device specific set page table */
- kgsl_setstate(mmu->device, KGSL_MMUFLAGS_TLBFLUSH |
+ kgsl_setstate(mmu, KGSL_MMUFLAGS_TLBFLUSH |
KGSL_MMUFLAGS_PTUPDATE);
}
}
}
-static int kgsl_gpummu_init(struct kgsl_device *device)
+static int kgsl_gpummu_init(struct kgsl_mmu *mmu)
{
/*
* intialize device mmu
@@ -511,9 +509,6 @@
* call this with the global lock held
*/
int status = 0;
- struct kgsl_mmu *mmu = &device->mmu;
-
- mmu->device = device;
/* sub-client MMU lookups require address translation */
if ((mmu->config & ~0x1) > 0) {
@@ -533,12 +528,12 @@
mmu->setstate_memory.size);
}
- dev_info(device->dev, "|%s| MMU type set for device is GPUMMU\n",
+ dev_info(mmu->device->dev, "|%s| MMU type set for device is GPUMMU\n",
__func__);
return status;
}
-static int kgsl_gpummu_start(struct kgsl_device *device)
+static int kgsl_gpummu_start(struct kgsl_mmu *mmu)
{
/*
* intialize device mmu
@@ -546,7 +541,7 @@
* call this with the global lock held
*/
- struct kgsl_mmu *mmu = &device->mmu;
+ struct kgsl_device *device = mmu->device;
struct kgsl_gpummu_pt *gpummu_pt;
if (mmu->flags & KGSL_FLAGS_STARTED)
@@ -587,12 +582,12 @@
mmu->hwpagetable = mmu->defaultpagetable;
gpummu_pt = mmu->hwpagetable->priv;
- kgsl_regwrite(device, MH_MMU_PT_BASE,
+ kgsl_regwrite(mmu->device, MH_MMU_PT_BASE,
gpummu_pt->base.gpuaddr);
- kgsl_regwrite(device, MH_MMU_VA_RANGE,
+ kgsl_regwrite(mmu->device, MH_MMU_VA_RANGE,
(KGSL_PAGETABLE_BASE |
(CONFIG_MSM_KGSL_PAGE_TABLE_SIZE >> 16)));
- kgsl_setstate(device, KGSL_MMUFLAGS_TLBFLUSH);
+ kgsl_setstate(mmu, KGSL_MMUFLAGS_TLBFLUSH);
mmu->flags |= KGSL_FLAGS_STARTED;
return 0;
@@ -691,25 +686,21 @@
return 0;
}
-static int kgsl_gpummu_stop(struct kgsl_device *device)
+static int kgsl_gpummu_stop(struct kgsl_mmu *mmu)
{
- struct kgsl_mmu *mmu = &device->mmu;
-
- kgsl_regwrite(device, MH_MMU_CONFIG, 0x00000000);
+ kgsl_regwrite(mmu->device, MH_MMU_CONFIG, 0x00000000);
mmu->flags &= ~KGSL_FLAGS_STARTED;
return 0;
}
-static int kgsl_gpummu_close(struct kgsl_device *device)
+static int kgsl_gpummu_close(struct kgsl_mmu *mmu)
{
/*
* close device mmu
*
* call this with the global lock held
*/
- struct kgsl_mmu *mmu = &device->mmu;
-
if (mmu->setstate_memory.gpuaddr)
kgsl_sharedmem_free(&mmu->setstate_memory);
@@ -720,10 +711,10 @@
}
static unsigned int
-kgsl_gpummu_get_current_ptbase(struct kgsl_device *device)
+kgsl_gpummu_get_current_ptbase(struct kgsl_mmu *mmu)
{
unsigned int ptbase;
- kgsl_regread(device, MH_MMU_PT_BASE, &ptbase);
+ kgsl_regread(mmu->device, MH_MMU_PT_BASE, &ptbase);
return ptbase;
}
diff --git a/drivers/gpu/msm/kgsl_iommu.c b/drivers/gpu/msm/kgsl_iommu.c
index b7f7b0a..bf2a4ee 100644
--- a/drivers/gpu/msm/kgsl_iommu.c
+++ b/drivers/gpu/msm/kgsl_iommu.c
@@ -166,17 +166,15 @@
return ret;
}
-static void kgsl_iommu_setstate(struct kgsl_device *device,
+static void kgsl_iommu_setstate(struct kgsl_mmu *mmu,
struct kgsl_pagetable *pagetable)
{
- struct kgsl_mmu *mmu = &device->mmu;
-
if (mmu->flags & KGSL_FLAGS_STARTED) {
/* page table not current, then setup mmu to use new
* specified page table
*/
if (mmu->hwpagetable != pagetable) {
- kgsl_idle(device, KGSL_TIMEOUT_DEFAULT);
+ kgsl_idle(mmu->device, KGSL_TIMEOUT_DEFAULT);
kgsl_detach_pagetable_iommu_domain(mmu);
mmu->hwpagetable = pagetable;
if (mmu->hwpagetable)
@@ -185,7 +183,7 @@
}
}
-static int kgsl_iommu_init(struct kgsl_device *device)
+static int kgsl_iommu_init(struct kgsl_mmu *mmu)
{
/*
* intialize device mmu
@@ -193,11 +191,8 @@
* call this with the global lock held
*/
int status = 0;
- struct kgsl_mmu *mmu = &device->mmu;
struct kgsl_iommu *iommu;
- mmu->device = device;
-
iommu = kzalloc(sizeof(struct kgsl_iommu), GFP_KERNEL);
if (!iommu) {
KGSL_CORE_ERR("kzalloc(%d) failed\n",
@@ -205,27 +200,26 @@
return -ENOMEM;
}
- status = kgsl_get_iommu_ctxt(iommu, device);
+ status = kgsl_get_iommu_ctxt(iommu, mmu->device);
if (status) {
kfree(iommu);
iommu = NULL;
}
mmu->priv = iommu;
- dev_info(device->dev, "|%s| MMU type set for device is IOMMU\n",
+ dev_info(mmu->device->dev, "|%s| MMU type set for device is IOMMU\n",
__func__);
return status;
}
-static int kgsl_iommu_start(struct kgsl_device *device)
+static int kgsl_iommu_start(struct kgsl_mmu *mmu)
{
int status;
- struct kgsl_mmu *mmu = &device->mmu;
if (mmu->flags & KGSL_FLAGS_STARTED)
return 0;
- kgsl_regwrite(device, MH_MMU_CONFIG, 0x00000000);
+ kgsl_regwrite(mmu->device, MH_MMU_CONFIG, 0x00000000);
if (mmu->defaultpagetable == NULL)
mmu->defaultpagetable =
kgsl_mmu_getpagetable(KGSL_MMU_GLOBAL_PT);
@@ -304,14 +298,13 @@
return ret;
}
-static int kgsl_iommu_stop(struct kgsl_device *device)
+static int kgsl_iommu_stop(struct kgsl_mmu *mmu)
{
/*
* stop device mmu
*
* call this with the global lock held
*/
- struct kgsl_mmu *mmu = &device->mmu;
if (mmu->flags & KGSL_FLAGS_STARTED) {
/* detach iommu attachment */
@@ -323,9 +316,8 @@
return 0;
}
-static int kgsl_iommu_close(struct kgsl_device *device)
+static int kgsl_iommu_close(struct kgsl_mmu *mmu)
{
- struct kgsl_mmu *mmu = &device->mmu;
if (mmu->defaultpagetable)
kgsl_mmu_putpagetable(mmu->defaultpagetable);
@@ -333,13 +325,13 @@
}
static unsigned int
-kgsl_iommu_get_current_ptbase(struct kgsl_device *device)
+kgsl_iommu_get_current_ptbase(struct kgsl_mmu *mmu)
{
/* Current base is always the hwpagetables domain as we
* do not use per process pagetables right not for iommu.
* This will change when we switch to per process pagetables.
*/
- return (unsigned int)device->mmu.hwpagetable->priv;
+ return (unsigned int)mmu->hwpagetable->priv;
}
struct kgsl_mmu_ops iommu_ops = {
diff --git a/drivers/gpu/msm/kgsl_mmu.c b/drivers/gpu/msm/kgsl_mmu.c
index 323c992..2b359ec 100644
--- a/drivers/gpu/msm/kgsl_mmu.c
+++ b/drivers/gpu/msm/kgsl_mmu.c
@@ -328,7 +328,7 @@
if (KGSL_MMU_TYPE_NONE == kgsl_mmu_type)
return 0;
else
- return mmu->mmu_ops->mmu_get_current_ptbase(device);
+ return mmu->mmu_ops->mmu_get_current_ptbase(mmu);
}
EXPORT_SYMBOL(kgsl_mmu_get_current_ptbase);
@@ -359,7 +359,7 @@
if (KGSL_MMU_TYPE_NONE == kgsl_mmu_type)
return;
else
- mmu->mmu_ops->mmu_setstate(device,
+ mmu->mmu_ops->mmu_setstate(mmu,
pagetable);
}
EXPORT_SYMBOL(kgsl_mmu_setstate);
@@ -385,7 +385,7 @@
else if (KGSL_MMU_TYPE_IOMMU == kgsl_mmu_type)
mmu->mmu_ops = &iommu_ops;
- return mmu->mmu_ops->mmu_init(device);
+ return mmu->mmu_ops->mmu_init(mmu);
}
EXPORT_SYMBOL(kgsl_mmu_init);
@@ -400,7 +400,7 @@
kgsl_setup_pt(NULL);
return 0;
} else {
- return mmu->mmu_ops->mmu_start(device);
+ return mmu->mmu_ops->mmu_start(mmu);
}
}
EXPORT_SYMBOL(kgsl_mmu_start);
@@ -418,7 +418,7 @@
if (status & MH_INTERRUPT_MASK__AXI_WRITE_ERROR)
KGSL_MEM_CRIT(device, "axi write error interrupt: %08x\n", reg);
if (status & MH_INTERRUPT_MASK__MMU_PAGE_FAULT)
- device->mmu.mmu_ops->mmu_pagefault(device);
+ device->mmu.mmu_ops->mmu_pagefault(&device->mmu);
status &= KGSL_MMU_INT_MASK;
kgsl_regwrite(device, MH_INTERRUPT_CLEAR, status);
@@ -543,15 +543,15 @@
}
EXPORT_SYMBOL(kgsl_mmu_putpagetable);
-void kgsl_setstate(struct kgsl_device *device, uint32_t flags)
+void kgsl_setstate(struct kgsl_mmu *mmu, uint32_t flags)
{
- struct kgsl_mmu *mmu = &device->mmu;
+ struct kgsl_device *device = mmu->device;
if (KGSL_MMU_TYPE_NONE == kgsl_mmu_type)
return;
else if (device->ftbl->setstate)
device->ftbl->setstate(device, flags);
else if (mmu->mmu_ops->mmu_device_setstate)
- mmu->mmu_ops->mmu_device_setstate(device, flags);
+ mmu->mmu_ops->mmu_device_setstate(mmu, flags);
}
EXPORT_SYMBOL(kgsl_setstate);
@@ -561,7 +561,7 @@
if (KGSL_MMU_TYPE_NONE == kgsl_mmu_type)
return;
else if (mmu->mmu_ops->mmu_device_setstate)
- mmu->mmu_ops->mmu_device_setstate(device, flags);
+ mmu->mmu_ops->mmu_device_setstate(mmu, flags);
}
EXPORT_SYMBOL(kgsl_mmu_device_setstate);
@@ -753,7 +753,7 @@
if (kgsl_mmu_type == KGSL_MMU_TYPE_NONE)
return 0;
else
- return mmu->mmu_ops->mmu_stop(device);
+ return mmu->mmu_ops->mmu_stop(mmu);
}
EXPORT_SYMBOL(kgsl_mmu_stop);
@@ -764,8 +764,9 @@
if (kgsl_mmu_type == KGSL_MMU_TYPE_NONE) {
kgsl_sharedmem_free(&mmu->setstate_memory);
return 0;
- } else
- return mmu->mmu_ops->mmu_close(device);
+ } else {
+ return mmu->mmu_ops->mmu_close(mmu);
+ }
}
EXPORT_SYMBOL(kgsl_mmu_close);
diff --git a/drivers/gpu/msm/kgsl_mmu.h b/drivers/gpu/msm/kgsl_mmu.h
index 63ecdd6..e35f368 100644
--- a/drivers/gpu/msm/kgsl_mmu.h
+++ b/drivers/gpu/msm/kgsl_mmu.h
@@ -116,18 +116,20 @@
void *priv;
};
+struct kgsl_mmu;
+
struct kgsl_mmu_ops {
- int (*mmu_init) (struct kgsl_device *device);
- int (*mmu_close) (struct kgsl_device *device);
- int (*mmu_start) (struct kgsl_device *device);
- int (*mmu_stop) (struct kgsl_device *device);
- void (*mmu_setstate) (struct kgsl_device *device,
+ int (*mmu_init) (struct kgsl_mmu *mmu);
+ int (*mmu_close) (struct kgsl_mmu *mmu);
+ int (*mmu_start) (struct kgsl_mmu *mmu);
+ int (*mmu_stop) (struct kgsl_mmu *mmu);
+ void (*mmu_setstate) (struct kgsl_mmu *mmu,
struct kgsl_pagetable *pagetable);
- void (*mmu_device_setstate) (struct kgsl_device *device,
+ void (*mmu_device_setstate) (struct kgsl_mmu *mmu,
uint32_t flags);
- void (*mmu_pagefault) (struct kgsl_device *device);
+ void (*mmu_pagefault) (struct kgsl_mmu *mmu);
unsigned int (*mmu_get_current_ptbase)
- (struct kgsl_device *device);
+ (struct kgsl_mmu *mmu);
};
struct kgsl_mmu_pt_ops {
@@ -177,7 +179,7 @@
int kgsl_mmu_unmap(struct kgsl_pagetable *pagetable,
struct kgsl_memdesc *memdesc);
unsigned int kgsl_virtaddr_to_physaddr(void *virtaddr);
-void kgsl_setstate(struct kgsl_device *device, uint32_t flags);
+void kgsl_setstate(struct kgsl_mmu *mmu, uint32_t flags);
void kgsl_mmu_device_setstate(struct kgsl_device *device, uint32_t flags);
void kgsl_mmu_setstate(struct kgsl_device *device,
struct kgsl_pagetable *pt);
diff --git a/drivers/gpu/msm/z180.c b/drivers/gpu/msm/z180.c
index 5902361..3ca9e18 100644
--- a/drivers/gpu/msm/z180.c
+++ b/drivers/gpu/msm/z180.c
@@ -468,8 +468,9 @@
cnt = PACKETSIZE_STATESTREAM;
ofs = 0;
}
- kgsl_setstate(device, kgsl_mmu_pt_get_flags(device->mmu.hwpagetable,
- device->id));
+ kgsl_setstate(&device->mmu,
+ kgsl_mmu_pt_get_flags(device->mmu.hwpagetable,
+ device->id));
result = wait_event_interruptible_timeout(device->wait_queue,
room_in_rb(z180_dev),
@@ -881,7 +882,7 @@
if (z180_dev->ringbuffer.prevctx == context->id) {
z180_dev->ringbuffer.prevctx = Z180_INVALID_CONTEXT;
device->mmu.hwpagetable = device->mmu.defaultpagetable;
- kgsl_setstate(device, KGSL_MMUFLAGS_PTUPDATE);
+ kgsl_setstate(&device->mmu, KGSL_MMUFLAGS_PTUPDATE);
}
}