diff options
| author | ian <ian@FreeBSD.org> | 2015-01-16 19:49:10 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2015-01-16 19:49:10 +0000 |
| commit | 211452886a83483db5640afcf58bbd9c1a2d78e8 (patch) | |
| tree | 2c73442be1b03200337dd5da456d027ff85fe520 | |
| parent | ce3bcc13cb3cd244fe97f19d5801ee86bc57f41e (diff) | |
| download | FreeBSD-src-211452886a83483db5640afcf58bbd9c1a2d78e8.zip FreeBSD-src-211452886a83483db5640afcf58bbd9c1a2d78e8.tar.gz | |
Enable the snoop control unit during MP startup, rather than relying on
the bootloader to have done so.
Submitted by: Thomas Skibo <thomasskibo@sbcglobal.net>
| -rw-r--r-- | sys/arm/xilinx/zy7_mp.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/sys/arm/xilinx/zy7_mp.c b/sys/arm/xilinx/zy7_mp.c index ecb1844..b6a540f 100644 --- a/sys/arm/xilinx/zy7_mp.c +++ b/sys/arm/xilinx/zy7_mp.c @@ -39,6 +39,9 @@ __FBSDID("$FreeBSD$"); #define ZYNQ7_CPU1_ENTRY 0xfffffff0 +#define SCU_CONTROL_REG 0xf8f00000 +#define SCU_CONTROL_ENABLE (1 << 0) + void platform_mp_init_secondary(void) { @@ -64,7 +67,21 @@ platform_mp_probe(void) void platform_mp_start_ap(void) { + bus_space_handle_t scu_handle; bus_space_handle_t ocm_handle; + uint32_t scu_ctrl; + + /* Map in SCU control register. */ + if (bus_space_map(fdtbus_bs_tag, SCU_CONTROL_REG, 4, + 0, &scu_handle) != 0) + panic("platform_mp_start_ap: Couldn't map SCU config reg\n"); + + /* Set SCU enable bit. */ + scu_ctrl = bus_space_read_4(fdtbus_bs_tag, scu_handle, 0); + scu_ctrl |= SCU_CONTROL_ENABLE; + bus_space_write_4(fdtbus_bs_tag, scu_handle, 0, scu_ctrl); + + bus_space_unmap(fdtbus_bs_tag, scu_handle, 4); /* Map in magic location to give entry address to CPU1. */ if (bus_space_map(fdtbus_bs_tag, ZYNQ7_CPU1_ENTRY, 4, @@ -75,8 +92,10 @@ platform_mp_start_ap(void) bus_space_write_4(fdtbus_bs_tag, ocm_handle, 0, pmap_kextract((vm_offset_t)mpentry)); + bus_space_unmap(fdtbus_bs_tag, ocm_handle, 4); + /* - * The SCU is enabled by the BOOTROM but I think the second CPU doesn't + * The SCU is enabled above but I think the second CPU doesn't * turn on filtering until after the wake-up below. I think that's why * things don't work if I don't put these cache ops here. Also, the * magic location, 0xfffffff0, isn't in the SCU's filtering range so it @@ -87,8 +106,6 @@ platform_mp_start_ap(void) /* Wake up CPU1. */ armv7_sev(); - - bus_space_unmap(fdtbus_bs_tag, ocm_handle, 4); } void |
