Additional NPCM7xx devices
v2 cover Additional NPCM7xx devices
This patch series include a few more NPCM7XX devices including
- Analog Digital Converter (ADC)
- Pulse Width Modulation (PWM)
We also modified the CLK module to generate clock values using qdev_clock. These clocks are used to determine various clocks in NPCM7XX devices.
Thank you for your review!
Changes since v1:
We removed the IPMI and KCS related code from this patch set.
Hao Wu (4):
hw/misc: Add clock converter in NPCM7XX CLK module hw/timer: Refactor NPCM7XX Timer to use CLK clock hw/adc: Add an ADC module for NPCM7XX hw/misc: Add a PWM module for NPCM7XX
docs/system/arm/nuvoton.rst | 4 +- hw/adc/meson.build | 1 + hw/adc/npcm7xx_adc.c | 318 +++++++++++++ hw/arm/npcm7xx.c | 55 ++- hw/misc/meson.build | 1 + hw/misc/npcm7xx_clk.c | 795 ++++++++++++++++++++++++++++++- hw/misc/npcm7xx_pwm.c | 535 +++++++++++++++++++++ hw/timer/npcm7xx_timer.c | 25 +- include/hw/adc/npcm7xx_adc.h | 72 +++ include/hw/arm/npcm7xx.h | 4 + include/hw/misc/npcm7xx_clk.h | 146 +++++- include/hw/misc/npcm7xx_pwm.h | 106 +++++ include/hw/timer/npcm7xx_timer.h | 1 + tests/qtest/meson.build | 4 +- tests/qtest/npcm7xx_adc-test.c | 400 ++++++++++++++++ tests/qtest/npcm7xx_pwm-test.c | 490 +++++++++++++++++++ 16 files changed, 2927 insertions(+), 30 deletions(-) create mode 100644 hw/adc/npcm7xx_adc.c create mode 100644 hw/misc/npcm7xx_pwm.c create mode 100644 include/hw/adc/npcm7xx_adc.h create mode 100644 include/hw/misc/npcm7xx_pwm.h create mode 100644 tests/qtest/npcm7xx_adc-test.c create mode 100644 tests/qtest/npcm7xx_pwm-test.c
Signature · 1 line
2.29.2.684.gfbc64c5ab5-goog
PATCH v2 1/4 hw/misc: Add clock converter in NPCM7XX CLK module
This patch allows NPCM7XX CLK module to compute clocks that are used by other NPCM7XX modules.
Add a new struct NPCM7xxClockConverterState which represents a single converter. Each clock converter in CLK module represents one converter in NPCM7XX CLK Module(PLL, SEL or Divider). Each converter takes one or more input clocks and converts them into one output clock. They form a clock hierarchy in the CLK module and are responsible for outputing clocks for various other modules in an NPCM7XX SoC.
Each converter has a function pointer called "convert" which represents the unique logic for that converter.
The clock contains two initialization information: ConverterInitInfo and ConverterConnectionInfo. They represent the vertices and edges in the clock diagram respectively.
--- hw/misc/npcm7xx_clk.c | 795 +++++++++++++++++++++++++++++++++- include/hw/misc/npcm7xx_clk.h | 140 +++++- 2 files changed, 927 insertions(+), 8 deletions(-)
hw/misc/npcm7xx_clk.c +789 -6
@@ -18,6 +18,7 @@#include "hw/misc/npcm7xx_clk.h" #include "hw/timer/npcm7xx_timer.h" +#include "hw/qdev-clock.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/log.h"
@@ -27,9 +28,22 @@#include "trace.h" #include "sysemu/watchdog.h" +/* +* The reference clock hz, and the SECCNT and CNTR25M registers in this module, +* is always 25 MHz. +*/ +#define NPCM7XX_CLOCK_REF_HZ (25000000) + +/* Register Field Definitions */ +#define NPCM7XX_CLK_WDRCR_CA9C BIT(0)/* Cortex A9 Cores */ +#define PLLCON_LOKI BIT(31)#define PLLCON_LOKS BIT(30)#define PLLCON_PWDEN BIT(12) +#define PLLCON_FBDV (con) extract32((con), 16, 12) +#define PLLCON_OTDV2 (con) extract32((con), 13, 3) +#define PLLCON_OTDV1 (con) extract32((con), 8, 3) +#define PLLCON_INDV (con) extract32((con), 0, 6)enum NPCM7xxCLKRegisters {NPCM7XX_CLK_CLKEN1 ,
@@ -89,12 +103,609 @@ static const uint32_t cold_reset_values[NPCM7XX_CLK_NR_REGS] = { [NPCM7XX_CLK_AHBCKFI] = 0x000000c8, }; -/* Register Field Definitions */ -#define NPCM7XX_CLK_WDRCR_CA9C BIT(0)/* Cortex A9 Cores */ -/* The number of watchdogs that can trigger a reset. */ #define NPCM7XX_NR_WATCHDOGS (3) +/* Clock converter functions */ + +#define TYPE_NPCM7XX_CLOCK_PLL "npcm7xx-clock-pll" +#define NPCM7XX_CLOCK_PLL (obj) OBJECT_CHECK(NPCM7xxClockPLLState, \ + (obj), TYPE_NPCM7XX_CLOCK_PLL) +#define TYPE_NPCM7XX_CLOCK_SEL "npcm7xx-clock-sel" +#define NPCM7XX_CLOCK_SEL (obj) OBJECT_CHECK(NPCM7xxClockSELState, \ + (obj), TYPE_NPCM7XX_CLOCK_SEL) +#define TYPE_NPCM7XX_CLOCK_DIVIDER "npcm7xx-clock-divider" +#define NPCM7XX_CLOCK_DIVIDER (obj) OBJECT_CHECK(NPCM7xxClockDividerState, \ + (obj), TYPE_NPCM7XX_CLOCK_DIVIDER) + +static void npcm7xx_clk_update_pll (void *opaque) +{ +NPCM7xxClockPLLState *s = opaque; +uint32_t con = s->clk->regs[s->reg]; +uint64_t freq; + +/* The PLL is grounded if it is not locked yet. */ +if (con &PLLCON_LOKI ) { + freq =clock_get_hz (s->clock_in); + freq *=PLLCON_FBDV (con); + freq /=PLLCON_INDV (con) *PLLCON_OTDV1 (con) *PLLCON_OTDV2 (con); + }else { + freq =0 ; + } + +clock_update_hz (s->clock_out, freq); +} + +static void npcm7xx_clk_update_sel (void *opaque) +{ +NPCM7xxClockSELState *s = opaque; +uint32_t index =extract32 (s->clk->regs[NPCM7XX_CLK_CLKSEL ], s->offset, + s->len); + +if (index >= s->input_size) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: SEL index: %u out of range\n" , + __func__, index); + index =0 ; + } +clock_update_hz (s->clock_out,clock_get_hz (s->clock_in[index])); +} + +static void npcm7xx_clk_update_divider (void *opaque) +{ +NPCM7xxClockDividerState *s = opaque; +uint32_t freq; + + freq = s->divide (s); +clock_update_hz (s->clock_out, freq); +} + +static uint32_t divide_by_constant (NPCM7xxClockDividerState *s) +{ +return clock_get_hz (s->clock_in) / s->divisor; +} + +static uint32_t divide_by_reg_divisor (NPCM7xxClockDividerState *s) +{ +return clock_get_hz (s->clock_in) / + (extract32 (s->clk->regs[s->reg], s->offset, s->len) +1 ); +} + +static uint32_t divide_by_reg_divisor_times_2 (NPCM7xxClockDividerState *s) +{ +return divide_by_reg_divisor (s) /2 ; +} + +static uint32_t shift_by_reg_divisor (NPCM7xxClockDividerState *s) +{ +return clock_get_hz (s->clock_in) >> +extract32 (s->clk->regs[s->reg], s->offset, s->len); +} + +static NPCM7xxClockPLL find_pll_by_reg (enum NPCM7xxCLKRegisters reg) +{ +switch (reg) { +case NPCM7XX_CLK_PLLCON0 : +return NPCM7XX_CLOCK_PLL0 ; +case NPCM7XX_CLK_PLLCON1 : +return NPCM7XX_CLOCK_PLL1 ; +case NPCM7XX_CLK_PLLCON2 : +return NPCM7XX_CLOCK_PLL2 ; +case NPCM7XX_CLK_PLLCONG : +return NPCM7XX_CLOCK_PLLG ; +default : +g_assert_not_reached (); + } +} + +static void npcm7xx_clk_update_all_plls (NPCM7xxCLKState *clk) +{ +int i; + +for (i =0 ; i <NPCM7XX_CLOCK_NR_PLLS ; ++i) { +npcm7xx_clk_update_pll (&clk->plls[i]); + } +} + +static void npcm7xx_clk_update_all_sels (NPCM7xxCLKState *clk) +{ +int i; + +for (i =0 ; i <NPCM7XX_CLOCK_NR_SELS ; ++i) { +npcm7xx_clk_update_sel (&clk->sels[i]); + } +} + +static void npcm7xx_clk_update_all_dividers (NPCM7xxCLKState *clk) +{ +int i; + +for (i =0 ; i <NPCM7XX_CLOCK_NR_DIVIDERS ; ++i) { +npcm7xx_clk_update_divider (&clk->dividers[i]); + } +} + +static void npcm7xx_clk_update_all_clocks (NPCM7xxCLKState *clk) +{ +clock_update_hz (clk->clkref,NPCM7XX_CLOCK_REF_HZ ); +npcm7xx_clk_update_all_plls (clk); +npcm7xx_clk_update_all_sels (clk); +npcm7xx_clk_update_all_dividers (clk); +} + +/* Types of clock sources. */ +typedef enum ClockSrcType { +CLKSRC_REF , +CLKSRC_PLL , +CLKSRC_SEL , +CLKSRC_DIV , +}ClockSrcType ; + +typedef struct PLLInitInfo { +const char *name; +ClockSrcType src_type; +int src_index; +int reg; +const char *public_name; +}PLLInitInfo ; + +typedef struct SELInitInfo { +const char *name; +uint8_t input_size; +ClockSrcType src_type[NPCM7XX_CLK_SEL_MAX_INPUT ]; +int src_index[NPCM7XX_CLK_SEL_MAX_INPUT ]; +int offset; +int len; +const char *public_name; +}SELInitInfo ; + +typedef struct DividerInitInfo { +const char *name; +ClockSrcType src_type; +int src_index; +uint32_t (*divide)(NPCM7xxClockDividerState *s); +int reg;/* not used when type == CONSTANT */ +int offset;/* not used when type == CONSTANT */ +int len;/* not used when type == CONSTANT */ +int divisor;/* used only when type == CONSTANT */ +const char *public_name; +}DividerInitInfo ; + +static const PLLInitInfo pll_init_info_list[] = { + [NPCM7XX_CLOCK_PLL0 ] = { + .name ="pll0" , + .src_type =CLKSRC_REF , + .reg =NPCM7XX_CLK_PLLCON0 , + }, + [NPCM7XX_CLOCK_PLL1 ] = { + .name ="pll1" , + .src_type =CLKSRC_REF , + .reg =NPCM7XX_CLK_PLLCON1 , + }, + [NPCM7XX_CLOCK_PLL2 ] = { + .name ="pll2" , + .src_type =CLKSRC_REF , + .reg =NPCM7XX_CLK_PLLCON2 , + }, + [NPCM7XX_CLOCK_PLLG ] = { + .name ="pllg" , + .src_type =CLKSRC_REF , + .reg =NPCM7XX_CLK_PLLCONG , + }, +}; + +static const SELInitInfo sel_init_info_list[] = { + [NPCM7XX_CLOCK_PIXCKSEL ] = { + .name ="pixcksel" , + .input_size =2 , + .src_type = {CLKSRC_PLL ,CLKSRC_REF }, + .src_index = {NPCM7XX_CLOCK_PLLG ,0 }, + .offset =5 , + .len =1 , + .public_name ="pixel-clock" , + }, + [NPCM7XX_CLOCK_MCCKSEL ] = { + .name ="mccksel" , + .input_size =4 , + .src_type = {CLKSRC_DIV ,CLKSRC_REF ,CLKSRC_REF , +/*MCBPCK, shouldn't be used in normal operation*/ +CLKSRC_REF }, + .src_index = {NPCM7XX_CLOCK_PLL1D2 ,0 ,0 ,0 }, + .offset =12 , + .len =2 , + .public_name ="mc-phy-clock" , + }, + [NPCM7XX_CLOCK_CPUCKSEL ] = { + .name ="cpucksel" , + .input_size =4 , + .src_type = {CLKSRC_PLL ,CLKSRC_DIV ,CLKSRC_REF , +/*SYSBPCK, shouldn't be used in normal operation*/ +CLKSRC_REF }, + .src_index = {NPCM7XX_CLOCK_PLL0 ,NPCM7XX_CLOCK_PLL1D2 ,0 ,0 }, + .offset =0 , + .len =2 , + .public_name ="system-clock" , + }, + [NPCM7XX_CLOCK_CLKOUTSEL ] = { + .name ="clkoutsel" , + .input_size =5 , + .src_type = {CLKSRC_PLL ,CLKSRC_DIV ,CLKSRC_REF , +CLKSRC_PLL ,CLKSRC_DIV }, + .src_index = {NPCM7XX_CLOCK_PLL0 ,NPCM7XX_CLOCK_PLL1D2 ,0 , +NPCM7XX_CLOCK_PLLG ,NPCM7XX_CLOCK_PLL2D2 }, + .offset =18 , + .len =3 , + .public_name ="tock" , + }, + [NPCM7XX_CLOCK_UARTCKSEL ] = { + .name ="uartcksel" , + .input_size =4 , + .src_type = {CLKSRC_PLL ,CLKSRC_DIV ,CLKSRC_REF ,CLKSRC_DIV }, + .src_index = {NPCM7XX_CLOCK_PLL0 ,NPCM7XX_CLOCK_PLL1D2 ,0 , +NPCM7XX_CLOCK_PLL2D2 }, + .offset =8 , + .len =2 , + }, + [NPCM7XX_CLOCK_TIMCKSEL ] = { + .name ="timcksel" , + .input_size =4 , + .src_type = {CLKSRC_PLL ,CLKSRC_DIV ,CLKSRC_REF ,CLKSRC_DIV }, + .src_index = {NPCM7XX_CLOCK_PLL0 ,NPCM7XX_CLOCK_PLL1D2 ,0 , +NPCM7XX_CLOCK_PLL2D2 }, + .offset =14 , + .len =2 , + }, + [NPCM7XX_CLOCK_SDCKSEL ] = { + .name ="sdcksel" , + .input_size =4 , + .src_type = {CLKSRC_PLL ,CLKSRC_DIV ,CLKSRC_REF ,CLKSRC_DIV }, + .src_index = {NPCM7XX_CLOCK_PLL0 ,NPCM7XX_CLOCK_PLL1D2 ,0 , +NPCM7XX_CLOCK_PLL2D2 }, + .offset =6 , + .len =2 , + }, + [NPCM7XX_CLOCK_GFXMSEL ] = { + .name ="gfxmksel" , + .input_size =2 , + .src_type = {CLKSRC_REF ,CLKSRC_PLL }, + .src_index = {0 ,NPCM7XX_CLOCK_PLL2 }, + .offset =21 , + .len =1 , + }, + [NPCM7XX_CLOCK_SUCKSEL ] = { + .name ="sucksel" , + .input_size =4 , + .src_type = {CLKSRC_PLL ,CLKSRC_DIV ,CLKSRC_REF ,CLKSRC_DIV }, + .src_index = {NPCM7XX_CLOCK_PLL0 ,NPCM7XX_CLOCK_PLL1D2 ,0 , +NPCM7XX_CLOCK_PLL2D2 }, + .offset =10 , + .len =2 , + }, +}; + +static const DividerInitInfo divider_init_info_list[] = { + [NPCM7XX_CLOCK_PLL1D2 ] = { + .name ="pll1d2" , + .src_type =CLKSRC_PLL , + .src_index =NPCM7XX_CLOCK_PLL1 , + .divide = divide_by_constant, + .divisor =2 , + }, + [NPCM7XX_CLOCK_PLL2D2 ] = { + .name ="pll2d2" , + .src_type =CLKSRC_PLL , + .src_index =NPCM7XX_CLOCK_PLL2 , + .divide = divide_by_constant, + .divisor =2 , + }, + [NPCM7XX_CLOCK_MC_DIVIDER ] = { + .name ="mc-divider" , + .src_type =CLKSRC_SEL , + .src_index =NPCM7XX_CLOCK_MCCKSEL , + .divide = divide_by_constant, + .divisor =2 , + .public_name ="mc-clock" + }, + [NPCM7XX_CLOCK_AXI_DIVIDER ] = { + .name ="axi-divider" , + .src_type =CLKSRC_SEL , + .src_index =NPCM7XX_CLOCK_CPUCKSEL , + .divide = shift_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV1 , + .offset =0 , + .len =1 , + .public_name ="clk2" + }, + [NPCM7XX_CLOCK_AHB_DIVIDER ] = { + .name ="ahb-divider" , + .src_type =CLKSRC_DIV , + .src_index =NPCM7XX_CLOCK_AXI_DIVIDER , + .divide = divide_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV1 , + .offset =26 , + .len =2 , + .public_name ="clk4" + }, + [NPCM7XX_CLOCK_AHB3_DIVIDER ] = { + .name ="ahb3-divider" , + .src_type =CLKSRC_DIV , + .src_index =NPCM7XX_CLOCK_AHB_DIVIDER , + .divide = divide_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV1 , + .offset =6 , + .len =5 , + .public_name ="ahb3-spi3-clock" + }, + [NPCM7XX_CLOCK_SPI0_DIVIDER ] = { + .name ="spi0-divider" , + .src_type =CLKSRC_DIV , + .src_index =NPCM7XX_CLOCK_AHB_DIVIDER , + .divide = divide_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV3 , + .offset =6 , + .len =5 , + .public_name ="spi0-clock" , + }, + [NPCM7XX_CLOCK_SPIX_DIVIDER ] = { + .name ="spix-divider" , + .src_type =CLKSRC_DIV , + .src_index =NPCM7XX_CLOCK_AHB_DIVIDER , + .divide = divide_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV3 , + .offset =1 , + .len =5 , + .public_name ="spix-clock" , + }, + [NPCM7XX_CLOCK_APB1_DIVIDER ] = { + .name ="apb1-divider" , + .src_type =CLKSRC_DIV , + .src_index =NPCM7XX_CLOCK_AHB_DIVIDER , + .divide = shift_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV2 , + .offset =24 , + .len =2 , + .public_name ="apb1-clock" , + }, + [NPCM7XX_CLOCK_APB2_DIVIDER ] = { + .name ="apb2-divider" , + .src_type =CLKSRC_DIV , + .src_index =NPCM7XX_CLOCK_AHB_DIVIDER , + .divide = shift_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV2 , + .offset =26 , + .len =2 , + .public_name ="apb2-clock" , + }, + [NPCM7XX_CLOCK_APB3_DIVIDER ] = { + .name ="apb3-divider" , + .src_type =CLKSRC_DIV , + .src_index =NPCM7XX_CLOCK_AHB_DIVIDER , + .divide = shift_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV2 , + .offset =28 , + .len =2 , + .public_name ="apb3-clock" , + }, + [NPCM7XX_CLOCK_APB4_DIVIDER ] = { + .name ="apb4-divider" , + .src_type =CLKSRC_DIV , + .src_index =NPCM7XX_CLOCK_AHB_DIVIDER , + .divide = shift_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV2 , + .offset =30 , + .len =2 , + .public_name ="apb4-clock" , + }, + [NPCM7XX_CLOCK_APB5_DIVIDER ] = { + .name ="apb5-divider" , + .src_type =CLKSRC_DIV , + .src_index =NPCM7XX_CLOCK_AHB_DIVIDER , + .divide = shift_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV2 , + .offset =22 , + .len =2 , + .public_name ="apb5-clock" , + }, + [NPCM7XX_CLOCK_CLKOUT_DIVIDER ] = { + .name ="clkout-divider" , + .src_type =CLKSRC_SEL , + .src_index =NPCM7XX_CLOCK_CLKOUTSEL , + .divide = divide_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV2 , + .offset =16 , + .len =5 , + .public_name ="clkout" , + }, + [NPCM7XX_CLOCK_UART_DIVIDER ] = { + .name ="uart-divider" , + .src_type =CLKSRC_SEL , + .src_index =NPCM7XX_CLOCK_UARTCKSEL , + .divide = divide_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV1 , + .offset =16 , + .len =5 , + .public_name ="uart-clock" , + }, + [NPCM7XX_CLOCK_TIMER_DIVIDER ] = { + .name ="timer-divider" , + .src_type =CLKSRC_SEL , + .src_index =NPCM7XX_CLOCK_TIMCKSEL , + .divide = divide_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV1 , + .offset =21 , + .len =5 , + .public_name ="timer-clock" , + }, + [NPCM7XX_CLOCK_ADC_DIVIDER ] = { + .name ="adc-divider" , + .src_type =CLKSRC_DIV , + .src_index =NPCM7XX_CLOCK_TIMER_DIVIDER , + .divide = shift_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV1 , + .offset =28 , + .len =3 , + .public_name ="adc-clock" , + }, + [NPCM7XX_CLOCK_MMC_DIVIDER ] = { + .name ="mmc-divider" , + .src_type =CLKSRC_SEL , + .src_index =NPCM7XX_CLOCK_SDCKSEL , + .divide = divide_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV1 , + .offset =11 , + .len =5 , + .public_name ="mmc-clock" , + }, + [NPCM7XX_CLOCK_SDHC_DIVIDER ] = { + .name ="sdhc-divider" , + .src_type =CLKSRC_SEL , + .src_index =NPCM7XX_CLOCK_SDCKSEL , + .divide = divide_by_reg_divisor_times_2, + .reg =NPCM7XX_CLK_CLKDIV2 , + .offset =0 , + .len =4 , + .public_name ="sdhc-clock" , + }, + [NPCM7XX_CLOCK_GFXM_DIVIDER ] = { + .name ="gfxm-divider" , + .src_type =CLKSRC_SEL , + .src_index =NPCM7XX_CLOCK_GFXMSEL , + .divide = divide_by_constant, + .divisor =3 , + .public_name ="gfxm-clock" , + }, + [NPCM7XX_CLOCK_UTMI_DIVIDER ] = { + .name ="utmi-divider" , + .src_type =CLKSRC_SEL , + .src_index =NPCM7XX_CLOCK_SUCKSEL , + .divide = divide_by_reg_divisor, + .reg =NPCM7XX_CLK_CLKDIV2 , + .offset =8 , + .len =5 , + .public_name ="utmi-clock" , + }, +}; + +static void npcm7xx_clk_pll_init (Object *obj) +{ +NPCM7xxClockPLLState *pll =NPCM7XX_CLOCK_PLL (obj); + + pll->clock_in =qdev_init_clock_in (DEVICE (pll),"clock-in" , + npcm7xx_clk_update_pll, pll); + pll->clock_out =qdev_init_clock_out (DEVICE (pll),"clock-out" ); +} + +static void npcm7xx_clk_sel_init (Object *obj) +{ +int i; +NPCM7xxClockSELState *sel =NPCM7XX_CLOCK_SEL (obj); + +for (i =0 ; i <NPCM7XX_CLK_SEL_MAX_INPUT ; ++i) { + sel->clock_in[i] =qdev_init_clock_in (DEVICE (sel), +g_strdup_printf ("clock-in[%d]" , i), + npcm7xx_clk_update_sel, sel); + } + sel->clock_out =qdev_init_clock_out (DEVICE (sel),"clock-out" ); +} +static void npcm7xx_clk_divider_init (Object *obj) +{ +NPCM7xxClockDividerState *div =NPCM7XX_CLOCK_DIVIDER (obj); + + div->clock_in =qdev_init_clock_in (DEVICE (div),"clock-in" , + npcm7xx_clk_update_divider, div); + div->clock_out =qdev_init_clock_out (DEVICE (div),"clock-out" ); +} + +static void npcm7xx_init_clock_pll (NPCM7xxClockPLLState *pll, +NPCM7xxCLKState *clk,const PLLInitInfo *init_info) +{ + pll->name = init_info->name; + pll->clk = clk; + pll->reg = init_info->reg; +if (init_info->public_name !=NULL ) { +qdev_alias_clock (DEVICE (pll),"clock-out" ,DEVICE (clk), + init_info->public_name); + } +} + +static void npcm7xx_init_clock_sel (NPCM7xxClockSELState *sel, +NPCM7xxCLKState *clk,const SELInitInfo *init_info) +{ +int input_size = init_info->input_size; + + sel->name = init_info->name; + sel->clk = clk; + sel->input_size = init_info->input_size; +g_assert (input_size <=NPCM7XX_CLK_SEL_MAX_INPUT ); + sel->offset = init_info->offset; + sel->len = init_info->len; +if (init_info->public_name !=NULL ) { +qdev_alias_clock (DEVICE (sel),"clock-out" ,DEVICE (clk), + init_info->public_name); + } +} + +static void npcm7xx_init_clock_divider (NPCM7xxClockDividerState *div, +NPCM7xxCLKState *clk,const DividerInitInfo *init_info) +{ + div->name = init_info->name; + div->clk = clk; + + div->divide = init_info->divide; +if (div->divide == divide_by_constant) { + div->divisor = init_info->divisor; + }else { + div->reg = init_info->reg; + div->offset = init_info->offset; + div->len = init_info->len; + } +if (init_info->public_name !=NULL ) { +qdev_alias_clock (DEVICE (div),"clock-out" ,DEVICE (clk), + init_info->public_name); + } +} + +static Clock *npcm7xx_get_clock (NPCM7xxCLKState *clk,ClockSrcType type, +int index) +{ +switch (type) { +case CLKSRC_REF : +return clk->clkref; +case CLKSRC_PLL : +return clk->plls[index].clock_out; +case CLKSRC_SEL : +return clk->sels[index].clock_out; +case CLKSRC_DIV : +return clk->dividers[index].clock_out; +default : +g_assert_not_reached (); + } +} + +static void npcm7xx_connect_clocks (NPCM7xxCLKState *clk) +{ +int i, j; +Clock *src; + +for (i =0 ; i <NPCM7XX_CLOCK_NR_PLLS ; ++i) { + src =npcm7xx_get_clock (clk, pll_init_info_list[i].src_type, + pll_init_info_list[i].src_index); +clock_set_source (clk->plls[i].clock_in, src); + } +for (i =0 ; i <NPCM7XX_CLOCK_NR_SELS ; ++i) { +for (j =0 ; j < sel_init_info_list[i].input_size; ++j) { + src =npcm7xx_get_clock (clk, sel_init_info_list[i].src_type[j], + sel_init_info_list[i].src_index[j]); +clock_set_source (clk->sels[i].clock_in[j], src); + } + } +for (i =0 ; i <NPCM7XX_CLOCK_NR_DIVIDERS ; ++i) { + src =npcm7xx_get_clock (clk, divider_init_info_list[i].src_type, + divider_init_info_list[i].src_index); +clock_set_source (clk->dividers[i].clock_in, src); + } +} +static uint64_t npcm7xx_clk_read (void *opaque,hwaddr offset,unsigned size) {uint32_t reg = offset /sizeof (uint32_t );
@@ -129,7 +740,7 @@ static uint64_t npcm7xx_clk_read(void *opaque, hwaddr offset, unsigned size)* * The 4 LSBs are always zero: (1e9 / 640) << 4 = 25000000. */ - value = (((now_ns - s->ref_ns) /640 ) <<4 ) %NPCM7XX_TIMER_REF_HZ ; + value = (((now_ns - s->ref_ns) /640 ) <<4 ) %NPCM7XX_CLOCK_REF_HZ ;break ;default :
@@ -183,6 +794,20 @@ static void npcm7xx_clk_write(void *opaque, hwaddr offset, value |= (value &PLLCON_LOKS ); } } +/* Only update PLL when it is locked. */ +if (value &PLLCON_LOKI ) { +npcm7xx_clk_update_pll (&s->plls[find_pll_by_reg (reg)]); + } +break ; + +case NPCM7XX_CLK_CLKSEL : +npcm7xx_clk_update_all_sels (s); +break ; + +case NPCM7XX_CLK_CLKDIV1 : +case NPCM7XX_CLK_CLKDIV2 : +case NPCM7XX_CLK_CLKDIV3 : +npcm7xx_clk_update_all_dividers (s);break ;case NPCM7XX_CLK_CNTR25M :
@@ -234,6 +859,7 @@ static void npcm7xx_clk_enter_reset(Object *obj, ResetType type)case RESET_TYPE_COLD :memcpy (s->regs, cold_reset_values,sizeof (cold_reset_values)); s->ref_ns =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ); +npcm7xx_clk_update_all_clocks (s);return ; }
@@ -245,6 +871,42 @@ static void npcm7xx_clk_enter_reset(Object *obj, ResetType type) __func__, type); } +static void npcm7xx_clk_init_clock_hierarchy (NPCM7xxCLKState *s) +{ +int i; + + s->clkref =qdev_init_clock_in (DEVICE (s),"clkref" ,NULL ,NULL ); + +/* First pass: init all converter modules */ +QEMU_BUILD_BUG_ON (ARRAY_SIZE (pll_init_info_list) !=NPCM7XX_CLOCK_NR_PLLS ); +QEMU_BUILD_BUG_ON (ARRAY_SIZE (sel_init_info_list) !=NPCM7XX_CLOCK_NR_SELS ); +QEMU_BUILD_BUG_ON (ARRAY_SIZE (divider_init_info_list) + !=NPCM7XX_CLOCK_NR_DIVIDERS ); +for (i =0 ; i <NPCM7XX_CLOCK_NR_PLLS ; ++i) { +object_initialize_child (OBJECT (s), pll_init_info_list[i].name, + &s->plls[i],TYPE_NPCM7XX_CLOCK_PLL ); +npcm7xx_init_clock_pll (&s->plls[i], s, + &pll_init_info_list[i]); + } +for (i =0 ; i <NPCM7XX_CLOCK_NR_SELS ; ++i) { +object_initialize_child (OBJECT (s), sel_init_info_list[i].name, + &s->sels[i],TYPE_NPCM7XX_CLOCK_SEL ); +npcm7xx_init_clock_sel (&s->sels[i], s, + &sel_init_info_list[i]); + } +for (i =0 ; i <NPCM7XX_CLOCK_NR_DIVIDERS ; ++i) { +object_initialize_child (OBJECT (s), divider_init_info_list[i].name, + &s->dividers[i],TYPE_NPCM7XX_CLOCK_DIVIDER ); +npcm7xx_init_clock_divider (&s->dividers[i], s, + ÷r_init_info_list[i]); + } + +/* Second pass: connect converter modules */ +npcm7xx_connect_clocks (s); + +clock_update_hz (s->clkref,NPCM7XX_CLOCK_REF_HZ ); +} +static void npcm7xx_clk_init (Object *obj) {NPCM7xxCLKState *s =NPCM7XX_CLK (obj);
@@ -252,21 +914,114 @@ static void npcm7xx_clk_init(Object *obj)memory_region_init_io (&s->iomem, obj, &npcm7xx_clk_ops, s,TYPE_NPCM7XX_CLK ,4 * KiB);sysbus_init_mmio (&s->parent, &s->iomem); +} + +static int npcm7xx_clk_post_load (void *opaque,int version_id) +{ +if (version_id >=1 ) { +NPCM7xxCLKState *clk = opaque; + +npcm7xx_clk_update_all_clocks (clk); + } + +return 0 ; +} + +static void npcm7xx_clk_realize (DeviceState *dev,Error **errp) +{ +int i; +NPCM7xxCLKState *s =NPCM7XX_CLK (dev); +qdev_init_gpio_in_named (DEVICE (s), npcm7xx_clk_perform_watchdog_reset,NPCM7XX_WATCHDOG_RESET_GPIO_IN ,NPCM7XX_NR_WATCHDOGS ); +npcm7xx_clk_init_clock_hierarchy (s); + +/* Realize child devices */ +for (i =0 ; i <NPCM7XX_CLOCK_NR_PLLS ; ++i) { +if (!qdev_realize (DEVICE (&s->plls[i]),NULL , errp)) { +return ; + } + } +for (i =0 ; i <NPCM7XX_CLOCK_NR_SELS ; ++i) { +if (!qdev_realize (DEVICE (&s->sels[i]),NULL , errp)) { +return ; + } + } +for (i =0 ; i <NPCM7XX_CLOCK_NR_DIVIDERS ; ++i) { +if (!qdev_realize (DEVICE (&s->dividers[i]),NULL , errp)) { +return ; + } + } } -static const VMStateDescription vmstate_npcm7xx_clk = { - .name ="npcm7xx-clk" , +static const VMStateDescription vmstate_npcm7xx_clk_pll = { + .name ="npcm7xx-clock-pll" , + .version_id =0 , + .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_CLOCK (clock_in, NPCM7xxClockPLLState), +VMSTATE_END_OF_LIST (), + }, +}; + +static const VMStateDescription vmstate_npcm7xx_clk_sel = { + .name ="npcm7xx-clock-sel" , + .version_id =0 , + .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_ARRAY_OF_POINTER_TO_STRUCT (clock_in, NPCM7xxClockSELState, +NPCM7XX_CLK_SEL_MAX_INPUT ,0 , vmstate_clock, Clock), +VMSTATE_END_OF_LIST (), + }, +}; + +static const VMStateDescription vmstate_npcm7xx_clk_divider = { + .name ="npcm7xx-clock-divider" , .version_id =0 , .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_CLOCK (clock_in, NPCM7xxClockDividerState), +VMSTATE_END_OF_LIST (), + }, +}; + +static const VMStateDescription vmstate_npcm7xx_clk = { + .name ="npcm7xx-clk" , + .version_id =1 , + .minimum_version_id =1 , + .post_load = npcm7xx_clk_post_load, .fields = (VMStateField []) {VMSTATE_UINT32_ARRAY (regs, NPCM7xxCLKState,NPCM7XX_CLK_NR_REGS ),VMSTATE_INT64 (ref_ns, NPCM7xxCLKState), +VMSTATE_CLOCK (clkref, NPCM7xxCLKState),VMSTATE_END_OF_LIST (), }, }; +static void npcm7xx_clk_pll_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->desc ="NPCM7xx Clock PLL Module" ; + dc->vmsd = &vmstate_npcm7xx_clk_pll; +} + +static void npcm7xx_clk_sel_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->desc ="NPCM7xx Clock SEL Module" ; + dc->vmsd = &vmstate_npcm7xx_clk_sel; +} + +static void npcm7xx_clk_divider_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->desc ="NPCM7xx Clock Divider Module" ; + dc->vmsd = &vmstate_npcm7xx_clk_divider; +} +static void npcm7xx_clk_class_init (ObjectClass *klass,void *data) {ResettableClass *rc =RESETTABLE_CLASS (klass);
@@ -276,9 +1031,34 @@ static void npcm7xx_clk_class_init(ObjectClass *klass, void *data) dc->desc ="NPCM7xx Clock Control Registers" ; dc->vmsd = &vmstate_npcm7xx_clk; + dc->realize = npcm7xx_clk_realize; rc->phases.enter = npcm7xx_clk_enter_reset; } +static const TypeInfo npcm7xx_clk_pll_info = { + .name =TYPE_NPCM7XX_CLOCK_PLL , + .parent =TYPE_DEVICE , + .instance_size =sizeof (NPCM7xxClockPLLState), + .instance_init = npcm7xx_clk_pll_init, + .class_init = npcm7xx_clk_pll_class_init, +}; + +static const TypeInfo npcm7xx_clk_sel_info = { + .name =TYPE_NPCM7XX_CLOCK_SEL , + .parent =TYPE_DEVICE , + .instance_size =sizeof (NPCM7xxClockSELState), + .instance_init = npcm7xx_clk_sel_init, + .class_init = npcm7xx_clk_sel_class_init, +}; + +static const TypeInfo npcm7xx_clk_divider_info = { + .name =TYPE_NPCM7XX_CLOCK_DIVIDER , + .parent =TYPE_DEVICE , + .instance_size =sizeof (NPCM7xxClockDividerState), + .instance_init = npcm7xx_clk_divider_init, + .class_init = npcm7xx_clk_divider_class_init, +}; +static const TypeInfo npcm7xx_clk_info = { .name =TYPE_NPCM7XX_CLK , .parent =TYPE_SYS_BUS_DEVICE ,
@@ -289,6 +1069,9 @@ static const TypeInfo npcm7xx_clk_info = {static void npcm7xx_clk_register_type (void ) { +type_register_static (&npcm7xx_clk_pll_info); +type_register_static (&npcm7xx_clk_sel_info); +type_register_static (&npcm7xx_clk_divider_info);type_register_static (&npcm7xx_clk_info); }type_init (npcm7xx_clk_register_type);
include/hw/misc/npcm7xx_clk.h +138 -2
160 lines not on this page · raw message
Signature · 1 line
2.29.2.684.gfbc64c5ab5-goog
PATCH v2 2/4 hw/timer: Refactor NPCM7XX Timer to use CLK clock
In reply to Hao Wu viaThis patch makes NPCM7XX Timer to use a the timer clock generated by the CLK module instead of the magic nubmer TIMER_REF_HZ.
--- hw/arm/npcm7xx.c | 5 +++++ hw/timer/npcm7xx_timer.c | 25 +++++++++++++++---------- include/hw/misc/npcm7xx_clk.h | 6 ------ include/hw/timer/npcm7xx_timer.h | 1 + 4 files changed, 21 insertions(+), 16 deletions(-)
hw/arm/npcm7xx.c +5 -0
@@ -22,6 +22,7 @@#include "hw/char/serial.h" #include "hw/loader.h" #include "hw/misc/unimp.h" +#include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/units.h"
@@ -420,6 +421,10 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)int first_irq;int j; +/* Connect the timer clock. */ +qdev_connect_clock_in (DEVICE (&s->tim[i]),"clock" ,qdev_get_clock_out ( +DEVICE (&s->clk),"timer-clock" )); +sysbus_realize (sbd, &error_abort);sysbus_mmio_map (sbd,0 , npcm7xx_tim_addr[i]);
hw/timer/npcm7xx_timer.c +15 -10
@@ -17,8 +17,8 @@#include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-clock.h" #include "hw/qdev-properties.h" -#include "hw/misc/npcm7xx_clk.h" #include "hw/timer/npcm7xx_timer.h" #include "migration/vmstate.h" #include "qemu/bitops.h"
@@ -130,7 +130,7 @@ static int64_t npcm7xx_timer_count_to_ns(NPCM7xxTimer *t, uint32_t count) {int64_t ns = count; - ns *=NANOSECONDS_PER_SECOND /NPCM7XX_TIMER_REF_HZ ; + ns *=NANOSECONDS_PER_SECOND /clock_get_hz (t->ctrl->clock); ns *=npcm7xx_tcsr_prescaler (t->tcsr);return ns;
@@ -141,7 +141,7 @@ static uint32_t npcm7xx_timer_ns_to_count(NPCM7xxTimer *t, int64_t ns) {int64_t count; - count = ns / (NANOSECONDS_PER_SECOND /NPCM7XX_TIMER_REF_HZ ); + count = ns / (NANOSECONDS_PER_SECOND /clock_get_hz (t->ctrl->clock)); count /=npcm7xx_tcsr_prescaler (t->tcsr);return count;
@@ -166,8 +166,10 @@ static uint32_t npcm7xx_watchdog_timer_prescaler(const NPCM7xxWatchdogTimer *t)static void npcm7xx_watchdog_timer_reset_cycles (NPCM7xxWatchdogTimer *t,int64_t cycles) { +g_assert (clock_get_hz (t->ctrl->clock) ==25000000 );uint32_t prescaler =npcm7xx_watchdog_timer_prescaler (t); -int64_t ns = (NANOSECONDS_PER_SECOND /NPCM7XX_TIMER_REF_HZ ) * cycles; +int64_t ns = (NANOSECONDS_PER_SECOND /clock_get_hz (t->ctrl->clock)) + * cycles;/* * The reset function always clears the current timer. The caller of the
@@ -606,10 +608,11 @@ static void npcm7xx_timer_hold_reset(Object *obj)qemu_irq_lower (s->watchdog_timer.irq); } -static void npcm7xx_timer_realize (DeviceState *dev,Error **errp) +static void npcm7xx_timer_init (Object *obj) { -NPCM7xxTimerCtrlState *s =NPCM7XX_TIMER (dev); +NPCM7xxTimerCtrlState *s =NPCM7XX_TIMER (obj);SysBusDevice *sbd = &s->parent; +DeviceState *dev =DEVICE (obj);int i;NPCM7xxWatchdogTimer *w;
@@ -627,11 +630,12 @@ static void npcm7xx_timer_realize(DeviceState *dev, Error **errp) npcm7xx_watchdog_timer_expired, w);sysbus_init_irq (sbd, &w->irq); -memory_region_init_io (&s->iomem,OBJECT (s), &npcm7xx_timer_ops, s, +memory_region_init_io (&s->iomem, obj, &npcm7xx_timer_ops, s,TYPE_NPCM7XX_TIMER ,4 * KiB);sysbus_init_mmio (sbd, &s->iomem);qdev_init_gpio_out_named (dev, &w->reset_signal,NPCM7XX_WATCHDOG_RESET_GPIO_OUT ,1 ); + s->clock =qdev_init_clock_in (dev,"clock" ,NULL ,NULL ); }static const VMStateDescription vmstate_npcm7xx_base_timer = {
@@ -675,10 +679,11 @@ static const VMStateDescription vmstate_npcm7xx_watchdog_timer = {static const VMStateDescription vmstate_npcm7xx_timer_ctrl = { .name ="npcm7xx-timer-ctrl" , - .version_id =1 , - .minimum_version_id =1 , + .version_id =2 , + .minimum_version_id =2 , .fields = (VMStateField []) {VMSTATE_UINT32 (tisr, NPCM7xxTimerCtrlState), +VMSTATE_CLOCK (clock, NPCM7xxTimerCtrlState),VMSTATE_STRUCT_ARRAY (timer, NPCM7xxTimerCtrlState,NPCM7XX_TIMERS_PER_CTRL ,0 , vmstate_npcm7xx_timer, NPCM7xxTimer),
@@ -697,7 +702,6 @@ static void npcm7xx_timer_class_init(ObjectClass *klass, void *data)QEMU_BUILD_BUG_ON (NPCM7XX_TIMER_REGS_END >NPCM7XX_TIMER_NR_REGS ); dc->desc ="NPCM7xx Timer Controller" ; - dc->realize = npcm7xx_timer_realize; dc->vmsd = &vmstate_npcm7xx_timer_ctrl; rc->phases.enter = npcm7xx_timer_enter_reset; rc->phases.hold = npcm7xx_timer_hold_reset;
@@ -708,6 +712,7 @@ static const TypeInfo npcm7xx_timer_info = { .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(NPCM7xxTimerCtrlState), .class_init = npcm7xx_timer_class_init, + .instance_init = npcm7xx_timer_init, };static void npcm7xx_timer_register_type (void )
include/hw/misc/npcm7xx_clk.h +0 -6
@@ -20,12 +20,6 @@#include "hw/clock.h" #include "hw/sysbus.h" -/* -* The reference clock frequency for the timer modules, and the SECCNT and -* CNTR25M registers in this module, is always 25 MHz. -*/ -#define NPCM7XX_TIMER_REF_HZ (25000000) -/* * Number of registers in our device state structure. Don't change this without * incrementing the version_id in the vmstate.
include/hw/timer/npcm7xx_timer.h +1 -0
@@ -101,6 +101,7 @@ struct NPCM7xxTimerCtrlState {uint32_t tisr; +Clock *clock;NPCM7xxTimer timer[NPCM7XX_TIMERS_PER_CTRL ];NPCM7xxWatchdogTimer watchdog_timer; };
Signature · 1 line
2.29.2.684.gfbc64c5ab5-goog
Re: [PATCH v2 2/4] hw/timer: Refactor NPCM7XX Timer to use CLK clock
Hi Wu,
[The list is mangling your From: ...]
Quoted 2 lines · Hao Wu via
This patch makes NPCM7XX Timer to use a the timer clock generated by the CLK module instead of the magic nubmer
TIMER_REF_HZ.
Typo "number".
Quoted 49 lines
Reviewed-by Havard Skinnemoen <[email protected]>Reviewed-by Tyrone Ting <[email protected]>Signed-off-by Hao Wu <[email protected]>--- hw/arm/npcm7xx.c | 5 +++++ hw/timer/npcm7xx_timer.c | 25 +++++++++++++++---------- include/hw/misc/npcm7xx_clk.h | 6 ------ include/hw/timer/npcm7xx_timer.h | 1 + 4 files changed, 21 insertions(+), 16 deletions(-)hw/arm/npcm7xx.c +5
-0@@ -22,6 +22,7 @@#include "hw/char/serial.h" #include "hw/loader.h" #include "hw/misc/unimp.h" +#include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/units.h" @@ -420,6 +421,10 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)int first_irq;int j; +/* Connect the timer clock. */ +qdev_connect_clock_in (DEVICE (&s->tim[i]),"clock" ,qdev_get_clock_out ( +DEVICE (&s->clk),"timer-clock" )); +sysbus_realize (sbd, &error_abort);sysbus_mmio_map (sbd,0 , npcm7xx_tim_addr[i]);hw/timer/npcm7xx_timer.c +1
-1@@ -17,8 +17,8 @@#include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-clock.h" #include "hw/qdev-properties.h" -#include "hw/misc/npcm7xx_clk.h" #include "hw/timer/npcm7xx_timer.h" #include "migration/vmstate.h" #include "qemu/bitops.h"
hw/timer/npcm7xx_timer.c static int64_t npcm7xx_timer_count_to_ns(NPCM7xxTimer *t, uint32_t count) · line 133
Quoted 5 lines
hw/timer/npcm7xx_timer.c +1
-1@@ -130,7 +130,7 @@ static int64_t npcm7xx_timer_count_to_ns(NPCM7xxTimer *t, uint32_t count) {int64_t ns = count; - ns *=NANOSECONDS_PER_SECOND /NPCM7XX_TIMER_REF_HZ ; + ns *=NANOSECONDS_PER_SECOND /clock_get_hz (t->ctrl->clock);
Why not use clock_get_ns()?
PATCH v2 3/4 hw/adc: Add an ADC module for NPCM7XX
In reply to Hao Wu viaThe ADC is part of NPCM7XX Module. Its behavior is controled by the ADC_CON register. It converts one of the eight analog inputs into a digital input and stores it in the ADC_DATA register when enabled.
--- docs/system/arm/nuvoton.rst | 2 +- hw/adc/meson.build | 1 + hw/adc/npcm7xx_adc.c | 318 ++++++++++++++++++++++++++ hw/arm/npcm7xx.c | 24 +- include/hw/adc/npcm7xx_adc.h | 72 ++++++ include/hw/arm/npcm7xx.h | 2 + tests/qtest/meson.build | 3 +- tests/qtest/npcm7xx_adc-test.c | 400 +++++++++++++++++++++++++++++++++ 8 files changed, 819 insertions(+), 3 deletions(-) create mode 100644 hw/adc/npcm7xx_adc.c create mode 100644 include/hw/adc/npcm7xx_adc.h create mode 100644 tests/qtest/npcm7xx_adc-test.c
docs/system/arm/nuvoton.rst +1 -1
@@ -41,6 +41,7 @@ Supported devices * Random Number Generator (RNG) * USB host (USBH) * GPIO controller + * Analog to Digital Converter (ADC) Missing devices ---------------
@@ -58,7 +59,6 @@ Missing devices * USB device (USBD) * SMBus controller (SMBF) * Peripheral SPI controller (PSPI) - * Analog to Digital Converter (ADC) * SD/MMC host * PECI interface * Pulse Width Modulation (PWM)
hw/adc/meson.build +1 -0
@@ -1 +1,2 @@ softmmu_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc.c')) +softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_adc.c'))
hw/adc/npcm7xx_adc.c new file +318 -0
318 lines not on this page · raw message
hw/arm/npcm7xx.c +23 -1
@@ -51,6 +51,9 @@#define NPCM7XX_EHCI_BA (0xf0806000)#define NPCM7XX_OHCI_BA (0xf0807000) +/* ADC Module */ +#define NPCM7XX_ADC_BA (0xf000c000) +/* Internal AHB SRAM */ #define NPCM7XX_RAM3_BA (0xc0008000)#define NPCM7XX_RAM3_SZ (4 * KiB)
@@ -61,6 +64,7 @@#define NPCM7XX_ROM_BA (0xffff0000)#define NPCM7XX_ROM_SZ (64 * KiB) +/* Clock configuration values to be fixed up when bypassing bootloader */ /* Run PLL1 at 1600 MHz */
@@ -73,6 +77,7 @@* interrupts. */ enum NPCM7xxInterrupt { +NPCM7XX_ADC_IRQ =0 ,NPCM7XX_UART0_IRQ =2 ,NPCM7XX_UART1_IRQ ,NPCM7XX_UART2_IRQ ,
@@ -296,6 +301,14 @@ static void npcm7xx_init_fuses(NPCM7xxState *s) sizeof(value)); } +static void npcm7xx_write_adc_calibration (NPCM7xxState *s) +{ +/* Both ADC and the fuse array must have realized. */ +QEMU_BUILD_BUG_ON (sizeof (s->adc.calibration_r_values) !=4 ); +npcm7xx_otp_array_write (&s->fuse_array, s->adc.calibration_r_values, +NPCM7XX_FUSE_ADC_CALIB ,sizeof (s->adc.calibration_r_values)); +} +static qemu_irq npcm7xx_irq (NPCM7xxState *s,int n) {return qdev_get_gpio_in (DEVICE (&s->a9mpcore), n);
@@ -322,6 +335,7 @@ static void npcm7xx_init(Object *obj) TYPE_NPCM7XX_FUSE_ARRAY);object_initialize_child (obj,"mc" , &s->mc,TYPE_NPCM7XX_MC );object_initialize_child (obj,"rng" , &s->rng,TYPE_NPCM7XX_RNG ); +object_initialize_child (obj,"adc" , &s->adc,TYPE_NPCM7XX_ADC );for (i =0 ; i <ARRAY_SIZE (s->tim); i++) {object_initialize_child (obj,"tim[*]" , &s->tim[i],TYPE_NPCM7XX_TIMER );
@@ -414,6 +428,15 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)sysbus_realize (SYS_BUS_DEVICE (&s->mc), &error_abort);sysbus_mmio_map (SYS_BUS_DEVICE (&s->mc),0 ,NPCM7XX_MC_BA ); +/* ADC Modules. Cannot fail. */ +qdev_connect_clock_in (DEVICE (&s->adc),"clock" ,qdev_get_clock_out ( +DEVICE (&s->clk),"adc-clock" )); +sysbus_realize (SYS_BUS_DEVICE (&s->adc), &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->adc),0 ,NPCM7XX_ADC_BA ); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->adc),0 , +npcm7xx_irq (s,NPCM7XX_ADC_IRQ )); +npcm7xx_write_adc_calibration (s); +/* Timer Modules (TIM). Cannot fail. */ QEMU_BUILD_BUG_ON (ARRAY_SIZE (npcm7xx_tim_addr) !=ARRAY_SIZE (s->tim));for (i =0 ; i <ARRAY_SIZE (s->tim); i++) {
@@ -528,7 +551,6 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("npcm7xx.vdmx" ,0xe0800000 ,4 * KiB);create_unimplemented_device ("npcm7xx.pcierc" ,0xe1000000 ,64 * KiB);create_unimplemented_device ("npcm7xx.kcs" ,0xf0007000 ,4 * KiB); -create_unimplemented_device ("npcm7xx.adc" ,0xf000c000 ,4 * KiB);create_unimplemented_device ("npcm7xx.gfxi" ,0xf000e000 ,4 * KiB);create_unimplemented_device ("npcm7xx.gpio[0]" ,0xf0010000 ,4 * KiB);create_unimplemented_device ("npcm7xx.gpio[1]" ,0xf0011000 ,4 * KiB);
include/hw/adc/npcm7xx_adc.h new file +72 -0
72 lines not on this page · raw message
include/hw/arm/npcm7xx.h +2 -0
@@ -17,6 +17,7 @@#define NPCM7XX_H #include "hw/boards.h" +#include "hw/adc/npcm7xx_adc.h" #include "hw/cpu/a9mpcore.h" #include "hw/gpio/npcm7xx_gpio.h" #include "hw/mem/npcm7xx_mc.h"
@@ -76,6 +77,7 @@ typedef struct NPCM7xxState {NPCM7xxGCRState gcr;NPCM7xxCLKState clk;NPCM7xxTimerCtrlState tim[3 ]; +NPCM7xxADCState adc;NPCM7xxOTPState key_storage;NPCM7xxOTPState fuse_array;NPCM7xxMCState mc;
tests/qtest/meson.build +2 -1
@@ -134,7 +134,8 @@ qtests_sparc64 = \ ['prom-env-test', 'boot-serial-test'] qtests_npcm7xx = \ - ['npcm7xx_gpio-test', + ['npcm7xx_adc-test', + 'npcm7xx_gpio-test', 'npcm7xx_rng-test', 'npcm7xx_timer-test', 'npcm7xx_watchdog_timer-test']
tests/qtest/npcm7xx_adc-test.c new file +400 -0
400 lines not on this page · raw message
Signature · 1 line
2.29.2.684.gfbc64c5ab5-goog
Re: [PATCH v2 3/4] hw/adc: Add an ADC module for NPCM7XX
Quoted 20 lines · Hao Wu via
The ADC is part of NPCM7XX Module. Its behavior is controled by the
ADC_CONregister. It converts one of the eight analog inputs into a digital input and stores it in theADC_DATAregister when enabled.Reviewed-by Havard Skinnemoen <[email protected]>Reviewed-by Tyrone Ting <[email protected]>Signed-off-by Hao Wu <[email protected]>--- docs/system/arm/nuvoton.rst | 2 +- hw/adc/meson.build | 1 + hw/adc/npcm7xx_adc.c | 318 ++++++++++++++++++++++++++ hw/arm/npcm7xx.c | 24 +- include/hw/adc/npcm7xx_adc.h | 72 ++++++ include/hw/arm/npcm7xx.h | 2 + tests/qtest/meson.build | 3 +- tests/qtest/npcm7xx_adc-test.c | 400 +++++++++++++++++++++++++++++++++ 8 files changed, 819 insertions(+), 3 deletions(-) create mode 100644 hw/adc/npcm7xx_adc.c create mode 100644 include/hw/adc/npcm7xx_adc.h create mode 100644 tests/qtest/npcm7xx_adc-test.c
...
Quoted 10 lines
hw/adc/npcm7xx_adc.c new file +10
-0+static void npcm7xx_adc_init (Object *obj) +{ +NPCM7xxADCState *s =NPCM7XX_ADC (obj); +SysBusDevice *sbd = &s->parent; +int i; + +sysbus_init_irq (sbd, &s->irq); + +timer_init_ns (&s->conv_timer,QEMU_CLOCK_VIRTUAL , + npcm7xx_adc_convert_done, s);
hw/adc/npcm7xx_adc.c line 261
Quoted 10 lines
hw/adc/npcm7xx_adc.c new file +10
-0+timer_init_ns (&s->reset_timer,QEMU_CLOCK_VIRTUAL , + npcm7xx_adc_reset_done, s); +memory_region_init_io (&s->iomem, obj, &npcm7xx_adc_ops, s, +TYPE_NPCM7XX_ADC ,4 * KiB); +sysbus_init_mmio (sbd, &s->iomem); + s->clock =qdev_init_clock_in (DEVICE (s),"clock" ,NULL ,NULL ); + +for (i =0 ; i <NPCM7XX_ADC_NUM_INPUTS ; ++i) { +object_property_add_uint32_ptr (obj,"adci[*]" , + &s->adci[i],OBJ_PROP_FLAG_WRITE );
How do you use this, any example?
FWIW I'm experimenting with other ADC to use the "audio/audio.h" API (which is not voice/audio specific, but generic DSP), then I can pass any QEMU source and consume it using AUD_read() to fill the ADC buffer (device sram or in main ram).
But I'm doing that alone during my free time, so don't expect it any time soon :(
Quoted 5 lines
hw/adc/npcm7xx_adc.c new file +5
-0+ } +object_property_add_uint32_ptr (obj,"vref" , + &s->vref,OBJ_PROP_FLAG_WRITE ); +npcm7xx_adc_calibrate (s); +}
Re: [PATCH v2 3/4] hw/adc: Add an ADC module for NPCM7XX
Thanks for your comment! We'll incorporate them into our next patch version.
We plan to let the user use QOM get/set QMP commands to control ADC/PWM values, similar to hw/misc/tmp105.c. The user can set a voltage value as input using QOM-set, and the QEMU guest can read the converted value through this module. Similar for PWM, the user can read the duty-cycle and frequency using QOM-get. The user can also run a third-party simulator and alter these values during execution. Our test code also shows how to deal with these values.
If you have a better suggestion, please let us know.
Quoted 60 lines · Philippe Mathieu-Daudé
Quoted 20 lines · Hao Wu via
The ADC is part of NPCM7XX Module. Its behavior is controled by the
ADC_CONregister. It converts one of the eight analog inputs into a digital input and stores it in theADC_DATAregister when enabled.Reviewed-by Havard Skinnemoen <[email protected]>Reviewed-by Tyrone Ting <[email protected]>Signed-off-by Hao Wu <[email protected]>--- docs/system/arm/nuvoton.rst | 2 +- hw/adc/meson.build | 1 + hw/adc/npcm7xx_adc.c | 318 ++++++++++++++++++++++++++ hw/arm/npcm7xx.c | 24 +- include/hw/adc/npcm7xx_adc.h | 72 ++++++ include/hw/arm/npcm7xx.h | 2 + tests/qtest/meson.build | 3 +- tests/qtest/npcm7xx_adc-test.c | 400 +++++++++++++++++++++++++++++++++ 8 files changed, 819 insertions(+), 3 deletions(-) create mode 100644 hw/adc/npcm7xx_adc.c create mode 100644 include/hw/adc/npcm7xx_adc.h create mode 100644 tests/qtest/npcm7xx_adc-test.c...
Quoted 10 lines
hw/adc/npcm7xx_adc.c new file +10
-0+static void npcm7xx_adc_init (Object *obj) +{ +NPCM7xxADCState *s =NPCM7XX_ADC (obj); +SysBusDevice *sbd = &s->parent; +int i; + +sysbus_init_irq (sbd, &s->irq); + +timer_init_ns (&s->conv_timer,QEMU_CLOCK_VIRTUAL , + npcm7xx_adc_convert_done, s);hw/adc/npcm7xx_adc.c line 261
Quoted 10 lines
hw/adc/npcm7xx_adc.c new file +10
-0+timer_init_ns (&s->reset_timer,QEMU_CLOCK_VIRTUAL , + npcm7xx_adc_reset_done, s); +memory_region_init_io (&s->iomem, obj, &npcm7xx_adc_ops, s, +TYPE_NPCM7XX_ADC ,4 * KiB); +sysbus_init_mmio (sbd, &s->iomem); + s->clock =qdev_init_clock_in (DEVICE (s),"clock" ,NULL ,NULL ); + +for (i =0 ; i <NPCM7XX_ADC_NUM_INPUTS ; ++i) { +object_property_add_uint32_ptr (obj,"adci[*]" , + &s->adci[i],OBJ_PROP_FLAG_WRITE );How do you use this, any example?
FWIW I'm experimenting with other ADC to use the "
audio/audio.h" API (which is not voice/audio specific, but generic DSP), then I can pass any QEMU source and consume it usingAUD_read()to fill the ADC buffer (device sram or in main ram).But I'm doing that alone during my free time, so don't expect it any time soon :(
Quoted 5 lines
hw/adc/npcm7xx_adc.c new file +5
-0+ } +object_property_add_uint32_ptr (obj,"vref" , + &s->vref,OBJ_PROP_FLAG_WRITE ); +npcm7xx_adc_calibrate (s); +}
PATCH v2 4/4 hw/misc: Add a PWM module for NPCM7XX
In reply to Hao Wu viaThe PWM module is part of NPCM7XX module. Each NPCM7XX module has two identical PWM modules. Each module contains 4 PWM entries. Each PWM has two outputs: frequency and duty_cycle. Both are computed using inputs from software side.
This module does not model detail pulse signals since it is expensive. It also does not model interrupts and watchdogs that are dependant on the detail models. The interfaces for these are left in the module so that anyone in need for these functionalities can implement on their own.
--- docs/system/arm/nuvoton.rst | 2 +- hw/arm/npcm7xx.c | 26 +- hw/misc/meson.build | 1 + hw/misc/npcm7xx_pwm.c | 535 +++++++++++++++++++++++++++++++++ include/hw/arm/npcm7xx.h | 2 + include/hw/misc/npcm7xx_pwm.h | 106 +++++++ tests/qtest/meson.build | 1 + tests/qtest/npcm7xx_pwm-test.c | 490 ++++++++++++++++++++++++++++++ 8 files changed, 1160 insertions(+), 3 deletions(-) create mode 100644 hw/misc/npcm7xx_pwm.c create mode 100644 include/hw/misc/npcm7xx_pwm.h create mode 100644 tests/qtest/npcm7xx_pwm-test.c
docs/system/arm/nuvoton.rst +1 -1
@@ -42,6 +42,7 @@ Supported devices * USB host (USBH) * GPIO controller * Analog to Digital Converter (ADC) + * Pulse Width Modulation (PWM) Missing devices ---------------
@@ -61,7 +62,6 @@ Missing devices * Peripheral SPI controller (PSPI) * SD/MMC host * PECI interface - * Pulse Width Modulation (PWM) * Tachometer * PCI and PCIe root complex and bridges * VDM and MCTP support
hw/arm/npcm7xx.c +24 -2
@@ -102,6 +102,8 @@ enum NPCM7xxInterrupt {NPCM7XX_WDG2_IRQ ,/* Timer Module 2 Watchdog */ NPCM7XX_EHCI_IRQ =61 ,NPCM7XX_OHCI_IRQ =62 , +NPCM7XX_PWM0_IRQ =93 ,/* PWM module 0 */ +NPCM7XX_PWM1_IRQ ,/* PWM module 1 */ NPCM7XX_GPIO0_IRQ =116 ,NPCM7XX_GPIO1_IRQ , NPCM7XX_GPIO2_IRQ,
@@ -144,6 +146,12 @@ static const hwaddr npcm7xx_fiu3_flash_addr[] = { 0xb8000000, /* CS3 */ }; +/* Register base address for each PWM Module */ +static const hwaddr npcm7xx_pwm_addr[] = { +0xf0103000 , +0xf0104000 , +}; + static const struct { hwaddr regs_addr; uint32_t unconnected_pins;
@@ -353,6 +361,10 @@ static void npcm7xx_init(Object *obj)object_initialize_child (obj, npcm7xx_fiu[i].name, &s->fiu[i],TYPE_NPCM7XX_FIU ); } + +for (i =0 ; i <ARRAY_SIZE (s->pwm); i++) { +object_initialize_child (obj,"pwm[*]" , &s->pwm[i],TYPE_NPCM7XX_PWM ); + } }static void npcm7xx_realize (DeviceState *dev,Error **errp)
@@ -513,6 +525,18 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->ohci),0 ,npcm7xx_irq (s,NPCM7XX_OHCI_IRQ )); +/* PWM Modules. Cannot fail. */ +QEMU_BUILD_BUG_ON (ARRAY_SIZE (npcm7xx_pwm_addr) !=ARRAY_SIZE (s->pwm)); +for (i =0 ; i <ARRAY_SIZE (s->pwm); i++) { +SysBusDevice *sbd =SYS_BUS_DEVICE (&s->pwm[i]); + +qdev_connect_clock_in (DEVICE (&s->pwm[i]),"clock" ,qdev_get_clock_out ( +DEVICE (&s->clk),"apb3-clock" )); +sysbus_realize (sbd, &error_abort); +sysbus_mmio_map (sbd,0 , npcm7xx_pwm_addr[i]); +sysbus_connect_irq (sbd, i,npcm7xx_irq (s,NPCM7XX_PWM0_IRQ + i)); + } +/* * Flash Interface Unit (FIU). Can fail if incorrect number of chip selects * specified, but this is a programming error.
@@ -580,8 +604,6 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("npcm7xx.peci" ,0xf0100000 ,4 * KiB);create_unimplemented_device ("npcm7xx.siox[1]" ,0xf0101000 ,4 * KiB);create_unimplemented_device ("npcm7xx.siox[2]" ,0xf0102000 ,4 * KiB); -create_unimplemented_device ("npcm7xx.pwm[0]" ,0xf0103000 ,4 * KiB); -create_unimplemented_device ("npcm7xx.pwm[1]" ,0xf0104000 ,4 * KiB);create_unimplemented_device ("npcm7xx.mft[0]" ,0xf0180000 ,4 * KiB);create_unimplemented_device ("npcm7xx.mft[1]" ,0xf0181000 ,4 * KiB);create_unimplemented_device ("npcm7xx.mft[2]" ,0xf0182000 ,4 * KiB);
hw/misc/meson.build +1 -0
@@ -64,6 +64,7 @@ softmmu_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mst_fpga.c')) softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files( 'npcm7xx_clk.c', 'npcm7xx_gcr.c', + 'npcm7xx_pwm.c', 'npcm7xx_rng.c', )) softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files(
hw/misc/npcm7xx_pwm.c new file +535 -0
535 lines not on this page · raw message
include/hw/arm/npcm7xx.h +2 -0
@@ -23,6 +23,7 @@#include "hw/mem/npcm7xx_mc.h" #include "hw/misc/npcm7xx_clk.h" #include "hw/misc/npcm7xx_gcr.h" +#include "hw/misc/npcm7xx_pwm.h" #include "hw/misc/npcm7xx_rng.h" #include "hw/nvram/npcm7xx_otp.h" #include "hw/timer/npcm7xx_timer.h"
@@ -78,6 +79,7 @@ typedef struct NPCM7xxState {NPCM7xxCLKState clk;NPCM7xxTimerCtrlState tim[3 ];NPCM7xxADCState adc; +NPCM7xxPWMState pwm[2 ];NPCM7xxOTPState key_storage;NPCM7xxOTPState fuse_array;NPCM7xxMCState mc;
include/hw/misc/npcm7xx_pwm.h new file +106 -0
106 lines not on this page · raw message
tests/qtest/meson.build +1 -0
@@ -136,6 +136,7 @@ qtests_sparc64 = \ qtests_npcm7xx = \ ['npcm7xx_adc-test', 'npcm7xx_gpio-test', + 'npcm7xx_pwm-test', 'npcm7xx_rng-test', 'npcm7xx_timer-test', 'npcm7xx_watchdog_timer-test']
tests/qtest/npcm7xx_pwm-test.c new file +490 -0
490 lines not on this page · raw message
Signature · 1 line
2.29.2.684.gfbc64c5ab5-goog
Re: [PATCH v2 4/4] hw/misc: Add a PWM module for NPCM7XX
Quoted 14 lines · Hao Wu via
The PWM module is part of NPCM7XX module. Each NPCM7XX module has two identical PWM modules. Each module contains 4 PWM entries. Each PWM has two outputs: frequency and
duty_cycle. Both are computed using inputs from software side.This module does not model detail pulse signals since it is expensive. It also does not model interrupts and watchdogs that are dependant on the detail models. The interfaces for these are left in the module so that anyone in need for these functionalities can implement on their own.
Reviewed-by Havard Skinnemoen <[email protected]>Reviewed-by Tyrone Ting <[email protected]>Signed-off-by Hao Wu <[email protected]>
Quoted 10 lines
--- docs/system/arm/nuvoton.rst | 2 +- hw/arm/npcm7xx.c | 26 +- hw/misc/meson.build | 1 + hw/misc/npcm7xx_pwm.c | 535 +++++++++++++++++++++++++++++++++ include/hw/arm/npcm7xx.h | 2 + include/hw/misc/npcm7xx_pwm.h | 106 +++++++ tests/qtest/meson.build | 1 + tests/qtest/npcm7xx_pwm-test.c | 490 ++++++++++++++++++++++++++++++ 8 files changed, 1160 insertions(+), 3 deletions(-)
As this patch is quite big, maybe add the test after the model?
...
Quoted 90 lines
+++
b/hw/misc/npcm7xx_pwm.chw/misc/npcm7xx_pwm.c new file +88
-0@@ -0,0 +1,535 @@ +/* +* Nuvoton NPCM7xx PWM Module +* +* Copyright 2020 Google LLC +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +* for more details. +*/ + +#include "qemu/osdep.h" + +#include "hw/irq.h" +#include "hw/qdev-clock.h" +#include "hw/qdev-properties.h" +#include "hw/misc/npcm7xx_pwm.h" +#include "migration/vmstate.h" +#include "qemu/bitops.h" +#include "qemu/error-report.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "qemu/units.h" +#include "trace.h" + +/* 32-bit register indices. */ +enum NPCM7xxPWMRegisters { +NPCM7XX_PWM_PPR , +NPCM7XX_PWM_CSR , +NPCM7XX_PWM_PCR , +NPCM7XX_PWM_CNR0 , +NPCM7XX_PWM_CMR0 , +NPCM7XX_PWM_PDR0 , +NPCM7XX_PWM_CNR1 , +NPCM7XX_PWM_CMR1 , +NPCM7XX_PWM_PDR1 , +NPCM7XX_PWM_CNR2 , +NPCM7XX_PWM_CMR2 , +NPCM7XX_PWM_PDR2 , +NPCM7XX_PWM_CNR3 , +NPCM7XX_PWM_CMR3 , +NPCM7XX_PWM_PDR3 , +NPCM7XX_PWM_PIER , +NPCM7XX_PWM_PIIR , +NPCM7XX_PWM_PWDR0 , +NPCM7XX_PWM_PWDR1 , +NPCM7XX_PWM_PWDR2 , +NPCM7XX_PWM_PWDR3 , +NPCM7XX_PWM_REGS_END , +}; + +/* Register field definitions. */ +#define NPCM7XX_PPR (rv, index) extract32((rv), npcm7xx_ppr_base[index], 8) +#define NPCM7XX_CSR (rv, index) extract32((rv), npcm7xx_csr_base[index], 3) +#define NPCM7XX_CH (rv, index) extract32((rv), npcm7xx_ch_base[index], 4) +#define NPCM7XX_CH_EN BIT(0) +#define NPCM7XX_CH_INV BIT(2) +#define NPCM7XX_CH_MOD BIT(3) + +/* Offset of each PWM channel's prescaler in the PPR register. */ +static const int npcm7xx_ppr_base[] = {0 ,0 ,8 ,8 }; +/* Offset of each PWM channel's clock selector in the CSR register. */ +static const int npcm7xx_csr_base[] = {0 ,4 ,8 ,12 }; +/* Offset of each PWM channel's control variable in the PCR register. */ +static const int npcm7xx_ch_base[] = {0 ,8 ,12 ,16 }; + +static uint32_t npcm7xx_pwm_calculate_freq (NPCM7xxPWM *p) +{ +uint32_t ppr; +uint32_t csr; +uint32_t freq; + +if (!p->running) { +return 0 ; + } + + csr =NPCM7XX_CSR (p->module->csr, p->index); + ppr =NPCM7XX_PPR (p->module->ppr, p->index); + freq =clock_get_hz (p->module->clock); + freq /= ppr +1 ; +/* csr can only be 0~4 */ +if (csr >4 ) { + qemu_log_mask(LOG_GUEST_ERROR,
hw/misc/npcm7xx_pwm.c line 98
Quoted 10 lines
hw/misc/npcm7xx_pwm.c new file +10
-0+"%s: invalid csr value %u\n" , + __func__, csr); + csr =4 ; + } +/* freq won't be changed if csr == 4. */ +if (csr <4 ) { + freq >>= csr +1 ; + } + +return freq / (p->cnr +1 );
Can you add a trace event here? Passing the unit as parameter would allow to display it in the traced event.
Alternatively you can introduce:
...pwm_update_freq(pwm, index)
{
freq = npcm7xx_pwm_calculate_freq(&s->pwm[i]);
if (freq != s->pwm[i].freq) {
trace_..pwm_freq_updated(i, s->pwm[i].freq, freq);
s->pwm[i].freq = freq;
}
}Quoted 12 lines
hw/misc/npcm7xx_pwm.c new file +12
-0+} + +static uint32_t npcm7xx_pwm_calculate_duty (NPCM7xxPWM *p) +{ +uint64_t duty; + +if (p->running) { +if (p->cnr ==0 ) { + duty =0 ; + }else if (p->cmr >= p->cnr) { + duty =NPCM7XX_PWM_MAX_DUTY ; + }else {
hw/misc/npcm7xx_pwm.c line 120
Quoted 10 lines
hw/misc/npcm7xx_pwm.c new file +10
-0+ duty =NPCM7XX_PWM_MAX_DUTY * (p->cmr +1 ) / (p->cnr +1 ); + } + }else { + duty =0 ; + } + +if (p->inverted) { + duty =NPCM7XX_PWM_MAX_DUTY - duty; + } +
Ditto, trace event and pwm_update_duty().
hw/misc/npcm7xx_pwm.c line 128
Quoted 8 lines
hw/misc/npcm7xx_pwm.c new file +8
-0+return duty; +} + +static void npcm7xx_pwm_calculate_output (NPCM7xxPWM *p) +{ + p->freq =npcm7xx_pwm_calculate_freq (p); + p->duty =npcm7xx_pwm_calculate_duty (p); +}
...
Rest looks good (not looking at the test yet).
Similar comment than previous ADC patch, at some point I'd like to introduce a common PWM interface to produce DSP sources.
Regards,
Phil.