linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
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 v7 7/9] ipic: clean up unsupported ack operations
Date: Fri, 19 Oct 2007 19:38:48 +0800	[thread overview]
Message-ID: <1192793930-26039-8-git-send-email-leoli@freescale.com> (raw)
In-Reply-To: <1192793930-26039-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 7168b03..174fd7a 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

  reply	other threads:[~2007-10-19 11:28 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-19 11:38 [PATCH v7 0/9] Add MPC837x generic support and MPC837xE MDS support Li Yang
2007-10-19 11:38 ` [PATCH v7 1/9] add e300c4 entry to cputable Li Yang
2007-10-19 11:38   ` [PATCH v7 2/9] ipic: add new interrupts introduced by new chip Li Yang
2007-10-19 11:38     ` [PATCH v7 3/9] add Freescale SerDes PHY support Li Yang
2007-10-19 11:38       ` [PATCH v7 4/9] add platform support for MPC837x MDS board Li Yang
2007-10-19 11:38         ` [PATCH v7 5/9] add documentation for SATA nodes Li Yang
2007-10-19 11:38           ` [PATCH v7 6/9] add documentation for SerDes nodes Li Yang
2007-10-19 11:38             ` Li Yang [this message]
2007-10-19 11:38               ` [PATCH v7 8/9] add MPC837x MDS default kernel configuration Li Yang
2007-10-19 11:38                 ` [PATCH v7 9/9] add MPC837x MDS board default device tree Li Yang
2007-11-30  0:44                   ` Kumar Gala
2007-11-30  9:55                     ` Li Yang
2007-11-30  0:37                 ` [PATCH v7 8/9] add MPC837x MDS default kernel configuration Kumar Gala
2007-11-30  0:35               ` [PATCH v7 7/9] ipic: clean up unsupported ack operations Kumar Gala
2007-11-30 10:03                 ` Li Yang
2007-11-30 14:48                   ` Kumar Gala
2007-10-19 15:41           ` [PATCH v7 5/9] add documentation for SATA nodes Grant Likely
2007-11-30  0:34         ` [PATCH v7 4/9] add platform support for MPC837x MDS board Kumar Gala
2007-10-19 15:35       ` [PATCH v7 3/9] add Freescale SerDes PHY support Grant Likely
2007-11-21  3:31         ` Kumar Gala
2007-11-21  3:48           ` Liu Dave
2007-11-21  3:48           ` Li Yang
2007-11-21  4:01             ` Kumar Gala
2007-11-21  4:05               ` Kumar Gala
2007-11-21  8:42             ` Benjamin Herrenschmidt
2007-11-30  0:34     ` [PATCH v7 2/9] ipic: add new interrupts introduced by new chip Kumar Gala
2007-11-30  0:33   ` [PATCH v7 1/9] add e300c4 entry to cputable Kumar Gala

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=1192793930-26039-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).