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=unavailable 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 0F042C433DB for ; Fri, 12 Feb 2021 11:15:39 +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 016BD64D74 for ; Fri, 12 Feb 2021 11:15:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 016BD64D74 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=2vhdj3heRYe9HIR+rP25+7N7ZhDSiF0VfyFwSaCDkCo=; b=2H/geeEcB/JTZNKIph1eilLm1 Ca5gYtCMlfHxT+dM/DgG3npkELoCWbMCs/EFPigvpf6+WyHF3iZcvvQzAbOUs54PZKQo72Es49OPH V4SK+TAxpSUv0gFiUW55Q9pHwGGZVMv7jxpBAfLxbu3le3RVzwklULi3hbx6qRTGiuXCs6+R8ts+a pqCVyWpUqX8sdtzm0Vj62bcIdBe9a7O8QafrimAhWaLO8osbnO0bZK5ohiHQxoYUjXu5ZQpQtGEjA 95tSkLCJjmNVmVriF0QzsdFCVJ5f0s01XX9/cPzpafgGK6YIaWJqV8FUVK1hfWeQCxIgW5on2K6B8 5C/bnQm6A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lAWP7-0006ja-Va; Fri, 12 Feb 2021 11:14:30 +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 1lAWP5-0006j5-BH for linux-arm-kernel@lists.infradead.org; Fri, 12 Feb 2021 11:14:28 +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 DB1D6113E; Fri, 12 Feb 2021 03:14:23 -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 D91A53F719; Fri, 12 Feb 2021 03:14:22 -0800 (PST) Subject: Re: [PATCH kvmtool 08/21] x86/ioport: Refactor trap handlers To: Andre Przywara , Will Deacon , Julien Thierry References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-9-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: <9089a68a-39ca-5047-24da-f1e2c1d52d22@arm.com> Date: Fri, 12 Feb 2021 11:14:39 +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-9-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_061427_524948_DC59AD1A X-CRM114-Status: GOOD ( 19.94 ) 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: > With the planned retirement of the special ioport emulation code, we > need to provide emulation functions compatible with the MMIO > prototype. > > Adjust the trap handlers to use that new function, and provide shims to > implement the old ioport interface, for now. > > Signed-off-by: Andre Przywara > --- > x86/ioport.c | 30 ++++++++++++++++++++++++++---- > 1 file changed, 26 insertions(+), 4 deletions(-) > > diff --git a/x86/ioport.c b/x86/ioport.c > index 8c5c7699..932da20a 100644 > --- a/x86/ioport.c > +++ b/x86/ioport.c > @@ -3,8 +3,14 @@ > #include > #include > > +static void dummy_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > + u8 is_write, void *ptr) > +{ > +} > + > static bool debug_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > { > + dummy_mmio(vcpu, port, data, size, true, NULL); > return 0; > } > > @@ -12,15 +18,23 @@ static struct ioport_operations debug_ops = { > .io_out = debug_io_out, > }; > > -static bool seabios_debug_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +static void seabios_debug_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, > + u32 len, u8 is_write, void *ptr) > { > char ch; > > + if (!is_write) > + return; > + > ch = ioport__read8(data); > > putchar(ch); > +} > > - return true; > +static bool seabios_debug_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +{ > + seabios_debug_mmio(vcpu, port, data, size, true, NULL); > + return 0; > } > > static struct ioport_operations seabios_debug_ops = { > @@ -29,11 +43,13 @@ static struct ioport_operations seabios_debug_ops = { > > static bool dummy_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > { > + dummy_mmio(vcpu, port, data, size, false, NULL); > return true; > } > > static bool dummy_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > { > + dummy_mmio(vcpu, port, data, size, true, NULL); > return true; > } > > @@ -50,13 +66,19 @@ static struct ioport_operations dummy_write_only_ioport_ops = { > * The "fast A20 gate" > */ > > -static bool ps2_control_a_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +static void ps2_control_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > + u8 is_write, void *ptr) > { > /* > * A20 is always enabled. > */ > - ioport__write8(data, 0x02); > + if (!is_write) > + ioport__write8(data, 0x02); > +} > > +static bool ps2_control_a_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +{ > + ps2_control_mmio(vcpu, port, data, size, false, NULL); > return true; > } > Looks correct to me, if not particularly pretty; thankfully the next patch removes all of these dummy functions. It compiles, so: 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