summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-12-19 16:49:07 +1100
committerPaul Mackerras <paulus@samba.org>2006-01-09 15:05:42 +1100
commit56c8eaee65d688b526c12dca54a30276335679e5 (patch)
tree548a09c91edd507a9e8341d43edd67b215f7f9b6
parent1beb6a7d6cbed3ac03500ce9b5b9bb632c512039 (diff)
downloadop-kernel-dev-56c8eaee65d688b526c12dca54a30276335679e5.zip
op-kernel-dev-56c8eaee65d688b526c12dca54a30276335679e5.tar.gz
[PATCH] powerpc: Fix g5 DART init
The patch enabling the new G5's with U4 broke initialization of the DART driver, causing it to trigger a BUG_ON for a case that is actually valid. This patch fixes it: Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/sysdev/dart_iommu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index df0dbde..e00b46b 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -216,12 +216,12 @@ static int dart_init(struct device_node *dart_node)
base = dart_tablebase >> DART_PAGE_SHIFT;
size = dart_tablesize >> DART_PAGE_SHIFT;
if (dart_is_u4) {
- BUG_ON(size & ~DART_SIZE_U4_SIZE_MASK);
+ size &= DART_SIZE_U4_SIZE_MASK;
DART_OUT(DART_BASE_U4, base);
DART_OUT(DART_SIZE_U4, size);
DART_OUT(DART_CNTL, DART_CNTL_U4_ENABLE);
} else {
- BUG_ON(size & ~DART_CNTL_U3_SIZE_MASK);
+ size &= DART_CNTL_U3_SIZE_MASK;
DART_OUT(DART_CNTL,
DART_CNTL_U3_ENABLE |
(base << DART_CNTL_U3_BASE_SHIFT) |
OpenPOWER on IntegriCloud