2022-05-02 18:03:03 +03:00
|
|
|
/*
|
|
|
|
* ASPEED Ast10x0 SoC
|
|
|
|
*
|
|
|
|
* Copyright (C) 2022 ASPEED Technology Inc.
|
|
|
|
*
|
|
|
|
* This code is licensed under the GPL version 2 or later. See
|
|
|
|
* the COPYING file in the top-level directory.
|
|
|
|
*
|
|
|
|
* Implementation extracted from the AST2600 and adapted for Ast10x0.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include "qapi/error.h"
|
|
|
|
#include "exec/address-spaces.h"
|
|
|
|
#include "sysemu/sysemu.h"
|
|
|
|
#include "hw/qdev-clock.h"
|
|
|
|
#include "hw/misc/unimp.h"
|
|
|
|
#include "hw/arm/aspeed_soc.h"
|
|
|
|
|
|
|
|
#define ASPEED_SOC_IOMEM_SIZE 0x00200000
|
|
|
|
|
|
|
|
static const hwaddr aspeed_soc_ast1030_memmap[] = {
|
|
|
|
[ASPEED_DEV_SRAM] = 0x00000000,
|
hw/arm/aspeed_ast10x0: Map the secure SRAM
Some SRAM appears to be used by the Secure Boot unit and
crypto accelerators. Name it 'secure sram'.
Note, the SRAM base address was already present but unused
(the 'SBC' index is used for the MMIO peripheral).
Interestingly using CFLAGS=-Winitializer-overrides reports:
../hw/arm/aspeed_ast10x0.c:32:30: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ASPEED_DEV_SBC] = 0x7E6F2000,
^~~~~~~~~~
../hw/arm/aspeed_ast10x0.c:24:30: note: previous initialization is here
[ASPEED_DEV_SBC] = 0x79000000,
^~~~~~~~~~
This fixes with Zephyr:
uart:~$ rsa test
rsa test vector[0]:
[00:00:26.156,000] <err> os: ***** BUS FAULT *****
[00:00:26.157,000] <err> os: Precise data bus error
[00:00:26.157,000] <err> os: BFAR Address: 0x79000000
[00:00:26.158,000] <err> os: r0/a1: 0x79000000 r1/a2: 0x00000000 r2/a3: 0x00001800
[00:00:26.158,000] <err> os: r3/a4: 0x79001800 r12/ip: 0x00000800 r14/lr: 0x0001098d
[00:00:26.158,000] <err> os: xpsr: 0x81000000
[00:00:26.158,000] <err> os: Faulting instruction address (r15/pc): 0x0001e1bc
[00:00:26.158,000] <err> os: >>> ZEPHYR FATAL ERROR 0: CPU exception on CPU 0
[00:00:26.158,000] <err> os: Current thread: 0x38248 (shell_uart)
[00:00:26.165,000] <err> os: Halting system
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Delevoryas <peter@pjd.dev>
[ clg: Fixed size of Secure Boot Controller Memory ]
Signed-off-by: Cédric Le Goater <clg@kaod.org>
2023-02-07 11:02:05 +03:00
|
|
|
[ASPEED_DEV_SECSRAM] = 0x79000000,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_IOMEM] = 0x7E600000,
|
|
|
|
[ASPEED_DEV_PWM] = 0x7E610000,
|
|
|
|
[ASPEED_DEV_FMC] = 0x7E620000,
|
|
|
|
[ASPEED_DEV_SPI1] = 0x7E630000,
|
|
|
|
[ASPEED_DEV_SPI2] = 0x7E640000,
|
2023-02-07 11:02:05 +03:00
|
|
|
[ASPEED_DEV_UDC] = 0x7E6A2000,
|
hw/arm/aspeed_ast10x0: Map HACE peripheral
Since I don't have access to the datasheet, the relevant
values were found in:
https://github.com/AspeedTech-BMC/zephyr/blob/v00.01.08/dts/arm/aspeed/ast10x0.dtsi
Before on Zephyr:
uart:~$ hash test
sha256_test
tv[0]:hash_final error
sha384_test
tv[0]:hash_final error
sha512_test
tv[0]:hash_final error
[00:00:06.278,000] <err> hace_global: HACE poll timeout
[00:00:09.324,000] <err> hace_global: HACE poll timeout
[00:00:12.261,000] <err> hace_global: HACE poll timeout
uart:~$ crypto aes256_cbc_vault
aes256_cbc vault key 1
[00:00:06.699,000] <inf> hace_global: aspeed_crypto_session_setup
[00:00:06.699,000] <inf> hace_global: data->cmd: 1c2098
[00:00:06.699,000] <inf> hace_global: crypto_data_src: 93340
[00:00:06.699,000] <inf> hace_global: crypto_data_dst: 93348
[00:00:06.699,000] <inf> hace_global: crypto_ctx_base: 93300
[00:00:06.699,000] <inf> hace_global: crypto_data_len: 80000040
[00:00:06.699,000] <inf> hace_global: crypto_cmd_reg: 11c2098
[00:00:09.743,000] <inf> hace_global: HACE_STS: 0
[00:00:09.743,000] <err> hace_global: HACE poll timeout
[00:00:09.743,000] <err> crypto: CBC mode ENCRYPT - Failed
[00:00:09.743,000] <inf> hace_global: aspeed_crypto_session_free
uart:~$
After:
uart:~$ hash test
sha256_test
tv[0]:PASS
tv[1]:PASS
tv[2]:PASS
tv[3]:PASS
tv[4]:PASS
sha384_test
tv[0]:PASS
tv[1]:PASS
tv[2]:PASS
tv[3]:PASS
tv[4]:PASS
tv[5]:PASS
sha512_test
tv[0]:PASS
tv[1]:PASS
tv[2]:PASS
tv[3]:PASS
tv[4]:PASS
tv[5]:PASS
uart:~$ crypto aes256_cbc_vault
aes256_cbc vault key 1
Was waiting for:
6b c1 be e2 2e 40 9f 96 e9 3d 7e 11 73 93 17 2a
ae 2d 8a 57 1e 03 ac 9c 9e b7 6f ac 45 af 8e 51
30 c8 1c 46 a3 5c e4 11 e5 fb c1 19 1a 0a 52 ef
f6 9f 24 45 df 4f 9b 17 ad 2b 41 7b e6 6c 37 10
But got:
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
[00:00:05.771,000] <inf> hace_global: aspeed_crypto_session_setup
[00:00:05.772,000] <inf> hace_global: data->cmd: 1c2098
[00:00:05.772,000] <inf> hace_global: crypto_data_src: 93340
[00:00:05.772,000] <inf> hace_global: crypto_data_dst: 93348
[00:00:05.772,000] <inf> hace_global: crypto_ctx_base: 93300
[00:00:05.772,000] <inf> hace_global: crypto_data_len: 80000040
[00:00:05.772,000] <inf> hace_global: crypto_cmd_reg: 11c2098
[00:00:05.772,000] <inf> hace_global: HACE_STS: 1000
[00:00:05.772,000] <inf> crypto: Output length (encryption): 80
[00:00:05.772,000] <inf> hace_global: aspeed_crypto_session_free
[00:00:05.772,000] <inf> hace_global: aspeed_crypto_session_setup
[00:00:05.772,000] <inf> hace_global: data->cmd: 1c2018
[00:00:05.772,000] <inf> hace_global: crypto_data_src: 93340
[00:00:05.772,000] <inf> hace_global: crypto_data_dst: 93348
[00:00:05.772,000] <inf> hace_global: crypto_ctx_base: 93300
[00:00:05.772,000] <inf> hace_global: crypto_data_len: 80000040
[00:00:05.772,000] <inf> hace_global: crypto_cmd_reg: 11c2018
[00:00:05.772,000] <inf> hace_global: HACE_STS: 1000
[00:00:05.772,000] <inf> crypto: Output length (decryption): 64
[00:00:05.772,000] <err> crypto: CBC mode DECRYPT - Mismatch between plaintext and decrypted cipher text
[00:00:05.774,000] <inf> hace_global: aspeed_crypto_session_free
uart:~$
Reviewed-by: Peter Delevoryas <peter@pjd.dev>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
2023-02-07 11:02:05 +03:00
|
|
|
[ASPEED_DEV_HACE] = 0x7E6D0000,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_SCU] = 0x7E6E2000,
|
2023-02-07 11:02:05 +03:00
|
|
|
[ASPEED_DEV_JTAG0] = 0x7E6E4000,
|
|
|
|
[ASPEED_DEV_JTAG1] = 0x7E6E4100,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_ADC] = 0x7E6E9000,
|
2023-02-07 11:02:05 +03:00
|
|
|
[ASPEED_DEV_ESPI] = 0x7E6EE000,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_SBC] = 0x7E6F2000,
|
|
|
|
[ASPEED_DEV_GPIO] = 0x7E780000,
|
2023-02-07 11:02:05 +03:00
|
|
|
[ASPEED_DEV_SGPIOM] = 0x7E780500,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_TIMER1] = 0x7E782000,
|
2022-05-25 11:31:33 +03:00
|
|
|
[ASPEED_DEV_UART1] = 0x7E783000,
|
|
|
|
[ASPEED_DEV_UART2] = 0x7E78D000,
|
|
|
|
[ASPEED_DEV_UART3] = 0x7E78E000,
|
|
|
|
[ASPEED_DEV_UART4] = 0x7E78F000,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_UART5] = 0x7E784000,
|
2022-05-25 11:31:33 +03:00
|
|
|
[ASPEED_DEV_UART6] = 0x7E790000,
|
|
|
|
[ASPEED_DEV_UART7] = 0x7E790100,
|
|
|
|
[ASPEED_DEV_UART8] = 0x7E790200,
|
|
|
|
[ASPEED_DEV_UART9] = 0x7E790300,
|
|
|
|
[ASPEED_DEV_UART10] = 0x7E790400,
|
|
|
|
[ASPEED_DEV_UART11] = 0x7E790500,
|
|
|
|
[ASPEED_DEV_UART12] = 0x7E790600,
|
|
|
|
[ASPEED_DEV_UART13] = 0x7E790700,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_WDT] = 0x7E785000,
|
|
|
|
[ASPEED_DEV_LPC] = 0x7E789000,
|
2022-06-30 10:21:14 +03:00
|
|
|
[ASPEED_DEV_PECI] = 0x7E78B000,
|
2023-02-07 11:02:05 +03:00
|
|
|
[ASPEED_DEV_I3C] = 0x7E7A0000,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_I2C] = 0x7E7B0000,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const int aspeed_soc_ast1030_irqmap[] = {
|
2022-05-25 11:31:33 +03:00
|
|
|
[ASPEED_DEV_UART1] = 47,
|
|
|
|
[ASPEED_DEV_UART2] = 48,
|
|
|
|
[ASPEED_DEV_UART3] = 49,
|
|
|
|
[ASPEED_DEV_UART4] = 50,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_UART5] = 8,
|
2022-05-25 11:31:33 +03:00
|
|
|
[ASPEED_DEV_UART6] = 57,
|
|
|
|
[ASPEED_DEV_UART7] = 58,
|
|
|
|
[ASPEED_DEV_UART8] = 59,
|
|
|
|
[ASPEED_DEV_UART9] = 60,
|
|
|
|
[ASPEED_DEV_UART10] = 61,
|
|
|
|
[ASPEED_DEV_UART11] = 62,
|
|
|
|
[ASPEED_DEV_UART12] = 63,
|
|
|
|
[ASPEED_DEV_UART13] = 64,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_GPIO] = 11,
|
|
|
|
[ASPEED_DEV_TIMER1] = 16,
|
|
|
|
[ASPEED_DEV_TIMER2] = 17,
|
|
|
|
[ASPEED_DEV_TIMER3] = 18,
|
|
|
|
[ASPEED_DEV_TIMER4] = 19,
|
|
|
|
[ASPEED_DEV_TIMER5] = 20,
|
|
|
|
[ASPEED_DEV_TIMER6] = 21,
|
|
|
|
[ASPEED_DEV_TIMER7] = 22,
|
|
|
|
[ASPEED_DEV_TIMER8] = 23,
|
|
|
|
[ASPEED_DEV_WDT] = 24,
|
|
|
|
[ASPEED_DEV_LPC] = 35,
|
2022-06-30 10:21:14 +03:00
|
|
|
[ASPEED_DEV_PECI] = 38,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_FMC] = 39,
|
2023-02-07 11:02:05 +03:00
|
|
|
[ASPEED_DEV_ESPI] = 42,
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_PWM] = 44,
|
|
|
|
[ASPEED_DEV_ADC] = 46,
|
|
|
|
[ASPEED_DEV_SPI1] = 65,
|
|
|
|
[ASPEED_DEV_SPI2] = 66,
|
2023-02-07 11:02:05 +03:00
|
|
|
[ASPEED_DEV_I3C] = 102, /* 102 -> 105 */
|
2022-05-02 18:03:03 +03:00
|
|
|
[ASPEED_DEV_I2C] = 110, /* 110 ~ 123 */
|
|
|
|
[ASPEED_DEV_KCS] = 138, /* 138 -> 142 */
|
2023-02-07 11:02:05 +03:00
|
|
|
[ASPEED_DEV_UDC] = 9,
|
|
|
|
[ASPEED_DEV_SGPIOM] = 51,
|
|
|
|
[ASPEED_DEV_JTAG0] = 27,
|
|
|
|
[ASPEED_DEV_JTAG1] = 53,
|
2022-05-02 18:03:03 +03:00
|
|
|
};
|
|
|
|
|
2022-05-25 11:31:33 +03:00
|
|
|
static qemu_irq aspeed_soc_ast1030_get_irq(AspeedSoCState *s, int dev)
|
2022-05-02 18:03:03 +03:00
|
|
|
{
|
2023-10-24 19:24:20 +03:00
|
|
|
Aspeed10x0SoCState *a = ASPEED10X0_SOC(s);
|
2022-05-02 18:03:03 +03:00
|
|
|
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
|
|
|
|
|
2023-10-24 19:24:20 +03:00
|
|
|
return qdev_get_gpio_in(DEVICE(&a->armv7m), sc->irqmap[dev]);
|
2022-05-02 18:03:03 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void aspeed_soc_ast1030_init(Object *obj)
|
|
|
|
{
|
2023-10-24 19:24:20 +03:00
|
|
|
Aspeed10x0SoCState *a = ASPEED10X0_SOC(obj);
|
2022-05-02 18:03:03 +03:00
|
|
|
AspeedSoCState *s = ASPEED_SOC(obj);
|
|
|
|
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
|
|
|
|
char socname[8];
|
|
|
|
char typename[64];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (sscanf(sc->name, "%7s", socname) != 1) {
|
|
|
|
g_assert_not_reached();
|
|
|
|
}
|
|
|
|
|
2023-10-24 19:24:20 +03:00
|
|
|
object_initialize_child(obj, "armv7m", &a->armv7m, TYPE_ARMV7M);
|
2022-05-02 18:03:03 +03:00
|
|
|
|
|
|
|
s->sysclk = qdev_init_clock_in(DEVICE(s), "sysclk", NULL, NULL, 0);
|
|
|
|
|
|
|
|
snprintf(typename, sizeof(typename), "aspeed.scu-%s", socname);
|
|
|
|
object_initialize_child(obj, "scu", &s->scu, typename);
|
|
|
|
qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", sc->silicon_rev);
|
|
|
|
|
|
|
|
object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu), "hw-strap1");
|
|
|
|
object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu), "hw-strap2");
|
|
|
|
|
2022-06-13 15:05:48 +03:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.i2c-%s", socname);
|
|
|
|
object_initialize_child(obj, "i2c", &s->i2c, typename);
|
|
|
|
|
2023-02-07 11:02:05 +03:00
|
|
|
object_initialize_child(obj, "i3c", &s->i3c, TYPE_ASPEED_I3C);
|
|
|
|
|
2022-05-02 18:03:03 +03:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.timer-%s", socname);
|
|
|
|
object_initialize_child(obj, "timerctrl", &s->timerctrl, typename);
|
|
|
|
|
|
|
|
snprintf(typename, sizeof(typename), "aspeed.adc-%s", socname);
|
|
|
|
object_initialize_child(obj, "adc", &s->adc, typename);
|
|
|
|
|
|
|
|
snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname);
|
|
|
|
object_initialize_child(obj, "fmc", &s->fmc, typename);
|
|
|
|
|
|
|
|
for (i = 0; i < sc->spis_num; i++) {
|
|
|
|
snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i + 1, socname);
|
|
|
|
object_initialize_child(obj, "spi[*]", &s->spi[i], typename);
|
|
|
|
}
|
|
|
|
|
|
|
|
object_initialize_child(obj, "lpc", &s->lpc, TYPE_ASPEED_LPC);
|
|
|
|
|
2022-06-30 10:21:14 +03:00
|
|
|
object_initialize_child(obj, "peci", &s->peci, TYPE_ASPEED_PECI);
|
|
|
|
|
2022-05-02 18:03:03 +03:00
|
|
|
object_initialize_child(obj, "sbc", &s->sbc, TYPE_ASPEED_SBC);
|
|
|
|
|
|
|
|
for (i = 0; i < sc->wdts_num; i++) {
|
|
|
|
snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname);
|
|
|
|
object_initialize_child(obj, "wdt[*]", &s->wdt[i], typename);
|
|
|
|
}
|
2022-05-25 11:31:33 +03:00
|
|
|
|
aspeed: Refactor UART init for multi-SoC machines
This change moves the code that connects the SoC UART's to serial_hd's
to the machine.
It makes each UART a proper child member of the SoC, and then allows the
machine to selectively initialize the chardev for each UART with a
serial_hd.
This should preserve backwards compatibility, but also allow multi-SoC
boards to completely change the wiring of serial devices from the
command line to specific SoC UART's.
This also removes the uart-default property from the SoC, since the SoC
doesn't need to know what UART is the "default" on the machine anymore.
I tested this using the images and commands from the previous
refactoring, and another test image for the ast1030:
wget https://github.com/facebook/openbmc/releases/download/v2021.49.0/fuji.mtd
wget https://github.com/facebook/openbmc/releases/download/v2021.49.0/wedge100.mtd
wget https://github.com/peterdelevoryas/OpenBIC/releases/download/oby35-cl-2022.13.01/Y35BCL.elf
Fuji uses UART1:
qemu-system-arm -machine fuji-bmc \
-drive file=fuji.mtd,format=raw,if=mtd \
-nographic
ast2600-evb uses uart-default=UART5:
qemu-system-arm -machine ast2600-evb \
-drive file=fuji.mtd,format=raw,if=mtd \
-serial null -serial mon:stdio -display none
Wedge100 uses UART3:
qemu-system-arm -machine palmetto-bmc \
-drive file=wedge100.mtd,format=raw,if=mtd \
-serial null -serial null -serial null \
-serial mon:stdio -display none
AST1030 EVB uses UART5:
qemu-system-arm -machine ast1030-evb \
-kernel Y35BCL.elf -nographic
Fixes: 6827ff20b2975 ("hw: aspeed: Init all UART's with serial devices")
Signed-off-by: Peter Delevoryas <peter@pjd.dev>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20220705191400.41632-4-peter@pjd.dev>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
2022-07-14 17:24:38 +03:00
|
|
|
for (i = 0; i < sc->uarts_num; i++) {
|
|
|
|
object_initialize_child(obj, "uart[*]", &s->uart[i], TYPE_SERIAL_MM);
|
|
|
|
}
|
|
|
|
|
2022-05-25 11:31:33 +03:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.gpio-%s", socname);
|
|
|
|
object_initialize_child(obj, "gpio", &s->gpio, typename);
|
2022-06-30 10:21:13 +03:00
|
|
|
|
hw/arm/aspeed_ast10x0: Map HACE peripheral
Since I don't have access to the datasheet, the relevant
values were found in:
https://github.com/AspeedTech-BMC/zephyr/blob/v00.01.08/dts/arm/aspeed/ast10x0.dtsi
Before on Zephyr:
uart:~$ hash test
sha256_test
tv[0]:hash_final error
sha384_test
tv[0]:hash_final error
sha512_test
tv[0]:hash_final error
[00:00:06.278,000] <err> hace_global: HACE poll timeout
[00:00:09.324,000] <err> hace_global: HACE poll timeout
[00:00:12.261,000] <err> hace_global: HACE poll timeout
uart:~$ crypto aes256_cbc_vault
aes256_cbc vault key 1
[00:00:06.699,000] <inf> hace_global: aspeed_crypto_session_setup
[00:00:06.699,000] <inf> hace_global: data->cmd: 1c2098
[00:00:06.699,000] <inf> hace_global: crypto_data_src: 93340
[00:00:06.699,000] <inf> hace_global: crypto_data_dst: 93348
[00:00:06.699,000] <inf> hace_global: crypto_ctx_base: 93300
[00:00:06.699,000] <inf> hace_global: crypto_data_len: 80000040
[00:00:06.699,000] <inf> hace_global: crypto_cmd_reg: 11c2098
[00:00:09.743,000] <inf> hace_global: HACE_STS: 0
[00:00:09.743,000] <err> hace_global: HACE poll timeout
[00:00:09.743,000] <err> crypto: CBC mode ENCRYPT - Failed
[00:00:09.743,000] <inf> hace_global: aspeed_crypto_session_free
uart:~$
After:
uart:~$ hash test
sha256_test
tv[0]:PASS
tv[1]:PASS
tv[2]:PASS
tv[3]:PASS
tv[4]:PASS
sha384_test
tv[0]:PASS
tv[1]:PASS
tv[2]:PASS
tv[3]:PASS
tv[4]:PASS
tv[5]:PASS
sha512_test
tv[0]:PASS
tv[1]:PASS
tv[2]:PASS
tv[3]:PASS
tv[4]:PASS
tv[5]:PASS
uart:~$ crypto aes256_cbc_vault
aes256_cbc vault key 1
Was waiting for:
6b c1 be e2 2e 40 9f 96 e9 3d 7e 11 73 93 17 2a
ae 2d 8a 57 1e 03 ac 9c 9e b7 6f ac 45 af 8e 51
30 c8 1c 46 a3 5c e4 11 e5 fb c1 19 1a 0a 52 ef
f6 9f 24 45 df 4f 9b 17 ad 2b 41 7b e6 6c 37 10
But got:
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
[00:00:05.771,000] <inf> hace_global: aspeed_crypto_session_setup
[00:00:05.772,000] <inf> hace_global: data->cmd: 1c2098
[00:00:05.772,000] <inf> hace_global: crypto_data_src: 93340
[00:00:05.772,000] <inf> hace_global: crypto_data_dst: 93348
[00:00:05.772,000] <inf> hace_global: crypto_ctx_base: 93300
[00:00:05.772,000] <inf> hace_global: crypto_data_len: 80000040
[00:00:05.772,000] <inf> hace_global: crypto_cmd_reg: 11c2098
[00:00:05.772,000] <inf> hace_global: HACE_STS: 1000
[00:00:05.772,000] <inf> crypto: Output length (encryption): 80
[00:00:05.772,000] <inf> hace_global: aspeed_crypto_session_free
[00:00:05.772,000] <inf> hace_global: aspeed_crypto_session_setup
[00:00:05.772,000] <inf> hace_global: data->cmd: 1c2018
[00:00:05.772,000] <inf> hace_global: crypto_data_src: 93340
[00:00:05.772,000] <inf> hace_global: crypto_data_dst: 93348
[00:00:05.772,000] <inf> hace_global: crypto_ctx_base: 93300
[00:00:05.772,000] <inf> hace_global: crypto_data_len: 80000040
[00:00:05.772,000] <inf> hace_global: crypto_cmd_reg: 11c2018
[00:00:05.772,000] <inf> hace_global: HACE_STS: 1000
[00:00:05.772,000] <inf> crypto: Output length (decryption): 64
[00:00:05.772,000] <err> crypto: CBC mode DECRYPT - Mismatch between plaintext and decrypted cipher text
[00:00:05.774,000] <inf> hace_global: aspeed_crypto_session_free
uart:~$
Reviewed-by: Peter Delevoryas <peter@pjd.dev>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
2023-02-07 11:02:05 +03:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.hace-%s", socname);
|
|
|
|
object_initialize_child(obj, "hace", &s->hace, typename);
|
|
|
|
|
2022-06-30 10:21:13 +03:00
|
|
|
object_initialize_child(obj, "iomem", &s->iomem, TYPE_UNIMPLEMENTED_DEVICE);
|
|
|
|
object_initialize_child(obj, "sbc-unimplemented", &s->sbc_unimplemented,
|
|
|
|
TYPE_UNIMPLEMENTED_DEVICE);
|
2023-02-07 11:02:05 +03:00
|
|
|
object_initialize_child(obj, "pwm", &s->pwm, TYPE_UNIMPLEMENTED_DEVICE);
|
|
|
|
object_initialize_child(obj, "espi", &s->espi, TYPE_UNIMPLEMENTED_DEVICE);
|
|
|
|
object_initialize_child(obj, "udc", &s->udc, TYPE_UNIMPLEMENTED_DEVICE);
|
|
|
|
object_initialize_child(obj, "sgpiom", &s->sgpiom,
|
|
|
|
TYPE_UNIMPLEMENTED_DEVICE);
|
|
|
|
object_initialize_child(obj, "jtag[0]", &s->jtag[0],
|
|
|
|
TYPE_UNIMPLEMENTED_DEVICE);
|
|
|
|
object_initialize_child(obj, "jtag[1]", &s->jtag[1],
|
|
|
|
TYPE_UNIMPLEMENTED_DEVICE);
|
2022-05-02 18:03:03 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void aspeed_soc_ast1030_realize(DeviceState *dev_soc, Error **errp)
|
|
|
|
{
|
2023-10-24 19:24:20 +03:00
|
|
|
Aspeed10x0SoCState *a = ASPEED10X0_SOC(dev_soc);
|
2022-05-02 18:03:03 +03:00
|
|
|
AspeedSoCState *s = ASPEED_SOC(dev_soc);
|
|
|
|
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
|
|
|
|
DeviceState *armv7m;
|
|
|
|
Error *err = NULL;
|
|
|
|
int i;
|
2022-07-14 17:24:38 +03:00
|
|
|
g_autofree char *sram_name = NULL;
|
2022-05-02 18:03:03 +03:00
|
|
|
|
|
|
|
if (!clock_has_source(s->sysclk)) {
|
|
|
|
error_setg(errp, "sysclk clock must be wired up by the board code");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* General I/O memory space to catch all unimplemented device */
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->iomem), "aspeed.io",
|
|
|
|
sc->memmap[ASPEED_DEV_IOMEM],
|
|
|
|
ASPEED_SOC_IOMEM_SIZE);
|
|
|
|
aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->sbc_unimplemented),
|
|
|
|
"aspeed.sbc", sc->memmap[ASPEED_DEV_SBC],
|
|
|
|
0x40000);
|
2022-05-02 18:03:03 +03:00
|
|
|
|
|
|
|
/* AST1030 CPU Core */
|
2023-10-24 19:24:20 +03:00
|
|
|
armv7m = DEVICE(&a->armv7m);
|
2022-05-02 18:03:03 +03:00
|
|
|
qdev_prop_set_uint32(armv7m, "num-irq", 256);
|
|
|
|
qdev_prop_set_string(armv7m, "cpu-type", sc->cpu_type);
|
|
|
|
qdev_connect_clock_in(armv7m, "cpuclk", s->sysclk);
|
2023-10-24 19:24:20 +03:00
|
|
|
object_property_set_link(OBJECT(&a->armv7m), "memory",
|
2022-06-30 10:21:13 +03:00
|
|
|
OBJECT(s->memory), &error_abort);
|
2023-10-24 19:24:20 +03:00
|
|
|
sysbus_realize(SYS_BUS_DEVICE(&a->armv7m), &error_abort);
|
2022-05-02 18:03:03 +03:00
|
|
|
|
|
|
|
/* Internal SRAM */
|
2022-07-14 17:24:38 +03:00
|
|
|
sram_name = g_strdup_printf("aspeed.sram.%d",
|
2023-10-24 19:24:20 +03:00
|
|
|
CPU(a->armv7m.cpu)->cpu_index);
|
2022-07-14 17:24:38 +03:00
|
|
|
memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, &err);
|
2022-05-02 18:03:03 +03:00
|
|
|
if (err != NULL) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2022-06-30 10:21:13 +03:00
|
|
|
memory_region_add_subregion(s->memory,
|
2022-05-02 18:03:03 +03:00
|
|
|
sc->memmap[ASPEED_DEV_SRAM],
|
|
|
|
&s->sram);
|
hw/arm/aspeed_ast10x0: Map the secure SRAM
Some SRAM appears to be used by the Secure Boot unit and
crypto accelerators. Name it 'secure sram'.
Note, the SRAM base address was already present but unused
(the 'SBC' index is used for the MMIO peripheral).
Interestingly using CFLAGS=-Winitializer-overrides reports:
../hw/arm/aspeed_ast10x0.c:32:30: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ASPEED_DEV_SBC] = 0x7E6F2000,
^~~~~~~~~~
../hw/arm/aspeed_ast10x0.c:24:30: note: previous initialization is here
[ASPEED_DEV_SBC] = 0x79000000,
^~~~~~~~~~
This fixes with Zephyr:
uart:~$ rsa test
rsa test vector[0]:
[00:00:26.156,000] <err> os: ***** BUS FAULT *****
[00:00:26.157,000] <err> os: Precise data bus error
[00:00:26.157,000] <err> os: BFAR Address: 0x79000000
[00:00:26.158,000] <err> os: r0/a1: 0x79000000 r1/a2: 0x00000000 r2/a3: 0x00001800
[00:00:26.158,000] <err> os: r3/a4: 0x79001800 r12/ip: 0x00000800 r14/lr: 0x0001098d
[00:00:26.158,000] <err> os: xpsr: 0x81000000
[00:00:26.158,000] <err> os: Faulting instruction address (r15/pc): 0x0001e1bc
[00:00:26.158,000] <err> os: >>> ZEPHYR FATAL ERROR 0: CPU exception on CPU 0
[00:00:26.158,000] <err> os: Current thread: 0x38248 (shell_uart)
[00:00:26.165,000] <err> os: Halting system
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Delevoryas <peter@pjd.dev>
[ clg: Fixed size of Secure Boot Controller Memory ]
Signed-off-by: Cédric Le Goater <clg@kaod.org>
2023-02-07 11:02:05 +03:00
|
|
|
memory_region_init_ram(&s->secsram, OBJECT(s), "sec.sram",
|
|
|
|
sc->secsram_size, &err);
|
|
|
|
if (err != NULL) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
memory_region_add_subregion(s->memory, sc->memmap[ASPEED_DEV_SECSRAM],
|
|
|
|
&s->secsram);
|
2022-05-02 18:03:03 +03:00
|
|
|
|
|
|
|
/* SCU */
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_SCU]);
|
2022-05-02 18:03:03 +03:00
|
|
|
|
2022-06-13 15:05:48 +03:00
|
|
|
/* I2C */
|
|
|
|
|
|
|
|
object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(&s->sram),
|
|
|
|
&error_abort);
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->i2c), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->i2c), 0, sc->memmap[ASPEED_DEV_I2C]);
|
2022-06-13 15:05:48 +03:00
|
|
|
for (i = 0; i < ASPEED_I2C_GET_CLASS(&s->i2c)->num_busses; i++) {
|
2023-10-24 19:24:20 +03:00
|
|
|
qemu_irq irq = qdev_get_gpio_in(DEVICE(&a->armv7m),
|
2022-06-13 15:05:48 +03:00
|
|
|
sc->irqmap[ASPEED_DEV_I2C] + i);
|
|
|
|
/* The AST1030 I2C controller has one IRQ per bus. */
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c.busses[i]), 0, irq);
|
|
|
|
}
|
|
|
|
|
2023-02-07 11:02:05 +03:00
|
|
|
/* I3C */
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->i3c), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->i3c), 0, sc->memmap[ASPEED_DEV_I3C]);
|
|
|
|
for (i = 0; i < ASPEED_I3C_NR_DEVICES; i++) {
|
2023-10-24 19:24:20 +03:00
|
|
|
qemu_irq irq = qdev_get_gpio_in(DEVICE(&a->armv7m),
|
2023-02-07 11:02:05 +03:00
|
|
|
sc->irqmap[ASPEED_DEV_I3C] + i);
|
|
|
|
/* The AST1030 I3C controller has one IRQ per bus. */
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->i3c.devices[i]), 0, irq);
|
|
|
|
}
|
|
|
|
|
2022-06-30 10:21:14 +03:00
|
|
|
/* PECI */
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->peci), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->peci), 0,
|
|
|
|
sc->memmap[ASPEED_DEV_PECI]);
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->peci), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_DEV_PECI));
|
|
|
|
|
2022-05-02 18:03:03 +03:00
|
|
|
/* LPC */
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->lpc), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->lpc), 0, sc->memmap[ASPEED_DEV_LPC]);
|
2022-05-02 18:03:03 +03:00
|
|
|
|
|
|
|
/* Connect the LPC IRQ to the GIC. It is otherwise unused. */
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->lpc), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_DEV_LPC));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* On the AST1030 LPC subdevice IRQs are connected straight to the GIC.
|
|
|
|
*/
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->lpc), 1 + aspeed_lpc_kcs_1,
|
2023-10-24 19:24:20 +03:00
|
|
|
qdev_get_gpio_in(DEVICE(&a->armv7m),
|
2022-05-02 18:03:03 +03:00
|
|
|
sc->irqmap[ASPEED_DEV_KCS] + aspeed_lpc_kcs_1));
|
|
|
|
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->lpc), 1 + aspeed_lpc_kcs_2,
|
2023-10-24 19:24:20 +03:00
|
|
|
qdev_get_gpio_in(DEVICE(&a->armv7m),
|
2022-05-02 18:03:03 +03:00
|
|
|
sc->irqmap[ASPEED_DEV_KCS] + aspeed_lpc_kcs_2));
|
|
|
|
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->lpc), 1 + aspeed_lpc_kcs_3,
|
2023-10-24 19:24:20 +03:00
|
|
|
qdev_get_gpio_in(DEVICE(&a->armv7m),
|
2022-05-02 18:03:03 +03:00
|
|
|
sc->irqmap[ASPEED_DEV_KCS] + aspeed_lpc_kcs_3));
|
|
|
|
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->lpc), 1 + aspeed_lpc_kcs_4,
|
2023-10-24 19:24:20 +03:00
|
|
|
qdev_get_gpio_in(DEVICE(&a->armv7m),
|
2022-05-02 18:03:03 +03:00
|
|
|
sc->irqmap[ASPEED_DEV_KCS] + aspeed_lpc_kcs_4));
|
|
|
|
|
2022-05-25 11:31:33 +03:00
|
|
|
/* UART */
|
aspeed: Refactor UART init for multi-SoC machines
This change moves the code that connects the SoC UART's to serial_hd's
to the machine.
It makes each UART a proper child member of the SoC, and then allows the
machine to selectively initialize the chardev for each UART with a
serial_hd.
This should preserve backwards compatibility, but also allow multi-SoC
boards to completely change the wiring of serial devices from the
command line to specific SoC UART's.
This also removes the uart-default property from the SoC, since the SoC
doesn't need to know what UART is the "default" on the machine anymore.
I tested this using the images and commands from the previous
refactoring, and another test image for the ast1030:
wget https://github.com/facebook/openbmc/releases/download/v2021.49.0/fuji.mtd
wget https://github.com/facebook/openbmc/releases/download/v2021.49.0/wedge100.mtd
wget https://github.com/peterdelevoryas/OpenBIC/releases/download/oby35-cl-2022.13.01/Y35BCL.elf
Fuji uses UART1:
qemu-system-arm -machine fuji-bmc \
-drive file=fuji.mtd,format=raw,if=mtd \
-nographic
ast2600-evb uses uart-default=UART5:
qemu-system-arm -machine ast2600-evb \
-drive file=fuji.mtd,format=raw,if=mtd \
-serial null -serial mon:stdio -display none
Wedge100 uses UART3:
qemu-system-arm -machine palmetto-bmc \
-drive file=wedge100.mtd,format=raw,if=mtd \
-serial null -serial null -serial null \
-serial mon:stdio -display none
AST1030 EVB uses UART5:
qemu-system-arm -machine ast1030-evb \
-kernel Y35BCL.elf -nographic
Fixes: 6827ff20b2975 ("hw: aspeed: Init all UART's with serial devices")
Signed-off-by: Peter Delevoryas <peter@pjd.dev>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20220705191400.41632-4-peter@pjd.dev>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
2022-07-14 17:24:38 +03:00
|
|
|
if (!aspeed_soc_uart_realize(s, errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2022-05-02 18:03:03 +03:00
|
|
|
|
|
|
|
/* Timer */
|
|
|
|
object_property_set_link(OBJECT(&s->timerctrl), "scu", OBJECT(&s->scu),
|
|
|
|
&error_abort);
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->timerctrl), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->timerctrl), 0,
|
2022-05-02 18:03:03 +03:00
|
|
|
sc->memmap[ASPEED_DEV_TIMER1]);
|
|
|
|
for (i = 0; i < ASPEED_TIMER_NR_TIMERS; i++) {
|
|
|
|
qemu_irq irq = aspeed_soc_get_irq(s, ASPEED_DEV_TIMER1 + i);
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->timerctrl), i, irq);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ADC */
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->adc), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->adc), 0, sc->memmap[ASPEED_DEV_ADC]);
|
2022-05-02 18:03:03 +03:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->adc), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_DEV_ADC));
|
|
|
|
|
|
|
|
/* FMC, The number of CS is set at the board level */
|
|
|
|
object_property_set_link(OBJECT(&s->fmc), "dram", OBJECT(&s->sram),
|
|
|
|
&error_abort);
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->fmc), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 0, sc->memmap[ASPEED_DEV_FMC]);
|
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 1,
|
2022-05-02 18:03:03 +03:00
|
|
|
ASPEED_SMC_GET_CLASS(&s->fmc)->flash_window_base);
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->fmc), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_DEV_FMC));
|
|
|
|
|
|
|
|
/* SPI */
|
|
|
|
for (i = 0; i < sc->spis_num; i++) {
|
|
|
|
object_property_set_link(OBJECT(&s->spi[i]), "dram",
|
|
|
|
OBJECT(&s->sram), &error_abort);
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 0,
|
2022-05-02 18:03:03 +03:00
|
|
|
sc->memmap[ASPEED_DEV_SPI1 + i]);
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 1,
|
2022-05-02 18:03:03 +03:00
|
|
|
ASPEED_SMC_GET_CLASS(&s->spi[i])->flash_window_base);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Secure Boot Controller */
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->sbc), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sbc), 0, sc->memmap[ASPEED_DEV_SBC]);
|
2022-05-02 18:03:03 +03:00
|
|
|
|
hw/arm/aspeed_ast10x0: Map HACE peripheral
Since I don't have access to the datasheet, the relevant
values were found in:
https://github.com/AspeedTech-BMC/zephyr/blob/v00.01.08/dts/arm/aspeed/ast10x0.dtsi
Before on Zephyr:
uart:~$ hash test
sha256_test
tv[0]:hash_final error
sha384_test
tv[0]:hash_final error
sha512_test
tv[0]:hash_final error
[00:00:06.278,000] <err> hace_global: HACE poll timeout
[00:00:09.324,000] <err> hace_global: HACE poll timeout
[00:00:12.261,000] <err> hace_global: HACE poll timeout
uart:~$ crypto aes256_cbc_vault
aes256_cbc vault key 1
[00:00:06.699,000] <inf> hace_global: aspeed_crypto_session_setup
[00:00:06.699,000] <inf> hace_global: data->cmd: 1c2098
[00:00:06.699,000] <inf> hace_global: crypto_data_src: 93340
[00:00:06.699,000] <inf> hace_global: crypto_data_dst: 93348
[00:00:06.699,000] <inf> hace_global: crypto_ctx_base: 93300
[00:00:06.699,000] <inf> hace_global: crypto_data_len: 80000040
[00:00:06.699,000] <inf> hace_global: crypto_cmd_reg: 11c2098
[00:00:09.743,000] <inf> hace_global: HACE_STS: 0
[00:00:09.743,000] <err> hace_global: HACE poll timeout
[00:00:09.743,000] <err> crypto: CBC mode ENCRYPT - Failed
[00:00:09.743,000] <inf> hace_global: aspeed_crypto_session_free
uart:~$
After:
uart:~$ hash test
sha256_test
tv[0]:PASS
tv[1]:PASS
tv[2]:PASS
tv[3]:PASS
tv[4]:PASS
sha384_test
tv[0]:PASS
tv[1]:PASS
tv[2]:PASS
tv[3]:PASS
tv[4]:PASS
tv[5]:PASS
sha512_test
tv[0]:PASS
tv[1]:PASS
tv[2]:PASS
tv[3]:PASS
tv[4]:PASS
tv[5]:PASS
uart:~$ crypto aes256_cbc_vault
aes256_cbc vault key 1
Was waiting for:
6b c1 be e2 2e 40 9f 96 e9 3d 7e 11 73 93 17 2a
ae 2d 8a 57 1e 03 ac 9c 9e b7 6f ac 45 af 8e 51
30 c8 1c 46 a3 5c e4 11 e5 fb c1 19 1a 0a 52 ef
f6 9f 24 45 df 4f 9b 17 ad 2b 41 7b e6 6c 37 10
But got:
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
[00:00:05.771,000] <inf> hace_global: aspeed_crypto_session_setup
[00:00:05.772,000] <inf> hace_global: data->cmd: 1c2098
[00:00:05.772,000] <inf> hace_global: crypto_data_src: 93340
[00:00:05.772,000] <inf> hace_global: crypto_data_dst: 93348
[00:00:05.772,000] <inf> hace_global: crypto_ctx_base: 93300
[00:00:05.772,000] <inf> hace_global: crypto_data_len: 80000040
[00:00:05.772,000] <inf> hace_global: crypto_cmd_reg: 11c2098
[00:00:05.772,000] <inf> hace_global: HACE_STS: 1000
[00:00:05.772,000] <inf> crypto: Output length (encryption): 80
[00:00:05.772,000] <inf> hace_global: aspeed_crypto_session_free
[00:00:05.772,000] <inf> hace_global: aspeed_crypto_session_setup
[00:00:05.772,000] <inf> hace_global: data->cmd: 1c2018
[00:00:05.772,000] <inf> hace_global: crypto_data_src: 93340
[00:00:05.772,000] <inf> hace_global: crypto_data_dst: 93348
[00:00:05.772,000] <inf> hace_global: crypto_ctx_base: 93300
[00:00:05.772,000] <inf> hace_global: crypto_data_len: 80000040
[00:00:05.772,000] <inf> hace_global: crypto_cmd_reg: 11c2018
[00:00:05.772,000] <inf> hace_global: HACE_STS: 1000
[00:00:05.772,000] <inf> crypto: Output length (decryption): 64
[00:00:05.772,000] <err> crypto: CBC mode DECRYPT - Mismatch between plaintext and decrypted cipher text
[00:00:05.774,000] <inf> hace_global: aspeed_crypto_session_free
uart:~$
Reviewed-by: Peter Delevoryas <peter@pjd.dev>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
2023-02-07 11:02:05 +03:00
|
|
|
/* HACE */
|
|
|
|
object_property_set_link(OBJECT(&s->hace), "dram", OBJECT(&s->sram),
|
|
|
|
&error_abort);
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->hace), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->hace), 0,
|
|
|
|
sc->memmap[ASPEED_DEV_HACE]);
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->hace), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_DEV_HACE));
|
|
|
|
|
2022-05-02 18:03:03 +03:00
|
|
|
/* Watch dog */
|
|
|
|
for (i = 0; i < sc->wdts_num; i++) {
|
|
|
|
AspeedWDTClass *awc = ASPEED_WDT_GET_CLASS(&s->wdt[i]);
|
2023-02-07 11:02:05 +03:00
|
|
|
hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT] + i * awc->iosize;
|
2022-05-02 18:03:03 +03:00
|
|
|
|
|
|
|
object_property_set_link(OBJECT(&s->wdt[i]), "scu", OBJECT(&s->scu),
|
|
|
|
&error_abort);
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->wdt[i]), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2023-02-07 11:02:05 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->wdt[i]), 0, wdt_offset);
|
2022-05-02 18:03:03 +03:00
|
|
|
}
|
2022-05-25 11:31:33 +03:00
|
|
|
|
|
|
|
/* GPIO */
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpio), errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2022-06-30 10:21:13 +03:00
|
|
|
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->gpio), 0,
|
|
|
|
sc->memmap[ASPEED_DEV_GPIO]);
|
2022-05-25 11:31:33 +03:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_DEV_GPIO));
|
2023-02-07 11:02:05 +03:00
|
|
|
|
|
|
|
aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->pwm), "aspeed.pwm",
|
|
|
|
sc->memmap[ASPEED_DEV_PWM], 0x100);
|
|
|
|
|
|
|
|
aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->espi), "aspeed.espi",
|
|
|
|
sc->memmap[ASPEED_DEV_ESPI], 0x800);
|
|
|
|
|
|
|
|
aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->udc), "aspeed.udc",
|
|
|
|
sc->memmap[ASPEED_DEV_UDC], 0x1000);
|
|
|
|
aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->sgpiom), "aspeed.sgpiom",
|
|
|
|
sc->memmap[ASPEED_DEV_SGPIOM], 0x100);
|
|
|
|
|
|
|
|
aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->jtag[0]), "aspeed.jtag",
|
|
|
|
sc->memmap[ASPEED_DEV_JTAG0], 0x20);
|
|
|
|
aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->jtag[1]), "aspeed.jtag",
|
|
|
|
sc->memmap[ASPEED_DEV_JTAG1], 0x20);
|
2022-05-02 18:03:03 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void aspeed_soc_ast1030_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
AspeedSoCClass *sc = ASPEED_SOC_CLASS(dc);
|
|
|
|
|
|
|
|
dc->realize = aspeed_soc_ast1030_realize;
|
|
|
|
|
|
|
|
sc->name = "ast1030-a1";
|
2023-02-07 11:02:05 +03:00
|
|
|
sc->cpu_type = ARM_CPU_TYPE_NAME("cortex-m4"); /* TODO cortex-m4f */
|
2022-05-02 18:03:03 +03:00
|
|
|
sc->silicon_rev = AST1030_A1_SILICON_REV;
|
|
|
|
sc->sram_size = 0xc0000;
|
hw/arm/aspeed_ast10x0: Map the secure SRAM
Some SRAM appears to be used by the Secure Boot unit and
crypto accelerators. Name it 'secure sram'.
Note, the SRAM base address was already present but unused
(the 'SBC' index is used for the MMIO peripheral).
Interestingly using CFLAGS=-Winitializer-overrides reports:
../hw/arm/aspeed_ast10x0.c:32:30: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ASPEED_DEV_SBC] = 0x7E6F2000,
^~~~~~~~~~
../hw/arm/aspeed_ast10x0.c:24:30: note: previous initialization is here
[ASPEED_DEV_SBC] = 0x79000000,
^~~~~~~~~~
This fixes with Zephyr:
uart:~$ rsa test
rsa test vector[0]:
[00:00:26.156,000] <err> os: ***** BUS FAULT *****
[00:00:26.157,000] <err> os: Precise data bus error
[00:00:26.157,000] <err> os: BFAR Address: 0x79000000
[00:00:26.158,000] <err> os: r0/a1: 0x79000000 r1/a2: 0x00000000 r2/a3: 0x00001800
[00:00:26.158,000] <err> os: r3/a4: 0x79001800 r12/ip: 0x00000800 r14/lr: 0x0001098d
[00:00:26.158,000] <err> os: xpsr: 0x81000000
[00:00:26.158,000] <err> os: Faulting instruction address (r15/pc): 0x0001e1bc
[00:00:26.158,000] <err> os: >>> ZEPHYR FATAL ERROR 0: CPU exception on CPU 0
[00:00:26.158,000] <err> os: Current thread: 0x38248 (shell_uart)
[00:00:26.165,000] <err> os: Halting system
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Delevoryas <peter@pjd.dev>
[ clg: Fixed size of Secure Boot Controller Memory ]
Signed-off-by: Cédric Le Goater <clg@kaod.org>
2023-02-07 11:02:05 +03:00
|
|
|
sc->secsram_size = 0x40000; /* 256 * KiB */
|
2022-05-02 18:03:03 +03:00
|
|
|
sc->spis_num = 2;
|
|
|
|
sc->ehcis_num = 0;
|
|
|
|
sc->wdts_num = 4;
|
|
|
|
sc->macs_num = 1;
|
2022-05-25 11:31:33 +03:00
|
|
|
sc->uarts_num = 13;
|
2022-05-02 18:03:03 +03:00
|
|
|
sc->irqmap = aspeed_soc_ast1030_irqmap;
|
|
|
|
sc->memmap = aspeed_soc_ast1030_memmap;
|
|
|
|
sc->num_cpus = 1;
|
2022-05-25 11:31:33 +03:00
|
|
|
sc->get_irq = aspeed_soc_ast1030_get_irq;
|
2022-05-02 18:03:03 +03:00
|
|
|
}
|
|
|
|
|
2023-10-24 19:24:16 +03:00
|
|
|
static const TypeInfo aspeed_soc_ast10x0_types[] = {
|
|
|
|
{
|
|
|
|
.name = TYPE_ASPEED10X0_SOC,
|
|
|
|
.parent = TYPE_ASPEED_SOC,
|
|
|
|
.instance_size = sizeof(Aspeed10x0SoCState),
|
|
|
|
.abstract = true,
|
|
|
|
}, {
|
|
|
|
.name = "ast1030-a1",
|
|
|
|
.parent = TYPE_ASPEED10X0_SOC,
|
|
|
|
.instance_init = aspeed_soc_ast1030_init,
|
|
|
|
.class_init = aspeed_soc_ast1030_class_init,
|
|
|
|
},
|
2022-05-02 18:03:03 +03:00
|
|
|
};
|
|
|
|
|
2023-10-24 19:24:16 +03:00
|
|
|
DEFINE_TYPES(aspeed_soc_ast10x0_types)
|