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.2 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_SANE_2 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 44049C433DB for ; Wed, 17 Feb 2021 15:57:15 +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 CCAFF64DEC for ; Wed, 17 Feb 2021 15:57:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCAFF64DEC 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:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mG/L6axoG5BRlQqLyscnlE7+Ce6W5qxwWicJp81rx1o=; b=jzfmkAPmzGDVSvfRWFDqicvNt qZK6rtaHaSZaTtYyqpaWVyAehuDsO7XLVX24z6TkrI9gcWfaXbe5PBVbkrQGoQiUNJRjhudJtPZXF n3WxDOm1d11kupc+qVdmOj5Ix6hn68aubGH+6FS1gGSLL3eLF1mgj1bMk9sLToSopMJgOEGYR9Pzb 4pXAa7TqooiirPQ1HHrfUsZ6/3itfHvZpFfq0YF/+FT40X8H0BKH7hpodUUDYKqMUbwaWOgW9BA/I MQeKKXaEnfWBySL3RuNa349RoQnJ1gZL7lk+Ey8AoxVfzlRdwAByskITQc6YDrLUi88I0jczyg4ZF teLUxV10g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCPAt-0008JB-IC; Wed, 17 Feb 2021 15:55:35 +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 1lCPAr-0008I1-4u for linux-arm-kernel@lists.infradead.org; Wed, 17 Feb 2021 15:55:34 +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 E2AA4ED1; Wed, 17 Feb 2021 07:55:29 -0800 (PST) Received: from slackpad.fritz.box (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AAB543F694; Wed, 17 Feb 2021 07:55:28 -0800 (PST) Date: Wed, 17 Feb 2021 15:54:28 +0000 From: Andre Przywara To: Alexandru Elisei Subject: Re: [PATCH kvmtool 03/21] ioport: Retire .generate_fdt_node functionality Message-ID: <20210217155428.1574884b@slackpad.fritz.box> In-Reply-To: <3f1cf056-1913-cbbf-b9cd-12d1a840c468@arm.com> References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-4-andre.przywara@arm.com> <3f1cf056-1913-cbbf-b9cd-12d1a840c468@arm.com> Organization: Arm Ltd. X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.31; x86_64-slackware-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210217_105533_388714_669F38E4 X-CRM114-Status: GOOD ( 25.44 ) 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: kvm@vger.kernel.org, Marc Zyngier , Julien Thierry , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.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 On Thu, 11 Feb 2021 14:05:27 +0000 Alexandru Elisei wrote: > Hi Andre, > > On 12/10/20 2:28 PM, Andre Przywara wrote: > > The ioport routines support a special way of registering FDT node > > generator functions. There is no reason to have this separate from the > > already existing way via the device header. > > > > Now that the only user of this special ioport variety has been > > transferred, we can retire this code, to simplify ioport handling. > > One comment below, but otherwise very nice cleanup. > > > > > Signed-off-by: Andre Przywara > > --- > > include/kvm/ioport.h | 4 ---- > > ioport.c | 34 ---------------------------------- > > 2 files changed, 38 deletions(-) > > > > diff --git a/include/kvm/ioport.h b/include/kvm/ioport.h > > index d0213541..a61038e2 100644 > > --- a/include/kvm/ioport.h > > +++ b/include/kvm/ioport.h > > @@ -29,10 +29,6 @@ struct ioport { > > struct ioport_operations { > > bool (*io_in)(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size); > > bool (*io_out)(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size); > > - void (*generate_fdt_node)(struct ioport *ioport, void *fdt, > > - void (*generate_irq_prop)(void *fdt, > > - u8 irq, > > - enum irq_type)); > > }; > > > > void ioport__map_irq(u8 *irq); > > diff --git a/ioport.c b/ioport.c > > index 667e8386..b98836d3 100644 > > --- a/ioport.c > > +++ b/ioport.c > > @@ -56,7 +56,6 @@ static struct ioport *ioport_get(struct rb_root *root, u64 addr) > > /* Called with ioport_lock held. */ > > static void ioport_unregister(struct rb_root *root, struct ioport *data) > > { > > - device__unregister(&data->dev_hdr); > > ioport_remove(root, data); > > free(data); > > } > > @@ -70,30 +69,6 @@ static void ioport_put(struct rb_root *root, struct ioport *data) > > mutex_unlock(&ioport_lock); > > } > > > > -#ifdef CONFIG_HAS_LIBFDT > > -static void generate_ioport_fdt_node(void *fdt, > > - struct device_header *dev_hdr, > > - void (*generate_irq_prop)(void *fdt, > > - u8 irq, > > - enum irq_type)) > > -{ > > - struct ioport *ioport = container_of(dev_hdr, struct ioport, dev_hdr); > > - struct ioport_operations *ops = ioport->ops; > > - > > - if (ops->generate_fdt_node) > > - ops->generate_fdt_node(ioport, fdt, generate_irq_prop); > > -} > > -#else > > -static void generate_ioport_fdt_node(void *fdt, > > - struct device_header *dev_hdr, > > - void (*generate_irq_prop)(void *fdt, > > - u8 irq, > > - enum irq_type)) > > -{ > > - die("Unable to generate device tree nodes without libfdt\n"); > > -} > > -#endif > > - > > int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, int count, void *param) > > { > > struct ioport *entry; > > @@ -107,10 +82,6 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i > > .node = RB_INT_INIT(port, port + count), > > .ops = ops, > > .priv = param, > > - .dev_hdr = (struct device_header) { > > - .bus_type = DEVICE_BUS_IOPORT, > > - .data = generate_ioport_fdt_node, > > - }, > > Since the dev_hdr field is not used anymore, maybe it could also be removed from > struct ioport in include/kvm/ioport.h? I could (seems to indeed still work without it), but this whole structure will go away with a later patch, so I didn't bother so far. That's why I am not sure it's useful to do this at this point then. Cheers, Andre > > /* > > * Start from 0 because ioport__unregister() doesn't decrement > > * the reference count. > > @@ -123,15 +94,10 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i > > r = ioport_insert(&ioport_tree, entry); > > if (r < 0) > > goto out_free; > > - r = device__register(&entry->dev_hdr); > > - if (r < 0) > > - goto out_remove; > > mutex_unlock(&ioport_lock); > > > > return port; > > > > -out_remove: > > - ioport_remove(&ioport_tree, entry); > > out_free: > > free(entry); > > mutex_unlock(&ioport_lock); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel