From: Li Yang <leoli@freescale.com>
To: galak@kernel.crashing.org, paulus@samba.org, linuxppc-dev@ozlabs.org
Cc: Li Yang <leoli@freescale.com>
Subject: [PATCH v3 7/9] ipic: clean up unsupported ack operations
Date: Fri, 12 Oct 2007 21:28:46 +0800 [thread overview]
Message-ID: <1192195728-24189-8-git-send-email-leoli@freescale.com> (raw)
In-Reply-To: <1192195728-24189-7-git-send-email-leoli@freescale.com>
IPIC controller doesn't support ack operations. The pending registers
are read-only. The patch removes ack operations which are not needed.
Signed-off-by: Li Yang <leoli@freescale.com>
---
arch/powerpc/sysdev/ipic.c | 40 ++--------------------------------------
1 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index cd8590d..6835c15 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -533,42 +533,7 @@ static void ipic_mask_irq(unsigned int virq)
temp = ipic_read(ipic->regs, ipic_info[src].mask);
temp &= ~(1 << (31 - ipic_info[src].bit));
ipic_write(ipic->regs, ipic_info[src].mask, temp);
-
- spin_unlock_irqrestore(&ipic_lock, flags);
-}
-
-static void ipic_ack_irq(unsigned int virq)
-{
- struct ipic *ipic = ipic_from_irq(virq);
- unsigned int src = ipic_irq_to_hw(virq);
- unsigned long flags;
- u32 temp;
-
- spin_lock_irqsave(&ipic_lock, flags);
-
- temp = ipic_read(ipic->regs, ipic_info[src].pend);
- temp |= (1 << (31 - ipic_info[src].bit));
- ipic_write(ipic->regs, ipic_info[src].pend, temp);
-
- spin_unlock_irqrestore(&ipic_lock, flags);
-}
-
-static void ipic_mask_irq_and_ack(unsigned int virq)
-{
- struct ipic *ipic = ipic_from_irq(virq);
- unsigned int src = ipic_irq_to_hw(virq);
- unsigned long flags;
- u32 temp;
-
- spin_lock_irqsave(&ipic_lock, flags);
-
- temp = ipic_read(ipic->regs, ipic_info[src].mask);
- temp &= ~(1 << (31 - ipic_info[src].bit));
- ipic_write(ipic->regs, ipic_info[src].mask, temp);
-
- temp = ipic_read(ipic->regs, ipic_info[src].pend);
- temp |= (1 << (31 - ipic_info[src].bit));
- ipic_write(ipic->regs, ipic_info[src].pend, temp);
+ mb();
spin_unlock_irqrestore(&ipic_lock, flags);
}
@@ -626,8 +591,7 @@ static struct irq_chip ipic_irq_chip = {
.typename = " IPIC ",
.unmask = ipic_unmask_irq,
.mask = ipic_mask_irq,
- .mask_ack = ipic_mask_irq_and_ack,
- .ack = ipic_ack_irq,
+ .mask_ack = ipic_mask_irq,
.set_type = ipic_set_irq_type,
};
--
1.5.3.2.104.g41ef
next prev parent reply other threads:[~2007-10-12 13:18 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-12 13:28 [PATCH v3 0/9] Add MPC837x generic support and MPC837xE MDS support Li Yang
2007-10-12 13:28 ` [PATCH v3 1/9] add e300c4 entry to cputable Li Yang
2007-10-12 13:28 ` [PATCH v3 2/9] ipic: add new interrupts introduced by new chip Li Yang
2007-10-12 13:28 ` [PATCH v3 3/9] add Freescale SerDes PHY support Li Yang
2007-10-12 13:28 ` [PATCH v3 4/9] add platform support for MPC837x MDS board Li Yang
2007-10-12 13:28 ` [PATCH v3 5/9] add documentation for SATA nodes Li Yang
2007-10-12 13:28 ` [PATCH v3 6/9] add documentation for SerDes nodes Li Yang
2007-10-12 13:28 ` Li Yang [this message]
2007-10-12 13:28 ` [PATCH v3 8/9] add MPC837x MDS default kernel configuration Li Yang
2007-10-12 13:28 ` [PATCH v3 9/9] add MPC837x MDS board default device tree Li Yang
2007-10-15 0:37 ` David Gibson
2007-10-17 13:59 ` Kumar Gala
2007-10-18 13:46 ` Li Yang-r58472
2007-10-19 13:04 ` Kumar Gala
2007-10-12 14:38 ` [PATCH v3 5/9] add documentation for SATA nodes Arnd Bergmann
2007-10-17 13:47 ` [PATCH v3 4/9] add platform support for MPC837x MDS board Kumar Gala
2007-10-18 3:51 ` Li Yang-r58472
2007-10-12 14:33 ` [PATCH v3 3/9] add Freescale SerDes PHY support Arnd Bergmann
2007-10-15 12:30 ` Li Yang-r58472
2007-10-15 14:10 ` Arnd Bergmann
2007-10-14 5:59 ` Stephen Rothwell
2007-10-17 14:13 ` Kumar Gala
2007-10-18 2:46 ` Li Yang-r58472
2007-10-17 13:45 ` [PATCH v3 2/9] ipic: add new interrupts introduced by new chip Kumar Gala
2007-10-18 4:09 ` Li Yang-r58472
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=1192195728-24189-8-git-send-email-leoli@freescale.com \
--to=leoli@freescale.com \
--cc=galak@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.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).