* [Qemu-devel] [PULL 0/2] target-arm queue
@ 2015-11-12 15:23 Peter Maydell
2015-11-12 15:23 ` [Qemu-devel] [PULL 1/2] target-arm: Update PC before calling gen_helper_check_breakpoints() Peter Maydell
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Peter Maydell @ 2015-11-12 15:23 UTC (permalink / raw)
To: qemu-devel
Last two things to sneak in before rc0.
thanks
-- PMM
The following changes since commit 17e50a72a3aade0eddfebc012a5d7bdd40a03573:
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2015-11-12 14:15:32 +0000)
are available in the git repository at:
git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20151112
for you to fetch changes up to a7df81a503ce0dd38fe400c9a37fe95ee07b51f0:
hw/misc: Add support for ADC controller in Xilinx Zynq 7000 (2015-11-12 15:10:43 +0000)
----------------------------------------------------------------
target-arm queue:
* add ADC controller to zynq board
* update PC before calling gen_helper_check_breakpoints()
----------------------------------------------------------------
Guenter Roeck (1):
hw/misc: Add support for ADC controller in Xilinx Zynq 7000
Sergey Fedorov (1):
target-arm: Update PC before calling gen_helper_check_breakpoints()
hw/arm/xilinx_zynq.c | 6 +
hw/misc/Makefile.objs | 1 +
hw/misc/zynq-xadc.c | 302 ++++++++++++++++++++++++++++++++++++++++++++
include/hw/misc/zynq-xadc.h | 46 +++++++
target-arm/translate-a64.c | 1 +
target-arm/translate.c | 1 +
6 files changed, 357 insertions(+)
create mode 100644 hw/misc/zynq-xadc.c
create mode 100644 include/hw/misc/zynq-xadc.h
^ permalink raw reply [flat|nested] 7+ messages in thread* [Qemu-devel] [PULL 1/2] target-arm: Update PC before calling gen_helper_check_breakpoints() 2015-11-12 15:23 [Qemu-devel] [PULL 0/2] target-arm queue Peter Maydell @ 2015-11-12 15:23 ` Peter Maydell 2015-11-12 15:23 ` [Qemu-devel] [PULL 2/2] hw/misc: Add support for ADC controller in Xilinx Zynq 7000 Peter Maydell 2015-11-12 16:52 ` [Qemu-devel] [PULL 0/2] target-arm queue Peter Maydell 2 siblings, 0 replies; 7+ messages in thread From: Peter Maydell @ 2015-11-12 15:23 UTC (permalink / raw) To: qemu-devel From: Sergey Fedorov <serge.fdrv@gmail.com> PC should be updated in the CPU state before calling check_breakpoints() helper. Otherwise, the helper would not see the correct PC in the CPU state if it is not at the start of a TB. Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com> Message-id: 1447176222-16401-1-git-send-email-serge.fdrv@gmail.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target-arm/translate-a64.c | 1 + target-arm/translate.c | 1 + 2 files changed, 2 insertions(+) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index d7e0954..fe485a4 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -11102,6 +11102,7 @@ void gen_intermediate_code_a64(ARMCPU *cpu, TranslationBlock *tb) QTAILQ_FOREACH(bp, &cs->breakpoints, entry) { if (bp->pc == dc->pc) { if (bp->flags & BP_CPU) { + gen_a64_set_pc_im(dc->pc); gen_helper_check_breakpoints(cpu_env); /* End the TB early; it likely won't be executed */ dc->is_jmp = DISAS_UPDATE; diff --git a/target-arm/translate.c b/target-arm/translate.c index a56f7fe..4351854 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -11373,6 +11373,7 @@ void gen_intermediate_code(CPUARMState *env, TranslationBlock *tb) QTAILQ_FOREACH(bp, &cs->breakpoints, entry) { if (bp->pc == dc->pc) { if (bp->flags & BP_CPU) { + gen_set_pc_im(dc, dc->pc); gen_helper_check_breakpoints(cpu_env); /* End the TB early; it's likely not going to be executed */ dc->is_jmp = DISAS_UPDATE; -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULL 2/2] hw/misc: Add support for ADC controller in Xilinx Zynq 7000 2015-11-12 15:23 [Qemu-devel] [PULL 0/2] target-arm queue Peter Maydell 2015-11-12 15:23 ` [Qemu-devel] [PULL 1/2] target-arm: Update PC before calling gen_helper_check_breakpoints() Peter Maydell @ 2015-11-12 15:23 ` Peter Maydell 2015-11-13 17:08 ` Paolo Bonzini 2015-11-12 16:52 ` [Qemu-devel] [PULL 0/2] target-arm queue Peter Maydell 2 siblings, 1 reply; 7+ messages in thread From: Peter Maydell @ 2015-11-12 15:23 UTC (permalink / raw) To: qemu-devel From: Guenter Roeck <linux@roeck-us.net> Add support for the Xilinx XADC core used in Zynq 7000. References: - Zynq-7000 All Programmable SoC Technical Reference Manual - 7 Series FPGAs and Zynq-7000 All Programmable SoC XADC Dual 12-Bit 1 MSPS Analog-to-Digital Converter Tested with Linux using QEMU machine xilinx-zynq-a9 with devicetree files zynq-zc702.dtb and zynq-zc706.dtb, and kernel configuration multi_v7_defconfig. Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Message-id: 57f84029331603f30f01511915e6b202e8424e7c.1447004487.git.crosthwaite.peter@gmail.com [ PC changes: * Changed macro names to match TRM where possible * Made programmers model macro scheme consistent * Dropped XADC_ZYNQ_ prefix on local macros * Fix ALM field width * Update threshold-comparison interrupts in _update_ints() * factored out DFIFO pushes into helper. Renamed to "push/pop" * Changed xadc_reg to 10 bits and added OOB check. * Reduced scope of MCTL reset to just stop channel coms. * Added dummy read data to write commands * Changed _ to - seperators in string names and filenames * Dropped ------------ in header comment * Catchall'ed _update_ints() in _write handler. * Minor whitespace changes. * Use ZYNQ_XADC_FIFO_DEPTH instead of ARRAY_SIZE() ] Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/arm/xilinx_zynq.c | 6 + hw/misc/Makefile.objs | 1 + hw/misc/zynq-xadc.c | 302 ++++++++++++++++++++++++++++++++++++++++++++ include/hw/misc/zynq-xadc.h | 46 +++++++ 4 files changed, 355 insertions(+) create mode 100644 hw/misc/zynq-xadc.c create mode 100644 include/hw/misc/zynq-xadc.h diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 82a9db8..1c1a445 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -24,6 +24,7 @@ #include "hw/block/flash.h" #include "sysemu/block-backend.h" #include "hw/loader.h" +#include "hw/misc/zynq-xadc.h" #include "hw/ssi.h" #include "qemu/error-report.h" @@ -264,6 +265,11 @@ static void zynq_init(MachineState *machine) sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0101000); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[79-IRQ_OFFSET]); + dev = qdev_create(NULL, TYPE_ZYNQ_XADC); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8007100); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[39-IRQ_OFFSET]); + dev = qdev_create(NULL, "pl330"); qdev_prop_set_uint8(dev, "num_chnls", 8); qdev_prop_set_uint8(dev, "num_periph_req", 4); diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 4aa76ff..aeb6b7d 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -36,6 +36,7 @@ obj-$(CONFIG_OMAP) += omap_sdrc.o obj-$(CONFIG_OMAP) += omap_tap.o obj-$(CONFIG_SLAVIO) += slavio_misc.o obj-$(CONFIG_ZYNQ) += zynq_slcr.o +obj-$(CONFIG_ZYNQ) += zynq-xadc.o obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o obj-$(CONFIG_PVPANIC) += pvpanic.o diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c new file mode 100644 index 0000000..ae3df5e --- /dev/null +++ b/hw/misc/zynq-xadc.c @@ -0,0 +1,302 @@ +/* + * ADC registers for Xilinx Zynq Platform + * + * Copyright (c) 2015 Guenter Roeck + * Based on hw/misc/zynq_slcr.c, written by Michal Simek + * + * 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. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "hw/hw.h" +#include "hw/misc/zynq-xadc.h" +#include "qemu/timer.h" +#include "sysemu/sysemu.h" + +enum { + CFG = 0x000 / 4, + INT_STS, + INT_MASK, + MSTS, + CMDFIFO, + RDFIFO, + MCTL, +}; + +#define CFG_ENABLE BIT(31) +#define CFG_CFIFOTH_SHIFT 20 +#define CFG_CFIFOTH_LENGTH 4 +#define CFG_DFIFOTH_SHIFT 16 +#define CFG_DFIFOTH_LENGTH 4 +#define CFG_WEDGE BIT(13) +#define CFG_REDGE BIT(12) +#define CFG_TCKRATE_SHIFT 8 +#define CFG_TCKRATE_LENGTH 2 + +#define CFG_TCKRATE_DIV(x) (0x1 << (x - 1)) + +#define CFG_IGAP_SHIFT 0 +#define CFG_IGAP_LENGTH 5 + +#define INT_CFIFO_LTH BIT(9) +#define INT_DFIFO_GTH BIT(8) +#define INT_OT BIT(7) +#define INT_ALM_SHIFT 0 +#define INT_ALM_LENGTH 7 +#define INT_ALM_MASK (((1 << INT_ALM_LENGTH) - 1) << INT_ALM_SHIFT) + +#define INT_ALL (INT_CFIFO_LTH | INT_DFIFO_GTH | INT_OT | INT_ALM_MASK) + +#define MSTS_CFIFO_LVL_SHIFT 16 +#define MSTS_CFIFO_LVL_LENGTH 4 +#define MSTS_DFIFO_LVL_SHIFT 12 +#define MSTS_DFIFO_LVL_LENGTH 4 +#define MSTS_CFIFOF BIT(11) +#define MSTS_CFIFOE BIT(10) +#define MSTS_DFIFOF BIT(9) +#define MSTS_DFIFOE BIT(8) +#define MSTS_OT BIT(7) +#define MSTS_ALM_SHIFT 0 +#define MSTS_ALM_LENGTH 7 + +#define MCTL_RESET BIT(4) + +#define CMD_NOP 0x00 +#define CMD_READ 0x01 +#define CMD_WRITE 0x02 + +static void zynq_xadc_update_ints(ZynqXADCState *s) +{ + + /* We are fast, commands are actioned instantly so the CFIFO is always + * empty (and below threshold). + */ + s->regs[INT_STS] |= INT_CFIFO_LTH; + + if (s->xadc_dfifo_entries > + extract32(s->regs[CFG], CFG_DFIFOTH_SHIFT, CFG_DFIFOTH_LENGTH)) { + s->regs[INT_STS] |= INT_DFIFO_GTH; + } + + qemu_set_irq(s->qemu_irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK])); +} + +static void zynq_xadc_reset(DeviceState *d) +{ + ZynqXADCState *s = ZYNQ_XADC(d); + + s->regs[CFG] = 0x14 << CFG_IGAP_SHIFT | + CFG_TCKRATE_DIV(4) << CFG_TCKRATE_SHIFT | CFG_REDGE; + s->regs[INT_STS] = INT_CFIFO_LTH; + s->regs[INT_MASK] = 0xffffffff; + s->regs[CMDFIFO] = 0; + s->regs[RDFIFO] = 0; + s->regs[MCTL] = MCTL_RESET; + + memset(s->xadc_regs, 0, sizeof(s->xadc_regs)); + memset(s->xadc_dfifo, 0, sizeof(s->xadc_dfifo)); + s->xadc_dfifo_entries = 0; + + zynq_xadc_update_ints(s); +} + +static uint16_t xadc_pop_dfifo(ZynqXADCState *s) +{ + uint16_t rv = s->xadc_dfifo[0]; + int i; + + if (s->xadc_dfifo_entries > 0) { + s->xadc_dfifo_entries--; + } + for (i = 0; i < s->xadc_dfifo_entries; i++) { + s->xadc_dfifo[i] = s->xadc_dfifo[i + 1]; + } + s->xadc_dfifo[s->xadc_dfifo_entries] = 0; + zynq_xadc_update_ints(s); + return rv; +} + +static void xadc_push_dfifo(ZynqXADCState *s, uint16_t regval) +{ + if (s->xadc_dfifo_entries < ZYNQ_XADC_FIFO_DEPTH) { + s->xadc_dfifo[s->xadc_dfifo_entries++] = s->xadc_read_reg_previous; + } + s->xadc_read_reg_previous = regval; + zynq_xadc_update_ints(s); +} + +static bool zynq_xadc_check_offset(hwaddr offset, bool rnw) +{ + switch (offset) { + case CFG: + case INT_MASK: + case INT_STS: + case MCTL: + return true; + case RDFIFO: + case MSTS: + return rnw; /* read only */ + case CMDFIFO: + return !rnw; /* write only */ + default: + return false; + } +} + +static uint64_t zynq_xadc_read(void *opaque, hwaddr offset, unsigned size) +{ + ZynqXADCState *s = opaque; + int reg = offset / 4; + uint32_t rv; + + if (!zynq_xadc_check_offset(reg, true)) { + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Invalid read access to " + "addr %" HWADDR_PRIx "\n", offset); + return 0; + } + + switch (reg) { + case CFG: + case INT_MASK: + case INT_STS: + case MCTL: + rv = s->regs[reg]; + break; + case MSTS: + rv = MSTS_CFIFOE; + rv |= s->xadc_dfifo_entries << MSTS_DFIFO_LVL_SHIFT; + if (!s->xadc_dfifo_entries) { + rv |= MSTS_DFIFOE; + } else if (s->xadc_dfifo_entries == ZYNQ_XADC_FIFO_DEPTH) { + rv |= MSTS_DFIFOF; + } + break; + case RDFIFO: + rv = xadc_pop_dfifo(s); + break; + } + return rv; +} + +static void zynq_xadc_write(void *opaque, hwaddr offset, uint64_t val, + unsigned size) +{ + ZynqXADCState *s = (ZynqXADCState *)opaque; + int reg = offset / 4; + int xadc_reg; + int xadc_cmd; + int xadc_data; + + if (!zynq_xadc_check_offset(reg, false)) { + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Invalid write access " + "to addr %" HWADDR_PRIx "\n", offset); + return; + } + + switch (reg) { + case CFG: + s->regs[CFG] = val; + break; + case INT_STS: + s->regs[INT_STS] &= ~val; + break; + case INT_MASK: + s->regs[INT_MASK] = val & INT_ALL; + break; + case CMDFIFO: + xadc_cmd = extract32(val, 26, 4); + xadc_reg = extract32(val, 16, 10); + xadc_data = extract32(val, 0, 16); + + if (s->regs[MCTL] & MCTL_RESET) { + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Sending command " + "while comm channel held in reset: %" PRIx32 "\n", + (uint32_t) val); + break; + } + + if (xadc_reg > ZYNQ_XADC_NUM_ADC_REGS && xadc_cmd != CMD_NOP) { + qemu_log_mask(LOG_GUEST_ERROR, "read/write op to invalid xadc " + "reg 0x%x\n", xadc_reg); + break; + } + + switch (xadc_cmd) { + case CMD_READ: + xadc_push_dfifo(s, s->xadc_regs[xadc_reg]); + break; + case CMD_WRITE: + s->xadc_regs[xadc_reg] = xadc_data; + /* fallthrough */ + case CMD_NOP: + xadc_push_dfifo(s, 0); + break; + } + break; + case MCTL: + s->regs[MCTL] = val & 0x00fffeff; + break; + } + zynq_xadc_update_ints(s); +} + +static const MemoryRegionOps xadc_ops = { + .read = zynq_xadc_read, + .write = zynq_xadc_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + +static void zynq_xadc_init(Object *obj) +{ + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); + ZynqXADCState *s = ZYNQ_XADC(obj); + + memory_region_init_io(&s->iomem, obj, &xadc_ops, s, "zynq-xadc", + ZYNQ_XADC_MMIO_SIZE); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->qemu_irq); +} + +static const VMStateDescription vmstate_zynq_xadc = { + .name = "zynq-xadc", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, ZynqXADCState, ZYNQ_XADC_NUM_IO_REGS), + VMSTATE_UINT16_ARRAY(xadc_regs, ZynqXADCState, + ZYNQ_XADC_NUM_ADC_REGS), + VMSTATE_UINT16_ARRAY(xadc_dfifo, ZynqXADCState, + ZYNQ_XADC_FIFO_DEPTH), + VMSTATE_UINT16(xadc_read_reg_previous, ZynqXADCState), + VMSTATE_UINT16(xadc_dfifo_entries, ZynqXADCState), + VMSTATE_END_OF_LIST() + } +}; + +static void zynq_xadc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->vmsd = &vmstate_zynq_xadc; + dc->reset = zynq_xadc_reset; +} + +static const TypeInfo zynq_xadc_info = { + .class_init = zynq_xadc_class_init, + .name = TYPE_ZYNQ_XADC, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(ZynqXADCState), + .instance_init = zynq_xadc_init, +}; + +static void zynq_xadc_register_types(void) +{ + type_register_static(&zynq_xadc_info); +} + +type_init(zynq_xadc_register_types) diff --git a/include/hw/misc/zynq-xadc.h b/include/hw/misc/zynq-xadc.h new file mode 100644 index 0000000..f1a410a --- /dev/null +++ b/include/hw/misc/zynq-xadc.h @@ -0,0 +1,46 @@ +/* + * Device model for Zynq ADC controller + * + * Copyright (c) 2015 Guenter Roeck <linux@roeck-us.net> + * + * 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. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef ZYNQ_XADC_H +#define ZYNQ_XADC_H + +#include "hw/sysbus.h" + +#define ZYNQ_XADC_MMIO_SIZE 0x0020 +#define ZYNQ_XADC_NUM_IO_REGS (ZYNQ_XADC_MMIO_SIZE / 4) +#define ZYNQ_XADC_NUM_ADC_REGS 128 +#define ZYNQ_XADC_FIFO_DEPTH 15 + +#define TYPE_ZYNQ_XADC "xlnx,zynq-xadc" +#define ZYNQ_XADC(obj) \ + OBJECT_CHECK(ZynqXADCState, (obj), TYPE_ZYNQ_XADC) + +typedef struct ZynqXADCState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + MemoryRegion iomem; + + uint32_t regs[ZYNQ_XADC_NUM_IO_REGS]; + uint16_t xadc_regs[ZYNQ_XADC_NUM_ADC_REGS]; + uint16_t xadc_read_reg_previous; + uint16_t xadc_dfifo[ZYNQ_XADC_FIFO_DEPTH]; + uint16_t xadc_dfifo_entries; + + struct IRQState *qemu_irq; + +} ZynqXADCState; + +#endif /* ZYNQ_XADC_H */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PULL 2/2] hw/misc: Add support for ADC controller in Xilinx Zynq 7000 2015-11-12 15:23 ` [Qemu-devel] [PULL 2/2] hw/misc: Add support for ADC controller in Xilinx Zynq 7000 Peter Maydell @ 2015-11-13 17:08 ` Paolo Bonzini 2015-11-13 17:54 ` Peter Crosthwaite 0 siblings, 1 reply; 7+ messages in thread From: Paolo Bonzini @ 2015-11-13 17:08 UTC (permalink / raw) To: Peter Maydell, qemu-devel, Peter Crosthwaite, linux, Alistair Francis On 12/11/2015 16:23, Peter Maydell wrote: > From: Guenter Roeck <linux@roeck-us.net> > > Add support for the Xilinx XADC core used in Zynq 7000. > > References: > - Zynq-7000 All Programmable SoC Technical Reference Manual > - 7 Series FPGAs and Zynq-7000 All Programmable SoC XADC > Dual 12-Bit 1 MSPS Analog-to-Digital Converter > > Tested with Linux using QEMU machine xilinx-zynq-a9 with devicetree > files zynq-zc702.dtb and zynq-zc706.dtb, and kernel configuration > multi_v7_defconfig. > > Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> > Message-id: 57f84029331603f30f01511915e6b202e8424e7c.1447004487.git.crosthwaite.peter@gmail.com > [ PC changes: > * Changed macro names to match TRM where possible > * Made programmers model macro scheme consistent > * Dropped XADC_ZYNQ_ prefix on local macros > * Fix ALM field width > * Update threshold-comparison interrupts in _update_ints() > * factored out DFIFO pushes into helper. Renamed to "push/pop" > * Changed xadc_reg to 10 bits and added OOB check. > * Reduced scope of MCTL reset to just stop channel coms. > * Added dummy read data to write commands > * Changed _ to - seperators in string names and filenames > * Dropped ------------ in header comment > * Catchall'ed _update_ints() in _write handler. > * Minor whitespace changes. > * Use ZYNQ_XADC_FIFO_DEPTH instead of ARRAY_SIZE() > ] > Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/arm/xilinx_zynq.c | 6 + > hw/misc/Makefile.objs | 1 + > hw/misc/zynq-xadc.c | 302 ++++++++++++++++++++++++++++++++++++++++++++ > include/hw/misc/zynq-xadc.h | 46 +++++++ > 4 files changed, 355 insertions(+) > create mode 100644 hw/misc/zynq-xadc.c > create mode 100644 include/hw/misc/zynq-xadc.h > > diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c > index 82a9db8..1c1a445 100644 > --- a/hw/arm/xilinx_zynq.c > +++ b/hw/arm/xilinx_zynq.c > @@ -24,6 +24,7 @@ > #include "hw/block/flash.h" > #include "sysemu/block-backend.h" > #include "hw/loader.h" > +#include "hw/misc/zynq-xadc.h" > #include "hw/ssi.h" > #include "qemu/error-report.h" > > @@ -264,6 +265,11 @@ static void zynq_init(MachineState *machine) > sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0101000); > sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[79-IRQ_OFFSET]); > > + dev = qdev_create(NULL, TYPE_ZYNQ_XADC); > + qdev_init_nofail(dev); > + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8007100); > + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[39-IRQ_OFFSET]); > + > dev = qdev_create(NULL, "pl330"); > qdev_prop_set_uint8(dev, "num_chnls", 8); > qdev_prop_set_uint8(dev, "num_periph_req", 4); > diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs > index 4aa76ff..aeb6b7d 100644 > --- a/hw/misc/Makefile.objs > +++ b/hw/misc/Makefile.objs > @@ -36,6 +36,7 @@ obj-$(CONFIG_OMAP) += omap_sdrc.o > obj-$(CONFIG_OMAP) += omap_tap.o > obj-$(CONFIG_SLAVIO) += slavio_misc.o > obj-$(CONFIG_ZYNQ) += zynq_slcr.o > +obj-$(CONFIG_ZYNQ) += zynq-xadc.o > obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o > > obj-$(CONFIG_PVPANIC) += pvpanic.o > diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c > new file mode 100644 > index 0000000..ae3df5e > --- /dev/null > +++ b/hw/misc/zynq-xadc.c > @@ -0,0 +1,302 @@ > +/* > + * ADC registers for Xilinx Zynq Platform > + * > + * Copyright (c) 2015 Guenter Roeck > + * Based on hw/misc/zynq_slcr.c, written by Michal Simek > + * > + * 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. > + * > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include "hw/hw.h" > +#include "hw/misc/zynq-xadc.h" > +#include "qemu/timer.h" > +#include "sysemu/sysemu.h" > + > +enum { > + CFG = 0x000 / 4, > + INT_STS, > + INT_MASK, > + MSTS, > + CMDFIFO, > + RDFIFO, > + MCTL, > +}; > + > +#define CFG_ENABLE BIT(31) > +#define CFG_CFIFOTH_SHIFT 20 > +#define CFG_CFIFOTH_LENGTH 4 > +#define CFG_DFIFOTH_SHIFT 16 > +#define CFG_DFIFOTH_LENGTH 4 > +#define CFG_WEDGE BIT(13) > +#define CFG_REDGE BIT(12) > +#define CFG_TCKRATE_SHIFT 8 > +#define CFG_TCKRATE_LENGTH 2 > + > +#define CFG_TCKRATE_DIV(x) (0x1 << (x - 1)) > + > +#define CFG_IGAP_SHIFT 0 > +#define CFG_IGAP_LENGTH 5 > + > +#define INT_CFIFO_LTH BIT(9) > +#define INT_DFIFO_GTH BIT(8) > +#define INT_OT BIT(7) > +#define INT_ALM_SHIFT 0 > +#define INT_ALM_LENGTH 7 > +#define INT_ALM_MASK (((1 << INT_ALM_LENGTH) - 1) << INT_ALM_SHIFT) > + > +#define INT_ALL (INT_CFIFO_LTH | INT_DFIFO_GTH | INT_OT | INT_ALM_MASK) > + > +#define MSTS_CFIFO_LVL_SHIFT 16 > +#define MSTS_CFIFO_LVL_LENGTH 4 > +#define MSTS_DFIFO_LVL_SHIFT 12 > +#define MSTS_DFIFO_LVL_LENGTH 4 > +#define MSTS_CFIFOF BIT(11) > +#define MSTS_CFIFOE BIT(10) > +#define MSTS_DFIFOF BIT(9) > +#define MSTS_DFIFOE BIT(8) > +#define MSTS_OT BIT(7) > +#define MSTS_ALM_SHIFT 0 > +#define MSTS_ALM_LENGTH 7 > + > +#define MCTL_RESET BIT(4) > + > +#define CMD_NOP 0x00 > +#define CMD_READ 0x01 > +#define CMD_WRITE 0x02 > + > +static void zynq_xadc_update_ints(ZynqXADCState *s) > +{ > + > + /* We are fast, commands are actioned instantly so the CFIFO is always > + * empty (and below threshold). > + */ > + s->regs[INT_STS] |= INT_CFIFO_LTH; > + > + if (s->xadc_dfifo_entries > > + extract32(s->regs[CFG], CFG_DFIFOTH_SHIFT, CFG_DFIFOTH_LENGTH)) { > + s->regs[INT_STS] |= INT_DFIFO_GTH; > + } > + > + qemu_set_irq(s->qemu_irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK])); > +} > + > +static void zynq_xadc_reset(DeviceState *d) > +{ > + ZynqXADCState *s = ZYNQ_XADC(d); > + > + s->regs[CFG] = 0x14 << CFG_IGAP_SHIFT | > + CFG_TCKRATE_DIV(4) << CFG_TCKRATE_SHIFT | CFG_REDGE; > + s->regs[INT_STS] = INT_CFIFO_LTH; > + s->regs[INT_MASK] = 0xffffffff; > + s->regs[CMDFIFO] = 0; > + s->regs[RDFIFO] = 0; > + s->regs[MCTL] = MCTL_RESET; > + > + memset(s->xadc_regs, 0, sizeof(s->xadc_regs)); > + memset(s->xadc_dfifo, 0, sizeof(s->xadc_dfifo)); > + s->xadc_dfifo_entries = 0; > + > + zynq_xadc_update_ints(s); > +} > + > +static uint16_t xadc_pop_dfifo(ZynqXADCState *s) > +{ > + uint16_t rv = s->xadc_dfifo[0]; > + int i; > + > + if (s->xadc_dfifo_entries > 0) { > + s->xadc_dfifo_entries--; > + } > + for (i = 0; i < s->xadc_dfifo_entries; i++) { > + s->xadc_dfifo[i] = s->xadc_dfifo[i + 1]; > + } > + s->xadc_dfifo[s->xadc_dfifo_entries] = 0; > + zynq_xadc_update_ints(s); > + return rv; > +} > + > +static void xadc_push_dfifo(ZynqXADCState *s, uint16_t regval) > +{ > + if (s->xadc_dfifo_entries < ZYNQ_XADC_FIFO_DEPTH) { > + s->xadc_dfifo[s->xadc_dfifo_entries++] = s->xadc_read_reg_previous; > + } > + s->xadc_read_reg_previous = regval; > + zynq_xadc_update_ints(s); > +} > + > +static bool zynq_xadc_check_offset(hwaddr offset, bool rnw) > +{ > + switch (offset) { > + case CFG: > + case INT_MASK: > + case INT_STS: > + case MCTL: > + return true; > + case RDFIFO: > + case MSTS: > + return rnw; /* read only */ > + case CMDFIFO: > + return !rnw; /* write only */ > + default: > + return false; > + } > +} > + > +static uint64_t zynq_xadc_read(void *opaque, hwaddr offset, unsigned size) > +{ > + ZynqXADCState *s = opaque; > + int reg = offset / 4; > + uint32_t rv; > + > + if (!zynq_xadc_check_offset(reg, true)) { > + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Invalid read access to " > + "addr %" HWADDR_PRIx "\n", offset); > + return 0; > + } > + > + switch (reg) { > + case CFG: > + case INT_MASK: > + case INT_STS: > + case MCTL: > + rv = s->regs[reg]; > + break; > + case MSTS: > + rv = MSTS_CFIFOE; > + rv |= s->xadc_dfifo_entries << MSTS_DFIFO_LVL_SHIFT; > + if (!s->xadc_dfifo_entries) { > + rv |= MSTS_DFIFOE; > + } else if (s->xadc_dfifo_entries == ZYNQ_XADC_FIFO_DEPTH) { > + rv |= MSTS_DFIFOF; > + } > + break; > + case RDFIFO: > + rv = xadc_pop_dfifo(s); > + break; > + } > + return rv; > +} > + > +static void zynq_xadc_write(void *opaque, hwaddr offset, uint64_t val, > + unsigned size) > +{ > + ZynqXADCState *s = (ZynqXADCState *)opaque; > + int reg = offset / 4; > + int xadc_reg; > + int xadc_cmd; > + int xadc_data; > + > + if (!zynq_xadc_check_offset(reg, false)) { > + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Invalid write access " > + "to addr %" HWADDR_PRIx "\n", offset); > + return; > + } > + > + switch (reg) { > + case CFG: > + s->regs[CFG] = val; > + break; > + case INT_STS: > + s->regs[INT_STS] &= ~val; > + break; > + case INT_MASK: > + s->regs[INT_MASK] = val & INT_ALL; > + break; > + case CMDFIFO: > + xadc_cmd = extract32(val, 26, 4); > + xadc_reg = extract32(val, 16, 10); > + xadc_data = extract32(val, 0, 16); > + > + if (s->regs[MCTL] & MCTL_RESET) { > + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Sending command " > + "while comm channel held in reset: %" PRIx32 "\n", > + (uint32_t) val); > + break; > + } > + > + if (xadc_reg > ZYNQ_XADC_NUM_ADC_REGS && xadc_cmd != CMD_NOP) { I think this > should be >= or you get an off-by-one. Paolo > + qemu_log_mask(LOG_GUEST_ERROR, "read/write op to invalid xadc " > + "reg 0x%x\n", xadc_reg); > + break; > + } > + > + switch (xadc_cmd) { > + case CMD_READ: > + xadc_push_dfifo(s, s->xadc_regs[xadc_reg]); > + break; > + case CMD_WRITE: > + s->xadc_regs[xadc_reg] = xadc_data; > + /* fallthrough */ > + case CMD_NOP: > + xadc_push_dfifo(s, 0); > + break; > + } > + break; > + case MCTL: > + s->regs[MCTL] = val & 0x00fffeff; > + break; > + } > + zynq_xadc_update_ints(s); > +} > + > +static const MemoryRegionOps xadc_ops = { > + .read = zynq_xadc_read, > + .write = zynq_xadc_write, > + .endianness = DEVICE_NATIVE_ENDIAN, > +}; > + > +static void zynq_xadc_init(Object *obj) > +{ > + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > + ZynqXADCState *s = ZYNQ_XADC(obj); > + > + memory_region_init_io(&s->iomem, obj, &xadc_ops, s, "zynq-xadc", > + ZYNQ_XADC_MMIO_SIZE); > + sysbus_init_mmio(sbd, &s->iomem); > + sysbus_init_irq(sbd, &s->qemu_irq); > +} > + > +static const VMStateDescription vmstate_zynq_xadc = { > + .name = "zynq-xadc", > + .version_id = 1, > + .minimum_version_id = 1, > + .fields = (VMStateField[]) { > + VMSTATE_UINT32_ARRAY(regs, ZynqXADCState, ZYNQ_XADC_NUM_IO_REGS), > + VMSTATE_UINT16_ARRAY(xadc_regs, ZynqXADCState, > + ZYNQ_XADC_NUM_ADC_REGS), > + VMSTATE_UINT16_ARRAY(xadc_dfifo, ZynqXADCState, > + ZYNQ_XADC_FIFO_DEPTH), > + VMSTATE_UINT16(xadc_read_reg_previous, ZynqXADCState), > + VMSTATE_UINT16(xadc_dfifo_entries, ZynqXADCState), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +static void zynq_xadc_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + > + dc->vmsd = &vmstate_zynq_xadc; > + dc->reset = zynq_xadc_reset; > +} > + > +static const TypeInfo zynq_xadc_info = { > + .class_init = zynq_xadc_class_init, > + .name = TYPE_ZYNQ_XADC, > + .parent = TYPE_SYS_BUS_DEVICE, > + .instance_size = sizeof(ZynqXADCState), > + .instance_init = zynq_xadc_init, > +}; > + > +static void zynq_xadc_register_types(void) > +{ > + type_register_static(&zynq_xadc_info); > +} > + > +type_init(zynq_xadc_register_types) > diff --git a/include/hw/misc/zynq-xadc.h b/include/hw/misc/zynq-xadc.h > new file mode 100644 > index 0000000..f1a410a > --- /dev/null > +++ b/include/hw/misc/zynq-xadc.h > @@ -0,0 +1,46 @@ > +/* > + * Device model for Zynq ADC controller > + * > + * Copyright (c) 2015 Guenter Roeck <linux@roeck-us.net> > + * > + * 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. > + * > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef ZYNQ_XADC_H > +#define ZYNQ_XADC_H > + > +#include "hw/sysbus.h" > + > +#define ZYNQ_XADC_MMIO_SIZE 0x0020 > +#define ZYNQ_XADC_NUM_IO_REGS (ZYNQ_XADC_MMIO_SIZE / 4) > +#define ZYNQ_XADC_NUM_ADC_REGS 128 > +#define ZYNQ_XADC_FIFO_DEPTH 15 > + > +#define TYPE_ZYNQ_XADC "xlnx,zynq-xadc" > +#define ZYNQ_XADC(obj) \ > + OBJECT_CHECK(ZynqXADCState, (obj), TYPE_ZYNQ_XADC) > + > +typedef struct ZynqXADCState { > + /*< private >*/ > + SysBusDevice parent_obj; > + > + /*< public >*/ > + MemoryRegion iomem; > + > + uint32_t regs[ZYNQ_XADC_NUM_IO_REGS]; > + uint16_t xadc_regs[ZYNQ_XADC_NUM_ADC_REGS]; > + uint16_t xadc_read_reg_previous; > + uint16_t xadc_dfifo[ZYNQ_XADC_FIFO_DEPTH]; > + uint16_t xadc_dfifo_entries; > + > + struct IRQState *qemu_irq; > + > +} ZynqXADCState; > + > +#endif /* ZYNQ_XADC_H */ > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PULL 2/2] hw/misc: Add support for ADC controller in Xilinx Zynq 7000 2015-11-13 17:08 ` Paolo Bonzini @ 2015-11-13 17:54 ` Peter Crosthwaite 2016-01-08 9:37 ` Paolo Bonzini 0 siblings, 1 reply; 7+ messages in thread From: Peter Crosthwaite @ 2015-11-13 17:54 UTC (permalink / raw) To: Paolo Bonzini Cc: Peter Maydell, qemu-devel@nongnu.org Developers, Guenter Roeck, Alistair Francis On Fri, Nov 13, 2015 at 9:08 AM, Paolo Bonzini <pbonzini@redhat.com> wrote: > > > On 12/11/2015 16:23, Peter Maydell wrote: >> From: Guenter Roeck <linux@roeck-us.net> >> >> Add support for the Xilinx XADC core used in Zynq 7000. >> >> References: >> - Zynq-7000 All Programmable SoC Technical Reference Manual >> - 7 Series FPGAs and Zynq-7000 All Programmable SoC XADC >> Dual 12-Bit 1 MSPS Analog-to-Digital Converter >> >> Tested with Linux using QEMU machine xilinx-zynq-a9 with devicetree >> files zynq-zc702.dtb and zynq-zc706.dtb, and kernel configuration >> multi_v7_defconfig. >> >> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> >> Signed-off-by: Guenter Roeck <linux@roeck-us.net> >> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> >> Message-id: 57f84029331603f30f01511915e6b202e8424e7c.1447004487.git.crosthwaite.peter@gmail.com >> [ PC changes: >> * Changed macro names to match TRM where possible >> * Made programmers model macro scheme consistent >> * Dropped XADC_ZYNQ_ prefix on local macros >> * Fix ALM field width >> * Update threshold-comparison interrupts in _update_ints() >> * factored out DFIFO pushes into helper. Renamed to "push/pop" >> * Changed xadc_reg to 10 bits and added OOB check. >> * Reduced scope of MCTL reset to just stop channel coms. >> * Added dummy read data to write commands >> * Changed _ to - seperators in string names and filenames >> * Dropped ------------ in header comment >> * Catchall'ed _update_ints() in _write handler. >> * Minor whitespace changes. >> * Use ZYNQ_XADC_FIFO_DEPTH instead of ARRAY_SIZE() >> ] >> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> >> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> >> --- >> hw/arm/xilinx_zynq.c | 6 + >> hw/misc/Makefile.objs | 1 + >> hw/misc/zynq-xadc.c | 302 ++++++++++++++++++++++++++++++++++++++++++++ >> include/hw/misc/zynq-xadc.h | 46 +++++++ >> 4 files changed, 355 insertions(+) >> create mode 100644 hw/misc/zynq-xadc.c >> create mode 100644 include/hw/misc/zynq-xadc.h >> >> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c >> index 82a9db8..1c1a445 100644 >> --- a/hw/arm/xilinx_zynq.c >> +++ b/hw/arm/xilinx_zynq.c >> @@ -24,6 +24,7 @@ >> #include "hw/block/flash.h" >> #include "sysemu/block-backend.h" >> #include "hw/loader.h" >> +#include "hw/misc/zynq-xadc.h" >> #include "hw/ssi.h" >> #include "qemu/error-report.h" >> >> @@ -264,6 +265,11 @@ static void zynq_init(MachineState *machine) >> sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0101000); >> sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[79-IRQ_OFFSET]); >> >> + dev = qdev_create(NULL, TYPE_ZYNQ_XADC); >> + qdev_init_nofail(dev); >> + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8007100); >> + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[39-IRQ_OFFSET]); >> + >> dev = qdev_create(NULL, "pl330"); >> qdev_prop_set_uint8(dev, "num_chnls", 8); >> qdev_prop_set_uint8(dev, "num_periph_req", 4); >> diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs >> index 4aa76ff..aeb6b7d 100644 >> --- a/hw/misc/Makefile.objs >> +++ b/hw/misc/Makefile.objs >> @@ -36,6 +36,7 @@ obj-$(CONFIG_OMAP) += omap_sdrc.o >> obj-$(CONFIG_OMAP) += omap_tap.o >> obj-$(CONFIG_SLAVIO) += slavio_misc.o >> obj-$(CONFIG_ZYNQ) += zynq_slcr.o >> +obj-$(CONFIG_ZYNQ) += zynq-xadc.o >> obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o >> >> obj-$(CONFIG_PVPANIC) += pvpanic.o >> diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c >> new file mode 100644 >> index 0000000..ae3df5e >> --- /dev/null >> +++ b/hw/misc/zynq-xadc.c >> @@ -0,0 +1,302 @@ >> +/* >> + * ADC registers for Xilinx Zynq Platform >> + * >> + * Copyright (c) 2015 Guenter Roeck >> + * Based on hw/misc/zynq_slcr.c, written by Michal Simek >> + * >> + * 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. >> + * >> + * You should have received a copy of the GNU General Public License along >> + * with this program; if not, see <http://www.gnu.org/licenses/>. >> + */ >> + >> +#include "hw/hw.h" >> +#include "hw/misc/zynq-xadc.h" >> +#include "qemu/timer.h" >> +#include "sysemu/sysemu.h" >> + >> +enum { >> + CFG = 0x000 / 4, >> + INT_STS, >> + INT_MASK, >> + MSTS, >> + CMDFIFO, >> + RDFIFO, >> + MCTL, >> +}; >> + >> +#define CFG_ENABLE BIT(31) >> +#define CFG_CFIFOTH_SHIFT 20 >> +#define CFG_CFIFOTH_LENGTH 4 >> +#define CFG_DFIFOTH_SHIFT 16 >> +#define CFG_DFIFOTH_LENGTH 4 >> +#define CFG_WEDGE BIT(13) >> +#define CFG_REDGE BIT(12) >> +#define CFG_TCKRATE_SHIFT 8 >> +#define CFG_TCKRATE_LENGTH 2 >> + >> +#define CFG_TCKRATE_DIV(x) (0x1 << (x - 1)) >> + >> +#define CFG_IGAP_SHIFT 0 >> +#define CFG_IGAP_LENGTH 5 >> + >> +#define INT_CFIFO_LTH BIT(9) >> +#define INT_DFIFO_GTH BIT(8) >> +#define INT_OT BIT(7) >> +#define INT_ALM_SHIFT 0 >> +#define INT_ALM_LENGTH 7 >> +#define INT_ALM_MASK (((1 << INT_ALM_LENGTH) - 1) << INT_ALM_SHIFT) >> + >> +#define INT_ALL (INT_CFIFO_LTH | INT_DFIFO_GTH | INT_OT | INT_ALM_MASK) >> + >> +#define MSTS_CFIFO_LVL_SHIFT 16 >> +#define MSTS_CFIFO_LVL_LENGTH 4 >> +#define MSTS_DFIFO_LVL_SHIFT 12 >> +#define MSTS_DFIFO_LVL_LENGTH 4 >> +#define MSTS_CFIFOF BIT(11) >> +#define MSTS_CFIFOE BIT(10) >> +#define MSTS_DFIFOF BIT(9) >> +#define MSTS_DFIFOE BIT(8) >> +#define MSTS_OT BIT(7) >> +#define MSTS_ALM_SHIFT 0 >> +#define MSTS_ALM_LENGTH 7 >> + >> +#define MCTL_RESET BIT(4) >> + >> +#define CMD_NOP 0x00 >> +#define CMD_READ 0x01 >> +#define CMD_WRITE 0x02 >> + >> +static void zynq_xadc_update_ints(ZynqXADCState *s) >> +{ >> + >> + /* We are fast, commands are actioned instantly so the CFIFO is always >> + * empty (and below threshold). >> + */ >> + s->regs[INT_STS] |= INT_CFIFO_LTH; >> + >> + if (s->xadc_dfifo_entries > >> + extract32(s->regs[CFG], CFG_DFIFOTH_SHIFT, CFG_DFIFOTH_LENGTH)) { >> + s->regs[INT_STS] |= INT_DFIFO_GTH; >> + } >> + >> + qemu_set_irq(s->qemu_irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK])); >> +} >> + >> +static void zynq_xadc_reset(DeviceState *d) >> +{ >> + ZynqXADCState *s = ZYNQ_XADC(d); >> + >> + s->regs[CFG] = 0x14 << CFG_IGAP_SHIFT | >> + CFG_TCKRATE_DIV(4) << CFG_TCKRATE_SHIFT | CFG_REDGE; >> + s->regs[INT_STS] = INT_CFIFO_LTH; >> + s->regs[INT_MASK] = 0xffffffff; >> + s->regs[CMDFIFO] = 0; >> + s->regs[RDFIFO] = 0; >> + s->regs[MCTL] = MCTL_RESET; >> + >> + memset(s->xadc_regs, 0, sizeof(s->xadc_regs)); >> + memset(s->xadc_dfifo, 0, sizeof(s->xadc_dfifo)); >> + s->xadc_dfifo_entries = 0; >> + >> + zynq_xadc_update_ints(s); >> +} >> + >> +static uint16_t xadc_pop_dfifo(ZynqXADCState *s) >> +{ >> + uint16_t rv = s->xadc_dfifo[0]; >> + int i; >> + >> + if (s->xadc_dfifo_entries > 0) { >> + s->xadc_dfifo_entries--; >> + } >> + for (i = 0; i < s->xadc_dfifo_entries; i++) { >> + s->xadc_dfifo[i] = s->xadc_dfifo[i + 1]; >> + } >> + s->xadc_dfifo[s->xadc_dfifo_entries] = 0; >> + zynq_xadc_update_ints(s); >> + return rv; >> +} >> + >> +static void xadc_push_dfifo(ZynqXADCState *s, uint16_t regval) >> +{ >> + if (s->xadc_dfifo_entries < ZYNQ_XADC_FIFO_DEPTH) { >> + s->xadc_dfifo[s->xadc_dfifo_entries++] = s->xadc_read_reg_previous; >> + } >> + s->xadc_read_reg_previous = regval; >> + zynq_xadc_update_ints(s); >> +} >> + >> +static bool zynq_xadc_check_offset(hwaddr offset, bool rnw) >> +{ >> + switch (offset) { >> + case CFG: >> + case INT_MASK: >> + case INT_STS: >> + case MCTL: >> + return true; >> + case RDFIFO: >> + case MSTS: >> + return rnw; /* read only */ >> + case CMDFIFO: >> + return !rnw; /* write only */ >> + default: >> + return false; >> + } >> +} >> + >> +static uint64_t zynq_xadc_read(void *opaque, hwaddr offset, unsigned size) >> +{ >> + ZynqXADCState *s = opaque; >> + int reg = offset / 4; >> + uint32_t rv; >> + >> + if (!zynq_xadc_check_offset(reg, true)) { >> + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Invalid read access to " >> + "addr %" HWADDR_PRIx "\n", offset); >> + return 0; >> + } >> + >> + switch (reg) { >> + case CFG: >> + case INT_MASK: >> + case INT_STS: >> + case MCTL: >> + rv = s->regs[reg]; >> + break; >> + case MSTS: >> + rv = MSTS_CFIFOE; >> + rv |= s->xadc_dfifo_entries << MSTS_DFIFO_LVL_SHIFT; >> + if (!s->xadc_dfifo_entries) { >> + rv |= MSTS_DFIFOE; >> + } else if (s->xadc_dfifo_entries == ZYNQ_XADC_FIFO_DEPTH) { >> + rv |= MSTS_DFIFOF; >> + } >> + break; >> + case RDFIFO: >> + rv = xadc_pop_dfifo(s); >> + break; >> + } >> + return rv; >> +} >> + >> +static void zynq_xadc_write(void *opaque, hwaddr offset, uint64_t val, >> + unsigned size) >> +{ >> + ZynqXADCState *s = (ZynqXADCState *)opaque; >> + int reg = offset / 4; >> + int xadc_reg; >> + int xadc_cmd; >> + int xadc_data; >> + >> + if (!zynq_xadc_check_offset(reg, false)) { >> + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Invalid write access " >> + "to addr %" HWADDR_PRIx "\n", offset); >> + return; >> + } >> + >> + switch (reg) { >> + case CFG: >> + s->regs[CFG] = val; >> + break; >> + case INT_STS: >> + s->regs[INT_STS] &= ~val; >> + break; >> + case INT_MASK: >> + s->regs[INT_MASK] = val & INT_ALL; >> + break; >> + case CMDFIFO: >> + xadc_cmd = extract32(val, 26, 4); >> + xadc_reg = extract32(val, 16, 10); >> + xadc_data = extract32(val, 0, 16); >> + >> + if (s->regs[MCTL] & MCTL_RESET) { >> + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Sending command " >> + "while comm channel held in reset: %" PRIx32 "\n", >> + (uint32_t) val); >> + break; >> + } >> + >> + if (xadc_reg > ZYNQ_XADC_NUM_ADC_REGS && xadc_cmd != CMD_NOP) { > > I think this > should be >= or you get an off-by-one. > Doh! Ill send the fixup next day or so. Regards, Peter > Paolo > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PULL 2/2] hw/misc: Add support for ADC controller in Xilinx Zynq 7000 2015-11-13 17:54 ` Peter Crosthwaite @ 2016-01-08 9:37 ` Paolo Bonzini 0 siblings, 0 replies; 7+ messages in thread From: Paolo Bonzini @ 2016-01-08 9:37 UTC (permalink / raw) To: Peter Crosthwaite Cc: Peter Maydell, qemu-devel@nongnu.org Developers, Guenter Roeck, Alistair Francis On 13/11/2015 18:54, Peter Crosthwaite wrote: > On Fri, Nov 13, 2015 at 9:08 AM, Paolo Bonzini <pbonzini@redhat.com> wrote: >> >> >> On 12/11/2015 16:23, Peter Maydell wrote: >>> From: Guenter Roeck <linux@roeck-us.net> >>> >>> Add support for the Xilinx XADC core used in Zynq 7000. >>> >>> References: >>> - Zynq-7000 All Programmable SoC Technical Reference Manual >>> - 7 Series FPGAs and Zynq-7000 All Programmable SoC XADC >>> Dual 12-Bit 1 MSPS Analog-to-Digital Converter >>> >>> Tested with Linux using QEMU machine xilinx-zynq-a9 with devicetree >>> files zynq-zc702.dtb and zynq-zc706.dtb, and kernel configuration >>> multi_v7_defconfig. >>> >>> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> >>> Signed-off-by: Guenter Roeck <linux@roeck-us.net> >>> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> >>> Message-id: 57f84029331603f30f01511915e6b202e8424e7c.1447004487.git.crosthwaite.peter@gmail.com >>> [ PC changes: >>> * Changed macro names to match TRM where possible >>> * Made programmers model macro scheme consistent >>> * Dropped XADC_ZYNQ_ prefix on local macros >>> * Fix ALM field width >>> * Update threshold-comparison interrupts in _update_ints() >>> * factored out DFIFO pushes into helper. Renamed to "push/pop" >>> * Changed xadc_reg to 10 bits and added OOB check. >>> * Reduced scope of MCTL reset to just stop channel coms. >>> * Added dummy read data to write commands >>> * Changed _ to - seperators in string names and filenames >>> * Dropped ------------ in header comment >>> * Catchall'ed _update_ints() in _write handler. >>> * Minor whitespace changes. >>> * Use ZYNQ_XADC_FIFO_DEPTH instead of ARRAY_SIZE() >>> ] >>> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> >>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> >>> --- >>> hw/arm/xilinx_zynq.c | 6 + >>> hw/misc/Makefile.objs | 1 + >>> hw/misc/zynq-xadc.c | 302 ++++++++++++++++++++++++++++++++++++++++++++ >>> include/hw/misc/zynq-xadc.h | 46 +++++++ >>> 4 files changed, 355 insertions(+) >>> create mode 100644 hw/misc/zynq-xadc.c >>> create mode 100644 include/hw/misc/zynq-xadc.h >>> >>> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c >>> index 82a9db8..1c1a445 100644 >>> --- a/hw/arm/xilinx_zynq.c >>> +++ b/hw/arm/xilinx_zynq.c >>> @@ -24,6 +24,7 @@ >>> #include "hw/block/flash.h" >>> #include "sysemu/block-backend.h" >>> #include "hw/loader.h" >>> +#include "hw/misc/zynq-xadc.h" >>> #include "hw/ssi.h" >>> #include "qemu/error-report.h" >>> >>> @@ -264,6 +265,11 @@ static void zynq_init(MachineState *machine) >>> sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0101000); >>> sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[79-IRQ_OFFSET]); >>> >>> + dev = qdev_create(NULL, TYPE_ZYNQ_XADC); >>> + qdev_init_nofail(dev); >>> + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8007100); >>> + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[39-IRQ_OFFSET]); >>> + >>> dev = qdev_create(NULL, "pl330"); >>> qdev_prop_set_uint8(dev, "num_chnls", 8); >>> qdev_prop_set_uint8(dev, "num_periph_req", 4); >>> diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs >>> index 4aa76ff..aeb6b7d 100644 >>> --- a/hw/misc/Makefile.objs >>> +++ b/hw/misc/Makefile.objs >>> @@ -36,6 +36,7 @@ obj-$(CONFIG_OMAP) += omap_sdrc.o >>> obj-$(CONFIG_OMAP) += omap_tap.o >>> obj-$(CONFIG_SLAVIO) += slavio_misc.o >>> obj-$(CONFIG_ZYNQ) += zynq_slcr.o >>> +obj-$(CONFIG_ZYNQ) += zynq-xadc.o >>> obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o >>> >>> obj-$(CONFIG_PVPANIC) += pvpanic.o >>> diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c >>> new file mode 100644 >>> index 0000000..ae3df5e >>> --- /dev/null >>> +++ b/hw/misc/zynq-xadc.c >>> @@ -0,0 +1,302 @@ >>> +/* >>> + * ADC registers for Xilinx Zynq Platform >>> + * >>> + * Copyright (c) 2015 Guenter Roeck >>> + * Based on hw/misc/zynq_slcr.c, written by Michal Simek >>> + * >>> + * 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. >>> + * >>> + * You should have received a copy of the GNU General Public License along >>> + * with this program; if not, see <http://www.gnu.org/licenses/>. >>> + */ >>> + >>> +#include "hw/hw.h" >>> +#include "hw/misc/zynq-xadc.h" >>> +#include "qemu/timer.h" >>> +#include "sysemu/sysemu.h" >>> + >>> +enum { >>> + CFG = 0x000 / 4, >>> + INT_STS, >>> + INT_MASK, >>> + MSTS, >>> + CMDFIFO, >>> + RDFIFO, >>> + MCTL, >>> +}; >>> + >>> +#define CFG_ENABLE BIT(31) >>> +#define CFG_CFIFOTH_SHIFT 20 >>> +#define CFG_CFIFOTH_LENGTH 4 >>> +#define CFG_DFIFOTH_SHIFT 16 >>> +#define CFG_DFIFOTH_LENGTH 4 >>> +#define CFG_WEDGE BIT(13) >>> +#define CFG_REDGE BIT(12) >>> +#define CFG_TCKRATE_SHIFT 8 >>> +#define CFG_TCKRATE_LENGTH 2 >>> + >>> +#define CFG_TCKRATE_DIV(x) (0x1 << (x - 1)) >>> + >>> +#define CFG_IGAP_SHIFT 0 >>> +#define CFG_IGAP_LENGTH 5 >>> + >>> +#define INT_CFIFO_LTH BIT(9) >>> +#define INT_DFIFO_GTH BIT(8) >>> +#define INT_OT BIT(7) >>> +#define INT_ALM_SHIFT 0 >>> +#define INT_ALM_LENGTH 7 >>> +#define INT_ALM_MASK (((1 << INT_ALM_LENGTH) - 1) << INT_ALM_SHIFT) >>> + >>> +#define INT_ALL (INT_CFIFO_LTH | INT_DFIFO_GTH | INT_OT | INT_ALM_MASK) >>> + >>> +#define MSTS_CFIFO_LVL_SHIFT 16 >>> +#define MSTS_CFIFO_LVL_LENGTH 4 >>> +#define MSTS_DFIFO_LVL_SHIFT 12 >>> +#define MSTS_DFIFO_LVL_LENGTH 4 >>> +#define MSTS_CFIFOF BIT(11) >>> +#define MSTS_CFIFOE BIT(10) >>> +#define MSTS_DFIFOF BIT(9) >>> +#define MSTS_DFIFOE BIT(8) >>> +#define MSTS_OT BIT(7) >>> +#define MSTS_ALM_SHIFT 0 >>> +#define MSTS_ALM_LENGTH 7 >>> + >>> +#define MCTL_RESET BIT(4) >>> + >>> +#define CMD_NOP 0x00 >>> +#define CMD_READ 0x01 >>> +#define CMD_WRITE 0x02 >>> + >>> +static void zynq_xadc_update_ints(ZynqXADCState *s) >>> +{ >>> + >>> + /* We are fast, commands are actioned instantly so the CFIFO is always >>> + * empty (and below threshold). >>> + */ >>> + s->regs[INT_STS] |= INT_CFIFO_LTH; >>> + >>> + if (s->xadc_dfifo_entries > >>> + extract32(s->regs[CFG], CFG_DFIFOTH_SHIFT, CFG_DFIFOTH_LENGTH)) { >>> + s->regs[INT_STS] |= INT_DFIFO_GTH; >>> + } >>> + >>> + qemu_set_irq(s->qemu_irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK])); >>> +} >>> + >>> +static void zynq_xadc_reset(DeviceState *d) >>> +{ >>> + ZynqXADCState *s = ZYNQ_XADC(d); >>> + >>> + s->regs[CFG] = 0x14 << CFG_IGAP_SHIFT | >>> + CFG_TCKRATE_DIV(4) << CFG_TCKRATE_SHIFT | CFG_REDGE; >>> + s->regs[INT_STS] = INT_CFIFO_LTH; >>> + s->regs[INT_MASK] = 0xffffffff; >>> + s->regs[CMDFIFO] = 0; >>> + s->regs[RDFIFO] = 0; >>> + s->regs[MCTL] = MCTL_RESET; >>> + >>> + memset(s->xadc_regs, 0, sizeof(s->xadc_regs)); >>> + memset(s->xadc_dfifo, 0, sizeof(s->xadc_dfifo)); >>> + s->xadc_dfifo_entries = 0; >>> + >>> + zynq_xadc_update_ints(s); >>> +} >>> + >>> +static uint16_t xadc_pop_dfifo(ZynqXADCState *s) >>> +{ >>> + uint16_t rv = s->xadc_dfifo[0]; >>> + int i; >>> + >>> + if (s->xadc_dfifo_entries > 0) { >>> + s->xadc_dfifo_entries--; >>> + } >>> + for (i = 0; i < s->xadc_dfifo_entries; i++) { >>> + s->xadc_dfifo[i] = s->xadc_dfifo[i + 1]; >>> + } >>> + s->xadc_dfifo[s->xadc_dfifo_entries] = 0; >>> + zynq_xadc_update_ints(s); >>> + return rv; >>> +} >>> + >>> +static void xadc_push_dfifo(ZynqXADCState *s, uint16_t regval) >>> +{ >>> + if (s->xadc_dfifo_entries < ZYNQ_XADC_FIFO_DEPTH) { >>> + s->xadc_dfifo[s->xadc_dfifo_entries++] = s->xadc_read_reg_previous; >>> + } >>> + s->xadc_read_reg_previous = regval; >>> + zynq_xadc_update_ints(s); >>> +} >>> + >>> +static bool zynq_xadc_check_offset(hwaddr offset, bool rnw) >>> +{ >>> + switch (offset) { >>> + case CFG: >>> + case INT_MASK: >>> + case INT_STS: >>> + case MCTL: >>> + return true; >>> + case RDFIFO: >>> + case MSTS: >>> + return rnw; /* read only */ >>> + case CMDFIFO: >>> + return !rnw; /* write only */ >>> + default: >>> + return false; >>> + } >>> +} >>> + >>> +static uint64_t zynq_xadc_read(void *opaque, hwaddr offset, unsigned size) >>> +{ >>> + ZynqXADCState *s = opaque; >>> + int reg = offset / 4; >>> + uint32_t rv; >>> + >>> + if (!zynq_xadc_check_offset(reg, true)) { >>> + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Invalid read access to " >>> + "addr %" HWADDR_PRIx "\n", offset); >>> + return 0; >>> + } >>> + >>> + switch (reg) { >>> + case CFG: >>> + case INT_MASK: >>> + case INT_STS: >>> + case MCTL: >>> + rv = s->regs[reg]; >>> + break; >>> + case MSTS: >>> + rv = MSTS_CFIFOE; >>> + rv |= s->xadc_dfifo_entries << MSTS_DFIFO_LVL_SHIFT; >>> + if (!s->xadc_dfifo_entries) { >>> + rv |= MSTS_DFIFOE; >>> + } else if (s->xadc_dfifo_entries == ZYNQ_XADC_FIFO_DEPTH) { >>> + rv |= MSTS_DFIFOF; >>> + } >>> + break; >>> + case RDFIFO: >>> + rv = xadc_pop_dfifo(s); >>> + break; >>> + } >>> + return rv; >>> +} >>> + >>> +static void zynq_xadc_write(void *opaque, hwaddr offset, uint64_t val, >>> + unsigned size) >>> +{ >>> + ZynqXADCState *s = (ZynqXADCState *)opaque; >>> + int reg = offset / 4; >>> + int xadc_reg; >>> + int xadc_cmd; >>> + int xadc_data; >>> + >>> + if (!zynq_xadc_check_offset(reg, false)) { >>> + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Invalid write access " >>> + "to addr %" HWADDR_PRIx "\n", offset); >>> + return; >>> + } >>> + >>> + switch (reg) { >>> + case CFG: >>> + s->regs[CFG] = val; >>> + break; >>> + case INT_STS: >>> + s->regs[INT_STS] &= ~val; >>> + break; >>> + case INT_MASK: >>> + s->regs[INT_MASK] = val & INT_ALL; >>> + break; >>> + case CMDFIFO: >>> + xadc_cmd = extract32(val, 26, 4); >>> + xadc_reg = extract32(val, 16, 10); >>> + xadc_data = extract32(val, 0, 16); >>> + >>> + if (s->regs[MCTL] & MCTL_RESET) { >>> + qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Sending command " >>> + "while comm channel held in reset: %" PRIx32 "\n", >>> + (uint32_t) val); >>> + break; >>> + } >>> + >>> + if (xadc_reg > ZYNQ_XADC_NUM_ADC_REGS && xadc_cmd != CMD_NOP) { >> >> I think this > should be >= or you get an off-by-one. >> > > Doh! > > Ill send the fixup next day or so. Ping. :) Paolo ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] target-arm queue 2015-11-12 15:23 [Qemu-devel] [PULL 0/2] target-arm queue Peter Maydell 2015-11-12 15:23 ` [Qemu-devel] [PULL 1/2] target-arm: Update PC before calling gen_helper_check_breakpoints() Peter Maydell 2015-11-12 15:23 ` [Qemu-devel] [PULL 2/2] hw/misc: Add support for ADC controller in Xilinx Zynq 7000 Peter Maydell @ 2015-11-12 16:52 ` Peter Maydell 2 siblings, 0 replies; 7+ messages in thread From: Peter Maydell @ 2015-11-12 16:52 UTC (permalink / raw) To: QEMU Developers On 12 November 2015 at 15:23, Peter Maydell <peter.maydell@linaro.org> wrote: > Last two things to sneak in before rc0. > > thanks > -- PMM > > The following changes since commit 17e50a72a3aade0eddfebc012a5d7bdd40a03573: > > Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2015-11-12 14:15:32 +0000) > > are available in the git repository at: > > > git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20151112 > > for you to fetch changes up to a7df81a503ce0dd38fe400c9a37fe95ee07b51f0: > > hw/misc: Add support for ADC controller in Xilinx Zynq 7000 (2015-11-12 15:10:43 +0000) > > ---------------------------------------------------------------- > target-arm queue: > * add ADC controller to zynq board > * update PC before calling gen_helper_check_breakpoints() > > ---------------------------------------------------------------- > Guenter Roeck (1): > hw/misc: Add support for ADC controller in Xilinx Zynq 7000 > > Sergey Fedorov (1): > target-arm: Update PC before calling gen_helper_check_breakpoints() The ADC patch had compile failures due to not having a 'default' case in its register-read function which meant it was provoking warnings about value-maybe-used-uninitialized. So I dropped that one and just cherry-picked the BP fix patch. thanks -- PMM ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-01-08 9:37 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-11-12 15:23 [Qemu-devel] [PULL 0/2] target-arm queue Peter Maydell 2015-11-12 15:23 ` [Qemu-devel] [PULL 1/2] target-arm: Update PC before calling gen_helper_check_breakpoints() Peter Maydell 2015-11-12 15:23 ` [Qemu-devel] [PULL 2/2] hw/misc: Add support for ADC controller in Xilinx Zynq 7000 Peter Maydell 2015-11-13 17:08 ` Paolo Bonzini 2015-11-13 17:54 ` Peter Crosthwaite 2016-01-08 9:37 ` Paolo Bonzini 2015-11-12 16:52 ` [Qemu-devel] [PULL 0/2] target-arm queue Peter Maydell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).