Received: from eggs.gnu.org ([2001:4830:134:3::10]:51090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1MqY-00080A-BF for qemu-devel@nongnu.org; Tue, 24 Nov 2015 18:18:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1MqU-0006kF-R0 for qemu-devel@nongnu.org; Tue, 24 Nov 2015 18:18:02 -0500 Received: from zose-mta05.web4all.fr ([185.49.20.50]:46523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1MqU-0006ir-FQ for qemu-devel@nongnu.org; Tue, 24 Nov 2015 18:17:58 -0500 References: From: Jean-Christophe DUBOIS Message-ID: <5654F020.406@tribudubois.net> Date: Wed, 25 Nov 2015 00:17:52 +0100 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 2/3] i.MX: Split the CCM class into an abstact base class and a concrete class. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite Cc: Peter Maydell , "qemu-devel@nongnu.org Developers" , Peter Crosthwaite Le 24/11/2015 23:04, Peter Crosthwaite a =C3=A9crit : > On Thu, Nov 19, 2015 at 12:40 PM, Jean-Christophe Dubois > wrote: >> The IMX_CCM class is now the base abstract class that is used by EPIT = and GPT >> timer implementation. >> >> IMX31_CCM class is the concrete class implementing CCM for i.MX31 SOC. >> >> For now the i.MX25 continues to use the i.MX31 CCM implementation. >> >> An i.MX25 specific CCM will be introduced in a later patch. >> >> We also rework initialization to stop using deprecated sysbus device i= nit >> >> Signed-off-by: Jean-Christophe Dubois >> --- >> >> Changes since v1: >> * None >> >> Changes since v2: >> * We moved to an inheritance QOM scheme >> >> hw/arm/fsl-imx25.c | 2 +- >> hw/arm/fsl-imx31.c | 2 +- >> hw/misc/Makefile.objs | 1 + >> hw/misc/imx31_ccm.c | 252 ++++++++++++++++++++++++++++++++++= ++++++++++ >> hw/misc/imx_ccm.c | 224 +++-------------------------------= ----- >> include/hw/arm/fsl-imx25.h | 4 +- >> include/hw/arm/fsl-imx31.h | 4 +- >> include/hw/misc/imx31_ccm.h | 64 +++++++++++ >> include/hw/misc/imx_ccm.h | 70 +++++------- >> 9 files changed, 365 insertions(+), 258 deletions(-) >> create mode 100644 hw/misc/imx31_ccm.c >> create mode 100644 include/hw/misc/imx31_ccm.h >> >> diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c >> index e1cadac..5526c22 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_IMX_CCM); >> + object_initialize(&s->ccm, sizeof(s->ccm), TYPE_IMX31_CCM); >> qdev_set_parent_bus(DEVICE(&s->ccm), sysbus_get_default()); >> >> for (i =3D 0; i < FSL_IMX25_NUM_UARTS; i++) { >> diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c >> index 53d4473..bcc71dc 100644 >> --- a/hw/arm/fsl-imx31.c >> +++ b/hw/arm/fsl-imx31.c >> @@ -35,7 +35,7 @@ static void fsl_imx31_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_IMX_CCM); >> + object_initialize(&s->ccm, sizeof(s->ccm), TYPE_IMX31_CCM); >> qdev_set_parent_bus(DEVICE(&s->ccm), sysbus_get_default()); >> >> for (i =3D 0; i < FSL_IMX31_NUM_UARTS; i++) { >> diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs >> index aeb6b7d..c77f3e3 100644 >> --- a/hw/misc/Makefile.objs >> +++ b/hw/misc/Makefile.objs >> @@ -26,6 +26,7 @@ obj-$(CONFIG_NSERIES) +=3D cbus.o >> obj-$(CONFIG_ECCMEMCTL) +=3D eccmemctl.o >> obj-$(CONFIG_EXYNOS4) +=3D exynos4210_pmu.o >> obj-$(CONFIG_IMX) +=3D imx_ccm.o >> +obj-$(CONFIG_IMX) +=3D imx31_ccm.o >> obj-$(CONFIG_MILKYMIST) +=3D milkymist-hpdmc.o >> obj-$(CONFIG_MILKYMIST) +=3D milkymist-pfpu.o >> obj-$(CONFIG_MAINSTONE) +=3D mst_fpga.o >> diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c >> new file mode 100644 >> index 0000000..f56fa77 >> --- /dev/null >> +++ b/hw/misc/imx31_ccm.c >> @@ -0,0 +1,252 @@ >> +/* >> + * IMX31 Clock Control Module >> + * >> + * Copyright (C) 2012 NICTA >> + * Updated by Jean-Christophe Dubois >> + * >> + * 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 pa= rt of >> + * the i.MX31 CCM. >> + */ >> + >> +#include "hw/misc/imx31_ccm.h" >> + >> +#define CKIH_FREQ 26000000 /* 26MHz crystal input */ >> + >> +#ifndef DEBUG_IMX31_CCM >> +#define DEBUG_IMX31_CCM 0 >> +#endif >> + >> +#define DPRINTF(fmt, args...) \ >> + do { \ >> + if (DEBUG_IMX31_CCM) { \ >> + fprintf(stderr, "[%s]%s: " fmt , TYPE_IMX31_CCM, \ >> + __func__, ##args); \ >> + } \ >> + } while (0) >> + >> +static const VMStateDescription vmstate_imx31_ccm =3D { >> + .name =3D TYPE_IMX31_CCM, >> + .version_id =3D 1, >> + .minimum_version_id =3D 1, >> + .fields =3D (VMStateField[]) { >> + VMSTATE_UINT32(ccmr, IMX31CCMState), >> + VMSTATE_UINT32(pdr0, IMX31CCMState), >> + VMSTATE_UINT32(pdr1, IMX31CCMState), >> + VMSTATE_UINT32(mpctl, IMX31CCMState), >> + VMSTATE_UINT32(spctl, IMX31CCMState), >> + VMSTATE_UINT32_ARRAY(cgr, IMX31CCMState, 3), >> + VMSTATE_UINT32(pmcr0, IMX31CCMState), >> + VMSTATE_UINT32(pmcr1, IMX31CCMState), >> + VMSTATE_END_OF_LIST() >> + }, >> +}; >> + >> +static uint32_t imx31_ccm_get_ref_clk(DeviceState *dev) >> +{ >> + IMX31CCMState *s =3D IMX31_CCM(dev); >> + >> + DPRINTF("()\n"); >> + >> + if ((s->ccmr & CCMR_PRCS) =3D=3D 2) { >> + return CKIL_FREQ * 1024; >> + } else { >> + return CKIH_FREQ; >> + } >> +} >> + >> +static uint32_t imx31_ccm_get_mcu_clk(DeviceState *dev) >> +{ >> + IMX31CCMState *s =3D IMX31_CCM(dev); >> + >> + DPRINTF("()\n"); >> + >> + if ((s->ccmr & CCMR_MDS) || !(s->ccmr & CCMR_MPE)) { >> + return imx31_ccm_get_ref_clk(dev); >> + } else { >> + return imx_ccm_calc_pll(s->mpctl, imx31_ccm_get_ref_clk(dev))= ; >> + } >> +} >> + >> +static uint32_t imx31_ccm_get_hsp_clk(DeviceState *dev) >> +{ >> + IMX31CCMState *s =3D IMX31_CCM(dev); >> + >> + DPRINTF("()\n"); >> + >> + return imx31_ccm_get_mcu_clk(dev) / (1 + EXTRACT(s->pdr0, HSP)); >> +} >> + >> +static uint32_t imx31_ccm_get_ipg_clk(DeviceState *dev) >> +{ >> + IMX31CCMState *s =3D IMX31_CCM(dev); >> + >> + DPRINTF("()\n"); >> + >> + return imx31_ccm_get_hsp_clk(dev) / (1 + EXTRACT(s->pdr0, IPG)); >> +} >> + >> +static uint32_t imx31_ccm_get_clock_frequency(DeviceState *dev, IMXCl= k clock) >> +{ >> + DPRINTF("Clock =3D %d)\n", clock); >> + >> + switch (clock) { >> + case NOCLK: >> + return 0; >> + case CLK_MCU: >> + return imx31_ccm_get_mcu_clk(dev); >> + case CLK_HSP: >> + return imx31_ccm_get_hsp_clk(dev); >> + case CLK_IPG: >> + return imx31_ccm_get_ipg_clk(dev); >> + case CLK_32k: >> + return CKIL_FREQ; >> + default: >> + return 0; >> + } >> +} >> + >> +static void imx31_ccm_reset(DeviceState *dev) >> +{ >> + IMX31CCMState *s =3D IMX31_CCM(dev); >> + >> + DPRINTF("()\n"); >> + >> + s->ccmr =3D 0x074b0b7b; >> + s->pdr0 =3D 0xff870b48; >> + s->pdr1 =3D 0x49fcfe7f; >> + s->mpctl =3D PLL_PD(1) | PLL_MFD(0) | PLL_MFI(6) | PLL_MFN(0); >> + s->cgr[0] =3D s->cgr[1] =3D s->cgr[2] =3D 0xffffffff; >> + s->spctl =3D PLL_PD(1) | PLL_MFD(4) | PLL_MFI(0xc) | PLL_MFN(1); >> + s->pmcr0 =3D 0x80209828; >> +} >> + >> +static uint64_t imx31_ccm_read(void *opaque, hwaddr offset, unsigned = size) >> +{ >> + IMX31CCMState *s =3D (IMX31CCMState *)opaque; >> + >> + DPRINTF("(offset=3D0x%" HWADDR_PRIx ")\n", offset); >> + >> + switch (offset >> 2) { >> + case 0: /* CCMR */ >> + DPRINTF(" ccmr =3D 0x%x\n", s->ccmr); >> + return s->ccmr; >> + case 1: >> + DPRINTF(" pdr0 =3D 0x%x\n", s->pdr0); >> + return s->pdr0; >> + case 2: >> + DPRINTF(" pdr1 =3D 0x%x\n", s->pdr1); >> + return s->pdr1; >> + case 4: >> + DPRINTF(" mpctl =3D 0x%x\n", s->mpctl); >> + return s->mpctl; >> + case 6: >> + DPRINTF(" spctl =3D 0x%x\n", s->spctl); >> + return s->spctl; >> + case 8: >> + DPRINTF(" cgr0 =3D 0x%x\n", s->cgr[0]); >> + return s->cgr[0]; >> + case 9: >> + DPRINTF(" cgr1 =3D 0x%x\n", s->cgr[1]); >> + return s->cgr[1]; >> + case 10: >> + DPRINTF(" cgr2 =3D 0x%x\n", s->cgr[2]); >> + return s->cgr[2]; >> + case 18: /* LTR1 */ >> + return 0x00004040; >> + case 23: >> + DPRINTF(" pcmr0 =3D 0x%x\n", s->pmcr0); >> + return s->pmcr0; >> + default: >> + qemu_log_mask(LOG_GUEST_ERROR, "[%s]%s: Bad register at offse= t 0x%" >> + HWADDR_PRIx "\n", TYPE_IMX31_CCM, __func__, off= set); >> + return 0; >> + } >> +} >> + >> +static void imx31_ccm_write(void *opaque, hwaddr offset, uint64_t val= ue, >> + unsigned size) >> +{ >> + IMX31CCMState *s =3D (IMX31CCMState *)opaque; >> + >> + DPRINTF("(offset=3D0x%" HWADDR_PRIx ", value =3D 0x%x)\n", >> + offset, (unsigned int)value); >> + >> + switch (offset >> 2) { >> + case 0: >> + s->ccmr =3D CCMR_FPMF | (value & 0x3b6fdfff); >> + break; >> + case 1: >> + s->pdr0 =3D value & 0xff9f3fff; >> + break; >> + case 2: >> + s->pdr1 =3D value; >> + break; >> + case 4: >> + s->mpctl =3D value & 0xbfff3fff; >> + break; >> + case 6: >> + s->spctl =3D value & 0xbfff3fff; >> + break; >> + case 8: >> + s->cgr[0] =3D value; >> + return; >> + case 9: >> + s->cgr[1] =3D value; >> + return; >> + case 10: >> + s->cgr[2] =3D value; >> + return; >> + >> + default: >> + qemu_log_mask(LOG_GUEST_ERROR, "[%s]%s: Bad register at offse= t 0x%" >> + HWADDR_PRIx "\n", TYPE_IMX31_CCM, __func__, off= set); >> + return; >> + } >> +} >> + >> +static const struct MemoryRegionOps imx31_ccm_ops =3D { >> + .read =3D imx31_ccm_read, >> + .write =3D imx31_ccm_write, >> + .endianness =3D DEVICE_NATIVE_ENDIAN, >> +}; >> + >> +static void imx31_ccm_init(Object *obj) >> +{ >> + DeviceState *dev =3D DEVICE(obj); >> + SysBusDevice *sd =3D SYS_BUS_DEVICE(obj); >> + IMX31CCMState *s =3D IMX31_CCM(obj); >> + >> + memory_region_init_io(&s->iomem, OBJECT(dev), &imx31_ccm_ops, s, >> + TYPE_IMX31_CCM, 0x1000); >> + sysbus_init_mmio(sd, &s->iomem); >> +} >> + >> +static void imx31_ccm_class_init(ObjectClass *klass, void *data) >> +{ >> + DeviceClass *dc =3D DEVICE_CLASS(klass); >> + IMXCCMClass *ccm =3D IMX_CCM_CLASS(klass); >> + >> + dc->reset =3D imx31_ccm_reset; >> + dc->vmsd =3D &vmstate_imx31_ccm; >> + dc->desc =3D "i.MX31 Clock Control Module"; >> + >> + ccm->get_clock_frequency =3D imx31_ccm_get_clock_frequency; >> +} >> + >> +static const TypeInfo imx31_ccm_info =3D { >> + .name =3D TYPE_IMX31_CCM, >> + .parent =3D TYPE_IMX_CCM, >> + .instance_size =3D sizeof(IMX31CCMState), >> + .instance_init =3D imx31_ccm_init, >> + .class_init =3D imx31_ccm_class_init, >> +}; >> + >> +static void imx31_ccm_register_types(void) >> +{ >> + type_register_static(&imx31_ccm_info); >> +} >> + >> +type_init(imx31_ccm_register_types) >> diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c >> index 415937f..e8a917c 100644 >> --- a/hw/misc/imx_ccm.c >> +++ b/hw/misc/imx_ccm.c >> @@ -7,15 +7,12 @@ >> * This work is licensed under the terms of the GNU GPL, version 2 o= r later. >> * See the COPYING file in the top-level directory. >> * >> - * To get the timer frequencies right, we need to emulate at least pa= rt of >> - * the CCM. >> + * This is an abstract base class used to get a common interface to >> + * retrieve the CCM frequencies from the various i.MX SOC. >> */ >> >> #include "hw/misc/imx_ccm.h" >> >> -#define CKIH_FREQ 26000000 /* 26MHz crystal input */ >> -#define CKIL_FREQ 32768 /* nominal 32khz clock */ >> - >> #ifndef DEBUG_IMX_CCM >> #define DEBUG_IMX_CCM 0 >> #endif >> @@ -28,59 +25,36 @@ >> } \ >> } while (0) >> >> -static int imx_ccm_post_load(void *opaque, int version_id); >> - >> -static const VMStateDescription vmstate_imx_ccm =3D { >> - .name =3D TYPE_IMX_CCM, >> - .version_id =3D 1, >> - .minimum_version_id =3D 1, >> - .fields =3D (VMStateField[]) { >> - VMSTATE_UINT32(ccmr, IMXCCMState), >> - VMSTATE_UINT32(pdr0, IMXCCMState), >> - VMSTATE_UINT32(pdr1, IMXCCMState), >> - VMSTATE_UINT32(mpctl, IMXCCMState), >> - VMSTATE_UINT32(spctl, IMXCCMState), >> - VMSTATE_UINT32_ARRAY(cgr, IMXCCMState, 3), >> - VMSTATE_UINT32(pmcr0, IMXCCMState), >> - VMSTATE_UINT32(pmcr1, IMXCCMState), >> - VMSTATE_UINT32(pll_refclk_freq, IMXCCMState), >> - VMSTATE_END_OF_LIST() >> - }, >> - .post_load =3D imx_ccm_post_load, >> -}; >> >> uint32_t imx_ccm_get_clock_frequency(DeviceState *dev, IMXClk clock) >> { >> - IMXCCMState *s =3D IMX_CCM(dev); >> + IMXCCMClass *klass =3D IMX_GET_CLASS(dev); >> >> - switch (clock) { >> - case NOCLK: >> + DPRINTF("Clock =3D %d)\n", clock); >> + >> + if (klass->get_clock_frequency) { >> + return klass->get_clock_frequency(dev, clock); >> + } else { >> return 0; >> - case CLK_MCU: >> - return s->mcu_clk_freq; >> - case CLK_HSP: >> - return s->hsp_clk_freq; >> - case CLK_IPG: >> - return s->ipg_clk_freq; >> - case CLK_32k: >> - return CKIL_FREQ; >> } >> - return 0; >> } >> >> /* >> * Calculate PLL output frequency >> */ >> -static uint32_t calc_pll(uint32_t pllreg, uint32_t base_freq) >> +uint32_t imx_ccm_calc_pll(uint32_t pllreg, uint32_t base_freq) >> { >> int32_t mfn =3D MFN(pllreg); /* Numerator */ >> uint32_t mfi =3D MFI(pllreg); /* Integer part */ >> uint32_t mfd =3D 1 + MFD(pllreg); /* Denominator */ >> uint32_t pd =3D 1 + PD(pllreg); /* Pre-divider */ >> >> + DPRINTF("pllreg =3D %d, base_freq =3D %d)\n", pllreg, base_freq); >> + >> if (mfi < 5) { >> mfi =3D 5; >> } >> + >> /* mfn is 10-bit signed twos-complement */ >> mfn <<=3D 32 - 10; >> mfn >>=3D 32 - 10; >> @@ -89,178 +63,12 @@ static uint32_t calc_pll(uint32_t pllreg, uint32_= t base_freq) >> (mfd * pd)) << 10; >> } >> >> -static void update_clocks(IMXCCMState *s) >> -{ >> - /* >> - * If we ever emulate more clocks, this should switch to a data-d= riven >> - * approach >> - */ >> - >> - if ((s->ccmr & CCMR_PRCS) =3D=3D 2) { >> - s->pll_refclk_freq =3D CKIL_FREQ * 1024; >> - } else { >> - s->pll_refclk_freq =3D CKIH_FREQ; >> - } >> - >> - /* ipg_clk_arm aka MCU clock */ >> - if ((s->ccmr & CCMR_MDS) || !(s->ccmr & CCMR_MPE)) { >> - s->mcu_clk_freq =3D s->pll_refclk_freq; >> - } else { >> - s->mcu_clk_freq =3D calc_pll(s->mpctl, s->pll_refclk_freq); >> - } >> - >> - /* High-speed clock */ >> - s->hsp_clk_freq =3D s->mcu_clk_freq / (1 + EXTRACT(s->pdr0, HSP))= ; >> - s->ipg_clk_freq =3D s->hsp_clk_freq / (1 + EXTRACT(s->pdr0, IPG))= ; >> - >> - DPRINTF("mcu %uMHz, HSP %uMHz, IPG %uHz\n", >> - s->mcu_clk_freq / 1000000, >> - s->hsp_clk_freq / 1000000, >> - s->ipg_clk_freq); >> -} >> - >> -static void imx_ccm_reset(DeviceState *dev) >> -{ >> - IMXCCMState *s =3D IMX_CCM(dev); >> - >> - s->ccmr =3D 0x074b0b7b; >> - s->pdr0 =3D 0xff870b48; >> - s->pdr1 =3D 0x49fcfe7f; >> - s->mpctl =3D PLL_PD(1) | PLL_MFD(0) | PLL_MFI(6) | PLL_MFN(0); >> - s->cgr[0] =3D s->cgr[1] =3D s->cgr[2] =3D 0xffffffff; >> - s->spctl =3D PLL_PD(1) | PLL_MFD(4) | PLL_MFI(0xc) | PLL_MFN(1); >> - s->pmcr0 =3D 0x80209828; >> - >> - update_clocks(s); >> -} >> - >> -static uint64_t imx_ccm_read(void *opaque, hwaddr offset, >> - unsigned size) >> -{ >> - IMXCCMState *s =3D (IMXCCMState *)opaque; >> - >> - DPRINTF("(offset=3D0x%" HWADDR_PRIx ")\n", offset); >> - >> - switch (offset >> 2) { >> - case 0: /* CCMR */ >> - DPRINTF(" ccmr =3D 0x%x\n", s->ccmr); >> - return s->ccmr; >> - case 1: >> - DPRINTF(" pdr0 =3D 0x%x\n", s->pdr0); >> - return s->pdr0; >> - case 2: >> - DPRINTF(" pdr1 =3D 0x%x\n", s->pdr1); >> - return s->pdr1; >> - case 4: >> - DPRINTF(" mpctl =3D 0x%x\n", s->mpctl); >> - return s->mpctl; >> - case 6: >> - DPRINTF(" spctl =3D 0x%x\n", s->spctl); >> - return s->spctl; >> - case 8: >> - DPRINTF(" cgr0 =3D 0x%x\n", s->cgr[0]); >> - return s->cgr[0]; >> - case 9: >> - DPRINTF(" cgr1 =3D 0x%x\n", s->cgr[1]); >> - return s->cgr[1]; >> - case 10: >> - DPRINTF(" cgr2 =3D 0x%x\n", s->cgr[2]); >> - return s->cgr[2]; >> - case 18: /* LTR1 */ >> - return 0x00004040; >> - case 23: >> - DPRINTF(" pcmr0 =3D 0x%x\n", s->pmcr0); >> - return s->pmcr0; >> - default: >> - qemu_log_mask(LOG_GUEST_ERROR, "[%s]%s: Bad register at offse= t 0x%" >> - HWADDR_PRIx "\n", TYPE_IMX_CCM, __func__, offse= t); >> - return 0; >> - } >> -} >> - >> -static void imx_ccm_write(void *opaque, hwaddr offset, >> - uint64_t value, unsigned size) >> -{ >> - IMXCCMState *s =3D (IMXCCMState *)opaque; >> - >> - DPRINTF("(offset=3D0x%" HWADDR_PRIx ", value =3D 0x%x)\n", >> - offset, (unsigned int)value); >> - >> - switch (offset >> 2) { >> - case 0: >> - s->ccmr =3D CCMR_FPMF | (value & 0x3b6fdfff); >> - break; >> - case 1: >> - s->pdr0 =3D value & 0xff9f3fff; >> - break; >> - case 2: >> - s->pdr1 =3D value; >> - break; >> - case 4: >> - s->mpctl =3D value & 0xbfff3fff; >> - break; >> - case 6: >> - s->spctl =3D value & 0xbfff3fff; >> - break; >> - case 8: >> - s->cgr[0] =3D value; >> - return; >> - case 9: >> - s->cgr[1] =3D value; >> - return; >> - case 10: >> - s->cgr[2] =3D value; >> - return; >> - >> - default: >> - qemu_log_mask(LOG_GUEST_ERROR, "[%s]%s: Bad register at offse= t 0x%" >> - HWADDR_PRIx "\n", TYPE_IMX_CCM, __func__, offse= t); >> - return; >> - } >> - update_clocks(s); >> -} >> - >> -static const struct MemoryRegionOps imx_ccm_ops =3D { >> - .read =3D imx_ccm_read, >> - .write =3D imx_ccm_write, >> - .endianness =3D DEVICE_NATIVE_ENDIAN, >> -}; >> - >> -static int imx_ccm_init(SysBusDevice *dev) >> -{ >> - IMXCCMState *s =3D IMX_CCM(dev); >> - >> - memory_region_init_io(&s->iomem, OBJECT(dev), &imx_ccm_ops, s, >> - TYPE_IMX_CCM, 0x1000); >> - sysbus_init_mmio(dev, &s->iomem); >> - >> - return 0; >> -} >> - >> -static int imx_ccm_post_load(void *opaque, int version_id) >> -{ >> - IMXCCMState *s =3D (IMXCCMState *)opaque; >> - >> - update_clocks(s); >> - return 0; >> -} >> - >> -static void imx_ccm_class_init(ObjectClass *klass, void *data) >> -{ >> - DeviceClass *dc =3D DEVICE_CLASS(klass); >> - SysBusDeviceClass *sbc =3D SYS_BUS_DEVICE_CLASS(klass); >> - >> - sbc->init =3D imx_ccm_init; >> - dc->reset =3D imx_ccm_reset; >> - dc->vmsd =3D &vmstate_imx_ccm; >> - dc->desc =3D "i.MX Clock Control Module"; >> -} >> - >> static const TypeInfo imx_ccm_info =3D { >> - .name =3D TYPE_IMX_CCM, >> - .parent =3D TYPE_SYS_BUS_DEVICE, >> + .name =3D TYPE_IMX_CCM, >> + .parent =3D TYPE_SYS_BUS_DEVICE, >> .instance_size =3D sizeof(IMXCCMState), >> - .class_init =3D imx_ccm_class_init, >> + .class_size =3D sizeof(IMXCCMClass), >> + .abstract =3D true, >> }; >> >> static void imx_ccm_register_types(void) >> diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h >> index 73f50c6..5c62fde 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/imx_ccm.h" >> +#include "hw/misc/imx31_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; >> - IMXCCMState ccm; >> + IMX31CCMState ccm; >> IMXSerialState uart[FSL_IMX25_NUM_UARTS]; >> IMXGPTState gpt[FSL_IMX25_NUM_GPTS]; >> IMXEPITState epit[FSL_IMX25_NUM_EPITS]; >> diff --git a/include/hw/arm/fsl-imx31.h b/include/hw/arm/fsl-imx31.h >> index 5e8f795..d408abb 100644 >> --- a/include/hw/arm/fsl-imx31.h >> +++ b/include/hw/arm/fsl-imx31.h >> @@ -19,7 +19,7 @@ >> >> #include "hw/arm/arm.h" >> #include "hw/intc/imx_avic.h" >> -#include "hw/misc/imx_ccm.h" >> +#include "hw/misc/imx31_ccm.h" >> #include "hw/char/imx_serial.h" >> #include "hw/timer/imx_gpt.h" >> #include "hw/timer/imx_epit.h" >> @@ -42,7 +42,7 @@ typedef struct FslIMX31State { >> /*< public >*/ >> ARMCPU cpu; >> IMXAVICState avic; >> - IMXCCMState ccm; >> + IMX31CCMState ccm; >> IMXSerialState uart[FSL_IMX31_NUM_UARTS]; >> IMXGPTState gpt; >> IMXEPITState epit[FSL_IMX31_NUM_EPITS]; >> diff --git a/include/hw/misc/imx31_ccm.h b/include/hw/misc/imx31_ccm.h >> new file mode 100644 >> index 0000000..47be0cd >> --- /dev/null >> +++ b/include/hw/misc/imx31_ccm.h >> @@ -0,0 +1,64 @@ >> +/* >> + * IMX31 Clock Control Module >> + * >> + * Copyright (C) 2012 NICTA >> + * Updated by Jean-Christophe Dubois >> + * >> + * 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 IMX31_CCM_H >> +#define IMX31_CCM_H >> + >> +#include "hw/misc/imx_ccm.h" >> + >> +/* CCMR */ >> +#define CCMR_FPME (1<<0) >> +#define CCMR_MPE (1<<3) >> +#define CCMR_MDS (1<<7) >> +#define CCMR_FPMF (1<<26) >> +#define CCMR_PRCS (3<<1) >> + >> +/* PDR0 */ >> +#define PDR0_MCU_PODF_SHIFT (0) >> +#define PDR0_MCU_PODF_MASK (0x7) >> +#define PDR0_MAX_PODF_SHIFT (3) >> +#define PDR0_MAX_PODF_MASK (0x7) >> +#define PDR0_IPG_PODF_SHIFT (6) >> +#define PDR0_IPG_PODF_MASK (0x3) >> +#define PDR0_NFC_PODF_SHIFT (8) >> +#define PDR0_NFC_PODF_MASK (0x7) >> +#define PDR0_HSP_PODF_SHIFT (11) >> +#define PDR0_HSP_PODF_MASK (0x7) >> +#define PDR0_PER_PODF_SHIFT (16) >> +#define PDR0_PER_PODF_MASK (0x1f) >> +#define PDR0_CSI_PODF_SHIFT (23) >> +#define PDR0_CSI_PODF_MASK (0x1ff) >> + >> +#define EXTRACT(value, name) (((value) >> PDR0_##name##_PODF_SHIFT) \ >> + & PDR0_##name##_PODF_MASK) >> +#define INSERT(value, name) (((value) & PDR0_##name##_PODF_MASK) << \ >> + PDR0_##name##_PODF_SHIFT) >> + >> +#define TYPE_IMX31_CCM "imx31.ccm" >> +#define IMX31_CCM(obj) OBJECT_CHECK(IMX31CCMState, (obj), TYPE_IMX31_= CCM) >> + >> +typedef struct IMX31CCMState { >> + /* */ >> + IMXCCMState parent_obj; >> + >> + /* */ >> + MemoryRegion iomem; >> + >> + uint32_t ccmr; >> + uint32_t pdr0; >> + uint32_t pdr1; >> + uint32_t mpctl; >> + uint32_t spctl; >> + uint32_t cgr[3]; >> + uint32_t pmcr0; >> + uint32_t pmcr1; >> +} IMX31CCMState; >> + >> +#endif /* IMX31_CCM_H */ >> diff --git a/include/hw/misc/imx_ccm.h b/include/hw/misc/imx_ccm.h >> index 09f6248..33293e8 100644 >> --- a/include/hw/misc/imx_ccm.h >> +++ b/include/hw/misc/imx_ccm.h >> @@ -1,5 +1,5 @@ >> /* >> - * IMX31 Clock Control Module >> + * IMX Clock Control Module base class >> * >> * Copyright (C) 2012 NICTA >> * Updated by Jean-Christophe Dubois >> @@ -13,33 +13,7 @@ >> >> #include "hw/sysbus.h" >> >> -/* CCMR */ >> -#define CCMR_FPME (1<<0) >> -#define CCMR_MPE (1<<3) >> -#define CCMR_MDS (1<<7) >> -#define CCMR_FPMF (1<<26) >> -#define CCMR_PRCS (3<<1) >> - >> -/* PDR0 */ >> -#define PDR0_MCU_PODF_SHIFT (0) >> -#define PDR0_MCU_PODF_MASK (0x7) >> -#define PDR0_MAX_PODF_SHIFT (3) >> -#define PDR0_MAX_PODF_MASK (0x7) >> -#define PDR0_IPG_PODF_SHIFT (6) >> -#define PDR0_IPG_PODF_MASK (0x3) >> -#define PDR0_NFC_PODF_SHIFT (8) >> -#define PDR0_NFC_PODF_MASK (0x7) >> -#define PDR0_HSP_PODF_SHIFT (11) >> -#define PDR0_HSP_PODF_MASK (0x7) >> -#define PDR0_PER_PODF_SHIFT (16) >> -#define PDR0_PER_PODF_MASK (0x1f) >> -#define PDR0_CSI_PODF_SHIFT (23) >> -#define PDR0_CSI_PODF_MASK (0x1ff) >> - >> -#define EXTRACT(value, name) (((value) >> PDR0_##name##_PODF_SHIFT) \ >> - & PDR0_##name##_PODF_MASK) >> -#define INSERT(value, name) (((value) & PDR0_##name##_PODF_MASK) << \ >> - PDR0_##name##_PODF_SHIFT) >> +#define CKIL_FREQ 32768 /* nominal 32khz clock */ >> >> /* PLL control registers */ >> #define PD(v) (((v) >> 26) & 0xf) >> @@ -53,39 +27,47 @@ >> #define PLL_MFN(x) (((x) & 0x3ff) << 0) >> >> #define TYPE_IMX_CCM "imx.ccm" >> -#define IMX_CCM(obj) OBJECT_CHECK(IMXCCMState, (obj), TYPE_IMX_CCM) >> +#define IMX_CCM(obj) \ >> + OBJECT_CHECK(IMXCCMState, (obj), TYPE_IMX_CCM) >> +#define IMX_CCM_CLASS(klass) \ >> + OBJECT_CLASS_CHECK(IMXCCMClass, (klass), TYPE_IMX_CCM) >> +#define IMX_GET_CLASS(obj) \ >> + OBJECT_GET_CLASS(IMXCCMClass, (obj), TYPE_IMX_CCM) >> >> typedef struct IMXCCMState { >> /* */ >> SysBusDevice parent_obj; >> >> /* */ >> - MemoryRegion iomem; >> >> - uint32_t ccmr; >> - uint32_t pdr0; >> - uint32_t pdr1; >> - uint32_t mpctl; >> - uint32_t spctl; >> - uint32_t cgr[3]; >> - uint32_t pmcr0; >> - uint32_t pmcr1; >> - >> - /* Frequencies precalculated on register changes */ >> - uint32_t pll_refclk_freq; >> - uint32_t mcu_clk_freq; >> - uint32_t hsp_clk_freq; >> - uint32_t ipg_clk_freq; >> } IMXCCMState; >> >> typedef enum { >> NOCLK, >> + CLK_MPLL, >> + CLK_UPLL, >> CLK_MCU, >> CLK_HSP, >> + CLK_MAX, >> + CLK_AHB, >> CLK_IPG, >> + CLK_PER, >> CLK_32k >> } IMXClk; >> >> +typedef struct IMXCCMClass { >> + /* */ >> + SysBusDeviceClass parent_class; >> + >> + /* */ >> + uint32_t (*get_clock_frequency)(DeviceState *s, IMXClk clk); >> + >> +} IMXCCMClass; >> + >> +uint32_t imx_ccm_calc_pll(uint32_t pllreg, uint32_t base_freq); >> + >> +void imx_ccm_set_ref_clock_frequency(DeviceState *s, uint32_t ref_fre= q); >> + > This looks unused. If implemented will it remove the hardcoded > per-implementation crystal freqs? That was the idea. But for now it is not implemented so I'll remove it. i.MX SOC seems to be designed to receive fixed/hardcoded reference=20 clock. There does not seem to be a real need for a variable ref clock. > >> uint32_t imx_ccm_get_clock_frequency(DeviceState *s, IMXClk clock); >> > The Type of the prototype should match the abstract type - IMXCCMState. OK, I'll move to IMXCCMState > > > Otherwise, > > Reviewed-by: Peter Crosthwaite > > Regards, > Peter > >> #endif /* IMX_CCM_H */ >> -- >> 2.5.0 >>