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.7 required=3.0 tests=BAYES_00, 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 7DE05C4167B for ; Thu, 10 Dec 2020 19:29:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F1D0522EBE for ; Thu, 10 Dec 2020 19:29:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390310AbgLJT3Q (ORCPT ); Thu, 10 Dec 2020 14:29:16 -0500 Received: from foss.arm.com ([217.140.110.172]:44772 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390263AbgLJOaJ (ORCPT ); Thu, 10 Dec 2020 09:30:09 -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 43F3531B; Thu, 10 Dec 2020 06:29:23 -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 288143F718; Thu, 10 Dec 2020 06:29:22 -0800 (PST) From: Andre Przywara To: Will Deacon , Julien Thierry Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Alexandru Elisei , Marc Zyngier Subject: [PATCH kvmtool 01/21] ioport: Remove ioport__setup_arch() Date: Thu, 10 Dec 2020 14:28:48 +0000 Message-Id: <20201210142908.169597-2-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> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Since x86 had a special need for registering tons of special I/O ports, we had an ioport__setup_arch() callback, to allow each architecture to do the same. As it turns out no one uses it beside x86, so we remove that unnecessary abstraction. The generic function was registered via a device_base_init() call, so we just do the same for the x86 specific function only, and can remove the unneeded ioport__setup_arch(). Signed-off-by: Andre Przywara --- arm/ioport.c | 5 ----- include/kvm/ioport.h | 1 - ioport.c | 28 ---------------------------- mips/kvm.c | 5 ----- powerpc/ioport.c | 6 ------ x86/ioport.c | 25 ++++++++++++++++++++++++- 6 files changed, 24 insertions(+), 46 deletions(-) diff --git a/arm/ioport.c b/arm/ioport.c index 2f0feb9a..24092c9d 100644 --- a/arm/ioport.c +++ b/arm/ioport.c @@ -1,11 +1,6 @@ #include "kvm/ioport.h" #include "kvm/irq.h" -int ioport__setup_arch(struct kvm *kvm) -{ - return 0; -} - void ioport__map_irq(u8 *irq) { *irq = irq__alloc_line(); diff --git a/include/kvm/ioport.h b/include/kvm/ioport.h index 039633f7..d0213541 100644 --- a/include/kvm/ioport.h +++ b/include/kvm/ioport.h @@ -35,7 +35,6 @@ struct ioport_operations { enum irq_type)); }; -int ioport__setup_arch(struct kvm *kvm); void ioport__map_irq(u8 *irq); int __must_check ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, diff --git a/ioport.c b/ioport.c index 844a832d..667e8386 100644 --- a/ioport.c +++ b/ioport.c @@ -158,21 +158,6 @@ int ioport__unregister(struct kvm *kvm, u16 port) return 0; } -static void ioport__unregister_all(void) -{ - struct ioport *entry; - struct rb_node *rb; - struct rb_int_node *rb_node; - - rb = rb_first(&ioport_tree); - while (rb) { - rb_node = rb_int(rb); - entry = ioport_node(rb_node); - ioport_unregister(&ioport_tree, entry); - rb = rb_first(&ioport_tree); - } -} - static const char *to_direction(int direction) { if (direction == KVM_EXIT_IO_IN) @@ -220,16 +205,3 @@ out: return !kvm->cfg.ioport_debug; } - -int ioport__init(struct kvm *kvm) -{ - return ioport__setup_arch(kvm); -} -dev_base_init(ioport__init); - -int ioport__exit(struct kvm *kvm) -{ - ioport__unregister_all(); - return 0; -} -dev_base_exit(ioport__exit); diff --git a/mips/kvm.c b/mips/kvm.c index 26355930..e110e5d5 100644 --- a/mips/kvm.c +++ b/mips/kvm.c @@ -100,11 +100,6 @@ void kvm__irq_trigger(struct kvm *kvm, int irq) die_perror("KVM_IRQ_LINE ioctl"); } -int ioport__setup_arch(struct kvm *kvm) -{ - return 0; -} - bool kvm__arch_cpu_supports_vm(void) { return true; diff --git a/powerpc/ioport.c b/powerpc/ioport.c index 0c188b61..a5cff4ee 100644 --- a/powerpc/ioport.c +++ b/powerpc/ioport.c @@ -12,12 +12,6 @@ #include -int ioport__setup_arch(struct kvm *kvm) -{ - /* PPC has no legacy ioports to set up */ - return 0; -} - void ioport__map_irq(u8 *irq) { } diff --git a/x86/ioport.c b/x86/ioport.c index 7ad7b8f3..8c5c7699 100644 --- a/x86/ioport.c +++ b/x86/ioport.c @@ -69,7 +69,7 @@ void ioport__map_irq(u8 *irq) { } -int ioport__setup_arch(struct kvm *kvm) +static int ioport__setup_arch(struct kvm *kvm) { int r; @@ -150,3 +150,26 @@ int ioport__setup_arch(struct kvm *kvm) return 0; } +dev_base_init(ioport__setup_arch); + +static int ioport__remove_arch(struct kvm *kvm) +{ + ioport__unregister(kvm, 0x510); + ioport__unregister(kvm, 0x402); + ioport__unregister(kvm, 0x03D5); + ioport__unregister(kvm, 0x03D4); + ioport__unregister(kvm, 0x0378); + ioport__unregister(kvm, 0x0278); + ioport__unregister(kvm, 0x00F0); + ioport__unregister(kvm, 0x00ED); + ioport__unregister(kvm, IOPORT_DBG); + ioport__unregister(kvm, 0x00C0); + ioport__unregister(kvm, 0x00A0); + ioport__unregister(kvm, 0x0092); + ioport__unregister(kvm, 0x0040); + ioport__unregister(kvm, 0x0020); + ioport__unregister(kvm, 0x0000); + + return 0; +} +dev_base_exit(ioport__remove_arch); -- 2.17.1