1From aa74fa2fb5acf54bd46ad4c1b10e0a23a2cb3d25 Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Thu, 4 Nov 2021 18:45:11 +0100 4Subject: [PATCH] fix build with 32-bits kernel 5 6Use div_s64 or div_s64_rem to fix the following build failure on 32-bits 7kernels: 8 9ERROR: modpost: "__divdi3" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/xpp/xpp_usb.ko] undefined! 10ERROR: modpost: "__udivdi3" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/xpp/xpp_usb.ko] undefined! 11ERROR: modpost: "__moddi3" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/xpp/xpp.ko] undefined! 12ERROR: modpost: "__divdi3" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/xpp/xpp.ko] undefined! 13 14Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 15--- 16 drivers/dahdi/xpp/xbus-core.c | 9 ++++++--- 17 drivers/dahdi/xpp/xbus-pcm.c | 4 ++-- 18 drivers/dahdi/xpp/xbus-sysfs.c | 2 +- 19 drivers/dahdi/xpp/xframe_queue.c | 15 ++++++++++----- 20 drivers/dahdi/xpp/xpp_usb.c | 2 +- 21 5 files changed, 20 insertions(+), 12 deletions(-) 22 23diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c 24index fc4ce7b..b1d1fd7 100644 25--- a/drivers/dahdi/xpp/xbus-core.c 26+++ b/drivers/dahdi/xpp/xbus-core.c 27@@ -1754,11 +1754,14 @@ out: 28 29 static void xbus_fill_proc_queue(struct seq_file *sfile, struct xframe_queue *q) 30 { 31+ s64 msec = 0; 32+ s32 rem = 0; 33+ 34+ msec = div_s64_rem(q->worst_lag_usec, 1000, &rem); 35 seq_printf(sfile, 36- "%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n", 37+ "%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%d ms\n", 38 q->name, q->steady_state_count, q->count, q->max_count, 39- q->worst_count, q->overflows, q->worst_lag_usec / 1000, 40- q->worst_lag_usec % 1000); 41+ q->worst_count, q->overflows, msec, rem); 42 xframe_queue_clearstats(q); 43 } 44 45diff --git a/drivers/dahdi/xpp/xbus-pcm.c b/drivers/dahdi/xpp/xbus-pcm.c 46index 8bb2fe7..e690ce7 100644 47--- a/drivers/dahdi/xpp/xbus-pcm.c 48+++ b/drivers/dahdi/xpp/xbus-pcm.c 49@@ -129,7 +129,7 @@ static int xpp_ticker_step(struct xpp_ticker *ticker, const ktime_t t) 50 usec = ktime_us_delta(ticker->last_sample, 51 ticker->first_sample); 52 ticker->first_sample = ticker->last_sample; 53- ticker->tick_period = usec / ticker->cycle; 54+ ticker->tick_period = div_s64(usec, ticker->cycle); 55 cycled = 1; 56 } 57 ticker->count++; 58@@ -497,7 +497,7 @@ static void send_drift(xbus_t *xbus, int drift) 59 XBUS_DBG(SYNC, xbus, 60 "%sDRIFT adjust %s (%d) (last update %lld seconds ago)\n", 61 (disable_pll_sync) ? "Fake " : "", msg, drift, 62- msec_delta / MSEC_PER_SEC); 63+ div_s64(msec_delta, MSEC_PER_SEC)); 64 if (!disable_pll_sync) 65 CALL_PROTO(GLOBAL, SYNC_SOURCE, xbus, NULL, SYNC_MODE_PLL, 66 drift); 67diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c 68index d8c11dc..35180d9 100644 69--- a/drivers/dahdi/xpp/xbus-sysfs.c 70+++ b/drivers/dahdi/xpp/xbus-sysfs.c 71@@ -249,7 +249,7 @@ static DEVICE_ATTR_READER(driftinfo_show, dev, buf) 72 /* 73 * Calculate lost ticks time 74 */ 75- seconds = ktime_ms_delta(now, di->last_lost_tick) / 1000; 76+ seconds = div_s64(ktime_ms_delta(now, di->last_lost_tick), 1000); 77 minutes = seconds / 60; 78 seconds = seconds % 60; 79 hours = minutes / 60; 80diff --git a/drivers/dahdi/xpp/xframe_queue.c b/drivers/dahdi/xpp/xframe_queue.c 81index e986083..8e5e508 100644 82--- a/drivers/dahdi/xpp/xframe_queue.c 83+++ b/drivers/dahdi/xpp/xframe_queue.c 84@@ -35,15 +35,18 @@ static void __xframe_dump_queue(struct xframe_queue *q) 85 int i = 0; 86 char prefix[30]; 87 ktime_t now = ktime_get(); 88+ s64 msec = 0; 89+ s32 rem = 0; 90 91 printk(KERN_DEBUG "%s: dump queue '%s' (first packet in each frame)\n", 92 THIS_MODULE->name, q->name); 93 list_for_each_entry_reverse(xframe, &q->head, frame_list) { 94 xpacket_t *pack = (xpacket_t *)&xframe->packets[0]; 95 s64 usec = ktime_us_delta(now, xframe->kt_queued); 96+ msec = div_s64_rem(usec, 1000, &rem); 97 98- snprintf(prefix, ARRAY_SIZE(prefix), " %3d> %5lld.%03lld msec", 99- i++, usec / 1000, usec % 1000); 100+ snprintf(prefix, ARRAY_SIZE(prefix), " %3d> %5lld.%03d msec", 101+ i++, msec, rem); 102 dump_packet(prefix, pack, 1); 103 } 104 } 105@@ -52,6 +55,8 @@ static bool __xframe_enqueue(struct xframe_queue *q, xframe_t *xframe) 106 { 107 int ret = 1; 108 static int overflow_cnt; 109+ s64 msec = 0; 110+ s32 rem = 0; 111 112 if (unlikely(q->disabled)) { 113 ret = 0; 114@@ -60,11 +65,11 @@ static bool __xframe_enqueue(struct xframe_queue *q, xframe_t *xframe) 115 if (q->count >= q->max_count) { 116 q->overflows++; 117 if ((overflow_cnt++ % 1000) < 5) { 118- NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n", 119+ msec = div_s64_rem(q->worst_lag_usec, 1000, &rem); 120+ NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%d ms\n", 121 q->name, q->steady_state_count, q->count, 122 q->max_count, q->worst_count, q->overflows, 123- q->worst_lag_usec / 1000, 124- q->worst_lag_usec % 1000); 125+ msec, rem); 126 __xframe_dump_queue(q); 127 } 128 ret = 0; 129diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c 130index 1a591b1..3741457 100644 131--- a/drivers/dahdi/xpp/xpp_usb.c 132+++ b/drivers/dahdi/xpp/xpp_usb.c 133@@ -882,7 +882,7 @@ static void xpp_send_callback(struct urb *urb) 134 usec = 0; /* System clock jumped */ 135 if (usec > xusb->max_tx_delay) 136 xusb->max_tx_delay = usec; 137- i = usec / USEC_BUCKET; 138+ i = div_s64(usec, USEC_BUCKET); 139 if (i >= NUM_BUCKETS) 140 i = NUM_BUCKETS - 1; 141 xusb->usb_tx_delay[i]++; 142-- 1432.33.0 144 145