On Thu, Aug 12, 2021 at 7:37 PM Peter Maydell <peter.mayd...@linaro.org> wrote:
>
> Wire up the sysclk and refclk for the stm32f100 SoC. This SoC always
> runs the systick refclk at 1/8 the frequency of the main CPU clock,
> so the board code only needs to provide a single sysclk clock.
>
> Because there is only one board using this SoC, we convert the SoC
> and the board together, rather than splitting it into "add clock to
> SoC; connect clock in board; add error check in SoC code that clock
> is wired up".
>
> When the systick device starts honouring its clock inputs, this will
> fix an emulation inaccuracy in the stm32vldiscovery board where the
> systick reference clock was running at 1MHz rather than 3MHz.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> include/hw/arm/stm32f100_soc.h | 4 ++++
> hw/arm/stm32f100_soc.c | 30 ++++++++++++++++++++++++++++++
> hw/arm/stm32vldiscovery.c | 12 +++++++-----
> 3 files changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/include/hw/arm/stm32f100_soc.h b/include/hw/arm/stm32f100_soc.h
> index b7d71c6c634..40cd415b284 100644
> --- a/include/hw/arm/stm32f100_soc.h
> +++ b/include/hw/arm/stm32f100_soc.h
> @@ -29,6 +29,7 @@
> #include "hw/ssi/stm32f2xx_spi.h"
> #include "hw/arm/armv7m.h"
> #include "qom/object.h"
> +#include "hw/clock.h"
>
> #define TYPE_STM32F100_SOC "stm32f100-soc"
> OBJECT_DECLARE_SIMPLE_TYPE(STM32F100State, STM32F100_SOC)
> @@ -56,6 +57,9 @@ struct STM32F100State {
> MemoryRegion sram;
> MemoryRegion flash;
> MemoryRegion flash_alias;
> +
> + Clock *sysclk;
> + Clock *refclk;
> };
>
> #endif
> diff --git a/hw/arm/stm32f100_soc.c b/hw/arm/stm32f100_soc.c
> index 0be92b2c475..f7b344ba9fb 100644
> --- a/hw/arm/stm32f100_soc.c
> +++ b/hw/arm/stm32f100_soc.c
> @@ -30,6 +30,7 @@
> #include "exec/address-spaces.h"
> #include "hw/arm/stm32f100_soc.h"
> #include "hw/qdev-properties.h"
> +#include "hw/qdev-clock.h"
> #include "hw/misc/unimp.h"
> #include "sysemu/sysemu.h"
>
> @@ -57,6 +58,9 @@ static void stm32f100_soc_initfn(Object *obj)
> for (i = 0; i < STM_NUM_SPIS; i++) {
> object_initialize_child(obj, "spi[*]", &s->spi[i],
> TYPE_STM32F2XX_SPI);
> }
> +
> + s->sysclk = qdev_init_clock_in(DEVICE(s), "sysclk", NULL, NULL, 0);
> + s->refclk = qdev_init_clock_in(DEVICE(s), "refclk", NULL, NULL, 0);
> }
>
> static void stm32f100_soc_realize(DeviceState *dev_soc, Error **errp)
> @@ -68,6 +72,30 @@ static void stm32f100_soc_realize(DeviceState *dev_soc,
> Error **errp)
>
> MemoryRegion *system_memory = get_system_memory();
>
> + /*
> + * We use s->refclk internally and only define it with
> qdev_init_clock_in()
> + * so it is correctly parented and not leaked on an init/deinit; it is
> not
> + * intended as an externally exposed clock.
> + */
> + if (clock_has_source(s->refclk)) {
> + error_setg(errp, "refclk clock must not be wired up by the board
> code");
> + return;
> + }
> +
> + if (!clock_has_source(s->sysclk)) {
> + error_setg(errp, "sysclk clock must be wired up by the board code");
> + return;
> + }
> +
> + /*
> + * TODO: ideally we should model the SoC RCC and its ability to
> + * change the sysclk frequency and define different sysclk sources.
> + */
> +
> + /* The refclk always runs at frequency HCLK / 8 */
> + clock_set_mul_div(s->refclk, 8, 1);
> + clock_set_source(s->refclk, s->sysclk);
> +
> /*
> * Init flash region
> * Flash starts at 0x08000000 and then is aliased to boot memory at 0x0
> @@ -89,6 +117,8 @@ static void stm32f100_soc_realize(DeviceState *dev_soc,
> Error **errp)
> qdev_prop_set_uint32(armv7m, "num-irq", 61);
> qdev_prop_set_string(armv7m, "cpu-type", s->cpu_type);
> qdev_prop_set_bit(armv7m, "enable-bitband", true);
> + qdev_connect_clock_in(armv7m, "cpuclk", s->sysclk);
> + qdev_connect_clock_in(armv7m, "refclk", s->refclk);
> object_property_set_link(OBJECT(&s->armv7m), "memory",
> OBJECT(get_system_memory()), &error_abort);
> if (!sysbus_realize(SYS_BUS_DEVICE(&s->armv7m), errp)) {
> diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c
> index 7e8191ebf5f..07e401a818d 100644
> --- a/hw/arm/stm32vldiscovery.c
> +++ b/hw/arm/stm32vldiscovery.c
> @@ -27,6 +27,7 @@
> #include "qapi/error.h"
> #include "hw/boards.h"
> #include "hw/qdev-properties.h"
> +#include "hw/qdev-clock.h"
> #include "qemu/error-report.h"
> #include "hw/arm/stm32f100_soc.h"
> #include "hw/arm/boot.h"
> @@ -39,16 +40,17 @@
> static void stm32vldiscovery_init(MachineState *machine)
> {
> DeviceState *dev;
> + Clock *sysclk;
>
> - /*
> - * TODO: ideally we would model the SoC RCC and let it handle
> - * system_clock_scale, including its ability to define different
> - * possible SYSCLK sources.
> - */
> system_clock_scale = NANOSECONDS_PER_SECOND / SYSCLK_FRQ;
>
> + /* This clock doesn't need migration because it is fixed-frequency */
> + sysclk = clock_new(OBJECT(machine), "SYSCLK");
> + clock_set_hz(sysclk, SYSCLK_FRQ);
> +
> dev = qdev_new(TYPE_STM32F100_SOC);
> qdev_prop_set_string(dev, "cpu-type", ARM_CPU_TYPE_NAME("cortex-m3"));
> + qdev_connect_clock_in(dev, "sysclk", sysclk);
> sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
>
> armv7m_load_kernel(ARM_CPU(first_cpu),
> --
> 2.20.1
>
>
