From: Sasha Levin Date: Mon, 1 May 2023 11:26:00 +0000 (-0400) Subject: Fixes for 5.4 X-Git-Tag: v5.15.111~149 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bc6108dba98b31cd1554ea2248ccb1a3c4754fd;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/asm-generic-io.h-suppress-endianness-warnings-for-re.patch b/queue-5.4/asm-generic-io.h-suppress-endianness-warnings-for-re.patch new file mode 100644 index 00000000000..2b639593a42 --- /dev/null +++ b/queue-5.4/asm-generic-io.h-suppress-endianness-warnings-for-re.patch @@ -0,0 +1,51 @@ +From 0404f4cef4c3a9e2b784c1573734d780875a78d1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jan 2023 15:11:52 +0200 +Subject: asm-generic/io.h: suppress endianness warnings for readq() and + writeq() + +From: Vladimir Oltean + +[ Upstream commit d564fa1ff19e893e2971d66e5c8f49dc1cdc8ffc ] + +Commit c1d55d50139b ("asm-generic/io.h: Fix sparse warnings on +big-endian architectures") missed fixing the 64-bit accessors. + +Arnd explains in the attached link why the casts are necessary, even if +__raw_readq() and __raw_writeq() do not take endian-specific types. + +Link: https://lore.kernel.org/lkml/9105d6fc-880b-4734-857d-e3d30b87ccf6@app.fastmail.com/ +Suggested-by: Arnd Bergmann +Signed-off-by: Vladimir Oltean +Reviewed-by: Jonathan Cameron +Signed-off-by: Arnd Bergmann +Signed-off-by: Sasha Levin +--- + include/asm-generic/io.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h +index d02806513670c..3dd3416f1df03 100644 +--- a/include/asm-generic/io.h ++++ b/include/asm-generic/io.h +@@ -190,7 +190,7 @@ static inline u64 readq(const volatile void __iomem *addr) + u64 val; + + __io_br(); +- val = __le64_to_cpu(__raw_readq(addr)); ++ val = __le64_to_cpu((__le64 __force)__raw_readq(addr)); + __io_ar(val); + return val; + } +@@ -233,7 +233,7 @@ static inline void writel(u32 value, volatile void __iomem *addr) + static inline void writeq(u64 value, volatile void __iomem *addr) + { + __io_bw(); +- __raw_writeq(__cpu_to_le64(value), addr); ++ __raw_writeq((u64 __force)__cpu_to_le64(value), addr); + __io_aw(); + } + #endif +-- +2.39.2 + diff --git a/queue-5.4/asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch b/queue-5.4/asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch new file mode 100644 index 00000000000..9447be31bcf --- /dev/null +++ b/queue-5.4/asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch @@ -0,0 +1,50 @@ +From 395441a8a9f0ec7b45d92e4c6b4fe7e0cfcf1393 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Mar 2023 15:53:32 +0100 +Subject: ASoC: Intel: bytcr_rt5640: Add quirk for the Acer Iconia One 7 B1-750 + +From: Hans de Goede + +[ Upstream commit e38c5e80c3d293a883c6f1d553f2146ec0bda35e ] + +The Acer Iconia One 7 B1-750 tablet mostly works fine with the defaults +for an Bay Trail CR tablet. Except for the internal mic, instead of +an analog mic on IN3 a digital mic on DMIC1 is uses. + +Add a quirk with these settings for this tablet. + +Acked-by: Pierre-Louis Bossart +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20230322145332.131525-1-hdegoede@redhat.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c +index 6a8edb0a559de..df3b370fe7292 100644 +--- a/sound/soc/intel/boards/bytcr_rt5640.c ++++ b/sound/soc/intel/boards/bytcr_rt5640.c +@@ -391,6 +391,18 @@ static int byt_rt5640_aif1_hw_params(struct snd_pcm_substream *substream, + + /* Please keep this list alphabetically sorted */ + static const struct dmi_system_id byt_rt5640_quirk_table[] = { ++ { /* Acer Iconia One 7 B1-750 */ ++ .matches = { ++ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Insyde"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "VESPA2"), ++ }, ++ .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | ++ BYT_RT5640_JD_SRC_JD1_IN4P | ++ BYT_RT5640_OVCD_TH_1500UA | ++ BYT_RT5640_OVCD_SF_0P75 | ++ BYT_RT5640_SSP0_AIF1 | ++ BYT_RT5640_MCLK_EN), ++ }, + { /* Acer Iconia Tab 8 W1-810 */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Acer"), +-- +2.39.2 + diff --git a/queue-5.4/iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch b/queue-5.4/iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch new file mode 100644 index 00000000000..195be42bfe0 --- /dev/null +++ b/queue-5.4/iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch @@ -0,0 +1,39 @@ +From dd8859faa6bae2ef0e7bb9c5b5053eb1a920ee8f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Mar 2023 21:50:29 +0100 +Subject: iio: adc: palmas_gpadc: fix NULL dereference on rmmod +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Patrik Dahlström + +[ Upstream commit 49f76c499d38bf67803438eee88c8300d0f6ce09 ] + +Calling dev_to_iio_dev() on a platform device pointer is undefined and +will make adc NULL. + +Signed-off-by: Patrik Dahlström +Link: https://lore.kernel.org/r/20230313205029.1881745-1-risca@dalakolonin.se +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/adc/palmas_gpadc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/iio/adc/palmas_gpadc.c b/drivers/iio/adc/palmas_gpadc.c +index 2bd785e9e42ac..4861093b0764e 100644 +--- a/drivers/iio/adc/palmas_gpadc.c ++++ b/drivers/iio/adc/palmas_gpadc.c +@@ -630,7 +630,7 @@ static int palmas_gpadc_probe(struct platform_device *pdev) + + static int palmas_gpadc_remove(struct platform_device *pdev) + { +- struct iio_dev *indio_dev = dev_to_iio_dev(&pdev->dev); ++ struct iio_dev *indio_dev = dev_get_drvdata(&pdev->dev); + struct palmas_gpadc *adc = iio_priv(indio_dev); + + if (adc->wakeup1_enable || adc->wakeup2_enable) +-- +2.39.2 + diff --git a/queue-5.4/series b/queue-5.4/series index b0e57f75bc5..4a90c704659 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -3,3 +3,6 @@ wifi-brcmfmac-slab-out-of-bounds-read-in-brcmf_get_assoc_ies.patch drm-fb-helper-set-x-yres_virtual-in-drm_fb_helper_check_var.patch bluetooth-perform-careful-capability-checks-in-hci_sock_ioctl.patch usb-serial-option-add-unisoc-vendor-and-tozed-lt70c-product.patch +iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch +asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch +asm-generic-io.h-suppress-endianness-warnings-for-re.patch