From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BC43C433DB for ; Thu, 11 Mar 2021 14:17:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C289F64FAD for ; Thu, 11 Mar 2021 14:17:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C289F64FAD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKM8B-0004nv-Ma for qemu-devel@archiver.kernel.org; Thu, 11 Mar 2021 09:17:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKLnk-0002sW-Uz for qemu-devel@nongnu.org; Thu, 11 Mar 2021 08:56:33 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:37557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lKLnh-0003T6-IZ for qemu-devel@nongnu.org; Thu, 11 Mar 2021 08:56:32 -0500 Received: by mail-pl1-x636.google.com with SMTP id 30so5673487ple.4 for ; Thu, 11 Mar 2021 05:56:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=waxc6Y2SDE+XDr+KNNeCC0k5MZzRZSnuXCLT07vtn88=; b=Y9xRwxj1mk1Fv9OpQ6/S70g9MekI9hQrVtjTxp6ORkUg13v7E3IMyRrDVWjymHU/qg 260Sk+ju4Qf4tsrfMzIUH5nRpYilsYYX3nTh27dlPy+62ywsuF2K6KeU+SBfpByInsos PlX7Gq7Iyttlv3Xo9htRRilshc+aBnL8umr33hPWt6W7nDOEmTEYepG/ZBpy8giXNnP0 J2vbiKcYCTUprzK6/i0ouLJP03P8Hbrp5aZ93EPapKZcgHkvt151Y+blyerEKKcM7/HU FeCT7vVmK4+fTH8S7UAPpoh9YcGMzNoRo1KmfYeKiRk3G24dUu5F97vjGY6Ht5n9/XLL T0+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=waxc6Y2SDE+XDr+KNNeCC0k5MZzRZSnuXCLT07vtn88=; b=Q5Uz6PPy+3qsqfft7Waeoc4ybLoWplehf/A8J3uLkFWqdGYXRVNb+al3cQVUQ2drqh ApGEesZW4ssmeeiGPdP5lfdJwzGHyiObieu4zhOkGl6jSseZocdxd2R3AaXXZuju/Ff3 nJKqutx0ry+5VtBNBLuw0p8m5hZdfT+8O5PO1gtRcdDVRp+kKHaR9KfIapwBuIsitSFv uHB3XD4FcPPSzTxHrH6u6mrJwuXHF3kVh7hOANfk7EQDiJ/tCV/iSV+qaqePhlQa6Mlr SWQFHTo+p5OwO87YicUL3wFnHG8fSf87ZyMURaC1MoCpK3CoLvmbEE6+aaFYb7jHmxPt yYEw== X-Gm-Message-State: AOAM531mUcbviVjaISBw97O0gPdhSN4SSfF85uLuQuF8SPus8zQwdkw8 AilSBcw1KhkVHqLrV8HFXhCLtDgexA3jXQ== X-Google-Smtp-Source: ABdhPJwIJzpe8FMZIQMdiptLFiEjw3Dr76SEJie2ZHFUPZzSyefNHvaLLsaj4/jgHU4SbXk1asaviQ== X-Received: by 2002:a17:902:e546:b029:e5:ec5e:6bf4 with SMTP id n6-20020a170902e546b02900e5ec5e6bf4mr8188219plf.41.1615470987483; Thu, 11 Mar 2021 05:56:27 -0800 (PST) Received: from localhost.localdomain ([120.138.12.210]) by smtp.gmail.com with ESMTPSA id a7sm2582392pfo.105.2021.03.11.05.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 05:56:27 -0800 (PST) From: G S Niteesh Babu To: qemu-devel@nongnu.org Subject: [PATCH 1/3] hw/avr: Add limited support for avr gpio registers Date: Thu, 11 Mar 2021 19:25:37 +0530 Message-Id: <20210311135539.10206-2-niteesh.gs@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210311135539.10206-1-niteesh.gs@gmail.com> References: <20210311135539.10206-1-niteesh.gs@gmail.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=niteesh.gs@gmail.com; helo=mail-pl1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: G S Niteesh Babu , S.E.Harris@kent.ac.uk, mrolnik@gmail.com, f4bug@amsat.org, Heecheol Yang Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Heecheol Yang 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 Signed-off-by: G S Niteesh Babu 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 + * Copyright (C) 2021 Niteesh Babu G S + * + * 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 . + */ +#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 + * + * 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 . + */ + +#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