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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 15C10C83F0F for ; Tue, 8 Jul 2025 19:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JV/ndeDsHJ14fbDIDrbazHB3qAR6zXphNM/V+ZmK2To=; b=Jk6Br0nHT04N5zGR+RtOF5GuDJ OEivGhW9VBSQRaKSZ20L+oRpPM43tcWM+zamtqxtCoERMH3vq//C5kxtEqg4ZxBfTgQKgI1XaIq+O QayACPyTmOpWZoWWmdxBeC+CTejvxDv2+FnwE67iGbAe6Ap6jfhWMBviR5jJ/9nSAd5hsMq6fmRwz 9J+X+Md/dDa3Ztt1rr7zwxAgCUO5IYkTbaS8f/4UdMe35CZ35XBgyTOIK34EzdpVNv/09Sk4Ar78j UTJ2/UuRqyDCj6SMrsmkWmPM6xgO/blOLja3lUrMADm3rd2LR8ca4vlZKFxGolxnIHNnXycEzef5e 7LbLuOUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uZEA9-00000006Mhp-2p7z; Tue, 08 Jul 2025 19:39:33 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uZCCy-000000067s6-35lZ for linux-arm-kernel@bombadil.infradead.org; Tue, 08 Jul 2025 17:34:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=JV/ndeDsHJ14fbDIDrbazHB3qAR6zXphNM/V+ZmK2To=; b=P3e5ZInmop1wdEsIXAHFu1vm9p KX0ljtWn2YDG0gbYWskP0Yc0fDJB5ybIyNOSRZouexmCi8EP1XKBLNhdjZhPGgjxIFNLrbN0F5car iJLMP9N6qmsqWcpeqAkPDI4PU2M+ebZXeU7Swm7dmoKtHxZDigg91GTqHLubHBphp4c6ciMrckZ1B Coyea42JSdEYjqYp+oK8DXDBeEqSMeHcYtJvEQNMePxDio6h1JZwFUY3LqF90t5yX3tVLJBeSsW4m qCR7kxWycIWeUoeuhBR9XF1GJnlboxDVTKAwlPQj4OmRdNRfsYkjVEuK4/KwsDOJb39G1ZBY/FXv/ GTyNHI2w==; Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uZCCt-00000008lV8-43ES for linux-arm-kernel@lists.infradead.org; Tue, 08 Jul 2025 17:34:19 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id F277F46923; Tue, 8 Jul 2025 17:34:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C81CBC4AF11; Tue, 8 Jul 2025 17:34:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751996051; bh=sUDI0sVBiIi+pYG0gkV4tQMbcNs3s0ngOA+Z4GztBAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PuxR3VgkOzp5yMyQiZyTvI8UOabnPg4R4zfwaQNJFOCVRgurw/UNyfyEmUMY/bmuZ ptOwPj74YyIy1a53UUL34SuyoJZjEPL4MO5Q6fnnU1YoXOTyxQYxU/gqF6pPTrXr49 aK2ZY/9zxYWSTKaLeoD5HWsRbSLUVFktNJpvrD6gmOySjN30tGSDDbD669hblWsBpi p8aD4owpOBEvhWsf8eug1KZuDiNyLmbDSprNBRGMmKNnV6pMfkkXOAQNYSwU2601ks IKUeHZ4q1RFByH5LBxL32ud4y16R6IrbWqAxOVXVvKUrmhfFkoyEw0/6MPrdzQ5Lew ZZVWRn6QG31RA== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1uZCCn-00Dqhw-Vj; Tue, 08 Jul 2025 18:34:10 +0100 From: Marc Zyngier To: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Toan Le , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas , Thomas Gleixner Subject: [PATCH v2 07/13] PCI: xgene-msi: Use device-managed memory allocations Date: Tue, 8 Jul 2025 18:33:58 +0100 Message-Id: <20250708173404.1278635-8-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250708173404.1278635-1-maz@kernel.org> References: <20250708173404.1278635-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, toan@os.amperecomputing.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, robh@kernel.org, bhelgaas@google.com, tglx@linutronix.de X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250708_183416_412678_B1A95B09 X-CRM114-Status: GOOD ( 18.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since the MSI driver is probed as a platform device, there is no reason to not use device-managed allocations. That's including the top-level bookkeeping structure, which is better dynamically alocated than being static. Signed-off-by: Marc Zyngier --- drivers/pci/controller/pci-xgene-msi.c | 37 +++++++++++++------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/pci/controller/pci-xgene-msi.c b/drivers/pci/controller/pci-xgene-msi.c index 50a817920cfd9..8b6724fe8d71c 100644 --- a/drivers/pci/controller/pci-xgene-msi.c +++ b/drivers/pci/controller/pci-xgene-msi.c @@ -40,7 +40,7 @@ struct xgene_msi { }; /* Global data */ -static struct xgene_msi xgene_msi_ctrl; +static struct xgene_msi *xgene_msi_ctrl; /* * X-Gene v1 has 16 groups of MSI termination registers MSInIRx, where @@ -253,18 +253,18 @@ static void xgene_free_domains(struct xgene_msi *msi) irq_domain_remove(msi->inner_domain); } -static int xgene_msi_init_allocator(struct xgene_msi *xgene_msi) +static int xgene_msi_init_allocator(struct device *dev) { - xgene_msi->bitmap = bitmap_zalloc(NR_MSI_VEC, GFP_KERNEL); - if (!xgene_msi->bitmap) + xgene_msi_ctrl->bitmap = devm_bitmap_zalloc(dev, NR_MSI_VEC, GFP_KERNEL); + if (!xgene_msi_ctrl->bitmap) return -ENOMEM; - mutex_init(&xgene_msi->bitmap_lock); + mutex_init(&xgene_msi_ctrl->bitmap_lock); - xgene_msi->msi_groups = kcalloc(NR_HW_IRQS, - sizeof(struct xgene_msi_group), - GFP_KERNEL); - if (!xgene_msi->msi_groups) + xgene_msi_ctrl->msi_groups = devm_kcalloc(dev, NR_HW_IRQS, + sizeof(struct xgene_msi_group), + GFP_KERNEL); + if (!xgene_msi_ctrl->msi_groups) return -ENOMEM; return 0; @@ -273,15 +273,14 @@ static int xgene_msi_init_allocator(struct xgene_msi *xgene_msi) static void xgene_msi_isr(struct irq_desc *desc) { struct irq_chip *chip = irq_desc_get_chip(desc); + struct xgene_msi *xgene_msi = xgene_msi_ctrl; struct xgene_msi_group *msi_groups; - struct xgene_msi *xgene_msi; int msir_index, msir_val, hw_irq, ret; u32 intr_index, grp_select, msi_grp; chained_irq_enter(chip, desc); msi_groups = irq_desc_get_handler_data(desc); - xgene_msi = msi_groups->msi; msi_grp = msi_groups->msi_grp; /* @@ -344,15 +343,12 @@ static void xgene_msi_remove(struct platform_device *pdev) kfree(msi->msi_groups); - bitmap_free(msi->bitmap); - msi->bitmap = NULL; - xgene_free_domains(msi); } static int xgene_msi_hwirq_alloc(unsigned int cpu) { - struct xgene_msi *msi = &xgene_msi_ctrl; + struct xgene_msi *msi = xgene_msi_ctrl; struct xgene_msi_group *msi_group; int i; int err; @@ -381,7 +377,7 @@ static int xgene_msi_hwirq_alloc(unsigned int cpu) static int xgene_msi_hwirq_free(unsigned int cpu) { - struct xgene_msi *msi = &xgene_msi_ctrl; + struct xgene_msi *msi = xgene_msi_ctrl; struct xgene_msi_group *msi_group; int i; @@ -406,7 +402,12 @@ static int xgene_msi_probe(struct platform_device *pdev) int virt_msir; u32 msi_val, msi_idx; - xgene_msi = &xgene_msi_ctrl; + xgene_msi_ctrl = devm_kzalloc(&pdev->dev, sizeof(*xgene_msi_ctrl), + GFP_KERNEL); + if (!xgene_msi_ctrl) + return -ENOMEM; + + xgene_msi = xgene_msi_ctrl; platform_set_drvdata(pdev, xgene_msi); @@ -417,7 +418,7 @@ static int xgene_msi_probe(struct platform_device *pdev) } xgene_msi->msi_addr = res->start; - rc = xgene_msi_init_allocator(xgene_msi); + rc = xgene_msi_init_allocator(&pdev->dev); if (rc) { dev_err(&pdev->dev, "Error allocating MSI bitmap\n"); goto error; -- 2.39.2