From: Greg Kroah-Hartman Date: Tue, 1 Sep 2020 15:07:09 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.4.235~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=677787af250e51d6faa49bb2c425258420cb417a;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: alsa-usb-audio-update-documentation-comment-for-ms2109-quirk.patch libbpf-fix-build-on-ppc64le-architecture.patch --- diff --git a/queue-5.4/alsa-usb-audio-update-documentation-comment-for-ms2109-quirk.patch b/queue-5.4/alsa-usb-audio-update-documentation-comment-for-ms2109-quirk.patch new file mode 100644 index 00000000000..00930d52166 --- /dev/null +++ b/queue-5.4/alsa-usb-audio-update-documentation-comment-for-ms2109-quirk.patch @@ -0,0 +1,35 @@ +From 74a2a7de81a2ef20732ec02087314e92692a7a1b Mon Sep 17 00:00:00 2001 +From: Hector Martin +Date: Sun, 16 Aug 2020 17:44:31 +0900 +Subject: ALSA: usb-audio: Update documentation comment for MS2109 quirk + +From: Hector Martin + +commit 74a2a7de81a2ef20732ec02087314e92692a7a1b upstream. + +As the recent fix addressed the channel swap problem more properly, +update the comment as well. + +Fixes: 1b7ecc241a67 ("ALSA: usb-audio: work around streaming quirk for MacroSilicon MS2109") +Signed-off-by: Hector Martin +Link: https://lore.kernel.org/r/20200816084431.102151-1-marcan@marcan.st +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/usb/quirks-table.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/usb/quirks-table.h ++++ b/sound/usb/quirks-table.h +@@ -3705,8 +3705,8 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* A + * they pretend to be 96kHz mono as a workaround for stereo being broken + * by that... + * +- * They also have swapped L-R channels, but that's for userspace to deal +- * with. ++ * They also have an issue with initial stream alignment that causes the ++ * channels to be swapped and out of phase, which is dealt with in quirks.c. + */ + { + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | diff --git a/queue-5.4/libbpf-fix-build-on-ppc64le-architecture.patch b/queue-5.4/libbpf-fix-build-on-ppc64le-architecture.patch new file mode 100644 index 00000000000..4672cd5e6d7 --- /dev/null +++ b/queue-5.4/libbpf-fix-build-on-ppc64le-architecture.patch @@ -0,0 +1,47 @@ +From 3fb1a96a91120877488071a167d26d76be4be977 Mon Sep 17 00:00:00 2001 +From: Andrii Nakryiko +Date: Tue, 18 Aug 2020 09:44:56 -0700 +Subject: libbpf: Fix build on ppc64le architecture +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Andrii Nakryiko + +commit 3fb1a96a91120877488071a167d26d76be4be977 upstream. + +On ppc64le we get the following warning: + + In file included from btf_dump.c:16:0: + btf_dump.c: In function ‘btf_dump_emit_struct_def’: + ../include/linux/kernel.h:20:17: error: comparison of distinct pointer types lacks a cast [-Werror] + (void) (&_max1 == &_max2); \ + ^ + btf_dump.c:882:11: note: in expansion of macro ‘max’ + m_sz = max(0LL, btf__resolve_size(d->btf, m->type)); + ^~~ + +Fix by explicitly casting to __s64, which is a return type from +btf__resolve_size(). + +Fixes: 702eddc77a90 ("libbpf: Handle GCC built-in types for Arm NEON") +Signed-off-by: Andrii Nakryiko +Signed-off-by: Alexei Starovoitov +Link: https://lore.kernel.org/bpf/20200818164456.1181661-1-andriin@fb.com +Signed-off-by: Greg Kroah-Hartman + +--- + tools/lib/bpf/btf_dump.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/lib/bpf/btf_dump.c ++++ b/tools/lib/bpf/btf_dump.c +@@ -906,7 +906,7 @@ static void btf_dump_emit_struct_def(str + btf_dump_printf(d, ": %d", m_sz); + off = m_off + m_sz; + } else { +- m_sz = max(0LL, btf__resolve_size(d->btf, m->type)); ++ m_sz = max((__s64)0, btf__resolve_size(d->btf, m->type)); + off = m_off + m_sz * 8; + } + btf_dump_printf(d, ";"); diff --git a/queue-5.4/series b/queue-5.4/series index b0db77adb2f..788fc006fe6 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -210,3 +210,5 @@ kheaders-explain-why-include-config-autoconf.h-is-excluded-from-md5sum.patch kbuild-add-variables-for-compression-tools.patch kbuild-fix-broken-builds-because-of-gzip-bzip2-lzop-variables.patch hid-hiddev-fix-slab-out-of-bounds-write-in-hiddev_ioctl_usage.patch +libbpf-fix-build-on-ppc64le-architecture.patch +alsa-usb-audio-update-documentation-comment-for-ms2109-quirk.patch