diff mbox series

[2/2] romulus: Add a barebones slot table

Message ID 20180410072802.17870-2-oohall@gmail.com
State Accepted
Headers show
Series [1/2] astbmc: Add more slot table helpers | expand

Commit Message

Oliver O'Halloran April 10, 2018, 7:28 a.m. UTC 
Add slot tables for romulus. Hopefully they won't be needed in THE
FUTURE!

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
ahahaha who am I kidding.
---
 platforms/astbmc/romulus.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

Comments

Stewart Smith April 12, 2018, 6:20 a.m. UTC | #1 
Oliver O'Halloran <oohall@gmail.com> writes:
> Add slot tables for romulus. Hopefully they won't be needed in THE
> FUTURE!
>
> Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
> ---
> ahahaha who am I kidding.
> ---
>  platforms/astbmc/romulus.c | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)

I trust you actually looked at a Romulus and didn't just crazy-guess so
we can find out it's all wrong a couple of years later like
$platform_that_shall_not_be_named

Series merged as of ee7bb4b391d564bd56060790c3a6abf9082e39e6
diff mbox series

Patch

diff --git a/platforms/astbmc/romulus.c b/platforms/astbmc/romulus.c
index e1b137cb3df6..7cdc3b9d3669 100644
--- a/platforms/astbmc/romulus.c
+++ b/platforms/astbmc/romulus.c
@@ -24,6 +24,34 @@ 
 
 #include "astbmc.h"
 
+ST_PLUGGABLE(romulus_cpu1_slot1, "CPU1 Slot1 (8x)");
+ST_PLUGGABLE(romulus_cpu1_slot2, "CPU1 Slot2 (16x)");
+
+ST_PLUGGABLE(romulus_cpu2_slot1, "CPU2 Slot1 (16x)");
+ST_PLUGGABLE(romulus_cpu2_slot2, "CPU2 Slot2 (16x)");
+ST_PLUGGABLE(romulus_cpu2_slot3, "CPU2 Slot3 (8x)");
+
+ST_BUILTIN_DEV(romulus_builtin_raid, "Builtin RAID");
+ST_BUILTIN_DEV(romulus_builtin_usb, "Builtin USB");
+ST_BUILTIN_DEV(romulus_builtin_ethernet, "Builtin Ethernet");
+ST_BUILTIN_DEV(romulus_builtin_bmc, "BMC");
+
+static const struct slot_table_entry romulus_phb_table[] = {
+	ST_PHB_ENTRY(0, 0, romulus_cpu1_slot2),
+	ST_PHB_ENTRY(0, 1, romulus_cpu1_slot1),
+
+	ST_PHB_ENTRY(0, 2, romulus_builtin_raid),
+	ST_PHB_ENTRY(0, 3, romulus_builtin_usb),
+	ST_PHB_ENTRY(0, 4, romulus_builtin_ethernet),
+	ST_PHB_ENTRY(0, 5, romulus_builtin_bmc),
+
+	ST_PHB_ENTRY(8, 0, romulus_cpu2_slot2), // might be swapped with 3
+	ST_PHB_ENTRY(8, 1, romulus_cpu2_slot3), // might be PHB1 or 2
+	ST_PHB_ENTRY(8, 3, romulus_cpu2_slot1),
+
+	{ .etype = st_end },
+};
+
 static bool romulus_probe(void)
 {
 	if (!dt_node_is_compatible(dt_root, "ibm,romulus"))
@@ -35,6 +63,8 @@  static bool romulus_probe(void)
 	/* Setup UART for use by OPAL (Linux hvc) */
 	uart_set_console_policy(UART_CONSOLE_OPAL);
 
+	slot_table_init(romulus_phb_table);
+
 	return true;
 }