genirq: Add IRQ_MOVE_PENDING to irq_data.state

chip implementations need to know about it. Keep status in sync until
all users are fixed.

Accessor function: irqd_is_setaffinity_pending(irqdata)

Coders who access them directly will be tracked down and slapped with
stinking trouts.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 62bb08e4af1371b890be03190d2766ab9c90c4e7..2899905bfac7af8811faaf4aae0fb79422a3292b 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -58,15 +58,16 @@ typedef     void (*irq_flow_handler_t)(unsigned int irq,
 #define IRQ_DISABLED           0x00000800      /* DEPRECATED */
 #define IRQ_PENDING            0x00001000      /* DEPRECATED */
 #define IRQ_MASKED             0x00002000      /* DEPRECATED */
+/* DEPRECATED use irq_setaffinity_pending() instead*/
+#define IRQ_MOVE_PENDING       0x00004000
 #endif
 
-#define IRQ_LEVEL              0x00004000      /* IRQ level triggered */
+#define IRQ_LEVEL              0x00008000      /* IRQ level triggered */
 #define IRQ_PER_CPU            0x00010000      /* IRQ is per CPU */
 #define IRQ_NOPROBE            0x00020000      /* IRQ is not valid for probing */
 #define IRQ_NOREQUEST          0x00040000      /* IRQ cannot be requested */
 #define IRQ_NOAUTOEN           0x00080000      /* IRQ will not be enabled on request irq */
 #define IRQ_WAKEUP             0x00100000      /* IRQ triggers system wakeup */
-#define IRQ_MOVE_PENDING       0x00200000      /* need to re-target IRQ destination */
 #define IRQ_NO_BALANCING       0x00400000      /* IRQ is excluded from balancing */
 #define IRQ_MOVE_PCNTXT                0x01000000      /* IRQ migration from process context */
 #define IRQ_AFFINITY_SET       0x02000000      /* IRQ affinity was set from userspace*/
@@ -128,6 +129,21 @@ struct irq_data {
 #endif
 };
 
+/*
+ * Bit masks for irq_data.state
+ *
+ * IRQD_SETAFFINITY_PENDING    - Affinity setting is pending
+ */
+enum {
+       /* Bit 0 - 7 reserved for TYPE will use later */
+       IRQD_SETAFFINITY_PENDING = (1 << 8),
+};
+
+static inline bool irqd_is_setaffinity_pending(struct irq_data *d)
+{
+       return d->state_use_accessors & IRQD_SETAFFINITY_PENDING;
+}
+
 /**
  * struct irq_chip - hardware interrupt chip descriptor
  *

diff --git a/kernel/irq/compat.h b/kernel/irq/compat.h
index 593abecbcc4467f8860154a1fababce2dbe18043..5e33aadadacc76eb4694dcc0c5a2fd335bf1811d 100644 (file)
--- a/kernel/irq/compat.h
+++ b/kernel/irq/compat.h
@@ -37,6 +37,15 @@ static inline void irq_compat_clr_masked(struct irq_desc *desc)
 {
        desc->status &= ~IRQ_MASKED;
 }
+static inline void irq_compat_set_move_pending(struct irq_desc *desc)
+{
+       desc->status |= IRQ_MOVE_PENDING;
+}
+
+static inline void irq_compat_clr_move_pending(struct irq_desc *desc)
+{
+       desc->status &= ~IRQ_MOVE_PENDING;
+}
 #else
 static inline void irq_compat_set_progress(struct irq_desc *desc) { }
 static inline void irq_compat_clr_progress(struct irq_desc *desc) { }
@@ -46,5 +55,7 @@ static inline void irq_compat_set_pending(struct irq_desc *desc) { }
 static inline void irq_compat_clr_pending(struct irq_desc *desc) { }
 static inline void irq_compat_set_masked(struct irq_desc *desc) { }
 static inline void irq_compat_clr_masked(struct irq_desc *desc) { }
+static inline void irq_compat_set_move_pending(struct irq_desc *desc) { }
+static inline void irq_compat_clr_move_pending(struct irq_desc *desc) { }
 #endif
 

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index cef0849dcfa5a8918336ad0453890566a194fad8..e93e6090cd4787e842ec5b638a33f979141f602b 100644 (file)
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -124,6 +124,21 @@ static inline void chip_bus_sync_unlock(struct irq_desc *desc)
                desc->irq_data.chip->irq_bus_sync_unlock(&desc->irq_data);
 }
 
+/*
+ * Manipulation functions for irq_data.state
+ */
+static inline void irqd_set_move_pending(struct irq_data *d)
+{
+       d->state_use_accessors |= IRQD_SETAFFINITY_PENDING;
+       irq_compat_set_move_pending(irq_data_to_desc(d));
+}
+
+static inline void irqd_clr_move_pending(struct irq_data *d)
+{
+       d->state_use_accessors &= ~IRQD_SETAFFINITY_PENDING;
+       irq_compat_clr_move_pending(irq_data_to_desc(d));
+}
+
 /*
  * Debugging printout:
  */

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index ccc9389909ffea291a4a834a9c17af4a5cc3e1f1..9a99c471d470b53293a7cf63bb3a863d0795e8c8 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -107,7 +107,7 @@ static inline bool irq_can_move_pcntxt(struct irq_desc *desc)
 }
 static inline bool irq_move_pending(struct irq_desc *desc)
 {
-       return desc->status & IRQ_MOVE_PENDING;
+       return irqd_is_setaffinity_pending(&desc->irq_data);
 }
 static inline void
 irq_copy_pending(struct irq_desc *desc, const struct cpumask *mask)
