Ok, no problem
Tested-by: VlaoMao <vlaomao at gmail.com>
Stefan Roese sr@denx.de 23 октября 2018 г. 13:21:52 написал:
On 23.10.18 12:19, Владислав wrote:
I checked this patch, and seems to work for me on clearfog base and silicon motion pcie video card
Thats good, thanks for checking. Could you please send a proper git "Tested-by" tag then?
Thanks, Stefan
Stefan Roese sr@denx.de 22 октября 2018 г. 15:21:20 написал:
With patch 49b23e035d96 (pci: mvebu: Increase size of PCIe default mapping) the mapping size for each PCI(e) controller was increased from 32MiB to 128MiB. This leads to problems on boards with multiple PCIe slots / ports which are unable to map all PCIe ports, e.g. the Armada-XP theadorable:
DRAM: 2 GiB (667 MHz, 64-bit, ECC not enabled) SF: Detected m25p128 with page size 256 Bytes, erase size 256 KiB, total 16 MiB Cannot add window '4:f8', conflicts with another window PCIe unable to add mbus window for mem at f0000000+08000000 Model: Marvell Armada XP theadorable
This patch moves the base address for the PCI(e) memory spaces from 0xe8000000 to the end of SDRAM (clipped to a max of 0xc0000000 right now). This gives move room and flexibility for PCI(e) mappings.
Signed-off-by: Stefan Roese sr@denx.de Cc: VlaoMao vlaomao@gmail.com
arch/arm/mach-mvebu/dram.c | 8 +++----- arch/arm/mach-mvebu/include/mach/cpu.h | 4 +++- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c index 68383d06a2..b5671b8c20 100644 --- a/arch/arm/mach-mvebu/dram.c +++ b/arch/arm/mach-mvebu/dram.c @@ -33,8 +33,6 @@ struct sdram_addr_dec { #define REG_CPUCS_WIN_WIN0_CS(x) (((x) & 0x3) << 2) #define REG_CPUCS_WIN_SIZE(x) (((x) & 0xff) << 24)
-#define SDRAM_SIZE_MAX 0xc0000000
#define SCRUB_MAGIC 0xbeefdead
#define SCRB_XOR_UNIT 0
@@ -275,8 +273,8 @@ int dram_init(void) * address space left for the internal registers etc. */ size += mvebu_sdram_bs(i);
if (size > SDRAM_SIZE_MAX)size = SDRAM_SIZE_MAX;
if (size > MVEBU_SDRAM_SIZE_MAX)size = MVEBU_SDRAM_SIZE_MAX;}
for (; i < CONFIG_NR_DRAM_BANKS; i++) {
@@ -312,7 +310,7 @@ int dram_init_banksize(void)
/* Clip the banksize to 1GiB if it exceeds the max size */ size += gd->bd->bi_dram[i].size;
if (size > SDRAM_SIZE_MAX)
if (size > MVEBU_SDRAM_SIZE_MAX) mvebu_sdram_bs_set(i, 0x40000000);diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h index d1042100a8..85d7dd1610 100644 --- a/arch/arm/mach-mvebu/include/mach/cpu.h +++ b/arch/arm/mach-mvebu/include/mach/cpu.h @@ -68,10 +68,12 @@ enum { MVEBU_SOC_UNKNOWN, };
+#define MVEBU_SDRAM_SIZE_MAX 0xc0000000
- /*
*/
- Default Device Address MAP BAR values
-#define MBUS_PCI_MEM_BASE 0xE8000000 +#define MBUS_PCI_MEM_BASE MVEBU_SDRAM_SIZE_MAX #define MBUS_PCI_MEM_SIZE (128 << 20) #define MBUS_PCI_IO_BASE 0xF1100000
#define MBUS_PCI_IO_SIZE (64 << 10)
2.19.1
Viele Grüße, Stefan
-- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de