From: Sasha Levin Date: Mon, 1 May 2023 11:26:00 +0000 (-0400) Subject: Fixes for 5.10 X-Git-Tag: v5.15.111~150 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca8b8920d3fecd846e05fbcc3c848395fbeffc10;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.10 Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/asm-generic-io.h-suppress-endianness-warnings-for-re.patch b/queue-5.10/asm-generic-io.h-suppress-endianness-warnings-for-re.patch new file mode 100644 index 00000000000..2638584c225 --- /dev/null +++ b/queue-5.10/asm-generic-io.h-suppress-endianness-warnings-for-re.patch @@ -0,0 +1,51 @@ +From 6a56513c5cdd8d349fcd66aaba422a0461fb8e12 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 9ea83d80eb6f9..dcbd41048b4e7 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.10/asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch b/queue-5.10/asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch new file mode 100644 index 00000000000..c95164e3c66 --- /dev/null +++ b/queue-5.10/asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch @@ -0,0 +1,50 @@ +From 5ad58c6e50e6f088660eefcb142725de9f590b7f 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 8a99cb6dfcd69..9a5ab96f917d3 100644 +--- a/sound/soc/intel/boards/bytcr_rt5640.c ++++ b/sound/soc/intel/boards/bytcr_rt5640.c +@@ -393,6 +393,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.10/asoc-intel-sof_sdw-add-quirk-for-intel-rooks-county-.patch b/queue-5.10/asoc-intel-sof_sdw-add-quirk-for-intel-rooks-county-.patch new file mode 100644 index 00000000000..503bceb5b61 --- /dev/null +++ b/queue-5.10/asoc-intel-sof_sdw-add-quirk-for-intel-rooks-county-.patch @@ -0,0 +1,52 @@ +From 84d408ecee97b948a51cec6d8edd867d4ef7f885 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Mar 2023 17:05:52 +0800 +Subject: ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Eugene Huang + +[ Upstream commit 3c728b1bc5b99c5275ac5c7788ef814c0e51ef54 ] + +Same quirks as the 'Bishop County' NUC M15, except the rt711 is in the +'JD2 100K' jack detection mode. + +Link: https://github.com/thesofproject/linux/issues/4088 +Signed-off-by: Eugene Huang +Reviewed-by: Pierre-Louis Bossart +Reviewed-by: Péter Ujfalusi +Signed-off-by: Bard Liao +Link: https://lore.kernel.org/r/20230314090553.498664-2-yung-chuan.liao@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c +index f5d8f7951cfc3..eb713e9c2bd22 100644 +--- a/sound/soc/intel/boards/sof_sdw.c ++++ b/sound/soc/intel/boards/sof_sdw.c +@@ -175,6 +175,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { + SOF_SDW_PCH_DMIC | + SOF_RT711_JD_SRC_JD2), + }, ++ { ++ /* NUC15 'Rooks County' LAPRC510 and LAPRC710 skews */ ++ .callback = sof_sdw_quirk_cb, ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "LAPRC"), ++ }, ++ .driver_data = (void *)(SOF_SDW_TGL_HDMI | ++ SOF_SDW_PCH_DMIC | ++ RT711_JD2_100K), ++ }, + /* TigerLake-SDCA devices */ + { + .callback = sof_sdw_quirk_cb, +-- +2.39.2 + diff --git a/queue-5.10/iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch b/queue-5.10/iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch new file mode 100644 index 00000000000..f66597fa682 --- /dev/null +++ b/queue-5.10/iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch @@ -0,0 +1,39 @@ +From 98dbe10684baa8c7f0d208cbbfabf75b0e9630d2 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 f4756671cddb6..6ed0d151ad21a 100644 +--- a/drivers/iio/adc/palmas_gpadc.c ++++ b/drivers/iio/adc/palmas_gpadc.c +@@ -628,7 +628,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.10/series b/queue-5.10/series index cbc6d34e377..9c03cfaf59d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -7,3 +7,7 @@ bluetooth-perform-careful-capability-checks-in-hci_sock_ioctl.patch x86-fpu-prevent-fpu-state-corruption.patch usb-serial-option-add-unisoc-vendor-and-tozed-lt70c-product.patch driver-core-don-t-require-dynamic_debug-for-initcall_debug-probe-timing.patch +asoc-intel-sof_sdw-add-quirk-for-intel-rooks-county-.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