target/linux/ramips/patches-3.18/0066-cevt.patch

   1 --- a/arch/mips/ralink/cevt-rt3352.c
   2 +++ b/arch/mips/ralink/cevt-rt3352.c
   3 @@ -45,18 +45,33 @@ static void (*systick_freq_scaling)(stru
   4  static void systick_set_clock_mode(enum clock_event_mode mode,
   5                                 struct clock_event_device *evt);
   6
   7 +static inline unsigned int read_count(struct systick_device *sdev)
   8 +{
   9 +       return ioread32(sdev->membase + SYSTICK_COUNT);
  10 +}
  11 +
  12 +static inline unsigned int read_compare(struct systick_device *sdev)
  13 +{
  14 +       return ioread32(sdev->membase + SYSTICK_COMPARE);
  15 +}
  16 +
  17 +static inline void write_compare(struct systick_device *sdev, unsigned int val)
  18 +{
  19 +       iowrite32(val, sdev->membase + SYSTICK_COMPARE);
  20 +}
  21 +
  22  static int systick_next_event(unsigned long delta,
  23                                 struct clock_event_device *evt)
  24  {
  25         struct systick_device *sdev;
  26 -       u32 count;
  27 +       int res;
  28
  29         sdev = container_of(evt, struct systick_device, dev);
  30 -       count = ioread32(sdev->membase + SYSTICK_COUNT);
  31 -       count = (count + delta) % SYSTICK_FREQ;
  32 -       iowrite32(count, sdev->membase + SYSTICK_COMPARE);
  33 +       delta += read_count(sdev);
  34 +       write_compare(sdev, delta);
  35 +       res = ((int)(read_count(sdev) - delta) >= 0) ? -ETIME : 0;
  36
  37 -       return 0;
  38 +       return res;
  39  }
  40
  41  static void systick_event_handler(struct clock_event_device *dev)
  42 @@ -66,20 +81,25 @@ static void systick_event_handler(struct
  43
  44  static irqreturn_t systick_interrupt(int irq, void *dev_id)
  45  {
  46 -       struct clock_event_device *dev = (struct clock_event_device *) dev_id;
  47 +       int ret = 0;
  48 +       struct clock_event_device *cdev;
  49 +       struct systick_device *sdev;
  50
  51 -       dev->event_handler(dev);
  52 +       if (read_c0_cause() & STATUSF_IP7) {
  53 +               cdev = (struct clock_event_device *) dev_id;
  54 +               sdev = container_of(cdev, struct systick_device, dev);
  55 +
  56 +               /* Clear Count/Compare Interrupt */
  57 +               write_compare(sdev, read_compare(sdev));
  58 +               cdev->event_handler(cdev);
  59 +               ret = 1;
  60 +       }
  61
  62 -       return IRQ_HANDLED;
  63 +       return IRQ_RETVAL(ret);
  64  }
  65
  66  static struct systick_device systick = {
  67         .dev = {
  68 -               /*
  69 -                * cevt-r4k uses 300, make sure systick
  70 -                * gets used if available
  71 -                */
  72 -               .rating         = 310,
  73                 .features       = CLOCK_EVT_FEAT_ONESHOT,
  74                 .set_next_event = systick_next_event,
  75                 .set_mode       = systick_set_clock_mode,
  76 @@ -126,13 +146,14 @@ static void systick_set_clock_mode(enum
  77                         systick_freq_scaling(sdev, 1);
  78                 break;
  79
  80 +       case CLOCK_EVT_MODE_UNUSED:
  81         case CLOCK_EVT_MODE_SHUTDOWN:
  82                 if (systick_freq_scaling)
  83                         systick_freq_scaling(sdev, 0);
  84                 if (sdev->irq_requested)
  85 -                       free_irq(systick.dev.irq, &systick_irqaction);
  86 +                       remove_irq(systick.dev.irq, &systick_irqaction);
  87                 sdev->irq_requested = 0;
  88 -               iowrite32(0, systick.membase + SYSTICK_CONFIG);
  89 +               iowrite32(CFG_CNT_EN, systick.membase + SYSTICK_CONFIG);
  90                 break;
  91
  92         default:
  93 @@ -142,38 +163,45 @@ static void systick_set_clock_mode(enum
  94  }
  95
  96  static const struct of_device_id systick_match[] = {
  97 -       { .compatible = "ralink,mt7620-systick", .data = mt7620_freq_scaling},
  98 +       { .compatible = "ralink,mt7620a-systick", .data = mt7620_freq_scaling},
  99         {},
 100  };
 101
 102  static void __init ralink_systick_init(struct device_node *np)
 103  {
 104         const struct of_device_id *match;
 105 +       int rating = 200;
 106
 107         systick.membase = of_iomap(np, 0);
 108         if (!systick.membase)
 109                 return;
 110
 111         match = of_match_node(systick_match, np);
 112 -       if (match)
 113 +       if (match) {
 114                 systick_freq_scaling = match->data;
 115 +               /*
 116 +                * cevt-r4k uses 300, make sure systick
 117 +                * gets used if available
 118 +                */
 119 +               rating = 310;
 120 +       }
 121
 122 -       systick_irqaction.name = np->name;
 123 -       systick.dev.name = np->name;
 124 -       clockevents_calc_mult_shift(&systick.dev, SYSTICK_FREQ, 60);
 125 -       systick.dev.max_delta_ns = clockevent_delta2ns(0x7fff, &systick.dev);
 126 -       systick.dev.min_delta_ns = clockevent_delta2ns(0x3, &systick.dev);
 127 +       /* enable counter than register clock source */
 128 +       iowrite32(CFG_CNT_EN, systick.membase + SYSTICK_CONFIG);
 129 +       clocksource_mmio_init(systick.membase + SYSTICK_COUNT, np->name,
 130 +                       SYSTICK_FREQ, rating, 16, clocksource_mmio_readl_up);
 131 +
 132 +       /* register clock event */
 133         systick.dev.irq = irq_of_parse_and_map(np, 0);
 134         if (!systick.dev.irq) {
 135                 pr_err("%s: request_irq failed", np->name);
 136                 return;
 137         }
 138 -
 139 -       clocksource_mmio_init(systick.membase + SYSTICK_COUNT, np->name,
 140 -                       SYSTICK_FREQ, 301, 16, clocksource_mmio_readl_up);
 141 -
 142 -       clockevents_register_device(&systick.dev);
 143 -
 144 +       systick_irqaction.name = np->name;
 145 +       systick.dev.name = np->name;
 146 +       systick.dev.rating = rating;
 147 +       systick.dev.cpumask = cpumask_of(0);
 148 +       clockevents_config_and_register(&systick.dev, SYSTICK_FREQ, 0x3, 0x7fff);
 149         pr_info("%s: running - mult: %d, shift: %d\n",
 150                         np->name, systick.dev.mult, systick.dev.shift);
 151  }