From ca62e05e7769c4c22920ddfcb823bb79d2d7197a Mon Sep 17 00:00:00 2001 From: Hanna Hawa Date: Wed, 27 Jun 2018 17:46:52 +0300 Subject: mvebu: mcbin: a8k: enable PCIE ECAM WA, and open PCIE window Change-Id: Id5eff2c7b481fc6e8a2e9f21dac0af20ddb1a868 Signed-off-by: Hanna Hawa Reviewed-on: http://vgitil04.il.marvell.com:8080/57434 Reviewed-by: Kostya Porotchkin Tested-by: iSoC Platform CI --- plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c | 12 +++++++----- plat/marvell/a8k/a80x0_mcbin/plat_def.h | 2 ++ plat/marvell/a8k/a80x0_mcbin/platform.mk | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c b/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c index fbe7ce9e..9296f80d 100644 --- a/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c +++ b/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c @@ -112,13 +112,15 @@ int marvell_get_io_win_memory_map(int ap_index, struct addr_map_win **win, uint3 struct addr_map_win iob_memory_map_cp0[] = { /* CP0 */ /* PEX1_X1 window */ - {0x00000000f7000000, 0x1000000, PEX1_TID}, + {0x00000000f7000000, 0x1000000, PEX1_TID}, /* PEX2_X1 window */ - {0x00000000f8000000, 0x1000000, PEX2_TID}, + {0x00000000f8000000, 0x1000000, PEX2_TID}, /* PEX0_X4 window */ - {0x00000000f6000000, 0x1000000, PEX0_TID}, - {0x00000000c0000000, 0x30000000, PEX0_TID}, - {0x0000000800000000, 0x100000000, PEX0_TID}, + {0x00000000f6000000, 0x1000000, PEX0_TID}, + {0x00000000c0000000, 0x20000000, PEX0_TID}, + {PCIE_ECAM_BASE, PCIE_ECAM_BUS0_SIZE, PEX0_TID}, + {PCIE_ECAM_BUS1_BASE, PCIE_ECAM_BUS1_SIZE, PEX0_TID}, + {0x0000000800000000, 0x100000000, PEX0_TID}, }; struct addr_map_win iob_memory_map_cp1[] = { diff --git a/plat/marvell/a8k/a80x0_mcbin/plat_def.h b/plat/marvell/a8k/a80x0_mcbin/plat_def.h index 3fb268cf..e64282e3 100644 --- a/plat/marvell/a8k/a80x0_mcbin/plat_def.h +++ b/plat/marvell/a8k/a80x0_mcbin/plat_def.h @@ -13,4 +13,6 @@ #define I2C_SPD_ADDR 0x53 /* Access SPD data */ #define I2C_SPD_P0_ADDR 0x36 /* Select SPD data page 0 */ +#define MVEBU_PCIE_ECAM_WA + #endif /* __MVEBU_DEF_H__ */ diff --git a/plat/marvell/a8k/a80x0_mcbin/platform.mk b/plat/marvell/a8k/a80x0_mcbin/platform.mk index 4c0ab006..713a34be 100644 --- a/plat/marvell/a8k/a80x0_mcbin/platform.mk +++ b/plat/marvell/a8k/a80x0_mcbin/platform.mk @@ -11,6 +11,8 @@ DOIMAGE_SEC := tools/doimage/secure/sec_img_8K.cfg MARVELL_MOCHI_DRV := drivers/marvell/mochi/apn806_setup.c +BL31_LIBS := plat/marvell/common/bl31_lib/mv_lib_ext.a + include plat/marvell/a8k/common/a8k_common.mk include plat/marvell/common/marvell_common.mk -- cgit