From: Geoff Levand <geoffrey.levand@am•sony.com>
To: paulus@samba•org
Cc: linuxppc-dev@ozlabs•org
Subject: [patch 08/30] PS3: Move chip mask defs up
Date: Tue, 12 Jun 2007 11:44:06 -0700 [thread overview]
Message-ID: <466EE976.5030006@am.sony.com> (raw)
In-Reply-To: <20070612181825.730300780@am.sony.com>>
This just moves the definitions of the PS3 chip_mask routines up
above the irq setup routines. This change is needed for the
kexec updates that follow. Also adds some inline documentation
to the routines.
Signed-off-by: Geoff Levand <geoffrey.levand@am•sony.com>
---
arch/powerpc/platforms/ps3/interrupt.c | 147 +++++++++++++++++++--------------
1 file changed, 86 insertions(+), 61 deletions(-)
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -91,6 +91,92 @@ struct ps3_private {
static DEFINE_PER_CPU(struct ps3_private, ps3_private);
/**
+ * ps3_chip_mask - Set an interrupt mask bit in ps3_bmp.
+ * @virq: The assigned Linux virq.
+ *
+ * Sets ps3_bmp.mask and calls lv1_did_update_interrupt_mask().
+ */
+
+static void ps3_chip_mask(unsigned int virq)
+{
+ struct ps3_private *pd = get_irq_chip_data(virq);
+ u64 bit = 0x8000000000000000UL >> virq;
+ u64 *p = &pd->bmp.mask;
+ u64 old;
+ unsigned long flags;
+
+ pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
+
+ local_irq_save(flags);
+ asm volatile(
+ "1: ldarx %0,0,%3\n"
+ "andc %0,%0,%2\n"
+ "stdcx. %0,0,%3\n"
+ "bne- 1b"
+ : "=&r" (old), "+m" (*p)
+ : "r" (bit), "r" (p)
+ : "cc" );
+
+ lv1_did_update_interrupt_mask(pd->node, pd->cpu);
+ local_irq_restore(flags);
+}
+
+/**
+ * ps3_chip_unmask - Clear an interrupt mask bit in ps3_bmp.
+ * @virq: The assigned Linux virq.
+ *
+ * Clears ps3_bmp.mask and calls lv1_did_update_interrupt_mask().
+ */
+
+static void ps3_chip_unmask(unsigned int virq)
+{
+ struct ps3_private *pd = get_irq_chip_data(virq);
+ u64 bit = 0x8000000000000000UL >> virq;
+ u64 *p = &pd->bmp.mask;
+ u64 old;
+ unsigned long flags;
+
+ pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
+
+ local_irq_save(flags);
+ asm volatile(
+ "1: ldarx %0,0,%3\n"
+ "or %0,%0,%2\n"
+ "stdcx. %0,0,%3\n"
+ "bne- 1b"
+ : "=&r" (old), "+m" (*p)
+ : "r" (bit), "r" (p)
+ : "cc" );
+
+ lv1_did_update_interrupt_mask(pd->node, pd->cpu);
+ local_irq_restore(flags);
+}
+
+/**
+ * ps3_chip_eoi - HV end-of-interrupt.
+ * @virq: The assigned Linux virq.
+ *
+ * Calls lv1_end_of_interrupt_ext().
+ */
+
+static void ps3_chip_eoi(unsigned int virq)
+{
+ const struct ps3_private *pd = get_irq_chip_data(virq);
+ lv1_end_of_interrupt_ext(pd->node, pd->cpu, virq);
+}
+
+/**
+ * ps3_irq_chip - Represents the ps3_bmp as a Linux struct irq_chip.
+ */
+
+static struct irq_chip ps3_irq_chip = {
+ .typename = "ps3",
+ .mask = ps3_chip_mask,
+ .unmask = ps3_chip_unmask,
+ .eoi = ps3_chip_eoi,
+};
+
+/**
* ps3_virq_setup - virq related setup.
* @cpu: enum ps3_cpu_binding indicating the cpu the interrupt should be
* serviced on.
@@ -565,67 +651,6 @@ static void __maybe_unused _dump_mask(st
static void dump_bmp(struct ps3_private* pd) {};
#endif /* defined(DEBUG) */
-static void ps3_chip_mask(unsigned int virq)
-{
- struct ps3_private *pd = get_irq_chip_data(virq);
- u64 bit = 0x8000000000000000UL >> virq;
- u64 *p = &pd->bmp.mask;
- u64 old;
- unsigned long flags;
-
- pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
-
- local_irq_save(flags);
- asm volatile(
- "1: ldarx %0,0,%3\n"
- "andc %0,%0,%2\n"
- "stdcx. %0,0,%3\n"
- "bne- 1b"
- : "=&r" (old), "+m" (*p)
- : "r" (bit), "r" (p)
- : "cc" );
-
- lv1_did_update_interrupt_mask(pd->node, pd->cpu);
- local_irq_restore(flags);
-}
-
-static void ps3_chip_unmask(unsigned int virq)
-{
- struct ps3_private *pd = get_irq_chip_data(virq);
- u64 bit = 0x8000000000000000UL >> virq;
- u64 *p = &pd->bmp.mask;
- u64 old;
- unsigned long flags;
-
- pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
-
- local_irq_save(flags);
- asm volatile(
- "1: ldarx %0,0,%3\n"
- "or %0,%0,%2\n"
- "stdcx. %0,0,%3\n"
- "bne- 1b"
- : "=&r" (old), "+m" (*p)
- : "r" (bit), "r" (p)
- : "cc" );
-
- lv1_did_update_interrupt_mask(pd->node, pd->cpu);
- local_irq_restore(flags);
-}
-
-static void ps3_chip_eoi(unsigned int virq)
-{
- const struct ps3_private *pd = get_irq_chip_data(virq);
- lv1_end_of_interrupt_ext(pd->node, pd->cpu, virq);
-}
-
-static struct irq_chip irq_chip = {
- .typename = "ps3",
- .mask = ps3_chip_mask,
- .unmask = ps3_chip_unmask,
- .eoi = ps3_chip_eoi,
-};
-
static void ps3_host_unmap(struct irq_host *h, unsigned int virq)
{
set_irq_chip_data(virq, NULL);
--
next prev parent reply other threads:[~2007-06-12 18:55 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070612181825.730300780@am.sony.com>
2007-06-12 18:42 ` [patch 01/30] Cell: Add spu shutdown method Geoff Levand
2007-06-12 18:43 ` [patch 02/30] PS3: Rename IPI symbols Geoff Levand
2007-06-12 18:43 ` [patch 03/30] PS3: Use __maybe_unused Geoff Levand
2007-06-12 18:43 ` [patch 04/30] PS3: Compare firmware version Geoff Levand
2007-06-12 18:43 ` [patch 05/30] PS3: Use ioremap_flags Geoff Levand
2007-06-13 9:10 ` Arnd Bergmann
2007-06-14 1:42 ` Geoff Levand
2007-06-14 2:31 ` Takao Shinohara
2007-06-14 19:03 ` [patch 05/30 v2] " Geoff Levand
2007-06-14 23:43 ` Arnd Bergmann
2007-06-12 18:43 ` [patch 06/30] PS3: Fix sparse warnings Geoff Levand
2007-06-12 18:44 ` [patch 07/30] PS3: Add support for HDMI RGB Full Range mode Geoff Levand
2007-06-12 18:44 ` Geoff Levand [this message]
2007-06-12 18:44 ` [patch 09/30] PS3: Use inline DBG Geoff Levand
2007-06-12 18:44 ` [patch 10/30] PS3: Kexec support Geoff Levand
2007-06-12 18:52 ` [patch 11/30] PS3: System-bus rework Geoff Levand
2007-06-12 18:52 ` [patch 12/30] PS3: System-bus uevent Geoff Levand
2007-06-12 18:52 ` [patch 13/30] PS3: System-bus modinfo attribute Geoff Levand
2007-06-12 18:53 ` [patch 14/30] PS3: Repository probe cleanups Geoff Levand
2007-06-12 18:53 ` [patch 15/30] PS3: Vuart rework Geoff Levand
2007-06-12 18:53 ` [patch 16/30] PS3: System manager re-work Geoff Levand
2007-06-12 18:53 ` [patch 17/30] PS3: Rework AV settings driver Geoff Levand
2007-06-12 18:53 ` [patch 18/30] PS3: Frame buffer system-bus rework Geoff Levand
2007-06-12 18:53 ` [patch 19/30] PS3: Device registration routines Geoff Levand
2007-06-12 18:53 ` [patch 20/30] PS3: Rename processor id symbols Geoff Levand
2007-06-12 18:54 ` [patch 21/30] PS3: Use clear_bit Geoff Levand
2007-06-12 18:54 ` [patch 22/30] Powerpc: Output params value in early_init_devtree Geoff Levand
2007-06-12 18:54 ` [patch 23/30] powerpc: Localize mmu_off Geoff Levand
2007-06-12 18:54 ` [patch 24/30] powerpc: Correct __secondary_hold comment Geoff Levand
2007-06-12 18:54 ` [patch 25/30] Powerpc: Add signed types to bootwrapper Geoff Levand
2007-06-12 18:54 ` [patch 26/30] Powerpc: Add u64 printf " Geoff Levand
2007-06-12 18:54 ` [patch 27/30] Powerpc: Fix constantness of bootwrapper arg Geoff Levand
2007-06-12 18:54 ` [patch 28/30] powerpc: Bootwrapper global scope kernel_entry_t Geoff Levand
2007-06-12 18:54 ` [patch 29/30] PS3: Device tree source Geoff Levand
2007-06-13 4:52 ` Segher Boessenkool
2007-06-13 8:40 ` Olaf Hering
2007-06-13 9:05 ` Segher Boessenkool
2007-06-13 11:24 ` Olaf Hering
2007-06-13 11:59 ` Segher Boessenkool
2007-06-13 12:28 ` Olaf Hering
2007-06-13 13:51 ` Segher Boessenkool
2007-06-13 16:04 ` Olaf Hering
2007-06-13 13:43 ` Geert Uytterhoeven
2007-06-13 13:52 ` Segher Boessenkool
2007-06-13 14:09 ` Geert Uytterhoeven
2007-06-13 14:18 ` Segher Boessenkool
2007-06-13 14:20 ` Geert Uytterhoeven
2007-06-13 17:36 ` Geoff Levand
2007-06-13 22:42 ` Benjamin Herrenschmidt
2007-06-14 7:31 ` Segher Boessenkool
2007-06-14 10:11 ` Benjamin Herrenschmidt
2007-06-14 10:25 ` Segher Boessenkool
2007-06-13 17:35 ` Geoff Levand
2007-06-13 18:18 ` Olaf Hering
2007-06-13 22:46 ` Benjamin Herrenschmidt
2007-06-14 7:32 ` Segher Boessenkool
2007-06-14 14:39 ` Yoder Stuart-B08248
2007-06-14 15:36 ` Segher Boessenkool
2007-06-14 15:53 ` Yoder Stuart-B08248
2007-06-15 8:32 ` Segher Boessenkool
2007-06-15 0:16 ` Benjamin Herrenschmidt
2007-06-15 8:37 ` Segher Boessenkool
2007-06-13 22:44 ` Benjamin Herrenschmidt
2007-06-14 1:31 ` Geoff Levand
2007-06-14 7:39 ` Segher Boessenkool
2007-06-14 1:31 ` [patch 29/30 v2] " Geoff Levand
2007-06-14 7:55 ` Geert Uytterhoeven
2007-06-14 17:05 ` Geoff Levand
2007-06-12 18:55 ` [patch 30/30] PS3: Bootwrapper support Geoff Levand
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=466EE976.5030006@am.sony.com \
--to=geoffrey.levand@am$(echo .)sony.com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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