@@ -156,7 +156,7 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *mask)
                        ret = 0;
                }
        } else {
-               desc->status |= IRQ_MOVE_PENDING;
+               irqd_set_move_pending(&desc->irq_data);
                irq_copy_pending(desc, mask);
        }
 

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 6f2f98480354b2b8ef9550fe532e79e301a7eb23..9485ae081dcd8efc14d412ad192b454809a44551 100644 (file)
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -9,7 +9,7 @@ void move_masked_irq(int irq)
        struct irq_desc *desc = irq_to_desc(irq);
        struct irq_chip *chip = desc->irq_data.chip;
 
-       if (likely(!(desc->status & IRQ_MOVE_PENDING)))
+       if (likely(!irqd_is_setaffinity_pending(&desc->irq_data)))
                return;
 
        /*
@@ -20,7 +20,7 @@ void move_masked_irq(int irq)
                return;
        }
 
-       desc->status &= ~IRQ_MOVE_PENDING;
+       irqd_clr_move_pending(&desc->irq_data);
 
        if (unlikely(cpumask_empty(desc->pending_mask)))
                return;
@@ -58,7 +58,7 @@ void move_native_irq(int irq)
        struct irq_desc *desc = irq_to_desc(irq);
        bool masked;
 
-       if (likely(!(desc->status & IRQ_MOVE_PENDING)))
+       if (likely(!irqd_is_setaffinity_pending(&desc->irq_data)))
                return;
 
        if (unlikely(desc->istate & IRQS_DISABLED))

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 26449239bb46b04448834d0d71b16c459998b182..afe4e68031483bc9e7fcc91ccf9f486273ef1965 100644 (file)
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -25,7 +25,7 @@ static int irq_affinity_proc_show(struct seq_file *m, void *v)
        const struct cpumask *mask = desc->irq_data.affinity;
 
 #ifdef CONFIG_GENERIC_PENDING_IRQ
-       if (desc->status & IRQ_MOVE_PENDING)
+       if (irqd_is_setaffinity_pending(&desc->irq_data))
                mask = desc->pending_mask;
 #endif
        seq_cpumask(m, mask);

diff --git a/kernel/irq/settings.h b/kernel/irq/settings.h
index ef09824e4b323b9c65f20aa246bea4c9ef17c788..bb104a2dce73088ebe800b9ca78d2dcc14c35e89 100644 (file)
--- a/kernel/irq/settings.h
+++ b/kernel/irq/settings.h
@@ -20,3 +20,5 @@ enum {
 #define IRQ_MASKED             GOT_YOU_MORON
 #undef IRQ_WAKEUP
 #define IRQ_WAKEUP             GOT_YOU_MORON
+#undef IRQ_MOVE_PENDING
+#define IRQ_MOVE_PENDING       GOT_YOU_MORON