- Linux-stable-mirror - lists.linaro.org

[PATCH 5.6] arm64: Always force a branch protection mode when the compiler has one

by Mark Brown

Compilers with branch protection support can be configured to enable it by default, it is likely that distributions will do this as part of deploying branch protection system wide. As well as the slight overhead from having some extra NOPs for unused branch protection features this can cause more serious problems when the kernel is providing pointer authentication to userspace but not built for pointer authentication itself. In that case our switching of keys for userspace can affect the kernel unexpectedly, causing pointer authentication instructions in the kernel to corrupt addresses. To ensure that we get consistent and reliable behaviour always explicitly initialise the branch protection mode, ensuring that the kernel is built the same way regardless of the compiler defaults. [This is a reworked version of b8fdef311a0bd9223f1075 ("arm64: Always force a branch protection mode when the compiler has one") for backport. Kernels prior to 74afda4016a7 ("arm64: compile the kernel with ptrauth return address signing") don't have any Makefile machinery for forcing on pointer auth but still have issues if the compiler defaults it on so need this reworked version. -- broonie] Fixes: 7503197562567 (arm64: add basic pointer authentication support) Reported-by: Szabolcs Nagy <szabolcs.nagy(a)arm.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> Cc: stable(a)vger.kernel.org [catalin.marinas(a)arm.com: remove Kconfig option in favour of Makefile check] Signed-off-by: Catalin Marinas <catalin.marinas(a)arm.com> --- arch/arm64/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index dca1a97751ab..4e6ce2d9196e 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -65,6 +65,10 @@ stack_protector_prepare: prepare0 include/generated/asm-offsets.h)) endif +# Ensure that if the compiler supports branch protection we default it +# off. +KBUILD_CFLAGS += $(call cc-option,-mbranch-protection=none) + ifeq ($(CONFIG_CPU_BIG_ENDIAN), y) KBUILD_CPPFLAGS += -mbig-endian CHECKFLAGS += -D__AARCH64EB__ -- 2.20.1

5 years, 8 months

2
1
0 0

[tip: timers/urgent] proc, time/namespace: Show clock symbolic names in /proc/pid/timens_offsets

by tip-bot2 for Andrei Vagin

The following commit has been merged into the timers/urgent branch of tip: Commit-ID: 94d440d618467806009c8edc70b094d64e12ee5a Gitweb: https://git.kernel.org/tip/94d440d618467806009c8edc70b094d64e12ee5a Author: Andrei Vagin <avagin(a)gmail.com> AuthorDate: Sat, 11 Apr 2020 08:40:31 -07:00 Committer: Thomas Gleixner <tglx(a)linutronix.de> CommitterDate: Thu, 16 Apr 2020 12:10:54 +02:00 proc, time/namespace: Show clock symbolic names in /proc/pid/timens_offsets Michael Kerrisk suggested to replace numeric clock IDs with symbolic names. Now the content of these files looks like this: $ cat /proc/774/timens_offsets monotonic 864000 0 boottime 1728000 0 For setting offsets, both representations of clocks (numeric and symbolic) can be used. As for compatibility, it is acceptable to change things as long as userspace doesn't care. The format of timens_offsets files is very new and there are no userspace tools yet which rely on this format. But three projects crun, util-linux and criu rely on the interface of setting time offsets and this is why it's required to continue supporting the numeric clock IDs on write. Fixes: 04a8682a71be ("fs/proc: Introduce /proc/pid/timens_offsets") Suggested-by: Michael Kerrisk <mtk.manpages(a)gmail.com> Signed-off-by: Andrei Vagin <avagin(a)gmail.com> Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Tested-by: Michael Kerrisk <mtk.manpages(a)gmail.com> Acked-by: Michael Kerrisk <mtk.manpages(a)gmail.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Eric W. Biederman <ebiederm(a)xmission.com> Cc: Dmitry Safonov <0x7f454c46(a)gmail.com> Cc: stable(a)vger.kernel.org Link: https://lkml.kernel.org/r/20200411154031.642557-1-avagin@gmail.com --- fs/proc/base.c | 14 +++++++++++++- kernel/time/namespace.c | 15 ++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 6042b64..572898d 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1573,6 +1573,7 @@ static ssize_t timens_offsets_write(struct file *file, const char __user *buf, noffsets = 0; for (pos = kbuf; pos; pos = next_line) { struct proc_timens_offset *off = &offsets[noffsets]; + char clock[10]; int err; /* Find the end of line and ensure we don't look past it */ @@ -1584,10 +1585,21 @@ static ssize_t timens_offsets_write(struct file *file, const char __user *buf, next_line = NULL; } - err = sscanf(pos, "%u %lld %lu", &off->clockid, + err = sscanf(pos, "%9s %lld %lu", clock, &off->val.tv_sec, &off->val.tv_nsec); if (err != 3 || off->val.tv_nsec >= NSEC_PER_SEC) goto out; + + clock[sizeof(clock) - 1] = 0; + if (strcmp(clock, "monotonic") == 0 || + strcmp(clock, __stringify(CLOCK_MONOTONIC)) == 0) + off->clockid = CLOCK_MONOTONIC; + else if (strcmp(clock, "boottime") == 0 || + strcmp(clock, __stringify(CLOCK_BOOTTIME)) == 0) + off->clockid = CLOCK_BOOTTIME; + else + goto out; + noffsets++; if (noffsets == ARRAY_SIZE(offsets)) { if (next_line) diff --git a/kernel/time/namespace.c b/kernel/time/namespace.c index 3b30288..53bce34 100644 --- a/kernel/time/namespace.c +++ b/kernel/time/namespace.c @@ -338,7 +338,20 @@ static struct user_namespace *timens_owner(struct ns_common *ns) static void show_offset(struct seq_file *m, int clockid, struct timespec64 *ts) { - seq_printf(m, "%d %lld %ld\n", clockid, ts->tv_sec, ts->tv_nsec); + char *clock; + + switch (clockid) { + case CLOCK_BOOTTIME: + clock = "boottime"; + break; + case CLOCK_MONOTONIC: + clock = "monotonic"; + break; + default: + clock = "unknown"; + break; + } + seq_printf(m, "%-10s %10lld %9ld\n", clock, ts->tv_sec, ts->tv_nsec); } void proc_timens_show_offsets(struct task_struct *p, struct seq_file *m)

5 years, 8 months

1
0
0 0

FAILED: patch "[PATCH] arm64: Always force a branch protection mode when the" failed to apply to 5.6-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b8fdef311a0bd9223f10754f94fdcf1a594a3457 Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Tue, 31 Mar 2020 20:44:59 +0100 Subject: [PATCH] arm64: Always force a branch protection mode when the compiler has one Compilers with branch protection support can be configured to enable it by default, it is likely that distributions will do this as part of deploying branch protection system wide. As well as the slight overhead from having some extra NOPs for unused branch protection features this can cause more serious problems when the kernel is providing pointer authentication to userspace but not built for pointer authentication itself. In that case our switching of keys for userspace can affect the kernel unexpectedly, causing pointer authentication instructions in the kernel to corrupt addresses. To ensure that we get consistent and reliable behaviour always explicitly initialise the branch protection mode, ensuring that the kernel is built the same way regardless of the compiler defaults. Fixes: 7503197562567 (arm64: add basic pointer authentication support) Reported-by: Szabolcs Nagy <szabolcs.nagy(a)arm.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> Cc: stable(a)vger.kernel.org [catalin.marinas(a)arm.com: remove Kconfig option in favour of Makefile check] Signed-off-by: Catalin Marinas <catalin.marinas(a)arm.com> diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index f15f92ba53e6..85e4149cc5d5 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -65,6 +65,10 @@ stack_protector_prepare: prepare0 include/generated/asm-offsets.h)) endif +# Ensure that if the compiler supports branch protection we default it +# off, this will be overridden if we are using branch protection. +branch-prot-flags-y += $(call cc-option,-mbranch-protection=none) + ifeq ($(CONFIG_ARM64_PTR_AUTH),y) branch-prot-flags-$(CONFIG_CC_HAS_SIGN_RETURN_ADDRESS) := -msign-return-address=all branch-prot-flags-$(CONFIG_CC_HAS_BRANCH_PROT_PAC_RET) := -mbranch-protection=pac-ret+leaf @@ -73,9 +77,10 @@ branch-prot-flags-$(CONFIG_CC_HAS_BRANCH_PROT_PAC_RET) := -mbranch-protection=pa # we pass it only to the assembler. This option is utilized only in case of non # integrated assemblers. branch-prot-flags-$(CONFIG_AS_HAS_PAC) += -Wa,-march=armv8.3-a -KBUILD_CFLAGS += $(branch-prot-flags-y) endif +KBUILD_CFLAGS += $(branch-prot-flags-y) + ifeq ($(CONFIG_CPU_BIG_ENDIAN), y) KBUILD_CPPFLAGS += -mbig-endian CHECKFLAGS += -D__AARCH64EB__

