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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFA5BC43334 for ; Mon, 11 Jul 2022 12:11:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231656AbiGKMLF (ORCPT ); Mon, 11 Jul 2022 08:11:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231620AbiGKMKs (ORCPT ); Mon, 11 Jul 2022 08:10:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B10C49B4B; Mon, 11 Jul 2022 05:10:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3846CB80ED7; Mon, 11 Jul 2022 12:10:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8895C34115; Mon, 11 Jul 2022 12:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657541445; bh=A2vqBbzpMVWKfDpC3m2AhDB490zHtivAEnRyuR6TAjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ue5p6kKSr04mMCumm+ey6QjwRCScrVXkcQFvhov3N8VFxcOvj1Z8hMxH8tMHH8sU+ HnydaS6OeroOUvNXnn/dJ8URrtOrgMgRd0mQKua7ZsNX7tRDmvHm2ez85poO1yTcbk dHVo2Id1iTcVl+nMk6j4bxs1nJqOBVRnOlkNWfEZxMJCqPxj5qMvt6FlVehufTNhTj oD0Smi6zULtkbVrVl+oeUv9YyuZGUQpL29jKNepGzajkFEu6Md12wRDVGQUZaQ7kpX Kv6nwALF2Afz+F4iwpDKAs5DvNFzZKIXTSB5WDlmwwOM/l4k0AeyZ26qulfxUuiFWT alfxwduBeHAVA== Received: by pali.im (Postfix) id 61D32276F; Mon, 11 Jul 2022 14:10:42 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Thomas Petazzoni , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] PCI: aardvark: Do static allocation of irq_chip Date: Mon, 11 Jul 2022 14:06:26 +0200 Message-Id: <20220711120626.11492-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220711120626.11492-1-pali@kernel.org> References: <20220711120626.11492-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no need to allocate struct irq_chip in pci-aardvark.c dynamically at runtime. Use static allocation like for any other irq_chip usage. Signed-off-by: Pali Rohár --- drivers/pci/controller/pci-aardvark.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c index 8bea5801d50a..74511f015168 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -274,7 +274,6 @@ struct advk_pcie { u8 wins_count; struct irq_domain *rp_irq_domain; struct irq_domain *irq_domain; - struct irq_chip irq_chip; raw_spinlock_t irq_lock; struct irq_domain *msi_domain; struct irq_domain *msi_inner_domain; @@ -1328,13 +1327,19 @@ static void advk_pcie_irq_unmask(struct irq_data *d) raw_spin_unlock_irqrestore(&pcie->irq_lock, flags); } +static struct irq_chip advk_irq_chip = { + .name = "advk-INTx", + .irq_mask = advk_pcie_irq_mask, + .irq_unmask = advk_pcie_irq_unmask, +}; + static int advk_pcie_irq_map(struct irq_domain *h, unsigned int virq, irq_hw_number_t hwirq) { struct advk_pcie *pcie = h->host_data; irq_set_status_flags(virq, IRQ_LEVEL); - irq_set_chip_and_handler(virq, &pcie->irq_chip, + irq_set_chip_and_handler(virq, &advk_irq_chip, handle_level_irq); irq_set_chip_data(virq, pcie); @@ -1394,7 +1399,6 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie) struct device *dev = &pcie->pdev->dev; struct device_node *node = dev->of_node; struct device_node *pcie_intc_node; - struct irq_chip *irq_chip; int ret = 0; raw_spin_lock_init(&pcie->irq_lock); @@ -1405,28 +1409,14 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie) return -ENODEV; } - irq_chip = &pcie->irq_chip; - - irq_chip->name = devm_kasprintf(dev, GFP_KERNEL, "%s-irq", - dev_name(dev)); - if (!irq_chip->name) { - ret = -ENOMEM; - goto out_put_node; - } - - irq_chip->irq_mask = advk_pcie_irq_mask; - irq_chip->irq_unmask = advk_pcie_irq_unmask; - pcie->irq_domain = irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX, &advk_pcie_irq_domain_ops, pcie); if (!pcie->irq_domain) { dev_err(dev, "Failed to get a INTx IRQ domain\n"); ret = -ENOMEM; - goto out_put_node; } -out_put_node: of_node_put(pcie_intc_node); return ret; } -- 2.20.1 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 51588C43334 for ; Mon, 11 Jul 2022 12:11:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AnzsbZ3pNmuxu0PQCSlTlusqMI73y1BIeZwyycYryh4=; b=p2e32sFN4eYt5o XZ7ug3F0OVJwotTfD/GRtoRGBu2NqC6q+wl3hFfWeE7Uli+/UHgYYu3wfMfDYI9nhhIUPLmvlYD3r 3TaciZ55hV556RZsrJ3vugVNwQ8mwwwmvAibkxl6OEaTKjZU0A6GUVjlIRQUXBuQiVmgQpyNbKYEo rfkPV1eLYl5/NLCe7A4GJE2IcjbOj2YHOwIr9fQ2DlKiqihRlW3teqr+iQnTZnNZe0p1vH/exVouU Bd9C1EV+VIokY9sOpn1aEay4jP41UIJhcXgamrdBVW7Q+2VpeO/ot5Nt4pLRovSXciqqaRpjRdn8h q6DW7CBJwFfCjXRUBgdg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAsFe-001JO2-4n; Mon, 11 Jul 2022 12:10:58 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAsFT-001JJQ-3e for linux-arm-kernel@lists.infradead.org; Mon, 11 Jul 2022 12:10:48 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 903BE611F3; Mon, 11 Jul 2022 12:10:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8895C34115; Mon, 11 Jul 2022 12:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657541445; bh=A2vqBbzpMVWKfDpC3m2AhDB490zHtivAEnRyuR6TAjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ue5p6kKSr04mMCumm+ey6QjwRCScrVXkcQFvhov3N8VFxcOvj1Z8hMxH8tMHH8sU+ HnydaS6OeroOUvNXnn/dJ8URrtOrgMgRd0mQKua7ZsNX7tRDmvHm2ez85poO1yTcbk dHVo2Id1iTcVl+nMk6j4bxs1nJqOBVRnOlkNWfEZxMJCqPxj5qMvt6FlVehufTNhTj oD0Smi6zULtkbVrVl+oeUv9YyuZGUQpL29jKNepGzajkFEu6Md12wRDVGQUZaQ7kpX Kv6nwALF2Afz+F4iwpDKAs5DvNFzZKIXTSB5WDlmwwOM/l4k0AeyZ26qulfxUuiFWT alfxwduBeHAVA== Received: by pali.im (Postfix) id 61D32276F; Mon, 11 Jul 2022 14:10:42 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Thomas Petazzoni , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] PCI: aardvark: Do static allocation of irq_chip Date: Mon, 11 Jul 2022 14:06:26 +0200 Message-Id: <20220711120626.11492-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220711120626.11492-1-pali@kernel.org> References: <20220711120626.11492-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220711_051047_262753_838B34D9 X-CRM114-Status: GOOD ( 16.09 ) 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhlcmUgaXMgbm8gbmVlZCB0byBhbGxvY2F0ZSBzdHJ1Y3QgaXJxX2NoaXAgaW4gcGNpLWFhcmR2 YXJrLmMgZHluYW1pY2FsbHkKYXQgcnVudGltZS4gVXNlIHN0YXRpYyBhbGxvY2F0aW9uIGxpa2Ug Zm9yIGFueSBvdGhlciBpcnFfY2hpcCB1c2FnZS4KClNpZ25lZC1vZmYtYnk6IFBhbGkgUm9ow6Fy IDxwYWxpQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktYWFyZHZh cmsuYyB8IDI0ICsrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcgaW5z ZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvY29u dHJvbGxlci9wY2ktYWFyZHZhcmsuYyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLWFhcmR2 YXJrLmMKaW5kZXggOGJlYTU4MDFkNTBhLi43NDUxMWYwMTUxNjggMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvcGNpL2NvbnRyb2xsZXIvcGNpLWFhcmR2YXJrLmMKKysrIGIvZHJpdmVycy9wY2kvY29udHJv bGxlci9wY2ktYWFyZHZhcmsuYwpAQCAtMjc0LDcgKzI3NCw2IEBAIHN0cnVjdCBhZHZrX3BjaWUg ewogCXU4IHdpbnNfY291bnQ7CiAJc3RydWN0IGlycV9kb21haW4gKnJwX2lycV9kb21haW47CiAJ c3RydWN0IGlycV9kb21haW4gKmlycV9kb21haW47Ci0Jc3RydWN0IGlycV9jaGlwIGlycV9jaGlw OwogCXJhd19zcGlubG9ja190IGlycV9sb2NrOwogCXN0cnVjdCBpcnFfZG9tYWluICptc2lfZG9t YWluOwogCXN0cnVjdCBpcnFfZG9tYWluICptc2lfaW5uZXJfZG9tYWluOwpAQCAtMTMyOCwxMyAr MTMyNywxOSBAQCBzdGF0aWMgdm9pZCBhZHZrX3BjaWVfaXJxX3VubWFzayhzdHJ1Y3QgaXJxX2Rh dGEgKmQpCiAJcmF3X3NwaW5fdW5sb2NrX2lycXJlc3RvcmUoJnBjaWUtPmlycV9sb2NrLCBmbGFn cyk7CiB9CiAKK3N0YXRpYyBzdHJ1Y3QgaXJxX2NoaXAgYWR2a19pcnFfY2hpcCA9IHsKKwkubmFt ZSA9ICJhZHZrLUlOVHgiLAorCS5pcnFfbWFzayA9IGFkdmtfcGNpZV9pcnFfbWFzaywKKwkuaXJx X3VubWFzayA9IGFkdmtfcGNpZV9pcnFfdW5tYXNrLAorfTsKKwogc3RhdGljIGludCBhZHZrX3Bj aWVfaXJxX21hcChzdHJ1Y3QgaXJxX2RvbWFpbiAqaCwKIAkJCSAgICAgdW5zaWduZWQgaW50IHZp cnEsIGlycV9od19udW1iZXJfdCBod2lycSkKIHsKIAlzdHJ1Y3QgYWR2a19wY2llICpwY2llID0g aC0+aG9zdF9kYXRhOwogCiAJaXJxX3NldF9zdGF0dXNfZmxhZ3ModmlycSwgSVJRX0xFVkVMKTsK LQlpcnFfc2V0X2NoaXBfYW5kX2hhbmRsZXIodmlycSwgJnBjaWUtPmlycV9jaGlwLAorCWlycV9z ZXRfY2hpcF9hbmRfaGFuZGxlcih2aXJxLCAmYWR2a19pcnFfY2hpcCwKIAkJCQkgaGFuZGxlX2xl dmVsX2lycSk7CiAJaXJxX3NldF9jaGlwX2RhdGEodmlycSwgcGNpZSk7CiAKQEAgLTEzOTQsNyAr MTM5OSw2IEBAIHN0YXRpYyBpbnQgYWR2a19wY2llX2luaXRfaXJxX2RvbWFpbihzdHJ1Y3QgYWR2 a19wY2llICpwY2llKQogCXN0cnVjdCBkZXZpY2UgKmRldiA9ICZwY2llLT5wZGV2LT5kZXY7CiAJ c3RydWN0IGRldmljZV9ub2RlICpub2RlID0gZGV2LT5vZl9ub2RlOwogCXN0cnVjdCBkZXZpY2Vf bm9kZSAqcGNpZV9pbnRjX25vZGU7Ci0Jc3RydWN0IGlycV9jaGlwICppcnFfY2hpcDsKIAlpbnQg cmV0ID0gMDsKIAogCXJhd19zcGluX2xvY2tfaW5pdCgmcGNpZS0+aXJxX2xvY2spOwpAQCAtMTQw NSwyOCArMTQwOSwxNCBAQCBzdGF0aWMgaW50IGFkdmtfcGNpZV9pbml0X2lycV9kb21haW4oc3Ry dWN0IGFkdmtfcGNpZSAqcGNpZSkKIAkJcmV0dXJuIC1FTk9ERVY7CiAJfQogCi0JaXJxX2NoaXAg PSAmcGNpZS0+aXJxX2NoaXA7Ci0KLQlpcnFfY2hpcC0+bmFtZSA9IGRldm1fa2FzcHJpbnRmKGRl diwgR0ZQX0tFUk5FTCwgIiVzLWlycSIsCi0JCQkJCWRldl9uYW1lKGRldikpOwotCWlmICghaXJx X2NoaXAtPm5hbWUpIHsKLQkJcmV0ID0gLUVOT01FTTsKLQkJZ290byBvdXRfcHV0X25vZGU7Ci0J fQotCi0JaXJxX2NoaXAtPmlycV9tYXNrID0gYWR2a19wY2llX2lycV9tYXNrOwotCWlycV9jaGlw LT5pcnFfdW5tYXNrID0gYWR2a19wY2llX2lycV91bm1hc2s7Ci0KIAlwY2llLT5pcnFfZG9tYWlu ID0KIAkJaXJxX2RvbWFpbl9hZGRfbGluZWFyKHBjaWVfaW50Y19ub2RlLCBQQ0lfTlVNX0lOVFgs CiAJCQkJICAgICAgJmFkdmtfcGNpZV9pcnFfZG9tYWluX29wcywgcGNpZSk7CiAJaWYgKCFwY2ll LT5pcnFfZG9tYWluKSB7CiAJCWRldl9lcnIoZGV2LCAiRmFpbGVkIHRvIGdldCBhIElOVHggSVJR IGRvbWFpblxuIik7CiAJCXJldCA9IC1FTk9NRU07Ci0JCWdvdG8gb3V0X3B1dF9ub2RlOwogCX0K IAotb3V0X3B1dF9ub2RlOgogCW9mX25vZGVfcHV0KHBjaWVfaW50Y19ub2RlKTsKIAlyZXR1cm4g cmV0OwogfQotLSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5l bEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4v bGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=