From nobody Fri Sep 20 22:16:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1670357239; cv=none; d=zohomail.com; s=zohoarc; b=HEdD9k1gyahLYXPUd7t4kM6PQx2bDWXa23zB7kQhFUnEO+gfQLE2q4Qy58Mm/PrNLYUFO3u0oCnYcNIa4/sQZOOkhAk6mOTURONCOPWtL97T9lklH/XOhEm6TiaWaFKhIN+hH9bn9YIU1G8zmfvKUCYcwix7004DKeQilsj1Uok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670357239; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Ltjm8NI9wS3nVN3HBNLGTjGZ0wP8hoqOgWSUD6YfDBs=; b=NKDDYNOvh+dF98bgiOaxDa8MfbLcA9s6ciYKmB6URtkDcoGBYK8DOnm7ujFQy3ejcqkweOhQn8cdh6DDrFmNjhwZpj/ZRHpFH76CwLYAz6SfU78RkCN5X6HdB4eaRKD50Fk2WzH2VZohXKVeu9LAUzo9mwwnArMuEuAnvL0NM2M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1670357239197827.2725650190388; Tue, 6 Dec 2022 12:07:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p2eDX-00027F-80; Tue, 06 Dec 2022 15:07:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2eDN-000258-BB for qemu-devel@nongnu.org; Tue, 06 Dec 2022 15:06:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2eDK-0004jJ-Vs for qemu-devel@nongnu.org; Tue, 06 Dec 2022 15:06:53 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-264-81qW_DYePkmf4HTR6T-8KA-1; Tue, 06 Dec 2022 15:06:47 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E5D53814595; Tue, 6 Dec 2022 20:06:47 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22AD640C2066; Tue, 6 Dec 2022 20:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670357208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Ltjm8NI9wS3nVN3HBNLGTjGZ0wP8hoqOgWSUD6YfDBs=; b=a5ycnJCA5JlQZ8CQCD0UQHdVAgNzfsXlwdA2Pk2Dmus7KEssvoUCXQYz4OVoQHi9/ySPWo MHd6Pe/nPFRGaEKHWvC9rCw/b7DJdEU0Ws6p8zp/22nxpTjTn7m2NY1DI+wHMFzUWLXbHj C7lJwx83/gdRQXD9RA+yyxhBAxH59XQ= X-MC-Unique: 81qW_DYePkmf4HTR6T-8KA-1 From: Thomas Huth To: Paolo Bonzini , qemu-devel@nongnu.org Cc: Michael S Tsirkin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH for-8.0] hw/rtc/mc146818rtc: Make this rtc device target independent Date: Tue, 6 Dec 2022 21:06:41 +0100 Message-Id: <20221206200641.339116-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1670357241407100003 Content-Type: text/plain; charset="utf-8" The only code that is really, really target dependent is the apic-related code in rtc_policy_slew_deliver_irq(). By moving this code into the hw/i386/ folder (renamed to rtc_apic_policy_slew_deliver_irq()) and passing this function as parameter to mc146818_rtc_init(), we can make the RTC completely target-independent. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/rtc/mc146818rtc.h | 7 +++++-- hw/alpha/dp264.c | 2 +- hw/hppa/machine.c | 2 +- hw/i386/microvm.c | 3 ++- hw/i386/pc.c | 10 +++++++++- hw/mips/jazz.c | 2 +- hw/ppc/pnv.c | 2 +- hw/rtc/mc146818rtc.c | 34 +++++++++++----------------------- hw/rtc/meson.build | 3 +-- 9 files changed, 32 insertions(+), 33 deletions(-) diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h index 1db0fcee92..c687953cc4 100644 --- a/include/hw/rtc/mc146818rtc.h +++ b/include/hw/rtc/mc146818rtc.h @@ -46,14 +46,17 @@ struct RTCState { Notifier clock_reset_notifier; LostTickPolicy lost_tick_policy; Notifier suspend_notifier; + bool (*policy_slew_deliver_irq)(RTCState *s); QLIST_ENTRY(RTCState) link; }; =20 #define RTC_ISA_IRQ 8 =20 -ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, - qemu_irq intercept_irq); +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercep= t_irq, + bool (*policy_slew_deliver_irq)(RTCState *s)); void rtc_set_memory(ISADevice *dev, int addr, int val); int rtc_get_memory(ISADevice *dev, int addr); +bool rtc_apic_policy_slew_deliver_irq(RTCState *s); +void qmp_rtc_reset_reinjection(Error **errp); =20 #endif /* HW_RTC_MC146818RTC_H */ diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index c502c8c62a..8723942b52 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -118,7 +118,7 @@ static void clipper_init(MachineState *machine) qdev_connect_gpio_out(i82378_dev, 0, isa_irq); =20 /* Since we have an SRM-compatible PALcode, use the SRM epoch. */ - mc146818_rtc_init(isa_bus, 1900, rtc_irq); + mc146818_rtc_init(isa_bus, 1900, rtc_irq, NULL); =20 /* VGA setup. Don't bother loading the bios. */ pci_vga_init(pci_bus); diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index de1cc7ab71..311031714a 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -232,7 +232,7 @@ static void machine_hppa_init(MachineState *machine) assert(isa_bus); =20 /* Realtime clock, used by firmware for PDC_TOD call. */ - mc146818_rtc_init(isa_bus, 2000, NULL); + mc146818_rtc_init(isa_bus, 2000, NULL, NULL); =20 /* Serial ports: Lasi and Dino use a 7.272727 MHz clock. */ serial_mm_init(addr_space, LASI_UART_HPA + 0x800, 0, diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 170a331e3f..d0ed4dca50 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -267,7 +267,8 @@ static void microvm_devices_init(MicrovmMachineState *m= ms) =20 if (mms->rtc =3D=3D ON_OFF_AUTO_ON || (mms->rtc =3D=3D ON_OFF_AUTO_AUTO && !kvm_enabled())) { - rtc_state =3D mc146818_rtc_init(isa_bus, 2000, NULL); + rtc_state =3D mc146818_rtc_init(isa_bus, 2000, NULL, + rtc_apic_policy_slew_deliver_irq); microvm_set_rtc(mms, rtc_state); } =20 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 546b703cb4..650e7bc199 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1244,6 +1244,13 @@ static void pc_superio_init(ISABus *isa_bus, bool cr= eate_fdctrl, g_free(a20_line); } =20 +bool rtc_apic_policy_slew_deliver_irq(RTCState *s) +{ + apic_reset_irq_delivered(); + qemu_irq_raise(s->irq); + return apic_get_irq_delivered(); +} + void pc_basic_device_init(struct PCMachineState *pcms, ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, @@ -1299,7 +1306,8 @@ void pc_basic_device_init(struct PCMachineState *pcms, pit_alt_irq =3D qdev_get_gpio_in(hpet, HPET_LEGACY_PIT_INT); rtc_irq =3D qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT); } - *rtc_state =3D mc146818_rtc_init(isa_bus, 2000, rtc_irq); + *rtc_state =3D mc146818_rtc_init(isa_bus, 2000, rtc_irq, + rtc_apic_policy_slew_deliver_irq); =20 qemu_register_boot_set(pc_boot_set, *rtc_state); =20 diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 6aefe9a61b..50fbd57b23 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -356,7 +356,7 @@ static void mips_jazz_init(MachineState *machine, fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), 0x80003000, fds); =20 /* Real time clock */ - mc146818_rtc_init(isa_bus, 1980, NULL); + mc146818_rtc_init(isa_bus, 1980, NULL, NULL); memory_region_init_io(rtc, NULL, &rtc_ops, NULL, "rtc", 0x1000); memory_region_add_subregion(address_space, 0x80004000, rtc); =20 diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 3d01e26f84..c5482554b7 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -992,7 +992,7 @@ static void pnv_init(MachineState *machine) serial_hds_isa_init(pnv->isa_bus, 0, MAX_ISA_SERIAL_PORTS); =20 /* Create an RTC ISA device too */ - mc146818_rtc_init(pnv->isa_bus, 2000, NULL); + mc146818_rtc_init(pnv->isa_bus, 2000, NULL, NULL); =20 /* * Create the machine BMC simulator and the IPMI BT device for diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 1ebb412479..9543ae0279 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -44,11 +44,6 @@ #include "qapi/visitor.h" #include "hw/rtc/mc146818rtc_regs.h" =20 -#ifdef TARGET_I386 -#include "qapi/qapi-commands-misc-target.h" -#include "hw/i386/apic.h" -#endif - //#define DEBUG_CMOS //#define DEBUG_COALESCED =20 @@ -112,7 +107,6 @@ static void rtc_coalesced_timer_update(RTCState *s) static QLIST_HEAD(, RTCState) rtc_devices =3D QLIST_HEAD_INITIALIZER(rtc_devices); =20 -#ifdef TARGET_I386 void qmp_rtc_reset_reinjection(Error **errp) { RTCState *s; @@ -124,9 +118,8 @@ void qmp_rtc_reset_reinjection(Error **errp) =20 static bool rtc_policy_slew_deliver_irq(RTCState *s) { - apic_reset_irq_delivered(); - qemu_irq_raise(s->irq); - return apic_get_irq_delivered(); + assert(s->policy_slew_deliver_irq); + return s->policy_slew_deliver_irq(s); } =20 static void rtc_coalesced_timer(void *opaque) @@ -145,13 +138,6 @@ static void rtc_coalesced_timer(void *opaque) =20 rtc_coalesced_timer_update(s); } -#else -static bool rtc_policy_slew_deliver_irq(RTCState *s) -{ - assert(0); - return false; -} -#endif =20 static uint32_t rtc_periodic_clock_ticks(RTCState *s) { @@ -922,14 +908,14 @@ static void rtc_realizefn(DeviceState *dev, Error **e= rrp) rtc_set_date_from_host(isadev); =20 switch (s->lost_tick_policy) { -#ifdef TARGET_I386 - case LOST_TICK_POLICY_SLEW: - s->coalesced_timer =3D - timer_new_ns(rtc_clock, rtc_coalesced_timer, s); - break; -#endif case LOST_TICK_POLICY_DISCARD: break; + case LOST_TICK_POLICY_SLEW: + if (s->policy_slew_deliver_irq) { + s->coalesced_timer =3D timer_new_ns(rtc_clock, rtc_coalesced_t= imer, s); + break; + } + /* fallthrough */ default: error_setg(errp, "Invalid lost tick policy."); return; @@ -960,7 +946,8 @@ static void rtc_realizefn(DeviceState *dev, Error **err= p) QLIST_INSERT_HEAD(&rtc_devices, s, link); } =20 -ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercep= t_irq) +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercep= t_irq, + bool (*policy_slew_deliver_irq)(RTCState *s)) { DeviceState *dev; ISADevice *isadev; @@ -969,6 +956,7 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year= , qemu_irq intercept_irq) isadev =3D isa_new(TYPE_MC146818_RTC); dev =3D DEVICE(isadev); s =3D MC146818_RTC(isadev); + s->policy_slew_deliver_irq =3D policy_slew_deliver_irq; qdev_prop_set_int32(dev, "base_year", base_year); isa_realize_and_unref(isadev, bus, &error_fatal); if (intercept_irq) { diff --git a/hw/rtc/meson.build b/hw/rtc/meson.build index dc33973384..34a4d316fa 100644 --- a/hw/rtc/meson.build +++ b/hw/rtc/meson.build @@ -13,5 +13,4 @@ softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(= 'aspeed_rtc.c')) softmmu_ss.add(when: 'CONFIG_GOLDFISH_RTC', if_true: files('goldfish_rtc.c= ')) softmmu_ss.add(when: 'CONFIG_LS7A_RTC', if_true: files('ls7a_rtc.c')) softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-rtc.= c')) - -specific_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'= )) +softmmu_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c')) --=20 2.31.1