5 years, 8 months

4
4
0 0

FAILED: patch "[PATCH] drm: Remove PageReserved manipulation from drm_pci_alloc" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ea36ec8623f56791c6ff6738d0509b7920f85220 Mon Sep 17 00:00:00 2001 From: Chris Wilson <chris(a)chris-wilson.co.uk> Date: Sun, 2 Feb 2020 17:16:31 +0000 Subject: [PATCH] drm: Remove PageReserved manipulation from drm_pci_alloc drm_pci_alloc/drm_pci_free are very thin wrappers around the core dma facilities, and we have no special reason within the drm layer to behave differently. In particular, since commit de09d31dd38a50fdce106c15abd68432eebbd014 Author: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Date: Fri Jan 15 16:51:42 2016 -0800 page-flags: define PG_reserved behavior on compound pages As far as I can see there's no users of PG_reserved on compound pages. Let's use PF_NO_COMPOUND here. it has been illegal to combine GFP_COMP with SetPageReserved, so lets stop doing both and leave the dma layer to its own devices. Reported-by: Taketo Kabe Bug: https://gitlab.freedesktop.org/drm/intel/issues/1027 Fixes: de09d31dd38a ("page-flags: define PG_reserved behavior on compound pages") Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: <stable(a)vger.kernel.org> # v4.5+ Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200202171635.4039044-1-chri… diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index f2e43d341980..d16dac4325f9 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -51,8 +51,6 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align) { drm_dma_handle_t *dmah; - unsigned long addr; - size_t sz; /* pci_alloc_consistent only guarantees alignment to the smallest * PAGE_SIZE order which is greater than or equal to the requested size. @@ -68,20 +66,13 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali dmah->size = size; dmah->vaddr = dma_alloc_coherent(&dev->pdev->dev, size, &dmah->busaddr, - GFP_KERNEL | __GFP_COMP); + GFP_KERNEL); if (dmah->vaddr == NULL) { kfree(dmah); return NULL; } - /* XXX - Is virt_to_page() legal for consistent mem? */ - /* Reserve */ - for (addr = (unsigned long)dmah->vaddr, sz = size; - sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) { - SetPageReserved(virt_to_page((void *)addr)); - } - return dmah; } @@ -94,19 +85,9 @@ EXPORT_SYMBOL(drm_pci_alloc); */ void __drm_legacy_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) { - unsigned long addr; - size_t sz; - - if (dmah->vaddr) { - /* XXX - Is virt_to_page() legal for consistent mem? */ - /* Unreserve */ - for (addr = (unsigned long)dmah->vaddr, sz = dmah->size; - sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) { - ClearPageReserved(virt_to_page((void *)addr)); - } + if (dmah->vaddr) dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr, dmah->busaddr); - } } /**

