libs/dahdi-linux/patches/130-DAHLIN-371-pld-linux-math64.patch

   1 --- a/drivers/dahdi/xpp/xbus-core.c
   2 +++ b/drivers/dahdi/xpp/xbus-core.c
   3 @@ -25,6 +25,7 @@
   4  #include <linux/errno.h>
   5  #include <linux/sched.h>
   6  #include <linux/mutex.h>
   7 +#include <linux/math64.h>
   8  #include <linux/proc_fs.h>
   9  #include <linux/seq_file.h>
  10  #include <linux/slab.h>
  11 @@ -1768,11 +1769,13 @@ out:
  12
  13  static void xbus_fill_proc_queue(struct seq_file *sfile, struct xframe_queue *q)
  14  {
  15 +       s32 rem;
  16 +       s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
  17         seq_printf(sfile,
  18 -               "%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n",
  19 +               "%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%ld ms\n",
  20                 q->name, q->steady_state_count, q->count, q->max_count,
  21 -               q->worst_count, q->overflows, q->worst_lag_usec / 1000,
  22 -               q->worst_lag_usec % 1000);
  23 +               q->worst_count, q->overflows, lag_sec,
  24 +               rem);
  25         xframe_queue_clearstats(q);
  26  }
  27
  28 --- a/drivers/dahdi/xpp/xbus-pcm.c
  29 +++ b/drivers/dahdi/xpp/xbus-pcm.c
  30 @@ -22,6 +22,7 @@
  31  #include <linux/version.h>
  32  #include <linux/kernel.h>
  33  #include <linux/module.h>
  34 +#include <linux/math64.h>
  35  #include "xbus-pcm.h"
  36  #include "xbus-core.h"
  37  #include "xpp_dahdi.h"
  38 @@ -129,7 +130,7 @@ static int xpp_ticker_step(struct xpp_ti
  39                 usec = ktime_us_delta(ticker->last_sample,
  40                                         ticker->first_sample);
  41                 ticker->first_sample = ticker->last_sample;
  42 -               ticker->tick_period = usec / ticker->cycle;
  43 +               ticker->tick_period = div_s64(usec, ticker->cycle);
  44                 cycled = 1;
  45         }
  46         ticker->count++;
  47 @@ -497,7 +498,7 @@ static void send_drift(xbus_t *xbus, int
  48         XBUS_DBG(SYNC, xbus,
  49                  "%sDRIFT adjust %s (%d) (last update %lld seconds ago)\n",
  50                  (disable_pll_sync) ? "Fake " : "", msg, drift,
  51 -                msec_delta / MSEC_PER_SEC);
  52 +                div_s64(msec_delta, MSEC_PER_SEC));
  53         if (!disable_pll_sync)
  54                 CALL_PROTO(GLOBAL, SYNC_SOURCE, xbus, NULL, SYNC_MODE_PLL,
  55                            drift);
  56 --- a/drivers/dahdi/xpp/xbus-sysfs.c
  57 +++ b/drivers/dahdi/xpp/xbus-sysfs.c
  58 @@ -23,6 +23,7 @@
  59  #include <linux/kernel.h>
  60  #include <linux/module.h>
  61  #include <linux/errno.h>
  62 +#include <linux/math64.h>
  63  #include <linux/proc_fs.h>
  64  #ifdef PROTOCOL_DEBUG
  65  #include <linux/ctype.h>
  66 @@ -249,11 +250,9 @@ static DEVICE_ATTR_READER(driftinfo_show
  67         /*
  68          * Calculate lost ticks time
  69          */
  70 -       seconds = ktime_ms_delta(now, di->last_lost_tick) / 1000;
  71 -       minutes = seconds / 60;
  72 -       seconds = seconds % 60;
  73 -       hours = minutes / 60;
  74 -       minutes = minutes % 60;
  75 +       seconds = div_s64(ktime_ms_delta(now, di->last_lost_tick), 1000);
  76 +       minutes = div_s64_rem(seconds, 60, &seconds);
  77 +       hours = div_s64_rem(minutes, 60, &minutes);
  78         len += snprintf(buf + len, PAGE_SIZE - len,
  79                 "%-15s: %8d (was %d:%02d:%02d ago)\n", "lost_ticks",
  80                 di->lost_ticks, hours, minutes, seconds);
  81 --- a/drivers/dahdi/xpp/xframe_queue.c
  82 +++ b/drivers/dahdi/xpp/xframe_queue.c
  83 @@ -1,3 +1,4 @@
  84 +#include <linux/math64.h>
  85  #include "xframe_queue.h"
  86  #include "xbus-core.h"
  87  #include "dahdi_debug.h"
  88 @@ -40,10 +41,11 @@ static void __xframe_dump_queue(struct x
  89                THIS_MODULE->name, q->name);
  90         list_for_each_entry_reverse(xframe, &q->head, frame_list) {
  91                 xpacket_t *pack = (xpacket_t *)&xframe->packets[0];
  92 -               s64 usec = ktime_us_delta(now, xframe->kt_queued);
  93 +               s32 rem;
  94 +               s64 sec = div_s64_rem(ktime_us_delta(now, xframe->kt_queued), 1000, &rem);
  95
  96 -               snprintf(prefix, ARRAY_SIZE(prefix), "  %3d> %5lld.%03lld msec",
  97 -                        i++, usec / 1000, usec % 1000);
  98 +               snprintf(prefix, ARRAY_SIZE(prefix), "  %3d> %5lld.%03ld msec",
  99 +                        i++, sec, rem);
 100                 dump_packet(prefix, pack, 1);
 101         }
 102  }
 103 @@ -60,11 +62,13 @@ static bool __xframe_enqueue(struct xfra
 104         if (q->count >= q->max_count) {
 105                 q->overflows++;
 106                 if ((overflow_cnt++ % 1000) < 5) {
 107 -                       NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n",
 108 +                       s32 rem;
 109 +                       s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
 110 +                       NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%ld ms\n",
 111                              q->name, q->steady_state_count, q->count,
 112                              q->max_count, q->worst_count, q->overflows,
 113 -                            q->worst_lag_usec / 1000,
 114 -                            q->worst_lag_usec % 1000);
 115 +                            lag_sec,
 116 +                            rem);
 117                         __xframe_dump_queue(q);
 118                 }
 119                 ret = 0;
 120 --- a/drivers/dahdi/xpp/xpp_usb.c
 121 +++ b/drivers/dahdi/xpp/xpp_usb.c
 122 @@ -27,6 +27,7 @@
 123  #include <linux/interrupt.h>
 124  #include <linux/delay.h>       /* for udelay */
 125  #include <linux/seq_file.h>
 126 +#include <linux/math64.h>
 127  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
 128  #include <asm/uaccess.h>
 129  #else
 130 @@ -891,7 +892,7 @@ static void xpp_send_callback(struct urb
 131                 usec = 0; /* System clock jumped */
 132         if (usec > xusb->max_tx_delay)
 133                 xusb->max_tx_delay = usec;
 134 -       i = usec / USEC_BUCKET;
 135 +       i = div_s64(usec, USEC_BUCKET);
 136         if (i >= NUM_BUCKETS)
 137                 i = NUM_BUCKETS - 1;
 138         xusb->usb_tx_delay[i]++;