ASoC: ops: Fix off by one in range control validation
Subsystems (8)
Sasha Levin
maintainerPATCH 2/41 pinctrl: aspeed: Fix potential NULL dereference in aspeed_pinmux_set_mux()
In reply to Sasha LevinFrom: Haowen Bai <[email protected]>
[ Upstream commit 84a85d3fef2e75b1fe9fc2af6f5267122555a1ed ]
pdesc could be null but still dereference pdesc->name and it will lead to a null pointer access. So we move a null check before dereference.
--- drivers/pinctrl/aspeed/pinctrl-aspeed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/aspeed/pinctrl-aspeed.c +2 -2
@@ -236,11 +236,11 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function,const struct aspeed_sig_expr **funcs;const struct aspeed_sig_expr ***prios; -pr_debug ("Muxing pin %s for %s\n" , pdesc->name, pfunc->name); -if (!pdesc)return -EINVAL ; +pr_debug ("Muxing pin %s for %s\n" , pdesc->name, pfunc->name); + prios = pdesc->prios;if (!prios)
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 1/41 ASoC: ops: Fix off by one in range control validation
From: Mark Brown <[email protected]>
[ Upstream commit 5871321fb4558c55bf9567052b618ff0be6b975e ]
We currently report that range controls accept a range of 0..(max-min) but accept writes in the range 0..(max-min+1). Remove that extra +1.
--- sound/soc/soc-ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-ops.c +2 -2
@@ -526,7 +526,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,return -EINVAL ;if (mc->platform_max && tmp > mc->platform_max)return -EINVAL ; -if (tmp > mc->max - mc->min +1 ) +if (tmp > mc->max - mc->min)return -EINVAL ;if (invert)
@@ -547,7 +547,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,return -EINVAL ;if (mc->platform_max && tmp > mc->platform_max)return -EINVAL ; -if (tmp > mc->max - mc->min +1 ) +if (tmp > mc->max - mc->min)return -EINVAL ;if (invert)
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 3/41 ASoC: Realtek/Maxim SoundWire codecs: disable pm_runtime on remove
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit ac63716da3070f8cb6baaba3a058a0c7f22aeb5b ]
When binding/unbinding codec drivers, the following warnings are thrown:
[ 107.266879] rt715-sdca sdw:3:025d:0714:01: Unbalanced pm_runtime_enable! [ 306.879700] rt711-sdca sdw:0:025d:0711:01: Unbalanced pm_runtime_enable!
Add a remove callback for all Realtek/Maxim SoundWire codecs and remove this warning.
--- sound/soc/codecs/max98373-sdw.c | 12 +++++++++++- sound/soc/codecs/rt1308-sdw.c | 11 +++++++++++ sound/soc/codecs/rt1316-sdw.c | 11 +++++++++++ sound/soc/codecs/rt5682-sdw.c | 5 ++++- sound/soc/codecs/rt700-sdw.c | 6 +++++- sound/soc/codecs/rt711-sdca-sdw.c | 6 +++++- sound/soc/codecs/rt711-sdw.c | 6 +++++- sound/soc/codecs/rt715-sdca-sdw.c | 12 ++++++++++++ sound/soc/codecs/rt715-sdw.c | 12 ++++++++++++ 9 files changed, 76 insertions(+), 5 deletions(-)
sound/soc/codecs/max98373-sdw.c +11 -1
@@ -862,6 +862,16 @@ static int max98373_sdw_probe(struct sdw_slave *slave,return max98373_init (slave, regmap); } +static int max98373_sdw_remove (struct sdw_slave *slave) +{ +struct max98373_priv *max98373 =dev_get_drvdata (&slave->dev); + +if (max98373->first_hw_init) +pm_runtime_disable (&slave->dev); + +return 0 ; +} +#if defined(CONFIG_OF )static const struct of_device_id max98373_of_match[] = { { .compatible = "maxim,max98373", },
@@ -893,7 +903,7 @@ static struct sdw_driver max98373_sdw_driver = { .pm = &max98373_pm, }, .probe = max98373_sdw_probe, - .remove = NULL, + .remove = max98373_sdw_remove, .ops = &max98373_slave_ops, .id_table = max98373_id, };
sound/soc/codecs/rt1308-sdw.c +11 -0
@@ -690,6 +690,16 @@ static int rt1308_sdw_probe(struct sdw_slave *slave,return 0 ; } +static int rt1308_sdw_remove (struct sdw_slave *slave) +{ +struct rt1308_sdw_priv *rt1308 =dev_get_drvdata (&slave->dev); + +if (rt1308->first_hw_init) +pm_runtime_disable (&slave->dev); + +return 0 ; +} +static const struct sdw_device_id rt1308_id[] = {SDW_SLAVE_ENTRY_EXT (0x025d ,0x1308 ,0x2 ,0 ,0 ), {},
@@ -749,6 +759,7 @@ static struct sdw_driver rt1308_sdw_driver = { .pm = &rt1308_pm, }, .probe = rt1308_sdw_probe, + .remove = rt1308_sdw_remove, .ops = &rt1308_slave_ops, .id_table = rt1308_id, };
sound/soc/codecs/rt1316-sdw.c +11 -0
@@ -675,6 +675,16 @@ static int rt1316_sdw_probe(struct sdw_slave *slave,return rt1316_sdw_init (&slave->dev, regmap, slave); } +static int rt1316_sdw_remove (struct sdw_slave *slave) +{ +struct rt1316_sdw_priv *rt1316 =dev_get_drvdata (&slave->dev); + +if (rt1316->first_hw_init) +pm_runtime_disable (&slave->dev); + +return 0 ; +} +static const struct sdw_device_id rt1316_id[] = {SDW_SLAVE_ENTRY_EXT (0x025d ,0x1316 ,0x3 ,0x1 ,0 ), {},
@@ -734,6 +744,7 @@ static struct sdw_driver rt1316_sdw_driver = { .pm = &rt1316_pm, }, .probe = rt1316_sdw_probe, + .remove = rt1316_sdw_remove, .ops = &rt1316_slave_ops, .id_table = rt1316_id, };
sound/soc/codecs/rt5682-sdw.c +4 -1
@@ -719,9 +719,12 @@ static int rt5682_sdw_remove(struct sdw_slave *slave) {struct rt5682_priv *rt5682 =dev_get_drvdata (&slave->dev); -if (rt5682 && rt5682->hw_init) +if (rt5682->hw_init)cancel_delayed_work_sync (&rt5682->jack_detect_work); +if (rt5682->first_hw_init) +pm_runtime_disable (&slave->dev); +return 0 ; }
sound/soc/codecs/rt700-sdw.c +5 -1
@@ -13,6 +13,7 @@#include <linux/soundwire/sdw_type.h> #include <linux/soundwire/sdw_registers.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <sound/soc.h> #include "rt700.h"
@@ -463,11 +464,14 @@ static int rt700_sdw_remove(struct sdw_slave *slave) {struct rt700_priv *rt700 =dev_get_drvdata (&slave->dev); -if (rt700 && rt700->hw_init) { +if (rt700->hw_init) {cancel_delayed_work_sync (&rt700->jack_detect_work);cancel_delayed_work_sync (&rt700->jack_btn_check_work); } +if (rt700->first_hw_init) +pm_runtime_disable (&slave->dev); +return 0 ; }
sound/soc/codecs/rt711-sdca-sdw.c +5 -1
@@ -11,6 +11,7 @@#include <linux/mod_devicetable.h> #include <linux/soundwire/sdw_registers.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #include "rt711-sdca.h" #include "rt711-sdca-sdw.h"
@@ -364,11 +365,14 @@ static int rt711_sdca_sdw_remove(struct sdw_slave *slave) {struct rt711_sdca_priv *rt711 =dev_get_drvdata (&slave->dev); -if (rt711 && rt711->hw_init) { +if (rt711->hw_init) {cancel_delayed_work_sync (&rt711->jack_detect_work);cancel_delayed_work_sync (&rt711->jack_btn_check_work); } +if (rt711->first_hw_init) +pm_runtime_disable (&slave->dev); +return 0 ; }
sound/soc/codecs/rt711-sdw.c +5 -1
@@ -13,6 +13,7 @@#include <linux/soundwire/sdw_type.h> #include <linux/soundwire/sdw_registers.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <sound/soc.h> #include "rt711.h"
@@ -464,12 +465,15 @@ static int rt711_sdw_remove(struct sdw_slave *slave) {struct rt711_priv *rt711 =dev_get_drvdata (&slave->dev); -if (rt711 && rt711->hw_init) { +if (rt711->hw_init) {cancel_delayed_work_sync (&rt711->jack_detect_work);cancel_delayed_work_sync (&rt711->jack_btn_check_work);cancel_work_sync (&rt711->calibration_work); } +if (rt711->first_hw_init) +pm_runtime_disable (&slave->dev); +return 0 ; }
sound/soc/codecs/rt715-sdca-sdw.c +12 -0
@@ -13,6 +13,7 @@#include <linux/soundwire/sdw_type.h> #include <linux/soundwire/sdw_registers.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <sound/soc.h> #include "rt715-sdca.h"
@@ -195,6 +196,16 @@ static int rt715_sdca_sdw_probe(struct sdw_slave *slave,return rt715_sdca_init (&slave->dev, mbq_regmap, regmap, slave); } +static int rt715_sdca_sdw_remove (struct sdw_slave *slave) +{ +struct rt715_sdca_priv *rt715 =dev_get_drvdata (&slave->dev); + +if (rt715->first_hw_init) +pm_runtime_disable (&slave->dev); + +return 0 ; +} +static const struct sdw_device_id rt715_sdca_id[] = {SDW_SLAVE_ENTRY_EXT (0x025d ,0x715 ,0x3 ,0x1 ,0 ),SDW_SLAVE_ENTRY_EXT (0x025d ,0x714 ,0x3 ,0x1 ,0 ),
@@ -269,6 +280,7 @@ static struct sdw_driver rt715_sdw_driver = { .pm = &rt715_pm, }, .probe = rt715_sdca_sdw_probe, + .remove = rt715_sdca_sdw_remove, .ops = &rt715_sdca_slave_ops, .id_table = rt715_sdca_id, };
sound/soc/codecs/rt715-sdw.c +12 -0
@@ -14,6 +14,7 @@#include <linux/soundwire/sdw_type.h> #include <linux/soundwire/sdw_registers.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #include <linux/of.h> #include <linux/regmap.h> #include <sound/soc.h>
@@ -514,6 +515,16 @@ static int rt715_sdw_probe(struct sdw_slave *slave,return 0 ; } +static int rt715_sdw_remove (struct sdw_slave *slave) +{ +struct rt715_priv *rt715 =dev_get_drvdata (&slave->dev); + +if (rt715->first_hw_init) +pm_runtime_disable (&slave->dev); + +return 0 ; +} +static const struct sdw_device_id rt715_id[] = {SDW_SLAVE_ENTRY_EXT (0x025d ,0x714 ,0x2 ,0 ,0 ),SDW_SLAVE_ENTRY_EXT (0x025d ,0x715 ,0x2 ,0 ,0 ),
@@ -575,6 +586,7 @@ static struct sdw_driver rt715_sdw_driver = { .pm = &rt715_pm, }, .probe = rt715_sdw_probe, + .remove = rt715_sdw_remove, .ops = &rt715_slave_ops, .id_table = rt715_id, };
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 4/41 ASoC: rt711-sdca-sdw: fix calibrate mutex initialization
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit ed0a7fb29c9fd4f53eeb37d1fe2354df7a038047 ]
In codec driver bind/unbind test, the following warning is thrown:
DEBUG_LOCKS_WARN_ON(lock->magic != lock)
...
[ 699.182495] rt711_sdca_jack_init+0x1b/0x1d0 [snd_soc_rt711_sdca] [ 699.182498] rt711_sdca_set_jack_detect+0x3b/0x90 [snd_soc_rt711_sdca] [ 699.182500] snd_soc_component_set_jack+0x24/0x50 [snd_soc_core]
A quick check in the code shows that the 'calibrate_mutex' used by this driver are not initialized at probe time. Moving the initialization to the probe removes the issue.
--- sound/soc/codecs/rt711-sdca-sdw.c | 3 +++ sound/soc/codecs/rt711-sdca.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/rt711-sdca-sdw.c +3 -0
@@ -373,6 +373,9 @@ static int rt711_sdca_sdw_remove(struct sdw_slave *slave)if (rt711->first_hw_init)pm_runtime_disable (&slave->dev); +mutex_destroy (&rt711->calibrate_mutex); +mutex_destroy (&rt711->disable_irq_lock); +return 0 ; }
sound/soc/codecs/rt711-sdca.c +1 -1
@@ -1411,6 +1411,7 @@ int rt711_sdca_init(struct device *dev, struct regmap *regmap, rt711->regmap = regmap; rt711->mbq_regmap = mbq_regmap; +mutex_init (&rt711->calibrate_mutex);mutex_init (&rt711->disable_irq_lock);/*
@@ -1549,7 +1550,6 @@ int rt711_sdca_io_init(struct device *dev, struct sdw_slave *slave) rt711_sdca_jack_detect_handler);INIT_DELAYED_WORK (&rt711->jack_btn_check_work, rt711_sdca_btn_check_handler); -mutex_init (&rt711->calibrate_mutex); }/* calibration */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 5/41 ASoC: Intel: sof_sdw: handle errors on card registration
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit fe154c4ff376bc31041c6441958a08243df09c99 ]
If the card registration fails, typically because of deferred probes, the device properties added for headset codecs are not removed, which leads to kernel oopses in driver bind/unbind tests.
We already clean-up the device properties when the card is removed, this code can be moved as a helper and called upon card registration errors.
--- sound/soc/intel/boards/sof_sdw.c | 51 ++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 22 deletions(-)
sound/soc/intel/boards/sof_sdw.c +29 -22
@@ -1398,6 +1398,33 @@ static struct snd_soc_card card_sof_sdw = { .late_probe = sof_sdw_card_late_probe, }; +static void mc_dailink_exit_loop (struct snd_soc_card *card) +{ +struct snd_soc_dai_link *link; +int ret; +int i, j; + +for (i =0 ; i <ARRAY_SIZE (codec_info_list); i++) { +if (!codec_info_list[i].exit) +continue ; +/* +* We don't need to call .exit function if there is no matched +* dai link found. +*/ +for_each_card_prelinks (card, j, link) { +if (!strcmp (link->codecs[0 ].dai_name, + codec_info_list[i].dai_name)) { + ret = codec_info_list[i].exit (card, link); +if (ret) +dev_warn (card->dev, +"codec exit failed %d\n" , + ret); +break ; + } + } + } +} +static int mc_probe (struct platform_device *pdev) {struct snd_soc_card *card = &card_sof_sdw;
@@ -1462,6 +1489,7 @@ static int mc_probe(struct platform_device *pdev) ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret) {dev_err (card->dev,"snd_soc_register_card failed %d\n" , ret); +mc_dailink_exit_loop (card);return ret; }
@@ -1473,29 +1501,8 @@ static int mc_probe(struct platform_device *pdev)static int mc_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct snd_soc_dai_link *link; -int ret; -int i, j; -for (i =0 ; i <ARRAY_SIZE (codec_info_list); i++) { -if (!codec_info_list[i].exit) -continue ; -/* -* We don't need to call .exit function if there is no matched -* dai link found. -*/ -for_each_card_prelinks (card, j, link) { -if (!strcmp (link->codecs[0 ].dai_name, - codec_info_list[i].dai_name)) { - ret = codec_info_list[i].exit (card, link); -if (ret) -dev_warn (&pdev->dev, -"codec exit failed %d\n" , - ret); -break ; - } - } - } +mc_dailink_exit_loop (card);return 0 ; }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 6/41 ASoC: rt711: fix calibrate mutex initialization
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 08bb5dc6ce02374169213cea772b1c297eaf32d5 ]
Follow the same flow as rt711-sdca and initialize all mutexes at probe time.
--- sound/soc/codecs/rt711-sdw.c | 3 +++ sound/soc/codecs/rt711.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/rt711-sdw.c +3 -0
@@ -474,6 +474,9 @@ static int rt711_sdw_remove(struct sdw_slave *slave)if (rt711->first_hw_init)pm_runtime_disable (&slave->dev); +mutex_destroy (&rt711->calibrate_mutex); +mutex_destroy (&rt711->disable_irq_lock); +return 0 ; }
sound/soc/codecs/rt711.c +1 -1
@@ -1203,6 +1203,7 @@ int rt711_init(struct device *dev, struct regmap *sdw_regmap, rt711->sdw_regmap = sdw_regmap; rt711->regmap = regmap; +mutex_init (&rt711->calibrate_mutex);mutex_init (&rt711->disable_irq_lock);/*
@@ -1317,7 +1318,6 @@ int rt711_io_init(struct device *dev, struct sdw_slave *slave) rt711_jack_detect_handler);INIT_DELAYED_WORK (&rt711->jack_btn_check_work, rt711_btn_check_handler); -mutex_init (&rt711->calibrate_mutex);INIT_WORK (&rt711->calibration_work, rt711_calibration_work);schedule_work (&rt711->calibration_work); }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 7/41 ASoC: rt7*-sdw: harden jack_detect_handler
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 0484271ab0ce50649329fa9dc23c50853c5b26a4 ]
Realtek headset codec drivers typically check if the card is instantiated before proceeding with the jack detection.
The rt700, rt711 and rt711-sdca are however missing a check on the card pointer, which can lead to NULL dereferences encountered in driver bind/unbind tests.
--- sound/soc/codecs/rt700.c | 2 +- sound/soc/codecs/rt711-sdca.c | 2 +- sound/soc/codecs/rt711.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/rt700.c +1 -1
@@ -162,7 +162,7 @@ static void rt700_jack_detect_handler(struct work_struct *work)if (!rt700->hs_jack)return ; -if (!rt700->component->card->instantiated) +if (!rt700->component->card || !rt700->component->card->instantiated)return ; reg =RT700_VERB_GET_PIN_SENSE |RT700_HP_OUT ;
sound/soc/codecs/rt711-sdca.c +1 -1
@@ -294,7 +294,7 @@ static void rt711_sdca_jack_detect_handler(struct work_struct *work)if (!rt711->hs_jack)return ; -if (!rt711->component->card->instantiated) +if (!rt711->component->card || !rt711->component->card->instantiated)return ;/* SDW_SCP_SDCA_INT_SDCA_0 is used for jack detection */
sound/soc/codecs/rt711.c +1 -1
@@ -242,7 +242,7 @@ static void rt711_jack_detect_handler(struct work_struct *work)if (!rt711->hs_jack)return ; -if (!rt711->component->card->instantiated) +if (!rt711->component->card || !rt711->component->card->instantiated)return ;if (pm_runtime_status_suspended (rt711->slave->dev.parent)) {
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 8/41 ASoC: codecs: rt700/rt711/rt711-sdca: initialize workqueues in probe
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit ba98d7d8b60ba410aa03834f6aa48fd3b2e68478 ]
The workqueues are initialized in the io_init functions, which isn't quite right. In some tests, this leads to warnings throw from __queue_delayed_work()
WARN_ON_FUNCTION_MISMATCH(timer->function, delayed_work_timer_fn);
Move all the initializations to the probe functions.
--- sound/soc/codecs/rt700.c | 12 +++++------- sound/soc/codecs/rt711-sdca.c | 10 +++------- sound/soc/codecs/rt711.c | 12 +++++------- 3 files changed, 13 insertions(+), 21 deletions(-)
sound/soc/codecs/rt700.c +5 -7
@@ -1114,6 +1114,11 @@ int rt700_init(struct device *dev, struct regmap *sdw_regmap,mutex_init (&rt700->disable_irq_lock); +INIT_DELAYED_WORK (&rt700->jack_detect_work, + rt700_jack_detect_handler); +INIT_DELAYED_WORK (&rt700->jack_btn_check_work, + rt700_btn_check_handler); +/* * Mark hw_init to false * HW init will be performed when device reports present
@@ -1208,13 +1213,6 @@ int rt700_io_init(struct device *dev, struct sdw_slave *slave)/* Finish Initial Settings, set power to D3 */ regmap_write (rt700->regmap,RT700_SET_AUDIO_POWER_STATE ,AC_PWRST_D3 ); -if (!rt700->first_hw_init) { -INIT_DELAYED_WORK (&rt700->jack_detect_work, - rt700_jack_detect_handler); -INIT_DELAYED_WORK (&rt700->jack_btn_check_work, - rt700_btn_check_handler); - } -/* * if set_jack callback occurred early than io_init, * we set up the jack detection function now
sound/soc/codecs/rt711-sdca.c +3 -7
@@ -1414,6 +1414,9 @@ int rt711_sdca_init(struct device *dev, struct regmap *regmap,mutex_init (&rt711->calibrate_mutex);mutex_init (&rt711->disable_irq_lock); +INIT_DELAYED_WORK (&rt711->jack_detect_work, rt711_sdca_jack_detect_handler); +INIT_DELAYED_WORK (&rt711->jack_btn_check_work, rt711_sdca_btn_check_handler); +/* * Mark hw_init to false * HW init will be performed when device reports present
@@ -1545,13 +1548,6 @@ int rt711_sdca_io_init(struct device *dev, struct sdw_slave *slave)rt711_sdca_index_update_bits (rt711,RT711_VENDOR_HDA_CTL ,RT711_PUSH_BTN_INT_CTL0 ,0x20 ,0x00 ); -if (!rt711->first_hw_init) { -INIT_DELAYED_WORK (&rt711->jack_detect_work, - rt711_sdca_jack_detect_handler); -INIT_DELAYED_WORK (&rt711->jack_btn_check_work, - rt711_sdca_btn_check_handler); - } -/* calibration */ ret =rt711_sdca_calibration (rt711);if (ret <0 )
sound/soc/codecs/rt711.c +5 -7
@@ -1206,6 +1206,10 @@ int rt711_init(struct device *dev, struct regmap *sdw_regmap,mutex_init (&rt711->calibrate_mutex);mutex_init (&rt711->disable_irq_lock); +INIT_DELAYED_WORK (&rt711->jack_detect_work, rt711_jack_detect_handler); +INIT_DELAYED_WORK (&rt711->jack_btn_check_work, rt711_btn_check_handler); +INIT_WORK (&rt711->calibration_work, rt711_calibration_work); +/* * Mark hw_init to false * HW init will be performed when device reports present
@@ -1313,14 +1317,8 @@ int rt711_io_init(struct device *dev, struct sdw_slave *slave)if (rt711->first_hw_init)rt711_calibration (rt711); -else { -INIT_DELAYED_WORK (&rt711->jack_detect_work, - rt711_jack_detect_handler); -INIT_DELAYED_WORK (&rt711->jack_btn_check_work, - rt711_btn_check_handler); -INIT_WORK (&rt711->calibration_work, rt711_calibration_work); +else schedule_work (&rt711->calibration_work); - }/* * if set_jack callback occurred early than io_init,
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 26/41 irqchip: or1k-pic: Undefine mask_ack for level triggered hardware
In reply to Sasha LevinFrom: Stafford Horne <[email protected]>
[ Upstream commit 8520501346ed8d1c4a6dfa751cb57328a9c843f1 ]
The mask_ack operation clears the interrupt by writing to the PICSR register. This we don't want for level triggered interrupt because it does not actually clear the interrupt on the source hardware.
This was causing issues in qemu with multi core setups where interrupts would continue to fire even though they had been cleared in PICSR.
Just remove the mask_ack operation.
--- drivers/irqchip/irq-or1k-pic.c | 1 - 1 file changed, 1 deletion(-)
drivers/irqchip/irq-or1k-pic.c +0 -1
@@ -66,7 +66,6 @@ static struct or1k_pic_dev or1k_pic_level = { .name = "or1k-PIC-level", .irq_unmask = or1k_pic_unmask, .irq_mask = or1k_pic_mask, - .irq_mask_ack = or1k_pic_mask_ack, }, .handle = handle_level_irq, .flags = IRQ_LEVEL | IRQ_NOPROBE,
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 16/41 ASoC: rockchip: i2s: switch BCLK to GPIO
In reply to Sasha LevinFrom: Judy Hsiao <[email protected]>
[ Upstream commit a5450aba737dae3ee1a64b282e609d8375d6700c ]
We discoverd that the state of BCLK on, LRCLK off and SD_MODE on may cause the speaker melting issue. Removing LRCLK while BCLK is present can cause unexpected output behavior including a large DC output voltage as described in the Max98357a datasheet.
In order to:
1. prevent BCLK from turning on by other component.
2. keep BCLK and LRCLK being present at the same time
This patch switches BCLK to GPIO func before LRCLK output, and configures BCLK func back during LRCLK is output.
Without this fix, BCLK is turned on 11 ms earlier than LRCK by the da7219.
With this fix, BCLK is turned on only 0.4 ms earlier than LRCK by the rockchip codec.
--- sound/soc/rockchip/rockchip_i2s.c | 160 ++++++++++++++++++++++++------ 1 file changed, 129 insertions(+), 31 deletions(-)
sound/soc/rockchip/rockchip_i2s.c +129 -31
@@ -13,6 +13,7 @@#include <linux/of_gpio.h> #include <linux/of_device.h> #include <linux/clk.h> +#include <linux/pinctrl/consumer.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/spinlock.h>
@@ -54,8 +55,40 @@ struct rk_i2s_dev {const struct rk_i2s_pins *pins;unsigned int bclk_ratio;spinlock_t lock;/* tx/rx lock */ +struct pinctrl *pinctrl; +struct pinctrl_state *bclk_on; +struct pinctrl_state *bclk_off; }; +static int i2s_pinctrl_select_bclk_on (struct rk_i2s_dev *i2s) +{ +int ret =0 ; + +if (!IS_ERR (i2s->pinctrl) && !IS_ERR_OR_NULL (i2s->bclk_on)) + ret =pinctrl_select_state (i2s->pinctrl, + i2s->bclk_on); + +if (ret) +dev_err (i2s->dev,"bclk enable failed %d\n" , ret); + +return ret; +} + +static int i2s_pinctrl_select_bclk_off (struct rk_i2s_dev *i2s) +{ + +int ret =0 ; + +if (!IS_ERR (i2s->pinctrl) && !IS_ERR_OR_NULL (i2s->bclk_off)) + ret =pinctrl_select_state (i2s->pinctrl, + i2s->bclk_off); + +if (ret) +dev_err (i2s->dev,"bclk disable failed %d\n" , ret); + +return ret; +} +static int i2s_runtime_suspend (struct device *dev) {struct rk_i2s_dev *i2s =dev_get_drvdata (dev);
@@ -92,38 +125,49 @@ static inline struct rk_i2s_dev *to_info(struct snd_soc_dai *dai)return snd_soc_dai_get_drvdata (dai); } -static void rockchip_snd_txctrl (struct rk_i2s_dev *i2s,int on) +static int rockchip_snd_txctrl (struct rk_i2s_dev *i2s,int on) {unsigned int val =0 ;int retry =10 ; +int ret =0 ;spin_lock (&i2s->lock);if (on) { -regmap_update_bits (i2s->regmap,I2S_DMACR , -I2S_DMACR_TDE_ENABLE ,I2S_DMACR_TDE_ENABLE ); + ret =regmap_update_bits (i2s->regmap,I2S_DMACR , +I2S_DMACR_TDE_ENABLE ,I2S_DMACR_TDE_ENABLE ); +if (ret <0 ) + goto end; -regmap_update_bits (i2s->regmap,I2S_XFER , -I2S_XFER_TXS_START |I2S_XFER_RXS_START , -I2S_XFER_TXS_START |I2S_XFER_RXS_START ); + ret =regmap_update_bits (i2s->regmap,I2S_XFER , +I2S_XFER_TXS_START |I2S_XFER_RXS_START , +I2S_XFER_TXS_START |I2S_XFER_RXS_START ); +if (ret <0 ) + goto end; i2s->tx_start = true; }else { i2s->tx_start = false; -regmap_update_bits (i2s->regmap,I2S_DMACR , -I2S_DMACR_TDE_ENABLE ,I2S_DMACR_TDE_DISABLE ); + ret =regmap_update_bits (i2s->regmap,I2S_DMACR , +I2S_DMACR_TDE_ENABLE ,I2S_DMACR_TDE_DISABLE ); +if (ret <0 ) + goto end;if (!i2s->rx_start) { -regmap_update_bits (i2s->regmap,I2S_XFER , -I2S_XFER_TXS_START | -I2S_XFER_RXS_START , -I2S_XFER_TXS_STOP | -I2S_XFER_RXS_STOP ); + ret =regmap_update_bits (i2s->regmap,I2S_XFER , +I2S_XFER_TXS_START | +I2S_XFER_RXS_START , +I2S_XFER_TXS_STOP | +I2S_XFER_RXS_STOP ); +if (ret <0 ) + goto end;udelay (150 ); -regmap_update_bits (i2s->regmap,I2S_CLR , -I2S_CLR_TXC |I2S_CLR_RXC , -I2S_CLR_TXC |I2S_CLR_RXC ); + ret =regmap_update_bits (i2s->regmap,I2S_CLR , +I2S_CLR_TXC |I2S_CLR_RXC , +I2S_CLR_TXC |I2S_CLR_RXC ); +if (ret <0 ) + goto end;regmap_read (i2s->regmap,I2S_CLR , &val);
@@ -138,44 +182,57 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) } } } +end:spin_unlock (&i2s->lock); +if (ret <0 ) +dev_err (i2s->dev,"lrclk update failed\n" ); + +return ret; } -static void rockchip_snd_rxctrl (struct rk_i2s_dev *i2s,int on) +static int rockchip_snd_rxctrl (struct rk_i2s_dev *i2s,int on) {unsigned int val =0 ;int retry =10 ; +int ret =0 ;spin_lock (&i2s->lock);if (on) { -regmap_update_bits (i2s->regmap,I2S_DMACR , + ret =regmap_update_bits (i2s->regmap,I2S_DMACR ,I2S_DMACR_RDE_ENABLE ,I2S_DMACR_RDE_ENABLE ); +if (ret <0 ) + goto end; -regmap_update_bits (i2s->regmap,I2S_XFER , + ret =regmap_update_bits (i2s->regmap,I2S_XFER ,I2S_XFER_TXS_START |I2S_XFER_RXS_START ,I2S_XFER_TXS_START |I2S_XFER_RXS_START ); +if (ret <0 ) + goto end; i2s->rx_start = true; }else { i2s->rx_start = false; -regmap_update_bits (i2s->regmap,I2S_DMACR , + ret =regmap_update_bits (i2s->regmap,I2S_DMACR ,I2S_DMACR_RDE_ENABLE ,I2S_DMACR_RDE_DISABLE ); +if (ret <0 ) + goto end;if (!i2s->tx_start) { -regmap_update_bits (i2s->regmap,I2S_XFER , + ret =regmap_update_bits (i2s->regmap,I2S_XFER ,I2S_XFER_TXS_START |I2S_XFER_RXS_START ,I2S_XFER_TXS_STOP |I2S_XFER_RXS_STOP ); - +if (ret <0 ) + goto end;udelay (150 ); -regmap_update_bits (i2s->regmap,I2S_CLR , + ret =regmap_update_bits (i2s->regmap,I2S_CLR ,I2S_CLR_TXC |I2S_CLR_RXC ,I2S_CLR_TXC |I2S_CLR_RXC ); - +if (ret <0 ) + goto end;regmap_read (i2s->regmap,I2S_CLR , &val); -/* Should wait for clear operation to finish */ while (val) {regmap_read (i2s->regmap,I2S_CLR , &val);
@@ -187,7 +244,12 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) } } } +end:spin_unlock (&i2s->lock); +if (ret <0 ) +dev_err (i2s->dev,"lrclk update failed\n" ); + +return ret; } static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
@@ -425,17 +487,26 @@ static int rockchip_i2s_trigger(struct snd_pcm_substream *substream,case SNDRV_PCM_TRIGGER_RESUME :case SNDRV_PCM_TRIGGER_PAUSE_RELEASE :if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE ) -rockchip_snd_rxctrl (i2s,1 ); + ret =rockchip_snd_rxctrl (i2s,1 );else -rockchip_snd_txctrl (i2s,1 ); + ret =rockchip_snd_txctrl (i2s,1 ); +/* Do not turn on bclk if lrclk open fails. */ +if (ret <0 ) +return ret; +i2s_pinctrl_select_bclk_on (i2s);break ;case SNDRV_PCM_TRIGGER_SUSPEND :case SNDRV_PCM_TRIGGER_STOP :case SNDRV_PCM_TRIGGER_PAUSE_PUSH : -if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE ) -rockchip_snd_rxctrl (i2s,0 ); -else -rockchip_snd_txctrl (i2s,0 ); +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE ) { +if (!i2s->tx_start) +i2s_pinctrl_select_bclk_off (i2s); + ret =rockchip_snd_rxctrl (i2s,0 ); + }else { +if (!i2s->rx_start) +i2s_pinctrl_select_bclk_off (i2s); + ret =rockchip_snd_txctrl (i2s,0 ); + }break ;default : ret = -EINVAL ;
@@ -736,6 +807,33 @@ static int rockchip_i2s_probe(struct platform_device *pdev) } i2s->bclk_ratio =64 ; + i2s->pinctrl =devm_pinctrl_get (&pdev->dev); +if (IS_ERR (i2s->pinctrl)) +dev_err (&pdev->dev,"failed to find i2s pinctrl\n" ); + + i2s->bclk_on =pinctrl_lookup_state (i2s->pinctrl, +"bclk_on" ); +if (IS_ERR_OR_NULL (i2s->bclk_on)) +dev_err (&pdev->dev,"failed to find i2s default state\n" ); +else +dev_dbg (&pdev->dev,"find i2s bclk state\n" ); + + i2s->bclk_off =pinctrl_lookup_state (i2s->pinctrl, +"bclk_off" ); +if (IS_ERR_OR_NULL (i2s->bclk_off)) +dev_err (&pdev->dev,"failed to find i2s gpio state\n" ); +else +dev_dbg (&pdev->dev,"find i2s bclk_off state\n" ); + +i2s_pinctrl_select_bclk_off (i2s); + + i2s->playback_dma_data.addr = res->start +I2S_TXDR ; + i2s->playback_dma_data.addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; + i2s->playback_dma_data.maxburst =4 ; + + i2s->capture_dma_data.addr = res->start +I2S_RXDR ; + i2s->capture_dma_data.addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; + i2s->capture_dma_data.maxburst =4 ;dev_set_drvdata (&pdev->dev, i2s);
Signature · 7 lines
2.35.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Sasha Levin
maintainerPATCH 36/41 nvme-pci: phison e16 has bogus namespace ids
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit 73029c9b23cf1213e5f54c2b59efce08665199e7 ]
Add the quirk.
--- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +2 -1
@@ -3432,7 +3432,8 @@ static const struct pci_device_id nvme_id_table[] = {NVME_QUIRK_DISABLE_WRITE_ZEROES | NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE(0x1987, 0x5016), /* Phison E16 */ - .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, }, + .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN | + NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1b4b, 0x1092), /* Lexar 256 GB SSD */ .driver_data = NVME_QUIRK_NO_NS_DESC_LIST | NVME_QUIRK_IGNORE_DEV_SUBNQN, },
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 9/41 ASoC: SOF: Intel: hda-dsp: Expose hda_dsp_core_power_up()
In reply to Sasha LevinFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit 08f8a93198e300dff9649bbae424cd805d313326 ]
The hda_dsp_core_power_up() needs to be exposed so that it can be used in hda-loader.c to correct the boot flow.
The first step must not unstall the core, it should only power up the core(s).
Add sanity check for the core_mask while exposing it to be safe.
Complements: 2a68ff846164 ("ASoC: SOF: Intel: hda: Revisit IMR boot sequence")
--- sound/soc/sof/intel/hda-dsp.c | 10 +++++++++- sound/soc/sof/intel/hda.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-)
sound/soc/sof/intel/hda-dsp.c +9 -1
@@ -181,12 +181,20 @@ int hda_dsp_core_run(struct snd_sof_dev *sdev, unsigned int core_mask)* Power Management. */ -static int hda_dsp_core_power_up (struct snd_sof_dev *sdev,unsigned int core_mask) +int hda_dsp_core_power_up (struct snd_sof_dev *sdev,unsigned int core_mask) { +struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata; +const struct sof_intel_dsp_desc *chip = hda->desc;unsigned int cpa;u32 adspcs;int ret; +/* restrict core_mask to host managed cores mask */ + core_mask &= chip->host_managed_cores_mask; +/* return if core_mask is not valid */ +if (!core_mask) +return 0 ; +/* update bits */ snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPCS, HDA_DSP_ADSPCS_SPA_MASK(core_mask),
sound/soc/sof/intel/hda.h +1 -0
@@ -490,6 +490,7 @@ struct sof_intel_hda_stream {*/ int hda_dsp_probe (struct snd_sof_dev *sdev);int hda_dsp_remove (struct snd_sof_dev *sdev); +int hda_dsp_core_power_up (struct snd_sof_dev *sdev,unsigned int core_mask);int hda_dsp_core_run (struct snd_sof_dev *sdev,unsigned int core_mask);int hda_dsp_enable_core (struct snd_sof_dev *sdev,unsigned int core_mask); int hda_dsp_core_reset_power_down(struct snd_sof_dev *sdev,
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 28/41 x86/xen: Use clear_bss() for Xen PV guests
In reply to Sasha LevinFrom: Juergen Gross <[email protected]>
[ Upstream commit 96e8fc5818686d4a1591bb6907e7fdb64ef29884 ]
Instead of clearing the bss area in assembly code, use the clear_bss() function.
This requires to pass the start_info address as parameter to xen_start_kernel() in order to avoid the xen_start_info being zeroed again.
--- arch/x86/include/asm/setup.h | 3 +++ arch/x86/kernel/head64.c | 2 +- arch/x86/xen/enlighten_pv.c | 8 ++++++-- arch/x86/xen/xen-head.S | 10 +--------- 4 files changed, 11 insertions(+), 12 deletions(-)
arch/x86/include/asm/setup.h +3 -0
@@ -132,6 +132,9 @@ void *extend_brk(size_t size, size_t align); }extern void probe_roms (void ); + +void clear_bss (void ); +#ifdef __i386__ asmlinkage void __init i386_start_kernel(void);
arch/x86/kernel/head64.c +1 -1
@@ -421,7 +421,7 @@ void __init do_early_exception(struct pt_regs *regs, int trapnr)/* Don't add a printk in there. printk relies on the PDA which is not initialized yet. */ -static void __init clear_bss (void ) +void __init clear_bss (void ) {memset (__bss_start,0 , (unsigned long ) __bss_stop - (unsigned long ) __bss_start);
arch/x86/xen/enlighten_pv.c +6 -2
@@ -1183,15 +1183,19 @@ static void __init xen_domu_set_legacy_features(void)extern void early_xen_iret_patch (void );/* First C function to be called on Xen boot */ -asmlinkage __visible void __init xen_start_kernel(void) +asmlinkage __visible void __init xen_start_kernel(struct start_info *si) {struct physdev_set_iopl set_iopl;unsigned long initrd_start =0 ;int rc; -if (!xen_start_info) +if (!si)return ; +clear_bss (); + + xen_start_info = si; +__text_gen_insn (&early_xen_iret_patch,JMP32_INSN_OPCODE , &early_xen_iret_patch, &xen_iret,JMP32_INSN_SIZE );
arch/x86/xen/xen-head.S +1 -9
@@ -48,15 +48,6 @@ SYM_CODE_START(startup_xen) ANNOTATE_NOENDBR cld - /* Clear .bss */ - xor %eax,%eax - mov $__bss_start, %rdi - mov $__bss_stop, %rcx - sub %rdi, %rcx - shr $3, %rcx - rep stosq - - mov %rsi, xen_start_info mov initial_stack(%rip), %rsp /* Set up %gs.
@@ -71,6 +62,7 @@ SYM_CODE_START(startup_xen) cdq wrmsr + mov %rsi, %rdi call xen_start_kernel SYM_CODE_END(startup_xen) __FINIT
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 37/41 nvme: use struct group for generic command dwords
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit 5c629dc9609dc43492a7bc8060cc6120875bf096 ]
This will allow the trace event to know the full size of the data intended to be copied and silence read overflow checks.
--- drivers/nvme/host/trace.h | 2 +- include/linux/nvme.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/nvme/host/trace.h +1 -1
@@ -69,7 +69,7 @@ TRACE_EVENT(nvme_setup_cmd, __entry->metadata = !!blk_integrity_rq (req); __entry->fctype = cmd->fabrics.fctype;__assign_disk_name (__entry->disk, req->q->disk); -memcpy (__entry->cdw10, &cmd->common.cdw10, +memcpy (__entry->cdw10, &cmd->common.cdws,sizeof (__entry->cdw10)); ), TP_printk("nvme%d: %sqid=%d, cmdid=%u, nsid=%u, flags=0x%x, meta=0x%x, cmd=(%s %s)",
include/linux/nvme.h +2 -0
@@ -867,12 +867,14 @@ struct nvme_common_command {__le32 cdw2[2 ];__le64 metadata;union nvme_data_ptr dptr; +struct_group (cdws, __le32 cdw10; __le32 cdw11; __le32 cdw12; __le32 cdw13; __le32 cdw14; __le32 cdw15; + ); };struct nvme_rw_command {
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 10/41 ASoC: SOF: Intel: hda-loader: Make sure that the fw load sequence is followed
In reply to Sasha LevinFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit c31691e0d126ec5d60d2b6b03f699c11b613b219 ]
The hda_dsp_enable_core() is powering up _and_ unstall the core in one call while the first step of the firmware loading must not unstall the core.
The core can be unstalled only after the set cpb_cfp and the configuration of the IPC register for the ROM_CONTROL message.
Complements: 2a68ff846164 ("ASoC: SOF: Intel: hda: Revisit IMR boot sequence")
--- sound/soc/sof/intel/hda-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/intel/hda-loader.c +1 -1
@@ -112,7 +112,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag)int ret;/* step 1: power up corex */ - ret =hda_dsp_enable_core (sdev, chip->host_managed_cores_mask); + ret =hda_dsp_core_power_up (sdev, chip->host_managed_cores_mask);if (ret <0 ) {if (hda->boot_iteration ==HDA_FW_BOOT_ATTEMPTS )dev_err (sdev->dev,"error: dsp core 0/1 power up failed\n" );
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 38/41 wireguard: selftests: set fake real time in init
In reply to Sasha LevinFrom: "Jason A. Donenfeld" <[email protected]>
[ Upstream commit 829be057dbc1e71383b8d7de8edb31dcf07b4aa0 ]
Not all platforms have an RTC, and rather than trying to force one into each, it's much easier to just set a fixed time. This is necessary because WireGuard's latest handshakes parameter is returned in wallclock time, and if the system time isn't set, and the system is really fast, then this returns 0, which trips the test.
Turning this on requires setting CONFIG_COMPAT_32BIT_TIME=y, as musl doesn't support settimeofday without it.
--- .../testing/selftests/wireguard/qemu/arch/arm.config | 1 + .../selftests/wireguard/qemu/arch/armeb.config | 1 + .../testing/selftests/wireguard/qemu/arch/i686.config | 1 + .../testing/selftests/wireguard/qemu/arch/m68k.config | 1 + .../testing/selftests/wireguard/qemu/arch/mips.config | 1 + .../selftests/wireguard/qemu/arch/mipsel.config | 1 + .../selftests/wireguard/qemu/arch/powerpc.config | 1 + tools/testing/selftests/wireguard/qemu/init.c | 11 +++++++++++ 8 files changed, 18 insertions(+)
tools/testing/selftests/wireguard/qemu/arch/arm.config +1 -0
@@ -7,6 +7,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_CONSOLE=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1 panic_on_warn=1" CONFIG_FRAME_WARN=1024
tools/testing/selftests/wireguard/qemu/arch/armeb.config +1 -0
@@ -7,6 +7,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_CONSOLE=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1 panic_on_warn=1" CONFIG_CPU_BIG_ENDIAN=y
tools/testing/selftests/wireguard/qemu/arch/i686.config +1 -0
@@ -1,6 +1,7 @@ CONFIG_ACPI=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1024
tools/testing/selftests/wireguard/qemu/arch/m68k.config +1 -0
@@ -5,5 +5,6 @@ CONFIG_MAC=y CONFIG_SERIAL_PMACZILOG=y CONFIG_SERIAL_PMACZILOG_TTYS=y CONFIG_SERIAL_PMACZILOG_CONSOLE=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1024
tools/testing/selftests/wireguard/qemu/arch/mips.config +1 -0
@@ -6,6 +6,7 @@ CONFIG_POWER_RESET=y CONFIG_POWER_RESET_SYSCON=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1024
tools/testing/selftests/wireguard/qemu/arch/mipsel.config +1 -0
@@ -7,6 +7,7 @@ CONFIG_POWER_RESET=y CONFIG_POWER_RESET_SYSCON=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1024
tools/testing/selftests/wireguard/qemu/arch/powerpc.config +1 -0
@@ -4,6 +4,7 @@ CONFIG_PPC_85xx=y CONFIG_PHYS_64BIT=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_MATH_EMULATION=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1"
tools/testing/selftests/wireguard/qemu/init.c +11 -0
@@ -11,6 +11,7 @@#include <stdlib.h> #include <stdbool.h> #include <fcntl.h> +#include <time.h> #include <sys/wait.h> #include <sys/mount.h> #include <sys/stat.h>
@@ -67,6 +68,15 @@ static void seed_rng(void)close (fd); } +static void set_time (void ) +{ +if (time (NULL )) +return ; +pretty_message ("[+] Setting fake time..." ); +if (stime (&(time_t ){1433512680 }) <0 ) +panic ("settimeofday()" ); +} +static void mount_filesystems (void ) {pretty_message ("[+] Mounting filesystems..." );
@@ -256,6 +266,7 @@ int main(int argc, char *argv[])print_banner ();mount_filesystems ();seed_rng (); +set_time ();kmod_selftests ();enable_logging ();clear_leaks ();
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 11/41 ASoC: SOF: Intel: hda-loader: Clarify the cl_dsp_init() flow
In reply to Sasha LevinFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit bbfef046c6613404c01aeb9e9928bebb78dd327a ]
Update the comment for the cl_dsp_init() to clarify what is done by the function and use the chip->init_core_mask instead of BIT(0) when unstalling/running the init core.
Complements: 2a68ff846164 ("ASoC: SOF: Intel: hda: Revisit IMR boot sequence")
--- sound/soc/sof/intel/hda-loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/sof/intel/hda-loader.c +4 -4
@@ -97,9 +97,9 @@ static struct hdac_ext_stream *cl_stream_prepare(struct snd_sof_dev *sdev, unsig }/* -* first boot sequence has some extra steps. core 0 waits for power -* status on core 1, so power up core 1 also momentarily, keep it in -* reset/stall and then turn it off +* first boot sequence has some extra steps. +* power on all host managed cores and only unstall/run the boot core to boot the +* DSP then turn off all non boot cores (if any) is powered on. */ static int cl_dsp_init (struct snd_sof_dev *sdev,int stream_tag) {
@@ -127,7 +127,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag) ((stream_tag - 1) << 9)));/* step 3: unset core 0 reset state & unstall/run core 0 */ - ret =hda_dsp_core_run (sdev,BIT (0 )); + ret =hda_dsp_core_run (sdev, chip->init_core_mask);if (ret <0 ) {if (hda->boot_iteration ==HDA_FW_BOOT_ATTEMPTS ) dev_err(sdev->dev,
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 39/41 wireguard: selftests: use virt machine on m68k
In reply to Sasha LevinFrom: "Jason A. Donenfeld" <[email protected]>
[ Upstream commit 1f2f341a62639c7066ee4c76b7d9ebe867e0a1d5 ]
This should be a bit more stable hopefully.
--- tools/testing/selftests/wireguard/qemu/Makefile | 5 +++-- tools/testing/selftests/wireguard/qemu/arch/m68k.config | 9 +++------ 2 files changed, 6 insertions(+), 8 deletions(-)
tools/testing/selftests/wireguard/qemu/Makefile +3 -2
@@ -210,10 +210,11 @@ QEMU_ARCH := m68k KERNEL_ARCH := m68k KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux KERNEL_CMDLINE := $(shell sed -n 's/CONFIG_CMDLINE=\(.*\)/\1/p' arch/m68k.config) +QEMU_VPORT_RESULT := virtio-serial-device ifeq ($(HOST_ARCH),$(ARCH)) -QEMU_MACHINE := -cpu host,accel=kvm -machine q800 -append $(KERNEL_CMDLINE) +QEMU_MACHINE := -cpu host,accel=kvm -machine virt -append $(KERNEL_CMDLINE) else -QEMU_MACHINE := -machine q800 -smp 1 -append $(KERNEL_CMDLINE) +QEMU_MACHINE := -machine virt -smp 1 -append $(KERNEL_CMDLINE) endif else ifeq ($(ARCH),riscv64) CHOST := riscv64-linux-musl
tools/testing/selftests/wireguard/qemu/arch/m68k.config +3 -6
@@ -1,10 +1,7 @@ CONFIG_MMU=y +CONFIG_VIRT=y CONFIG_M68KCLASSIC=y -CONFIG_M68040=y -CONFIG_MAC=y -CONFIG_SERIAL_PMACZILOG=y -CONFIG_SERIAL_PMACZILOG_TTYS=y -CONFIG_SERIAL_PMACZILOG_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y CONFIG_COMPAT_32BIT_TIME=y -CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" +CONFIG_CMDLINE="console=ttyGF0 wg.success=vport0p1 panic_on_warn=1" CONFIG_FRAME_WARN=1024
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 40/41 wireguard: selftests: always call kernel makefile
In reply to Sasha LevinFrom: "Jason A. Donenfeld" <[email protected]>
[ Upstream commit 1a087eec257154e26a81a7a0a15380d7a2431765 ]
These selftests are used for much more extensive changes than just the wireguard source files. So always call the kernel's build file, which will do something or nothing after checking the whole tree, per usual.
--- tools/testing/selftests/wireguard/qemu/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/testing/selftests/wireguard/qemu/Makefile +2 -3
@@ -19,8 +19,6 @@ endif MIRROR := https://download.wireguard.com/qemu-test/distfiles/ KERNEL_BUILD_PATH := $(BUILD_PATH)/kernel$(if $(findstring yes,$(DEBUG_KERNEL)),-debug) -rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) -WIREGUARD_SOURCES := $(call rwildcard,$(KERNEL_PATH)/drivers/net/wireguard/,*) default: qemu
@@ -325,8 +323,9 @@ $(KERNEL_BUILD_PATH)/.config: $(TOOLCHAIN_PATH)/.installed kernel.config arch/$( cd $(KERNEL_BUILD_PATH) && ARCH=$(KERNEL_ARCH) $(KERNEL_PATH)/scripts/kconfig/merge_config.sh -n $(KERNEL_BUILD_PATH)/.config $(KERNEL_BUILD_PATH)/minimal.config $(if $(findstring yes,$(DEBUG_KERNEL)),cp debug.config $(KERNEL_BUILD_PATH) && cd $(KERNEL_BUILD_PATH) && ARCH=$(KERNEL_ARCH) $(KERNEL_PATH)/scripts/kconfig/merge_config.sh -n $(KERNEL_BUILD_PATH)/.config debug.config,) -$(KERNEL_BZIMAGE): $(TOOLCHAIN_PATH)/.installed $(KERNEL_BUILD_PATH)/.config $(BUILD_PATH)/init-cpio-spec.txt $(IPERF_PATH)/src/iperf3 $(IPUTILS_PATH)/ping $(BASH_PATH)/bash $(IPROUTE2_PATH)/misc/ss $(IPROUTE2_PATH)/ip/ip $(IPTABLES_PATH)/iptables/xtables-legacy-multi $(NMAP_PATH)/ncat/ncat $(WIREGUARD_TOOLS_PATH)/src/wg $(BUILD_PATH)/init ../netns.sh $(WIREGUARD_SOURCES) +$(KERNEL_BZIMAGE): $(TOOLCHAIN_PATH)/.installed $(KERNEL_BUILD_PATH)/.config $(BUILD_PATH)/init-cpio-spec.txt $(IPERF_PATH)/src/iperf3 $(IPUTILS_PATH)/ping $(BASH_PATH)/bash $(IPROUTE2_PATH)/misc/ss $(IPROUTE2_PATH)/ip/ip $(IPTABLES_PATH)/iptables/xtables-legacy-multi $(NMAP_PATH)/ncat/ncat $(WIREGUARD_TOOLS_PATH)/src/wg $(BUILD_PATH)/init $(MAKE) -C $(KERNEL_PATH) O=$(KERNEL_BUILD_PATH) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) +.PHONY: $(KERNEL_BZIMAGE) $(TOOLCHAIN_PATH)/$(CHOST)/include/linux/.installed: | $(KERNEL_BUILD_PATH)/.config $(TOOLCHAIN_PATH)/.installed rm -rf $(TOOLCHAIN_PATH)/$(CHOST)/include/linux
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 27/41 pinctrl: imx: Add the zero base flag for imx93
In reply to Sasha LevinFrom: Jacky Bai <[email protected]>
[ Upstream commit fbc24ebc65507feb9728dc38197f90486148dda0 ]
On i.MX93, the pin mux reg offset is from 0x0, so need to add the 'ZERO_OFFSET_VALID' flag to make sure the pin at mux offset 0 can be found.
--- drivers/pinctrl/freescale/pinctrl-imx93.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/freescale/pinctrl-imx93.c +1 -0
@@ -239,6 +239,7 @@ static const struct pinctrl_pin_desc imx93_pinctrl_pads[] = {static const struct imx_pinctrl_soc_info imx93_pinctrl_info = { .pins = imx93_pinctrl_pads, .npins =ARRAY_SIZE (imx93_pinctrl_pads), + .flags =ZERO_OFFSET_VALID , .gpr_compatible ="fsl,imx93-iomuxc-gpr" , };
Signature · 7 lines
2.35.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 12/41 ASoC: wcd9335: Remove RX channel from old list before adding it to a new one
In reply to Sasha LevinFrom: Yassine Oudjana <[email protected]>
[ Upstream commit be6dd72edb216f20fc80e426ece9fe9b8aabf033 ]
Currently in slim_rx_mux_put, an RX channel gets added to a new list even if it is already in one. This can mess up links and make either it, the new list head, or both, get linked to the wrong entries. This can cause an entry to link to itself which in turn ends up making list_for_each_entry in other functions loop infinitely. To avoid issues, always remove the RX channel from any list it's in before adding it to a new list.
--- sound/soc/codecs/wcd9335.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/wcd9335.c +4 -1
@@ -1289,9 +1289,12 @@ static int slim_rx_mux_put(struct snd_kcontrol *kc, wcd->rx_port_value[port_id] = ucontrol->value.enumerated.item[0 ]; +/* Remove channel from any list it's in before adding it to a new one */ +list_del_init (&wcd->rx_chs[port_id].list); +switch (wcd->rx_port_value[port_id]) {case 0 : -list_del_init (&wcd->rx_chs[port_id].list); +/* Channel already removed from lists. Nothing to do here */ break ;case 1 : list_add_tail(&wcd->rx_chs[port_id].list,
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 13/41 ASoC: wcd9335: Fix spurious event generation
In reply to Sasha LevinFrom: Mark Brown <[email protected]>
[ Upstream commit a7786cbae4b2732815da98efa39df96746b5bd0d ]
The slimbus mux put operation unconditionally reports a change in value which means that spurious events are generated. Fix this by exiting early in that case.
--- sound/soc/codecs/wcd9335.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/codecs/wcd9335.c +3 -0
@@ -1287,6 +1287,9 @@ static int slim_rx_mux_put(struct snd_kcontrol *kc,struct snd_soc_dapm_update *update =NULL ;u32 port_id = w->shift; +if (wcd->rx_port_value[port_id] == ucontrol->value.enumerated.item[0 ]) +return 0 ; + wcd->rx_port_value[port_id] = ucontrol->value.enumerated.item[0 ];/* Remove channel from any list it's in before adding it to a new one */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 14/41 ASoC: wcd938x: Fix event generation for some controls
In reply to Sasha LevinFrom: Mark Brown <[email protected]>
[ Upstream commit 10e7ff0047921e32b919ecee7be706dd33c107f8 ]
Currently wcd938x_*_put() unconditionally report that the value of the control changed, resulting in spurious events being generated. Return 0 in that case instead as we should. There is still an issue in the compander control which is a bit more complex.
--- sound/soc/codecs/wcd938x.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
sound/soc/codecs/wcd938x.c +12 -0
@@ -2519,6 +2519,9 @@ static int wcd938x_tx_mode_put(struct snd_kcontrol *kcontrol,struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;int path = e->shift_l; +if (wcd938x->tx_mode[path] == ucontrol->value.enumerated.item[0 ]) +return 0 ; + wcd938x->tx_mode[path] = ucontrol->value.enumerated.item[0 ];return 1 ;
@@ -2541,6 +2544,9 @@ static int wcd938x_rx_hph_mode_put(struct snd_kcontrol *kcontrol,struct snd_soc_component *component =snd_soc_kcontrol_component (kcontrol);struct wcd938x_priv *wcd938x =snd_soc_component_get_drvdata (component); +if (wcd938x->hph_mode == ucontrol->value.enumerated.item[0 ]) +return 0 ; + wcd938x->hph_mode = ucontrol->value.enumerated.item[0 ];return 1 ;
@@ -2632,6 +2638,9 @@ static int wcd938x_ldoh_put(struct snd_kcontrol *kcontrol,struct snd_soc_component *component =snd_soc_kcontrol_component (kcontrol);struct wcd938x_priv *wcd938x =snd_soc_component_get_drvdata (component); +if (wcd938x->ldoh == ucontrol->value.integer.value[0 ]) +return 0 ; + wcd938x->ldoh = ucontrol->value.integer.value[0 ];return 1 ;
@@ -2654,6 +2663,9 @@ static int wcd938x_bcs_put(struct snd_kcontrol *kcontrol,struct snd_soc_component *component =snd_soc_kcontrol_component (kcontrol);struct wcd938x_priv *wcd938x =snd_soc_component_get_drvdata (component); +if (wcd938x->bcs_dis == ucontrol->value.integer.value[0 ]) +return 0 ; + wcd938x->bcs_dis = ucontrol->value.integer.value[0 ];return 1 ;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 15/41 ASoC: Intel: bytcr_wm5102: Fix GPIO related probe-ordering problem
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 4e07479eab8a044cc9542414ccb4aeb8eb033bde ]
The "wlf,spkvdd-ena" GPIO needed by the bytcr_wm5102 driver is made available through a gpio-lookup table.
This gpio-lookup table is registered by drivers/mfd/arizona-spi.c, which may get probed after the bytcr_wm5102 driver.
If the gpio-lookup table has not registered yet then the gpiod_get() will return -ENOENT. Treat -ENOENT as -EPROBE_DEFER to still keep things working in this case.
--- sound/soc/intel/boards/bytcr_wm5102.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
sound/soc/intel/boards/bytcr_wm5102.c +11 -2
@@ -421,8 +421,17 @@ static int snd_byt_wm5102_mc_probe(struct platform_device *pdev) priv->spkvdd_en_gpio =gpiod_get (codec_dev,"wlf,spkvdd-ena" ,GPIOD_OUT_LOW );put_device (codec_dev); -if (IS_ERR (priv->spkvdd_en_gpio)) -return dev_err_probe (dev,PTR_ERR (priv->spkvdd_en_gpio),"getting spkvdd-GPIO\n" ); +if (IS_ERR (priv->spkvdd_en_gpio)) { + ret =PTR_ERR (priv->spkvdd_en_gpio); +/* +* The spkvdd gpio-lookup is registered by: drivers/mfd/arizona-spi.c, +* so -ENOENT means that arizona-spi hasn't probed yet. +*/ +if (ret == -ENOENT ) + ret = -EPROBE_DEFER ; + +return dev_err_probe (dev, ret,"getting spkvdd-GPIO\n" ); + }/* override platform name, if required */ byt_wm5102_card.dev = dev;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 17/41 ASoC: wm_adsp: Fix event for preloader
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit 9896c029f0df628c6cb108253d09b1d61f1d4a88 ]
The preloader controls on ADSP should return a value of 1 if the preloader value was changed, update to correct this.
--- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +1 -1
@@ -997,7 +997,7 @@ int wm_adsp2_preloader_put(struct snd_kcontrol *kcontrol,snd_soc_dapm_sync (dapm); } -return 0 ; +return 1 ; }EXPORT_SYMBOL_GPL (wm_adsp2_preloader_put);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 18/41 ASoC: wm5110: Fix DRE control
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit 0bc0ae9a5938d512fd5d44f11c9c04892dcf4961 ]
The DRE controls on wm5110 should return a value of 1 if the DRE state is actually changed, update to fix this.
--- sound/soc/codecs/wm5110.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/soc/codecs/wm5110.c +6 -2
@@ -413,6 +413,7 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol,unsigned int rnew = (!!ucontrol->value.integer.value[1 ]) << mc->rshift;unsigned int lold, rold;unsigned int lena, rena; +bool change = false;int ret;snd_soc_dapm_mutex_lock (dapm);
@@ -440,8 +441,8 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol, goto err; } - ret =regmap_update_bits (arizona->regmap,ARIZONA_DRE_ENABLE , - mask, lnew | rnew); + ret =regmap_update_bits_check (arizona->regmap,ARIZONA_DRE_ENABLE , + mask, lnew | rnew, &change);if (ret) {dev_err (arizona->dev,"Failed to set DRE: %d\n" , ret); goto err;
@@ -454,6 +455,9 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol,if (!rnew && rold)wm5110_clear_pga_volume (arizona, mc->rshift); +if (change) + ret =1 ; + err:snd_soc_dapm_mutex_unlock (dapm);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 19/41 ASoC: cs35l41: Correct some control names
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit c6a5f22f9b4fd5f21414be690ce34046d9712f05 ]
Various boolean controls on cs35l41 are missing the required "Switch" in the name, add these.
--- sound/soc/codecs/cs35l41.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/soc/codecs/cs35l41.c +6 -6
@@ -392,7 +392,7 @@ static const struct snd_kcontrol_new cs35l41_aud_controls[] = {SOC_SINGLE ("HW Noise Gate Enable" ,CS35L41_NG_CFG ,8 ,63 ,0 ),SOC_SINGLE ("HW Noise Gate Delay" ,CS35L41_NG_CFG ,4 ,7 ,0 ),SOC_SINGLE ("HW Noise Gate Threshold" ,CS35L41_NG_CFG ,0 ,7 ,0 ), -SOC_SINGLE ("Aux Noise Gate CH1 Enable" , +SOC_SINGLE ("Aux Noise Gate CH1 Switch" ,CS35L41_MIXER_NGATE_CH1_CFG ,16 ,1 ,0 ),SOC_SINGLE ("Aux Noise Gate CH1 Entry Delay" , CS35L41_MIXER_NGATE_CH1_CFG, 8, 15, 0),
@@ -400,15 +400,15 @@ static const struct snd_kcontrol_new cs35l41_aud_controls[] = { CS35L41_MIXER_NGATE_CH1_CFG, 0, 7, 0),SOC_SINGLE ("Aux Noise Gate CH2 Entry Delay" ,CS35L41_MIXER_NGATE_CH2_CFG ,8 ,15 ,0 ), -SOC_SINGLE ("Aux Noise Gate CH2 Enable" , +SOC_SINGLE ("Aux Noise Gate CH2 Switch" ,CS35L41_MIXER_NGATE_CH2_CFG ,16 ,1 ,0 ),SOC_SINGLE ("Aux Noise Gate CH2 Threshold" ,CS35L41_MIXER_NGATE_CH2_CFG ,0 ,7 ,0 ), -SOC_SINGLE ("SCLK Force" ,CS35L41_SP_FORMAT ,CS35L41_SCLK_FRC_SHIFT ,1 ,0 ), -SOC_SINGLE ("LRCLK Force" ,CS35L41_SP_FORMAT ,CS35L41_LRCLK_FRC_SHIFT ,1 ,0 ), -SOC_SINGLE ("Invert Class D" ,CS35L41_AMP_DIG_VOL_CTRL , +SOC_SINGLE ("SCLK Force Switch" ,CS35L41_SP_FORMAT ,CS35L41_SCLK_FRC_SHIFT ,1 ,0 ), +SOC_SINGLE ("LRCLK Force Switch" ,CS35L41_SP_FORMAT ,CS35L41_LRCLK_FRC_SHIFT ,1 ,0 ), +SOC_SINGLE ("Invert Class D Switch" ,CS35L41_AMP_DIG_VOL_CTRL ,CS35L41_AMP_INV_PCM_SHIFT ,1 ,0 ), -SOC_SINGLE ("Amp Gain ZC" ,CS35L41_AMP_GAIN_CTRL , +SOC_SINGLE ("Amp Gain ZC Switch" ,CS35L41_AMP_GAIN_CTRL ,CS35L41_AMP_GAIN_ZC_SHIFT ,1 ,0 ),WM_ADSP2_PRELOAD_SWITCH ("DSP1" ,1 ), WM_ADSP_FW_CONTROL("DSP1", 0),
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 20/41 ASoC: rt711-sdca: fix kernel NULL pointer dereference when IO error
In reply to Sasha LevinFrom: Shuming Fan <[email protected]>
[ Upstream commit 1df793d479bef546569fc2e409ff8bb3f0fb8e99 ]
The initial settings will be written before the codec probe function.
But, the rt711->component doesn't be assigned yet.
If IO error happened during initial settings operations, it will cause the kernel panic. This patch changed component->dev to slave->dev to fix this issue.
--- sound/soc/codecs/rt711-sdca.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rt711-sdca.c +2 -2
@@ -34,7 +34,7 @@ static int rt711_sdca_index_write(struct rt711_sdca_priv *rt711, ret =regmap_write (regmap, addr, value);if (ret <0 ) -dev_err (rt711->component->dev, +dev_err (&rt711->slave->dev,"Failed to set private value: %06x <= %04x ret=%d\n" , addr, value, ret);
@@ -50,7 +50,7 @@ static int rt711_sdca_index_read(struct rt711_sdca_priv *rt711, ret =regmap_read (regmap, addr, value);if (ret <0 ) -dev_err (rt711->component->dev, +dev_err (&rt711->slave->dev,"Failed to get private value: %06x => %04x ret=%d\n" , addr, *value, ret);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 21/41 ASoC: dapm: Initialise kcontrol data for mux/demux controls
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit 11d7a12f7f50baa5af9090b131c9b03af59503e7 ]
DAPM keeps a copy of the current value of mux/demux controls, however this value is only initialised in the case of autodisable controls. This leads to false notification events when first modifying a DAPM kcontrol that has a non-zero default.
Autodisable controls are left as they are, since they already initialise the value, and there would be more work required to support autodisable muxes where the first option isn't disabled and/or that isn't the default.
Technically this issue could affect mixer/switch elements as well, although not on any of the devices I am currently running. There is also a little more work to do to address the issue there due to that side supporting stereo controls, so that has not been tackled in this patch.
--- sound/soc/soc-dapm.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/soc-dapm.c +5 -0
@@ -62,6 +62,8 @@ struct snd_soc_dapm_widget * snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_widget *widget); +static unsigned int soc_dapm_read (struct snd_soc_dapm_context *dapm,int reg); +/* dapm power sequences - make this per codec in the future */ static int dapm_up_seq[] = { [snd_soc_dapm_pre] =1 ,
@@ -442,6 +444,9 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,snd_soc_dapm_add_path (widget->dapm, data->widget, widget,NULL ,NULL ); + }else if (e->reg !=SND_SOC_NOPM ) { + data->value =soc_dapm_read (widget->dapm, e->reg) & + (e->mask << e->shift_l); }break ;default :
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 22/41 ASoC: cs35l41: Add ASP TX3/4 source to register patch
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit 46b0d050c8c7df6dfb2c376aaa149bf2cfc5ca3e ]
The mixer controls for ASP TX3/4 are set to values that are not included in their enumeration control. This will cause spurious event notifications when the controls are first changed, as the register value changes whilst the actual visible enumeration value does not. Use the register patch to set them to a known value, zero, which equates to zero fill, thereby avoiding the spurious notifications.
--- sound/soc/codecs/cs35l41-lib.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
sound/soc/codecs/cs35l41-lib.c +8 -2
@@ -36,8 +36,8 @@ static const struct reg_default cs35l41_reg[] = { { CS35L41_DAC_PCM1_SRC, 0x00000008 }, { CS35L41_ASP_TX1_SRC, 0x00000018 }, { CS35L41_ASP_TX2_SRC, 0x00000019 }, - { CS35L41_ASP_TX3_SRC, 0x00000020 }, - { CS35L41_ASP_TX4_SRC, 0x00000021 }, + { CS35L41_ASP_TX3_SRC, 0x00000000 }, + { CS35L41_ASP_TX4_SRC, 0x00000000 }, { CS35L41_DSP1_RX1_SRC, 0x00000008 }, { CS35L41_DSP1_RX2_SRC, 0x00000009 }, { CS35L41_DSP1_RX3_SRC, 0x00000018 },
@@ -643,6 +643,8 @@ static const struct reg_sequence cs35l41_reva0_errata_patch[] = { { CS35L41_DSP1_XM_ACCEL_PL0_PRI, 0x00000000 }, { CS35L41_PWR_CTRL2, 0x00000000 }, { CS35L41_AMP_GAIN_CTRL, 0x00000000 }, + { CS35L41_ASP_TX3_SRC, 0x00000000 }, + { CS35L41_ASP_TX4_SRC, 0x00000000 }, }; static const struct reg_sequence cs35l41_revb0_errata_patch[] = {
@@ -654,6 +656,8 @@ static const struct reg_sequence cs35l41_revb0_errata_patch[] = { { CS35L41_DSP1_XM_ACCEL_PL0_PRI, 0x00000000 }, { CS35L41_PWR_CTRL2, 0x00000000 }, { CS35L41_AMP_GAIN_CTRL, 0x00000000 }, + { CS35L41_ASP_TX3_SRC, 0x00000000 }, + { CS35L41_ASP_TX4_SRC, 0x00000000 }, }; static const struct reg_sequence cs35l41_revb2_errata_patch[] = {
@@ -665,6 +669,8 @@ static const struct reg_sequence cs35l41_revb2_errata_patch[] = { { CS35L41_DSP1_XM_ACCEL_PL0_PRI, 0x00000000 }, { CS35L41_PWR_CTRL2, 0x00000000 }, { CS35L41_AMP_GAIN_CTRL, 0x00000000 }, + { CS35L41_ASP_TX3_SRC, 0x00000000 }, + { CS35L41_ASP_TX4_SRC, 0x00000000 }, }; static const struct cs35l41_otp_map_element_t cs35l41_otp_map_map[] = {
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 23/41 ASoC: cs47l15: Fix event generation for low power mux control
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit 7f103af4a10f375b9b346b4d0b730f6a66b8c451 ]
cs47l15_in1_adc_put always returns zero regardless of if the control value was updated. This results in missing notifications to user-space of the control change. Update the handling to return 1 when the value is changed.
--- sound/soc/codecs/cs47l15.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/cs47l15.c +4 -1
@@ -122,6 +122,9 @@ static int cs47l15_in1_adc_put(struct snd_kcontrol *kcontrol,snd_soc_kcontrol_component (kcontrol);struct cs47l15 *cs47l15 =snd_soc_component_get_drvdata (component); +if (!!ucontrol->value.integer.value[0 ] == cs47l15->in1_lp_mode) +return 0 ; +switch (ucontrol->value.integer.value[0 ]) {case 0 :/* Set IN1 to normal mode */
@@ -150,7 +153,7 @@ static int cs47l15_in1_adc_put(struct snd_kcontrol *kcontrol,break ; } -return 0 ; +return 1 ; }static const struct snd_kcontrol_new cs47l15_snd_controls[] = {
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 24/41 ASoC: madera: Fix event generation for OUT1 demux
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit e3cabbef3db8269207a6b8808f510137669f8deb ]
madera_out1_demux_put returns the value of snd_soc_dapm_mux_update_power, which returns a 1 if a path was found for the kcontrol. This is obviously different to the expected return a 1 if the control was updated value. This results in spurious notifications to user-space. Update the handling to only return a 1 when the value is changed.
--- sound/soc/codecs/madera.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
sound/soc/codecs/madera.c +7 -1
@@ -618,7 +618,13 @@ int madera_out1_demux_put(struct snd_kcontrol *kcontrol, end:snd_soc_dapm_mutex_unlock (dapm); -return snd_soc_dapm_mux_update_power (dapm, kcontrol, mux, e,NULL ); + ret =snd_soc_dapm_mux_update_power (dapm, kcontrol, mux, e,NULL ); +if (ret <0 ) { +dev_err (madera->dev,"Failed to update demux power state: %d\n" , ret); +return ret; + } + +return change; }EXPORT_SYMBOL_GPL (madera_out1_demux_put);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 25/41 ASoC: madera: Fix event generation for rate controls
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit 980555e95f7cabdc9c80a07107622b097ba23703 ]
madera_adsp_rate_put always returns zero regardless of if the control value was updated. This results in missing notifications to user-space of the control change. Update the handling to return 1 when the value is changed.
--- sound/soc/codecs/madera.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/madera.c +3 -3
@@ -899,7 +899,7 @@ static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol,struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;const int adsp_num = e->shift_l;const unsigned int item = ucontrol->value.enumerated.item[0 ]; -int ret; +int ret =0 ;if (item >= e->items)return -EINVAL ;
@@ -916,10 +916,10 @@ static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol,"Cannot change '%s' while in use by active audio paths\n" , kcontrol->id.name); ret = -EBUSY ; - }else { + }else if (priv->adsp_rate_cache[adsp_num] != e->values[item]) {/* Volatile register so defer until the codec is powered up */ priv->adsp_rate_cache[adsp_num] = e->values[item]; - ret =0 ; + ret =1 ; }mutex_unlock (&priv->rate_lock);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 29/41 x86: Clear .brk area at early boot
In reply to Sasha LevinFrom: Juergen Gross <[email protected]>
[ Upstream commit 38fa5479b41376dc9d7f57e71c83514285a25ca0 ]
The .brk section has the same properties as .bss: it is an alloc-only section and should be cleared before being used.
Not doing so is especially a problem for Xen PV guests, as the hypervisor will validate page tables (check for writable page tables and hypervisor private bits) before accepting them to be used.
Make sure .brk is initially zero by letting clear_bss() clear the brk area, too.
--- arch/x86/kernel/head64.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/head64.c +2 -0
@@ -425,6 +425,8 @@ void __init clear_bss(void) {memset (__bss_start,0 , (unsigned long ) __bss_stop - (unsigned long ) __bss_start); +memset (__brk_base,0 , + (unsigned long ) __brk_limit - (unsigned long ) __brk_base); }static unsigned long get_cmd_line_ptr (void )
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 31/41 ARM: dts: stm32: use the correct clock source for CEC on stm32mp151
In reply to Sasha LevinFrom: Gabriel Fernandez <[email protected]>
[ Upstream commit 78ece8cce1ba0c3f3e5a7c6c1b914b3794f04c44 ]
The peripheral clock of CEC is not LSE but CEC.
--- arch/arm/boot/dts/stm32mp151.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp151.dtsi +1 -1
@@ -565,7 +565,7 @@ cec: cec@40016000 { compatible = "st,stm32-cec"; reg = <0x40016000 0x400>; interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&rcc CEC_K>, <&clk_lse>; + clocks = <&rcc CEC_K>, <&rcc CEC>; clock-names = "cec", "hdmi-cec"; status = "disabled"; };
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 30/41 soc: ixp4xx/npe: Fix unused match warning
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit 620f83b8326ce9706b1118334f0257ae028ce045 ]
The kernel test robot found this inconsistency:
drivers/soc/ixp4xx/ixp4xx-npe.c:737:34: warning:
'ixp4xx_npe_of_match' defined but not used [-Wunused-const-variable=]
737 | static const struct of_device_id ixp4xx_npe_of_match[] = {This is because the match is enclosed in the of_match_ptr() which compiles into NULL when OF is disabled and this is unnecessary.
Fix it by dropping of_match_ptr() around the match.
--- drivers/soc/ixp4xx/ixp4xx-npe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/ixp4xx/ixp4xx-npe.c +1 -1
@@ -758,7 +758,7 @@ static const struct of_device_id ixp4xx_npe_of_match[] = {static struct platform_driver ixp4xx_npe_driver = { .driver = { .name ="ixp4xx-npe" , - .of_match_table =of_match_ptr (ixp4xx_npe_of_match), + .of_match_table = ixp4xx_npe_of_match, }, .probe = ixp4xx_npe_probe, .remove = ixp4xx_npe_remove,
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 32/41 Revert "can: xilinx_can: Limit CANFD brp to 2"
In reply to Sasha LevinFrom: Srinivas Neeli <[email protected]>
[ Upstream commit c6da4590fe819dfe28a4f8037a8dc1e056542fb4 ]
This reverts commit 05ca14fdb6fe65614e0652d03e44b02748d25af7.
On early silicon engineering samples observed bit shrinking issue when we use brp as 1. Hence updated brp_min as 2. As in production silicon this issue is fixed, so reverting the patch.
--- drivers/net/can/xilinx_can.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/can/xilinx_can.c +2 -2
@@ -259,7 +259,7 @@ static const struct can_bittiming_const xcan_bittiming_const_canfd2 = { .tseg2_min = 1, .tseg2_max = 128, .sjw_max = 128, - .brp_min = 2, + .brp_min = 1, .brp_max = 256, .brp_inc = 1, };
@@ -272,7 +272,7 @@ static const struct can_bittiming_const xcan_data_bittiming_const_canfd2 = { .tseg2_min = 1, .tseg2_max = 16, .sjw_max = 16, - .brp_min = 2, + .brp_min = 1, .brp_max = 256, .brp_inc = 1, };
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 33/41 ALSA: usb-audio: Add quirks for MacroSilicon MS2100/MS2106 devices
In reply to Sasha LevinFrom: John Veness <[email protected]>
[ Upstream commit 6e2c9105e0b743c92a157389d40f00b81bdd09fe ]
Treat the claimed 96kHz 1ch in the descriptors as 48kHz 2ch, so that the audio stream doesn't sound mono. Also fix initial stream alignment, so that left and right channels are in the correct order.
--- sound/usb/quirks-table.h | 48 ++++++++++++++++++++++++++++++++++++++++ sound/usb/quirks.c | 3 +++ 2 files changed, 51 insertions(+)
sound/usb/quirks-table.h +48 -0
@@ -3802,6 +3802,54 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, +/* +* MacroSilicon MS2100/MS2106 based AV capture cards +* +* These claim 96kHz 1ch in the descriptors, but are actually 48kHz 2ch. +* They also need QUIRK_FLAG_ALIGN_TRANSFER, which makes one wonder if +* they pretend to be 96kHz mono as a workaround for stereo being broken +* by that... +* +* 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. +*/ +{ + USB_AUDIO_DEVICE(0x534d, 0x0021), + .driver_info = (unsigned long ) &(const struct snd_usb_audio_quirk ) { + .vendor_name ="MacroSilicon" , + .product_name ="MS210x" , + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_COMPOSITE , + .data = &(const struct snd_usb_audio_quirk []) { + { + .ifnum =2 , + .type =QUIRK_AUDIO_STANDARD_MIXER , + }, + { + .ifnum =3 , + .type =QUIRK_AUDIO_FIXED_ENDPOINT , + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S16_LE , + .channels =2 , + .iface =3 , + .altsetting =1 , + .altset_idx =1 , + .attributes =0 , + .endpoint =0x82 , + .ep_attr =USB_ENDPOINT_XFER_ISOC | +USB_ENDPOINT_SYNC_ASYNC , + .rates =SNDRV_PCM_RATE_CONTINUOUS , + .rate_min =48000 , + .rate_max =48000 , + } + }, + { + .ifnum =-1 + } + } + } +}, +/* * MacroSilicon MS2109 based HDMI capture cards *
sound/usb/quirks.c +3 -0
@@ -1478,6 +1478,7 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs,case USB_ID (0x041e ,0x3f19 ):/* E-Mu 0204 USB */ set_format_emu_quirk (subs, fmt);break ; +case USB_ID (0x534d ,0x0021 ):/* MacroSilicon MS2100/MS2106 */ case USB_ID (0x534d ,0x2109 ):/* MacroSilicon MS2109 */ subs->stream_offset_adj =2 ;break ;
@@ -1904,6 +1905,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_IGNORE_CTL_ERROR),DEVICE_FLG (0x413c ,0xa506 ,/* Dell AE515 sound bar */ QUIRK_FLAG_GET_SAMPLE_RATE ), +DEVICE_FLG (0x534d ,0x0021 ,/* MacroSilicon MS2100/MS2106 */ +QUIRK_FLAG_ALIGN_TRANSFER ),DEVICE_FLG (0x534d ,0x2109 ,/* MacroSilicon MS2109 */ QUIRK_FLAG_ALIGN_TRANSFER ), DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 34/41 ALSA: usb-audio: Add quirk for Fiero SC-01
In reply to Sasha LevinFrom: Egor Vorontsov <[email protected]>
[ Upstream commit 4fb7c24f69c48fdc02ea7858dbd5a60ff08bf7e5 ]
Fiero SC-01 is a USB sound card with two mono inputs and a single stereo output. The inputs are composed into a single stereo stream.
The device uses a vendor-provided driver on Windows and does not work at all without it. The driver mostly provides ASIO functionality, but also alters the way the sound card is queried for sample rates and clocks.
ALSA queries those failing with an EPIPE (same as Windows 10 does). Presumably, the vendor-provided driver does not query it at all, simply matching by VID:PID. Thus, I consider this a buggy firmware and adhere to a set of fixed endpoint quirks instead.
The soundcard has an internal clock. Implicit feedback mode is required for the playback.
I have updated my device to v1.1.0 from a Windows 10 VM using a vendor- provided binary prior to the development, hoping for it to just begin working. The device provides no obvious way to downgrade the firmware, and regardless, there's no binary available for v1.0.0 anyway.
Thus, I will be getting another unit to extend the patch with support for that. Expected to be a simple copy-paste of the existing one, though.
There were no previous reports of that device in context of Linux anywhere. Other issues have been reported though, but that's out of the scope.
--- sound/usb/quirks-table.h | 68 ++++++++++++++++++++++++++++++++++++++++ sound/usb/quirks.c | 2 ++ 2 files changed, 70 insertions(+)
sound/usb/quirks-table.h +68 -0
@@ -4167,6 +4167,74 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +{ +/* +* Fiero SC-01 (firmware v1.1.0) +*/ + USB_DEVICE(0x2b53, 0x0031), + .driver_info = (unsigned long ) &(const struct snd_usb_audio_quirk ) { + .vendor_name ="Fiero" , + .product_name ="SC-01" , + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_COMPOSITE , + .data = &(const struct snd_usb_audio_quirk []) { + { + .ifnum =0 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, +/* Playback */ + { + .ifnum =1 , + .type =QUIRK_AUDIO_FIXED_ENDPOINT , + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S32_LE , + .channels =2 , + .fmt_bits =24 , + .iface =1 , + .altsetting =1 , + .altset_idx =1 , + .endpoint =0x01 , + .ep_attr =USB_ENDPOINT_XFER_ISOC | +USB_ENDPOINT_SYNC_ASYNC , + .rates =SNDRV_PCM_RATE_48000 | +SNDRV_PCM_RATE_96000 , + .rate_min =48000 , + .rate_max =96000 , + .nr_rates =2 , + .rate_table = (unsigned int []) {48000 ,96000 }, + .clock =0x29 + } + }, +/* Capture */ + { + .ifnum =2 , + .type =QUIRK_AUDIO_FIXED_ENDPOINT , + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S32_LE , + .channels =2 , + .fmt_bits =24 , + .iface =2 , + .altsetting =1 , + .altset_idx =1 , + .endpoint =0x82 , + .ep_attr =USB_ENDPOINT_XFER_ISOC | +USB_ENDPOINT_SYNC_ASYNC | +USB_ENDPOINT_USAGE_IMPLICIT_FB , + .rates =SNDRV_PCM_RATE_48000 | +SNDRV_PCM_RATE_96000 , + .rate_min =48000 , + .rate_max =96000 , + .nr_rates =2 , + .rate_table = (unsigned int []) {48000 ,96000 }, + .clock =0x29 + } + }, + { + .ifnum =-1 + } + } + } +}, #undef USB_DEVICE_VENDOR_SPEC #undef USB_AUDIO_DEVICE
sound/usb/quirks.c +2 -0
@@ -1911,6 +1911,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_ALIGN_TRANSFER),DEVICE_FLG (0x1224 ,0x2a25 ,/* Jieli Technology USB PHY 2.0 */ QUIRK_FLAG_GET_SAMPLE_RATE ), +DEVICE_FLG (0x2b53 ,0x0031 ,/* Fiero SC-01 (firmware v1.1.0) */ +QUIRK_FLAG_GENERIC_IMPLICIT_FB ),/* Vendor matches */ VENDOR_FLG(0x045e, /* MS Lifecam */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 35/41 ALSA: usb-audio: Add quirk for Fiero SC-01 (fw v1.0.0)
In reply to Sasha LevinFrom: Egor Vorontsov <[email protected]>
[ Upstream commit 2307a0e1ca0b5c1337b37ac6302f96e017ebac3c ]
The patch applies the same quirks used for SC-01 at firmware v1.1.0 to the ones running v1.0.0, with respect to hard-coded sample rates.
I got two more units and successfully tested the patch series with both firmwares.
The support is now complete (not accounting ASIO).
--- sound/usb/quirks-table.h | 132 +++++++++++++++++++++++++++++++++++++++ sound/usb/quirks.c | 4 ++ 2 files changed, 136 insertions(+)
sound/usb/quirks-table.h +132 -0
@@ -4167,6 +4167,138 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +{ +/* +* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) +*/ + USB_DEVICE(0x2b53, 0x0023), + .driver_info = (unsigned long ) &(const struct snd_usb_audio_quirk ) { + .vendor_name ="Fiero" , + .product_name ="SC-01" , + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_COMPOSITE , + .data = &(const struct snd_usb_audio_quirk []) { + { + .ifnum =0 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, +/* Playback */ + { + .ifnum =1 , + .type =QUIRK_AUDIO_FIXED_ENDPOINT , + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S32_LE , + .channels =2 , + .fmt_bits =24 , + .iface =1 , + .altsetting =1 , + .altset_idx =1 , + .endpoint =0x01 , + .ep_attr =USB_ENDPOINT_XFER_ISOC | +USB_ENDPOINT_SYNC_ASYNC , + .rates =SNDRV_PCM_RATE_48000 , + .rate_min =48000 , + .rate_max =48000 , + .nr_rates =1 , + .rate_table = (unsigned int []) {48000 }, + .clock =0x29 + } + }, +/* Capture */ + { + .ifnum =2 , + .type =QUIRK_AUDIO_FIXED_ENDPOINT , + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S32_LE , + .channels =2 , + .fmt_bits =24 , + .iface =2 , + .altsetting =1 , + .altset_idx =1 , + .endpoint =0x82 , + .ep_attr =USB_ENDPOINT_XFER_ISOC | +USB_ENDPOINT_SYNC_ASYNC | +USB_ENDPOINT_USAGE_IMPLICIT_FB , + .rates =SNDRV_PCM_RATE_48000 , + .rate_min =48000 , + .rate_max =48000 , + .nr_rates =1 , + .rate_table = (unsigned int []) {48000 }, + .clock =0x29 + } + }, + { + .ifnum =-1 + } + } + } +}, +{ + /* + * Fiero SC-01 (firmware v1.0.0 @ 96 kHz) + */ + USB_DEVICE(0x2b53, 0x0024), + .driver_info = (unsigned long ) &(const struct snd_usb_audio_quirk ) { + .vendor_name ="Fiero" , + .product_name ="SC-01" , + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_COMPOSITE , + .data = &(const struct snd_usb_audio_quirk []) { + { + .ifnum =0 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, +/* Playback */ + { + .ifnum =1 , + .type =QUIRK_AUDIO_FIXED_ENDPOINT , + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S32_LE , + .channels =2 , + .fmt_bits =24 , + .iface =1 , + .altsetting =1 , + .altset_idx =1 , + .endpoint =0x01 , + .ep_attr =USB_ENDPOINT_XFER_ISOC | +USB_ENDPOINT_SYNC_ASYNC , + .rates =SNDRV_PCM_RATE_96000 , + .rate_min =96000 , + .rate_max =96000 , + .nr_rates =1 , + .rate_table = (unsigned int []) {96000 }, + .clock =0x29 + } + }, +/* Capture */ + { + .ifnum =2 , + .type =QUIRK_AUDIO_FIXED_ENDPOINT , + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S32_LE , + .channels =2 , + .fmt_bits =24 , + .iface =2 , + .altsetting =1 , + .altset_idx =1 , + .endpoint =0x82 , + .ep_attr =USB_ENDPOINT_XFER_ISOC | +USB_ENDPOINT_SYNC_ASYNC | +USB_ENDPOINT_USAGE_IMPLICIT_FB , + .rates =SNDRV_PCM_RATE_96000 , + .rate_min =96000 , + .rate_max =96000 , + .nr_rates =1 , + .rate_table = (unsigned int []) {96000 }, + .clock =0x29 + } + }, + { + .ifnum =-1 + } + } + } +}, {/* * Fiero SC-01 (firmware v1.1.0)
sound/usb/quirks.c +4 -0
@@ -1911,6 +1911,10 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_ALIGN_TRANSFER),DEVICE_FLG (0x1224 ,0x2a25 ,/* Jieli Technology USB PHY 2.0 */ QUIRK_FLAG_GET_SAMPLE_RATE ), +DEVICE_FLG (0x2b53 ,0x0023 ,/* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) */ +QUIRK_FLAG_GENERIC_IMPLICIT_FB ), +DEVICE_FLG (0x2b53 ,0x0024 ,/* Fiero SC-01 (firmware v1.0.0 @ 96 kHz) */ +QUIRK_FLAG_GENERIC_IMPLICIT_FB ),DEVICE_FLG (0x2b53 ,0x0031 ,/* Fiero SC-01 (firmware v1.1.0) */ QUIRK_FLAG_GENERIC_IMPLICIT_FB),
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 41/41 signal handling: don't use BUG_ON() for debugging
In reply to Sasha LevinFrom: Linus Torvalds <[email protected]>
[ Upstream commit a382f8fee42ca10c9bfce0d2352d4153f931f5dc ]
These are indeed "should not happen" situations, but it turns out recent changes made the 'task_is_stopped_or_trace()' case trigger (fix for that exists, is pending more testing), and the BUG_ON() makes it unnecessarily hard to actually debug for no good reason.
It's been that way for a long time, but let's make it clear: BUG_ON() is not good for debugging, and should never be used in situations where you could just say "this shouldn't happen, but we can continue".
Use WARN_ON_ONCE() instead to make sure it gets logged, and then just continue running. Instead of making the system basically unusuable because you crashed the machine while potentially holding some very core locks (eg this function is commonly called while holding 'tasklist_lock' for writing).
--- kernel/signal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/signal.c +4 -4
@@ -2031,12 +2031,12 @@ bool do_notify_parent(struct task_struct *tsk, int sig)bool autoreap = false;u64 utime, stime; -BUG_ON (sig ==-1 ); +WARN_ON_ONCE (sig ==-1 ); -/* do_notify_parent_cldstop should have been called instead. */ -BUG_ON (task_is_stopped_or_traced (tsk)); +/* do_notify_parent_cldstop should have been called instead. */ +WARN_ON_ONCE (task_is_stopped_or_traced (tsk)); -BUG_ON (!tsk->ptrace && +WARN_ON_ONCE (!tsk->ptrace && (tsk->group_leader != tsk || !thread_group_empty (tsk)));/* Wake up all pidfd waiters */
Signature · 1 line
2.35.1
Re: [PATCH AUTOSEL 5.18 39/41] wireguard: selftests: use virt machine on m68k
In reply to Sasha LevinHi Sasha,
Quoted 9 lines · Sasha Levin
From: "Jason A. Donenfeld" <[email protected]>
[ Upstream commit
1f2f341a62639c7066ee4c76b7d9ebe867e0a1d5]This should be a bit more stable hopefully.
Signed-off-by Jason A. Donenfeld <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Thanks for your patch!
tools/testing/selftests/wireguard/qemu/arch/m68k.config line 2
Quoted 5 lines
tools/testing/selftests/wireguard/qemu/arch/m68k.config +1
-0@@ -1,10 +1,7 @@ CONFIG_MMU=y +CONFIG_VIRT=y
The m68k virt machine was introduced in v5.19-rc1, so this patch must not be backported to v5.18 and earlier.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.18 39/41] wireguard: selftests: use virt machine on m68k
Quoted 15 lines · Geert Uytterhoeven
Hi Sasha,
Quoted 9 lines · Sasha Levin
From: "Jason A. Donenfeld" <[email protected]>
[ Upstream commit
1f2f341a62639c7066ee4c76b7d9ebe867e0a1d5]This should be a bit more stable hopefully.
Signed-off-by Jason A. Donenfeld <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>Thanks for your patch!
Quoted 8 lines
tools/testing/selftests/wireguard/qemu/arch/m68k.config line 2
Quoted 5 lines
tools/testing/selftests/wireguard/qemu/arch/m68k.config +1
-0@@ -1,10 +1,7 @@ CONFIG_MMU=y +CONFIG_VIRT=yThe m68k virt machine was introduced in v5.19-rc1, so this patch must not be backported to v5.18 and earlier.
I'll drop it, thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.18 39/41] wireguard: selftests: use virt machine on m68k
Quoted 25 lines · Sasha Levin
Quoted 15 lines · Geert Uytterhoeven
Hi Sasha,
Quoted 9 lines · Sasha Levin
From: "Jason A. Donenfeld" <[email protected]>
[ Upstream commit
1f2f341a62639c7066ee4c76b7d9ebe867e0a1d5]This should be a bit more stable hopefully.
Signed-off-by Jason A. Donenfeld <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>Thanks for your patch!
Quoted 8 lines
Quoted 5 lines
tools/testing/selftests/wireguard/qemu/arch/m68k.config +0
-0@@ -1,10 +1,7 @@
CONFIG_MMU=y
+CONFIG_VIRT=yThe m68k virt machine was introduced in v5.19-rc1, so this patch must not be backported to v5.18 and earlier.
Quoted 1 line
I'll drop it, thanks!
I've clicked the wrong button and still queued it by mistake, now really removed :)
Signature · 2 lines
Thanks, Sasha