5 years, 8 months

3
2
0 0

FAILED: patch "[PATCH] XArray: Fix xa_find_next for large multi-index entries" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From bd40b17ca49d7d110adf456e647701ce74de2241 Mon Sep 17 00:00:00 2001 From: "Matthew Wilcox (Oracle)" <willy(a)infradead.org> Date: Fri, 31 Jan 2020 05:07:55 -0500 Subject: [PATCH] XArray: Fix xa_find_next for large multi-index entries Coverity pointed out that xas_sibling() was shifting xa_offset without promoting it to an unsigned long first, so the shift could cause an overflow and we'd get the wrong answer. The fix is obvious, and the new test-case provokes UBSAN to report an error: runtime error: shift exponent 60 is too large for 32-bit type 'int' Fixes: 19c30f4dd092 ("XArray: Fix xa_find_after with multi-index entries") Reported-by: Bjorn Helgaas <bhelgaas(a)google.com> Reported-by: Kees Cook <keescook(a)chromium.org> Signed-off-by: Matthew Wilcox (Oracle) <willy(a)infradead.org> Cc: stable(a)vger.kernel.org diff --git a/lib/test_xarray.c b/lib/test_xarray.c index 55c14e8c8859..8c7d7a8468b8 100644 --- a/lib/test_xarray.c +++ b/lib/test_xarray.c @@ -12,6 +12,9 @@ static unsigned int tests_run; static unsigned int tests_passed; +static const unsigned int order_limit = + IS_ENABLED(CONFIG_XARRAY_MULTI) ? BITS_PER_LONG : 1; + #ifndef XA_DEBUG # ifdef __KERNEL__ void xa_dump(const struct xarray *xa) { } @@ -959,6 +962,20 @@ static noinline void check_multi_find_2(struct xarray *xa) } } +static noinline void check_multi_find_3(struct xarray *xa) +{ + unsigned int order; + + for (order = 5; order < order_limit; order++) { + unsigned long index = 1UL << (order - 5); + + XA_BUG_ON(xa, !xa_empty(xa)); + xa_store_order(xa, 0, order - 4, xa_mk_index(0), GFP_KERNEL); + XA_BUG_ON(xa, xa_find_after(xa, &index, ULONG_MAX, XA_PRESENT)); + xa_erase_index(xa, 0); + } +} + static noinline void check_find_1(struct xarray *xa) { unsigned long i, j, k; @@ -1081,6 +1098,7 @@ static noinline void check_find(struct xarray *xa) for (i = 2; i < 10; i++) check_multi_find_1(xa, i); check_multi_find_2(xa); + check_multi_find_3(xa); } /* See find_swap_entry() in mm/shmem.c */ diff --git a/lib/xarray.c b/lib/xarray.c index 1d9fab7db8da..acd1fad2e862 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -1839,7 +1839,8 @@ static bool xas_sibling(struct xa_state *xas) if (!node) return false; mask = (XA_CHUNK_SIZE << node->shift) - 1; - return (xas->xa_index & mask) > (xas->xa_offset << node->shift); + return (xas->xa_index & mask) > + ((unsigned long)xas->xa_offset << node->shift); } /**

5 years, 8 months

4
4
0 0

[PATCH v2] crypto: algapi - Avoid spurious modprobe on LOADED

by Eric Biggers

From: Eric Biggers <ebiggers(a)google.com> Currently after any algorithm is registered and tested, there's an unnecessary request_module("cryptomgr") even if it's already loaded. Also, CRYPTO_MSG_ALG_LOADED is sent twice, and thus if the algorithm is "crct10dif", lib/crc-t10dif.c replaces the tfm twice rather than once. This occurs because CRYPTO_MSG_ALG_LOADED is sent using crypto_probing_notify(), which tries to load "cryptomgr" if the notification is not handled (NOTIFY_DONE). This doesn't make sense because "cryptomgr" doesn't handle this notification. Fix this by using crypto_notify() instead of crypto_probing_notify(). Fixes: dd8b083f9a5e ("crypto: api - Introduce notifier for new crypto algorithms") Cc: <stable(a)vger.kernel.org> # v4.20+ Cc: Martin K. Petersen <martin.petersen(a)oracle.com> Signed-off-by: Eric Biggers <ebiggers(a)google.com> --- crypto/algapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/algapi.c b/crypto/algapi.c index 69605e21af92..849254d7e627 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -403,7 +403,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval) err = wait_for_completion_killable(&larval->completion); WARN_ON(err); if (!err) - crypto_probing_notify(CRYPTO_MSG_ALG_LOADED, larval); + crypto_notify(CRYPTO_MSG_ALG_LOADED, larval); out: crypto_larval_kill(&larval->alg); -- 2.26.0

