From nobody Sun May 12 15:46:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1597423245; cv=none; d=zohomail.com; s=zohoarc; b=OOZkp9fmUvYvdmWY8nCjP00iiLwqYFuNJGqxi1RkRpycbzOe0xJd27p+koZ6pGozmWT1baYfxdEgGzygD3X5YF3uw128E5tKue8vqDHKIiXgO0ko4hVCvG5v7nXjwwgFqlBIltbOCoRrtlfOxlGh1wMrE47d8PvimC+q1/rKtaA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597423245; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+vZKMxDAk/vtC5bjb2De5DWR9pVCk7ac3nopYj/xQZQ=; b=EdI42PadCLMksuQOnktYRaA0hR3EV1NOB+7ZFbnAVhw1TZlTJArM6Uf3KChuuvf1BFeB2i9md4LkLffUV5pyMoLbZ8RNP1H7ttUWxzj5ZETsdn8pUVoelPQPHOnSIkGYzqHunKEl8nV1Jl+NQVFSQhqymxtfqcMLsV0+pwJWLHo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597423245456660.6386552231562; Fri, 14 Aug 2020 09:40:45 -0700 (PDT) Received: from localhost ([::1]:60744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6cl0-0005QI-KC for importer@patchew.org; Fri, 14 Aug 2020 12:40:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6cjr-0004CL-Lr for qemu-devel@nongnu.org; Fri, 14 Aug 2020 12:39:31 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:36645) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6cjp-0002KH-Q0 for qemu-devel@nongnu.org; Fri, 14 Aug 2020 12:39:31 -0400 Received: by mail-wr1-x442.google.com with SMTP id 88so8910733wrh.3 for ; Fri, 14 Aug 2020 09:39:29 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id p14sm18417178wrg.96.2020.08.14.09.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 09:39:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+vZKMxDAk/vtC5bjb2De5DWR9pVCk7ac3nopYj/xQZQ=; b=bWkRrO9fkbz+xIXQnkj7lKtLTDatmyFCxnl36tMgE4/cQKBlGyO21nPKBLnYfMUVw1 MOSiyhuLp+y+hCPTfkpVo086Y3czlnHq+83gfbOaRsAHHcRm4cnJ3yW/FFFmI0tXZYft mw+zVbNkM99mO1/4gUvSgAXxKD4vazy8q9e4ZE8QQyYUV4Rx+c2/mmj7keZsWUocscS6 RX4glLOiEXnCFiEMFltHObkuTX1XqEQ0zmcVVnGMeFiMQFFk/9iPLJ6c+5Qkv9FE6vMQ 3jwb3G077h+F8qOl6n/qnSbLWHyshS++UWzX6FgQjaHeRCTh/HlRsq8q+LXHtHhM1xDG u5tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+vZKMxDAk/vtC5bjb2De5DWR9pVCk7ac3nopYj/xQZQ=; b=pcsqCN/I67Z0pAjq/8L4nGPv2U3YamzHBJKTL9jV0YZRRgFOyGsX1a64N24tWJQf9h xV1gbwJr/9ZIos8LzNzfnGXKELbe0qvT4HpDuws8BsmUJBUM7ZFoyyQna0QsJPW1AlJq /lXLD37k/+v44oY4KD3rBEN2tXUPTJ+bSYsvoEf2caltXxEC0xbw951D2ItF+3pRQ53A Z+gkYhltlFUlDgV8W8V3HJaN7IorRUDufxwkG0vekleovnTjrNkujCv7enHdwT2VK0gj 5vj0XfK9qcdCXu7nijMOCQRqTi8Wfcb8yXx3t5Tyfnh1l+jlXao+oBtT6F171WF4FKSk iwIA== X-Gm-Message-State: AOAM532xft8N+K40syKl11+VJX5I0dcTlRaFWn0Bp125+mfSCEAGKjbh nmBkvoGnObHSehjG3vEHneNYzo2N8lo= X-Google-Smtp-Source: ABdhPJyrg9H8J6ymKpOmZ85sTdvxJWOvdKByTux6BmHVIIBM9jYb54drThGHhVHuK92X+DgjgO/G5g== X-Received: by 2002:adf:edd0:: with SMTP id v16mr3710820wro.271.1597423168411; Fri, 14 Aug 2020 09:39:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/5] hw/avr/atmega: Introduce the I/O clock Date: Fri, 14 Aug 2020 18:39:20 +0200 Message-Id: <20200814163924.11662-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200814163924.11662-1-f4bug@amsat.org> References: <20200814163924.11662-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Sarah Harris , Thomas Huth , Joaquin de Andres , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Rolnik , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use the Clock API to model the I/O clock. As we don't model the Clock Control Unit, the XTAL is its unique clock source. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Michael Rolnik --- hw/avr/atmega.h | 2 ++ hw/avr/atmega.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/hw/avr/atmega.h b/hw/avr/atmega.h index 0928cb0ce6..c91317107f 100644 --- a/hw/avr/atmega.h +++ b/hw/avr/atmega.h @@ -14,6 +14,7 @@ #include "hw/char/avr_usart.h" #include "hw/timer/avr_timer16.h" #include "hw/misc/avr_power.h" +#include "hw/clock.h" #include "target/avr/cpu.h" =20 #define TYPE_ATMEGA_MCU "ATmega" @@ -35,6 +36,7 @@ typedef struct AtmegaMcuState { /*< public >*/ =20 AVRCPU cpu; + Clock *ioclk; MemoryRegion flash; MemoryRegion eeprom; MemoryRegion sram; diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c index 7131224431..9d814de499 100644 --- a/hw/avr/atmega.c +++ b/hw/avr/atmega.c @@ -15,6 +15,7 @@ #include "exec/memory.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" +#include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/boards.h" /* FIXME memory_region_allocate_system_memory for s= ram */ @@ -231,6 +232,9 @@ static void atmega_realize(DeviceState *dev, Error **er= rp) error_setg(errp, "\"xtal-frequency-hz\" property must be provided.= "); return; } + s->ioclk =3D qdev_init_clock_out(dev, "ioclk"); + /* Clock Control Unit not implemented: directly distribute from xtal */ + clock_set_hz(s->ioclk, s->xtal_freq_hz); =20 /* CPU */ object_initialize_child(OBJECT(dev), "cpu", &s->cpu, mc->cpu_type); --=20 2.21.3 From nobody Sun May 12 15:46:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1597423340; cv=none; d=zohomail.com; s=zohoarc; b=aOEokhUyGTlC/gw/PsCWeBl0S38x27lEZjZdg+3OfEscUTNLAGl+5gQbyGO6pXObri4m908kkT0fNcyGNEbptZnm7P4r1FVoAVtQF4/g+B28iL539JwRrgp/Jlpx65kEPqNjyxoZkka3PD9zC6vD2bitmi+QjKdq42gMQx9MiDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597423340; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hn4hL0y7ZpwSzMH1FWPCmjokpRtbCkZjalyMESN2N7M=; b=DwVxNGrJwbV8EAp1BE3MZi4SarJJvQLZPJCyxLMx6x8tofVhAPmLkBW4dWHn/qi0S3FGF9M/De/G7+sFg3cpOSEZm6Byk1rshnVBgYvQDQa1V4T5ZTteqqjH8YuOegUW+CwNWN3pUdNRIN4bwvTP13rBTjXeOkjRiY09lb34b40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597423340882519.9033206265733; Fri, 14 Aug 2020 09:42:20 -0700 (PDT) Received: from localhost ([::1]:39832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6cmZ-00008Q-Mg for importer@patchew.org; Fri, 14 Aug 2020 12:42:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6cjt-0004Dy-F1 for qemu-devel@nongnu.org; Fri, 14 Aug 2020 12:39:33 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:40864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6cjr-0002KV-Ut for qemu-devel@nongnu.org; Fri, 14 Aug 2020 12:39:33 -0400 Received: by mail-wm1-x341.google.com with SMTP id k20so8436903wmi.5 for ; Fri, 14 Aug 2020 09:39:31 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id p14sm18417178wrg.96.2020.08.14.09.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 09:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hn4hL0y7ZpwSzMH1FWPCmjokpRtbCkZjalyMESN2N7M=; b=YFDrudV0p8Rt+yk6Zwx8X6WsKXIdMtw4EQucHrPL25x5aWmibCh/FqOQQLNLMw+5nr YICGcUU0ql9nca4oLJ8flwdPl0PT3SgwuZeiQDZ/WyP1isKtYOh5j7AXmY1bXnOfsgbD b3SdO2nhEUUwYKS+lx8CkUhyV7J1h3xyUv22F1Z9ArRFYq63Vaq2maPdoe+KBUQE+Yew SMvh87A+W4ZLVIbss83TWUgabpJYX/YOcnJA69LNhP5rsSWkJWdNGVo+Ceb6qFzPNc9J Ql+O6fd9FgF7XFCAakxD9fleATw2/RFodjeYJA0Biflj9pi5QIN6Dc87NANFWVi5kPFV 7D1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hn4hL0y7ZpwSzMH1FWPCmjokpRtbCkZjalyMESN2N7M=; b=asjz0Su9/V5uIBL9xA/h9TZyaocnOHWH/Wm7m7JvERoHluWisMh39rX8pRdK6bsQvn TJ4oVGeQwnKCItqjPG6nw7ae0kjOcbkixtVrAiHXSQhB8zDJIrNY267UnBsTp/tMpScv 5dJsFnVUb12yqHsV8OgSKc2UWnFXtaHBA1TB26S+jMnyOJCpqQdfHoACUoP2P9V6im4H sCLNEYBMlP9kJy6dV62QU0JNG6S0O16aBjHN2AKvpw8sPK+4lm1B4mSFiIOOovTyarkO j+jCVtPQ4hQTWTZTVnePZdD9eXbx9PaRgonkhjjJsXAVky5qtJvaPnGkNo03pVZklgTU gM1Q== X-Gm-Message-State: AOAM5312IuB4MbEVzusTPs0OjxBfHJhtu1meDVt7wcKTjr9TFW6kt/b0 9PBt62mMxaTW9yW33CTfGhngkXCloac= X-Google-Smtp-Source: ABdhPJyNStCYxJDisiWbuES7fx01TmZg1wUt51sqBa3IW3EoCQ4MsqjZtZMrzW1OUeO6kCkrXFc1TQ== X-Received: by 2002:a1c:a9ce:: with SMTP id s197mr3095243wme.45.1597423170178; Fri, 14 Aug 2020 09:39:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/5] hw/timer/avr_timer16: Use the Clock API Date: Fri, 14 Aug 2020 18:39:21 +0200 Message-Id: <20200814163924.11662-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200814163924.11662-1-f4bug@amsat.org> References: <20200814163924.11662-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Sarah Harris , Thomas Huth , Joaquin de Andres , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Rolnik , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Expose the 'clkt' clock source. Connect the MCU I/O clock to it. Drop the now unused 'cpu-frequency-hz' static property. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Michael Rolnik --- include/hw/timer/avr_timer16.h | 3 ++- hw/avr/atmega.c | 3 +-- hw/timer/avr_timer16.c | 12 ++++-------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/hw/timer/avr_timer16.h b/include/hw/timer/avr_timer16.h index 982019d242..fb1ef5d3be 100644 --- a/include/hw/timer/avr_timer16.h +++ b/include/hw/timer/avr_timer16.h @@ -31,6 +31,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/hw.h" +#include "hw/clock.h" =20 enum NextInterrupt { OVERFLOW, @@ -52,6 +53,7 @@ typedef struct AVRTimer16State { MemoryRegion iomem; MemoryRegion imsk_iomem; MemoryRegion ifr_iomem; + Clock *clkin; QEMUTimer *timer; qemu_irq capt_irq; qemu_irq compa_irq; @@ -84,7 +86,6 @@ typedef struct AVRTimer16State { uint8_t ifr; =20 uint8_t id; - uint64_t cpu_freq_hz; uint64_t freq_hz; uint64_t period_ns; uint64_t reset_time_ns; diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c index 9d814de499..f14b558140 100644 --- a/hw/avr/atmega.c +++ b/hw/avr/atmega.c @@ -332,8 +332,7 @@ static void atmega_realize(DeviceState *dev, Error **er= rp) devname =3D g_strdup_printf("timer%zu", i); object_initialize_child(OBJECT(dev), devname, &s->timer[i], TYPE_AVR_TIMER16); - object_property_set_uint(OBJECT(&s->timer[i]), "cpu-frequency-hz", - s->xtal_freq_hz, &error_abort); + qdev_connect_clock_in(DEVICE(&s->timer[i]), "clkt", s->ioclk); sbd =3D SYS_BUS_DEVICE(&s->timer[i]); sysbus_realize(sbd, &error_abort); sysbus_mmio_map(sbd, 0, OFFSET_DATA + mc->dev[idx].addr); diff --git a/hw/timer/avr_timer16.c b/hw/timer/avr_timer16.c index c48555da52..7634fe6587 100644 --- a/hw/timer/avr_timer16.c +++ b/hw/timer/avr_timer16.c @@ -35,6 +35,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "hw/irq.h" +#include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "hw/timer/avr_timer16.h" #include "trace.h" @@ -167,7 +168,7 @@ static void avr_timer16_clksrc_update(AVRTimer16State *= t16) break; } if (divider) { - t16->freq_hz =3D t16->cpu_freq_hz / divider; + t16->freq_hz =3D clock_get_hz(t16->clkin) / divider; t16->period_ns =3D NANOSECONDS_PER_SECOND / t16->freq_hz; trace_avr_timer16_clksrc_update(t16->freq_hz, t16->period_ns, (uint64_t)(1e6 / t16->freq_hz)); @@ -544,8 +545,6 @@ static const MemoryRegionOps avr_timer16_ifr_ops =3D { =20 static Property avr_timer16_properties[] =3D { DEFINE_PROP_UINT8("id", struct AVRTimer16State, id, 0), - DEFINE_PROP_UINT64("cpu-frequency-hz", struct AVRTimer16State, - cpu_freq_hz, 0), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -564,6 +563,8 @@ static void avr_timer16_init(Object *obj) { AVRTimer16State *s =3D AVR_TIMER16(obj); =20 + s->clkin =3D qdev_init_clock_in(DEVICE(obj), "clkt", NULL, s); + sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->capt_irq); sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->compa_irq); sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->compb_irq); @@ -587,11 +588,6 @@ static void avr_timer16_realize(DeviceState *dev, Erro= r **errp) { AVRTimer16State *s =3D AVR_TIMER16(dev); =20 - if (s->cpu_freq_hz =3D=3D 0) { - error_setg(errp, "AVR timer16: cpu-frequency-hz property must be s= et"); - return; - } - s->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, avr_timer16_interrupt, s= ); s->enabled =3D true; } --=20 2.21.3 From nobody Sun May 12 15:46:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1597423340; cv=none; d=zohomail.com; s=zohoarc; b=OcxPXoNVuAWjxKbkFfAIa+E3qrSykF0dlHMs+w96tiRpNbe+B6NNdySqeSCR86fM7Fj5JxabbFKCuUjbtaejjmBrj9gFqGokVtj/T+3iZ/IKp8lZvuDetT4WY+GuBh8g6E/fnz5CfNt6mG1VaXQ67npU8y5ScVrMTxR0oOHJMOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597423340; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9pWOckZfWxmm5Cx0x7GbXw26/l3P0TjnIk9rBNWTYh0=; b=NwHAUL6+/IqlLQ4DxWw70rpDLQ2j3mpTnH1V+fth/GP6R2cy7pM5Q7N1+iSj/Sv/GuJf727Hs8+ZTe9eVS4cQMgK/3GRXSCL3brS4LxNtUuRqALDy73fif7RnViIGftdPFqNEXe5CoFum+3khIi7nCSn0XYGFA7YlJRoyiDqwQ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597423340320788.6517116155643; Fri, 14 Aug 2020 09:42:20 -0700 (PDT) Received: from localhost ([::1]:39788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6cmY-00007C-O1 for importer@patchew.org; Fri, 14 Aug 2020 12:42:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6cju-0004Fe-Aa for qemu-devel@nongnu.org; Fri, 14 Aug 2020 12:39:34 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:39892) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6cjs-0002Kg-S6 for qemu-devel@nongnu.org; Fri, 14 Aug 2020 12:39:34 -0400 Received: by mail-wm1-x341.google.com with SMTP id g75so8436419wme.4 for ; Fri, 14 Aug 2020 09:39:32 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id p14sm18417178wrg.96.2020.08.14.09.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 09:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9pWOckZfWxmm5Cx0x7GbXw26/l3P0TjnIk9rBNWTYh0=; b=e4/SGrC/gjRY9eB+jKzpcw/ZKQVD3IvyoIvxku/1gSHImXI0ZQqdKoCcdvIyWizRdC Lwi19O6WIEXGtS27VsF1LeyU7qiHr3VUC0hR0jIVHoIaU7+POdHWi8RW3FigH3aNZ9Pt r0ds0lxTG4/0nDW3h91O4pD87AcuN2WWtlHbFB8ZLswwZTv98Dmb/epwTbAGkwD64Mkn jmDYveLIsGXE//6imTS880c0xtE8kviiSkR734ERlYzwA1+1wM1ZqRc4Yed5FH7SI42F lXc01GA2O67IEqrzsTinnYQq2KFuhG+S+9hrkivENRsrzcwuJDvptWOjMf5fycAEyjcu UGpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9pWOckZfWxmm5Cx0x7GbXw26/l3P0TjnIk9rBNWTYh0=; b=E0diWdzDV3YMvlJKsSN4Kg5rBb90F9d92iOulvJq6wosHtJdfHYTw/GKnRWQnhKjQR zPUYehhKNuWpa0yPDT5yVt3A2hrRsm6aM+h/spg5SZ0Dex3oRb7jgbq3bom+ZH7IoqLp agMrQgGGIJlkWOthWYaP8DcR9s1STzZCe07Pg5VIMJM4NWr+/a5yg8tJJVT8SjRaY809 iwhL6l6dnqSaOZ/TEOdTXgqZ99RpaiutAMp9kVwk9h0ZhfKoQRl9VUV5V7rgFwRhKWPJ wxfZpMv8mMecceokYmZ96tv4O4eQ8Gi7Z7mJaTDwjDsGWSZBdgf2qQeEimmefEZzI0OI 9TiA== X-Gm-Message-State: AOAM5303pABwowZkPtx92KCtegG/W1nCy7cK9FyqizKMyxKsBNv8wEfr d2Hko91WOaTMrpfa8v+VOD4RgYI8PbM= X-Google-Smtp-Source: ABdhPJxi2ZNmSxqhoXZzRHX6u8ec9FSvomBl4hAHsxq7v0y9mv756RKGyzEPrT3d3Q+H8uJDL1Sr/w== X-Received: by 2002:a7b:cb4d:: with SMTP id v13mr3466832wmj.56.1597423171284; Fri, 14 Aug 2020 09:39:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/5] hw/char/avr_usart: Restrict register definitions to source Date: Fri, 14 Aug 2020 18:39:22 +0200 Message-Id: <20200814163924.11662-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200814163924.11662-1-f4bug@amsat.org> References: <20200814163924.11662-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Sarah Harris , Thomas Huth , Joaquin de Andres , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Rolnik , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Nothing out of our model implementation is supposed to access its registers. Keep the definitions local. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Michael Rolnik --- include/hw/char/avr_usart.h | 30 ------------------------------ hw/char/avr_usart.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/hw/char/avr_usart.h b/include/hw/char/avr_usart.h index 5739aaf26f..46d6c76e50 100644 --- a/include/hw/char/avr_usart.h +++ b/include/hw/char/avr_usart.h @@ -26,36 +26,6 @@ #include "chardev/char-fe.h" #include "hw/hw.h" =20 -/* Offsets of registers. */ -#define USART_DR 0x06 -#define USART_CSRA 0x00 -#define USART_CSRB 0x01 -#define USART_CSRC 0x02 -#define USART_BRRH 0x05 -#define USART_BRRL 0x04 - -/* Relevant bits in regiters. */ -#define USART_CSRA_RXC (1 << 7) -#define USART_CSRA_TXC (1 << 6) -#define USART_CSRA_DRE (1 << 5) -#define USART_CSRA_MPCM (1 << 0) - -#define USART_CSRB_RXCIE (1 << 7) -#define USART_CSRB_TXCIE (1 << 6) -#define USART_CSRB_DREIE (1 << 5) -#define USART_CSRB_RXEN (1 << 4) -#define USART_CSRB_TXEN (1 << 3) -#define USART_CSRB_CSZ2 (1 << 2) -#define USART_CSRB_RXB8 (1 << 1) -#define USART_CSRB_TXB8 (1 << 0) - -#define USART_CSRC_MSEL1 (1 << 7) -#define USART_CSRC_MSEL0 (1 << 6) -#define USART_CSRC_PM1 (1 << 5) -#define USART_CSRC_PM0 (1 << 4) -#define USART_CSRC_CSZ1 (1 << 2) -#define USART_CSRC_CSZ0 (1 << 1) - #define TYPE_AVR_USART "avr-usart" #define AVR_USART(obj) \ OBJECT_CHECK(AVRUsartState, (obj), TYPE_AVR_USART) diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c index fbe2a112b7..fd0b488ef9 100644 --- a/hw/char/avr_usart.c +++ b/hw/char/avr_usart.c @@ -25,6 +25,36 @@ #include "hw/irq.h" #include "hw/qdev-properties.h" =20 +/* Offsets of registers. */ +#define USART_DR 0x06 +#define USART_CSRA 0x00 +#define USART_CSRB 0x01 +#define USART_CSRC 0x02 +#define USART_BRRH 0x05 +#define USART_BRRL 0x04 + +/* Relevant bits in regiters. */ +#define USART_CSRA_RXC (1 << 7) +#define USART_CSRA_TXC (1 << 6) +#define USART_CSRA_DRE (1 << 5) +#define USART_CSRA_MPCM (1 << 0) + +#define USART_CSRB_RXCIE (1 << 7) +#define USART_CSRB_TXCIE (1 << 6) +#define USART_CSRB_DREIE (1 << 5) +#define USART_CSRB_RXEN (1 << 4) +#define USART_CSRB_TXEN (1 << 3) +#define USART_CSRB_CSZ2 (1 << 2) +#define USART_CSRB_RXB8 (1 << 1) +#define USART_CSRB_TXB8 (1 << 0) + +#define USART_CSRC_MSEL1 (1 << 7) +#define USART_CSRC_MSEL0 (1 << 6) +#define USART_CSRC_PM1 (1 << 5) +#define USART_CSRC_PM0 (1 << 4) +#define USART_CSRC_CSZ1 (1 << 2) +#define USART_CSRC_CSZ0 (1 << 1) + static int avr_usart_can_receive(void *opaque) { AVRUsartState *usart =3D opaque; --=20 2.21.3 From nobody Sun May 12 15:46:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1597423434; cv=none; d=zohomail.com; s=zohoarc; b=Oq99uC8wPiKatMePTGW2wQgLuVuYMJ02tKYJ3iHhkvz2GLIQipsSGSINJGpVURaMt/nGUG2csh5qO/TRKeUA0+2IfsDXzCR9KWn+Q36WCkabKtogCNNV4wJyQfcwhxqkT6JOMLVHlnk6vifDIUjquVB3B9xGvd08lX+0hiCQA3o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597423434; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T47mf/KpXo4rEcEG9yBWBrQa7uEEYMLMPzhxvqfRUeU=; b=oGkHB05atqzSyBcHtYJPYCC1W9WHTL7quAEJFYXipbkhDuE++q2zrAysQr+l9Eses/bwH31pRIfIF8Hg49SZDvGkemUSn4MQ1K0SByHczE7bfIJE82/ANPnN+ZAwpYzv0uv6TUdHbkJOk5zYizmZ97mx4S99l39IZ+PXDzV5hAQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597423434970565.8679826585545; Fri, 14 Aug 2020 09:43:54 -0700 (PDT) Received: from localhost ([::1]:48314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6co5-0003cx-O1 for importer@patchew.org; Fri, 14 Aug 2020 12:43:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6cjv-0004HW-8R for qemu-devel@nongnu.org; Fri, 14 Aug 2020 12:39:35 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:51640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6cjt-0002Kl-RD for qemu-devel@nongnu.org; Fri, 14 Aug 2020 12:39:34 -0400 Received: by mail-wm1-x341.google.com with SMTP id p14so7986768wmg.1 for ; Fri, 14 Aug 2020 09:39:33 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id p14sm18417178wrg.96.2020.08.14.09.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 09:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T47mf/KpXo4rEcEG9yBWBrQa7uEEYMLMPzhxvqfRUeU=; b=uUUnGR5cmO6R7x2qS/iHcvETmU//nunsed1iXUpq8OwlfxwChQE3cbFfLBpI6TPBrH JNuc6PQt/5VrUG9YeBu0YrcdmJDVDbC2SzokTzF5ZGAcK4hPyfDuIQCARB2RYMCk+rVT fyeCLIquyg5oNiLtPj+nl7cjXr2X7sqNSIHsuyW2PYcUlIMtK3Q9Wwsop8/onCVafmm/ VupKT2pUxapfiI6r6IU5UVXAWtPwk9JSmhGNLHdAxHiQoVEaCkC1WWPX/XHfOyiussQy tMkHqvuoPWnvezX/xX+tvodzZEdzs5JKRpP5gxobnlYPYLtrI+kS9cGHPEpow0Z4pqXw l9Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=T47mf/KpXo4rEcEG9yBWBrQa7uEEYMLMPzhxvqfRUeU=; b=hg9VtvzZz0imp0vUWYuoOEcgSHb+HViKX1A7z6Aou3hrunfT1vT2eT/sEvfZLxi+tE wQQ+JOWgz0xHQhm5bOINsg1V1GaACMMFGiW+0W5F0yBn7Zq76rr9f5Nc8pyTP+vk+kOZ tb5l01pIWiWVYp/4BwdTefSBJImeoYf0Y12ZZptaOhWclcaGoMeIDxieputUrPU8Ll5S ucuwhFcu/qWhDWWB4GDj81iF0OjRqCp0MluVdP0Xrmh8WG7l/v2HbiBaG/4DgMbRAP/F YCq1YAmqA77x5it7wBS93YFuviDDwwAYqzZf5t/jAnlAppmfEg5tFA7wnzprd0G8KYWg /Eug== X-Gm-Message-State: AOAM530VZ4rYY7MaFf3RjOb5nBQw6TKqkY0TrpoBZ8+yEwg6sCkNa85g cF4aFcUXznpNo2NFu1sdTqGNA7VaAow= X-Google-Smtp-Source: ABdhPJwx4BLy118NDBYSpV+Xgi2IxqepKLKDyM+A7VCEqCbBe8mtYqzaE3dYPoTL21maH7xIkMPOUA== X-Received: by 2002:a7b:c941:: with SMTP id i1mr3219351wml.73.1597423172417; Fri, 14 Aug 2020 09:39:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/5] hw/char/avr_usart: Use the Clock API Date: Fri, 14 Aug 2020 18:39:23 +0200 Message-Id: <20200814163924.11662-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200814163924.11662-1-f4bug@amsat.org> References: <20200814163924.11662-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Sarah Harris , Thomas Huth , Joaquin de Andres , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Rolnik , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Expose the 'xck' clock source. Connect the MCU I/O clock to it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Michael Rolnik --- include/hw/char/avr_usart.h | 2 ++ hw/avr/atmega.c | 1 + hw/char/avr_usart.c | 3 +++ 3 files changed, 6 insertions(+) diff --git a/include/hw/char/avr_usart.h b/include/hw/char/avr_usart.h index 46d6c76e50..13cfd5ea07 100644 --- a/include/hw/char/avr_usart.h +++ b/include/hw/char/avr_usart.h @@ -25,6 +25,7 @@ #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "hw/hw.h" +#include "hw/clock.h" =20 #define TYPE_AVR_USART "avr-usart" #define AVR_USART(obj) \ @@ -51,6 +52,7 @@ typedef struct { /* Baud Rate Registers (low/high byte) */ uint8_t brrh; uint8_t brrl; + Clock *clkin; =20 /* Receive Complete */ qemu_irq rxc_irq; diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c index f14b558140..b6e86a4531 100644 --- a/hw/avr/atmega.c +++ b/hw/avr/atmega.c @@ -302,6 +302,7 @@ static void atmega_realize(DeviceState *dev, Error **er= rp) object_initialize_child(OBJECT(dev), devname, &s->usart[i], TYPE_AVR_USART); qdev_prop_set_chr(DEVICE(&s->usart[i]), "chardev", serial_hd(i)); + qdev_connect_clock_in(DEVICE(&s->usart[i]), "xck", s->ioclk); sbd =3D SYS_BUS_DEVICE(&s->usart[i]); sysbus_realize(sbd, &error_abort); sysbus_mmio_map(sbd, 0, OFFSET_DATA + mc->dev[USART(i)].addr); diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c index fd0b488ef9..4a43492082 100644 --- a/hw/char/avr_usart.c +++ b/hw/char/avr_usart.c @@ -23,6 +23,7 @@ #include "hw/char/avr_usart.h" #include "qemu/log.h" #include "hw/irq.h" +#include "hw/qdev-clock.h" #include "hw/qdev-properties.h" =20 /* Offsets of registers. */ @@ -307,12 +308,14 @@ static void avr_usart_pr(void *opaque, int irq, int l= evel) static void avr_usart_init(Object *obj) { AVRUsartState *s =3D AVR_USART(obj); + sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->rxc_irq); sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->dre_irq); sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->txc_irq); memory_region_init_io(&s->mmio, obj, &avr_usart_ops, s, TYPE_AVR_USART= , 7); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); qdev_init_gpio_in(DEVICE(s), avr_usart_pr, 1); + s->clkin =3D qdev_init_clock_in(DEVICE(obj), "xck", NULL, s); s->enabled =3D true; } =20 --=20 2.21.3 From nobody Sun May 12 15:46:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1597423251; cv=none; d=zohomail.com; s=zohoarc; b=EyBhc643ny9XXDTOcd7cSvIWrXAfgFCEL6eDK7hlNlHvzJxvxVfTSbyMOCrFI5Z+6GkCEUAvqddXn2snISd856b1AWRTmF8Xcjpfq6xndYTEl5qxstWebH+LAxJ7kMo/hMburOo2wPeuVLRxBeO0lhCkEuQHFfNvMfrwUK45Vew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597423251; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0dlRp7G2rkzZ9KDPViPaK9mH4rIwxMLs+qxgigKBCp8=; b=XWqKfAdKEmethT5UhXOMrJjro8V+JBPMXbYFgxXkXM6ffGk+ATNAou93K9WwlCTAybPceDQA17hf2jVotVGuFnYODgquHVGl3cUJW4J2X3Q6r2hrsvgnpFA4l8ugnrKkBEONiwru6VTRjvYJAmbszMG+7c1PCoHQ218BIYgO42I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597423251775962.8831009646863; Fri, 14 Aug 2020 09:40:51 -0700 (PDT) Received: from localhost ([::1]:33026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6cl8-0005i8-JZ for importer@patchew.org; Fri, 14 Aug 2020 12:40:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6cjw-0004Jw-HZ for qemu-devel@nongnu.org; Fri, 14 Aug 2020 12:39:36 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6cjv-0002Ku-1w for qemu-devel@nongnu.org; Fri, 14 Aug 2020 12:39:36 -0400 Received: by mail-wm1-x343.google.com with SMTP id d190so7976414wmd.4 for ; Fri, 14 Aug 2020 09:39:34 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id p14sm18417178wrg.96.2020.08.14.09.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 09:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0dlRp7G2rkzZ9KDPViPaK9mH4rIwxMLs+qxgigKBCp8=; b=VHg+ziTNXZz1jQ++4vGHYMj93us0h/267iBBSq7VQuFFuegT2RqEF8PWEHv/uu69Z1 9DSyIKHbXgkOdnFcPX91UygwLXHIYQQdrvG25tR9O+91e4/qDUrDlbmkcuRqDSVNu1NU OLQiWj3moO6w49Bo9e1Q5KhrfcQqoMZeKx9CSShxSKsnDWyqlH9Tknyl3IpKsL2RYoHk oIjREVc0vZHh7M9Y7mw1BVuFRXG++esjIkYb+/duYuwY4uOGxQDSrsiOQCqt6pXjB1Bn f7jj1vKanOfHlvMcO8Gf7JnaiUep2jT7Gd/Q1sG2zLY9MlGwrBXLQViibQ/j6SOe93H6 0NVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0dlRp7G2rkzZ9KDPViPaK9mH4rIwxMLs+qxgigKBCp8=; b=MtyPNRlJlhRyGRt0LEvw/qBczz2NfZla6z/tyCfa4kL5JWKqoVcTOpbeZeE2Khn6pE br3xDb+Gx51tKWN37SOKlFW9LompKRP/Jj6CQNLNrN1aT02hz8kcCdNmD7K1Ap5E6wKg tJ8nc19zY5XQT5m0bSNCI+/oaJjJumfr3z+nN0n09RF2pnTHcEue8F1HsyuZ6c+Qffvw zp6AjvBs9jZnfyNsMPIFKVZNaeDJutXHN/EOvfcsIaAtInEn0JRmCgW4Y+v6xHGw9Dga 181Fum0WjIyLmqZDUEXo2Gfq/mcRgb3BXnZ1SFOTuI/RfP74BRDg6VDw9rLjEomS02wF 3ArA== X-Gm-Message-State: AOAM532Kgqiaa/6MOzgssmeVgOz6Xg92uWM9i3+CI+UCLLbfkXY1d54R vhZqFHtwgzjiUTKqrCprQot8Qnzi3d0= X-Google-Smtp-Source: ABdhPJxMiq7fs9hAKHJ0llIiVOoq2yqbOO7j5Qx9Z121H+Xwgs9sVoiQ4Am5VHRcyF/pFWnnyqYSew== X-Received: by 2002:a1c:4e10:: with SMTP id g16mr3055081wmh.146.1597423173515; Fri, 14 Aug 2020 09:39:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/5] hw/char/avr_usart: Trace baudrate changes Date: Fri, 14 Aug 2020 18:39:24 +0200 Message-Id: <20200814163924.11662-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200814163924.11662-1-f4bug@amsat.org> References: <20200814163924.11662-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Sarah Harris , Thomas Huth , Joaquin de Andres , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Rolnik , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add a trace event to track baudrate changes. Example when running the FreeRTOS acceptance test [1]: $ qemu-system-avr -machine arduino-mega-2560-v3 -bios demo.elf -trace avr= \* 2546@1597415281.399619:avr_usart_update_baudrate baudrate 0x0019 (38461 b= auds) 2546@1597415281.400029:avr_usart_update_baudrate baudrate 0x0019 (38461 b= auds) Which confirm the definition from the test [2]: #define mainCOM_TEST_BAUD_RATE ( ( unsigned long ) 38400 ) [1] tests/acceptance/machine_avr6.py [2] https://github.com/seharris/qemu-avr-tests/blob/9c0c24da1b1/free-rtos/D= emo/AVR_ATMega2560_GCC/main.c#L80 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Michael Rolnik --- hw/char/avr_usart.c | 13 +++++++++++++ hw/char/trace-events | 3 +++ 2 files changed, 16 insertions(+) diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c index 4a43492082..176158a96b 100644 --- a/hw/char/avr_usart.c +++ b/hw/char/avr_usart.c @@ -25,6 +25,7 @@ #include "hw/irq.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" +#include "trace.h" =20 /* Offsets of registers. */ #define USART_DR 0x06 @@ -56,6 +57,8 @@ #define USART_CSRC_CSZ1 (1 << 2) #define USART_CSRC_CSZ0 (1 << 1) =20 +#define USART_CLOCK_DIVISOR 16 /* baudrate is input clock / 16 */ + static int avr_usart_can_receive(void *opaque) { AVRUsartState *usart =3D opaque; @@ -120,6 +123,14 @@ static void update_char_mask(AVRUsartState *usart) } } =20 +static void avr_usart_update_baudrate(AVRUsartState *s) +{ + unsigned baudrate =3D (clock_get_hz(s->clkin) / USART_CLOCK_DIVISOR) + / (((s->brrh << 8) | s->brrl) + 1); + + trace_avr_usart_update_baudrate((s->brrh << 8) | s->brrl, baudrate); +} + static void avr_usart_reset(DeviceState *dev) { AVRUsartState *usart =3D AVR_USART(dev); @@ -269,9 +280,11 @@ static void avr_usart_write(void *opaque, hwaddr addr,= uint64_t value, break; case USART_BRRL: usart->brrl =3D value; + avr_usart_update_baudrate(usart); break; case USART_BRRH: usart->brrh =3D value & 0b00001111; + avr_usart_update_baudrate(usart); break; default: qemu_log_mask( diff --git a/hw/char/trace-events b/hw/char/trace-events index d20eafd56f..b92cecbfaa 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -100,3 +100,6 @@ exynos_uart_rx_timeout(uint32_t channel, uint32_t stat,= uint32_t intsp) "UART%d: =20 # hw/char/cadence_uart.c cadence_uart_baudrate(unsigned baudrate) "baudrate %u" + +# avr_usart.c +avr_usart_update_baudrate(uint16_t regval, unsigned baudrate) "baudrate 0x= %04x (%u bauds)" --=20 2.21.3