From: Florian Fainelli <f.fainelli@gmail.com>
To: Marc Zyngier <maz@kernel.org>
Cc: linux-kernel@vger.kernel.org, Rob Herring <robh@kernel.org>,
Ray Jui <rjui@broadcom.com>,
Scott Branden <sbranden@broadcom.com>,
"maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..."
<bcm-kernel-feedback-list@broadcom.com>,
Russell King <linux@armlinux.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Thomas Gleixner <tglx@linutronix.de>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
"moderated list:ARM SUB-ARCHITECTURES"
<linux-arm-kernel@lists.infradead.org>,
"open list:MIPS" <linux-mips@vger.kernel.org>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE"
<devicetree@vger.kernel.org>
Subject: Re: [PATCH v4 09/14] irqchip: Provide platform_device to of_irq_init_cb_t
Date: Tue, 19 Oct 2021 14:52:53 -0700 [thread overview]
Message-ID: <52edd412-4ffa-2f5e-4466-bca71abb5e66@gmail.com> (raw)
In-Reply-To: <871r4gvggb.wl-maz@kernel.org>
On 10/19/21 2:43 PM, Marc Zyngier wrote:
> On Sat, 09 Oct 2021 03:20:18 +0100,
> Florian Fainelli <f.fainelli@gmail.com> wrote:
>>
>> Provide the platform device mapping to the interrupt controller node to
>> the of_irq_init_cb_t callback such that drivers can make use of it.
>>
>> Reviewed-by: Rob Herring <robh@kernel.org>
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>> ---
>> drivers/irqchip/irqchip.c | 2 +-
>> drivers/irqchip/qcom-pdc.c | 3 ++-
>> drivers/of/irq.c | 2 +-
>> include/linux/of_irq.h | 5 ++++-
>> 4 files changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
>> index 3570f0a588c4..289784eefd00 100644
>> --- a/drivers/irqchip/irqchip.c
>> +++ b/drivers/irqchip/irqchip.c
>> @@ -55,6 +55,6 @@ int platform_irqchip_probe(struct platform_device *pdev)
>> if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY))
>> return -EPROBE_DEFER;
>>
>> - return irq_init_cb(np, par_np);
>> + return irq_init_cb(np, par_np, pdev);
>> }
>> EXPORT_SYMBOL_GPL(platform_irqchip_probe);
>> diff --git a/drivers/irqchip/qcom-pdc.c b/drivers/irqchip/qcom-pdc.c
>> index 173e6520e06e..819a93360b96 100644
>> --- a/drivers/irqchip/qcom-pdc.c
>> +++ b/drivers/irqchip/qcom-pdc.c
>> @@ -359,7 +359,8 @@ static int pdc_setup_pin_mapping(struct device_node *np)
>> return 0;
>> }
>>
>> -static int qcom_pdc_init(struct device_node *node, struct device_node *parent)
>> +static int qcom_pdc_init(struct device_node *node, struct device_node *parent,
>> + struct platform_device *pdev)
>> {
>> struct irq_domain *parent_domain, *pdc_domain, *pdc_gpio_domain;
>> int ret;
>> diff --git a/drivers/of/irq.c b/drivers/of/irq.c
>> index 352e14b007e7..18f3f5c00c87 100644
>> --- a/drivers/of/irq.c
>> +++ b/drivers/of/irq.c
>> @@ -538,7 +538,7 @@ void __init of_irq_init(const struct of_device_id *matches)
>> desc->dev,
>> desc->dev, desc->interrupt_parent);
>> ret = desc->irq_init_cb(desc->dev,
>> - desc->interrupt_parent);
>> + desc->interrupt_parent, NULL);
>> if (ret) {
>> of_node_clear_flag(desc->dev, OF_POPULATED);
>> kfree(desc);
>> diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
>> index aaf219bd0354..89acc8b089f0 100644
>> --- a/include/linux/of_irq.h
>> +++ b/include/linux/of_irq.h
>> @@ -9,7 +9,10 @@
>> #include <linux/ioport.h>
>> #include <linux/of.h>
>>
>> -typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *);
>> +struct platform_device;
>> +
>> +typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *,
>> + struct platform_device *);
>
> Having added some type-checking to the IRQCHIP_MATCH() #definery, I
> end-up with warnings such as:
>
> In file included from ./include/linux/kernel.h:16,
> from drivers/irqchip/irq-bcm7038-l1.c:12:
> ./include/linux/minmax.h:20:28: warning: comparison of distinct pointer types lacks a cast
> 20 | (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
> | ^~
> ./include/linux/irqchip.h:41:2: note: in expansion of macro ‘__typecheck’
> 41 | __typecheck(typecheck_irq_init_cb, fn) ? fn : fn
> | ^~~~~~~~~~~
> ./include/linux/irqchip.h:44:12: note: in expansion of macro ‘typecheck_irq_init_cb’
> 44 | .data = typecheck_irq_init_cb(fn), },
> | ^~~~~~~~~~~~~~~~~~~~~
> drivers/irqchip/irq-bcm7038-l1.c:459:1: note: in expansion of macro ‘IRQCHIP_MATCH’
> 459 | IRQCHIP_MATCH("brcm,bcm7038-l1-intc", bcm7038_l1_of_init)
> | ^~~~~~~~~~~~~
>
> Clearly, you didn't update the drivers you just converted to
> IRQCHIP_MATCH(), and only fixed the QC driver.
Yes, I will re-order the patches a little bit and update the drivers as
they are converted.
>
> FWIW, I'm planning to take something like the hack below into the tree
> to detect this sort of stuff early.
Sounds good, thanks!
--
Florian
next prev parent reply other threads:[~2021-10-19 21:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-09 2:20 [PATCH v4 00/14] Modular Broadcom irqchip drivers Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 01/14] MIPS: BMIPS: Remove use of irq_cpu_offline Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 02/14] irqchip/irq-bcm7038-l1: Remove .irq_cpu_offline() Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 03/14] irqchip/irq-bcm7038-l1: Use irq_get_irq_data() Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 04/14] irqchip/irq-bcm7038-l1: Gate use of CPU logical map to MIPS Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 05/14] irqchip/irq-bcm7038-l1: Restrict affinity setting " Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 06/14] irqchip/irq-bcm7038-l1: Switch to IRQCHIP_PLATFORM_DRIVER Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 07/14] genirq: Export irq_gc_{unmask_enable,mask_disable}_reg Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 08/14] irqchip/irq-brcmstb-l2: Switch to IRQCHIP_PLATFORM_DRIVER Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 09/14] irqchip: Provide platform_device to of_irq_init_cb_t Florian Fainelli
2021-10-19 21:43 ` Marc Zyngier
2021-10-19 21:52 ` Florian Fainelli [this message]
2021-10-19 22:23 ` Rob Herring
2021-10-20 8:24 ` Marc Zyngier
2021-10-20 15:14 ` Florian Fainelli
2021-10-20 15:28 ` Marc Zyngier
2021-10-09 2:20 ` [PATCH v4 10/14] genirq: Export irq_gc_noop() Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 11/14] irqchip/irq-bcm7120-l2: Switch to IRQCHIP_PLATFORM_DRIVER Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 12/14] arm64: broadcom: Removed forced select of interrupt controllers Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 13/14] ARM: bcm: " Florian Fainelli
2021-10-09 2:20 ` [PATCH v4 14/14] irqchip: Fix kernel-doc parameter typo for IRQCHIP_DECLARE Florian Fainelli
2021-10-19 19:13 ` [PATCH v4 00/14] Modular Broadcom irqchip drivers Florian Fainelli
2021-10-19 21:46 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52edd412-4ffa-2f5e-4466-bca71abb5e66@gmail.com \
--to=f.fainelli@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=maz@kernel.org \
--cc=rjui@broadcom.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=sbranden@broadcom.com \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).