5 years, 8 months

3
2
0 0

Stable RC build failures (v4.19.y, v5.4.y, v5.5.y)

by Guenter Roeck

Hi, The folloewing build failures currently observed with stable release candidates. Thanks, Guenter --- v4.19.y: drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:392:14: error: 'chipFeatures_PIPE_3D' undeclared here drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:397:14: error: 'chipFeatures_PIPE_2D' drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:402:14: error: 'chipFeatures_PIPE_VG' undeclared here Culprit is 'drm/etnaviv: rework perfmon query infrastructure'. Applying commit 15ff4a7b5841 ("etnaviv: perfmon: fix total and idle HI cyleces readout") as well fixes the problem. v5.4.y, v5.5.y: drivers/mmc/host/sdhci-tegra.c: In function 'tegra_sdhci_set_timeout': drivers/mmc/host/sdhci-tegra.c:1256:2: error: implicit declaration of function '__sdhci_set_timeout' Culprit is "sdhci: tegra: Implement Tegra specific set_timeout callback". __sdhci_set_timeout() was introduced with commit 7d76ed77cfbd3 ("mmc: sdhci: Refactor sdhci_set_timeout()"). Unfortunately, applying that patch results in a conflict. Guenter

5 years, 8 months

2
2
0 0

Re: [chrome-os:chromeos-4.19 21350/21402] drivers/misc/echo/echo.c:384:27: error: equality comparison with extraneous parentheses

by Nick Desaulniers

