target/linux/brcm63xx/patches-3.9/321-MIPS-BCM63XX-use-irq_desc-as-argument-for-un-mask.patch

   1 From 0e692ab15a69ac4534c18e67ed3cb7685f728037 Mon Sep 17 00:00:00 2001
   2 From: Jonas Gorski <jogo@openwrt.org>
   3 Date: Tue, 30 Apr 2013 11:26:53 +0200
   4 Subject: [PATCH 13/14] MIPS: BCM63XX: use irq_desc as argument for (un)mask
   5
   6 In preparation for applying affinity, use the irq descriptor as the
   7 argument for (un)mask.
   8
   9 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  10 ---
  11  arch/mips/bcm63xx/irq.c |   26 ++++++++++++++------------
  12  1 file changed, 14 insertions(+), 12 deletions(-)
  13
  14 --- a/arch/mips/bcm63xx/irq.c
  15 +++ b/arch/mips/bcm63xx/irq.c
  16 @@ -22,10 +22,10 @@
  17
  18  static void __dispatch_internal_32(int cpu) __maybe_unused;
  19  static void __dispatch_internal_64(int cpu) __maybe_unused;
  20 -static void __internal_irq_mask_32(unsigned int irq) __maybe_unused;
  21 -static void __internal_irq_mask_64(unsigned int irq) __maybe_unused;
  22 -static void __internal_irq_unmask_32(unsigned int irq) __maybe_unused;
  23 -static void __internal_irq_unmask_64(unsigned int irq) __maybe_unused;
  24 +static void __internal_irq_mask_32(struct irq_data *d) __maybe_unused;
  25 +static void __internal_irq_mask_64(struct irq_data *d) __maybe_unused;
  26 +static void __internal_irq_unmask_32(struct irq_data *d) __maybe_unused;
  27 +static void __internal_irq_unmask_64(struct irq_data *d) __maybe_unused;
  28
  29  static DEFINE_SPINLOCK(ipic_lock);
  30  static DEFINE_SPINLOCK(epic_lock);
  31 @@ -167,8 +167,8 @@ static int is_ext_irq_cascaded;
  32  static unsigned int ext_irq_count;
  33  static unsigned int ext_irq_start, ext_irq_end;
  34  static unsigned int ext_irq_cfg_reg1, ext_irq_cfg_reg2;
  35 -static void (*internal_irq_mask)(unsigned int irq);
  36 -static void (*internal_irq_unmask)(unsigned int irq);
  37 +static void (*internal_irq_mask)(struct irq_data *d);
  38 +static void (*internal_irq_unmask)(struct irq_data *d);
  39
  40  static void bcm63xx_init_irq(void)
  41  {
  42 @@ -358,9 +358,10 @@ void __dispatch_internal_##width(int cpu
  43         }                                                               \
  44  }                                                                      \
  45                                                                         \
  46 -static void __internal_irq_mask_##width(unsigned int irq)              \
  47 +static void __internal_irq_mask_##width(struct irq_data *d)            \
  48  {                                                                      \
  49         u32 val;                                                        \
  50 +       unsigned irq = d->irq - IRQ_INTERNAL_BASE;                      \
  51         unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
  52         unsigned bit = irq & 0x1f;                                      \
  53         unsigned long flags;                                            \
  54 @@ -380,9 +381,10 @@ static void __internal_irq_mask_##width(
  55         spin_unlock_irqrestore(&ipic_lock, flags);                      \
  56  }                                                                      \
  57                                                                         \
  58 -static void __internal_irq_unmask_##width(unsigned int irq)            \
  59 +static void __internal_irq_unmask_##width(struct irq_data *d)          \
  60  {                                                                      \
  61         u32 val;                                                        \
  62 +       unsigned irq = d->irq - IRQ_INTERNAL_BASE;                      \
  63         unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
  64         unsigned bit = irq & 0x1f;                                      \
  65         unsigned long flags;                                            \
  66 @@ -448,12 +450,12 @@ asmlinkage void plat_irq_dispatch(void)
  67   */
  68  static void bcm63xx_internal_irq_mask(struct irq_data *d)
  69  {
  70 -       internal_irq_mask(d->irq - IRQ_INTERNAL_BASE);
  71 +       internal_irq_mask(d);
  72  }
  73
  74  static void bcm63xx_internal_irq_unmask(struct irq_data *d)
  75  {
  76 -       internal_irq_unmask(d->irq - IRQ_INTERNAL_BASE);
  77 +       internal_irq_unmask(d);
  78  }
  79
  80  /*
  81 @@ -479,7 +481,7 @@ static void bcm63xx_external_irq_mask(st
  82         spin_unlock_irqrestore(&epic_lock, flags);
  83
  84         if (is_ext_irq_cascaded)
  85 -               internal_irq_mask(irq + ext_irq_start);
  86 +               internal_irq_mask(irq_get_irq_data(irq + ext_irq_start));
  87  }
  88
  89  static void bcm63xx_external_irq_unmask(struct irq_data *d)
  90 @@ -501,7 +503,7 @@ static void bcm63xx_external_irq_unmask(
  91         spin_unlock_irqrestore(&epic_lock, flags);
  92
  93         if (is_ext_irq_cascaded)
  94 -               internal_irq_unmask(irq + ext_irq_start);
  95 +               internal_irq_unmask(irq_get_irq_data(irq + ext_irq_start));
  96  }
  97
  98  static void bcm63xx_external_irq_clear(struct irq_data *d)