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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 9348EC47247 for ; Tue, 5 May 2020 13:22:57 +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 5263420746 for ; Tue, 5 May 2020 13:22:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JnGaacWw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5263420746 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVxXE-000309-Hn for qemu-devel@archiver.kernel.org; Tue, 05 May 2020 09:22:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVxWJ-0001iB-Du for qemu-devel@nongnu.org; Tue, 05 May 2020 09:21:59 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47092 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jVxWI-0005wN-Hf for qemu-devel@nongnu.org; Tue, 05 May 2020 09:21:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588684917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G5BRipC8ikiuOy1gYFRYlHvIzAeB5UcvtII4rG8CrOI=; b=JnGaacWwM6x+cb3quL+zGVbg6gBhpDJDTb9WxloL5IgWamsjBZeQId2hY9ovaoFvMHXxC1 RxyjZU48FH92jVZ3vHfdmj4qKgjacTgNF7nF+Mp8gZLmVrdp4pQKSLbYGOmZemKrt4IfbY hC6uSgwhSJ5k1rJgGDGiFizsX4l4EZM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-386-nfUinQo3NEizzWl3V1RQ9w-1; Tue, 05 May 2020 09:21:56 -0400 X-MC-Unique: nfUinQo3NEizzWl3V1RQ9w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 169F3107ACF2; Tue, 5 May 2020 13:21:55 +0000 (UTC) Received: from localhost (unknown [10.40.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE15660621; Tue, 5 May 2020 13:21:41 +0000 (UTC) Date: Tue, 5 May 2020 15:21:41 +0200 From: Igor Mammedov To: Gerd Hoffmann Subject: Re: [PATCH v4 02/13] acpi: move aml builder code for rtc device Message-ID: <20200505152141.685873bf@redhat.com> In-Reply-To: <20200505113843.22012-3-kraxel@redhat.com> References: <20200505113843.22012-1-kraxel@redhat.com> <20200505113843.22012-3-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=205.139.110.120; envelope-from=imammedo@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/05 03:48:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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_PASS=-0.001 autolearn=_AUTOLEARN 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: Laurent Vivier , Kevin Wolf , Thomas Huth , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , qemu-devel@nongnu.org, Max Reitz , =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau , Paolo Bonzini , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 5 May 2020 13:38:32 +0200 Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov > --- > hw/i386/acpi-build.c | 17 ----------------- > hw/rtc/mc146818rtc.c | 22 ++++++++++++++++++++++ > 2 files changed, 22 insertions(+), 17 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 2e15f6848e7e..0bfa2dd23fcc 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1137,22 +1137,6 @@ static Aml *build_fdc_device_aml(ISADevice *fdc) > return dev; > } > > -static Aml *build_rtc_device_aml(void) > -{ > - Aml *dev; > - Aml *crs; > - > - dev = aml_device("RTC"); > - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0B00"))); > - crs = aml_resource_template(); > - aml_append(crs, aml_io(AML_DECODE16, 0x0070, 0x0070, 0x10, 0x02)); > - aml_append(crs, aml_irq_no_flags(8)); > - aml_append(crs, aml_io(AML_DECODE16, 0x0072, 0x0072, 0x02, 0x06)); > - aml_append(dev, aml_name_decl("_CRS", crs)); > - > - return dev; > -} > - > static Aml *build_kbd_device_aml(void) > { > Aml *dev; > @@ -1278,7 +1262,6 @@ static void build_isa_devices_aml(Aml *table) > Aml *scope = aml_scope("_SB.PCI0.ISA"); > Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); > > - aml_append(scope, build_rtc_device_aml()); > aml_append(scope, build_kbd_device_aml()); > aml_append(scope, build_mouse_device_aml()); > if (fdc) { > diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c > index d18c09911be2..2104e0aa3b14 100644 > --- a/hw/rtc/mc146818rtc.c > +++ b/hw/rtc/mc146818rtc.c > @@ -27,6 +27,7 @@ > #include "qemu/cutils.h" > #include "qemu/module.h" > #include "qemu/bcd.h" > +#include "hw/acpi/aml-build.h" > #include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "qemu/timer.h" > @@ -1007,13 +1008,34 @@ static void rtc_resetdev(DeviceState *d) > } > } > > +static void rtc_build_aml(ISADevice *isadev, Aml *scope) > +{ > + Aml *dev; > + Aml *crs; > + > + crs = aml_resource_template(); > + aml_append(crs, aml_io(AML_DECODE16, RTC_ISA_BASE, RTC_ISA_BASE, > + 0x10, 0x02)); > + aml_append(crs, aml_irq_no_flags(RTC_ISA_IRQ)); > + aml_append(crs, aml_io(AML_DECODE16, RTC_ISA_BASE + 2, RTC_ISA_BASE + 2, > + 0x02, 0x06)); > + > + dev = aml_device("RTC"); > + aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0B00"))); > + aml_append(dev, aml_name_decl("_CRS", crs)); > + > + aml_append(scope, dev); > +} > + > static void rtc_class_initfn(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > + ISADeviceClass *isa = ISA_DEVICE_CLASS(klass); > > dc->realize = rtc_realizefn; > dc->reset = rtc_resetdev; > dc->vmsd = &vmstate_rtc; > + isa->build_aml = rtc_build_aml; > device_class_set_props(dc, mc146818rtc_properties); > } >