diff options
| author | Stepan Moskovchenko <stepanm@codeaurora.org> | 2011-02-24 18:00:42 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-03-08 14:40:59 -0800 |
| commit | a43d8c101eb71bf4527dd7f36a34a5a502894f38 (patch) | |
| tree | a00145fb4f24eca3e90edacbd9f29335c53b9c3e /arch/arm/mach-msm/iommu.c | |
| parent | 2e8c8ba98376459e73d03a285f5d3406b630ea2d (diff) | |
| download | talos-op-linux-a43d8c101eb71bf4527dd7f36a34a5a502894f38.tar.gz talos-op-linux-a43d8c101eb71bf4527dd7f36a34a5a502894f38.zip | |
msm: iommu: Remove dependency on IDR
Remove the depencency on the IOMMU IDR register, as it may
not be accessible depending on the security configuraton.
This involves moving the NCB field of IDR into the platform
data.
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/iommu.c')
| -rw-r--r-- | arch/arm/mach-msm/iommu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/iommu.c b/arch/arm/mach-msm/iommu.c index 9c087405c635..0146f519e85c 100644 --- a/arch/arm/mach-msm/iommu.c +++ b/arch/arm/mach-msm/iommu.c @@ -636,7 +636,7 @@ irqreturn_t msm_iommu_fault_handler(int irq, void *dev_id) struct msm_iommu_drvdata *drvdata = dev_id; void __iomem *base; unsigned int fsr; - int ncb, i, ret; + int i, ret; spin_lock(&msm_iommu_lock); @@ -654,8 +654,7 @@ irqreturn_t msm_iommu_fault_handler(int irq, void *dev_id) if (ret) goto fail; - ncb = GET_NCB(base)+1; - for (i = 0; i < ncb; i++) { + for (i = 0; i < drvdata->ncb; i++) { fsr = GET_FSR(base, i); if (fsr) { pr_err("Fault occurred in context %d.\n", i); |
