mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aspeed: Support AST2600A1 silicon revision

Browse Source 
There are minimal differences from Qemu's point of view between the A0
and A1 silicon revisions.

As the A1 exercises different code paths in u-boot it is desirable to
emulate that instead.

Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-id: 20200504093703.261135-1-joel@jms.id.au
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Joel Stanley 2020-05-04 19:07:03 +09:30 committed by Peter Maydell
parent 93dd1e6140
commit 7582591ae7
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/arm/aspeed.c
View File

@ -93,7 +93,7 @@ struct AspeedBoardState {
/* Tacoma hardware value */ /* Tacoma hardware value */
#define TACOMA_BMC_HW_STRAP1 0x00000000 #define TACOMA_BMC_HW_STRAP1 0x00000000
#define TACOMA_BMC_HW_STRAP2 0x00000000 #define TACOMA_BMC_HW_STRAP2 0x00000040
/* /*
* The max ram region is for firmwares that scan the address space * The max ram region is for firmwares that scan the address space
@ -585,7 +585,7 @@ static void aspeed_machine_ast2600_evb_class_init(ObjectClass *oc, void *data)
AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
mc->desc = "Aspeed AST2600 EVB (Cortex A7)"; mc->desc = "Aspeed AST2600 EVB (Cortex A7)";
amc->soc_name = "ast2600-a0"; amc->soc_name = "ast2600-a1";
amc->hw_strap1 = AST2600_EVB_HW_STRAP1; amc->hw_strap1 = AST2600_EVB_HW_STRAP1;
amc->hw_strap2 = AST2600_EVB_HW_STRAP2; amc->hw_strap2 = AST2600_EVB_HW_STRAP2;
amc->fmc_model = "w25q512jv"; amc->fmc_model = "w25q512jv";
@ -600,8 +600,8 @@ static void aspeed_machine_tacoma_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
mc->desc = "Aspeed AST2600 EVB (Cortex A7)"; mc->desc = "OpenPOWER Tacoma BMC (Cortex A7)";
amc->soc_name = "ast2600-a0"; amc->soc_name = "ast2600-a1";
amc->hw_strap1 = TACOMA_BMC_HW_STRAP1; amc->hw_strap1 = TACOMA_BMC_HW_STRAP1;
amc->hw_strap2 = TACOMA_BMC_HW_STRAP2; amc->hw_strap2 = TACOMA_BMC_HW_STRAP2;
amc->fmc_model = "mx66l1g45g"; amc->fmc_model = "mx66l1g45g";

6
hw/arm/aspeed_ast2600.c
View File

@ -557,9 +557,9 @@ static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data)
dc->realize = aspeed_soc_ast2600_realize; dc->realize = aspeed_soc_ast2600_realize;
sc->name = "ast2600-a0"; sc->name = "ast2600-a1";
sc->cpu_type = ARM_CPU_TYPE_NAME("cortex-a7"); sc->cpu_type = ARM_CPU_TYPE_NAME("cortex-a7");
sc->silicon_rev = AST2600_A0_SILICON_REV; sc->silicon_rev = AST2600_A1_SILICON_REV;
sc->sram_size = 0x10000; sc->sram_size = 0x10000;
sc->spis_num = 2; sc->spis_num = 2;
sc->ehcis_num = 2; sc->ehcis_num = 2;
@ -571,7 +571,7 @@ static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data)
} }
static const TypeInfo aspeed_soc_ast2600_type_info = { static const TypeInfo aspeed_soc_ast2600_type_info = {
.name = "ast2600-a0", .name = "ast2600-a1",
.parent = TYPE_ASPEED_SOC, .parent = TYPE_ASPEED_SOC,
.instance_size = sizeof(AspeedSoCState), .instance_size = sizeof(AspeedSoCState),
.instance_init = aspeed_soc_ast2600_init, .instance_init = aspeed_soc_ast2600_init,

11
hw/misc/aspeed_scu.c
View File

@ -431,6 +431,7 @@ static uint32_t aspeed_silicon_revs[] = {
AST2500_A0_SILICON_REV, AST2500_A0_SILICON_REV,
AST2500_A1_SILICON_REV, AST2500_A1_SILICON_REV,
AST2600_A0_SILICON_REV, AST2600_A0_SILICON_REV,
AST2600_A1_SILICON_REV,
}; };
bool is_supported_silicon_rev(uint32_t silicon_rev) bool is_supported_silicon_rev(uint32_t silicon_rev)
@ -649,12 +650,10 @@ static const MemoryRegionOps aspeed_ast2600_scu_ops = {
.valid.unaligned = false, .valid.unaligned = false,
}; };
static const uint32_t ast2600_a0_resets[ASPEED_AST2600_SCU_NR_REGS] = { static const uint32_t ast2600_a1_resets[ASPEED_AST2600_SCU_NR_REGS] = {
[AST2600_SILICON_REV] = AST2600_SILICON_REV, [AST2600_SYS_RST_CTRL] = 0xF7C3FED8,
[AST2600_SILICON_REV2] = AST2600_SILICON_REV,
[AST2600_SYS_RST_CTRL] = 0xF7CFFEDC | 0x100,
[AST2600_SYS_RST_CTRL2] = 0xFFFFFFFC, [AST2600_SYS_RST_CTRL2] = 0xFFFFFFFC,
[AST2600_CLK_STOP_CTRL] = 0xEFF43E8B, [AST2600_CLK_STOP_CTRL] = 0xFFFF7F8A,
[AST2600_CLK_STOP_CTRL2] = 0xFFF0FFF0, [AST2600_CLK_STOP_CTRL2] = 0xFFF0FFF0,
[AST2600_SDRAM_HANDSHAKE] = 0x00000040, /* SoC completed DRAM init */ [AST2600_SDRAM_HANDSHAKE] = 0x00000040, /* SoC completed DRAM init */
[AST2600_HPLL_PARAM] = 0x1000405F, [AST2600_HPLL_PARAM] = 0x1000405F,
@ -684,7 +683,7 @@ static void aspeed_2600_scu_class_init(ObjectClass *klass, void *data)
dc->desc = "ASPEED 2600 System Control Unit"; dc->desc = "ASPEED 2600 System Control Unit";
dc->reset = aspeed_ast2600_scu_reset; dc->reset = aspeed_ast2600_scu_reset;
asc->resets = ast2600_a0_resets; asc->resets = ast2600_a1_resets;
asc->calc_hpll = aspeed_2500_scu_calc_hpll; /* No change since AST2500 */ asc->calc_hpll = aspeed_2500_scu_calc_hpll; /* No change since AST2500 */
asc->apb_divider = 4; asc->apb_divider = 4;
asc->nr_regs = ASPEED_AST2600_SCU_NR_REGS; asc->nr_regs = ASPEED_AST2600_SCU_NR_REGS;

1
include/hw/misc/aspeed_scu.h
View File

@ -41,6 +41,7 @@ typedef struct AspeedSCUState {
#define AST2500_A0_SILICON_REV 0x04000303U #define AST2500_A0_SILICON_REV 0x04000303U
#define AST2500_A1_SILICON_REV 0x04010303U #define AST2500_A1_SILICON_REV 0x04010303U
#define AST2600_A0_SILICON_REV 0x05000303U #define AST2600_A0_SILICON_REV 0x05000303U
#define AST2600_A1_SILICON_REV 0x05010303U
#define ASPEED_IS_AST2500(si_rev) ((((si_rev) >> 24) & 0xff) == 0x04) #define ASPEED_IS_AST2500(si_rev) ((((si_rev) >> 24) & 0xff) == 0x04)