From nobody Tue May 7 18:30:06 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1653068947; cv=none; d=zohomail.com; s=zohoarc; b=cFYQ/aUhXVprsaizY6Tg/iHwmdAqDSw68qrAbxjVIQuDn1vwybnamYnLITnRLrQcNqX+vl77Z06pOu1/9vavQwNLpyn2ggjtvLsogkpmZL48o2zvZkQkLbtzgKUvQNQIe8lPst1wkrdjqbkbWD5+hHPDCWKMGmULNQFT3VX9jxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653068947; h=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=M+6xNQGU+o4w9wXJ3n1vviWp3ar1enMx7bE5W8kNOiU=; b=ma5GPEQLJGfmnomFbfbBRtMOag7P29N8OXtSRkeQxG23dHaIAAqsPza1u/IXm/0y0zOoWGU0j8ZpZW5VE2vO/PkmVQC///5rwU5K7foEgdV223b1qigPpj9aPoXzgiqb8iNpeKjFCZkVB/Yj12sGfxcAUmNrLV2BEiA8PUof0f4= 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+importer2=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 1653068947623481.8202792078006; Fri, 20 May 2022 10:49:07 -0700 (PDT) Received: from localhost ([::1]:43772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ns6kM-0004uk-KJ for importer2@patchew.org; Fri, 20 May 2022 13:49:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ns6hT-0002bd-R3; Fri, 20 May 2022 13:46:07 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:40618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ns6hR-0002DP-Pn; Fri, 20 May 2022 13:46:07 -0400 Received: by mail-ej1-x632.google.com with SMTP id wh22so16784164ejb.7; Fri, 20 May 2022 10:46:05 -0700 (PDT) Received: from localhost.localdomain (dynamic-089-014-209-236.89.14.pool.telefonica.de. [89.14.209.236]) by smtp.gmail.com with ESMTPSA id h22-20020aa7cdd6000000b0042abb914d6asm4410209edw.69.2022.05.20.10.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 10:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M+6xNQGU+o4w9wXJ3n1vviWp3ar1enMx7bE5W8kNOiU=; b=Hg85X0TvMlgOv2QHtTUTyYb9mDMOB4MIN78P9RbLWmQAoDko6E7UnB0AS3RE7jA7xE btCJMHQXo4Hdv3Y4EnOoJP7HHIlD+M6o6UYWzEwKrbWV3E2w/cIei8bt7Idx2oHX/6m1 xzEmEQgm5hqNetPWqxwNUX80xnuMDXKRzZtp+vzlfwqBine5uFoZs7NFIwMPedQZHyVR tDttDdt9GlZ1A4gyhAT1KUXPBX1eGdsexi/eYtHrPV/6/ULxj0/U1pn5TiIr2bVPNgGj B5p6RRMJ7BW2YtJlTPatg3eG/8RVQ3YDFMZk7+af8ryeHnZozp1eB2Do5n2LTfuu9/Pb WbMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M+6xNQGU+o4w9wXJ3n1vviWp3ar1enMx7bE5W8kNOiU=; b=AEDO1yjPffqZijEqUBOvTDkIKP6kA+ZDg53GQyenOzX6YYEDw+r1fkRc85+iYcKdxs N3J9C5UfEGGdTutbqooLv9X8hfsiXZ0yTGwaJiFsc3NdhOQLeMI+fzRvH3I+9eghXcFg CGDdo0HSzU5VGzTPiayH5RQVsJ0H1nv6d6pTjHHr9wv3uARSNtdoio+ZW5ZkPE4LdZDR 1EU807SVaXljJdEcuAjfOSk4GLLeuI4isBtuU1Kpppjp2+Rk0rtWqfSAs6nY0re72KKk CD2vv8hsjkjPRvpZZMpgVuxjs4YRWjGOAXwPDWNT/2x8Rwa40Z41ok5kYfqMncshO+9c Q7fg== X-Gm-Message-State: AOAM5313qUXFQoLg5yyuacfM38EdYK5bJSt85jkpbbP+j9pJAS7zUmdH WI/5khQfTqrT64qfKLBrHvKtx04zMiY= X-Google-Smtp-Source: ABdhPJxJPmh4+WpTlt7EuC5YncIAgVAIn0pHvH1jQdvfoGuMtWcAh6yzwG0kLbnqQNwI7EbF7UGocQ== X-Received: by 2002:a17:906:685:b0:6fa:8e17:e9b5 with SMTP id u5-20020a170906068500b006fa8e17e9b5mr10194510ejb.522.1653068763820; Fri, 20 May 2022 10:46:03 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Bernhard Beschow , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PATCH 1/2] hw/i386/microvm-dt: Determine mc146818rtc's IRQ number from QOM property Date: Fri, 20 May 2022 19:45:36 +0200 Message-Id: <20220520174537.5827-2-shentey@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220520174537.5827-1-shentey@gmail.com> References: <20220520174537.5827-1-shentey@gmail.com> MIME-Version: 1.0 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=shentey@gmail.com; helo=mail-ej1-x632.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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1653068947973100001 Content-Type: text/plain; charset="utf-8" Since commit 3b004a16540aa41f2aa6a1ceb0bf306716766914 'hw/rtc/ mc146818rtc: QOM'ify IRQ number' mc146818rtc's IRQ number is configurable. Fix microvm-dt to respect its value. Signed-off-by: Bernhard Beschow Reviewed-by: Mark Cave-Ayland --- hw/i386/microvm-dt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/microvm-dt.c b/hw/i386/microvm-dt.c index 9c3c4995b4..a5db9e4e5a 100644 --- a/hw/i386/microvm-dt.c +++ b/hw/i386/microvm-dt.c @@ -208,7 +208,7 @@ static void dt_add_isa_serial(MicrovmMachineState *mms,= ISADevice *dev) static void dt_add_isa_rtc(MicrovmMachineState *mms, ISADevice *dev) { const char compat[] =3D "motorola,mc146818"; - uint32_t irq =3D RTC_ISA_IRQ; + uint32_t irq =3D object_property_get_uint(OBJECT(dev), "irq", NULL); hwaddr base =3D RTC_ISA_BASE; hwaddr size =3D 8; char *nodename; --=20 2.36.1 From nobody Tue May 7 18:30:06 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1653069035; cv=none; d=zohomail.com; s=zohoarc; b=gYxt2cP4VKJLYowRSFu10KJDbq868AQQMhOtow4DfFEaFw+E0NSlUXM6SB9ND/Rk9vw9e5rhmK1bEi1to+9IgXrlIQ4aiYH8p/lo4V/xfyXNnW5Rnwm2COVpDViVGskc08IuZwQq9F/PRs0VqsIRw+kTw2sq/kQFV2+Mj7miYyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653069035; h=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=C41Pk0vCO8V+AJMtMv+Bt9tIl1e7vmq6beORcxBkGfQ=; b=VgzqDATn6GMmYKvSMIe6aViLflqSIDnLqtMwUx4W3Twmtz0j0hEgxFqj9QHhT73bDL5v4kgMFU/HYEK7iEG+YGOxHYEUyARIJwW+IrrhFr0DrtM8LBejJW6o1mbBE4diubWtxuiRV+YXioZ+FGLABjapXBvUpi3X4z5YSlnLTJk= 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+importer2=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 1653069035032620.758633782275; Fri, 20 May 2022 10:50:35 -0700 (PDT) Received: from localhost ([::1]:44504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ns6lm-0005Q8-2A for importer2@patchew.org; Fri, 20 May 2022 13:50:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ns6hV-0002cn-2z; Fri, 20 May 2022 13:46:09 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:36522) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ns6hT-0002Dk-Cg; Fri, 20 May 2022 13:46:08 -0400 Received: by mail-ej1-x633.google.com with SMTP id gi33so8448618ejc.3; Fri, 20 May 2022 10:46:06 -0700 (PDT) Received: from localhost.localdomain (dynamic-089-014-209-236.89.14.pool.telefonica.de. [89.14.209.236]) by smtp.gmail.com with ESMTPSA id h22-20020aa7cdd6000000b0042abb914d6asm4410209edw.69.2022.05.20.10.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 10:46:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C41Pk0vCO8V+AJMtMv+Bt9tIl1e7vmq6beORcxBkGfQ=; b=qlC2t8JX1/MfO36JQyiZe+2cYLC1ZQYAoRXcob0NOcleZY4zRE/ACLmzpT+oUaSH+p kMWoUiBeIKlM64EZRi7TZkerV1pS5KMAn45PXSGyVbDsH5VeUng7JEsy55Z1poZPGOnV tQI2tt+foxBGtlwmXB+y7G66iNDtvLQiWA/3XAniq9lBUyittvuWH/lw73Qtr9iS9Jjd EXwZSRM8RAy3Lkns7qplOHPSY9lJCOWU/5WBQdpc85/rPnMEYuVk9d/uufGxInL1a/T1 2ptgR7w+ekboOe9r2l2bd5iq9ZVmmsWMBeahEpdat4pHAEur+9TORoCKjlYKtCIzgdPq XaCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C41Pk0vCO8V+AJMtMv+Bt9tIl1e7vmq6beORcxBkGfQ=; b=6womMqKOATmE8hHoLoudTr5FY4xW8nLaTqPDQ5CwIw0ayGDDjV87xG/I6foZXfubYq 1wrubKn8ngYecP8y4RNtxueYaR21t73UjfpknjZzMCOCjjFiqLWx7YDm0sQtBsWE/SKe ur1JnTTNFUC/Gvr9xbsGDgZhj8Y48WPEzbaUahmyfGT9HAvhV54/MiVr+Wapr2N41nx0 N4UX4kXLV6xY83kSTv6JbwTEZ0bUzjb5HZTKDfjMK7OSDZY6iHzCTL7dEYOzqbOj7vI0 lWz4DCtbOruUobHoUALaMq9IFX0PUF4KsYo6WNbDfHlg4TshsjpJ7FBH+qly9XPdqdLr Y6lA== X-Gm-Message-State: AOAM530SuFsQvSNyDBcFTRvmKe3kp5HAcL8wTmUwiYOBTBH207Eer9V+ gli7H6e/49Eqf5FU4UZZoETJ0eT5VWA= X-Google-Smtp-Source: ABdhPJzGZ1GQlw6tDuKSsth+/K1pRabgo8mIVktr8kP18YZaoNqSHLiMWr+zb3CZ6B2GcRqpWM4V3g== X-Received: by 2002:a17:906:4786:b0:6fe:a20a:fcd1 with SMTP id cw6-20020a170906478600b006fea20afcd1mr5699315ejc.442.1653068765429; Fri, 20 May 2022 10:46:05 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Bernhard Beschow , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PATCH 2/2] rtc/mc146818rtc: QOM'ify io_base offset Date: Fri, 20 May 2022 19:45:37 +0200 Message-Id: <20220520174537.5827-3-shentey@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220520174537.5827-1-shentey@gmail.com> References: <20220520174537.5827-1-shentey@gmail.com> MIME-Version: 1.0 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=shentey@gmail.com; helo=mail-ej1-x633.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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1653069037229100001 Content-Type: text/plain; charset="utf-8" Exposing the io_base offset as a QOM property not only allows it to be configurable but also to be displayed in HMP: Before: (qemu) info qtree ... dev: mc146818rtc, id "" gpio-out "" 1 base_year =3D 0 (0x0) irq =3D 8 (0x8) lost_tick_policy =3D "discard" After: dev: mc146818rtc, id "" gpio-out "" 1 base_year =3D 0 (0x0) iobase =3D 112 (0x70) irq =3D 8 (0x8) lost_tick_policy =3D "discard" Signed-off-by: Bernhard Beschow Reviewed-by: Mark Cave-Ayland --- hw/i386/microvm-dt.c | 2 +- hw/rtc/mc146818rtc.c | 7 ++++--- include/hw/rtc/mc146818rtc.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/i386/microvm-dt.c b/hw/i386/microvm-dt.c index a5db9e4e5a..39fe425b26 100644 --- a/hw/i386/microvm-dt.c +++ b/hw/i386/microvm-dt.c @@ -209,7 +209,7 @@ static void dt_add_isa_rtc(MicrovmMachineState *mms, IS= ADevice *dev) { const char compat[] =3D "motorola,mc146818"; uint32_t irq =3D object_property_get_uint(OBJECT(dev), "irq", NULL); - hwaddr base =3D RTC_ISA_BASE; + hwaddr base =3D object_property_get_int(OBJECT(dev), "iobase", NULL); hwaddr size =3D 8; char *nodename; =20 diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index f235c2ddbe..484f91b6f8 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -941,7 +941,7 @@ static void rtc_realizefn(DeviceState *dev, Error **err= p) qemu_register_suspend_notifier(&s->suspend_notifier); =20 memory_region_init_io(&s->io, OBJECT(s), &cmos_ops, s, "rtc", 2); - isa_register_ioport(isadev, &s->io, RTC_ISA_BASE); + isa_register_ioport(isadev, &s->io, s->io_base); =20 /* register rtc 0x70 port for coalesced_pio */ memory_region_set_flush_coalesced(&s->io); @@ -950,7 +950,7 @@ static void rtc_realizefn(DeviceState *dev, Error **err= p) memory_region_add_subregion(&s->io, 0, &s->coalesced_io); memory_region_add_coalescing(&s->coalesced_io, 0, 1); =20 - qdev_set_legacy_instance_id(dev, RTC_ISA_BASE, 3); + qdev_set_legacy_instance_id(dev, s->io_base, 3); =20 object_property_add_tm(OBJECT(s), "date", rtc_get_date); =20 @@ -983,6 +983,7 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year= , qemu_irq intercept_irq) =20 static Property mc146818rtc_properties[] =3D { DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980), + DEFINE_PROP_UINT32("iobase", RTCState, io_base, 0x70), DEFINE_PROP_UINT8("irq", RTCState, isairq, RTC_ISA_IRQ), DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", RTCState, lost_tick_policy, LOST_TICK_POLICY_DISCARD), @@ -1028,7 +1029,7 @@ static void rtc_build_aml(ISADevice *isadev, Aml *sco= pe) * does, even though qemu only responds to the first two ports. */ crs =3D aml_resource_template(); - aml_append(crs, aml_io(AML_DECODE16, RTC_ISA_BASE, RTC_ISA_BASE, + aml_append(crs, aml_io(AML_DECODE16, s->io_base, s->io_base, 0x01, 0x08)); aml_append(crs, aml_irq_no_flags(s->isairq)); =20 diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h index 33d85753c0..1f7942a9f8 100644 --- a/include/hw/rtc/mc146818rtc.h +++ b/include/hw/rtc/mc146818rtc.h @@ -26,6 +26,7 @@ struct RTCState { uint8_t cmos_data[128]; uint8_t cmos_index; uint8_t isairq; + uint32_t io_base; int32_t base_year; uint64_t base_rtc; uint64_t last_update; @@ -49,7 +50,6 @@ struct RTCState { }; =20 #define RTC_ISA_IRQ 8 -#define RTC_ISA_BASE 0x70 =20 ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); --=20 2.36.1