|
@@ -213,6 +213,11 @@ static uint32_t aspeed_scu_get_random(void)
|
|
|
}
|
|
|
|
|
|
uint32_t aspeed_scu_get_apb_freq(AspeedSCUState *s)
|
|
|
+{
|
|
|
+ return ASPEED_SCU_GET_CLASS(s)->get_apb(s);
|
|
|
+}
|
|
|
+
|
|
|
+static uint32_t aspeed_2400_scu_get_apb_freq(AspeedSCUState *s)
|
|
|
{
|
|
|
AspeedSCUClass *asc = ASPEED_SCU_GET_CLASS(s);
|
|
|
uint32_t hpll = asc->calc_hpll(s, s->regs[HPLL_PARAM]);
|
|
@@ -221,6 +226,15 @@ uint32_t aspeed_scu_get_apb_freq(AspeedSCUState *s)
|
|
|
/ asc->apb_divider;
|
|
|
}
|
|
|
|
|
|
+static uint32_t aspeed_2600_scu_get_apb_freq(AspeedSCUState *s)
|
|
|
+{
|
|
|
+ AspeedSCUClass *asc = ASPEED_SCU_GET_CLASS(s);
|
|
|
+ uint32_t hpll = asc->calc_hpll(s, s->regs[AST2600_HPLL_PARAM]);
|
|
|
+
|
|
|
+ return hpll / (SCU_CLK_GET_PCLK_DIV(s->regs[AST2600_CLK_SEL]) + 1)
|
|
|
+ / asc->apb_divider;
|
|
|
+}
|
|
|
+
|
|
|
static uint64_t aspeed_scu_read(void *opaque, hwaddr offset, unsigned size)
|
|
|
{
|
|
|
AspeedSCUState *s = ASPEED_SCU(opaque);
|
|
@@ -426,6 +440,26 @@ static uint32_t aspeed_2500_scu_calc_hpll(AspeedSCUState *s, uint32_t hpll_reg)
|
|
|
return clkin * multiplier;
|
|
|
}
|
|
|
|
|
|
+static uint32_t aspeed_2600_scu_calc_hpll(AspeedSCUState *s, uint32_t hpll_reg)
|
|
|
+{
|
|
|
+ uint32_t multiplier = 1;
|
|
|
+ uint32_t clkin = aspeed_scu_get_clkin(s);
|
|
|
+
|
|
|
+ if (hpll_reg & SCU_AST2600_H_PLL_OFF) {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!(hpll_reg & SCU_AST2600_H_PLL_BYPASS_EN)) {
|
|
|
+ uint32_t p = (hpll_reg >> 19) & 0xf;
|
|
|
+ uint32_t n = (hpll_reg >> 13) & 0x3f;
|
|
|
+ uint32_t m = hpll_reg & 0x1fff;
|
|
|
+
|
|
|
+ multiplier = ((m + 1) / (n + 1)) / (p + 1);
|
|
|
+ }
|
|
|
+
|
|
|
+ return clkin * multiplier;
|
|
|
+}
|
|
|
+
|
|
|
static void aspeed_scu_reset(DeviceState *dev)
|
|
|
{
|
|
|
AspeedSCUState *s = ASPEED_SCU(dev);
|
|
@@ -525,6 +559,7 @@ static void aspeed_2400_scu_class_init(ObjectClass *klass, void *data)
|
|
|
dc->desc = "ASPEED 2400 System Control Unit";
|
|
|
asc->resets = ast2400_a0_resets;
|
|
|
asc->calc_hpll = aspeed_2400_scu_calc_hpll;
|
|
|
+ asc->get_apb = aspeed_2400_scu_get_apb_freq;
|
|
|
asc->apb_divider = 2;
|
|
|
asc->nr_regs = ASPEED_SCU_NR_REGS;
|
|
|
asc->ops = &aspeed_ast2400_scu_ops;
|
|
@@ -545,6 +580,7 @@ static void aspeed_2500_scu_class_init(ObjectClass *klass, void *data)
|
|
|
dc->desc = "ASPEED 2500 System Control Unit";
|
|
|
asc->resets = ast2500_a1_resets;
|
|
|
asc->calc_hpll = aspeed_2500_scu_calc_hpll;
|
|
|
+ asc->get_apb = aspeed_2400_scu_get_apb_freq;
|
|
|
asc->apb_divider = 4;
|
|
|
asc->nr_regs = ASPEED_SCU_NR_REGS;
|
|
|
asc->ops = &aspeed_ast2500_scu_ops;
|
|
@@ -716,7 +752,8 @@ static void aspeed_2600_scu_class_init(ObjectClass *klass, void *data)
|
|
|
dc->desc = "ASPEED 2600 System Control Unit";
|
|
|
dc->reset = aspeed_ast2600_scu_reset;
|
|
|
asc->resets = ast2600_a3_resets;
|
|
|
- asc->calc_hpll = aspeed_2500_scu_calc_hpll; /* No change since AST2500 */
|
|
|
+ asc->calc_hpll = aspeed_2600_scu_calc_hpll;
|
|
|
+ asc->get_apb = aspeed_2600_scu_get_apb_freq;
|
|
|
asc->apb_divider = 4;
|
|
|
asc->nr_regs = ASPEED_AST2600_SCU_NR_REGS;
|
|
|
asc->ops = &aspeed_ast2600_scu_ops;
|