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=-16.8 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,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 F102FC433FE for ; Thu, 10 Dec 2020 14:53:57 +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 8AE6F2310E for ; Thu, 10 Dec 2020 14:53:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8AE6F2310E 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:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pI1LH30uHXfZ7VVSgbFTxPLczhb5y0mZKxLjdZfvfcs=; b=pwcf0NCBC0p+/vh5qGohyde/uX 44u/lNjlM7gtxxenGCzYsfy3W5EKEPO2mnTriAJBDDBX1O4B82dEXOOJrHRjnEGF2GURI66mYPYis A+LkDk2m+H9QNT3fHOuqn87UBEAq7QaESiHyAXglNHrlZSRzsxgnEX+O/tx0moh4+9fSz29PUz7HX kc0ztr8dVDDbucBL40WQi/OsPP5SRpktTarpLxX2v70kwXpJFpvjBWE92vsgZ73tZjciQU1lEhNUA 6ZLN+1jQvQ1ZM9XQd/TFbJNbpp3sjnAcE8kTZ6LepbGiiNgQgLOhEBYVy/k9NanNCLvaW+zfqVfyK INu4WnQA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knNIh-0004uT-O2; Thu, 10 Dec 2020 14:52:11 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knNIZ-0004ot-O1 for linux-arm-kernel@merlin.infradead.org; Thu, 10 Dec 2020 14:52:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=LnFVLBVcy4cdIbiHOWDhJOEqHAJiIrZ7oNvs5XQBJQc=; b=Z87vpRirKMvTLS5oM+JIbrH3uv Tzs1XUjgbq+UfxkJDXvRSg3BoDQJ4BrWeEOxiYKCsvZvEmPkbwfPdBmygeSIINVZRCYFWHIZFiKoP GeXv0OsP1ng/jqkl5yr/Uwrroj+Ko5foZgvjeYUDRedqgPC29WkL9UzQOH9FGLZPPskEJnmQUkKmI LQElvpnxwdHL4O669ItYvZZY+YWqBqp+9hlAhJfLv2c4C3Z5NcoWuh27+GNxag4G9oRjIOmtdCZ8W tiEj/RDOqO5kD8iCiIPGpdPthjw6VxlkrnZCg3+iUryKwIqS2mHwxJFZzV6Dxrmyl+pcFlCtYbbgQ aUnsGaRg==; Received: from foss.arm.com ([217.140.110.172]) by casper.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knMwv-0002UG-RK for linux-arm-kernel@lists.infradead.org; Thu, 10 Dec 2020 14:29: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 7919A152B; Thu, 10 Dec 2020 06:29:40 -0800 (PST) Received: from donnerap.arm.com (donnerap.cambridge.arm.com [10.1.195.35]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5F6B13F718; Thu, 10 Dec 2020 06:29:39 -0800 (PST) From: Andre Przywara To: Will Deacon , Julien Thierry Subject: [PATCH kvmtool 14/21] hw/serial: Switch to new trap handlers Date: Thu, 10 Dec 2020 14:29:01 +0000 Message-Id: <20201210142908.169597-15-andre.przywara@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201210142908.169597-1-andre.przywara@arm.com> References: <20201210142908.169597-1-andre.przywara@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201210_142942_725996_BE5B3C99 X-CRM114-Status: GOOD ( 10.39 ) 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 , Alexandru Elisei , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org MIME-Version: 1.0 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 Now that the serial 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/serial.c | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/hw/serial.c b/hw/serial.c index 2907089c..d840eebc 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -397,31 +397,6 @@ static void serial8250_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, } } -static bool serial8250_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, - u16 port, void *data, int size) -{ - struct serial8250_device *dev = ioport->priv; - u8 value = ioport__read8(data); - - serial8250_mmio(vcpu, port, &value, 1, true, dev); - - return true; -} - -static bool serial8250_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, - u16 port, void *data, int size) -{ - struct serial8250_device *dev = ioport->priv; - u8 value = 0; - - - serial8250_mmio(vcpu, port, &value, 1, false, dev); - - ioport__write8(data, value); - - return true; -} - #ifdef CONFIG_HAS_LIBFDT char *fdt_stdout_path = NULL; @@ -459,11 +434,6 @@ void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr, } #endif -static struct ioport_operations serial8250_ops = { - .io_in = serial8250_ioport_in, - .io_out = serial8250_ioport_out, -}; - static int serial8250__device_init(struct kvm *kvm, struct serial8250_device *dev) { @@ -474,7 +444,7 @@ static int serial8250__device_init(struct kvm *kvm, return r; ioport__map_irq(&dev->irq); - r = ioport__register(kvm, dev->iobase, &serial8250_ops, 8, dev); + r = kvm__register_pio(kvm, dev->iobase, 8, serial8250_mmio, dev); return r; } @@ -497,7 +467,7 @@ cleanup: for (j = 0; j <= i; j++) { struct serial8250_device *dev = &devices[j]; - ioport__unregister(kvm, dev->iobase); + kvm__deregister_pio(kvm, dev->iobase); device__unregister(&dev->dev_hdr); } @@ -513,7 +483,7 @@ int serial8250__exit(struct kvm *kvm) for (i = 0; i < ARRAY_SIZE(devices); i++) { struct serial8250_device *dev = &devices[i]; - r = ioport__unregister(kvm, dev->iobase); + r = kvm__deregister_pio(kvm, dev->iobase); if (r < 0) return r; device__unregister(&dev->dev_hdr); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel