From: Greg Kroah-Hartman Date: Sat, 7 Nov 2020 15:47:43 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.4.242~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6daad9c69e91d2bd95ce4c035885ac0fc2384cf;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: alsa-usb-audio-add-implicit-feedback-quirk-for-qu-16.patch fonts-replace-discarded-const-qualifier.patch --- diff --git a/queue-4.4/alsa-usb-audio-add-implicit-feedback-quirk-for-qu-16.patch b/queue-4.4/alsa-usb-audio-add-implicit-feedback-quirk-for-qu-16.patch new file mode 100644 index 00000000000..8b6cc9ea648 --- /dev/null +++ b/queue-4.4/alsa-usb-audio-add-implicit-feedback-quirk-for-qu-16.patch @@ -0,0 +1,32 @@ +From 0938ecae432e7ac8b01080c35dd81d50a1e43033 Mon Sep 17 00:00:00 2001 +From: "Geoffrey D. Bennett" +Date: Wed, 4 Nov 2020 22:27:17 +1030 +Subject: ALSA: usb-audio: Add implicit feedback quirk for Qu-16 + +From: Geoffrey D. Bennett + +commit 0938ecae432e7ac8b01080c35dd81d50a1e43033 upstream. + +This patch fixes audio distortion on playback for the Allen&Heath +Qu-16. + +Signed-off-by: Geoffrey D. Bennett +Cc: +Link: https://lore.kernel.org/r/20201104115717.GA19046@b4.vu +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/usb/pcm.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/usb/pcm.c ++++ b/sound/usb/pcm.c +@@ -332,6 +332,7 @@ static int set_sync_ep_implicit_fb_quirk + switch (subs->stream->chip->usb_id) { + case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */ + case USB_ID(0x0763, 0x2031): /* M-Audio Fast Track C600 */ ++ case USB_ID(0x22f0, 0x0006): /* Allen&Heath Qu-16 */ + ep = 0x81; + iface = usb_ifnum_to_if(dev, 3); + diff --git a/queue-4.4/fonts-replace-discarded-const-qualifier.patch b/queue-4.4/fonts-replace-discarded-const-qualifier.patch new file mode 100644 index 00000000000..0bae0bd2770 --- /dev/null +++ b/queue-4.4/fonts-replace-discarded-const-qualifier.patch @@ -0,0 +1,171 @@ +From 9522750c66c689b739e151fcdf895420dc81efc0 Mon Sep 17 00:00:00 2001 +From: Lee Jones +Date: Mon, 2 Nov 2020 13:32:42 -0500 +Subject: Fonts: Replace discarded const qualifier + +From: Lee Jones + +commit 9522750c66c689b739e151fcdf895420dc81efc0 upstream. + +Commit 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in +fonts") introduced the following error when building rpc_defconfig (only +this build appears to be affected): + + `acorndata_8x8' referenced in section `.text' of arch/arm/boot/compressed/ll_char_wr.o: + defined in discarded section `.data' of arch/arm/boot/compressed/font.o + `acorndata_8x8' referenced in section `.data.rel.ro' of arch/arm/boot/compressed/font.o: + defined in discarded section `.data' of arch/arm/boot/compressed/font.o + make[3]: *** [/scratch/linux/arch/arm/boot/compressed/Makefile:191: arch/arm/boot/compressed/vmlinux] Error 1 + make[2]: *** [/scratch/linux/arch/arm/boot/Makefile:61: arch/arm/boot/compressed/vmlinux] Error 2 + make[1]: *** [/scratch/linux/arch/arm/Makefile:317: zImage] Error 2 + +The .data section is discarded at link time. Reinstating acorndata_8x8 as +const ensures it is still available after linking. Do the same for the +other 12 built-in fonts as well, for consistency purposes. + +Cc: +Cc: Russell King +Reviewed-by: Greg Kroah-Hartman +Fixes: 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts") +Signed-off-by: Lee Jones +Co-developed-by: Peilin Ye +Signed-off-by: Peilin Ye +Signed-off-by: Daniel Vetter +Link: https://patchwork.freedesktop.org/patch/msgid/20201102183242.2031659-1-yepeilin.cs@gmail.com +Signed-off-by: Greg Kroah-Hartman + +--- + lib/fonts/font_10x18.c | 2 +- + lib/fonts/font_6x10.c | 2 +- + lib/fonts/font_6x11.c | 2 +- + lib/fonts/font_7x14.c | 2 +- + lib/fonts/font_8x16.c | 2 +- + lib/fonts/font_8x8.c | 2 +- + lib/fonts/font_acorn_8x8.c | 2 +- + lib/fonts/font_mini_4x6.c | 2 +- + lib/fonts/font_pearl_8x8.c | 2 +- + lib/fonts/font_sun12x22.c | 2 +- + lib/fonts/font_sun8x16.c | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +--- a/lib/fonts/font_10x18.c ++++ b/lib/fonts/font_10x18.c +@@ -7,7 +7,7 @@ + + #define FONTDATAMAX 9216 + +-static struct font_data fontdata_10x18 = { ++static const struct font_data fontdata_10x18 = { + { 0, 0, FONTDATAMAX, 0 }, { + /* 0 0x00 '^@' */ + 0x00, 0x00, /* 0000000000 */ +--- a/lib/fonts/font_6x10.c ++++ b/lib/fonts/font_6x10.c +@@ -2,7 +2,7 @@ + + #define FONTDATAMAX 2560 + +-static struct font_data fontdata_6x10 = { ++static const struct font_data fontdata_6x10 = { + { 0, 0, FONTDATAMAX, 0 }, { + /* 0 0x00 '^@' */ + 0x00, /* 00000000 */ +--- a/lib/fonts/font_6x11.c ++++ b/lib/fonts/font_6x11.c +@@ -8,7 +8,7 @@ + + #define FONTDATAMAX (11*256) + +-static struct font_data fontdata_6x11 = { ++static const struct font_data fontdata_6x11 = { + { 0, 0, FONTDATAMAX, 0 }, { + /* 0 0x00 '^@' */ + 0x00, /* 00000000 */ +--- a/lib/fonts/font_7x14.c ++++ b/lib/fonts/font_7x14.c +@@ -7,7 +7,7 @@ + + #define FONTDATAMAX 3584 + +-static struct font_data fontdata_7x14 = { ++static const struct font_data fontdata_7x14 = { + { 0, 0, FONTDATAMAX, 0 }, { + /* 0 0x00 '^@' */ + 0x00, /* 0000000 */ +--- a/lib/fonts/font_8x16.c ++++ b/lib/fonts/font_8x16.c +@@ -9,7 +9,7 @@ + + #define FONTDATAMAX 4096 + +-static struct font_data fontdata_8x16 = { ++static const struct font_data fontdata_8x16 = { + { 0, 0, FONTDATAMAX, 0 }, { + /* 0 0x00 '^@' */ + 0x00, /* 00000000 */ +--- a/lib/fonts/font_8x8.c ++++ b/lib/fonts/font_8x8.c +@@ -8,7 +8,7 @@ + + #define FONTDATAMAX 2048 + +-static struct font_data fontdata_8x8 = { ++static const struct font_data fontdata_8x8 = { + { 0, 0, FONTDATAMAX, 0 }, { + /* 0 0x00 '^@' */ + 0x00, /* 00000000 */ +--- a/lib/fonts/font_acorn_8x8.c ++++ b/lib/fonts/font_acorn_8x8.c +@@ -4,7 +4,7 @@ + + #define FONTDATAMAX 2048 + +-static struct font_data acorndata_8x8 = { ++static const struct font_data acorndata_8x8 = { + { 0, 0, FONTDATAMAX, 0 }, { + /* 00 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ^@ */ + /* 01 */ 0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e, /* ^A */ +--- a/lib/fonts/font_mini_4x6.c ++++ b/lib/fonts/font_mini_4x6.c +@@ -43,7 +43,7 @@ __END__; + + #define FONTDATAMAX 1536 + +-static struct font_data fontdata_mini_4x6 = { ++static const struct font_data fontdata_mini_4x6 = { + { 0, 0, FONTDATAMAX, 0 }, { + /*{*/ + /* Char 0: ' ' */ +--- a/lib/fonts/font_pearl_8x8.c ++++ b/lib/fonts/font_pearl_8x8.c +@@ -13,7 +13,7 @@ + + #define FONTDATAMAX 2048 + +-static struct font_data fontdata_pearl8x8 = { ++static const struct font_data fontdata_pearl8x8 = { + { 0, 0, FONTDATAMAX, 0 }, { + /* 0 0x00 '^@' */ + 0x00, /* 00000000 */ +--- a/lib/fonts/font_sun12x22.c ++++ b/lib/fonts/font_sun12x22.c +@@ -2,7 +2,7 @@ + + #define FONTDATAMAX 11264 + +-static struct font_data fontdata_sun12x22 = { ++static const struct font_data fontdata_sun12x22 = { + { 0, 0, FONTDATAMAX, 0 }, { + /* 0 0x00 '^@' */ + 0x00, 0x00, /* 000000000000 */ +--- a/lib/fonts/font_sun8x16.c ++++ b/lib/fonts/font_sun8x16.c +@@ -2,7 +2,7 @@ + + #define FONTDATAMAX 4096 + +-static struct font_data fontdata_sun8x16 = { ++static const struct font_data fontdata_sun8x16 = { + { 0, 0, FONTDATAMAX, 0 }, { + /* */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + /* */ 0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xbd,0x99,0x81,0x81,0x7e,0x00,0x00,0x00,0x00, diff --git a/queue-4.4/series b/queue-4.4/series index b26f05ef02a..b4a8a8a6359 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -65,3 +65,5 @@ xen-events-don-t-use-chip_data-for-legacy-irqs.patch tipc-fix-use-after-free-in-tipc_bcast_get_mode.patch gianfar-replace-skb_realloc_headroom-with-skb_cow_head-for-ptp.patch gianfar-account-for-tx-ptp-timestamp-in-the-skb-headroom.patch +fonts-replace-discarded-const-qualifier.patch +alsa-usb-audio-add-implicit-feedback-quirk-for-qu-16.patch