On Tue, Apr 14, 2020 at 5:56 PM 'Guenter Roeck' via Clang Built Linux <clang-built-linux(a)googlegroups.com> wrote: > > On Tue, Apr 14, 2020 at 5:26 PM Nathan Chancellor > <natechancellor(a)gmail.com> wrote: > > > > Hi all, > > > > Sorry for yet another convergeance on this commit... :/ hopefully this > > does not continue for much longer. None of the warnings are obviously > > caused by the patch below. >> Fixed by commit 85dc2c65e6c9 ("misc: echo: Remove unnecessary >> parentheses and simplify check for zero"). > > > No worries. > > I noticed that the problems are pretty much all fixed in the upstream > kernel. I just wasn't sure if it would be worthwhile sending a request > to stable@ to have them applied to 4.19.y (and if necessary 5.4.y). > Any suggestions ? We should strive to be warning free on stable. Thanks for identifying the fix Nathan. Greg, Sasha, Would you please cherry pick 85dc2c65e6c9 to 4.19.y, 4.14.y, 4.9.y, and 4.4.y (maybe 3.18, didn't check that one)? It applies cleanly and is a trivial fix for a warning that landed in v4.20-rc1. `git describe --contains "$tag" | sed 's/~.*//'` is my trick for finding the first tag that contained a commit. > > Thanks, > Guenter > > > Guenter > > > On Wed, Apr 15, 2020 at 06:09:47AM +0800, kbuild test robot wrote: > > > tree: https://chromium.googlesource.com/chromiumos/third_party/kernel chromeos-4.19 > > > head: e747fc8dfce13c501be9b7032a5a3d8249bc27ab > > > commit: 12bd892cc0bd4a700dd41aa4b0d1e0cfc128e3e4 [21350/21402] CHROMIUM: Merge 'v4.19.114' into chromeos-4.19 > > > config: x86_64-randconfig-c002-20200414 (attached as .config) > > > compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project f3da6b7ab5698bb0b9bd208972115dbcbbc59f27) > > > reproduce: > > > wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross > > > chmod +x ~/bin/make.cross > > > git checkout 12bd892cc0bd4a700dd41aa4b0d1e0cfc128e3e4 > > > # save the attached .config to linux build tree > > > COMPILER=clang make.cross ARCH=x86_64 > > > > > > If you fix the issue, kindly add following tag as appropriate > > > Reported-by: kbuild test robot <lkp(a)intel.com> > > > > > > All errors (new ones prefixed by >>): > > > > > > >> drivers/misc/echo/echo.c:384:27: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] > > > if ((ec->nonupdate_dwell == 0)) { > > > ~~~~~~~~~~~~~~~~~~~~^~~~ > > > drivers/misc/echo/echo.c:384:27: note: remove extraneous parentheses around the comparison to silence this warning > > > if ((ec->nonupdate_dwell == 0)) { > > > ~ ^ ~ > > > drivers/misc/echo/echo.c:384:27: note: use '=' to turn this equality comparison into an assignment > > > if ((ec->nonupdate_dwell == 0)) { > > > ^~ > > > = > > > 1 error generated. > > > > Fixed by commit 85dc2c65e6c9 ("misc: echo: Remove unnecessary > > parentheses and simplify check for zero"). > > > > > >> net/decnet/dn_dev.c:1366:10: error: address of array 'dev->name' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] > > > dev->name ? dev->name : "???", > > > ~~~~~^~~~ ~ > > > 1 error generated. > > > > Fixed by commit 5b9b0a80aa1a ("decnet: Remove unnecessary check for > > dev->name"). > > > > > >> drivers/regulator/da903x.c:395:2: error: division by zero is undefined [-Werror,-Wdivision-by-zero] > > > DA9030_LDO(13, 2100, 2100, 0, INVAL, 0, 0, RCTL11, 3), /* fixed @2.1V */ > > > ^ ~ > > > drivers/regulator/da903x.c:359:2: note: expanded from macro 'DA9030_LDO' > > > DA903x_LDO(DA9030, _id, min, max, step, vreg, shift, nbits, ereg, ebit) > > > ^ ~~~~ > > > drivers/regulator/da903x.c:320:39: note: expanded from macro 'DA903x_LDO' > > > .n_voltages = (step) ? ((max - min) / step + 1) : 1, \ > > > ^ ~~~~ > > > drivers/regulator/da903x.c:415:2: error: division by zero is undefined [-Werror,-Wdivision-by-zero] > > > DA9034_LDO(5, 3100, 3100, 0, INVAL, 0, 0, OVER3, 7), /* fixed @3.1V */ > > > ^ ~ > > > drivers/regulator/da903x.c:356:2: note: expanded from macro 'DA9034_LDO' > > > DA903x_LDO(DA9034, _id, min, max, step, vreg, shift, nbits, ereg, ebit) > > > ^ ~~~~ > > > drivers/regulator/da903x.c:320:39: note: expanded from macro 'DA903x_LDO' > > > .n_voltages = (step) ? ((max - min) / step + 1) : 1, \ > > > ^ ~~~~ > > > 2 errors generated. > > > > "Fixed" by commit 0077aaaeeb69 ("regulator: da903x: don't build with > > clang"). I do not think the Clang fix ever got finalized. > > > > > In file included from drivers/scsi/osd/osd_uld.c:60: > > > In file included from include/scsi/osd_initiator.h:18: > > > >> include/scsi/osd_types.h:31:21: error: 'weak' attribute only applies to variables, functions, and classes [-Werror,-Wignored-attributes] > > > static const struct __weak osd_obj_id osd_root_object = {0, 0}; > > > ^ > > > include/linux/compiler_types.h:219:33: note: expanded from macro '__weak' > > > #define __weak __attribute__((weak)) > > > ^ > > > 1 error generated. > > > > "Fixed" by just deleting the driver in commit 19fcae3d4f2d ("scsi: > > remove the SCSI OSD library"). I did send a patch to fix it which > > spurred the deletion, if we wanted to take it in stable if we care: > > > > https://lore.kernel.org/lkml/20190126064740.12949-1-natechancellor@gmail.co… > > > > > vim +384 drivers/misc/echo/echo.c > > > > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 273 > > > 9d8f2d5dfbcc9d drivers/staging/echo/echo.c Tzafrir Cohen 2008-10-12 274 int16_t oslec_update(struct oslec_state *ec, int16_t tx, int16_t rx) > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 275 { > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 276 int32_t echo_value; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 277 int clean_bg; > > > 3ec50be588d773 drivers/staging/echo/echo.c Jesper Juhl 2012-06-27 278 int tmp; > > > 3ec50be588d773 drivers/staging/echo/echo.c Jesper Juhl 2012-06-27 279 int tmp1; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 280 > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 281 /* > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 282 * Input scaling was found be required to prevent problems when tx > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 283 * starts clipping. Another possible way to handle this would be the > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 284 * filter coefficent scaling. > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 285 */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 286 > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 287 ec->tx = tx; > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 288 ec->rx = rx; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 289 tx >>= 1; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 290 rx >>= 1; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 291 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 292 /* > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 293 * Filter DC, 3dB point is 160Hz (I think), note 32 bit precision > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 294 * required otherwise values do not track down to 0. Zero at DC, Pole > > > 196e76e86a3a90 drivers/staging/echo/echo.c David Rowe 2009-08-23 295 * at (1-Beta) on real axis. Some chip sets (like Si labs) don't > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 296 * need this, but something like a $10 X100P card does. Any DC really > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 297 * slows down convergence. > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 298 * > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 299 * Note: removes some low frequency from the signal, this reduces the > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 300 * speech quality when listening to samples through headphones but may > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 301 * not be obvious through a telephone handset. > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 302 * > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 303 * Note that the 3dB frequency in radians is approx Beta, e.g. for Beta > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 304 * = 2^(-3) = 0.125, 3dB freq is 0.125 rads = 159Hz. > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 305 */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 306 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 307 if (ec->adaption_mode & ECHO_CAN_USE_RX_HPF) { > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 308 tmp = rx << 15; > > > 196e76e86a3a90 drivers/staging/echo/echo.c David Rowe 2009-08-23 309 > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 310 /* > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 311 * Make sure the gain of the HPF is 1.0. This can still > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 312 * saturate a little under impulse conditions, and it might > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 313 * roll to 32768 and need clipping on sustained peak level > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 314 * signals. However, the scale of such clipping is small, and > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 315 * the error due to any saturation should not markedly affect > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 316 * the downstream processing. > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 317 */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 318 tmp -= (tmp >> 4); > > > 196e76e86a3a90 drivers/staging/echo/echo.c David Rowe 2009-08-23 319 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 320 ec->rx_1 += -(ec->rx_1 >> DC_LOG2BETA) + tmp - ec->rx_2; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 321 > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 322 /* > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 323 * hard limit filter to prevent clipping. Note that at this > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 324 * stage rx should be limited to +/- 16383 due to right shift > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 325 * above > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 326 */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 327 tmp1 = ec->rx_1 >> 15; > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 328 if (tmp1 > 16383) > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 329 tmp1 = 16383; > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 330 if (tmp1 < -16383) > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 331 tmp1 = -16383; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 332 rx = tmp1; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 333 ec->rx_2 = tmp; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 334 } > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 335 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 336 /* Block average of power in the filter states. Used for > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 337 adaption power calculation. */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 338 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 339 { > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 340 int new, old; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 341 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 342 /* efficient "out with the old and in with the new" algorithm so > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 343 we don't have to recalculate over the whole block of > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 344 samples. */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 345 new = (int)tx * (int)tx; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 346 old = (int)ec->fir_state.history[ec->fir_state.curr_pos] * > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 347 (int)ec->fir_state.history[ec->fir_state.curr_pos]; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 348 ec->pstates += > > > 0f51010e87636e drivers/staging/echo/echo.c David Rowe 2009-05-20 349 ((new - old) + (1 << (ec->log2taps - 1))) >> ec->log2taps; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 350 if (ec->pstates < 0) > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 351 ec->pstates = 0; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 352 } > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 353 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 354 /* Calculate short term average levels using simple single pole IIRs */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 355 > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 356 ec->ltxacc += abs(tx) - ec->ltx; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 357 ec->ltx = (ec->ltxacc + (1 << 4)) >> 5; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 358 ec->lrxacc += abs(rx) - ec->lrx; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 359 ec->lrx = (ec->lrxacc + (1 << 4)) >> 5; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 360 > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 361 /* Foreground filter */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 362 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 363 ec->fir_state.coeffs = ec->fir_taps16[0]; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 364 echo_value = fir16(&ec->fir_state, tx); > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 365 ec->clean = rx - echo_value; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 366 ec->lcleanacc += abs(ec->clean) - ec->lclean; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 367 ec->lclean = (ec->lcleanacc + (1 << 4)) >> 5; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 368 > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 369 /* Background filter */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 370 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 371 echo_value = fir16(&ec->fir_state_bg, tx); > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 372 clean_bg = rx - echo_value; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 373 ec->lclean_bgacc += abs(clean_bg) - ec->lclean_bg; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 374 ec->lclean_bg = (ec->lclean_bgacc + (1 << 4)) >> 5; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 375 > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 376 /* Background Filter adaption */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 377 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 378 /* Almost always adap bg filter, just simple DT and energy > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 379 detection to minimise adaption in cases of strong double talk. > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 380 However this is not critical for the dual path algorithm. > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 381 */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 382 ec->factor = 0; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 383 ec->shift = 0; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 @384 if ((ec->nonupdate_dwell == 0)) { > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 385 int p, logp, shift; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 386 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 387 /* Determine: > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 388 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 389 f = Beta * clean_bg_rx/P ------ (1) > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 390 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 391 where P is the total power in the filter states. > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 392 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 393 The Boffins have shown that if we obey (1) we converge > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 394 quickly and avoid instability. > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 395 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 396 The correct factor f must be in Q30, as this is the fixed > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 397 point format required by the lms_adapt_bg() function, > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 398 therefore the scaled version of (1) is: > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 399 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 400 (2^30) * f = (2^30) * Beta * clean_bg_rx/P > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 401 factor = (2^30) * Beta * clean_bg_rx/P ----- (2) > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 402 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 403 We have chosen Beta = 0.25 by experiment, so: > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 404 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 405 factor = (2^30) * (2^-2) * clean_bg_rx/P > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 406 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 407 (30 - 2 - log2(P)) > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 408 factor = clean_bg_rx 2 ----- (3) > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 409 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 410 To avoid a divide we approximate log2(P) as top_bit(P), > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 411 which returns the position of the highest non-zero bit in > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 412 P. This approximation introduces an error as large as a > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 413 factor of 2, but the algorithm seems to handle it OK. > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 414 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 415 Come to think of it a divide may not be a big deal on a > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 416 modern DSP, so its probably worth checking out the cycles > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 417 for a divide versus a top_bit() implementation. > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 418 */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 419 > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 420 p = MIN_TX_POWER_FOR_ADAPTION + ec->pstates; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 421 logp = top_bit(p) + ec->log2taps; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 422 shift = 30 - 2 - logp; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 423 ec->shift = shift; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 424 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 425 lms_adapt_bg(ec, clean_bg, shift); > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 426 } > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 427 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 428 /* very simple DTD to make sure we dont try and adapt with strong > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 429 near end speech */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 430 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 431 ec->adapt = 0; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 432 if ((ec->lrx > MIN_RX_POWER_FOR_ADAPTION) && (ec->lrx > ec->ltx)) > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 433 ec->nonupdate_dwell = DTD_HANGOVER; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 434 if (ec->nonupdate_dwell) > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 435 ec->nonupdate_dwell--; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 436 > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 437 /* Transfer logic */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 438 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 439 /* These conditions are from the dual path paper [1], I messed with > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 440 them a bit to improve performance. */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 441 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 442 if ((ec->adaption_mode & ECHO_CAN_USE_ADAPTION) && > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 443 (ec->nonupdate_dwell == 0) && > > > dc57a3ea80a85a drivers/staging/echo/echo.c Alexander Beregalov 2009-03-12 444 /* (ec->Lclean_bg < 0.875*ec->Lclean) */ > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 445 (8 * ec->lclean_bg < 7 * ec->lclean) && > > > dc57a3ea80a85a drivers/staging/echo/echo.c Alexander Beregalov 2009-03-12 446 /* (ec->Lclean_bg < 0.125*ec->Ltx) */ > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 447 (8 * ec->lclean_bg < ec->ltx)) { > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 448 if (ec->cond_met == 6) { > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 449 /* > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 450 * BG filter has had better results for 6 consecutive > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 451 * samples > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 452 */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 453 ec->adapt = 1; > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 454 memcpy(ec->fir_taps16[0], ec->fir_taps16[1], > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 455 ec->taps * sizeof(int16_t)); > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 456 } else > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 457 ec->cond_met++; > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 458 } else > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 459 ec->cond_met = 0; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 460 > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 461 /* Non-Linear Processing */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 462 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 463 ec->clean_nlp = ec->clean; > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 464 if (ec->adaption_mode & ECHO_CAN_USE_NLP) { > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 465 /* > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 466 * Non-linear processor - a fancy way to say "zap small > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 467 * signals, to avoid residual echo due to (uLaw/ALaw) > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 468 * non-linearity in the channel.". > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 469 */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 470 > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 471 if ((16 * ec->lclean < ec->ltx)) { > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 472 /* > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 473 * Our e/c has improved echo by at least 24 dB (each > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 474 * factor of 2 is 6dB, so 2*2*2*2=16 is the same as > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 475 * 6+6+6+6=24dB) > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 476 */ > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 477 if (ec->adaption_mode & ECHO_CAN_USE_CNG) { > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 478 ec->cng_level = ec->lbgn; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 479 > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 480 /* > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 481 * Very elementary comfort noise generation. > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 482 * Just random numbers rolled off very vaguely > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 483 * Hoth-like. DR: This noise doesn't sound > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 484 * quite right to me - I suspect there are some > > > 83aa3c7bf3f04a drivers/staging/echo/echo.c Jonathan Neuschäfer 2011-03-01 485 * overflow issues in the filtering as it's too > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 486 * "crackly". > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 487 * TODO: debug this, maybe just play noise at > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 488 * high level or look at spectrum. > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 489 */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 490 > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 491 ec->cng_rndnum = > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 492 1664525U * ec->cng_rndnum + 1013904223U; > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 493 ec->cng_filter = > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 494 ((ec->cng_rndnum & 0xFFFF) - 32768 + > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 495 5 * ec->cng_filter) >> 3; > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 496 ec->clean_nlp = > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 497 (ec->cng_filter * ec->cng_level * 8) >> 14; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 498 > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 499 } else if (ec->adaption_mode & ECHO_CAN_USE_CLIP) { > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 500 /* This sounds much better than CNG */ > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 501 if (ec->clean_nlp > ec->lbgn) > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 502 ec->clean_nlp = ec->lbgn; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 503 if (ec->clean_nlp < -ec->lbgn) > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 504 ec->clean_nlp = -ec->lbgn; > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 505 } else { > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 506 /* > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 507 * just mute the residual, doesn't sound very > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 508 * good, used mainly in G168 tests > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 509 */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 510 ec->clean_nlp = 0; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 511 } > > > 4460a860f72898 drivers/staging/echo/echo.c J.R. Mauro 2008-10-20 512 } else { > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 513 /* > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 514 * Background noise estimator. I tried a few > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 515 * algorithms here without much luck. This very simple > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 516 * one seems to work best, we just average the level > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 517 * using a slow (1 sec time const) filter if the > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 518 * current level is less than a (experimentally > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 519 * derived) constant. This means we dont include high > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 520 * level signals like near end speech. When combined > > > 49bb9e6d753469 drivers/staging/echo/echo.c Greg Kroah-Hartman 2009-08-10 521 * with CNG or especially CLIP seems to work OK. > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 522 */ > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 523 if (ec->lclean < 40) { > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 524 ec->lbgn_acc += abs(ec->clean) - ec->lbgn; > > > 0c474826cfdd24 drivers/staging/echo/echo.c Lisa Nguyen 2013-05-05 525 ec->lbgn = (ec->lbgn_acc + (1 << 11)) >> 12; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 526 } > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 527 } > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 528 } > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 529 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 530 /* Roll around the taps buffer */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 531 if (ec->curr_pos <= 0) > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 532 ec->curr_pos = ec->taps; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 533 ec->curr_pos--; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 534 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 535 if (ec->adaption_mode & ECHO_CAN_DISABLE) > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 536 ec->clean_nlp = rx; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 537 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 538 /* Output scaled back up again to match input scaling */ > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 539 > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 540 return (int16_t) ec->clean_nlp << 1; > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 541 } > > > 9d8f2d5dfbcc9d drivers/staging/echo/echo.c Tzafrir Cohen 2008-10-12 542 EXPORT_SYMBOL_GPL(oslec_update); > > > 10602db812fa27 drivers/staging/echo/echo.c David Rowe 2008-10-06 543 > > > > > > :::::: The code at line 384 was first introduced by commit > > > :::::: 10602db812fa270fc923f5e48fb47202288828f3 Staging: add echo cancelation module > > > > > > :::::: TO: David Rowe <david(a)rowetel.com> > > > :::::: CC: Greg Kroah-Hartman <gregkh(a)suse.de> > > > > > > --- > > > 0-DAY CI Kernel Test Service, Intel Corporation > > > https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org > > > -- Thanks, ~Nick Desaulniers

