ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hw: enable SMP for Wandboard (fix #2253)

This commit is contained in:
Stefan Kalkowski 2017-01-23 10:23:55 +01:00 committed by Norman Feske
parent b14e6fd724
commit c76c199f8d
4 changed files with 58 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base-hw/lib/mk/spec/imx6/core-hw.mk
View File

@ -14,7 +14,7 @@ INC_DIR += $(REP_DIR)/src/core/include/spec/imx
SRC_CC += platform_services.cc
SRC_CC += spec/imx6/platform_support.cc
NR_OF_CPUS = 1
NR_OF_CPUS = 4
# include less specific configuration
include $(REP_DIR)/lib/mk/spec/cortex_a9/core-hw.inc

61
repos/base-hw/src/core/include/spec/imx6/board.h
View File

@ -19,21 +19,56 @@
#include <spec/imx/board_support.h>
#include <spec/cortex_a9/board_support.h>
namespace Genode
{
/**
* Board driver
*/
class Board : public Imx::Board, public Cortex_a9::Board
{
public:
namespace Genode { class Board; }
void init()
class Genode::Board : public Imx::Board, public Cortex_a9::Board
{
private:
struct Src : Mmio
{
Src() : Mmio(SRC_MMIO_BASE) {}
struct Scr : Register<0x0, 32>
{
Imx::Board::init();
Cortex_a9::Board::init();
struct Core_1_reset : Bitfield<14,1> {};
struct Core_2_reset : Bitfield<15,1> {};
struct Core_3_reset : Bitfield<16,1> {};
struct Core_1_enable : Bitfield<22,1> {};
struct Core_2_enable : Bitfield<23,1> {};
struct Core_3_enable : Bitfield<24,1> {};
};
struct Gpr1 : Register<0x20, 32> {}; /* ep core 0 */
struct Gpr3 : Register<0x28, 32> {}; /* ep core 1 */
struct Gpr5 : Register<0x30, 32> {}; /* ep core 2 */
struct Gpr7 : Register<0x38, 32> {}; /* ep core 3 */
void entrypoint(void * entry)
{
write<Gpr3>((Gpr3::access_t)entry);
write<Gpr5>((Gpr5::access_t)entry);
write<Gpr7>((Gpr7::access_t)entry);
Scr::access_t v = read<Scr>();
Scr::Core_1_enable::set(v,1);
Scr::Core_1_reset::set(v,1);
Scr::Core_2_enable::set(v,1);
Scr::Core_3_reset::set(v,1);
Scr::Core_3_enable::set(v,1);
Scr::Core_3_reset::set(v,1);
write<Scr>(v);
}
};
}
} _src;
public:
void init()
{
Imx::Board::init();
Cortex_a9::Board::init();
}
void wake_up_all_cpus(void *entry) { _src.entrypoint(entry); }
};
#endif /* _CORE__INCLUDE__SPEC__IMX6__BOARD_H_ */

6
repos/base-hw/src/core/spec/cortex_a9/kernel/cpu.cc
View File

@ -111,6 +111,12 @@ void Kernel::Cpu::init(Kernel::Pic &pic, Kernel::Pd & core_pd, Genode::Board & b
Actlr::enable_smp();
smp_coherency_enabled.inc();
/*
* strangely, some older versions (imx6) seem to not work cache coherent
* until SMP bit is set, so write back the variable here.
*/
clean_invalidate_inner_data_cache();
/* wait for other cores' coherency activation */
smp_coherency_enabled.wait_for(NR_OF_CPUS);

3
repos/base/include/spec/imx6/drivers/board_base.h
View File

@ -66,6 +66,9 @@ struct Genode::Board_base
PL310_MMIO_BASE = 0x00a02000,
PL310_MMIO_SIZE = 0x00001000,
/* System reset controller */
SRC_MMIO_BASE = 0x20d8000,
/* CPU cache */
CACHE_LINE_SIZE_LOG2 = 5,