From 802830d8d40cf87da8843e23bb868b1bef61ede0 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Mon, 17 Dec 2018 16:04:50 -0800 Subject: [PATCH] warmboot: start cluster_init, skeleton all remaining code --- exosphere/lp0fw/src/car.h | 36 ++++++++++++++++++---- exosphere/lp0fw/src/cluster.c | 58 +++++++++++++++++++++++++++++++++++ exosphere/lp0fw/src/cluster.h | 24 +++++++++++++++ exosphere/lp0fw/src/flow.h | 31 +++++++++++++++++++ exosphere/lp0fw/src/lp0.c | 21 +++++++++++-- exosphere/lp0fw/src/pmc.h | 2 ++ exosphere/lp0fw/src/timer.h | 2 +- 7 files changed, 164 insertions(+), 10 deletions(-) create mode 100644 exosphere/lp0fw/src/cluster.c create mode 100644 exosphere/lp0fw/src/cluster.h create mode 100644 exosphere/lp0fw/src/flow.h diff --git a/exosphere/lp0fw/src/car.h b/exosphere/lp0fw/src/car.h index f10c2e518..bc08731d7 100644 --- a/exosphere/lp0fw/src/car.h +++ b/exosphere/lp0fw/src/car.h @@ -30,6 +30,12 @@ #define CLK_RST_CONTROLLER_RST_CPUG_CMPLX_SET_0 MAKE_CAR_REG(0x450) #define CLK_RST_CONTROLLER_RST_CPUG_CMPLX_CLR_0 MAKE_CAR_REG(0x454) +#define CLK_RST_CONTROLLER_SUPER_CCLKG_DIVIDER_0 MAKE_CAR_REG(0x36C) +#define CLK_RST_CONTROLLER_SUPER_CCLKP_DIVIDER_0 MAKE_CAR_REG(0x374) + +#define CLK_RST_CONTROLLER_CPU_SOFTRST_CTRL2_0 MAKE_CAR_REG(0x388) +#define CLK_RST_CONTROLLER_CLK_SOURCE_MSELECT_0 MAKE_CAR_REG(0x3B4) + #define CLK_RST_CONTROLLER_LVL2_CLK_GATE_OVRA_0 MAKE_CAR_REG(0x0F8) #define CLK_RST_CONTROLLER_LVL2_CLK_GATE_OVRB_0 MAKE_CAR_REG(0x0FC) #define CLK_RST_CONTROLLER_LVL2_CLK_GATE_OVRC_0 MAKE_CAR_REG(0x3A0) @@ -38,17 +44,35 @@ #define CLK_RST_CONTROLLER_SPARE_REG0_0 MAKE_CAR_REG(0x55C) +#define CLK_RST_CONTROLLER_RST_DEV_U_SET_0 MAKE_CAR_REG(0x310) + +#define CLK_RST_CONTROLLER_RST_DEV_U_CLR_0 MAKE_CAR_REG(0x314) +#define CLK_RST_CONTROLLER_RST_DEV_V_CLR_0 MAKE_CAR_REG(0x434) + +#define CLK_RST_CONTROLLER_CLK_ENB_U_SET_0 MAKE_CAR_REG(0x330) +#define CLK_RST_CONTROLLER_CLK_ENB_V_SET_0 MAKE_CAR_REG(0x440) #define CLK_RST_CONTROLLER_CLK_ENB_W_SET_0 MAKE_CAR_REG(0x448) #define NUM_CAR_BANKS 7 typedef enum { - CARDEVICE_UARTA = 6, - CARDEVICE_UARTB = 7, - CARDEVICE_I2C1 = 12, - CARDEVICE_I2C5 = 47, - CARDEVICE_ACTMON = 119, - CARDEVICE_BPMP = 1 + CARDEVICE_UARTA = ((0 << 5) | 0x6), + CARDEVICE_UARTB = ((0 << 5) | 0x7), + CARDEVICE_UARTC = ((1 << 5) | 0x17), + CARDEVICE_I2C1 = ((0 << 5) | 0xC), + CARDEVICE_I2C5 = ((1 << 5) | 0xF), + CARDEVICE_UNK = ((3 << 5) | 0x1E), + CARDEVICE_SE = ((3 << 5) | 0x1F), + CARDEVICE_HOST1X = ((0 << 5) | 0x1C), + CARDEVICE_TSEC = ((2 << 5) | 0x13), + CARDEVICE_SOR_SAFE = ((6 << 5) | 0x1E), + CARDEVICE_SOR0 = ((5 << 5) | 0x16), + CARDEVICE_SOR1 = ((5 << 5) | 0x17), + CARDEVICE_KFUSE = ((1 << 5) | 0x8), + CARDEVICE_CL_DVFS = ((4 << 5) | 0x1B), + CARDEVICE_CORESIGHT = ((2 << 5) | 0x9), + CARDEVICE_ACTMON = ((3 << 5) | 0x17), + CARDEVICE_BPMP = ((0 << 5) | 0x1) } CarDevice; void car_configure_oscillators(void); diff --git a/exosphere/lp0fw/src/cluster.c b/exosphere/lp0fw/src/cluster.c new file mode 100644 index 000000000..daa5c6d84 --- /dev/null +++ b/exosphere/lp0fw/src/cluster.c @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2018 Atmosphère-NX + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +#include "utils.h" +#include "cluster.h" +#include "car.h" +#include "timer.h" +#include "pmc.h" +#include "sysreg.h" + +void cluster_initialize_cpu(void) { + /* Hold CoreSight in reset. */ + CLK_RST_CONTROLLER_RST_DEV_U_SET_0 = 0x200; + + /* CAR2PMC_CPU_ACK_WIDTH should be set to 0. */ + CLK_RST_CONTROLLER_CPU_SOFTRST_CTRL2_0 &= 0xFFFFF000; + + /* Restore SB_AA64_RESET values from PMC scratch. */ + SB_AA64_RESET_LOW_0 = APBDEV_PMC_SECURE_SCRATCH34_0 | 1; + SB_AA64_RESET_HIGH_0 = APBDEV_PMC_SECURE_SCRATCH35_0; + + /* Set CDIV_ENB for CCLKG/CCLKP. */ + CLK_RST_CONTROLLER_SUPER_CCLKG_DIVIDER_0 = 0x80000000; + CLK_RST_CONTROLLER_SUPER_CCLKP_DIVIDER_0 = 0x80000000; + + /* Enable CoreSight clock, take CoreSight out of reset. */ + CLK_RST_CONTROLLER_CLK_ENB_U_SET_0 = 0x200; + CLK_RST_CONTROLLER_RST_DEV_U_CLR_0 = 0x200; + + /* Configure MSELECT to divide by 4, enable MSELECT clock. */ + CLK_RST_CONTROLLER_CLK_SOURCE_MSELECT_0 = 6; /* (6/2) + 1 = 4. */ + CLK_RST_CONTROLLER_CLK_ENB_V_SET_0 = 0x8; + + /* Wait 2 us, then take MSELECT out of reset. */ + timer_wait(2); + CLK_RST_CONTROLLER_RST_DEV_V_CLR_0 = 0x8; + + /* TODO: This function is enormous */ +} + +void cluster_power_on_cpu(void) { + /* TODO */ +} \ No newline at end of file diff --git a/exosphere/lp0fw/src/cluster.h b/exosphere/lp0fw/src/cluster.h new file mode 100644 index 000000000..0551deb3f --- /dev/null +++ b/exosphere/lp0fw/src/cluster.h @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2018 naehrwert + * Copyright (c) 2018 Atmosphère-NX + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef EXOSPHERE_WARMBOOT_BIN_CLUSTER_H +#define EXOSPHERE_WARMBOOT_BIN_CLUSTER_H + +void cluster_initialize_cpu(void); +void cluster_power_on_cpu(void); + +#endif diff --git a/exosphere/lp0fw/src/flow.h b/exosphere/lp0fw/src/flow.h new file mode 100644 index 000000000..559c79716 --- /dev/null +++ b/exosphere/lp0fw/src/flow.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2018 Atmosphère-NX + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef EXOSPHERE_WARMBOOT_BIN_FLOW_CTLR_H +#define EXOSPHERE_WARMBOOT_BIN_FLOW_CTLR_H + +#include +#include + +#include "utils.h" + +#define FLOW_BASE (0x60007000) + +#define MAKE_FLOW_REG(ofs) MAKE_REG32(FLOW_BASE + ofs) + +#define FLOW_CTLR_HALT_COP_EVENTS_0 MAKE_FLOW_REG(0x004) + +#endif diff --git a/exosphere/lp0fw/src/lp0.c b/exosphere/lp0fw/src/lp0.c index a0ebd3985..565af3b79 100644 --- a/exosphere/lp0fw/src/lp0.c +++ b/exosphere/lp0fw/src/lp0.c @@ -22,6 +22,8 @@ #include "fuse.h" #include "car.h" #include "emc.h" +#include "cluster.h" +#include "flow.h" #include "timer.h" void reboot(void) { @@ -76,9 +78,22 @@ void lp0_entry_main(warmboot_metadata_t *meta) { /* Setup clock output for all devices, working around mbist bug. */ car_mbist_workaround(); - /* TODO: stuff */ - - while (true) { /* TODO: Halt BPMP */ } + /* Initialize the CPU cluster. */ + cluster_initialize_cpu(); + + /* TODO: decrypt_restore_secmon_to_tzram(); */ + + /* Power on the CPU cluster. */ + cluster_power_on_cpu(); + + /* Nintendo clears most of warmboot.bin out of IRAM here. We're not gonna bother. */ + /* memset( ... ); */ + + const uint32_t halt_val = (target_firmware >= ATMOSPHERE_TARGET_FIRMWARE_400) ? 0x40000000 : 0x50000000; + while (true) { + /* Halt the BPMP. */ + FLOW_CTLR_HALT_COP_EVENTS_0 = halt_val; + } } diff --git a/exosphere/lp0fw/src/pmc.h b/exosphere/lp0fw/src/pmc.h index 22ce2d94d..17a821903 100644 --- a/exosphere/lp0fw/src/pmc.h +++ b/exosphere/lp0fw/src/pmc.h @@ -45,6 +45,8 @@ #define APBDEV_PMC_SECURE_SCRATCH21_0 MAKE_PMC_REG(0x334) #define APBDEV_PMC_SECURE_SCRATCH32_0 MAKE_PMC_REG(0x360) +#define APBDEV_PMC_SECURE_SCRATCH34_0 MAKE_PMC_REG(0x368) +#define APBDEV_PMC_SECURE_SCRATCH35_0 MAKE_PMC_REG(0x36C) #define APBDEV_PMC_IO_DPD3_REQ_0 MAKE_PMC_REG(0x45C) #define APBDEV_PMC_IO_DPD3_STATUS_0 MAKE_PMC_REG(0x460) diff --git a/exosphere/lp0fw/src/timer.h b/exosphere/lp0fw/src/timer.h index 3a4911856..14d3b9afd 100644 --- a/exosphere/lp0fw/src/timer.h +++ b/exosphere/lp0fw/src/timer.h @@ -23,7 +23,7 @@ #define TIMERUS_USEC_CFG_0 MAKE_REG32(0x60005014) static inline void timer_wait(uint32_t microseconds) { - uint32_t old_time = TIMERUS_CNTR_1US_0; + const uint32_t old_time = TIMERUS_CNTR_1US_0; while (TIMERUS_CNTR_1US_0 - old_time <= microseconds) { /* Spin-lock. */ }