Additional NPCM7xx features, devices and tests
v2 cover Additional NPCM7xx features, devices and tests
This is an update to the initial NPCM7xx patch series adding
- Watchdog timer support. This makes the reboot command work.
- Random Number Generator device.
- USB Host Controllers.
- GPIO Controllers.
The watchdog was implemented by my new teammate Hao Wu. Expect to see more patches from him in the near future.
This series has also been pushed to the npcm7xx-5.2-update branch of my github repository at
https://github.com/hskinnemoen/qemu
Changes since v1:
- Dropped the timer test since it's already applied (thanks Peter).
- Watchdog reset signaling is now using GPIOs instead of a custom API (thanks Peter for suggesting, and Hao for implementing it).
- A few comment updates for the watchdog timer.
- VMState added to GPIO device.
- Missing VMstate terminator added to RNG device.
- Include order in RNG test fixed.
Again, thanks a lot for reviewing!
Havard
Hao Wu (1):
hw/timer: Adding watchdog for NPCM7XX Timer.
Havard Skinnemoen (4):
Move npcm7xx_timer_reached_zero call out of npcm7xx_timer_pause hw/misc: Add npcm7xx random number generator hw/arm/npcm7xx: Add EHCI and OHCI controllers hw/gpio: Add GPIO model for Nuvoton NPCM7xx
docs/system/arm/nuvoton.rst | 6 +- hw/usb/hcd-ehci.h | 1 + include/hw/arm/npcm7xx.h | 8 + include/hw/gpio/npcm7xx_gpio.h | 55 +++ include/hw/misc/npcm7xx_clk.h | 2 + include/hw/misc/npcm7xx_rng.h | 34 ++ include/hw/timer/npcm7xx_timer.h | 48 ++- hw/arm/npcm7xx.c | 126 ++++++- hw/gpio/npcm7xx_gpio.c | 424 ++++++++++++++++++++++ hw/misc/npcm7xx_clk.c | 28 ++ hw/misc/npcm7xx_rng.c | 180 +++++++++ hw/timer/npcm7xx_timer.c | 270 +++++++++++--- hw/usb/hcd-ehci-sysbus.c | 19 + tests/qtest/npcm7xx_gpio-test.c | 385 ++++++++++++++++++++ tests/qtest/npcm7xx_rng-test.c | 278 ++++++++++++++ tests/qtest/npcm7xx_watchdog_timer-test.c | 313 ++++++++++++++++ MAINTAINERS | 1 + hw/gpio/meson.build | 1 + hw/gpio/trace-events | 7 + hw/misc/meson.build | 1 + hw/misc/trace-events | 4 + tests/qtest/meson.build | 3 + 22 files changed, 2133 insertions(+), 61 deletions(-) create mode 100644 include/hw/gpio/npcm7xx_gpio.h create mode 100644 include/hw/misc/npcm7xx_rng.h create mode 100644 hw/gpio/npcm7xx_gpio.c create mode 100644 hw/misc/npcm7xx_rng.c create mode 100644 tests/qtest/npcm7xx_gpio-test.c create mode 100644 tests/qtest/npcm7xx_rng-test.c create mode 100644 tests/qtest/npcm7xx_watchdog_timer-test.c
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 2/5 hw/timer: Adding watchdog for NPCM7XX Timer.
From: Hao Wu <[email protected]>
The watchdog is part of NPCM7XX's timer module. Its behavior is controlled by the WTCR register in the timer.
When enabled, the watchdog issues an interrupt signal after a pre-set amount of cycles, and issues a reset signal shortly after that.
--- include/hw/misc/npcm7xx_clk.h | 2 + include/hw/timer/npcm7xx_timer.h | 48 +++- hw/arm/npcm7xx.c | 12 + hw/misc/npcm7xx_clk.c | 28 ++ hw/timer/npcm7xx_timer.c | 266 ++++++++++++++---- tests/qtest/npcm7xx_watchdog_timer-test.c | 313 ++++++++++++++++++++++ MAINTAINERS | 1 + tests/qtest/meson.build | 1 + 8 files changed, 618 insertions(+), 53 deletions(-) create mode 100644 tests/qtest/npcm7xx_watchdog_timer-test.c
include/hw/misc/npcm7xx_clk.h +2 -0
@@ -31,6 +31,8 @@*/ #define NPCM7XX_CLK_NR_REGS (0x70 / sizeof(uint32_t)) +#define NPCM7XX_WATCHDOG_RESET_GPIO_IN "npcm7xx-clk-watchdog-reset-gpio-in" + typedef struct NPCM7xxCLKState { SysBusDevice parent;
include/hw/timer/npcm7xx_timer.h +41 -7
85 lines not on this page · raw message
hw/arm/npcm7xx.c +12 -0
@@ -86,6 +86,9 @@ enum NPCM7xxInterrupt {NPCM7XX_TIMER12_IRQ ,NPCM7XX_TIMER13_IRQ ,NPCM7XX_TIMER14_IRQ , +NPCM7XX_WDG0_IRQ =47 ,/* Timer Module 0 Watchdog */ +NPCM7XX_WDG1_IRQ ,/* Timer Module 1 Watchdog */ + NPCM7XX_WDG2_IRQ, /* Timer Module 2 Watchdog */ };/* Total number of GIC interrupts, including internal Cortex-A9 interrupts. */
@@ -353,6 +356,15 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)qemu_irq irq =npcm7xx_irq (s, first_irq + j);sysbus_connect_irq (sbd, j, irq); } + +/* IRQ for watchdogs */ +sysbus_connect_irq (sbd,NPCM7XX_TIMERS_PER_CTRL , +npcm7xx_irq (s,NPCM7XX_WDG0_IRQ + i)); +/* GPIO that connects clk module with watchdog */ +qdev_connect_gpio_out_named (DEVICE (&s->tim[i]), +NPCM7XX_WATCHDOG_RESET_GPIO_OUT ,0 , +qdev_get_gpio_in_named (DEVICE (&s->clk), +NPCM7XX_WATCHDOG_RESET_GPIO_IN , i)); }/* UART0..3 (16550 compatible) */
hw/misc/npcm7xx_clk.c +28 -0
@@ -17,6 +17,7 @@#include "qemu/osdep.h" #include "hw/misc/npcm7xx_clk.h" +#include "hw/timer/npcm7xx_timer.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/log.h"
@@ -24,6 +25,7 @@#include "qemu/timer.h" #include "qemu/units.h" #include "trace.h" +#include "sysemu/watchdog.h" #define PLLCON_LOKI BIT(31)#define PLLCON_LOKS BIT(30)
@@ -87,6 +89,12 @@ 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) +static uint64_t npcm7xx_clk_read (void *opaque,hwaddr offset,unsigned size) {uint32_t reg = offset /sizeof (uint32_t );
@@ -187,6 +195,24 @@ static void npcm7xx_clk_write(void *opaque, hwaddr offset, s->regs[reg] = value; } +/* Perform reset action triggered by a watchdog */ +static void npcm7xx_clk_perform_watchdog_reset (void *opaque,int n, +int level) +{ +NPCM7xxCLKState *clk =NPCM7XX_CLK (opaque); +uint32_t rcr; + +g_assert (n >=0 && n <=NPCM7XX_NR_WATCHDOGS ); + rcr = clk->regs[NPCM7XX_CLK_WD0RCR + n]; +if (rcr &NPCM7XX_CLK_WDRCR_CA9C ) { +watchdog_perform_action (); + }else { +qemu_log_mask (LOG_UNIMP , +"%s: only CPU reset is implemented. (requested 0x%" PRIx32")\n" , + __func__, rcr); + } +} +static const struct MemoryRegionOps npcm7xx_clk_ops = { .read = npcm7xx_clk_read, .write = npcm7xx_clk_write,
@@ -226,6 +252,8 @@ 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); +qdev_init_gpio_in_named (DEVICE (s), npcm7xx_clk_perform_watchdog_reset, +NPCM7XX_WATCHDOG_RESET_GPIO_IN ,NPCM7XX_NR_WATCHDOGS ); }static const VMStateDescription vmstate_npcm7xx_clk = {
hw/timer/npcm7xx_timer.c +220 -46
406 lines not on this page · raw message
tests/qtest/npcm7xx_watchdog_timer-test.c new file +313 -0
313 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -755,6 +755,7 @@ L: [email protected] S: Supported F: hw/*/npcm7xx* F: include/hw/*/npcm7xx* +F: tests/qtest/npcm7xx* F: pc-bios/npcm7xx_bootrom.bin F: roms/vbootrom
tests/qtest/meson.build +1 -0
@@ -139,6 +139,7 @@ qtests_arm = \ 'microbit-test', 'm25p80-test', 'npcm7xx_timer-test', + 'npcm7xx_watchdog_timer-test', 'test-arm-mptimer', 'boot-serial-test', 'hexloader-test']
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
Re: [PATCH v2 2/5] hw/timer: Adding watchdog for NPCM7XX Timer.
Quoted 12 lines · Havard Skinnemoen via
From: Hao Wu <[email protected]>
The watchdog is part of NPCM7XX's timer module. Its behavior is controlled by the WTCR register in the timer.
When enabled, the watchdog issues an interrupt signal after a pre-set amount of cycles, and issues a reset signal shortly after that.
Reviewed-by Tyrone Ting <[email protected]>Signed-off-by Hao Wu <[email protected]>Signed-off-by Havard Skinnemoen <[email protected]>---
[...]
Quoted 26 lines
tests/qtest/npcm7xx_watchdog_timer-test.c new file +20
-0@@ -0,0 +1,313 @@ +/* +* QTests for Nuvoton NPCM7xx Timer Watchdog Modules. +* +* 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 "qemu/timer.h" + +#include "libqtest-single.h"
[...]
Quoted 10 lines
tests/qtest/npcm7xx_watchdog_timer-test.c new file +10
-0+/* +* Check a watchdog doesn't fire if corresponding flags (WTIE and WTRE) are not +* set. +*/ +static void test_enabling_flags (gconstpointer watchdog) +{ +const Watchdog *wd = watchdog; +QTestState *qts; + +/* Neither WTIE or WTRE is set, no interrupt or reset should happen */
tests/qtest/npcm7xx_watchdog_timer-test.c line 215
Quoted 10 lines
tests/qtest/npcm7xx_watchdog_timer-test.c new file +10
-0+ qts =qtest_start ("-machine quanta-gsj" ); +qtest_irq_intercept_in (qts,"/machine/soc/a9mpcore/gic" ); +watchdog_write_wtcr (wd,WTCLK (0 ) |WTE |WTIF |WTRF |WTR ); +clock_step (watchdog_interrupt_steps (wd)); +g_assert_true (watchdog_read_wtcr (wd) &WTIF ); +g_assert_false (qtest_get_irq (qts, wd->irq)); +clock_step (watchdog_calculate_steps (RESET_CYCLES ,watchdog_prescaler (wd))); +g_assert_true (watchdog_read_wtcr (wd) &WTIF ); +g_assert_false (watchdog_read_wtcr (wd) &WTRF ); +qtest_end ();
You are mixing functions from libqtest.h and libqtest-single.h ... e.g. you use qtest_get_irq() from libqtest.h instead of get_irq() from libqtest-single.h, on the other hand, you use clock_step() from libqtest-single.h instead of qtest_clock_step() from libqtest.h ... there is no real problem with this, but the style looks a little bit strange.
For new tests, we prefer nowadays to avoid libqtest-single.h since it causes trouble if you have to track multiple test states (e.g. when writing tests that include migration tests). Could you maybe try to rewrite your code without libqtest-single.h? I.e. use qtest_clock_step() instead of clock_step() etc. ?
tests/qtest/meson.build qtests_arm = \ · line 142
Quoted 9 lines
tests/qtest/meson.build +1
-0@@ -139,6 +139,7 @@ qtests_arm = \ 'microbit-test', 'm25p80-test', 'npcm7xx_timer-test', + 'npcm7xx_watchdog_timer-test',
Could you please fence this test with CONFIG_NPCM7XX ? ... since it won't work if the quanta-gsj machine has not been compiled into the binary.
Thanks,
Thomas
PATCH v2 1/5 Move npcm7xx_timer_reached_zero call out of npcm7xx_timer_pause
In reply to Havard Skinnemoen viaThis allows us to reuse npcm7xx_timer_pause for the watchdog timer.
--- hw/timer/npcm7xx_timer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/timer/npcm7xx_timer.c +3 -3
@@ -157,9 +157,6 @@ static void npcm7xx_timer_pause(NPCM7xxTimer *t)timer_del (&t->qtimer); now =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ); t->remaining_ns = t->expires_ns - now; -if (t->remaining_ns <=0 ) { -npcm7xx_timer_reached_zero (t); - } }/*
@@ -239,6 +236,9 @@ static void npcm7xx_timer_write_tcsr(NPCM7xxTimer *t, uint32_t new_tcsr) }else { t->tcsr &= ~NPCM7XX_TCSR_CACT ;npcm7xx_timer_pause (t); +if (t->remaining_ns <=0 ) { +npcm7xx_timer_reached_zero (t); + } } } }
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 3/5 hw/misc: Add npcm7xx random number generator
In reply to Havard Skinnemoen viaThe RNG module returns a byte of randomness when the Data Valid bit is set.
This implementation ignores the prescaler setting, and loads a new value into RNGD every time RNGCS is read while the RNG is enabled and random data is available.
A qtest featuring some simple randomness tests is included.
--- docs/system/arm/nuvoton.rst | 2 +- include/hw/arm/npcm7xx.h | 2 + include/hw/misc/npcm7xx_rng.h | 34 ++++ hw/arm/npcm7xx.c | 7 +- hw/misc/npcm7xx_rng.c | 180 +++++++++++++++++++++ tests/qtest/npcm7xx_rng-test.c | 278 +++++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + hw/misc/trace-events | 4 + tests/qtest/meson.build | 1 + 9 files changed, 507 insertions(+), 2 deletions(-) create mode 100644 include/hw/misc/npcm7xx_rng.h create mode 100644 hw/misc/npcm7xx_rng.c create mode 100644 tests/qtest/npcm7xx_rng-test.c
docs/system/arm/nuvoton.rst +1 -1
@@ -38,6 +38,7 @@ Supported devices * DDR4 memory controller (dummy interface indicating memory training is done) * OTP controllers (no protection features) * Flash Interface Unit (FIU; no protection features) + * Random Number Generator (RNG) Missing devices ---------------
@@ -59,7 +60,6 @@ Missing devices * Peripheral SPI controller (PSPI) * Analog to Digital Converter (ADC) * SD/MMC host - * Random Number Generator (RNG) * PECI interface * Pulse Width Modulation (PWM) * Tachometer
include/hw/arm/npcm7xx.h +2 -0
@@ -21,6 +21,7 @@#include "hw/mem/npcm7xx_mc.h" #include "hw/misc/npcm7xx_clk.h" #include "hw/misc/npcm7xx_gcr.h" +#include "hw/misc/npcm7xx_rng.h" #include "hw/nvram/npcm7xx_otp.h" #include "hw/timer/npcm7xx_timer.h" #include "hw/ssi/npcm7xx_fiu.h"
@@ -75,6 +76,7 @@ typedef struct NPCM7xxState {NPCM7xxOTPState key_storage;NPCM7xxOTPState fuse_array;NPCM7xxMCState mc; +NPCM7xxRNGState rng;NPCM7xxFIUState fiu[2 ]; } NPCM7xxState;
include/hw/misc/npcm7xx_rng.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Nuvoton NPCM7xx Random Number Generator. +* +* 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. +*/ +#ifndef NPCM7XX_RNG_H +#define NPCM7XX_RNG_H + +#include "hw/sysbus.h" + +typedef struct NPCM7xxRNGState { +SysBusDevice parent; + +MemoryRegion iomem; + +uint8_t rngcs; +uint8_t rngd; +uint8_t rngmode; +}NPCM7xxRNGState ; + +#define TYPE_NPCM7XX_RNG "npcm7xx-rng" +#define NPCM7XX_RNG (obj) OBJECT_CHECK(NPCM7xxRNGState, (obj), TYPE_NPCM7XX_RNG) + +#endif /* NPCM7XX_RNG_H */
hw/arm/npcm7xx.c +6 -1
@@ -44,6 +44,7 @@#define NPCM7XX_GCR_BA (0xf0800000)#define NPCM7XX_CLK_BA (0xf0801000)#define NPCM7XX_MC_BA (0xf0824000) +#define NPCM7XX_RNG_BA (0xf000b000)/* Internal AHB SRAM */ #define NPCM7XX_RAM3_BA (0xc0008000)
@@ -256,6 +257,7 @@ static void npcm7xx_init(Object *obj)object_initialize_child (obj,"otp2" , &s->fuse_array,TYPE_NPCM7XX_FUSE_ARRAY );object_initialize_child (obj,"mc" , &s->mc,TYPE_NPCM7XX_MC ); +object_initialize_child (obj,"rng" , &s->rng,TYPE_NPCM7XX_RNG );for (i =0 ; i <ARRAY_SIZE (s->tim); i++) {object_initialize_child (obj,"tim[*]" , &s->tim[i],TYPE_NPCM7XX_TIMER );
@@ -374,6 +376,10 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp) serial_hd(i), DEVICE_LITTLE_ENDIAN); } +/* Random Number Generator. Cannot fail. */ +sysbus_realize (SYS_BUS_DEVICE (&s->rng), &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->rng),0 ,NPCM7XX_RNG_BA ); +/* * Flash Interface Unit (FIU). Can fail if incorrect number of chip selects * specified, but this is a programming error.
@@ -412,7 +418,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.rng" ,0xf000b000 ,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);
hw/misc/npcm7xx_rng.c new file +180 -0
180 lines not on this page · raw message
tests/qtest/npcm7xx_rng-test.c new file +278 -0
278 lines not on this page · raw message
hw/misc/meson.build +1 -0
@@ -59,6 +59,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_rng.c', )) softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files( 'omap_clk.c',
hw/misc/trace-events +4 -0
@@ -118,6 +118,10 @@ npcm7xx_clk_write(uint64_t offset, uint32_t value) "offset: 0x%04" PRIx64 " valu npcm7xx_gcr_read(uint64_t offset, uint32_t value) " offset: 0x%04" PRIx64 " value: 0x%08" PRIx32 npcm7xx_gcr_write(uint64_t offset, uint32_t value) "offset: 0x%04" PRIx64 " value: 0x%08" PRIx32 +# npcm7xx_rng.c +npcm7xx_rng_read(uint64_t offset, uint64_t value, unsigned size) "offset: 0x%04" PRIx64 " value: 0x%02" PRIx64 " size: %u" +npcm7xx_rng_write(uint64_t offset, uint64_t value, unsigned size) "offset: 0x%04" PRIx64 " value: 0x%02" PRIx64 " size: %u" + # stm32f4xx_syscfg.c stm32f4xx_syscfg_set_irq(int gpio, int line, int level) "Interupt: GPIO: %d, Line: %d; Level: %d" stm32f4xx_pulse_exti(int irq) "Pulse EXTI: %d"
tests/qtest/meson.build +1 -0
@@ -140,6 +140,7 @@ qtests_arm = \ 'm25p80-test', 'npcm7xx_timer-test', 'npcm7xx_watchdog_timer-test', + 'npcm7xx_rng-test', 'test-arm-mptimer', 'boot-serial-test', 'hexloader-test']
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
Re: [PATCH v2 3/5] hw/misc: Add npcm7xx random number generator
Quoted 13 lines · Havard Skinnemoen via
The RNG module returns a byte of randomness when the Data Valid bit is set.
This implementation ignores the prescaler setting, and loads a new value into RNGD every time RNGCS is read while the RNG is enabled and random data is available.
A qtest featuring some simple randomness tests is included.
Reviewed-by Tyrone Ting <[email protected]>Reviewed-by Peter Maydell <[email protected]>Signed-off-by Havard Skinnemoen <[email protected]>---
[...]
tests/qtest/meson.build qtests_arm = \ · line 146
Quoted 12 lines
tests/qtest/meson.build +1
-0@@ -140,6 +140,7 @@ qtests_arm = \ 'm25p80-test', 'npcm7xx_timer-test', 'npcm7xx_watchdog_timer-test', + 'npcm7xx_rng-test', 'test-arm-mptimer', 'boot-serial-test', 'hexloader-test']
Please fence this with CONFIG_NPCM7XX, too.
Thanks,
Thomas
PATCH v2 5/5 hw/gpio: Add GPIO model for Nuvoton NPCM7xx
In reply to Havard Skinnemoen viaThe NPCM7xx chips have multiple GPIO controllers that are mostly identical except for some minor differences like the reset values of some registers. Each controller controls up to 32 pins.
Each individual pin is modeled as a pair of unnamed GPIOs -- one for emitting the actual pin state, and one for driving the pin externally. Like the nRF51 GPIO controller, a gpio level may be negative, which means the pin is not driven, or floating.
--- docs/system/arm/nuvoton.rst | 2 +- include/hw/arm/npcm7xx.h | 2 + include/hw/gpio/npcm7xx_gpio.h | 55 +++++ hw/arm/npcm7xx.c | 80 ++++++ hw/gpio/npcm7xx_gpio.c | 424 ++++++++++++++++++++++++++++++++ tests/qtest/npcm7xx_gpio-test.c | 385 +++++++++++++++++++++++++++++ hw/gpio/meson.build | 1 + hw/gpio/trace-events | 7 + tests/qtest/meson.build | 1 + 9 files changed, 956 insertions(+), 1 deletion(-) create mode 100644 include/hw/gpio/npcm7xx_gpio.h create mode 100644 hw/gpio/npcm7xx_gpio.c create mode 100644 tests/qtest/npcm7xx_gpio-test.c
docs/system/arm/nuvoton.rst +1 -1
@@ -40,11 +40,11 @@ Supported devices * Flash Interface Unit (FIU; no protection features) * Random Number Generator (RNG) * USB host (USBH) + * GPIO controller Missing devices --------------- - * GPIO controller * LPC/eSPI host-to-BMC interface, including * Keyboard and mouse controller interface (KBCI)
include/hw/arm/npcm7xx.h +2 -0
@@ -18,6 +18,7 @@#include "hw/boards.h" #include "hw/cpu/a9mpcore.h" +#include "hw/gpio/npcm7xx_gpio.h" #include "hw/mem/npcm7xx_mc.h" #include "hw/misc/npcm7xx_clk.h" #include "hw/misc/npcm7xx_gcr.h"
@@ -79,6 +80,7 @@ typedef struct NPCM7xxState {NPCM7xxOTPState fuse_array;NPCM7xxMCState mc;NPCM7xxRNGState rng; +NPCM7xxGPIOState gpio[8 ];EHCISysBusState ehci;OHCISysBusState ohci;NPCM7xxFIUState fiu[2 ];
include/hw/gpio/npcm7xx_gpio.h new file +55 -0
55 lines not on this page · raw message
hw/arm/npcm7xx.c +80 -0
104 lines not on this page · raw message
hw/gpio/npcm7xx_gpio.c new file +424 -0
424 lines not on this page · raw message
tests/qtest/npcm7xx_gpio-test.c new file +385 -0
385 lines not on this page · raw message
hw/gpio/meson.build +1 -0
@@ -6,6 +6,7 @@ softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_gpio.c')) softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c')) softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c')) +softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_gpio.c')) softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c')) softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c')) softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
hw/gpio/trace-events +7 -0
@@ -1,5 +1,12 @@ # See docs/devel/tracing.txt for syntax documentation. +# npcm7xx_gpio.c +npcm7xx_gpio_read(const char *id, uint64_t offset, uint64_t value) " %s offset: 0x%04" PRIx64 " value 0x%08" PRIx64 +npcm7xx_gpio_write(const char *id, uint64_t offset, uint64_t value) "%s offset: 0x%04" PRIx64 " value 0x%08" PRIx64 +npcm7xx_gpio_set_input(const char *id, int32_t line, int32_t level) "%s line: %" PRIi32 " level: %" PRIi32 +npcm7xx_gpio_set_output(const char *id, int32_t line, int32_t level) "%s line: %" PRIi32 " level: %" PRIi32 +npcm7xx_gpio_update_events(const char *id, uint32_t evst, uint32_t even) "%s evst: 0x%08" PRIx32 " even: 0x%08" PRIx32 + # nrf51_gpio.c nrf51_gpio_read(uint64_t offset, uint64_t r) "offset 0x%" PRIx64 " value 0x%" PRIx64 nrf51_gpio_write(uint64_t offset, uint64_t value) "offset 0x%" PRIx64 " value 0x%" PRIx64
tests/qtest/meson.build +1 -0
@@ -138,6 +138,7 @@ qtests_arm = \ ['arm-cpu-features', 'microbit-test', 'm25p80-test', + 'npcm7xx_gpio-test', 'npcm7xx_timer-test', 'npcm7xx_watchdog_timer-test', 'npcm7xx_rng-test',
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
PATCH v2 4/5 hw/arm/npcm7xx: Add EHCI and OHCI controllers
In reply to Havard Skinnemoen viaThe NPCM730 and NPCM750 chips have a single USB host port shared between a USB 2.0 EHCI host controller and a USB 1.1 OHCI host controller. This adds support for both of them.
Testing notes:
* With -device usb-kbd, qemu will automatically insert a full-speed hub, and the keyboard becomes controlled by the OHCI controller.
* With -device usb-kbd,bus=usb-bus.0,port=1, the keyboard is directly attached to the port without any hubs, and the device becomes controlled by the EHCI controller since it's high speed capable.
* With -device usb-kbd,bus=usb-bus.0,port=1,usb_version=1, the keyboard is directly attached to the port, but it only advertises itself as full-speed capable, so it becomes controlled by the OHCI controller.
In all cases, the keyboard device enumerates correctly.
--- docs/system/arm/nuvoton.rst | 2 +- hw/usb/hcd-ehci.h | 1 + include/hw/arm/npcm7xx.h | 4 ++++ hw/arm/npcm7xx.c | 27 +++++++++++++++++++++++++-- hw/usb/hcd-ehci-sysbus.c | 19 +++++++++++++++++++ 5 files changed, 50 insertions(+), 3 deletions(-)
docs/system/arm/nuvoton.rst +1 -1
@@ -39,6 +39,7 @@ Supported devices * OTP controllers (no protection features) * Flash Interface Unit (FIU; no protection features) * Random Number Generator (RNG) + * USB host (USBH) Missing devices ---------------
@@ -54,7 +55,6 @@ Missing devices * eSPI slave interface * Ethernet controllers (GMAC and EMC) - * USB host (USBH) * USB device (USBD) * SMBus controller (SMBF) * Peripheral SPI controller (PSPI)
hw/usb/hcd-ehci.h +1 -0
@@ -344,6 +344,7 @@ struct EHCIPCIState {#define TYPE_PLATFORM_EHCI "platform-ehci-usb"#define TYPE_EXYNOS4210_EHCI "exynos4210-ehci-usb"#define TYPE_AW_H3_EHCI "aw-h3-ehci-usb" +#define TYPE_NPCM7XX_EHCI "npcm7xx-ehci-usb"#define TYPE_TEGRA2_EHCI "tegra2-ehci-usb"#define TYPE_PPC4xx_EHCI "ppc4xx-ehci-usb"#define TYPE_FUSBH200_EHCI "fusbh200-ehci-usb"
include/hw/arm/npcm7xx.h +4 -0
@@ -25,6 +25,8 @@#include "hw/nvram/npcm7xx_otp.h" #include "hw/timer/npcm7xx_timer.h" #include "hw/ssi/npcm7xx_fiu.h" +#include "hw/usb/hcd-ehci.h" +#include "hw/usb/hcd-ohci.h" #include "target/arm/cpu.h" #define NPCM7XX_MAX_NUM_CPUS (2)
@@ -77,6 +79,8 @@ typedef struct NPCM7xxState {NPCM7xxOTPState fuse_array;NPCM7xxMCState mc;NPCM7xxRNGState rng; +EHCISysBusState ehci; +OHCISysBusState ohci;NPCM7xxFIUState fiu[2 ]; } NPCM7xxState;
hw/arm/npcm7xx.c +25 -2
@@ -46,6 +46,10 @@#define NPCM7XX_MC_BA (0xf0824000)#define NPCM7XX_RNG_BA (0xf000b000) +/* USB Host modules */ +#define NPCM7XX_EHCI_BA (0xf0806000) +#define NPCM7XX_OHCI_BA (0xf0807000) +/* Internal AHB SRAM */ #define NPCM7XX_RAM3_BA (0xc0008000)#define NPCM7XX_RAM3_SZ (4 * KiB)
@@ -90,6 +94,8 @@ enum NPCM7xxInterrupt {NPCM7XX_WDG0_IRQ =47 ,/* Timer Module 0 Watchdog */ NPCM7XX_WDG1_IRQ ,/* Timer Module 1 Watchdog */ NPCM7XX_WDG2_IRQ ,/* Timer Module 2 Watchdog */ +NPCM7XX_EHCI_IRQ =61 , + NPCM7XX_OHCI_IRQ = 62, };/* Total number of GIC interrupts, including internal Cortex-A9 interrupts. */
@@ -263,6 +269,9 @@ static void npcm7xx_init(Object *obj)object_initialize_child (obj,"tim[*]" , &s->tim[i],TYPE_NPCM7XX_TIMER ); } +object_initialize_child (obj,"ehci" , &s->ehci,TYPE_NPCM7XX_EHCI ); +object_initialize_child (obj,"ohci" , &s->ohci,TYPE_SYSBUS_OHCI ); +QEMU_BUILD_BUG_ON (ARRAY_SIZE (npcm7xx_fiu) !=ARRAY_SIZE (s->fiu));for (i =0 ; i <ARRAY_SIZE (s->fiu); i++) { object_initialize_child(obj, npcm7xx_fiu[i].name, &s->fiu[i],
@@ -380,6 +389,22 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)sysbus_realize (SYS_BUS_DEVICE (&s->rng), &error_abort);sysbus_mmio_map (SYS_BUS_DEVICE (&s->rng),0 ,NPCM7XX_RNG_BA ); +/* USB Host */ +object_property_set_bool (OBJECT (&s->ehci),"companion-enable" , true, + &error_abort); +sysbus_realize (SYS_BUS_DEVICE (&s->ehci), &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->ehci),0 ,NPCM7XX_EHCI_BA ); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->ehci),0 , +npcm7xx_irq (s,NPCM7XX_EHCI_IRQ )); + +object_property_set_str (OBJECT (&s->ohci),"masterbus" ,"usb-bus.0" , + &error_abort); +object_property_set_uint (OBJECT (&s->ohci),"num-ports" ,1 , &error_abort); +sysbus_realize (SYS_BUS_DEVICE (&s->ohci), &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->ohci),0 ,NPCM7XX_OHCI_BA ); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->ohci),0 , +npcm7xx_irq (s,NPCM7XX_OHCI_IRQ )); +/* * Flash Interface Unit (FIU). Can fail if incorrect number of chip selects * specified, but this is a programming error.
@@ -464,8 +489,6 @@ static void npcm7xx_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("npcm7xx.mcphy" ,0xf05f0000 ,64 * KiB);create_unimplemented_device ("npcm7xx.gmac1" ,0xf0802000 ,8 * KiB);create_unimplemented_device ("npcm7xx.gmac2" ,0xf0804000 ,8 * KiB); -create_unimplemented_device ("npcm7xx.ehci" ,0xf0806000 ,4 * KiB); -create_unimplemented_device ("npcm7xx.ohci" ,0xf0807000 ,4 * KiB);create_unimplemented_device ("npcm7xx.vcd" ,0xf0810000 ,64 * KiB);create_unimplemented_device ("npcm7xx.ece" ,0xf0820000 ,8 * KiB);create_unimplemented_device ("npcm7xx.vdma" ,0xf0822000 ,8 * KiB);
hw/usb/hcd-ehci-sysbus.c +19 -0
@@ -147,6 +147,24 @@ static const TypeInfo ehci_aw_h3_type_info = { .class_init = ehci_aw_h3_class_init, }; +static void ehci_npcm7xx_class_init (ObjectClass *oc,void *data) +{ +SysBusEHCIClass *sec =SYS_BUS_EHCI_CLASS (oc); +DeviceClass *dc =DEVICE_CLASS (oc); + + sec->capsbase =0x0 ; + sec->opregbase =0x10 ; + sec->portscbase =0x44 ; + sec->portnr =1 ; +set_bit (DEVICE_CATEGORY_USB , dc->categories); +} + +static const TypeInfo ehci_npcm7xx_type_info = { + .name =TYPE_NPCM7XX_EHCI , + .parent =TYPE_SYS_BUS_EHCI , + .class_init = ehci_npcm7xx_class_init, +}; +static void ehci_tegra2_class_init (ObjectClass *oc,void *data) {SysBusEHCIClass *sec =SYS_BUS_EHCI_CLASS (oc);
@@ -269,6 +287,7 @@ static void ehci_sysbus_register_types(void)type_register_static (&ehci_platform_type_info);type_register_static (&ehci_exynos4210_type_info);type_register_static (&ehci_aw_h3_type_info); +type_register_static (&ehci_npcm7xx_type_info);type_register_static (&ehci_tegra2_type_info);type_register_static (&ehci_ppc4xx_type_info);type_register_static (&ehci_fusbh200_type_info);
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog