From: guoren@kernel.org
To: arnd@arndb.de, robh+dt@kernel.org, marc.zyngier@arm.com
Cc: linux-kernel@vger.kernel.org, guoren@kernel.org,
linux-arch@vger.kernel.org, Guo Ren <ren_guo@c-sky.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 04/10] irqchip/csky: Optimize remove unnecessary loop irq handle
Date: Tue, 29 Jan 2019 20:24:23 +0800 [thread overview]
Message-ID: <1548764669-16656-4-git-send-email-guoren@kernel.org> (raw)
In-Reply-To: <1548764669-16656-1-git-send-email-guoren@kernel.org>
From: Guo Ren <ren_guo@c-sky.com>
Here is the previous interrupt processing flow:
while (pending) {
^^^^^^^^^^^^^^^ It's unnecessary!
get irq
handle_level/fasteoi_irq {
mask irq
driver irq handler
unmask irq
}
irq_exit {
preempt_count_sub(HARDIRQ_OFFSET);
if (!in_interrupt() && local_softirq_pending())
invoke_softirq();
Because: ^^^^^^^^^^^^^^^^ linux enable irq Here!
}
}
Because linux enable the irq in irq_exit() before ret, we needn't loop
read pending register again for next irq which is done during irq_exit().
Signed-off-by: Guo Ren <ren_guo@c-sky.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Marc Zyngier <marc.zyngier@arm.com>
---
drivers/irqchip/irq-csky-apb-intc.c | 36 ++++++++++++++++++------------------
drivers/irqchip/irq-csky-mpintc.c | 8 ++------
2 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/drivers/irqchip/irq-csky-apb-intc.c b/drivers/irqchip/irq-csky-apb-intc.c
index fcc5444..ae4c59b 100644
--- a/drivers/irqchip/irq-csky-apb-intc.c
+++ b/drivers/irqchip/irq-csky-apb-intc.c
@@ -150,7 +150,7 @@ ck_intc_init_comm(struct device_node *node, struct device_node *parent)
return 0;
}
-static inline bool handle_irq_perbit(struct pt_regs *regs, u32 hwirq,
+static inline bool handle_irq_onebit(struct pt_regs *regs, u32 hwirq,
u32 irq_base)
{
if (hwirq == 0)
@@ -166,16 +166,15 @@ static void gx_irq_handler(struct pt_regs *regs)
{
bool ret;
-retry:
- ret = handle_irq_perbit(regs,
+ ret = handle_irq_onebit(regs,
readl(reg_base + GX_INTC_PEN63_32), 32);
if (ret)
- goto retry;
+ return;
- ret = handle_irq_perbit(regs,
+ ret = handle_irq_onebit(regs,
readl(reg_base + GX_INTC_PEN31_00), 0);
- if (ret)
- goto retry;
+ if (!ret)
+ pr_err("%s: none irq pending!\n", __func__);
}
static int __init
@@ -277,29 +276,30 @@ static void ck_irq_handler(struct pt_regs *regs)
void __iomem *reg_pen_lo = reg_base + CK_INTC_PEN31_00;
void __iomem *reg_pen_hi = reg_base + CK_INTC_PEN63_32;
-retry:
/* handle 0 - 63 irqs */
- ret = handle_irq_perbit(regs, readl(reg_pen_hi), 32);
+ ret = handle_irq_onebit(regs, readl(reg_pen_hi), 32);
if (ret)
- goto retry;
+ return;
- ret = handle_irq_perbit(regs, readl(reg_pen_lo), 0);
+ ret = handle_irq_onebit(regs, readl(reg_pen_lo), 0);
if (ret)
- goto retry;
+ return;
- if (nr_irq == INTC_IRQS)
+ if (nr_irq == INTC_IRQS) {
+ pr_err("%s: none irq pending!\n", __func__);
return;
+ }
/* handle 64 - 127 irqs */
- ret = handle_irq_perbit(regs,
+ ret = handle_irq_onebit(regs,
readl(reg_pen_hi + CK_INTC_DUAL_BASE), 96);
if (ret)
- goto retry;
+ return;
- ret = handle_irq_perbit(regs,
+ ret = handle_irq_onebit(regs,
readl(reg_pen_lo + CK_INTC_DUAL_BASE), 64);
- if (ret)
- goto retry;
+ if (!ret)
+ pr_err("%s: none irq pending!\n", __func__);
}
static int __init
diff --git a/drivers/irqchip/irq-csky-mpintc.c b/drivers/irqchip/irq-csky-mpintc.c
index c67c961..99d3f3f 100644
--- a/drivers/irqchip/irq-csky-mpintc.c
+++ b/drivers/irqchip/irq-csky-mpintc.c
@@ -33,7 +33,6 @@ static void __iomem *INTCL_base;
#define INTCL_PICTLR 0x0
#define INTCL_SIGR 0x60
-#define INTCL_HPPIR 0x68
#define INTCL_RDYIR 0x6c
#define INTCL_SENR 0xa0
#define INTCL_CENR 0xa4
@@ -45,11 +44,8 @@ static void csky_mpintc_handler(struct pt_regs *regs)
{
void __iomem *reg_base = this_cpu_read(intcl_reg);
- do {
- handle_domain_irq(root_domain,
- readl_relaxed(reg_base + INTCL_RDYIR),
- regs);
- } while (readl_relaxed(reg_base + INTCL_HPPIR) & BIT(31));
+ handle_domain_irq(root_domain,
+ readl_relaxed(reg_base + INTCL_RDYIR), regs);
}
static void csky_mpintc_enable(struct irq_data *d)
--
2.7.4
next prev parent reply other threads:[~2019-01-29 12:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 12:24 [PATCH 01/10] irqchip/csky: Support csky,dh7k SOC intc driver guoren
2019-01-29 12:24 ` [PATCH 02/10] dt-bindings: csky,apb-intc: Add dh7k SOC support guoren
2019-01-29 12:24 ` [PATCH 03/10] csky: Fixup _PAGE_GLOBAL bit for 610 tlb entry guoren
2019-01-29 12:24 ` guoren [this message]
2019-01-29 12:24 ` [PATCH 05/10] irqchip/irq-csky-mpintc: Add triger type and priority guoren
2019-01-29 12:24 ` [PATCH 06/10] dt-bindings: interrupt-controller: Update csky mpintc guoren
2019-01-29 12:24 ` [PATCH 07/10] csky: Fixup wrong pt_regs size guoren
2019-01-29 12:24 ` [PATCH 08/10] csky: coding convention: Use task_stack_page guoren
2019-01-29 12:24 ` [PATCH 09/10] dt-bindings: csky,apb-intc: Add vector irq mode guoren
2019-01-29 12:24 ` [PATCH 10/10] irqchip/csky: Add support-vector-irq for apb-intc guoren
2019-02-14 14:03 ` [PATCH 01/10] irqchip/csky: Support csky,dh7k SOC intc driver Marc Zyngier
2019-02-15 1:21 ` Guo Ren
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=1548764669-16656-4-git-send-email-guoren@kernel.org \
--to=guoren@kernel.org \
--cc=arnd@arndb.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=ren_guo@c-sky.com \
--cc=robh+dt@kernel.org \
--cc=tglx@linutronix.de \
/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).