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 82124C433DB for ; Thu, 11 Feb 2021 17:24:12 +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 3082B64DE9 for ; Thu, 11 Feb 2021 17:24:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3082B64DE9 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=R0NNlOnnsOHGHQhY63l8lbR8r0EEqSzcjibbwrxI6Hg=; b=m3bfJw/tJ1orHeZKud0g6wN5w cV87qqQECnz4mZaQHFP5XicF5gCv9RkEjXW3mP9sBcOqT5/GdM290SnXKauD98LKMlePCB+5iEkzf 8Bh8+mlnExrnG2o8MbTNXTjkZpqNcLeJBi13RmOfclYXE1FzOu0ltCFhlAe7wTfNVF5X7n5Ryg2on vav2AGHHExApvirS2f9D16GABbYimH+6f5lunHkEGBR9y/zgHOYF26EKWvOFqLMXFjg/i5DkEOpyO 1ttjvcWdhpOm08XheIwkJf4fjNNwzxpWIDv6XHEKzYCF4SHXqxUG5a9qVOuA806eKsWzpoqmtTzMb U2jq/SCVg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lAFgJ-0003Xa-Ls; Thu, 11 Feb 2021 17:23:08 +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 1lAFgH-0003Wy-2U for linux-arm-kernel@lists.infradead.org; Thu, 11 Feb 2021 17:23:06 +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 6DCD411D4; Thu, 11 Feb 2021 09:23:04 -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 C75A33F73B; Thu, 11 Feb 2021 09:23:02 -0800 (PST) Subject: Re: [PATCH kvmtool 06/21] hw/i8042: Refactor trap handler To: Andre Przywara , Will Deacon , Julien Thierry References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-7-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: <288df0e8-997c-7691-2dda-017876dba3f4@arm.com> Date: Thu, 11 Feb 2021 17:23:13 +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-7-andre.przywara@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210211_122305_229540_B569ABDD X-CRM114-Status: GOOD ( 23.59 ) 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 an emulation function compatible with the MMIO > prototype. > > Adjust the trap handler to use that new function, and provide shims to > implement the old ioport interface, for now. > > Signed-off-by: Andre Przywara > --- > hw/i8042.c | 68 +++++++++++++++++++++++++++--------------------------- > 1 file changed, 34 insertions(+), 34 deletions(-) > > diff --git a/hw/i8042.c b/hw/i8042.c > index 36ee183f..eb1f9d28 100644 > --- a/hw/i8042.c > +++ b/hw/i8042.c > @@ -292,52 +292,52 @@ static void kbd_reset(void) > }; > } > > -/* > - * Called when the OS has written to one of the keyboard's ports (0x60 or 0x64) > - */ > -static bool kbd_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +static void kbd_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > + u8 is_write, void *ptr) > { > - switch (port) { > - case I8042_COMMAND_REG: { > - u8 value = kbd_read_status(); > - ioport__write8(data, value); > + u8 value; > + > + if (is_write) > + value = ioport__read8(data); > + > + switch (addr) { > + case I8042_COMMAND_REG: > + if (is_write) > + kbd_write_command(vcpu->kvm, value); > + else > + value = kbd_read_status(); > break; > - } > - case I8042_DATA_REG: { > - u8 value = kbd_read_data(); > - ioport__write8(data, value); > + case I8042_DATA_REG: > + if (is_write) > + kbd_write_data(value); > + else > + value = kbd_read_data(); > break; > - } > - case I8042_PORT_B_REG: { > - ioport__write8(data, 0x20); > + case I8042_PORT_B_REG: > + if (!is_write) > + value = 0x20; > break; > - } > default: > - return false; > + return; Any particular reason for removing the false return value? I don't see it mentioned in the commit message. Otherwise this is identical to the two functions it replaces. > } > > + if (!is_write) > + ioport__write8(data, value); > +} > + > +/* > + * Called when the OS has written to one of the keyboard's ports (0x60 or 0x64) > + */ > +static bool kbd_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +{ > + kbd_io(vcpu, port, data, size, false, NULL); is_write is an u8, not a bool. I never could wrap my head around the ioport convention of "in" (read) and "out" (write). To be honest, changing is_write changed to an enum so it's crystal clear what is happening would help with that a lot, but I guess that's a separate patch. Thanks, Alex > + > return true; > } > > static bool kbd_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > { > - switch (port) { > - case I8042_COMMAND_REG: { > - u8 value = ioport__read8(data); > - kbd_write_command(vcpu->kvm, value); > - break; > - } > - case I8042_DATA_REG: { > - u8 value = ioport__read8(data); > - kbd_write_data(value); > - break; > - } > - case I8042_PORT_B_REG: { > - break; > - } > - default: > - return false; > - } > + kbd_io(vcpu, port, data, size, true, NULL); > > return true; > } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel