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=-15.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 A6690C433E0 for ; Fri, 12 Feb 2021 12:03:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6C51B64E01 for ; Fri, 12 Feb 2021 12:03:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230194AbhBLMDI (ORCPT ); Fri, 12 Feb 2021 07:03:08 -0500 Received: from foss.arm.com ([217.140.110.172]:35920 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231264AbhBLMCk (ORCPT ); Fri, 12 Feb 2021 07:02:40 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A2C791063; Fri, 12 Feb 2021 04:01:54 -0800 (PST) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A95883F719; Fri, 12 Feb 2021 04:01:53 -0800 (PST) Subject: Re: [PATCH kvmtool 11/21] hw/rtc: Switch to new trap handler To: Andre Przywara , Will Deacon , Julien Thierry Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Marc Zyngier References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-12-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: Date: Fri, 12 Feb 2021 12:02:10 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20201210142908.169597-12-andre.przywara@arm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi Andre, On 12/10/20 2:28 PM, Andre Przywara wrote: > Now that the RTC device has a trap handler adhering to the MMIO fault > handler prototype, let's switch over to the joint registration routine. > > This allows us to get rid of the ioport shim routines. > > Signed-off-by: Andre Przywara > --- > hw/rtc.c | 21 ++------------------- > 1 file changed, 2 insertions(+), 19 deletions(-) > > diff --git a/hw/rtc.c b/hw/rtc.c > index 664d4cb0..ee4c9102 100644 > --- a/hw/rtc.c > +++ b/hw/rtc.c > @@ -120,23 +120,6 @@ static void cmos_ram_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, > } > } > > -static bool cmos_ram_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - cmos_ram_io(vcpu, port, data, size, false, NULL); > - return true; > -} > - > -static bool cmos_ram_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - cmos_ram_io(vcpu, port, data, size, true, NULL); > - return true; > -} > - > -static struct ioport_operations cmos_ram_ioport_ops = { > - .io_out = cmos_ram_out, > - .io_in = cmos_ram_in, > -}; > - > #ifdef CONFIG_HAS_LIBFDT > static void generate_rtc_fdt_node(void *fdt, > struct device_header *dev_hdr, > @@ -169,7 +152,7 @@ int rtc__init(struct kvm *kvm) > return r; > > /* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ > - r = ioport__register(kvm, 0x0070, &cmos_ram_ioport_ops, 2, NULL); > + r = kvm__register_pio(kvm, 0x0070, 2, cmos_ram_io, NULL); > if (r < 0) > goto out_device; > > @@ -188,7 +171,7 @@ dev_init(rtc__init); > int rtc__exit(struct kvm *kvm) > { > /* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ > - ioport__unregister(kvm, 0x0070); > + kvm__deregister_pio(kvm, 0x0070); > > return 0; > } Looks good: Reviewed-by: Alexandru Elisei Thanks, Alex 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=-15.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 B03FDC433E0 for ; Fri, 12 Feb 2021 12:01:59 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 2FDA764E02 for ; Fri, 12 Feb 2021 12:01:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2FDA764E02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 8FF3C4B4C8; Fri, 12 Feb 2021 07:01:58 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y1oiYxCfGowa; Fri, 12 Feb 2021 07:01:57 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 61D6E4B4C2; Fri, 12 Feb 2021 07:01:57 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 303CC4B4BF for ; Fri, 12 Feb 2021 07:01:56 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S7pw5wb8thXD for ; Fri, 12 Feb 2021 07:01:55 -0500 (EST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 153154B4BE for ; Fri, 12 Feb 2021 07:01:55 -0500 (EST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A2C791063; Fri, 12 Feb 2021 04:01:54 -0800 (PST) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A95883F719; Fri, 12 Feb 2021 04:01:53 -0800 (PST) Subject: Re: [PATCH kvmtool 11/21] hw/rtc: Switch to new trap handler To: Andre Przywara , Will Deacon , Julien Thierry References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-12-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: Date: Fri, 12 Feb 2021 12:02:10 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20201210142908.169597-12-andre.przywara@arm.com> Content-Language: en-US Cc: linux-arm-kernel@lists.infradead.org, Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Hi Andre, On 12/10/20 2:28 PM, Andre Przywara wrote: > Now that the RTC device has a trap handler adhering to the MMIO fault > handler prototype, let's switch over to the joint registration routine. > > This allows us to get rid of the ioport shim routines. > > Signed-off-by: Andre Przywara > --- > hw/rtc.c | 21 ++------------------- > 1 file changed, 2 insertions(+), 19 deletions(-) > > diff --git a/hw/rtc.c b/hw/rtc.c > index 664d4cb0..ee4c9102 100644 > --- a/hw/rtc.c > +++ b/hw/rtc.c > @@ -120,23 +120,6 @@ static void cmos_ram_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, > } > } > > -static bool cmos_ram_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - cmos_ram_io(vcpu, port, data, size, false, NULL); > - return true; > -} > - > -static bool cmos_ram_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - cmos_ram_io(vcpu, port, data, size, true, NULL); > - return true; > -} > - > -static struct ioport_operations cmos_ram_ioport_ops = { > - .io_out = cmos_ram_out, > - .io_in = cmos_ram_in, > -}; > - > #ifdef CONFIG_HAS_LIBFDT > static void generate_rtc_fdt_node(void *fdt, > struct device_header *dev_hdr, > @@ -169,7 +152,7 @@ int rtc__init(struct kvm *kvm) > return r; > > /* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ > - r = ioport__register(kvm, 0x0070, &cmos_ram_ioport_ops, 2, NULL); > + r = kvm__register_pio(kvm, 0x0070, 2, cmos_ram_io, NULL); > if (r < 0) > goto out_device; > > @@ -188,7 +171,7 @@ dev_init(rtc__init); > int rtc__exit(struct kvm *kvm) > { > /* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ > - ioport__unregister(kvm, 0x0070); > + kvm__deregister_pio(kvm, 0x0070); > > return 0; > } Looks good: Reviewed-by: Alexandru Elisei Thanks, Alex _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 24B44C433E0 for ; Fri, 12 Feb 2021 12:03:09 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 E28A464E01 for ; Fri, 12 Feb 2021 12:03:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E28A464E01 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8JehcDYM5CrJ+KeKKIBdfUV2uYaz1eO4dFpmpOoUXm8=; b=sTPrrRLZyHlshpdXauJgJnd3b gt4ciEqGXwhTjI0arKKgs2M2DfgZmUMurbHK32AwVZlAZfqn4g4BbxB+9xHbC4vbnwOdk5Coh2bjR EeBH1csXdH1OuRaRnhAFcbY0rrWG+HuYtiePFEeThvPGSQtclKbV5jCTMGI0hIIyOfk2KlRBOJyni foBQ4V5EK2yqnbliivYVu7VTaLACVEboi4PrFbi7pHiUkX1OyYJnyhM6QmkjVOB6HSVI0FDjFSSou mgaYeoCQ0VQIa0xpTFAwWexPDJXZn/tWwjyV5t+MYYbx86NYVtDpKSXShaR9IRXeehV1BONf4GwKo beVULrD/w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lAX95-0004fc-0K; Fri, 12 Feb 2021 12:01:59 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lAX91-0004et-VC for linux-arm-kernel@lists.infradead.org; Fri, 12 Feb 2021 12:01:56 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A2C791063; Fri, 12 Feb 2021 04:01:54 -0800 (PST) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A95883F719; Fri, 12 Feb 2021 04:01:53 -0800 (PST) Subject: Re: [PATCH kvmtool 11/21] hw/rtc: Switch to new trap handler To: Andre Przywara , Will Deacon , Julien Thierry References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-12-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: Date: Fri, 12 Feb 2021 12:02:10 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20201210142908.169597-12-andre.przywara@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210212_070156_082691_62E170A2 X-CRM114-Status: GOOD ( 17.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Andre, On 12/10/20 2:28 PM, Andre Przywara wrote: > Now that the RTC device has a trap handler adhering to the MMIO fault > handler prototype, let's switch over to the joint registration routine. > > This allows us to get rid of the ioport shim routines. > > Signed-off-by: Andre Przywara > --- > hw/rtc.c | 21 ++------------------- > 1 file changed, 2 insertions(+), 19 deletions(-) > > diff --git a/hw/rtc.c b/hw/rtc.c > index 664d4cb0..ee4c9102 100644 > --- a/hw/rtc.c > +++ b/hw/rtc.c > @@ -120,23 +120,6 @@ static void cmos_ram_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, > } > } > > -static bool cmos_ram_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - cmos_ram_io(vcpu, port, data, size, false, NULL); > - return true; > -} > - > -static bool cmos_ram_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - cmos_ram_io(vcpu, port, data, size, true, NULL); > - return true; > -} > - > -static struct ioport_operations cmos_ram_ioport_ops = { > - .io_out = cmos_ram_out, > - .io_in = cmos_ram_in, > -}; > - > #ifdef CONFIG_HAS_LIBFDT > static void generate_rtc_fdt_node(void *fdt, > struct device_header *dev_hdr, > @@ -169,7 +152,7 @@ int rtc__init(struct kvm *kvm) > return r; > > /* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ > - r = ioport__register(kvm, 0x0070, &cmos_ram_ioport_ops, 2, NULL); > + r = kvm__register_pio(kvm, 0x0070, 2, cmos_ram_io, NULL); > if (r < 0) > goto out_device; > > @@ -188,7 +171,7 @@ dev_init(rtc__init); > int rtc__exit(struct kvm *kvm) > { > /* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ > - ioport__unregister(kvm, 0x0070); > + kvm__deregister_pio(kvm, 0x0070); > > return 0; > } Looks good: Reviewed-by: Alexandru Elisei Thanks, Alex _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel