Commit 5b9eda33 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Dan Williams
Browse files

iop3xx: ATU and PCI memory configuration corrected 



There are two 64 MB outbound memory windows at bus addresses
0x80000000..0x83ffffff and 0x84000000..0x87ffffff for PCI
memory. Currently, on iop32x, only the lower window is available for
allocations, limiting the available space to 64 MB. On iop33x the full
128 MB can be allocated, but the translation value is wrong for the
upper window.

The patch enables the full 128 MB space on iop32x and corrects the
initialization of OMWTVR1. Redundant definitions are deleted. Tested
using a Thecus N2100 board with a graphics adapter in the expansion
slot. Both windows are in use:

  00:05.0 VGA compatible controller: XGI Technology Inc. (eXtreme Graphics
  Innovation) Volari Z7 (prog-if 00 [VGA controller])
  [...]
	Region 0: Memory at 80000000 (32-bit, prefetchable) [size=64M]
	Region 1: Memory at 84080000 (32-bit, non-prefetchable) [size=256K]

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 9e2a7e6f

arch/arm/include/asm/hardware/iop3xx.h

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ extern int iop3xx_get_init_atu(void); 
 * IOP3XX I/O and Mem space regions for PCI autoconfiguration

 */

#define IOP3XX_PCI_LOWER_MEM_PA	0x80000000

#define IOP3XX_PCI_MEM_WINDOW_SIZE	0x08000000



#define IOP3XX_PCI_IO_WINDOW_SIZE	0x00010000

#define IOP3XX_PCI_LOWER_IO_PA		0x90000000

arch/arm/mach-iop32x/include/mach/iop32x.h

+0 −2
Original line number Diff line number Diff line
@@ -31,7 +31,5 @@ 
#define IOP32X_MAX_RAM_SIZE            0x40000000UL

#define IOP3XX_MAX_RAM_SIZE            IOP32X_MAX_RAM_SIZE

#define IOP3XX_PCI_LOWER_MEM_BA        0x80000000

#define IOP32X_PCI_MEM_WINDOW_SIZE     0x04000000

#define IOP3XX_PCI_MEM_WINDOW_SIZE     IOP32X_PCI_MEM_WINDOW_SIZE



#endif

arch/arm/mach-iop33x/include/mach/iop33x.h

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#define IOP33X_MAX_RAM_SIZE		0x80000000UL

#define IOP3XX_MAX_RAM_SIZE		IOP33X_MAX_RAM_SIZE

#define IOP3XX_PCI_LOWER_MEM_BA	(PHYS_OFFSET + IOP33X_MAX_RAM_SIZE)

#define IOP33X_PCI_MEM_WINDOW_SIZE	0x08000000

#define IOP3XX_PCI_MEM_WINDOW_SIZE	IOP33X_PCI_MEM_WINDOW_SIZE





#endif

arch/arm/plat-iop/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ void __init iop3xx_atu_setup(void) 
	*IOP3XX_OUMWTVR0 = 0;



	/* Outbound window 1 */

	*IOP3XX_OMWTVR1 = IOP3XX_PCI_LOWER_MEM_BA + IOP3XX_PCI_MEM_WINDOW_SIZE;

	*IOP3XX_OMWTVR1 = IOP3XX_PCI_LOWER_MEM_BA +

			  IOP3XX_PCI_MEM_WINDOW_SIZE / 2;

	*IOP3XX_OUMWTVR1 = 0;



	/* BAR 3 ( Disabled ) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE