From: Sasha Levin Date: Wed, 16 Nov 2022 12:53:28 +0000 (-0500) Subject: Fixes for 5.4 X-Git-Tag: v4.19.266~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a215e4322aa89cba2cc9ecfef38b4f4376f389;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/asoc-codecs-jz4725b-add-missed-line-in-power-control.patch b/queue-5.4/asoc-codecs-jz4725b-add-missed-line-in-power-control.patch new file mode 100644 index 00000000000..a6199f806c0 --- /dev/null +++ b/queue-5.4/asoc-codecs-jz4725b-add-missed-line-in-power-control.patch @@ -0,0 +1,37 @@ +From 416017029539f687e40aa45432bc4cbfcc3cd9e5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 16 Oct 2022 16:26:42 +0300 +Subject: ASoC: codecs: jz4725b: add missed Line In power control bit + +From: Siarhei Volkau + +[ Upstream commit 1013999b431b4bcdc1f5ae47dd3338122751db31 ] + +Line In path stayed powered off during capturing or +bypass to mixer. + +Signed-off-by: Siarhei Volkau +Link: https://lore.kernel.org/r/20221016132648.3011729-2-lis8215@gmail.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/jz4725b.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sound/soc/codecs/jz4725b.c b/sound/soc/codecs/jz4725b.c +index 2567a5d15b55..a04b8d5d1ded 100644 +--- a/sound/soc/codecs/jz4725b.c ++++ b/sound/soc/codecs/jz4725b.c +@@ -236,7 +236,8 @@ static const struct snd_soc_dapm_widget jz4725b_codec_dapm_widgets[] = { + SND_SOC_DAPM_MIXER("DAC to Mixer", JZ4725B_CODEC_REG_CR1, + REG_CR1_DACSEL_OFFSET, 0, NULL, 0), + +- SND_SOC_DAPM_MIXER("Line In", SND_SOC_NOPM, 0, 0, NULL, 0), ++ SND_SOC_DAPM_MIXER("Line In", JZ4725B_CODEC_REG_PMR1, ++ REG_PMR1_SB_LIN_OFFSET, 1, NULL, 0), + SND_SOC_DAPM_MIXER("HP Out", JZ4725B_CODEC_REG_CR1, + REG_CR1_HP_DIS_OFFSET, 1, NULL, 0), + +-- +2.35.1 + diff --git a/queue-5.4/asoc-codecs-jz4725b-fix-capture-selector-naming.patch b/queue-5.4/asoc-codecs-jz4725b-fix-capture-selector-naming.patch new file mode 100644 index 00000000000..cb7e5137979 --- /dev/null +++ b/queue-5.4/asoc-codecs-jz4725b-fix-capture-selector-naming.patch @@ -0,0 +1,64 @@ +From 166ed25f5540b57d19d0fe1af9a03bb4c9ff1868 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 16 Oct 2022 16:26:45 +0300 +Subject: ASoC: codecs: jz4725b: fix capture selector naming + +From: Siarhei Volkau + +[ Upstream commit 80852f8268769715db335a22305e81a0c4a38a84 ] + +At the moment Capture source selector appears on Playback +tab in the alsamixer and has a senseless name. + +Let's fix that. + +Signed-off-by: Siarhei Volkau +Link: https://lore.kernel.org/r/20221016132648.3011729-5-lis8215@gmail.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/jz4725b.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/sound/soc/codecs/jz4725b.c b/sound/soc/codecs/jz4725b.c +index 1960516ac65e..ebe643e4aa2f 100644 +--- a/sound/soc/codecs/jz4725b.c ++++ b/sound/soc/codecs/jz4725b.c +@@ -183,7 +183,7 @@ static SOC_VALUE_ENUM_SINGLE_DECL(jz4725b_codec_adc_src_enum, + jz4725b_codec_adc_src_texts, + jz4725b_codec_adc_src_values); + static const struct snd_kcontrol_new jz4725b_codec_adc_src_ctrl = +- SOC_DAPM_ENUM("Route", jz4725b_codec_adc_src_enum); ++ SOC_DAPM_ENUM("ADC Source Capture Route", jz4725b_codec_adc_src_enum); + + static const struct snd_kcontrol_new jz4725b_codec_mixer_controls[] = { + SOC_DAPM_SINGLE("Line In Bypass", JZ4725B_CODEC_REG_CR1, +@@ -228,7 +228,7 @@ static const struct snd_soc_dapm_widget jz4725b_codec_dapm_widgets[] = { + SND_SOC_DAPM_ADC("ADC", "Capture", + JZ4725B_CODEC_REG_PMR1, REG_PMR1_SB_ADC_OFFSET, 1), + +- SND_SOC_DAPM_MUX("ADC Source", SND_SOC_NOPM, 0, 0, ++ SND_SOC_DAPM_MUX("ADC Source Capture Route", SND_SOC_NOPM, 0, 0, + &jz4725b_codec_adc_src_ctrl), + + /* Mixer */ +@@ -287,11 +287,11 @@ static const struct snd_soc_dapm_route jz4725b_codec_dapm_routes[] = { + {"Mixer", NULL, "DAC to Mixer"}, + + {"Mixer to ADC", NULL, "Mixer"}, +- {"ADC Source", "Mixer", "Mixer to ADC"}, +- {"ADC Source", "Line In", "Line In"}, +- {"ADC Source", "Mic 1", "Mic 1"}, +- {"ADC Source", "Mic 2", "Mic 2"}, +- {"ADC", NULL, "ADC Source"}, ++ {"ADC Source Capture Route", "Mixer", "Mixer to ADC"}, ++ {"ADC Sourc Capture Routee", "Line In", "Line In"}, ++ {"ADC Source Capture Route", "Mic 1", "Mic 1"}, ++ {"ADC Source Capture Route", "Mic 2", "Mic 2"}, ++ {"ADC", NULL, "ADC Source Capture Route"}, + + {"Out Stage", NULL, "Mixer"}, + {"HP Out", NULL, "Out Stage"}, +-- +2.35.1 + diff --git a/queue-5.4/asoc-codecs-jz4725b-fix-reported-volume-for-master-c.patch b/queue-5.4/asoc-codecs-jz4725b-fix-reported-volume-for-master-c.patch new file mode 100644 index 00000000000..392d9530474 --- /dev/null +++ b/queue-5.4/asoc-codecs-jz4725b-fix-reported-volume-for-master-c.patch @@ -0,0 +1,41 @@ +From 5089dafc80e11d6374d6c995c1ff3bec63da9daa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 16 Oct 2022 16:26:43 +0300 +Subject: ASoC: codecs: jz4725b: fix reported volume for Master ctl + +From: Siarhei Volkau + +[ Upstream commit 088777bf65b98cfa4b5378119d0a7d49a58ece44 ] + +DAC volume control is the Master Playback Volume at the moment +and it reports wrong levels in alsamixer and other alsa apps. + +The patch fixes that, as stated in manual on the jz4725b SoC +(16.6.3.4 Programmable attenuation: GOD) the ctl range varies +from -22.5dB to 0dB with 1.5dB step. + +Signed-off-by: Siarhei Volkau +Link: https://lore.kernel.org/r/20221016132648.3011729-3-lis8215@gmail.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/jz4725b.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/codecs/jz4725b.c b/sound/soc/codecs/jz4725b.c +index a04b8d5d1ded..1f7a234266b9 100644 +--- a/sound/soc/codecs/jz4725b.c ++++ b/sound/soc/codecs/jz4725b.c +@@ -142,8 +142,8 @@ struct jz_icdc { + struct clk *clk; + }; + +-static const SNDRV_CTL_TLVD_DECLARE_DB_LINEAR(jz4725b_dac_tlv, -2250, 0); + static const SNDRV_CTL_TLVD_DECLARE_DB_LINEAR(jz4725b_line_tlv, -1500, 600); ++static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(jz4725b_dac_tlv, -2250, 150, 0); + + static const struct snd_kcontrol_new jz4725b_codec_controls[] = { + SOC_DOUBLE_TLV("Master Playback Volume", +-- +2.35.1 + diff --git a/queue-5.4/asoc-codecs-jz4725b-fix-spelling-mistake-sourc-sourc.patch b/queue-5.4/asoc-codecs-jz4725b-fix-spelling-mistake-sourc-sourc.patch new file mode 100644 index 00000000000..0dd9b8dc33c --- /dev/null +++ b/queue-5.4/asoc-codecs-jz4725b-fix-spelling-mistake-sourc-sourc.patch @@ -0,0 +1,41 @@ +From d26a440646493ee8e0c7d245f0e239a3681a2b6c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 19 Oct 2022 08:16:39 +0100 +Subject: ASoC: codecs: jz4725b: Fix spelling mistake "Sourc" -> "Source", + "Routee" -> "Route" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Colin Ian King + +[ Upstream commit df496157a5afa1b6d1f4c46ad6549c2c346d1e59 ] + +There are two spelling mistakes in codec routing description. Fix it. + +Signed-off-by: Colin Ian King +Reviewed-by: Philippe Mathieu-Daudé +Acked-by: Paul Cercueil +Link: https://lore.kernel.org/r/20221019071639.1003730-1-colin.i.king@gmail.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/jz4725b.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/codecs/jz4725b.c b/sound/soc/codecs/jz4725b.c +index ebe643e4aa2f..48c40a44b763 100644 +--- a/sound/soc/codecs/jz4725b.c ++++ b/sound/soc/codecs/jz4725b.c +@@ -288,7 +288,7 @@ static const struct snd_soc_dapm_route jz4725b_codec_dapm_routes[] = { + + {"Mixer to ADC", NULL, "Mixer"}, + {"ADC Source Capture Route", "Mixer", "Mixer to ADC"}, +- {"ADC Sourc Capture Routee", "Line In", "Line In"}, ++ {"ADC Source Capture Route", "Line In", "Line In"}, + {"ADC Source Capture Route", "Mic 1", "Mic 1"}, + {"ADC Source Capture Route", "Mic 2", "Mic 2"}, + {"ADC", NULL, "ADC Source Capture Route"}, +-- +2.35.1 + diff --git a/queue-5.4/asoc-codecs-jz4725b-use-right-control-for-capture-vo.patch b/queue-5.4/asoc-codecs-jz4725b-use-right-control-for-capture-vo.patch new file mode 100644 index 00000000000..ceb27b3f7ac --- /dev/null +++ b/queue-5.4/asoc-codecs-jz4725b-use-right-control-for-capture-vo.patch @@ -0,0 +1,69 @@ +From 2b253271de146a1b73a92615cdb5b07a85bef238 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 16 Oct 2022 16:26:44 +0300 +Subject: ASoC: codecs: jz4725b: use right control for Capture Volume + +From: Siarhei Volkau + +[ Upstream commit 1538e2c8c9b7e7a656effcc6e4e7cfe8c1b405fd ] + +Line In Bypass control is used as Master Capture at the moment +this is completely incorrect. + +Current control routed to Mixer instead of ADC, thus can't affect +Capture path. ADC control shall be used instead. + +ADC volume control parameters are different, so the patch fixes that +as well. Manual says (16.6.3.2 Programmable input attenuation amplifier: +PGATM) that gain varies in range 0dB..22.5dB with 1.5dB step. + +Signed-off-by: Siarhei Volkau +Link: https://lore.kernel.org/r/20221016132648.3011729-4-lis8215@gmail.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/jz4725b.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/sound/soc/codecs/jz4725b.c b/sound/soc/codecs/jz4725b.c +index 1f7a234266b9..1960516ac65e 100644 +--- a/sound/soc/codecs/jz4725b.c ++++ b/sound/soc/codecs/jz4725b.c +@@ -136,13 +136,16 @@ enum { + #define REG_CGR3_GO1L_OFFSET 0 + #define REG_CGR3_GO1L_MASK (0x1f << REG_CGR3_GO1L_OFFSET) + ++#define REG_CGR10_GIL_OFFSET 0 ++#define REG_CGR10_GIR_OFFSET 4 ++ + struct jz_icdc { + struct regmap *regmap; + void __iomem *base; + struct clk *clk; + }; + +-static const SNDRV_CTL_TLVD_DECLARE_DB_LINEAR(jz4725b_line_tlv, -1500, 600); ++static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(jz4725b_adc_tlv, 0, 150, 0); + static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(jz4725b_dac_tlv, -2250, 150, 0); + + static const struct snd_kcontrol_new jz4725b_codec_controls[] = { +@@ -151,11 +154,11 @@ static const struct snd_kcontrol_new jz4725b_codec_controls[] = { + REG_CGR1_GODL_OFFSET, + REG_CGR1_GODR_OFFSET, + 0xf, 1, jz4725b_dac_tlv), +- SOC_DOUBLE_R_TLV("Master Capture Volume", +- JZ4725B_CODEC_REG_CGR3, +- JZ4725B_CODEC_REG_CGR2, +- REG_CGR2_GO1R_OFFSET, +- 0x1f, 1, jz4725b_line_tlv), ++ SOC_DOUBLE_TLV("Master Capture Volume", ++ JZ4725B_CODEC_REG_CGR10, ++ REG_CGR10_GIL_OFFSET, ++ REG_CGR10_GIR_OFFSET, ++ 0xf, 0, jz4725b_adc_tlv), + + SOC_SINGLE("Master Playback Switch", JZ4725B_CODEC_REG_CR1, + REG_CR1_DAC_MUTE_OFFSET, 1, 1), +-- +2.35.1 + diff --git a/queue-5.4/asoc-wm5102-revert-asoc-wm5102-fix-pm-disable-depth-.patch b/queue-5.4/asoc-wm5102-revert-asoc-wm5102-fix-pm-disable-depth-.patch new file mode 100644 index 00000000000..f7f2a84c37e --- /dev/null +++ b/queue-5.4/asoc-wm5102-revert-asoc-wm5102-fix-pm-disable-depth-.patch @@ -0,0 +1,51 @@ +From 69cf9a1f9fba4e877fde39272c674be007d6aa67 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Oct 2022 19:48:50 +0800 +Subject: ASoC: wm5102: Revert "ASoC: wm5102: Fix PM disable depth imbalance in + wm5102_probe" + +From: Zhang Qilong + +[ Upstream commit de71d7567e358effd06dfc3e2a154b25f1331c10 ] + +This reverts commit fcbb60820cd3008bb44334a0395e5e57ccb77329. + +The pm_runtime_disable is redundant when error returns in +wm5102_probe, we just revert the old patch to fix it. + +Signed-off-by: Zhang Qilong +Acked-by: Charles Keepax +Link: https://lore.kernel.org/r/20221010114852.88127-2-zhangqilong3@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/wm5102.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c +index c5667b149c70..d6d4b4121369 100644 +--- a/sound/soc/codecs/wm5102.c ++++ b/sound/soc/codecs/wm5102.c +@@ -2084,6 +2084,9 @@ static int wm5102_probe(struct platform_device *pdev) + regmap_update_bits(arizona->regmap, wm5102_digital_vu[i], + WM5102_DIG_VU, WM5102_DIG_VU); + ++ pm_runtime_enable(&pdev->dev); ++ pm_runtime_idle(&pdev->dev); ++ + ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, + "ADSP2 Compressed IRQ", wm5102_adsp2_irq, + wm5102); +@@ -2116,9 +2119,6 @@ static int wm5102_probe(struct platform_device *pdev) + goto err_spk_irqs; + } + +- pm_runtime_enable(&pdev->dev); +- pm_runtime_idle(&pdev->dev); +- + return ret; + + err_spk_irqs: +-- +2.35.1 + diff --git a/queue-5.4/asoc-wm5110-revert-asoc-wm5110-fix-pm-disable-depth-.patch b/queue-5.4/asoc-wm5110-revert-asoc-wm5110-fix-pm-disable-depth-.patch new file mode 100644 index 00000000000..e5fda490e47 --- /dev/null +++ b/queue-5.4/asoc-wm5110-revert-asoc-wm5110-fix-pm-disable-depth-.patch @@ -0,0 +1,51 @@ +From 5a2e66654903cbf98e60c83169062bd3708fb0ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Oct 2022 19:48:51 +0800 +Subject: ASoC: wm5110: Revert "ASoC: wm5110: Fix PM disable depth imbalance in + wm5110_probe" + +From: Zhang Qilong + +[ Upstream commit 7d4e966f4cd73ff69bf06934e8e14a33fb7ef447 ] + +This reverts commit 86b46bf1feb83898d89a2b4a8d08d21e9ea277a7. + +The pm_runtime_disable is redundant when error returns in +wm5110_probe, we just revert the old patch to fix it. + +Signed-off-by: Zhang Qilong +Acked-by: Charles Keepax +Link: https://lore.kernel.org/r/20221010114852.88127-3-zhangqilong3@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/wm5110.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c +index bbe9fdfb423c..06ec3f48c808 100644 +--- a/sound/soc/codecs/wm5110.c ++++ b/sound/soc/codecs/wm5110.c +@@ -2452,6 +2452,9 @@ static int wm5110_probe(struct platform_device *pdev) + regmap_update_bits(arizona->regmap, wm5110_digital_vu[i], + WM5110_DIG_VU, WM5110_DIG_VU); + ++ pm_runtime_enable(&pdev->dev); ++ pm_runtime_idle(&pdev->dev); ++ + ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, + "ADSP2 Compressed IRQ", wm5110_adsp2_irq, + wm5110); +@@ -2484,9 +2487,6 @@ static int wm5110_probe(struct platform_device *pdev) + goto err_spk_irqs; + } + +- pm_runtime_enable(&pdev->dev); +- pm_runtime_idle(&pdev->dev); +- + return ret; + + err_spk_irqs: +-- +2.35.1 + diff --git a/queue-5.4/asoc-wm8962-add-an-event-handler-for-temp_hp-and-tem.patch b/queue-5.4/asoc-wm8962-add-an-event-handler-for-temp_hp-and-tem.patch new file mode 100644 index 00000000000..67ba0f6f7e6 --- /dev/null +++ b/queue-5.4/asoc-wm8962-add-an-event-handler-for-temp_hp-and-tem.patch @@ -0,0 +1,116 @@ +From 6532779ec0cbdf1bb43ec8f5e4e9fcfc681077ea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Oct 2022 17:20:14 +0800 +Subject: ASoC: wm8962: Add an event handler for TEMP_HP and TEMP_SPK + +From: Xiaolei Wang + +[ Upstream commit ee1aa2ae3eaa96e70229fa61deee87ef4528ffdf ] + +In wm8962 driver, the WM8962_ADDITIONAL_CONTROL_4 is used as a volatile +register, but this register mixes a bunch of volatile status bits and a +bunch of non-volatile control bits. The dapm widgets TEMP_HP and +TEMP_SPK leverages the control bits in this register. After the wm8962 +probe, the regmap will bet set to cache only mode, then a read error +like below would be triggered when trying to read the initial power +state of the dapm widgets TEMP_HP and TEMP_SPK. + wm8962 0-001a: ASoC: error at soc_component_read_no_lock + on wm8962.0-001a: -16 + +In order to fix this issue, we add event handler to actually power +up/down these widgets. With this change, we also need to explicitly +power off these widgets in the wm8962 probe since they are enabled +by default. + +Signed-off-by: Xiaolei Wang +Tested-by: Adam Ford +Acked-by: Charles Keepax +Link: https://lore.kernel.org/r/20221010092014.2229246-1-xiaolei.wang@windriver.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/wm8962.c | 54 +++++++++++++++++++++++++++++++++++++-- + 1 file changed, 52 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c +index ebaee468057b..c384ca3681e9 100644 +--- a/sound/soc/codecs/wm8962.c ++++ b/sound/soc/codecs/wm8962.c +@@ -1840,6 +1840,49 @@ SOC_SINGLE_TLV("SPKOUTR Mixer DACR Volume", WM8962_SPEAKER_MIXER_5, + 4, 1, 0, inmix_tlv), + }; + ++static int tp_event(struct snd_soc_dapm_widget *w, ++ struct snd_kcontrol *kcontrol, int event) ++{ ++ int ret, reg, val, mask; ++ struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); ++ ++ ret = pm_runtime_resume_and_get(component->dev); ++ if (ret < 0) { ++ dev_err(component->dev, "Failed to resume device: %d\n", ret); ++ return ret; ++ } ++ ++ reg = WM8962_ADDITIONAL_CONTROL_4; ++ ++ if (!strcmp(w->name, "TEMP_HP")) { ++ mask = WM8962_TEMP_ENA_HP_MASK; ++ val = WM8962_TEMP_ENA_HP; ++ } else if (!strcmp(w->name, "TEMP_SPK")) { ++ mask = WM8962_TEMP_ENA_SPK_MASK; ++ val = WM8962_TEMP_ENA_SPK; ++ } else { ++ pm_runtime_put(component->dev); ++ return -EINVAL; ++ } ++ ++ switch (event) { ++ case SND_SOC_DAPM_POST_PMD: ++ val = 0; ++ fallthrough; ++ case SND_SOC_DAPM_POST_PMU: ++ ret = snd_soc_component_update_bits(component, reg, mask, val); ++ break; ++ default: ++ WARN(1, "Invalid event %d\n", event); ++ pm_runtime_put(component->dev); ++ return -EINVAL; ++ } ++ ++ pm_runtime_put(component->dev); ++ ++ return 0; ++} ++ + static int cp_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) + { +@@ -2132,8 +2175,10 @@ SND_SOC_DAPM_SUPPLY("TOCLK", WM8962_ADDITIONAL_CONTROL_1, 0, 0, NULL, 0), + SND_SOC_DAPM_SUPPLY_S("DSP2", 1, WM8962_DSP2_POWER_MANAGEMENT, + WM8962_DSP2_ENA_SHIFT, 0, dsp2_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), +-SND_SOC_DAPM_SUPPLY("TEMP_HP", WM8962_ADDITIONAL_CONTROL_4, 2, 0, NULL, 0), +-SND_SOC_DAPM_SUPPLY("TEMP_SPK", WM8962_ADDITIONAL_CONTROL_4, 1, 0, NULL, 0), ++SND_SOC_DAPM_SUPPLY("TEMP_HP", SND_SOC_NOPM, 0, 0, tp_event, ++ SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), ++SND_SOC_DAPM_SUPPLY("TEMP_SPK", SND_SOC_NOPM, 0, 0, tp_event, ++ SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), + + SND_SOC_DAPM_MIXER("INPGAL", WM8962_LEFT_INPUT_PGA_CONTROL, 4, 0, + inpgal, ARRAY_SIZE(inpgal)), +@@ -3750,6 +3795,11 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, + if (ret < 0) + goto err_pm_runtime; + ++ regmap_update_bits(wm8962->regmap, WM8962_ADDITIONAL_CONTROL_4, ++ WM8962_TEMP_ENA_HP_MASK, 0); ++ regmap_update_bits(wm8962->regmap, WM8962_ADDITIONAL_CONTROL_4, ++ WM8962_TEMP_ENA_SPK_MASK, 0); ++ + regcache_cache_only(wm8962->regmap, true); + + /* The drivers should power up as needed */ +-- +2.35.1 + diff --git a/queue-5.4/asoc-wm8997-revert-asoc-wm8997-fix-pm-disable-depth-.patch b/queue-5.4/asoc-wm8997-revert-asoc-wm8997-fix-pm-disable-depth-.patch new file mode 100644 index 00000000000..40b04974520 --- /dev/null +++ b/queue-5.4/asoc-wm8997-revert-asoc-wm8997-fix-pm-disable-depth-.patch @@ -0,0 +1,51 @@ +From 23c4842485533bbc4e62e0b2cd09a0696d7e0924 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Oct 2022 19:48:52 +0800 +Subject: ASoC: wm8997: Revert "ASoC: wm8997: Fix PM disable depth imbalance in + wm8997_probe" + +From: Zhang Qilong + +[ Upstream commit 68ce83e3bb26feba0fcdd59667fde942b3a600a1 ] + +This reverts commit 41a736ac20602f64773e80f0f5b32cde1830a44a. + +The pm_runtime_disable is redundant when error returns in +wm8997_probe, we just revert the old patch to fix it. + +Signed-off-by: Zhang Qilong +Acked-by: Charles Keepax +Link: https://lore.kernel.org/r/20221010114852.88127-4-zhangqilong3@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/wm8997.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c +index 07378714b013..229f2986cd96 100644 +--- a/sound/soc/codecs/wm8997.c ++++ b/sound/soc/codecs/wm8997.c +@@ -1156,6 +1156,9 @@ static int wm8997_probe(struct platform_device *pdev) + regmap_update_bits(arizona->regmap, wm8997_digital_vu[i], + WM8997_DIG_VU, WM8997_DIG_VU); + ++ pm_runtime_enable(&pdev->dev); ++ pm_runtime_idle(&pdev->dev); ++ + arizona_init_common(arizona); + + ret = arizona_init_vol_limit(arizona); +@@ -1174,9 +1177,6 @@ static int wm8997_probe(struct platform_device *pdev) + goto err_spk_irqs; + } + +- pm_runtime_enable(&pdev->dev); +- pm_runtime_idle(&pdev->dev); +- + return ret; + + err_spk_irqs: +-- +2.35.1 + diff --git a/queue-5.4/bluetooth-l2cap-fix-l2cap_global_chan_by_psm.patch b/queue-5.4/bluetooth-l2cap-fix-l2cap_global_chan_by_psm.patch new file mode 100644 index 00000000000..e5bce1bd8d4 --- /dev/null +++ b/queue-5.4/bluetooth-l2cap-fix-l2cap_global_chan_by_psm.patch @@ -0,0 +1,35 @@ +From d42dcb06d81c9081c93c620043870e18395847b7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 31 Oct 2022 16:10:33 -0700 +Subject: Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm + +From: Luiz Augusto von Dentz + +[ Upstream commit f937b758a188d6fd328a81367087eddbb2fce50f ] + +l2cap_global_chan_by_psm shall not return fixed channels as they are not +meant to be connected by (S)PSM. + +Signed-off-by: Luiz Augusto von Dentz +Reviewed-by: Tedd Ho-Jeong An +Signed-off-by: Sasha Levin +--- + net/bluetooth/l2cap_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c +index c0cdc28e1d1e..afa7fc55555e 100644 +--- a/net/bluetooth/l2cap_core.c ++++ b/net/bluetooth/l2cap_core.c +@@ -1833,7 +1833,7 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, + if (link_type == LE_LINK && c->src_type == BDADDR_BREDR) + continue; + +- if (c->psm == psm) { ++ if (c->chan_type != L2CAP_CHAN_FIXED && c->psm == psm) { + int src_match, dst_match; + int src_any, dst_any; + +-- +2.35.1 + diff --git a/queue-5.4/btrfs-remove-pointless-and-double-ulist-frees-in-err.patch b/queue-5.4/btrfs-remove-pointless-and-double-ulist-frees-in-err.patch new file mode 100644 index 00000000000..1c251bdf25a --- /dev/null +++ b/queue-5.4/btrfs-remove-pointless-and-double-ulist-frees-in-err.patch @@ -0,0 +1,134 @@ +From 630c8707b879b8b34ae85d926280528572117cb4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Nov 2022 16:15:40 +0000 +Subject: btrfs: remove pointless and double ulist frees in error paths of + qgroup tests + +From: Filipe Manana + +[ Upstream commit d0ea17aec12ea0f7b9d2ed727d8ef8169d1e7699 ] + +Several places in the qgroup self tests follow the pattern of freeing the +ulist pointer they passed to btrfs_find_all_roots() if the call to that +function returned an error. That is pointless because that function always +frees the ulist in case it returns an error. + +Also In some places like at test_multiple_refs(), after a call to +btrfs_qgroup_account_extent() we also leave "old_roots" and "new_roots" +pointing to ulists that were freed, because btrfs_qgroup_account_extent() +has freed those ulists, and if after that the next call to +btrfs_find_all_roots() fails, we call ulist_free() on the "old_roots" +ulist again, resulting in a double free. + +So remove those calls to reduce the code size and avoid double ulist +free in case of an error. + +Signed-off-by: Filipe Manana +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/tests/qgroup-tests.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c +index f312ed5abb19..f6169bece7c0 100644 +--- a/fs/btrfs/tests/qgroup-tests.c ++++ b/fs/btrfs/tests/qgroup-tests.c +@@ -230,7 +230,6 @@ static int test_no_shared_qgroup(struct btrfs_root *root, + ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, + false); + if (ret) { +- ulist_free(old_roots); + test_err("couldn't find old roots: %d", ret); + return ret; + } +@@ -246,7 +245,6 @@ static int test_no_shared_qgroup(struct btrfs_root *root, + false); + if (ret) { + ulist_free(old_roots); +- ulist_free(new_roots); + test_err("couldn't find old roots: %d", ret); + return ret; + } +@@ -258,18 +256,19 @@ static int test_no_shared_qgroup(struct btrfs_root *root, + return ret; + } + ++ /* btrfs_qgroup_account_extent() always frees the ulists passed to it. */ ++ old_roots = NULL; ++ new_roots = NULL; ++ + if (btrfs_verify_qgroup_counts(fs_info, BTRFS_FS_TREE_OBJECTID, + nodesize, nodesize)) { + test_err("qgroup counts didn't match expected values"); + return -EINVAL; + } +- old_roots = NULL; +- new_roots = NULL; + + ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, + false); + if (ret) { +- ulist_free(old_roots); + test_err("couldn't find old roots: %d", ret); + return ret; + } +@@ -284,7 +283,6 @@ static int test_no_shared_qgroup(struct btrfs_root *root, + false); + if (ret) { + ulist_free(old_roots); +- ulist_free(new_roots); + test_err("couldn't find old roots: %d", ret); + return ret; + } +@@ -335,7 +333,6 @@ static int test_multiple_refs(struct btrfs_root *root, + ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, + false); + if (ret) { +- ulist_free(old_roots); + test_err("couldn't find old roots: %d", ret); + return ret; + } +@@ -351,7 +348,6 @@ static int test_multiple_refs(struct btrfs_root *root, + false); + if (ret) { + ulist_free(old_roots); +- ulist_free(new_roots); + test_err("couldn't find old roots: %d", ret); + return ret; + } +@@ -372,7 +368,6 @@ static int test_multiple_refs(struct btrfs_root *root, + ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, + false); + if (ret) { +- ulist_free(old_roots); + test_err("couldn't find old roots: %d", ret); + return ret; + } +@@ -388,7 +383,6 @@ static int test_multiple_refs(struct btrfs_root *root, + false); + if (ret) { + ulist_free(old_roots); +- ulist_free(new_roots); + test_err("couldn't find old roots: %d", ret); + return ret; + } +@@ -415,7 +409,6 @@ static int test_multiple_refs(struct btrfs_root *root, + ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, + false); + if (ret) { +- ulist_free(old_roots); + test_err("couldn't find old roots: %d", ret); + return ret; + } +@@ -431,7 +424,6 @@ static int test_multiple_refs(struct btrfs_root *root, + false); + if (ret) { + ulist_free(old_roots); +- ulist_free(new_roots); + test_err("couldn't find old roots: %d", ret); + return ret; + } +-- +2.35.1 + diff --git a/queue-5.4/drm-imx-imx-tve-fix-return-type-of-imx_tve_connector.patch b/queue-5.4/drm-imx-imx-tve-fix-return-type-of-imx_tve_connector.patch new file mode 100644 index 00000000000..3c911a858ac --- /dev/null +++ b/queue-5.4/drm-imx-imx-tve-fix-return-type-of-imx_tve_connector.patch @@ -0,0 +1,53 @@ +From 30596569b5e6e0298295acf632740378782d57ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 13 Sep 2022 13:55:44 -0700 +Subject: drm/imx: imx-tve: Fix return type of imx_tve_connector_mode_valid + +From: Nathan Huckleberry + +[ Upstream commit fc007fb815ab5395c3962c09b79a1630b0fbed9c ] + +The mode_valid field in drm_connector_helper_funcs is expected to be of +type: +enum drm_mode_status (* mode_valid) (struct drm_connector *connector, + struct drm_display_mode *mode); + +The mismatched return type breaks forward edge kCFI since the underlying +function definition does not match the function hook definition. + +The return type of imx_tve_connector_mode_valid should be changed from +int to enum drm_mode_status. + +Reported-by: Dan Carpenter +Link: https://github.com/ClangBuiltLinux/linux/issues/1703 +Cc: llvm@lists.linux.dev +Signed-off-by: Nathan Huckleberry +Reviewed-by: Nathan Chancellor +Reviewed-by: Fabio Estevam +Reviewed-by: Philipp Zabel +Signed-off-by: Philipp Zabel +Link: https://patchwork.freedesktop.org/patch/msgid/20220913205544.155106-1-nhuck@google.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/imx/imx-tve.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c +index f91c3eb7697b..cc300ed456e1 100644 +--- a/drivers/gpu/drm/imx/imx-tve.c ++++ b/drivers/gpu/drm/imx/imx-tve.c +@@ -237,8 +237,9 @@ static int imx_tve_connector_get_modes(struct drm_connector *connector) + return ret; + } + +-static int imx_tve_connector_mode_valid(struct drm_connector *connector, +- struct drm_display_mode *mode) ++static enum drm_mode_status ++imx_tve_connector_mode_valid(struct drm_connector *connector, ++ struct drm_display_mode *mode) + { + struct imx_tve *tve = con_to_tve(connector); + unsigned long rate; +-- +2.35.1 + diff --git a/queue-5.4/i2c-i801-add-lis3lv02d-s-i2c-address-for-vostro-5568.patch b/queue-5.4/i2c-i801-add-lis3lv02d-s-i2c-address-for-vostro-5568.patch new file mode 100644 index 00000000000..1d463c85377 --- /dev/null +++ b/queue-5.4/i2c-i801-add-lis3lv02d-s-i2c-address-for-vostro-5568.patch @@ -0,0 +1,46 @@ +From 5265ad8250c0fe133ffeca321a09e6d66f759f1b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Oct 2022 16:54:40 +0200 +Subject: i2c: i801: add lis3lv02d's I2C address for Vostro 5568 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Nam Cao + +[ Upstream commit d6643d7207c572c1b0305ed505101f15502c6c87 ] + +Dell Vostro 5568 laptop has lis3lv02d, but its i2c address is not known +to the kernel. Add this address. + +Output of "cat /sys/devices/platform/lis3lv02d/position" on Dell Vostro +5568 laptop: + - Horizontal: (-18,0,1044) + - Front elevated: (522,-18,1080) + - Left elevated: (-18,-360,1080) + - Upside down: (36,108,-1134) + +Signed-off-by: Nam Cao +Reviewed-by: Jean Delvare +Reviewed-by: Pali Rohár +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-i801.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c +index 4e6d0b722ddc..2b84db59ab3c 100644 +--- a/drivers/i2c/busses/i2c-i801.c ++++ b/drivers/i2c/busses/i2c-i801.c +@@ -1253,6 +1253,7 @@ static const struct { + * Additional individual entries were added after verification. + */ + { "Vostro V131", 0x1d }, ++ { "Vostro 5568", 0x29 }, + }; + + static void register_dell_lis3lv02d_i2c_device(struct i801_priv *priv) +-- +2.35.1 + diff --git a/queue-5.4/nfsv4-retry-lock-on-old_stateid-during-delegation-re.patch b/queue-5.4/nfsv4-retry-lock-on-old_stateid-during-delegation-re.patch new file mode 100644 index 00000000000..fd660040bd9 --- /dev/null +++ b/queue-5.4/nfsv4-retry-lock-on-old_stateid-during-delegation-re.patch @@ -0,0 +1,62 @@ +From fc3d3a4039028bf0401e45a6f1c7fd6c09cd6c44 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 19 Oct 2022 12:09:18 -0400 +Subject: NFSv4: Retry LOCK on OLD_STATEID during delegation return + +From: Benjamin Coddington + +[ Upstream commit f5ea16137a3fa2858620dc9084466491c128535f ] + +There's a small window where a LOCK sent during a delegation return can +race with another OPEN on client, but the open stateid has not yet been +updated. In this case, the client doesn't handle the OLD_STATEID error +from the server and will lose this lock, emitting: +"NFS: nfs4_handle_delegation_recall_error: unhandled error -10024". + +Fix this by sending the task through the nfs4 error handling in +nfs4_lock_done() when we may have to reconcile our stateid with what the +server believes it to be. For this case, the result is a retry of the +LOCK operation with the updated stateid. + +Reported-by: Gonzalo Siero Humet +Signed-off-by: Benjamin Coddington +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/nfs4proc.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c +index 7c5dfed0437f..77c2c88621be 100644 +--- a/fs/nfs/nfs4proc.c ++++ b/fs/nfs/nfs4proc.c +@@ -6854,6 +6854,7 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata) + { + struct nfs4_lockdata *data = calldata; + struct nfs4_lock_state *lsp = data->lsp; ++ struct nfs_server *server = NFS_SERVER(d_inode(data->ctx->dentry)); + + dprintk("%s: begin!\n", __func__); + +@@ -6863,8 +6864,7 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata) + data->rpc_status = task->tk_status; + switch (task->tk_status) { + case 0: +- renew_lease(NFS_SERVER(d_inode(data->ctx->dentry)), +- data->timestamp); ++ renew_lease(server, data->timestamp); + if (data->arg.new_lock && !data->cancelled) { + data->fl.fl_flags &= ~(FL_SLEEP | FL_ACCESS); + if (locks_lock_inode_wait(lsp->ls_state->inode, &data->fl) < 0) +@@ -6885,6 +6885,8 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata) + if (!nfs4_stateid_match(&data->arg.open_stateid, + &lsp->ls_state->open_stateid)) + goto out_restart; ++ else if (nfs4_async_handle_error(task, server, lsp->ls_state, NULL) == -EAGAIN) ++ goto out_restart; + } else if (!nfs4_stateid_match(&data->arg.lock_stateid, + &lsp->ls_stateid)) + goto out_restart; +-- +2.35.1 + diff --git a/queue-5.4/rtc-cmos-fix-build-on-non-acpi-platforms.patch b/queue-5.4/rtc-cmos-fix-build-on-non-acpi-platforms.patch new file mode 100644 index 00000000000..9947db44737 --- /dev/null +++ b/queue-5.4/rtc-cmos-fix-build-on-non-acpi-platforms.patch @@ -0,0 +1,37 @@ +From 542d4bf0881e7698381f1901e1917719c39d7e70 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 Oct 2022 22:35:11 +0200 +Subject: rtc: cmos: fix build on non-ACPI platforms + +From: Alexandre Belloni + +[ Upstream commit db4e955ae333567dea02822624106c0b96a2f84f ] + +Now that rtc_wake_setup is called outside of cmos_wake_setup, it also need +to be defined on non-ACPI platforms. + +Reported-by: kernel test robot +Link: https://lore.kernel.org/r/20221018203512.2532407-1-alexandre.belloni@bootlin.com +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/rtc/rtc-cmos.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c +index c0dc03ffa817..be92919af2f3 100644 +--- a/drivers/rtc/rtc-cmos.c ++++ b/drivers/rtc/rtc-cmos.c +@@ -1290,6 +1290,9 @@ static void cmos_check_acpi_rtc_status(struct device *dev, + { + } + ++static void rtc_wake_setup(struct device *dev) ++{ ++} + #endif + + #ifdef CONFIG_PNP +-- +2.35.1 + diff --git a/queue-5.4/selftests-futex-fix-build-for-clang.patch b/queue-5.4/selftests-futex-fix-build-for-clang.patch new file mode 100644 index 00000000000..86a9e7da2d0 --- /dev/null +++ b/queue-5.4/selftests-futex-fix-build-for-clang.patch @@ -0,0 +1,54 @@ +From c0739da08331d252f5e76156ab70d3d6a5d64009 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Oct 2022 08:37:02 +0200 +Subject: selftests/futex: fix build for clang +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ricardo Cañuelo + +[ Upstream commit 03cab65a07e083b6c1010fbc8f9b817e9aca75d9 ] + +Don't use the test-specific header files as source files to force a +target dependency, as clang will complain if more than one source file +is used for a compile command with a single '-o' flag. + +Use the proper Makefile variables instead as defined in +tools/testing/selftests/lib.mk. + +Signed-off-by: Ricardo Cañuelo +Reviewed-by: André Almeida +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/futex/functional/Makefile | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile +index 30996306cabc..479531f5865d 100644 +--- a/tools/testing/selftests/futex/functional/Makefile ++++ b/tools/testing/selftests/futex/functional/Makefile +@@ -3,11 +3,11 @@ INCLUDES := -I../include -I../../ + CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) + LDFLAGS := $(LDFLAGS) -pthread -lrt + +-HEADERS := \ ++LOCAL_HDRS := \ + ../include/futextest.h \ + ../include/atomic.h \ + ../include/logging.h +-TEST_GEN_FILES := \ ++TEST_GEN_PROGS := \ + futex_wait_timeout \ + futex_wait_wouldblock \ + futex_requeue_pi \ +@@ -21,5 +21,3 @@ TEST_PROGS := run.sh + top_srcdir = ../../../../.. + KSFT_KHDR_INSTALL := 1 + include ../../lib.mk +- +-$(TEST_GEN_FILES): $(HEADERS) +-- +2.35.1 + diff --git a/queue-5.4/selftests-intel_pstate-fix-build-for-arch-x86_64.patch b/queue-5.4/selftests-intel_pstate-fix-build-for-arch-x86_64.patch new file mode 100644 index 00000000000..008cf276f3f --- /dev/null +++ b/queue-5.4/selftests-intel_pstate-fix-build-for-arch-x86_64.patch @@ -0,0 +1,43 @@ +From cac3c7e15d61affe2399ab7e63855d42595e5c39 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Oct 2022 08:38:11 +0200 +Subject: selftests/intel_pstate: fix build for ARCH=x86_64 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ricardo Cañuelo + +[ Upstream commit beb7d862ed4ac6aa14625418970f22a7d55b8615 ] + +Handle the scenario where the build is launched with the ARCH envvar +defined as x86_64. + +Signed-off-by: Ricardo Cañuelo +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/intel_pstate/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/testing/selftests/intel_pstate/Makefile b/tools/testing/selftests/intel_pstate/Makefile +index 7340fd6a9a9f..9fc1a40b0127 100644 +--- a/tools/testing/selftests/intel_pstate/Makefile ++++ b/tools/testing/selftests/intel_pstate/Makefile +@@ -2,10 +2,10 @@ + CFLAGS := $(CFLAGS) -Wall -D_GNU_SOURCE + LDLIBS := $(LDLIBS) -lm + +-uname_M := $(shell uname -m 2>/dev/null || echo not) +-ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) ++ARCH ?= $(shell uname -m 2>/dev/null || echo not) ++ARCH_PROCESSED := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/) + +-ifeq (x86,$(ARCH)) ++ifeq (x86,$(ARCH_PROCESSED)) + TEST_GEN_FILES := msr aperf + endif + +-- +2.35.1 + diff --git a/queue-5.4/series b/queue-5.4/series index d56ad2ae072..934210f94fc 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -61,3 +61,21 @@ dmaengine-at_hdmac-fix-impossible-condition.patch dmaengine-at_hdmac-check-return-code-of-dma_async_device_register.patch net-tun-call-napi_schedule_prep-to-ensure-we-own-a-napi.patch x86-cpu-restore-amd-s-de_cfg-msr-after-resume.patch +asoc-wm5102-revert-asoc-wm5102-fix-pm-disable-depth-.patch +asoc-wm5110-revert-asoc-wm5110-fix-pm-disable-depth-.patch +asoc-wm8997-revert-asoc-wm8997-fix-pm-disable-depth-.patch +asoc-wm8962-add-an-event-handler-for-temp_hp-and-tem.patch +spi-intel-fix-the-offset-to-get-the-64k-erase-opcode.patch +asoc-codecs-jz4725b-add-missed-line-in-power-control.patch +asoc-codecs-jz4725b-fix-reported-volume-for-master-c.patch +asoc-codecs-jz4725b-use-right-control-for-capture-vo.patch +asoc-codecs-jz4725b-fix-capture-selector-naming.patch +selftests-futex-fix-build-for-clang.patch +selftests-intel_pstate-fix-build-for-arch-x86_64.patch +rtc-cmos-fix-build-on-non-acpi-platforms.patch +nfsv4-retry-lock-on-old_stateid-during-delegation-re.patch +i2c-i801-add-lis3lv02d-s-i2c-address-for-vostro-5568.patch +drm-imx-imx-tve-fix-return-type-of-imx_tve_connector.patch +btrfs-remove-pointless-and-double-ulist-frees-in-err.patch +bluetooth-l2cap-fix-l2cap_global_chan_by_psm.patch +asoc-codecs-jz4725b-fix-spelling-mistake-sourc-sourc.patch diff --git a/queue-5.4/spi-intel-fix-the-offset-to-get-the-64k-erase-opcode.patch b/queue-5.4/spi-intel-fix-the-offset-to-get-the-64k-erase-opcode.patch new file mode 100644 index 00000000000..e75be5df5cf --- /dev/null +++ b/queue-5.4/spi-intel-fix-the-offset-to-get-the-64k-erase-opcode.patch @@ -0,0 +1,38 @@ +From 1c5474f853d0277ce0f7e9fc2da978ec0c4b5757 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 12 Oct 2022 12:21:35 -0300 +Subject: spi: intel: Fix the offset to get the 64K erase opcode + +From: Mauro Lima + +[ Upstream commit 6a43cd02ddbc597dc9a1f82c1e433f871a2f6f06 ] + +According to documentation, the 64K erase opcode is located in VSCC +range [16:23] instead of [8:15]. +Use the proper value to shift the mask over the correct range. + +Signed-off-by: Mauro Lima +Reviewed-by: Mika Westerberg +Link: https://lore.kernel.org/r/20221012152135.28353-1-mauro.lima@eclypsium.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/mtd/spi-nor/intel-spi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mtd/spi-nor/intel-spi.c b/drivers/mtd/spi-nor/intel-spi.c +index 43e55a2e9b27..21b98c82e196 100644 +--- a/drivers/mtd/spi-nor/intel-spi.c ++++ b/drivers/mtd/spi-nor/intel-spi.c +@@ -113,7 +113,7 @@ + #define ERASE_OPCODE_SHIFT 8 + #define ERASE_OPCODE_MASK (0xff << ERASE_OPCODE_SHIFT) + #define ERASE_64K_OPCODE_SHIFT 16 +-#define ERASE_64K_OPCODE_MASK (0xff << ERASE_OPCODE_SHIFT) ++#define ERASE_64K_OPCODE_MASK (0xff << ERASE_64K_OPCODE_SHIFT) + + #define INTEL_SPI_TIMEOUT 5000 /* ms */ + #define INTEL_SPI_FIFO_SZ 64 +-- +2.35.1 +