5 years, 8 months

4
3
0 0

FAILED: patch "[PATCH] powerpc/kasan: Fix kasan_remap_early_shadow_ro()" failed to apply to 5.6-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From af92bad615be75c6c0d1b1c5b48178360250a187 Mon Sep 17 00:00:00 2001 From: Christophe Leroy <christophe.leroy(a)c-s.fr> Date: Fri, 6 Mar 2020 15:09:40 +0000 Subject: [PATCH] powerpc/kasan: Fix kasan_remap_early_shadow_ro() At the moment kasan_remap_early_shadow_ro() does nothing, because k_end is 0 and k_cur < 0 is always true. Change the test to k_cur != k_end, as done in kasan_init_shadow_page_tables() Signed-off-by: Christophe Leroy <christophe.leroy(a)c-s.fr> Fixes: cbd18991e24f ("powerpc/mm: Fix an Oops in kasan_mmu_init()") Cc: stable(a)vger.kernel.org Signed-off-by: Michael Ellerman <mpe(a)ellerman.id.au> Link: https://lore.kernel.org/r/4e7b56865e01569058914c991143f5961b5d4719.15835073… diff --git a/arch/powerpc/mm/kasan/kasan_init_32.c b/arch/powerpc/mm/kasan/kasan_init_32.c index f19526e7d3dc..1a29cf469903 100644 --- a/arch/powerpc/mm/kasan/kasan_init_32.c +++ b/arch/powerpc/mm/kasan/kasan_init_32.c @@ -101,7 +101,7 @@ static void __init kasan_remap_early_shadow_ro(void) kasan_populate_pte(kasan_early_shadow_pte, prot); - for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) { + for (k_cur = k_start & PAGE_MASK; k_cur != k_end; k_cur += PAGE_SIZE) { pmd_t *pmd = pmd_ptr_k(k_cur); pte_t *ptep = pte_offset_kernel(pmd, k_cur);

