From: Zhen Lei <thunder.leizhen@huawei.com> To: Thomas Gleixner <tglx@linutronix.de>, Jason Cooper <jason@lakedaemon.net>, Marc Zyngier <maz@kernel.org>, Rob Herring <robh+dt@kernel.org>, "Alexey Brodkin" <abrodkin@synopsys.com>, Vineet Gupta <vgupta@synopsys.com>, devicetree <devicetree@vger.kernel.org>, linux-snps-arc <linux-snps-arc@lists.infradead.org>, linux-kernel <linux-kernel@vger.kernel.org> Cc: Zhen Lei <thunder.leizhen@huawei.com>, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>, Haoyu Lv <lvhaoyu@huawei.com>, Libin <huawei.libin@huawei.com>, Kefeng Wang <wangkefeng.wang@huawei.com> Subject: [PATCH v6 2/6] irqchip: dw-apb-ictl: prepare for support hierarchy irq domain Date: Thu, 24 Sep 2020 15:17:50 +0800 [thread overview] Message-ID: <20200924071754.4509-3-thunder.leizhen@huawei.com> (raw) In-Reply-To: <20200924071754.4509-1-thunder.leizhen@huawei.com> Rename some functions and variables in advance, to make the next patch looks more clear. The details are as follows: 1. rename dw_apb_ictl_handler() to dw_apb_ictl_handle_irq_cascaded(). 2. change (1 << hwirq) to BIT(hwirq). In function dw_apb_ictl_init(): 1. rename local variable irq to parent_irq. 2. add "const struct irq_domain_ops *domain_ops = &irq_generic_chip_ops", then replace &irq_generic_chip_ops in other places with domain_ops. No functional change. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Tested-by: Haoyu Lv <lvhaoyu@huawei.com> --- drivers/irqchip/irq-dw-apb-ictl.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-dw-apb-ictl.c b/drivers/irqchip/irq-dw-apb-ictl.c index e4550e9c810ba94..5458004242e9d20 100644 --- a/drivers/irqchip/irq-dw-apb-ictl.c +++ b/drivers/irqchip/irq-dw-apb-ictl.c @@ -26,7 +26,7 @@ #define APB_INT_FINALSTATUS_H 0x34 #define APB_INT_BASE_OFFSET 0x04 -static void dw_apb_ictl_handler(struct irq_desc *desc) +static void dw_apb_ictl_handle_irq_cascaded(struct irq_desc *desc) { struct irq_domain *d = irq_desc_get_handler_data(desc); struct irq_chip *chip = irq_desc_get_chip(desc); @@ -43,7 +43,7 @@ static void dw_apb_ictl_handler(struct irq_desc *desc) u32 virq = irq_find_mapping(d, gc->irq_base + hwirq); generic_handle_irq(virq); - stat &= ~(1 << hwirq); + stat &= ~BIT(hwirq); } } @@ -73,12 +73,13 @@ static int __init dw_apb_ictl_init(struct device_node *np, struct irq_domain *domain; struct irq_chip_generic *gc; void __iomem *iobase; - int ret, nrirqs, irq, i; + int ret, nrirqs, parent_irq, i; u32 reg; + const struct irq_domain_ops *domain_ops = &irq_generic_chip_ops; /* Map the parent interrupt for the chained handler */ - irq = irq_of_parse_and_map(np, 0); - if (irq <= 0) { + parent_irq = irq_of_parse_and_map(np, 0); + if (parent_irq <= 0) { pr_err("%pOF: unable to parse irq\n", np); return -EINVAL; } @@ -120,8 +121,7 @@ static int __init dw_apb_ictl_init(struct device_node *np, else nrirqs = fls(readl_relaxed(iobase + APB_INT_ENABLE_L)); - domain = irq_domain_add_linear(np, nrirqs, - &irq_generic_chip_ops, NULL); + domain = irq_domain_add_linear(np, nrirqs, domain_ops, NULL); if (!domain) { pr_err("%pOF: unable to add irq domain\n", np); ret = -ENOMEM; @@ -146,7 +146,8 @@ static int __init dw_apb_ictl_init(struct device_node *np, gc->chip_types[0].chip.irq_resume = dw_apb_ictl_resume; } - irq_set_chained_handler_and_data(irq, dw_apb_ictl_handler, domain); + irq_set_chained_handler_and_data(parent_irq, + dw_apb_ictl_handle_irq_cascaded, domain); return 0; -- 1.8.3
WARNING: multiple messages have this Message-ID (diff)
From: Zhen Lei <thunder.leizhen@huawei.com> To: Thomas Gleixner <tglx@linutronix.de>, Jason Cooper <jason@lakedaemon.net>, Marc Zyngier <maz@kernel.org>, Rob Herring <robh+dt@kernel.org>, "Alexey Brodkin" <abrodkin@synopsys.com>, Vineet Gupta <vgupta@synopsys.com>, devicetree <devicetree@vger.kernel.org>, linux-snps-arc <linux-snps-arc@lists.infradead.org>, linux-kernel <linux-kernel@vger.kernel.org> Cc: Haoyu Lv <lvhaoyu@huawei.com>, Kefeng Wang <wangkefeng.wang@huawei.com>, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>, Libin <huawei.libin@huawei.com>, Zhen Lei <thunder.leizhen@huawei.com> Subject: [PATCH v6 2/6] irqchip: dw-apb-ictl: prepare for support hierarchy irq domain Date: Thu, 24 Sep 2020 15:17:50 +0800 [thread overview] Message-ID: <20200924071754.4509-3-thunder.leizhen@huawei.com> (raw) In-Reply-To: <20200924071754.4509-1-thunder.leizhen@huawei.com> Rename some functions and variables in advance, to make the next patch looks more clear. The details are as follows: 1. rename dw_apb_ictl_handler() to dw_apb_ictl_handle_irq_cascaded(). 2. change (1 << hwirq) to BIT(hwirq). In function dw_apb_ictl_init(): 1. rename local variable irq to parent_irq. 2. add "const struct irq_domain_ops *domain_ops = &irq_generic_chip_ops", then replace &irq_generic_chip_ops in other places with domain_ops. No functional change. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Tested-by: Haoyu Lv <lvhaoyu@huawei.com> --- drivers/irqchip/irq-dw-apb-ictl.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-dw-apb-ictl.c b/drivers/irqchip/irq-dw-apb-ictl.c index e4550e9c810ba94..5458004242e9d20 100644 --- a/drivers/irqchip/irq-dw-apb-ictl.c +++ b/drivers/irqchip/irq-dw-apb-ictl.c @@ -26,7 +26,7 @@ #define APB_INT_FINALSTATUS_H 0x34 #define APB_INT_BASE_OFFSET 0x04 -static void dw_apb_ictl_handler(struct irq_desc *desc) +static void dw_apb_ictl_handle_irq_cascaded(struct irq_desc *desc) { struct irq_domain *d = irq_desc_get_handler_data(desc); struct irq_chip *chip = irq_desc_get_chip(desc); @@ -43,7 +43,7 @@ static void dw_apb_ictl_handler(struct irq_desc *desc) u32 virq = irq_find_mapping(d, gc->irq_base + hwirq); generic_handle_irq(virq); - stat &= ~(1 << hwirq); + stat &= ~BIT(hwirq); } } @@ -73,12 +73,13 @@ static int __init dw_apb_ictl_init(struct device_node *np, struct irq_domain *domain; struct irq_chip_generic *gc; void __iomem *iobase; - int ret, nrirqs, irq, i; + int ret, nrirqs, parent_irq, i; u32 reg; + const struct irq_domain_ops *domain_ops = &irq_generic_chip_ops; /* Map the parent interrupt for the chained handler */ - irq = irq_of_parse_and_map(np, 0); - if (irq <= 0) { + parent_irq = irq_of_parse_and_map(np, 0); + if (parent_irq <= 0) { pr_err("%pOF: unable to parse irq\n", np); return -EINVAL; } @@ -120,8 +121,7 @@ static int __init dw_apb_ictl_init(struct device_node *np, else nrirqs = fls(readl_relaxed(iobase + APB_INT_ENABLE_L)); - domain = irq_domain_add_linear(np, nrirqs, - &irq_generic_chip_ops, NULL); + domain = irq_domain_add_linear(np, nrirqs, domain_ops, NULL); if (!domain) { pr_err("%pOF: unable to add irq domain\n", np); ret = -ENOMEM; @@ -146,7 +146,8 @@ static int __init dw_apb_ictl_init(struct device_node *np, gc->chip_types[0].chip.irq_resume = dw_apb_ictl_resume; } - irq_set_chained_handler_and_data(irq, dw_apb_ictl_handler, domain); + irq_set_chained_handler_and_data(parent_irq, + dw_apb_ictl_handle_irq_cascaded, domain); return 0; -- 1.8.3 _______________________________________________ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
next prev parent reply other threads:[~2020-09-24 7:19 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-24 7:17 [PATCH v6 0/6] irqchip: dw-apb-ictl: support hierarchy irq domain Zhen Lei 2020-09-24 7:17 ` Zhen Lei 2020-09-24 7:17 ` [PATCH v6 1/6] genirq: define an empty function set_handle_irq() if !GENERIC_IRQ_MULTI_HANDLER Zhen Lei 2020-09-24 7:17 ` Zhen Lei 2020-10-11 17:57 ` [tip: irq/core] genirq: Add stub for set_handle_irq() when !GENERIC_IRQ_MULTI_HANDLER tip-bot2 for Zhen Lei 2020-09-24 7:17 ` Zhen Lei [this message] 2020-09-24 7:17 ` [PATCH v6 2/6] irqchip: dw-apb-ictl: prepare for support hierarchy irq domain Zhen Lei 2020-10-11 17:57 ` [tip: irq/core] irqchip/dw-apb-ictl: Refactor priot to introducing hierarchical irq domains tip-bot2 for Zhen Lei 2020-09-24 7:17 ` [PATCH v6 3/6] irqchip: dw-apb-ictl: support hierarchy irq domain Zhen Lei 2020-09-24 7:17 ` Zhen Lei 2020-10-11 17:57 ` [tip: irq/core] irqchip/dw-apb-ictl: Add primary interrupt controller support tip-bot2 for Zhen Lei 2020-09-24 7:17 ` [PATCH v6 4/6] dt-bindings: dw-apb-ictl: support hierarchy irq domain Zhen Lei 2020-09-24 7:17 ` Zhen Lei 2020-10-11 17:57 ` [tip: irq/core] dt-bindings: dw-apb-ictl: Update binding to describe use as primary interrupt controller tip-bot2 for Zhen Lei 2020-09-24 7:17 ` [PATCH v6 5/6] dt-bindings: dw-apb-ictl: convert to json-schema Zhen Lei 2020-09-24 7:17 ` Zhen Lei 2020-09-27 9:53 ` Leizhen (ThunderTown) 2020-09-27 9:53 ` Leizhen (ThunderTown) 2020-09-28 18:26 ` Rob Herring 2020-09-28 18:26 ` Rob Herring 2020-09-29 1:37 ` Leizhen (ThunderTown) 2020-09-29 1:37 ` Leizhen (ThunderTown) 2020-09-24 7:17 ` [PATCH v6 6/6] ARC: [dts] fix the errors detected by dtbs_check Zhen Lei 2020-09-24 7:17 ` Zhen Lei 2020-09-28 18:32 ` Vineet Gupta 2020-09-28 18:32 ` Vineet Gupta 2020-09-25 15:54 ` [PATCH v6 0/6] irqchip: dw-apb-ictl: support hierarchy irq domain Marc Zyngier 2020-09-25 15:54 ` Marc Zyngier 2020-09-27 6:49 ` Leizhen (ThunderTown) 2020-09-27 6:49 ` Leizhen (ThunderTown)
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=20200924071754.4509-3-thunder.leizhen@huawei.com \ --to=thunder.leizhen@huawei.com \ --cc=abrodkin@synopsys.com \ --cc=devicetree@vger.kernel.org \ --cc=huawei.libin@huawei.com \ --cc=jason@lakedaemon.net \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-snps-arc@lists.infradead.org \ --cc=lvhaoyu@huawei.com \ --cc=maz@kernel.org \ --cc=robh+dt@kernel.org \ --cc=sebastian.hesselbarth@gmail.com \ --cc=tglx@linutronix.de \ --cc=vgupta@synopsys.com \ --cc=wangkefeng.wang@huawei.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.