From: gerlando.falauto@keymile.com (Gerlando Falauto)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 7/9] genirq: handle separate mask registers
Date: Mon, 18 Mar 2013 15:00:53 +0100 [thread overview]
Message-ID: <1363615255-18200-8-git-send-email-gerlando.falauto@keymile.com> (raw)
In-Reply-To: <1363615255-18200-1-git-send-email-gerlando.falauto@keymile.com>
There are cases where all irq_chip_type instances have separate mask registers,
making a shared mask register cache unsuitable for the purpose.
So introduce a new flag IRQ_GC_SEPARATE_MASK_REGISTERS to explicitly enable
this separate treatment.
When this flag is not set, pointers for all irq_chip_type instances point
to the the shared mask register as it has been done so far.
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
---
include/linux/irq.h | 1 +
kernel/irq/generic-chip.c | 15 +++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 5aca310..9feb06f 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -700,6 +700,7 @@ struct irq_chip_generic {
enum irq_gc_flags {
IRQ_GC_INIT_MASK_CACHE = 1 << 0,
IRQ_GC_INIT_NESTED_LOCK = 1 << 1,
+ IRQ_GC_SEPARATE_MASK_REGISTERS = 1 << 2,
};
/* Generic chip callback functions */
diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c
index b5cb991..ae5ce41 100644
--- a/kernel/irq/generic-chip.c
+++ b/kernel/irq/generic-chip.c
@@ -241,19 +241,26 @@ void irq_setup_generic_chip(struct irq_chip_generic *gc, u32 msk,
{
struct irq_chip_type *ct = gc->chip_types;
unsigned int i;
+ bool mskperct = flags & IRQ_GC_SEPARATE_MASK_REGISTERS;
+ bool mskinit = flags & IRQ_GC_INIT_MASK_CACHE;
raw_spin_lock(&gc_lock);
list_add_tail(&gc->list, &gc_list);
raw_spin_unlock(&gc_lock);
/* Init mask cache ? */
- if (flags & IRQ_GC_INIT_MASK_CACHE)
+ if (mskinit && !mskperct)
gc->shared_mask_cache =
irq_reg_readl(gc->reg_base + ct->regs.mask);
- /* Initialize mask cache pointer */
- for (i = 0; i < gc->num_ct; i++)
- ct[i].pmask_cache = &gc->shared_mask_cache;
+ /* Initialize mask cache pointers */
+ for (i = 0; i < gc->num_ct; i++) {
+ ct[i].pmask_cache = mskperct ?
+ &ct[i].mask_cache : &gc->shared_mask_cache;
+ if (mskinit && mskperct)
+ ct[i].mask_cache =
+ irq_reg_readl(gc->reg_base + ct[i].regs.mask);
+ }
for (i = gc->irq_base; msk; msk >>= 1, i++) {
if (!(msk & 0x01))
--
1.7.10.1
next prev parent reply other threads:[~2013-03-18 14:00 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-14 16:10 [PATCH] genirq: allow an alternative setup for the mask cache Holger Brunck
2013-03-14 17:45 ` Simon Guinot
2013-03-15 10:43 ` Holger Brunck
2013-03-15 11:02 ` Thomas Gleixner
2013-03-15 16:26 ` Gerlando Falauto
2013-03-15 19:55 ` Thomas Gleixner
2013-03-14 19:08 ` Thomas Gleixner
2013-03-14 19:42 ` Ezequiel Garcia
2013-03-18 11:05 ` Gerlando Falauto
2013-03-15 19:36 ` [PATCH v2 0/2] refactoring for mask_cache Gerlando Falauto
2013-03-15 19:36 ` [PATCH 1/2] genirq: cosmetic: remove cur_regs Gerlando Falauto
2013-03-15 19:36 ` [PATCH 2/2] genirq: move mask_cache into struct irq_chip_type Gerlando Falauto
2013-03-15 20:47 ` Thomas Gleixner
2013-03-18 7:59 ` Gerlando Falauto
2013-03-18 8:56 ` Thomas Gleixner
2013-03-15 21:25 ` [PATCH v2 0/2] refactoring for mask_cache Andrew Lunn
2013-03-15 23:34 ` Simon Guinot
2013-03-18 14:00 ` [PATCH v3 0/9] " Gerlando Falauto
2013-03-18 14:00 ` [PATCH v3 1/9] genirq: cosmetic: remove cur_regs Gerlando Falauto
2013-03-18 14:00 ` [PATCH v3 2/9] genirq: add mask_cache and pmask_cache into struct irq_chip_type Gerlando Falauto
2013-03-19 11:32 ` Thomas Gleixner
2013-03-18 14:00 ` [PATCH v3 3/9] gpio: mvebu: convert to usage of *pmask_cache within irq_chip_type Gerlando Falauto
2013-03-18 14:00 ` [PATCH v3 4/9] MIPS: JZ4740: " Gerlando Falauto
2013-03-18 14:00 ` [PATCH v3 5/9] ARM: SAMSUNG: " Gerlando Falauto
2013-03-18 14:00 ` [PATCH v3 6/9] genirq: rename mask_cache to shared_mask_cache Gerlando Falauto
2013-03-18 14:00 ` Gerlando Falauto [this message]
2013-03-18 14:00 ` [PATCH v3 8/9] orion-gpio: enable IRQ_GC_SEPARATE_MASK_REGISTERS Gerlando Falauto
2013-03-18 14:00 ` [PATCH v3 9/9] gpio: mvebu: " Gerlando Falauto
2013-03-18 14:28 ` [PATCH v3 0/9] refactoring for mask_cache Simon Guinot
2013-03-18 14:39 ` Simon Guinot
2013-03-19 10:03 ` Ezequiel Garcia
2013-03-19 10:09 ` Gerlando Falauto
2013-03-19 11:25 ` Ezequiel Garcia
2013-03-19 11:06 ` Jason Cooper
2013-03-19 11:10 ` Gerlando Falauto
2013-03-19 11:44 ` Jason Cooper
2013-03-19 11:56 ` Jason Cooper
2013-03-20 17:40 ` Gerlando Falauto
2013-03-20 21:42 ` Thomas Gleixner
2013-03-21 10:37 ` Gerlando Falauto
2013-03-21 10:59 ` Simon Guinot
2013-03-19 11:19 ` Ezequiel Garcia
2013-03-21 10:51 ` Simon Guinot
2013-03-21 11:24 ` Gerlando Falauto
2013-04-04 9:31 ` Ezequiel Garcia
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=1363615255-18200-8-git-send-email-gerlando.falauto@keymile.com \
--to=gerlando.falauto@keymile.com \
--cc=linux-arm-kernel@lists.infradead.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).