5 years, 8 months

2
1
0 0

FAILED: patch "[PATCH] powerpc/fsl_booke: Avoid creating duplicate tlb1 entry" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From aa4113340ae6c2811e046f08c2bc21011d20a072 Mon Sep 17 00:00:00 2001 From: Laurentiu Tudor <laurentiu.tudor(a)nxp.com> Date: Thu, 23 Jan 2020 11:19:25 +0000 Subject: [PATCH] powerpc/fsl_booke: Avoid creating duplicate tlb1 entry In the current implementation, the call to loadcam_multi() is wrapped between switch_to_as1() and restore_to_as0() calls so, when it tries to create its own temporary AS=1 TLB1 entry, it ends up duplicating the existing one created by switch_to_as1(). Add a check to skip creating the temporary entry if already running in AS=1. Fixes: d9e1831a4202 ("powerpc/85xx: Load all early TLB entries at once") Cc: stable(a)vger.kernel.org # v4.4+ Signed-off-by: Laurentiu Tudor <laurentiu.tudor(a)nxp.com> Acked-by: Scott Wood <oss(a)buserror.net> Signed-off-by: Michael Ellerman <mpe(a)ellerman.id.au> Link: https://lore.kernel.org/r/20200123111914.2565-1-laurentiu.tudor@nxp.com diff --git a/arch/powerpc/mm/nohash/tlb_low.S b/arch/powerpc/mm/nohash/tlb_low.S index 2ca407cedbe7..eaeee402f96e 100644 --- a/arch/powerpc/mm/nohash/tlb_low.S +++ b/arch/powerpc/mm/nohash/tlb_low.S @@ -397,7 +397,7 @@ _GLOBAL(set_context) * extern void loadcam_entry(unsigned int index) * * Load TLBCAM[index] entry in to the L2 CAM MMU - * Must preserve r7, r8, r9, and r10 + * Must preserve r7, r8, r9, r10 and r11 */ _GLOBAL(loadcam_entry) mflr r5 @@ -433,6 +433,10 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_BIG_PHYS) */ _GLOBAL(loadcam_multi) mflr r8 + /* Don't switch to AS=1 if already there */ + mfmsr r11 + andi. r11,r11,MSR_IS + bne 10f /* * Set up temporary TLB entry that is the same as what we're @@ -458,6 +462,7 @@ _GLOBAL(loadcam_multi) mtmsr r6 isync +10: mr r9,r3 add r10,r3,r4 2: bl loadcam_entry @@ -466,6 +471,10 @@ _GLOBAL(loadcam_multi) mr r3,r9 blt 2b + /* Don't return to AS=0 if we were in AS=1 at function start */ + andi. r11,r11,MSR_IS + bne 3f + /* Return to AS=0 and clear the temporary entry */ mfmsr r6 rlwinm. r6,r6,0,~(MSR_IS|MSR_DS) @@ -481,6 +490,7 @@ _GLOBAL(loadcam_multi) tlbwe isync +3: mtlr r8 blr #endif

5 years, 8 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror