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