From: Sebastian Kemper Date: Fri, 24 Apr 2020 18:52:11 +0000 (+0200) Subject: dahdi-linux: add patch to fix 32bit targets X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=86dd09fcbe5a0f48225006469e7e8db3a3b4aa00;p=feed%2Ftelephony.git dahdi-linux: add patch to fix 32bit targets On some 32 bit targets dahdi-linux currently fails to build. Examples: ERROR: "__divdi3" [/builder/shared-workdir/build/sdk/build_dir/target-powerpc_8540_musl/linux-mpc85xx_generic/dahdi-linux-3.1.0/drivers/dahdi/xpp/xpp_usb.ko] undefined! ERROR: "__udivdi3" [/builder/shared-workdir/build/sdk/build_dir/target-powerpc_8540_musl/linux-mpc85xx_generic/dahdi-linux-3.1.0/drivers/dahdi/xpp/xpp_usb.ko] undefined! ERROR: "__moddi3" [/builder/shared-workdir/build/sdk/build_dir/target-powerpc_8540_musl/linux-mpc85xx_generic/dahdi-linux-3.1.0/drivers/dahdi/xpp/xpp.ko] undefined! ERROR: "__divdi3" [/builder/shared-workdir/build/sdk/build_dir/target-powerpc_8540_musl/linux-mpc85xx_generic/dahdi-linux-3.1.0/drivers/dahdi/xpp/xpp.ko] undefined! or ERROR: "__aeabi_ldivmod" [/store/buildbot/slave/shared-workdir/build/sdk/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-bcm27xx_bcm2708/dahdi-linux-3.1.0/drivers/dahdi/xpp/xpp_usb.ko] undefined! ERROR: "__aeabi_uldivmod" [/store/buildbot/slave/shared-workdir/build/sdk/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-bcm27xx_bcm2708/dahdi-linux-3.1.0/drivers/dahdi/xpp/xpp_usb.ko] undefined! ERROR: "__aeabi_ldivmod" [/store/buildbot/slave/shared-workdir/build/sdk/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-bcm27xx_bcm2708/dahdi-linux-3.1.0/drivers/dahdi/xpp/xpp.ko] undefined! Problem was reported to upstream already by third party ([1]). Patch attached to bug report is not sufficient. This commit adds a patch from PLD Linux ([2]) to address the build failures. [1] https://issues.asterisk.org/jira/browse/DAHLIN-371 [2] https://github.com/pld-linux/dahdi-linux/blob/master/math64.patch Signed-off-by: Sebastian Kemper --- diff --git a/libs/dahdi-linux/Makefile b/libs/dahdi-linux/Makefile index e648217..766fcfb 100644 --- a/libs/dahdi-linux/Makefile +++ b/libs/dahdi-linux/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=dahdi-linux PKG_VERSION:=3.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases diff --git a/libs/dahdi-linux/patches/130-DAHLIN-371-pld-linux-math64.patch b/libs/dahdi-linux/patches/130-DAHLIN-371-pld-linux-math64.patch new file mode 100644 index 0000000..1d4f5b1 --- /dev/null +++ b/libs/dahdi-linux/patches/130-DAHLIN-371-pld-linux-math64.patch @@ -0,0 +1,138 @@ +--- a/drivers/dahdi/xpp/xbus-core.c ++++ b/drivers/dahdi/xpp/xbus-core.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -1754,11 +1755,13 @@ out: + + static void xbus_fill_proc_queue(struct seq_file *sfile, struct xframe_queue *q) + { ++ s32 rem; ++ s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem); + seq_printf(sfile, +- "%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n", ++ "%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%ld ms\n", + q->name, q->steady_state_count, q->count, q->max_count, +- q->worst_count, q->overflows, q->worst_lag_usec / 1000, +- q->worst_lag_usec % 1000); ++ q->worst_count, q->overflows, lag_sec, ++ rem); + xframe_queue_clearstats(q); + } + +--- a/drivers/dahdi/xpp/xbus-pcm.c ++++ b/drivers/dahdi/xpp/xbus-pcm.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include "xbus-pcm.h" + #include "xbus-core.h" + #include "xpp_dahdi.h" +@@ -129,7 +130,7 @@ static int xpp_ticker_step(struct xpp_ti + usec = ktime_us_delta(ticker->last_sample, + ticker->first_sample); + ticker->first_sample = ticker->last_sample; +- ticker->tick_period = usec / ticker->cycle; ++ ticker->tick_period = div_s64(usec, ticker->cycle); + cycled = 1; + } + ticker->count++; +@@ -497,7 +498,7 @@ static void send_drift(xbus_t *xbus, int + XBUS_DBG(SYNC, xbus, + "%sDRIFT adjust %s (%d) (last update %lld seconds ago)\n", + (disable_pll_sync) ? "Fake " : "", msg, drift, +- msec_delta / MSEC_PER_SEC); ++ div_s64(msec_delta, MSEC_PER_SEC)); + if (!disable_pll_sync) + CALL_PROTO(GLOBAL, SYNC_SOURCE, xbus, NULL, SYNC_MODE_PLL, + drift); +--- a/drivers/dahdi/xpp/xbus-sysfs.c ++++ b/drivers/dahdi/xpp/xbus-sysfs.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #ifdef PROTOCOL_DEBUG + #include +@@ -249,11 +250,9 @@ static DEVICE_ATTR_READER(driftinfo_show + /* + * Calculate lost ticks time + */ +- seconds = ktime_ms_delta(now, di->last_lost_tick) / 1000; +- minutes = seconds / 60; +- seconds = seconds % 60; +- hours = minutes / 60; +- minutes = minutes % 60; ++ seconds = div_s64(ktime_ms_delta(now, di->last_lost_tick), 1000); ++ minutes = div_s64_rem(seconds, 60, &seconds); ++ hours = div_s64_rem(minutes, 60, &minutes); + len += snprintf(buf + len, PAGE_SIZE - len, + "%-15s: %8d (was %d:%02d:%02d ago)\n", "lost_ticks", + di->lost_ticks, hours, minutes, seconds); +--- a/drivers/dahdi/xpp/xframe_queue.c ++++ b/drivers/dahdi/xpp/xframe_queue.c +@@ -1,3 +1,4 @@ ++#include + #include "xframe_queue.h" + #include "xbus-core.h" + #include "dahdi_debug.h" +@@ -40,10 +41,11 @@ static void __xframe_dump_queue(struct x + THIS_MODULE->name, q->name); + list_for_each_entry_reverse(xframe, &q->head, frame_list) { + xpacket_t *pack = (xpacket_t *)&xframe->packets[0]; +- s64 usec = ktime_us_delta(now, xframe->kt_queued); ++ s32 rem; ++ s64 sec = div_s64_rem(ktime_us_delta(now, xframe->kt_queued), 1000, &rem); + +- snprintf(prefix, ARRAY_SIZE(prefix), " %3d> %5lld.%03lld msec", +- i++, usec / 1000, usec % 1000); ++ snprintf(prefix, ARRAY_SIZE(prefix), " %3d> %5lld.%03ld msec", ++ i++, sec, rem); + dump_packet(prefix, pack, 1); + } + } +@@ -60,11 +62,13 @@ static bool __xframe_enqueue(struct xfra + if (q->count >= q->max_count) { + q->overflows++; + if ((overflow_cnt++ % 1000) < 5) { +- NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n", ++ s32 rem; ++ s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem); ++ NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%ld ms\n", + q->name, q->steady_state_count, q->count, + q->max_count, q->worst_count, q->overflows, +- q->worst_lag_usec / 1000, +- q->worst_lag_usec % 1000); ++ lag_sec, ++ rem); + __xframe_dump_queue(q); + } + ret = 0; +--- a/drivers/dahdi/xpp/xpp_usb.c ++++ b/drivers/dahdi/xpp/xpp_usb.c +@@ -27,6 +27,7 @@ + #include + #include /* for udelay */ + #include ++#include + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) + #include + #else +@@ -886,7 +887,7 @@ static void xpp_send_callback(struct urb + usec = 0; /* System clock jumped */ + if (usec > xusb->max_tx_delay) + xusb->max_tx_delay = usec; +- i = usec / USEC_BUCKET; ++ i = div_s64(usec, USEC_BUCKET); + if (i >= NUM_BUCKETS) + i = NUM_BUCKETS - 1; + xusb->usb_tx_delay[i]++;