mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
[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>
This commit is contained in:
parent
1beb6a7d6c
commit
56c8eaee65
1 changed files with 2 additions and 2 deletions
|
@ -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) |
|
||||
|
|
Loading…
Reference in a new issue