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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 5F8A7C2B9F4 for ; Fri, 25 Jun 2021 14:03:53 +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 8AE5161477 for ; Fri, 25 Jun 2021 14:03:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8AE5161477 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=users.sourceforge.jp Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwmQw-0005V0-Bl for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 10:03:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwmQ8-0004U1-HE for qemu-devel@nongnu.org; Fri, 25 Jun 2021 10:03:00 -0400 Received: from mail09.asahi-net.or.jp ([202.224.55.49]:45357) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwmQ6-00044q-Ch for qemu-devel@nongnu.org; Fri, 25 Jun 2021 10:03:00 -0400 Received: from sakura.ysato.name (ik1-413-38519.vs.sakura.ne.jp [153.127.30.23]) (Authenticated sender: PQ4Y-STU) by mail09.asahi-net.or.jp (Postfix) with ESMTPA id 3452541E62; Fri, 25 Jun 2021 23:02:51 +0900 (JST) Received: from SIOS1075.ysato.ml (ZM005235.ppp.dion.ne.jp [222.8.5.235]) by sakura.ysato.name (Postfix) with ESMTPSA id A10DB1C058F; Fri, 25 Jun 2021 23:02:50 +0900 (JST) Date: Fri, 25 Jun 2021 23:02:48 +0900 Message-ID: <87mtre3uuv.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: Philippe =?ISO-8859-1?Q?Mathieu-Daud=E9?= Subject: Re: [RFC PATCH 2/4] !fixup hw/rx: rx62n switch renesas_timer. In-Reply-To: <20210624092336.1078504-3-f4bug@amsat.org> References: <20210624092336.1078504-1-f4bug@amsat.org> <20210624092336.1078504-3-f4bug@amsat.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Received-SPF: softfail client-ip=202.224.55.49; envelope-from=ysato@users.sourceforge.jp; helo=mail09.asahi-net.or.jp X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 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: Magnus Damm , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, 24 Jun 2021 18:23:34 +0900, Philippe Mathieu-Daud=E9 wrote: >=20 > Fixup while reviewing. >=20 > Signed-off-by: Philippe Mathieu-Daud=E9 > --- > include/hw/rx/rx62n.h | 3 +-- > hw/rx/rx62n.c | 6 +++--- > hw/rx/Kconfig | 1 - > 3 files changed, 4 insertions(+), 6 deletions(-) >=20 > diff --git a/include/hw/rx/rx62n.h b/include/hw/rx/rx62n.h > index c35bf3998c7..a34b845e1e7 100644 > --- a/include/hw/rx/rx62n.h > +++ b/include/hw/rx/rx62n.h > @@ -26,7 +26,6 @@ > =20 > #include "target/rx/cpu.h" > #include "hw/intc/rx_icu.h" > -#include "hw/timer/renesas_tmr.h" > #include "hw/timer/renesas_timer.h" > #include "hw/char/renesas_sci.h" > #include "qemu/units.h" > @@ -55,7 +54,7 @@ struct RX62NState { > =20 > RXCPU cpu; > RXICUState icu; > - RTMRState tmr[RX62N_NR_TMR]; > + RenesasTMUState tmr[RX62N_NR_TMR]; > RenesasCMTState cmt[RX62N_NR_CMT]; > RSCIState sci[RX62N_NR_SCI]; > =20 > diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c > index fa5add9f9db..626d027a2db 100644 > --- a/hw/rx/rx62n.c > +++ b/hw/rx/rx62n.c > @@ -163,13 +163,13 @@ static void register_tmr(RX62NState *s, int unit) > int i, irqbase; > =20 > object_initialize_child(OBJECT(s), "tmr[*]", > - &s->tmr[unit], TYPE_RENESAS_TMR); > + &s->tmr[unit], TYPE_RENESAS_TMU); > tmr =3D SYS_BUS_DEVICE(&s->tmr[unit]); > qdev_prop_set_uint64(DEVICE(tmr), "input-freq", s->pclk_freq_hz); > sysbus_realize(tmr, &error_abort); > =20 > - irqbase =3D RX62N_TMR_IRQ + TMR_NR_IRQ * unit; > - for (i =3D 0; i < TMR_NR_IRQ; i++) { > + irqbase =3D RX62N_TMR_IRQ + TMU_NR_IRQ * unit; > + for (i =3D 0; i < TMU_NR_IRQ; i++) { > sysbus_connect_irq(tmr, i, s->irq[irqbase + i]); > } > sysbus_mmio_map(tmr, 0, RX62N_TMR_BASE + unit * 0x10); > diff --git a/hw/rx/Kconfig b/hw/rx/Kconfig > index f9cb892633a..845ef416e38 100644 > --- a/hw/rx/Kconfig > +++ b/hw/rx/Kconfig > @@ -1,7 +1,6 @@ > config RX62N_MCU > bool > select RX_ICU > - select RENESAS_TMR > select RENESAS_TIMER > select RENESAS_SCI > =20 > --=20 > 2.31.1 >=20 >=20 The TMU and TMR are different, so the fix is not intended. TMR is implemented in renesas_tmr.c and has not been integrated yet. The features are also different and cannot be integrated immediately. --=20 Yosinori Sato