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

Commit 04668873 authored Aug 01, 2007 by David Howells Committed by Linus Torvalds Aug 01, 2007

FRV: Enable the MB86943 PCI arbiter correctly



Enable the MB93090 motherboard's MB86943 PCI arbiter correctly by assigning to
the register rather than comparing against it.  This is required to support
bus mastering.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent b5625481

arch/frv/mb93090-mb00/pci-vdk.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -400,7 +400,8 @@ int __init pcibios_init(void)
	__reg_MB86943_pci_sl_mem_base = __region_CS2 + 0x08000000;		__reg_MB86943_pci_sl_mem_base = __region_CS2 + 0x08000000;
	mb();		mb();

	(volatile unsigned long )(__region_CS2+0x01300014) == 1;		/* enable PCI arbitration */
			__reg_MB86943_pci_arbiter = MB86943_PCIARB_EN;

	ioport_resource.start = (__reg_MB86943_sl_pci_io_base << 9) & 0xfffffc00;		ioport_resource.start = (__reg_MB86943_sl_pci_io_base << 9) & 0xfffffc00;
	ioport_resource.end = (__reg_MB86943_sl_pci_io_range << 9) \| 0x3ff;		ioport_resource.end = (__reg_MB86943_sl_pci_io_range << 9) \| 0x3ff;

include/asm-frv/mb86943a.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,4 +36,7 @@
	#define __reg_MB86943_pci_sl_io_base (volatile uint32_t ) (__region_CS1 + 0x70)		#define __reg_MB86943_pci_sl_io_base (volatile uint32_t ) (__region_CS1 + 0x70)
	#define __reg_MB86943_pci_sl_mem_base (volatile uint32_t ) (__region_CS1 + 0x78)		#define __reg_MB86943_pci_sl_mem_base (volatile uint32_t ) (__region_CS1 + 0x78)

			#define __reg_MB86943_pci_arbiter (volatile uint32_t ) (__region_CS2 + 0x01300014)
			#define MB86943_PCIARB_EN 0x00000001

	#endif /* _ASM_MB86943A_H */		#endif /* _ASM_MB86943A_H */