On Tue, Dec 1, 2015 at 12:25 PM, Jean-Christophe Dubois
<j...@tribudubois.net> wrote:
> With this CCM, i.MX25 timer is accurate with "real world time".
>
> Signed-off-by: Jean-Christophe Dubois <j...@tribudubois.net>
> ---
> Changes since v1:
> * rework loging to match other i.MX drivers
>
> Changes since v2:
> * We moved to an inheritance QOM scheme
>
> Changes since v3:
> * Rework logging based on comments.
>
> Changes since v4:
> * Improve debug logging.
>
> hw/arm/fsl-imx25.c | 2 +-
> hw/misc/Makefile.objs | 1 +
> hw/misc/imx25_ccm.c | 367
> ++++++++++++++++++++++++++++++++++++++++++++
> include/hw/arm/fsl-imx25.h | 4 +-
> include/hw/misc/imx25_ccm.h | 61 ++++++++
> 5 files changed, 432 insertions(+), 3 deletions(-)
> create mode 100644 hw/misc/imx25_ccm.c
> create mode 100644 include/hw/misc/imx25_ccm.h
>
> diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
> index 9f302ed..36818ee 100644
> --- a/hw/arm/fsl-imx25.c
> +++ b/hw/arm/fsl-imx25.c
> @@ -38,7 +38,7 @@ static void fsl_imx25_init(Object *obj)
> object_initialize(&s->avic, sizeof(s->avic), TYPE_IMX_AVIC);
> qdev_set_parent_bus(DEVICE(&s->avic), sysbus_get_default());
>
> - object_initialize(&s->ccm, sizeof(s->ccm), TYPE_IMX31_CCM);
> + object_initialize(&s->ccm, sizeof(s->ccm), TYPE_IMX25_CCM);
> qdev_set_parent_bus(DEVICE(&s->ccm), sysbus_get_default());
>
> for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
> diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
> index c77f3e3..8a235df 100644
> --- a/hw/misc/Makefile.objs
> +++ b/hw/misc/Makefile.objs
> @@ -27,6 +27,7 @@ obj-$(CONFIG_ECCMEMCTL) += eccmemctl.o
> obj-$(CONFIG_EXYNOS4) += exynos4210_pmu.o
> obj-$(CONFIG_IMX) += imx_ccm.o
> obj-$(CONFIG_IMX) += imx31_ccm.o
> +obj-$(CONFIG_IMX) += imx25_ccm.o
> obj-$(CONFIG_MILKYMIST) += milkymist-hpdmc.o
> obj-$(CONFIG_MILKYMIST) += milkymist-pfpu.o
> obj-$(CONFIG_MAINSTONE) += mst_fpga.o
> diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c
> new file mode 100644
> index 0000000..fcba903
> --- /dev/null
> +++ b/hw/misc/imx25_ccm.c
> @@ -0,0 +1,367 @@
> +/*
> + * IMX25 Clock Control Module
> + *
> + * Copyright (C) 2012 NICTA
> + * Updated by Jean-Christophe Dubois <j...@tribudubois.net>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + *
> + * To get the timer frequencies right, we need to emulate at least part of
> + * the CCM.
> + */
> +
> +#include "hw/misc/imx25_ccm.h"
> +
> +#ifndef DEBUG_IMX25_CCM
> +#define DEBUG_IMX25_CCM 0
> +#endif
> +
> +#define DPRINTF(fmt, args...) \
> + do { \
> + if (DEBUG_IMX25_CCM) { \
> + fprintf(stderr, "[%s]%s: " fmt , TYPE_IMX25_CCM, \
> + __func__, ##args); \
> + } \
> + } while (0)
> +
> +static char const *imx25_ccm_reg_name(uint32_t reg)
> +{
> + static char unknown[20];
> +
> + switch (reg) {
> + case 0:
> + return "mpctl";
> + case 1:
> + return "upctl";
> + case 2:
> + return "cctl";
> + case 3:
> + return "cgcr0";
> + case 4:
> + return "cgcr1";
> + case 5:
> + return "cgcr2";
> + case 6:
> + return "pcdr0";
> + case 7:
> + return "pcdr1";
> + case 8:
> + return "pcdr2";
> + case 9:
> + return "pcdr3";
> + case 10:
> + return "rcsr";
> + case 11:
> + return "crdr";
> + case 12:
> + return "dcvr0";
> + case 13:
> + return "dcvr1";
> + case 14:
> + return "dcvr2";
> + case 15:
> + return "dcvr3";
> + case 16:
> + return "ltr0";
> + case 17:
> + return "ltr1";
> + case 18:
> + return "ltr2";
> + case 19:
> + return "ltr3";
> + case 20:
> + return "ltbr0";
> + case 21:
> + return "ltbr1";
> + case 22:
> + return "pmcr0";
> + case 23:
> + return "pmcr1";
> + case 24:
> + return "pmcr2";
> + case 25:
> + return "mcr";
> + case 26:
> + return "lpimr0";
> + case 27:
> + return "lpimr1";
> + default:
> + sprintf(unknown, "[%d ?]", reg);
> + return unknown;
> + }
> +}
> +#define CKIH_FREQ 24000000 /* 24MHz crystal input */
> +
> +static const VMStateDescription vmstate_imx25_ccm = {
> + .name = TYPE_IMX25_CCM,
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT32(mpctl, IMX25CCMState),
> + VMSTATE_UINT32(upctl, IMX25CCMState),
> + VMSTATE_UINT32(cctl, IMX25CCMState),
> + VMSTATE_UINT32_ARRAY(cgcr, IMX25CCMState, 3),
> + VMSTATE_UINT32_ARRAY(pcdr, IMX25CCMState, 4),
> + VMSTATE_UINT32(rcsr, IMX25CCMState),
> + VMSTATE_UINT32(crdr, IMX25CCMState),
> + VMSTATE_UINT32_ARRAY(dcvr, IMX25CCMState, 4),
> + VMSTATE_UINT32_ARRAY(ltr, IMX25CCMState, 4),
> + VMSTATE_UINT32_ARRAY(ltbr, IMX25CCMState, 2),
> + VMSTATE_UINT32_ARRAY(pmcr, IMX25CCMState, 3),
> + VMSTATE_UINT32(mcr, IMX25CCMState),
> + VMSTATE_UINT32_ARRAY(lpimr, IMX25CCMState, 2),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> +static uint32_t imx25_ccm_get_mpll_clk(IMXCCMState *dev)
> +{
> + uint32_t freq;
> + IMX25CCMState *s = IMX25_CCM(dev);
> +
> + if (EXTRACT(s->cctl, MPLL_BYPASS)) {
> + freq = CKIH_FREQ;
> + } else {
> + freq = imx_ccm_calc_pll(s->mpctl, CKIH_FREQ);
> + }
> +
> + DPRINTF("freq = %d\n", freq);
> +
> + return freq;
> +}
> +
> +static uint32_t imx25_ccm_get_upll_clk(IMXCCMState *dev)
> +{
> + uint32_t freq = 0;
> + IMX25CCMState *s = IMX25_CCM(dev);
> +
> + if (!EXTRACT(s->cctl, UPLL_DIS)) {
> + freq = imx_ccm_calc_pll(s->upctl, CKIH_FREQ);
> + }
> +
> + DPRINTF("freq = %d\n", freq);
> +
> + return freq;
> +}
> +
> +static uint32_t imx25_ccm_get_mcu_clk(IMXCCMState *dev)
> +{
> + uint32_t freq;
> + IMX25CCMState *s = IMX25_CCM(dev);
> +
> + freq = imx25_ccm_get_mpll_clk(dev);
> +
> + if (EXTRACT(s->cctl, ARM_SRC)) {
> + freq = (freq * 3 / 4);
> + }
> +
> + freq = freq / (1 + EXTRACT(s->cctl, ARM_CLK_DIV));
> +
> + DPRINTF("freq = %d\n", freq);
> +
> + return freq;
> +}
> +
> +static uint32_t imx25_ccm_get_ahb_clk(IMXCCMState *dev)
> +{
> + uint32_t freq;
> + IMX25CCMState *s = IMX25_CCM(dev);
> +
> + freq = imx25_ccm_get_mcu_clk(dev) / (1 + EXTRACT(s->cctl, AHB_CLK_DIV));
> +
> + DPRINTF("freq = %d\n", freq);
> +
> + return freq;
> +}
> +
> +static uint32_t imx25_ccm_get_ipg_clk(IMXCCMState *dev)
> +{
> + uint32_t freq;
> +
> + freq = imx25_ccm_get_ahb_clk(dev) / 2;
> +
> + DPRINTF("freq = %d\n", freq);
> +
> + return freq;
> +}
> +
> +static uint32_t imx25_ccm_get_clock_frequency(IMXCCMState *dev, IMXClk clock)
> +{
> + uint32_t freq = 0;
> + DPRINTF("Clock = %d)\n", clock);
> +
> + switch (clock) {
> + case NOCLK:
> + break;
> + case CLK_MPLL:
> + freq = imx25_ccm_get_mpll_clk(dev);
> + break;
> + case CLK_UPLL:
> + freq = imx25_ccm_get_upll_clk(dev);
> + break;
> + case CLK_MCU:
> + freq = imx25_ccm_get_mcu_clk(dev);
> + break;
> + case CLK_AHB:
> + freq = imx25_ccm_get_ahb_clk(dev);
> + break;
> + case CLK_IPG:
> + freq = imx25_ccm_get_ipg_clk(dev);
> + break;
> + case CLK_32k:
> + freq = CKIL_FREQ;
> + break;
> + default:
> + qemu_log_mask(LOG_GUEST_ERROR, "[%s]%s: unsupported clock %d\n",
> + TYPE_IMX25_CCM, __func__, clock);
> + break;
> + }
> +
> + DPRINTF("Clock = %d) = %d\n", clock, freq);
> +
> + return freq;
> +}
> +
> +static void imx25_ccm_reset(DeviceState *dev)
> +{
> + IMX25CCMState *s = IMX25_CCM(dev);
> +
> + DPRINTF("\n");
> +
> + s->mpctl = 0x800b2c01;
> + s->upctl = 0x84042800;
> + /*
> + * The value below gives:
> + * CPU = 133 MHz, AHB = 66,5 MHz, IPG = 33 MHz.
> + */
> + s->cctl = 0xd0030000;
> + s->cgcr[0] = 0x028A0100;
> + s->cgcr[1] = 0x04008100;
> + s->cgcr[2] = 0x00000438;
> + s->pcdr[0] = 0x01010101;
> + s->pcdr[1] = 0x01010101;
> + s->pcdr[2] = 0x01010101;
> + s->pcdr[3] = 0x01010101;
> + s->rcsr = 0;
> + s->crdr = 0;
> + s->dcvr[0] = 0;
> + s->dcvr[1] = 0;
> + s->dcvr[2] = 0;
> + s->dcvr[3] = 0;
> + s->ltr[0] = 0;
> + s->ltr[1] = 0;
> + s->ltr[2] = 0;
> + s->ltr[3] = 0;
> + s->ltbr[0] = 0;
> + s->ltbr[1] = 0;
> + s->pmcr[0] = 0x00A00000;
> + s->pmcr[1] = 0x0000A030;
> + s->pmcr[2] = 0x0000A030;
> + s->mcr = 0x43000000;
> + s->lpimr[0] = 0;
> + s->lpimr[1] = 0;
> +
> + /*
> + * default boot will change the reset values to allow:
> + * CPU = 399 MHz, AHB = 133 MHz, IPG = 66,5 MHz.
> + * For some reason, this doesn't work. With the value below, linux
> + * detects a 88 MHz IPG CLK instead of 66,5 MHz.
> + */
> + //s->cctl = 0x20032000;
Should be a C style comment rather than C++.
> +}
> +
> +static uint64_t imx25_ccm_read(void *opaque, hwaddr offset, unsigned size)
> +{
> + uint32 value = 0;
> + IMX25CCMState *s = (IMX25CCMState *)opaque;
> + uint32_t *reg = &s->mpctl;
Still not a fan of taking the field address as an array base. So with
either the union or array-MACRO conversion,
Reviewed-by Peter Crosthwaite <crosthwaite.pe...@gmail.com>
The main reason I worry about this, is so the VMSD will be array-form
from the get-go avoid a later conversion and version bump. In the
union solution the VMSD should be the single VWSTATE_UINT32_ARRAY.
Regards,
Peter
> +
> + if (offset < 0x70) {
> + value = reg[offset >> 2];
> + } else {
> + qemu_log_mask(LOG_GUEST_ERROR, "[%s]%s: Bad register at offset 0x%"
> + HWADDR_PRIx "\n", TYPE_IMX25_CCM, __func__, offset);
> + }
> +
> + DPRINTF("reg[%s] => 0x%" PRIx32 "\n", imx25_ccm_reg_name(offset >> 2),
> + value);
> +
> + return value;
> +}
> +
> +static void imx25_ccm_write(void *opaque, hwaddr offset, uint64_t value,
> + unsigned size)
> +{
> + IMX25CCMState *s = (IMX25CCMState *)opaque;
> + uint32_t *reg = &s->mpctl;
> +
> + DPRINTF("reg[%s] <= 0x%" PRIx32 "\n", imx25_ccm_reg_name(offset >> 2),
> + (uint32_t)value);
> +
> + if (offset < 0x70) {
> + /*
> + * We will do a better implementation later. In particular some bits
> + * cannot be written to.
> + */
> + reg[offset >> 2] = value;
> + } else {
> + qemu_log_mask(LOG_GUEST_ERROR, "[%s]%s: Bad register at offset 0x%"
> + HWADDR_PRIx "\n", TYPE_IMX25_CCM, __func__, offset);
> + }
> +}
> +
> +static const struct MemoryRegionOps imx25_ccm_ops = {
> + .read = imx25_ccm_read,
> + .write = imx25_ccm_write,
> + .endianness = DEVICE_NATIVE_ENDIAN,
> + .valid = {
> + /*
> + * Our device would not work correctly if the guest was doing
> + * unaligned access. This might not be a limitation on the real
> + * device but in practice there is no reason for a guest to access
> + * this device unaligned.
> + */
> + .min_access_size = 4,
> + .max_access_size = 4,
> + .unaligned = false,
> + },
> +};
> +
> +static void imx25_ccm_init(Object *obj)
> +{
> + DeviceState *dev = DEVICE(obj);
> + SysBusDevice *sd = SYS_BUS_DEVICE(obj);
> + IMX25CCMState *s = IMX25_CCM(obj);
> +
> + memory_region_init_io(&s->iomem, OBJECT(dev), &imx25_ccm_ops, s,
> + TYPE_IMX25_CCM, 0x1000);
> + sysbus_init_mmio(sd, &s->iomem);
> +}
> +
> +static void imx25_ccm_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> + IMXCCMClass *ccm = IMX_CCM_CLASS(klass);
> +
> + dc->reset = imx25_ccm_reset;
> + dc->vmsd = &vmstate_imx25_ccm;
> + dc->desc = "i.MX25 Clock Control Module";
> +
> + ccm->get_clock_frequency = imx25_ccm_get_clock_frequency;
> +}
> +
> +static const TypeInfo imx25_ccm_info = {
> + .name = TYPE_IMX25_CCM,
> + .parent = TYPE_IMX_CCM,
> + .instance_size = sizeof(IMX25CCMState),
> + .instance_init = imx25_ccm_init,
> + .class_init = imx25_ccm_class_init,
> +};
> +
> +static void imx25_ccm_register_types(void)
> +{
> + type_register_static(&imx25_ccm_info);
> +}
> +
> +type_init(imx25_ccm_register_types)
> diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h
> index 5c62fde..d0e8e9d 100644
> --- a/include/hw/arm/fsl-imx25.h
> +++ b/include/hw/arm/fsl-imx25.h
> @@ -19,7 +19,7 @@
>
> #include "hw/arm/arm.h"
> #include "hw/intc/imx_avic.h"
> -#include "hw/misc/imx31_ccm.h"
> +#include "hw/misc/imx25_ccm.h"
> #include "hw/char/imx_serial.h"
> #include "hw/timer/imx_gpt.h"
> #include "hw/timer/imx_epit.h"
> @@ -44,7 +44,7 @@ typedef struct FslIMX25State {
> /*< public >*/
> ARMCPU cpu;
> IMXAVICState avic;
> - IMX31CCMState ccm;
> + IMX25CCMState ccm;
> IMXSerialState uart[FSL_IMX25_NUM_UARTS];
> IMXGPTState gpt[FSL_IMX25_NUM_GPTS];
> IMXEPITState epit[FSL_IMX25_NUM_EPITS];
> diff --git a/include/hw/misc/imx25_ccm.h b/include/hw/misc/imx25_ccm.h
> new file mode 100644
> index 0000000..a2dbcea
> --- /dev/null
> +++ b/include/hw/misc/imx25_ccm.h
> @@ -0,0 +1,61 @@
> +/*
> + * IMX25 Clock Control Module
> + *
> + * Copyright (C) 2012 NICTA
> + * Updated by Jean-Christophe Dubois <j...@tribudubois.net>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#ifndef IMX25_CCM_H
> +#define IMX25_CCM_H
> +
> +#include "hw/misc/imx_ccm.h"
> +
> +/* CCTL */
> +#define CCTL_ARM_CLK_DIV_SHIFT (30)
> +#define CCTL_ARM_CLK_DIV_MASK (0x3)
> +#define CCTL_AHB_CLK_DIV_SHIFT (28)
> +#define CCTL_AHB_CLK_DIV_MASK (0x3)
> +#define CCTL_MPLL_BYPASS_SHIFT (22)
> +#define CCTL_MPLL_BYPASS_MASK (0x1)
> +#define CCTL_USB_DIV_SHIFT (16)
> +#define CCTL_USB_DIV_MASK (0x3F)
> +#define CCTL_ARM_SRC_SHIFT (13)
> +#define CCTL_ARM_SRC_MASK (0x1)
> +#define CCTL_UPLL_DIS_SHIFT (23)
> +#define CCTL_UPLL_DIS_MASK (0x1)
> +
> +#define EXTRACT(value, name) (((value) >> CCTL_##name##_SHIFT) \
> + & CCTL_##name##_MASK)
> +#define INSERT(value, name) (((value) & CCTL_##name##_MASK) << \
> + CCTL_##name##_SHIFT)
> +
> +#define TYPE_IMX25_CCM "imx25.ccm"
> +#define IMX25_CCM(obj) OBJECT_CHECK(IMX25CCMState, (obj), TYPE_IMX25_CCM)
> +
> +typedef struct IMX25CCMState {
> + /* <private> */
> + IMXCCMState parent_obj;
> +
> + /* <public> */
> + MemoryRegion iomem;
> +
> + uint32_t mpctl;
> + uint32_t upctl;
> + uint32_t cctl;
> + uint32_t cgcr[3];
> + uint32_t pcdr[4];
> + uint32_t rcsr;
> + uint32_t crdr;
> + uint32_t dcvr[4];
> + uint32_t ltr[4];
> + uint32_t ltbr[2];
> + uint32_t pmcr[3];
> + uint32_t mcr;
> + uint32_t lpimr[2];
> +
> +} IMX25CCMState;
> +
> +#endif /* IMX25_CCM_H */
> --
> 2.5.0
>
