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

Commit 56c8eaee authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 1beb6a7d

arch/powerpc/sysdev/dart_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -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) |