* [PATCH 1/3] hw/avr: Add limited support for avr gpio registers
@ 2021-03-02 17:29 G S Niteesh Babu
2021-03-02 17:29 ` [PATCH 2/3] avr/arduino: Add D13 LED G S Niteesh Babu
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: G S Niteesh Babu @ 2021-03-02 17:29 UTC (permalink / raw)
To: qemu-devel; +Cc: f4bug, heecheol.yang
From: Heecheol Yang <heecheol.yang@outlook.com>
Add some of these features for AVR GPIO:
- GPIO I/O : PORTx registers
- Data Direction : DDRx registers
- DDRx toggling : PINx registers
Following things are not supported yet:
- MCUR registers
Signed-off-by: Heecheol Yang <heecheol.yang@outlook.com>
---
hw/avr/Kconfig | 1 +
hw/avr/atmega.c | 7 +-
hw/avr/atmega.h | 2 +
hw/gpio/Kconfig | 3 +
hw/gpio/avr_gpio.c | 139 +++++++++++++++++++++++++++++++++++++
hw/gpio/meson.build | 1 +
include/hw/gpio/avr_gpio.h | 53 ++++++++++++++
7 files changed, 204 insertions(+), 2 deletions(-)
create mode 100644 hw/gpio/avr_gpio.c
create mode 100644 include/hw/gpio/avr_gpio.h
diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig
index d31298c3cc..16a57ced11 100644
--- a/hw/avr/Kconfig
+++ b/hw/avr/Kconfig
@@ -3,6 +3,7 @@ config AVR_ATMEGA_MCU
select AVR_TIMER16
select AVR_USART
select AVR_POWER
+ select AVR_GPIO
config ARDUINO
select AVR_ATMEGA_MCU
diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c
index 44c6afebbb..ad942028fd 100644
--- a/hw/avr/atmega.c
+++ b/hw/avr/atmega.c
@@ -283,8 +283,11 @@ static void atmega_realize(DeviceState *dev, Error **errp)
continue;
}
devname = g_strdup_printf("atmega-gpio-%c", 'a' + (char)i);
- create_unimplemented_device(devname,
- OFFSET_DATA + mc->dev[idx].addr, 3);
+ object_initialize_child(OBJECT(dev), devname, &s->gpio[i],
+ TYPE_AVR_GPIO);
+ sysbus_realize(SYS_BUS_DEVICE(&s->gpio[i]), &error_abort);
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio[i]), 0,
+ OFFSET_DATA + mc->dev[idx].addr);
g_free(devname);
}
diff --git a/hw/avr/atmega.h b/hw/avr/atmega.h
index a99ee15c7e..e2289d5744 100644
--- a/hw/avr/atmega.h
+++ b/hw/avr/atmega.h
@@ -13,6 +13,7 @@
#include "hw/char/avr_usart.h"
#include "hw/timer/avr_timer16.h"
+#include "hw/gpio/avr_gpio.h"
#include "hw/misc/avr_power.h"
#include "target/avr/cpu.h"
#include "qom/object.h"
@@ -44,6 +45,7 @@ struct AtmegaMcuState {
DeviceState *io;
AVRMaskState pwr[POWER_MAX];
AVRUsartState usart[USART_MAX];
+ AVRGPIOState gpio[GPIO_MAX];
AVRTimer16State timer[TIMER_MAX];
uint64_t xtal_freq_hz;
};
diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig
index f0e7405f6e..fde7019b2b 100644
--- a/hw/gpio/Kconfig
+++ b/hw/gpio/Kconfig
@@ -13,3 +13,6 @@ config GPIO_PWR
config SIFIVE_GPIO
bool
+
+config AVR_GPIO
+ bool
diff --git a/hw/gpio/avr_gpio.c b/hw/gpio/avr_gpio.c
new file mode 100644
index 0000000000..7984843841
--- /dev/null
+++ b/hw/gpio/avr_gpio.c
@@ -0,0 +1,139 @@
+/*
+ * AVR processors GPIO registers emulation.
+ *
+ * Copyright (C) 2020 Heecheol Yang <heecheol.yang@outlook.com>
+ *
+ * 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 or
+ * (at your option) version 3 of the License.
+ *
+ * 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.
+ *
+ * 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 "qemu/osdep.h"
+#include "qemu/log.h"
+#include "qemu/module.h"
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/sysbus.h"
+#include "hw/irq.h"
+#include "hw/gpio/avr_gpio.h"
+#include "hw/qdev-properties.h"
+
+static void avr_gpio_reset(DeviceState *dev)
+{
+ AVRGPIOState *gpio = AVR_GPIO(dev);
+ gpio->reg.pin = 0u;
+ gpio->reg.ddr = 0u;
+ gpio->reg.port = 0u;
+}
+
+static void avr_gpio_write_port(AVRGPIOState *s, uint64_t value)
+{
+ uint8_t pin;
+ uint8_t org_val = value;
+ uint8_t cur_port_val = s->reg.port;
+ uint8_t cur_ddr_val = s->reg.ddr;
+
+ for (pin = 0u; pin < 8u ; pin++) {
+ uint8_t cur_port_pin_val = cur_port_val & 0x01u;
+ uint8_t cur_ddr_pin_val = cur_ddr_val & 0x01u;
+ uint8_t new_port_pin_val = value & 0x01u;
+
+ if (cur_ddr_pin_val && (cur_port_pin_val != new_port_pin_val)) {
+ qemu_set_irq(s->out[pin], new_port_pin_val);
+ }
+ cur_port_val >>= 1u;
+ cur_ddr_val >>= 1u;
+ value >>= 1u;
+ }
+ s->reg.port = org_val & s->reg.ddr;
+}
+static uint64_t avr_gpio_read(void *opaque, hwaddr offset, unsigned int size)
+{
+ AVRGPIOState *s = (AVRGPIOState *)opaque;
+ switch (offset) {
+ case GPIO_PIN:
+ return s->reg.pin;
+ case GPIO_DDR:
+ return s->reg.ddr;
+ case GPIO_PORT:
+ return s->reg.port;
+ default:
+ g_assert_not_reached();
+ break;
+ }
+ return 0;
+}
+
+static void avr_gpio_write(void *opaque, hwaddr offset, uint64_t value,
+ unsigned int size)
+{
+ AVRGPIOState *s = (AVRGPIOState *)opaque;
+ value = value & 0xFF;
+
+ trace_avr_gpio_write(offset, value);
+ switch (offset) {
+ case GPIO_PIN:
+ s->reg.pin = value;
+ s->reg.port ^= s->reg.pin;
+ break;
+ case GPIO_DDR:
+ s->reg.ddr = value;
+ break;
+ case GPIO_PORT:
+ avr_gpio_write_port(s, value);
+ break;
+ default:
+ g_assert_not_reached();
+ break;
+ }
+}
+
+static const MemoryRegionOps avr_gpio_ops = {
+ .read = avr_gpio_read,
+ .write = avr_gpio_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+static void avr_gpio_init(Object *obj)
+{
+ AVRGPIOState *s = AVR_GPIO(obj);
+ qdev_init_gpio_out(DEVICE(obj), s->out, ARRAY_SIZE(s->out));
+ memory_region_init_io(&s->mmio, obj, &avr_gpio_ops, s, TYPE_AVR_GPIO, 3);
+ sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
+}
+static void avr_gpio_realize(DeviceState *dev, Error **errp)
+{
+ /* Do nothing currently */
+}
+
+
+static void avr_gpio_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->reset = avr_gpio_reset;
+ dc->realize = avr_gpio_realize;
+}
+
+static const TypeInfo avr_gpio_info = {
+ .name = TYPE_AVR_GPIO,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(AVRGPIOState),
+ .instance_init = avr_gpio_init,
+ .class_init = avr_gpio_class_init,
+};
+
+static void avr_gpio_register_types(void)
+{
+ type_register_static(&avr_gpio_info);
+}
+
+type_init(avr_gpio_register_types)
diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build
index 79568f00ce..366aca52ca 100644
--- a/hw/gpio/meson.build
+++ b/hw/gpio/meson.build
@@ -13,3 +13,4 @@ softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c'))
softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c'))
softmmu_ss.add(when: 'CONFIG_SIFIVE_GPIO', if_true: files('sifive_gpio.c'))
+softmmu_ss.add(when: 'CONFIG_AVR_GPIO', if_true: files('avr_gpio.c'))
diff --git a/include/hw/gpio/avr_gpio.h b/include/hw/gpio/avr_gpio.h
new file mode 100644
index 0000000000..498a7275f0
--- /dev/null
+++ b/include/hw/gpio/avr_gpio.h
@@ -0,0 +1,53 @@
+/*
+ * AVR processors GPIO registers definition.
+ *
+ * Copyright (C) 2020 Heecheol Yang <heecheol.yang@outlook.com>
+ *
+ * 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 or
+ * (at your option) version 3 of the License.
+ *
+ * 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.
+ *
+ * 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 AVR_GPIO_H
+#define AVR_GPIO_H
+
+#include "hw/sysbus.h"
+#include "qom/object.h"
+
+/* Offsets of registers. */
+#define GPIO_PIN 0x00
+#define GPIO_DDR 0x01
+#define GPIO_PORT 0x02
+
+#define TYPE_AVR_GPIO "avr-gpio"
+OBJECT_DECLARE_SIMPLE_TYPE(AVRGPIOState, AVR_GPIO)
+#define AVR_GPIO_COUNT 8
+
+struct AVRGPIOState {
+ /*< private >*/
+ SysBusDevice parent_obj;
+
+ /*< public >*/
+ MemoryRegion mmio;
+
+ struct {
+ uint8_t pin;
+ uint8_t ddr;
+ uint8_t port;
+ } reg;
+
+ /* PORTx data changed IRQs */
+ qemu_irq out[8u];
+
+};
+
+#endif /* AVR_GPIO_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] avr/arduino: Add D13 LED
2021-03-02 17:29 [PATCH 1/3] hw/avr: Add limited support for avr gpio registers G S Niteesh Babu
@ 2021-03-02 17:29 ` G S Niteesh Babu
2021-03-02 17:29 ` [PATCH 3/3] hw/gpio/avr_gpio.c: add tracing for read and writes G S Niteesh Babu
2021-03-09 13:15 ` [PATCH 1/3] hw/avr: Add limited support for avr gpio registers Niteesh G. S.
2 siblings, 0 replies; 5+ messages in thread
From: G S Niteesh Babu @ 2021-03-02 17:29 UTC (permalink / raw)
To: qemu-devel; +Cc: G S Niteesh Babu, f4bug, heecheol.yang
Signed-off-by: G S Niteesh Babu <niteesh.gs@gmail.com>
---
hw/avr/Kconfig | 1 +
hw/avr/arduino.c | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig
index 16a57ced11..e0d4fc5537 100644
--- a/hw/avr/Kconfig
+++ b/hw/avr/Kconfig
@@ -8,3 +8,4 @@ config AVR_ATMEGA_MCU
config ARDUINO
select AVR_ATMEGA_MCU
select UNIMP
+ select LED
diff --git a/hw/avr/arduino.c b/hw/avr/arduino.c
index 3c8388490d..5cdba3201c 100644
--- a/hw/avr/arduino.c
+++ b/hw/avr/arduino.c
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/boards.h"
+#include "hw/misc/led.h"
#include "atmega.h"
#include "boot.h"
#include "qom/object.h"
@@ -22,6 +23,8 @@ struct ArduinoMachineState {
MachineState parent_obj;
/*< public >*/
AtmegaMcuState mcu;
+
+ LEDState *onboard_led;
};
typedef struct ArduinoMachineState ArduinoMachineState;
@@ -49,6 +52,18 @@ static void arduino_machine_init(MachineState *machine)
amc->xtal_hz, &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&ams->mcu), &error_abort);
+ ams->onboard_led = led_create_simple(OBJECT(ams),
+ GPIO_POLARITY_ACTIVE_HIGH,
+ LED_COLOR_BLUE,
+ "D13 LED");
+
+ /* TODO: Add macro or function to map pins to ports */
+ /* The onboard led is connected to PIN 13 in all boards currently supported
+ * in QEMU. And PIN 13 is mapped to PORT B BIT 5.
+ */
+ qdev_connect_gpio_out(DEVICE(&ams->mcu.gpio[1]), 5,
+ qdev_get_gpio_in(DEVICE(ams->onboard_led), 0));
+
if (machine->firmware) {
if (!avr_load_firmware(&ams->mcu.cpu, machine,
&ams->mcu.flash, machine->firmware)) {
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] hw/gpio/avr_gpio.c: add tracing for read and writes
2021-03-02 17:29 [PATCH 1/3] hw/avr: Add limited support for avr gpio registers G S Niteesh Babu
2021-03-02 17:29 ` [PATCH 2/3] avr/arduino: Add D13 LED G S Niteesh Babu
@ 2021-03-02 17:29 ` G S Niteesh Babu
2021-03-09 13:15 ` [PATCH 1/3] hw/avr: Add limited support for avr gpio registers Niteesh G. S.
2 siblings, 0 replies; 5+ messages in thread
From: G S Niteesh Babu @ 2021-03-02 17:29 UTC (permalink / raw)
To: qemu-devel; +Cc: G S Niteesh Babu, f4bug, heecheol.yang
Added tracing for gpio read, write, and update output irq.
1) trace_avr_gpio_update_ouput_irq
2) trace_avr_gpio_read
3) trace_avr_gpio_write
Signed-off-by: G S Niteesh Babu <niteesh.gs@gmail.com>
---
hw/gpio/avr_gpio.c | 16 ++++++++++++----
hw/gpio/trace-events | 6 ++++++
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/hw/gpio/avr_gpio.c b/hw/gpio/avr_gpio.c
index 7984843841..5c0d6aa922 100644
--- a/hw/gpio/avr_gpio.c
+++ b/hw/gpio/avr_gpio.c
@@ -25,6 +25,7 @@
#include "hw/irq.h"
#include "hw/gpio/avr_gpio.h"
#include "hw/qdev-properties.h"
+#include "trace.h"
static void avr_gpio_reset(DeviceState *dev)
{
@@ -48,6 +49,7 @@ static void avr_gpio_write_port(AVRGPIOState *s, uint64_t value)
if (cur_ddr_pin_val && (cur_port_pin_val != new_port_pin_val)) {
qemu_set_irq(s->out[pin], new_port_pin_val);
+ trace_avr_gpio_update_output_irq(pin, new_port_pin_val);
}
cur_port_val >>= 1u;
cur_ddr_val >>= 1u;
@@ -57,19 +59,25 @@ static void avr_gpio_write_port(AVRGPIOState *s, uint64_t value)
}
static uint64_t avr_gpio_read(void *opaque, hwaddr offset, unsigned int size)
{
+ uint8_t val = 0;
AVRGPIOState *s = (AVRGPIOState *)opaque;
switch (offset) {
case GPIO_PIN:
- return s->reg.pin;
+ val = s->reg.pin;
+ break;
case GPIO_DDR:
- return s->reg.ddr;
+ val = s->reg.ddr;
+ break;
case GPIO_PORT:
- return s->reg.port;
+ val = s->reg.port;
+ break;
default:
g_assert_not_reached();
break;
}
- return 0;
+
+ trace_avr_gpio_read(offset, val);
+ return val;
}
static void avr_gpio_write(void *opaque, hwaddr offset, uint64_t value,
diff --git a/hw/gpio/trace-events b/hw/gpio/trace-events
index 46ab9323bd..a054def07c 100644
--- a/hw/gpio/trace-events
+++ b/hw/gpio/trace-events
@@ -18,3 +18,9 @@ sifive_gpio_read(uint64_t offset, uint64_t r) "offset 0x%" PRIx64 " value 0x%" P
sifive_gpio_write(uint64_t offset, uint64_t value) "offset 0x%" PRIx64 " value 0x%" PRIx64
sifive_gpio_set(int64_t line, int64_t value) "line %" PRIi64 " value %" PRIi64
sifive_gpio_update_output_irq(int64_t line, int64_t value) "line %" PRIi64 " value %" PRIi64
+
+# avr_gpio.c
+avr_gpio_read(uint64_t offset, uint64_t r) "offset 0x%" PRIx64 " value 0x%" PRIx64
+avr_gpio_write(uint64_t offset, uint64_t value) "offset 0x%" PRIx64 " value 0x%" PRIx64
+avr_gpio_set(int64_t line, int64_t value) "line %" PRIi64 " value %" PRIi64
+avr_gpio_update_output_irq(int64_t line, int64_t value) "pin %" PRIi64 " value %" PRIi64
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] hw/avr: Add limited support for avr gpio registers
2021-03-02 17:29 [PATCH 1/3] hw/avr: Add limited support for avr gpio registers G S Niteesh Babu
2021-03-02 17:29 ` [PATCH 2/3] avr/arduino: Add D13 LED G S Niteesh Babu
2021-03-02 17:29 ` [PATCH 3/3] hw/gpio/avr_gpio.c: add tracing for read and writes G S Niteesh Babu
@ 2021-03-09 13:15 ` Niteesh G. S.
2 siblings, 0 replies; 5+ messages in thread
From: Niteesh G. S. @ 2021-03-09 13:15 UTC (permalink / raw)
To: qemu-devel; +Cc: philmd, f4bug, heecheol.yang
[-- Attachment #1: Type: text/plain, Size: 9600 bytes --]
Hello,
Ping.
It has been 7days since the patch has been posted.
Please review.
Thanks,
Niteesh
On Tue, Mar 2, 2021 at 10:59 PM G S Niteesh Babu <niteesh.gs@gmail.com>
wrote:
> From: Heecheol Yang <heecheol.yang@outlook.com>
>
> Add some of these features for AVR GPIO:
>
> - GPIO I/O : PORTx registers
> - Data Direction : DDRx registers
> - DDRx toggling : PINx registers
>
> Following things are not supported yet:
> - MCUR registers
>
> Signed-off-by: Heecheol Yang <heecheol.yang@outlook.com>
> ---
> hw/avr/Kconfig | 1 +
> hw/avr/atmega.c | 7 +-
> hw/avr/atmega.h | 2 +
> hw/gpio/Kconfig | 3 +
> hw/gpio/avr_gpio.c | 139 +++++++++++++++++++++++++++++++++++++
> hw/gpio/meson.build | 1 +
> include/hw/gpio/avr_gpio.h | 53 ++++++++++++++
> 7 files changed, 204 insertions(+), 2 deletions(-)
> create mode 100644 hw/gpio/avr_gpio.c
> create mode 100644 include/hw/gpio/avr_gpio.h
>
> diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig
> index d31298c3cc..16a57ced11 100644
> --- a/hw/avr/Kconfig
> +++ b/hw/avr/Kconfig
> @@ -3,6 +3,7 @@ config AVR_ATMEGA_MCU
> select AVR_TIMER16
> select AVR_USART
> select AVR_POWER
> + select AVR_GPIO
>
> config ARDUINO
> select AVR_ATMEGA_MCU
> diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c
> index 44c6afebbb..ad942028fd 100644
> --- a/hw/avr/atmega.c
> +++ b/hw/avr/atmega.c
> @@ -283,8 +283,11 @@ static void atmega_realize(DeviceState *dev, Error
> **errp)
> continue;
> }
> devname = g_strdup_printf("atmega-gpio-%c", 'a' + (char)i);
> - create_unimplemented_device(devname,
> - OFFSET_DATA + mc->dev[idx].addr, 3);
> + object_initialize_child(OBJECT(dev), devname, &s->gpio[i],
> + TYPE_AVR_GPIO);
> + sysbus_realize(SYS_BUS_DEVICE(&s->gpio[i]), &error_abort);
> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio[i]), 0,
> + OFFSET_DATA + mc->dev[idx].addr);
> g_free(devname);
> }
>
> diff --git a/hw/avr/atmega.h b/hw/avr/atmega.h
> index a99ee15c7e..e2289d5744 100644
> --- a/hw/avr/atmega.h
> +++ b/hw/avr/atmega.h
> @@ -13,6 +13,7 @@
>
> #include "hw/char/avr_usart.h"
> #include "hw/timer/avr_timer16.h"
> +#include "hw/gpio/avr_gpio.h"
> #include "hw/misc/avr_power.h"
> #include "target/avr/cpu.h"
> #include "qom/object.h"
> @@ -44,6 +45,7 @@ struct AtmegaMcuState {
> DeviceState *io;
> AVRMaskState pwr[POWER_MAX];
> AVRUsartState usart[USART_MAX];
> + AVRGPIOState gpio[GPIO_MAX];
> AVRTimer16State timer[TIMER_MAX];
> uint64_t xtal_freq_hz;
> };
> diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig
> index f0e7405f6e..fde7019b2b 100644
> --- a/hw/gpio/Kconfig
> +++ b/hw/gpio/Kconfig
> @@ -13,3 +13,6 @@ config GPIO_PWR
>
> config SIFIVE_GPIO
> bool
> +
> +config AVR_GPIO
> + bool
> diff --git a/hw/gpio/avr_gpio.c b/hw/gpio/avr_gpio.c
> new file mode 100644
> index 0000000000..7984843841
> --- /dev/null
> +++ b/hw/gpio/avr_gpio.c
> @@ -0,0 +1,139 @@
> +/*
> + * AVR processors GPIO registers emulation.
> + *
> + * Copyright (C) 2020 Heecheol Yang <heecheol.yang@outlook.com>
> + *
> + * 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 or
> + * (at your option) version 3 of the License.
> + *
> + * 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.
> + *
> + * 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 "qemu/osdep.h"
> +#include "qemu/log.h"
> +#include "qemu/module.h"
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "hw/sysbus.h"
> +#include "hw/irq.h"
> +#include "hw/gpio/avr_gpio.h"
> +#include "hw/qdev-properties.h"
> +
> +static void avr_gpio_reset(DeviceState *dev)
> +{
> + AVRGPIOState *gpio = AVR_GPIO(dev);
> + gpio->reg.pin = 0u;
> + gpio->reg.ddr = 0u;
> + gpio->reg.port = 0u;
> +}
> +
> +static void avr_gpio_write_port(AVRGPIOState *s, uint64_t value)
> +{
> + uint8_t pin;
> + uint8_t org_val = value;
> + uint8_t cur_port_val = s->reg.port;
> + uint8_t cur_ddr_val = s->reg.ddr;
> +
> + for (pin = 0u; pin < 8u ; pin++) {
> + uint8_t cur_port_pin_val = cur_port_val & 0x01u;
> + uint8_t cur_ddr_pin_val = cur_ddr_val & 0x01u;
> + uint8_t new_port_pin_val = value & 0x01u;
> +
> + if (cur_ddr_pin_val && (cur_port_pin_val != new_port_pin_val)) {
> + qemu_set_irq(s->out[pin], new_port_pin_val);
> + }
> + cur_port_val >>= 1u;
> + cur_ddr_val >>= 1u;
> + value >>= 1u;
> + }
> + s->reg.port = org_val & s->reg.ddr;
> +}
> +static uint64_t avr_gpio_read(void *opaque, hwaddr offset, unsigned int
> size)
> +{
> + AVRGPIOState *s = (AVRGPIOState *)opaque;
> + switch (offset) {
> + case GPIO_PIN:
> + return s->reg.pin;
> + case GPIO_DDR:
> + return s->reg.ddr;
> + case GPIO_PORT:
> + return s->reg.port;
> + default:
> + g_assert_not_reached();
> + break;
> + }
> + return 0;
> +}
> +
> +static void avr_gpio_write(void *opaque, hwaddr offset, uint64_t value,
> + unsigned int size)
> +{
> + AVRGPIOState *s = (AVRGPIOState *)opaque;
> + value = value & 0xFF;
> +
> + trace_avr_gpio_write(offset, value);
> + switch (offset) {
> + case GPIO_PIN:
> + s->reg.pin = value;
> + s->reg.port ^= s->reg.pin;
> + break;
> + case GPIO_DDR:
> + s->reg.ddr = value;
> + break;
> + case GPIO_PORT:
> + avr_gpio_write_port(s, value);
> + break;
> + default:
> + g_assert_not_reached();
> + break;
> + }
> +}
> +
> +static const MemoryRegionOps avr_gpio_ops = {
> + .read = avr_gpio_read,
> + .write = avr_gpio_write,
> + .endianness = DEVICE_NATIVE_ENDIAN,
> +};
> +
> +static void avr_gpio_init(Object *obj)
> +{
> + AVRGPIOState *s = AVR_GPIO(obj);
> + qdev_init_gpio_out(DEVICE(obj), s->out, ARRAY_SIZE(s->out));
> + memory_region_init_io(&s->mmio, obj, &avr_gpio_ops, s, TYPE_AVR_GPIO,
> 3);
> + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
> +}
> +static void avr_gpio_realize(DeviceState *dev, Error **errp)
> +{
> + /* Do nothing currently */
> +}
> +
> +
> +static void avr_gpio_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> +
> + dc->reset = avr_gpio_reset;
> + dc->realize = avr_gpio_realize;
> +}
> +
> +static const TypeInfo avr_gpio_info = {
> + .name = TYPE_AVR_GPIO,
> + .parent = TYPE_SYS_BUS_DEVICE,
> + .instance_size = sizeof(AVRGPIOState),
> + .instance_init = avr_gpio_init,
> + .class_init = avr_gpio_class_init,
> +};
> +
> +static void avr_gpio_register_types(void)
> +{
> + type_register_static(&avr_gpio_info);
> +}
> +
> +type_init(avr_gpio_register_types)
> diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build
> index 79568f00ce..366aca52ca 100644
> --- a/hw/gpio/meson.build
> +++ b/hw/gpio/meson.build
> @@ -13,3 +13,4 @@ softmmu_ss.add(when: 'CONFIG_OMAP', if_true:
> files('omap_gpio.c'))
> softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
> softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c'))
> softmmu_ss.add(when: 'CONFIG_SIFIVE_GPIO', if_true:
> files('sifive_gpio.c'))
> +softmmu_ss.add(when: 'CONFIG_AVR_GPIO', if_true: files('avr_gpio.c'))
> diff --git a/include/hw/gpio/avr_gpio.h b/include/hw/gpio/avr_gpio.h
> new file mode 100644
> index 0000000000..498a7275f0
> --- /dev/null
> +++ b/include/hw/gpio/avr_gpio.h
> @@ -0,0 +1,53 @@
> +/*
> + * AVR processors GPIO registers definition.
> + *
> + * Copyright (C) 2020 Heecheol Yang <heecheol.yang@outlook.com>
> + *
> + * 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 or
> + * (at your option) version 3 of the License.
> + *
> + * 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.
> + *
> + * 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 AVR_GPIO_H
> +#define AVR_GPIO_H
> +
> +#include "hw/sysbus.h"
> +#include "qom/object.h"
> +
> +/* Offsets of registers. */
> +#define GPIO_PIN 0x00
> +#define GPIO_DDR 0x01
> +#define GPIO_PORT 0x02
> +
> +#define TYPE_AVR_GPIO "avr-gpio"
> +OBJECT_DECLARE_SIMPLE_TYPE(AVRGPIOState, AVR_GPIO)
> +#define AVR_GPIO_COUNT 8
> +
> +struct AVRGPIOState {
> + /*< private >*/
> + SysBusDevice parent_obj;
> +
> + /*< public >*/
> + MemoryRegion mmio;
> +
> + struct {
> + uint8_t pin;
> + uint8_t ddr;
> + uint8_t port;
> + } reg;
> +
> + /* PORTx data changed IRQs */
> + qemu_irq out[8u];
> +
> +};
> +
> +#endif /* AVR_GPIO_H */
> --
> 2.17.1
>
>
[-- Attachment #2: Type: text/html, Size: 12508 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] hw/avr: Add limited support for avr gpio registers
2021-03-11 13:55 [PATCH 0/3] AVR GPIO Emulation and Arduino D13 LED G S Niteesh Babu
@ 2021-03-11 13:55 ` G S Niteesh Babu
0 siblings, 0 replies; 5+ messages in thread
From: G S Niteesh Babu @ 2021-03-11 13:55 UTC (permalink / raw)
To: qemu-devel; +Cc: G S Niteesh Babu, S.E.Harris, mrolnik, f4bug, Heecheol Yang
From: Heecheol Yang <heecheol.yang@outlook.com>
Add some of these features for AVR GPIO:
- GPIO I/O : PORTx registers
- Data Direction : DDRx registers
- DDRx toggling : PINx registers
Following things are not supported yet:
- MCUR registers
Signed-off-by: Heecheol Yang <heecheol.yang@outlook.com>
Signed-off-by: G S Niteesh Babu <niteesh.gs@gmail.com>
Message-id: DM6PR16MB2473D96C4D975DE569A330F2E60C0@DM6PR16MB2473.namprd16.prod.outlook.com
---
hw/avr/Kconfig | 1 +
hw/avr/atmega.c | 7 +-
hw/avr/atmega.h | 2 +
hw/gpio/Kconfig | 3 +
hw/gpio/avr_gpio.c | 140 +++++++++++++++++++++++++++++++++++++
hw/gpio/meson.build | 1 +
include/hw/gpio/avr_gpio.h | 53 ++++++++++++++
7 files changed, 205 insertions(+), 2 deletions(-)
create mode 100644 hw/gpio/avr_gpio.c
create mode 100644 include/hw/gpio/avr_gpio.h
diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig
index d31298c3cc..16a57ced11 100644
--- a/hw/avr/Kconfig
+++ b/hw/avr/Kconfig
@@ -3,6 +3,7 @@ config AVR_ATMEGA_MCU
select AVR_TIMER16
select AVR_USART
select AVR_POWER
+ select AVR_GPIO
config ARDUINO
select AVR_ATMEGA_MCU
diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c
index 44c6afebbb..ad942028fd 100644
--- a/hw/avr/atmega.c
+++ b/hw/avr/atmega.c
@@ -283,8 +283,11 @@ static void atmega_realize(DeviceState *dev, Error **errp)
continue;
}
devname = g_strdup_printf("atmega-gpio-%c", 'a' + (char)i);
- create_unimplemented_device(devname,
- OFFSET_DATA + mc->dev[idx].addr, 3);
+ object_initialize_child(OBJECT(dev), devname, &s->gpio[i],
+ TYPE_AVR_GPIO);
+ sysbus_realize(SYS_BUS_DEVICE(&s->gpio[i]), &error_abort);
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio[i]), 0,
+ OFFSET_DATA + mc->dev[idx].addr);
g_free(devname);
}
diff --git a/hw/avr/atmega.h b/hw/avr/atmega.h
index a99ee15c7e..e2289d5744 100644
--- a/hw/avr/atmega.h
+++ b/hw/avr/atmega.h
@@ -13,6 +13,7 @@
#include "hw/char/avr_usart.h"
#include "hw/timer/avr_timer16.h"
+#include "hw/gpio/avr_gpio.h"
#include "hw/misc/avr_power.h"
#include "target/avr/cpu.h"
#include "qom/object.h"
@@ -44,6 +45,7 @@ struct AtmegaMcuState {
DeviceState *io;
AVRMaskState pwr[POWER_MAX];
AVRUsartState usart[USART_MAX];
+ AVRGPIOState gpio[GPIO_MAX];
AVRTimer16State timer[TIMER_MAX];
uint64_t xtal_freq_hz;
};
diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig
index f0e7405f6e..fde7019b2b 100644
--- a/hw/gpio/Kconfig
+++ b/hw/gpio/Kconfig
@@ -13,3 +13,6 @@ config GPIO_PWR
config SIFIVE_GPIO
bool
+
+config AVR_GPIO
+ bool
diff --git a/hw/gpio/avr_gpio.c b/hw/gpio/avr_gpio.c
new file mode 100644
index 0000000000..8fc192dbcb
--- /dev/null
+++ b/hw/gpio/avr_gpio.c
@@ -0,0 +1,140 @@
+/*
+ * AVR processors GPIO registers emulation.
+ *
+ * Copyright (C) 2020 Heecheol Yang <heecheol.yang@outlook.com>
+ * Copyright (C) 2021 Niteesh Babu G S <niteesh.gs@gmail.com>
+ *
+ * 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 or
+ * (at your option) version 3 of the License.
+ *
+ * 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.
+ *
+ * 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 "qemu/osdep.h"
+#include "qemu/log.h"
+#include "qemu/module.h"
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/sysbus.h"
+#include "hw/irq.h"
+#include "hw/gpio/avr_gpio.h"
+#include "hw/qdev-properties.h"
+
+static void avr_gpio_reset(DeviceState *dev)
+{
+ AVRGPIOState *gpio = AVR_GPIO(dev);
+ gpio->reg.pin = 0u;
+ gpio->reg.ddr = 0u;
+ gpio->reg.port = 0u;
+}
+
+static void avr_gpio_write_port(AVRGPIOState *s, uint64_t value)
+{
+ uint8_t pin;
+ uint8_t org_val = value;
+ uint8_t cur_port_val = s->reg.port;
+ uint8_t cur_ddr_val = s->reg.ddr;
+
+ for (pin = 0u; pin < 8u ; pin++) {
+ uint8_t cur_port_pin_val = cur_port_val & 0x01u;
+ uint8_t cur_ddr_pin_val = cur_ddr_val & 0x01u;
+ uint8_t new_port_pin_val = value & 0x01u;
+
+ if (cur_ddr_pin_val && (cur_port_pin_val != new_port_pin_val)) {
+ qemu_set_irq(s->out[pin], new_port_pin_val);
+ }
+ cur_port_val >>= 1u;
+ cur_ddr_val >>= 1u;
+ value >>= 1u;
+ }
+ s->reg.port = org_val & s->reg.ddr;
+}
+static uint64_t avr_gpio_read(void *opaque, hwaddr offset, unsigned int size)
+{
+ AVRGPIOState *s = (AVRGPIOState *)opaque;
+ switch (offset) {
+ case GPIO_PIN:
+ return s->reg.pin;
+ case GPIO_DDR:
+ return s->reg.ddr;
+ case GPIO_PORT:
+ return s->reg.port;
+ default:
+ g_assert_not_reached();
+ break;
+ }
+ return 0;
+}
+
+static void avr_gpio_write(void *opaque, hwaddr offset, uint64_t value,
+ unsigned int size)
+{
+ AVRGPIOState *s = (AVRGPIOState *)opaque;
+ value = value & 0xFF;
+
+ trace_avr_gpio_write(offset, value);
+ switch (offset) {
+ case GPIO_PIN:
+ s->reg.pin = value;
+ s->reg.port ^= s->reg.pin;
+ break;
+ case GPIO_DDR:
+ s->reg.ddr = value;
+ break;
+ case GPIO_PORT:
+ avr_gpio_write_port(s, value);
+ break;
+ default:
+ g_assert_not_reached();
+ break;
+ }
+}
+
+static const MemoryRegionOps avr_gpio_ops = {
+ .read = avr_gpio_read,
+ .write = avr_gpio_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+static void avr_gpio_init(Object *obj)
+{
+ AVRGPIOState *s = AVR_GPIO(obj);
+ qdev_init_gpio_out(DEVICE(obj), s->out, ARRAY_SIZE(s->out));
+ memory_region_init_io(&s->mmio, obj, &avr_gpio_ops, s, TYPE_AVR_GPIO, 3);
+ sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
+}
+static void avr_gpio_realize(DeviceState *dev, Error **errp)
+{
+ /* Do nothing currently */
+}
+
+
+static void avr_gpio_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->reset = avr_gpio_reset;
+ dc->realize = avr_gpio_realize;
+}
+
+static const TypeInfo avr_gpio_info = {
+ .name = TYPE_AVR_GPIO,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(AVRGPIOState),
+ .instance_init = avr_gpio_init,
+ .class_init = avr_gpio_class_init,
+};
+
+static void avr_gpio_register_types(void)
+{
+ type_register_static(&avr_gpio_info);
+}
+
+type_init(avr_gpio_register_types)
diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build
index 79568f00ce..366aca52ca 100644
--- a/hw/gpio/meson.build
+++ b/hw/gpio/meson.build
@@ -13,3 +13,4 @@ softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c'))
softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c'))
softmmu_ss.add(when: 'CONFIG_SIFIVE_GPIO', if_true: files('sifive_gpio.c'))
+softmmu_ss.add(when: 'CONFIG_AVR_GPIO', if_true: files('avr_gpio.c'))
diff --git a/include/hw/gpio/avr_gpio.h b/include/hw/gpio/avr_gpio.h
new file mode 100644
index 0000000000..498a7275f0
--- /dev/null
+++ b/include/hw/gpio/avr_gpio.h
@@ -0,0 +1,53 @@
+/*
+ * AVR processors GPIO registers definition.
+ *
+ * Copyright (C) 2020 Heecheol Yang <heecheol.yang@outlook.com>
+ *
+ * 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 or
+ * (at your option) version 3 of the License.
+ *
+ * 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.
+ *
+ * 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 AVR_GPIO_H
+#define AVR_GPIO_H
+
+#include "hw/sysbus.h"
+#include "qom/object.h"
+
+/* Offsets of registers. */
+#define GPIO_PIN 0x00
+#define GPIO_DDR 0x01
+#define GPIO_PORT 0x02
+
+#define TYPE_AVR_GPIO "avr-gpio"
+OBJECT_DECLARE_SIMPLE_TYPE(AVRGPIOState, AVR_GPIO)
+#define AVR_GPIO_COUNT 8
+
+struct AVRGPIOState {
+ /*< private >*/
+ SysBusDevice parent_obj;
+
+ /*< public >*/
+ MemoryRegion mmio;
+
+ struct {
+ uint8_t pin;
+ uint8_t ddr;
+ uint8_t port;
+ } reg;
+
+ /* PORTx data changed IRQs */
+ qemu_irq out[8u];
+
+};
+
+#endif /* AVR_GPIO_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-11 14:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-02 17:29 [PATCH 1/3] hw/avr: Add limited support for avr gpio registers G S Niteesh Babu
2021-03-02 17:29 ` [PATCH 2/3] avr/arduino: Add D13 LED G S Niteesh Babu
2021-03-02 17:29 ` [PATCH 3/3] hw/gpio/avr_gpio.c: add tracing for read and writes G S Niteesh Babu
2021-03-09 13:15 ` [PATCH 1/3] hw/avr: Add limited support for avr gpio registers Niteesh G. S.
2021-03-11 13:55 [PATCH 0/3] AVR GPIO Emulation and Arduino D13 LED G S Niteesh Babu
2021-03-11 13:55 ` [PATCH 1/3] hw/avr: Add limited support for avr gpio registers G S Niteesh Babu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.