- Alsa-devel - mailman.alsa-project.org

[PATCH] ASoC: SOF: core: Print out the value of sof_debug if it is set
by Peter Ujfalusi 27 Dec '22

27 Dec '22

The sof_debug value is set by the user, developer intentionally. To save time on figuring out what value has been passed to the kernel by the user, developer, print it out if it is not 0. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Daniel Baluta <daniel.baluta(a)nxp.com> --- sound/soc/sof/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 625977a29d8a..26a3f7c8c914 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -362,6 +362,9 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data) sdev->first_boot = true; dev_set_drvdata(dev, sdev); + if (sof_core_debug) + dev_info(dev, "sof_debug value: %#x\n", sof_core_debug); + /* check IPC support */ if (!(BIT(plat_data->ipc_type) & plat_data->desc->ipc_supported_mask)) { dev_err(dev, "ipc_type %d is not supported on this platform, mask is %#x\n", -- 2.39.0

2 1

[PATCH] ASoC: SOF: IPC3 topology: Print the conflicting bytes sizes
by Peter Ujfalusi 27 Dec '22

27 Dec '22

From: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> The error "Conflict in bytes vs. priv size." is too brief. With the printed sizes it's a lot easier to find the size issue in for binary control if such happens. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> Reviewed-by: Daniel Baluta <daniel.baluta(a)nxp.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/sof/ipc3-topology.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c index b94cc40485ed..989395999d6e 100644 --- a/sound/soc/sof/ipc3-topology.c +++ b/sound/soc/sof/ipc3-topology.c @@ -1651,6 +1651,7 @@ static int sof_ipc3_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route * static int sof_ipc3_control_load_bytes(struct snd_sof_dev *sdev, struct snd_sof_control *scontrol) { struct sof_ipc_ctrl_data *cdata; + size_t priv_size_check; int ret; if (scontrol->max_size < (sizeof(*cdata) + sizeof(struct sof_abi_hdr))) { @@ -1694,8 +1695,10 @@ static int sof_ipc3_control_load_bytes(struct snd_sof_dev *sdev, struct snd_sof_ goto err; } - if (cdata->data->size + sizeof(struct sof_abi_hdr) != scontrol->priv_size) { - dev_err(sdev->dev, "Conflict in bytes vs. priv size.\n"); + priv_size_check = cdata->data->size + sizeof(struct sof_abi_hdr); + if (priv_size_check != scontrol->priv_size) { + dev_err(sdev->dev, "Conflict in bytes (%zu) vs. priv size (%zu).\n", + priv_size_check, scontrol->priv_size); ret = -EINVAL; goto err; } -- 2.39.0

2 1

[PATCH v3 1/3] ASoC: wm8940: Remove warning when no plat data present
by Lukasz Majewski 27 Dec '22

27 Dec '22

The lack of platform data in the contemporary Linux shall not be the reason to display warnings to the kernel logs. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- Changes for v2: - None Changes for v3: - None --- sound/soc/codecs/wm8940.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 8dac9fd88547..0b59020d747f 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -709,9 +709,7 @@ static int wm8940_probe(struct snd_soc_component *component) if (ret < 0) return ret; - if (!pdata) - dev_warn(component->dev, "No platform data supplied\n"); - else { + if (pdata) { reg = snd_soc_component_read(component, WM8940_OUTPUTCTL); ret = snd_soc_component_write(component, WM8940_OUTPUTCTL, reg | pdata->vroi); if (ret < 0) -- 2.20.1

2 3

[PATCH] ASoC: SOF: mediatek: mt8195: remove a redundant comparison of sram
by YC Hung 27 Dec '22

27 Dec '22

DSP SRAM is not used for audio shared buffer between host and DSP so TOTAL_SIZE_SHARED_SRAM_FROM_TAIL is zero. Remove the definition and redundant comparison to fix coverity "unsigned compared against 0". Signed-off-by: YC Hung <yc.hung(a)mediatek.com> --- sound/soc/sof/mediatek/mt8195/mt8195.c | 5 ----- sound/soc/sof/mediatek/mt8195/mt8195.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.c b/sound/soc/sof/mediatek/mt8195/mt8195.c index 3c81e84fcecf..7c831e18483c 100644 --- a/sound/soc/sof/mediatek/mt8195/mt8195.c +++ b/sound/soc/sof/mediatek/mt8195/mt8195.c @@ -215,11 +215,6 @@ static int platform_parse_resource(struct platform_device *pdev, void *data) adsp->pa_sram = (phys_addr_t)mmio->start; adsp->sramsize = resource_size(mmio); - if (adsp->sramsize < TOTAL_SIZE_SHARED_SRAM_FROM_TAIL) { - dev_err(dev, "adsp SRAM(%#x) is not enough for share\n", - adsp->sramsize); - return -EINVAL; - } dev_dbg(dev, "sram pbase=%pa,%#x\n", &adsp->pa_sram, adsp->sramsize); diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.h b/sound/soc/sof/mediatek/mt8195/mt8195.h index 7ffd523f936c..b4229170049f 100644 --- a/sound/soc/sof/mediatek/mt8195/mt8195.h +++ b/sound/soc/sof/mediatek/mt8195/mt8195.h @@ -139,8 +139,6 @@ struct snd_sof_dev; #define DSP_MBOX1_BAR 6 #define DSP_MBOX2_BAR 7 -#define TOTAL_SIZE_SHARED_SRAM_FROM_TAIL 0x0 - #define SIZE_SHARED_DRAM_DL 0x40000 /*Shared buffer for Downlink*/ #define SIZE_SHARED_DRAM_UL 0x40000 /*Shared buffer for Uplink*/ -- 2.18.0

3 2

[PATCH 0/4] ASoC: Fixes for WM8940 codec
by Lukasz Majewski 27 Dec '22

27 Dec '22

This patch series provides fixes for WM8940 codec. The most notable change is the clock rewrite, so this driver now can either generate proper clock frequency by itself or use one provided from the clock subsystem of the SoC. Lukasz Majewski (4): ASoC: wm8940: Remove warning when no plat data present ASoC: wm8940: Rewrite code to set proper clocks ASoC: wm8940: Mute also the speaker output ASoC: wm8940: Read chip ID when wm8940 codec probing sound/soc/codecs/wm8940.c | 129 +++++++++++++++++++++++++++++++------- sound/soc/codecs/wm8940.h | 6 ++ 2 files changed, 111 insertions(+), 24 deletions(-) -- 2.20.1

3 22

Re: [PATCH 2/2] ASoC: da7213: Add support for mono, set frame width to 32 when possible
by Mark Brown 27 Dec '22

27 Dec '22

On Wed, 14 Dec 2022 04:40:58 +0000, David Rau wrote: > This adds the DAI mono mode support and set the frame width to 32 > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [2/2] ASoC: da7213: Add support for mono, set frame width to 32 when possible commit: c89e652e84f636354213aae42490c7f77a0eadde All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

[PATCH 0/4] Add support for DSP volume controls
by Amadeusz Sławiński 27 Dec '22

27 Dec '22

Some devices like DMIC don't expose native controls or need volume limit due to possible HW damage. Add support for volume controls allowing to change volume level in DSP. Maximum volume level is imposed by the topology file which defines given path. Amadeusz Sławiński (4): ASoC: Intel: avs: Add peakvol runtime-parameter requests ASoC: Intel: avs: Add control volume operations ASoC: Intel: avs: Parse control tuples ASoC: Intel: avs: Peakvol module configuration include/uapi/sound/intel/avs/tokens.h | 4 + sound/soc/intel/avs/Makefile | 2 +- sound/soc/intel/avs/control.c | 105 ++++++++++++++++++++++++++ sound/soc/intel/avs/control.h | 23 ++++++ sound/soc/intel/avs/messages.c | 29 +++++++ sound/soc/intel/avs/messages.h | 33 ++++++++ sound/soc/intel/avs/path.c | 62 +++++++++++++++ sound/soc/intel/avs/topology.c | 76 +++++++++++++++++++ sound/soc/intel/avs/topology.h | 3 + 9 files changed, 336 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/avs/control.c create mode 100644 sound/soc/intel/avs/control.h -- 2.25.1

2 5

[PATCH] ASoC: SOF: amd: Enable cache for AMD Rembrandt platform
by V sujith kumar Reddy 27 Dec '22

27 Dec '22

Enable DSP cache for ACP memory Signed-off-by: V sujith kumar Reddy <Vsujithkumar.Reddy(a)amd.com> --- sound/soc/sof/amd/acp-dsp-offset.h | 4 ++++ sound/soc/sof/amd/acp-loader.c | 7 +++++++ sound/soc/sof/amd/acp.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/sound/soc/sof/amd/acp-dsp-offset.h b/sound/soc/sof/amd/acp-dsp-offset.h index de5726251dc6..920155dee819 100644 --- a/sound/soc/sof/amd/acp-dsp-offset.h +++ b/sound/soc/sof/amd/acp-dsp-offset.h @@ -85,4 +85,8 @@ #define ACP_SCRATCH_REG_0 0x10000 #define ACP6X_DSP_FUSION_RUNSTALL 0x0644 + +/* Cache window registers */ +#define ACP_DSP0_CACHE_OFFSET0 0x0420 +#define ACP_DSP0_CACHE_SIZE0 0x0424 #endif diff --git a/sound/soc/sof/amd/acp-loader.c b/sound/soc/sof/amd/acp-loader.c index 090c8b18c83c..a4bce5a3ae48 100644 --- a/sound/soc/sof/amd/acp-loader.c +++ b/sound/soc/sof/amd/acp-loader.c @@ -151,6 +151,7 @@ static void configure_pte_for_fw_loading(int type, int num_pages, struct acp_dev int acp_dsp_pre_fw_run(struct snd_sof_dev *sdev) { struct pci_dev *pci = to_pci_dev(sdev->dev); + const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); struct acp_dev_data *adata; unsigned int src_addr, size_fw; u32 page_count, dma_size; @@ -183,6 +184,12 @@ int acp_dsp_pre_fw_run(struct snd_sof_dev *sdev) if (ret < 0) dev_err(sdev->dev, "acp dma transfer status: %d\n", ret); + if (desc->rev > 3) { + /* Cache Window enable */ + snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_DSP0_CACHE_OFFSET0, desc->sram_pte_offset); + snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_DSP0_CACHE_SIZE0, SRAM1_SIZE | BIT(31)); + } + /* Free memory once DMA is complete */ dma_size = (PAGE_ALIGN(sdev->basefw.fw->size) >> PAGE_SHIFT) * ACP_PAGE_SIZE; dma_free_coherent(&pci->dev, dma_size, adata->bin_buf, adata->sha_dma_addr); diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index 09e16ef8afa0..4314094a97fd 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -72,6 +72,8 @@ #define EXCEPT_MAX_HDR_SIZE 0x400 #define AMD_STACK_DUMP_SIZE 32 +#define SRAM1_SIZE 0x13A000 + enum clock_source { ACP_CLOCK_96M = 0, ACP_CLOCK_48M, -- 2.25.1

2 1

[PATCH 00/15] ASoC: Drop empty platform remove functions
by Uwe Kleine-König 27 Dec '22

27 Dec '22

From: Uwe Kleine-König <uwe(a)kleine-koenig.org> Hello, this patch series removes all platform remove functions that only return zero below sound/soc. There is no reason to have these, as the only caller is platform core code doing: if (drv->remove) { int ret = drv->remove(dev); ... } (in platform_remove()) and so having no remove function is both equivalent and simpler. Best regards Uwe Uwe Kleine-König (15): ASoC: pxa: Drop empty platform remove function ASoC: amd: Drop empty platform remove function ASoC: atmel-classd: Drop empty platform remove function ASoC: atmel-pdmic: Drop empty platform remove function ASoC: 88pm860x: Drop empty platform remove function ASoC: ac97: Drop empty platform remove function ASoC: adau7002: Drop empty platform remove function ASoC: bt-sco: Drop empty platform remove function ASoC: cq93vc: Drop empty platform remove function ASoC: mc13783: Drop empty platform remove function ASoC: wl1273: Drop empty platform remove function ASoC: pxa: e740_wm9705: Drop empty platform remove function ASoC: pxa: e750_wm9705: Drop empty platform remove function ASoC: pxa: e800_wm9712: Drop empty platform remove function ASoC: SOF: nocodec: Drop empty platform remove function sound/soc/amd/raven/acp3x-i2s.c | 8 -------- sound/soc/atmel/atmel-classd.c | 6 ------ sound/soc/atmel/atmel-pdmic.c | 6 ------ sound/soc/codecs/88pm860x-codec.c | 6 ------ sound/soc/codecs/ac97.c | 6 ------ sound/soc/codecs/adau7002.c | 6 ------ sound/soc/codecs/bt-sco.c | 6 ------ sound/soc/codecs/cq93vc.c | 6 ------ sound/soc/codecs/mc13783.c | 6 ------ sound/soc/codecs/wl1273.c | 6 ------ sound/soc/pxa/e740_wm9705.c | 6 ------ sound/soc/pxa/e750_wm9705.c | 6 ------ sound/soc/pxa/e800_wm9712.c | 6 ------ sound/soc/pxa/spitz.c | 6 ------ sound/soc/sof/nocodec.c | 6 ------ 15 files changed, 92 deletions(-) base-commit: 3a28c2c89f4b412b648761430720d40a8dc326ef -- 2.38.1

4 19

[PATCH] ASoC: pxa: Drop empty platform remove function
by Uwe Kleine-König 27 Dec '22

27 Dec '22

A remove callback just returning 0 is equivalent to no remove callback at all. So drop the useless function. Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- sound/soc/pxa/spitz.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 44303b6eb228..70442315f5c5 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -306,18 +306,12 @@ static int spitz_probe(struct platform_device *pdev) return ret; } -static int spitz_remove(struct platform_device *pdev) -{ - return 0; -} - static struct platform_driver spitz_driver = { .driver = { .name = "spitz-audio", .pm = &snd_soc_pm_ops, }, .probe = spitz_probe, - .remove = spitz_remove, }; module_platform_driver(spitz_driver); -- 2.38.1

2 2

[PATCH] ASoC: dt-bindings: adi,adau7002: Convert to DT schema
by Krzysztof Kozlowski 27 Dec '22

27 Dec '22

Convert the Analog Devices ADAU7002 Stereo PDM-to-I2S/TDM Converter bindings to DT schema. During the conversion, add properties already used by DTS (sc7180-trogdor-coachz.dts) and Linux driver: 1. wakeup-delay-ms, 2. sound-dai-cells (via referencing dai-common.yaml). Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- .../bindings/sound/adi,adau7002.txt | 19 --------- .../bindings/sound/adi,adau7002.yaml | 40 +++++++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.txt create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.yaml diff --git a/Documentation/devicetree/bindings/sound/adi,adau7002.txt b/Documentation/devicetree/bindings/sound/adi,adau7002.txt deleted file mode 100644 index f144ee1abf85..000000000000 --- a/Documentation/devicetree/bindings/sound/adi,adau7002.txt +++ /dev/null @@ -1,19 +0,0 @@ -Analog Devices ADAU7002 Stereo PDM-to-I2S/TDM Converter - -Required properties: - - - compatible: Must be "adi,adau7002" - -Optional properties: - - - IOVDD-supply: Phandle and specifier for the power supply providing the IOVDD - supply as covered in Documentation/devicetree/bindings/regulator/regulator.txt - - If this property is not present it is assumed that the supply pin is - hardwired to always on. - -Example: - adau7002: pdm-to-i2s { - compatible = "adi,adau7002"; - IOVDD-supply = <&supply>; - }; diff --git a/Documentation/devicetree/bindings/sound/adi,adau7002.yaml b/Documentation/devicetree/bindings/sound/adi,adau7002.yaml new file mode 100644 index 000000000000..fcca0fde7d86 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/adi,adau7002.yaml @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/adi,adau7002.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog Devices ADAU7002 Stereo PDM-to-I2S/TDM Converter + +maintainers: + - Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> + +allOf: + - $ref: dai-common.yaml# + +properties: + compatible: + const: adi,adau7002 + + IOVDD-supply: + description: + IOVDD power supply, if skipped then it is assumed that the supply pin is + hardwired to always on. + + wakeup-delay-ms: + description: + Delay after power up needed for device to settle. + +required: + - compatible + +unevaluatedProperties: false + +examples: + - | + audio-codec { + compatible = "adi,adau7002"; + IOVDD-supply = <&pp1800_l15a>; + #sound-dai-cells = <0>; + wakeup-delay-ms = <80>; + }; -- 2.34.1

3 2

Re: [PATCH 1/2] ASoC: rt5640: Allow configuration of LOUT to mono differential mode
by Mark Brown 27 Dec '22

27 Dec '22

On Fri, 09 Dec 2022 10:56:20 +0000, Jarrah Gosbell wrote: > LOUT output can produce either single-ended stereo signals, or mono > differential signal. Some applications are wired to use LOUT in mono > differential mode. Allow to configure it via device property. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/2] ASoC: rt5640: Allow configuration of LOUT to mono differential mode commit: 44b54f54b41d36e8a2302a2c18a65268751c9067 [2/2] dt-bindings: sound: rt5640: Allow to describe how LOUT is wired commit: d8510532ccf3bc12e2b1c0c285d4b61d4b713e1a All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

[PATCH] ALSA: hda/realtek: Apply dual codec fixup for Dell Latitude laptops
by Chris Chiu 27 Dec '22

27 Dec '22

The Dell Latiture 3340/3440/3540 laptops with Realtek ALC3204 have dual codecs and need the ALC1220_FIXUP_GB_DUAL_CODECS to fix the conflicts of Master controls. The existing headset mic fixup for Dell is also required to enable the jack sense and the headset mic. Introduce a new fixup to fix the dual codec and headset mic issues for particular Dell laptops since other old Dell laptops with the same codec configuration are already well handled by the fixup in alc269_fallback_pin_fixup_tbl[]. Signed-off-by: Chris Chiu <chris.chiu(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e443d88f627f..3794b522c222 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7175,6 +7175,7 @@ enum { ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK, ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN, ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS, + ALC236_FIXUP_DELL_DUAL_CODECS, }; /* A special fixup for Lenovo C940 and Yoga Duet 7; @@ -9130,6 +9131,12 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE, }, + [ALC236_FIXUP_DELL_DUAL_CODECS] = { + .type = HDA_FIXUP_PINS, + .v.func = alc1220_fixup_gb_dual_codecs, + .chained = true, + .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -9232,6 +9239,12 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0b1a, "Dell Precision 5570", ALC289_FIXUP_DUAL_SPK), SND_PCI_QUIRK(0x1028, 0x0b37, "Dell Inspiron 16 Plus 7620 2-in-1", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS), SND_PCI_QUIRK(0x1028, 0x0b71, "Dell Inspiron 16 Plus 7620", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS), + SND_PCI_QUIRK(0x1028, 0x0c19, "Dell Precision 3340", ALC236_FIXUP_DELL_DUAL_CODECS), + SND_PCI_QUIRK(0x1028, 0x0c1a, "Dell Precision 3340", ALC236_FIXUP_DELL_DUAL_CODECS), + SND_PCI_QUIRK(0x1028, 0x0c1b, "Dell Precision 3440", ALC236_FIXUP_DELL_DUAL_CODECS), + SND_PCI_QUIRK(0x1028, 0x0c1c, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS), + SND_PCI_QUIRK(0x1028, 0x0c1d, "Dell Precision 3440", ALC236_FIXUP_DELL_DUAL_CODECS), + SND_PCI_QUIRK(0x1028, 0x0c1e, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS), SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), -- 2.25.1

2 1

[PATCH v2 0/3] ASoC: SOF: Fixes for suspend after firmware crash
by Peter Ujfalusi 27 Dec '22

27 Dec '22

Hi, This is the followup series for the v1 sent out by Ranjani [1]. Unfortunately Ranjani was dragged away to another issue and could not send the update herself. Changes since v1: - In patch 2, move the tear_down_all_pipelines call instead of duplicating it Amadeusz: I have kept the check as it is: if (tplg_ops && tplg_ops->tear_down_all_pipelines) I'm preparing the ops optionality change series which would require this change. [1] https://lore.kernel.org/alsa-devel/20221215185347.1457541-1-ranjani.sridhar… Regards, Peter --- Curtis Malainey (1): ASoC: SOF: Add FW state to debugfs Ranjani Sridharan (2): ASoC: SOF: pm: Set target state earlier ASoC: SOF: pm: Always tear down pipelines before DSP suspend sound/soc/sof/debug.c | 4 +++- sound/soc/sof/pm.c | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) -- 2.39.0

2 4

[PATCH 0/3] ASoC: SOF: Fixes for suspend after firmware crash
by Ranjani Sridharan 27 Dec '22

27 Dec '22

This series contains 2 patches to fix device suspend after a firmware crash and another patch to allow reading the FW state from debugfs. Curtis Malainey (1): ASoC: SOF: Add FW state to debugfs Ranjani Sridharan (2): ASoC: SOF: pm: Set target state earlier ASoC: SOF: pm: Always tear down pipelines before DSP suspend sound/soc/sof/debug.c | 4 +++- sound/soc/sof/pm.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) -- 2.25.1

4 6

[PATCH 1/2] ASoC: Intel: soc-acpi: add configuration for variant of 0C40 product
by Bard Liao 27 Dec '22

27 Dec '22

From: Gongjun Song <gongjun.song(a)intel.com> Support configuration with SoundWire RT1316 amplifiers on link0 and link1, and RT711 on link2 for headphone/headset. This product does not support local microphones. Signed-off-by: Gongjun Song <gongjun.song(a)intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- .../intel/common/soc-acpi-intel-rpl-match.c | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c index 31b43116e3d8..c70d85bfedbf 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -203,6 +203,25 @@ static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link2_rt1316_link01_rt71 {} }; +static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link2_rt1316_link01[] = { + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(rt711_sdca_2_adr), + .adr_d = rt711_sdca_2_adr, + }, + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt1316_0_group2_adr), + .adr_d = rt1316_0_group2_adr, + }, + { + .mask = BIT(1), + .num_adr = ARRAY_SIZE(rt1316_1_group2_adr), + .adr_d = rt1316_1_group2_adr, + }, + {} +}; + static const struct snd_soc_acpi_link_adr rpl_sdw_rt711_link0_rt1318_link12_rt714_link3[] = { { .mask = BIT(0), @@ -277,6 +296,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-rpl-rt1316-l12-rt714-l0.tplg", }, + { + .link_mask = 0x7, /* rt711 on link2 & two rt1316s on link0 and link1 */ + .links = rpl_sdw_rt711_link2_rt1316_link01, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-rpl-rt711-l2-rt1316-l01.tplg", + }, { .link_mask = 0x1, /* link0 required */ .links = rpl_rvp, -- 2.25.1

2 2

[PATCH v3] ASoC: Intel: sof_nau8825: add variant with nau8318 amplifier.
by Ajye Huang 27 Dec '22

27 Dec '22

This patch adds the driver data for two nau8318 speaker amplifiers on SSP1 and nau8825 on SSP0 for ADL platform. The nau8315 and nau8318 are both Nuvoton Amp chips. They use the same Amp driver nau8315.c. The acpi_device_id for nau8315 is "NVTN2010", for nau8318 is "NVTN2012". The nau8825 is one of Nuvoton headset codec, and its acpi_device_id is "10508825". Signed-off-by: Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- changes from v1->v2: * Modify title and add explanations in commit messages . * Use new topology file "sof-adl-nau8318-nau8825.tplg" instead of sof-adl-max98360a-nau8825.tplg. changes from v2-v3: * Modify drv_name string from "adl_nau8318_nau8825" to "adl_nau8318_8825". sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/sof_nau8825.c | 23 +++++++++++++++++++ .../intel/common/soc-acpi-intel-adl-match.c | 12 ++++++++++ 3 files changed, 36 insertions(+) diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index a472de1909f4..3f68e9edd853 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -554,6 +554,7 @@ config SND_SOC_INTEL_SOF_NAU8825_MACH select SND_SOC_RT1015P select SND_SOC_MAX98373_I2C select SND_SOC_MAX98357A + select SND_SOC_NAU8315 select SND_SOC_DMIC select SND_SOC_HDAC_HDMI select SND_SOC_INTEL_HDA_DSP_COMMON diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 27880224359d..78d84527081a 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -48,6 +48,7 @@ #define SOF_MAX98373_SPEAKER_AMP_PRESENT BIT(15) #define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(16) #define SOF_RT1015P_SPEAKER_AMP_PRESENT BIT(17) +#define SOF_NAU8318_SPEAKER_AMP_PRESENT BIT(18) static unsigned long sof_nau8825_quirk = SOF_NAU8825_SSP_CODEC(0); @@ -338,6 +339,13 @@ static struct snd_soc_dai_link_component rt1019p_component[] = { } }; +static struct snd_soc_dai_link_component nau8318_components[] = { + { + .name = "NVTN2012:00", + .dai_name = "nau8315-hifi", + } +}; + static struct snd_soc_dai_link_component dummy_component[] = { { .name = "snd-soc-dummy", @@ -486,6 +494,11 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, max_98360a_dai_link(&links[id]); } else if (sof_nau8825_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT) { sof_rt1015p_dai_link(&links[id]); + } else if (sof_nau8825_quirk & + SOF_NAU8318_SPEAKER_AMP_PRESENT) { + links[id].codecs = nau8318_components; + links[id].num_codecs = ARRAY_SIZE(nau8318_components); + links[id].init = speaker_codec_init; } else { goto devm_err; } @@ -657,6 +670,16 @@ static const struct platform_device_id board_ids[] = { SOF_BT_OFFLOAD_SSP(2) | SOF_SSP_BT_OFFLOAD_PRESENT), }, + { + .name = "adl_nau8318_8825", + .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_NAU8318_SPEAKER_AMP_PRESENT | + SOF_NAU8825_SSP_AMP(1) | + SOF_NAU8825_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 60aee56f94bd..b1c0a89a8787 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -450,6 +450,11 @@ static const struct snd_soc_acpi_codecs adl_lt6911_hdmi = { .codecs = {"INTC10B0"} }; +static const struct snd_soc_acpi_codecs adl_nau8318_amp = { + .num_codecs = 1, + .codecs = {"NVTN2012"} +}; + struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { { .comp_ids = &adl_rt5682_rt5682s_hp, @@ -507,6 +512,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { .quirk_data = &adl_rt1015p_amp, .sof_tplg_filename = "sof-adl-rt1015-nau8825.tplg", }, + { + .id = "10508825", + .drv_name = "adl_nau8318_8825", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &adl_nau8318_amp, + .sof_tplg_filename = "sof-adl-nau8318-nau8825.tplg", + }, { .id = "10508825", .drv_name = "sof_nau8825", -- 2.25.1

2 1

[PATCH] ASoC: Intel: fix sof-nau8825 link failure
by Arnd Bergmann 27 Dec '22

27 Dec '22

From: Arnd Bergmann <arnd(a)arndb.de> The snd-soc-sof_nau8825.ko module fails to link unless the sof_realtek_common support is also enabled: ERROR: modpost: "sof_rt1015p_codec_conf" [sound/soc/intel/boards/snd-soc-sof_nau8825.ko] undefined! ERROR: modpost: "sof_rt1015p_dai_link" [sound/soc/intel/boards/snd-soc-sof_nau8825.ko] undefined! Fixes: 8d0872f6239f ("ASoC: Intel: add sof-nau8825 machine driver") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/intel/boards/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index a472de1909f4..9aee729c2406 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -558,6 +558,7 @@ config SND_SOC_INTEL_SOF_NAU8825_MACH select SND_SOC_HDAC_HDMI select SND_SOC_INTEL_HDA_DSP_COMMON select SND_SOC_INTEL_SOF_MAXIM_COMMON + select SND_SOC_INTEL_SOF_REALTEK_COMMON help This adds support for ASoC machine driver for SOF platforms with nau8825 codec. -- 2.35.1

3 2

[PATCH] ASoC: Intel: sof-nau8825: fix module alias overflow
by Arnd Bergmann 27 Dec '22

27 Dec '22

From: Arnd Bergmann <arnd(a)arndb.de> The maximum name length for a platform_device_id entry is 20 characters including the trailing NUL byte. The sof_nau8825.c file exceeds that, which causes an obscure error message: sound/soc/intel/boards/snd-soc-sof_nau8825.mod.c:35:45: error: illegal character encoding in string literal [-Werror,-Winvalid-source-encoding] MODULE_ALIAS("platform:adl_max98373_nau8825<U+0018><AA>"); ^~~~ include/linux/module.h:168:49: note: expanded from macro 'MODULE_ALIAS' ^~~~~~ include/linux/module.h:165:56: note: expanded from macro 'MODULE_INFO' ^~~~ include/linux/moduleparam.h:26:47: note: expanded from macro '__MODULE_INFO' = __MODULE_INFO_PREFIX __stringify(tag) "=" info I could not figure out how to make the module handling robust enough to handle this better, but as a quick fix, using slightly shorter names that are still unique avoids the build issue. Fixes: 8d0872f6239f ("ASoC: Intel: add sof-nau8825 machine driver") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/intel/boards/sof_nau8825.c | 8 ++++---- sound/soc/intel/common/soc-acpi-intel-adl-match.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 27880224359d..009a41fbefa1 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -618,7 +618,7 @@ static const struct platform_device_id board_ids[] = { }, { - .name = "adl_rt1019p_nau8825", + .name = "adl_rt1019p_8825", .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | SOF_SPEAKER_AMP_PRESENT | SOF_RT1019P_SPEAKER_AMP_PRESENT | @@ -626,7 +626,7 @@ static const struct platform_device_id board_ids[] = { SOF_NAU8825_NUM_HDMIDEV(4)), }, { - .name = "adl_max98373_nau8825", + .name = "adl_max98373_8825", .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | SOF_SPEAKER_AMP_PRESENT | SOF_MAX98373_SPEAKER_AMP_PRESENT | @@ -637,7 +637,7 @@ static const struct platform_device_id board_ids[] = { }, { /* The limitation of length of char array, shorten the name */ - .name = "adl_mx98360a_nau8825", + .name = "adl_mx98360a_8825", .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | SOF_SPEAKER_AMP_PRESENT | SOF_MAX98360A_SPEAKER_AMP_PRESENT | @@ -648,7 +648,7 @@ static const struct platform_device_id board_ids[] = { }, { - .name = "adl_rt1015p_nau8825", + .name = "adl_rt1015p_8825", .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | SOF_SPEAKER_AMP_PRESENT | SOF_RT1015P_SPEAKER_AMP_PRESENT | diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 60aee56f94bd..1f79fef600ac 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -474,21 +474,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { }, { .id = "10508825", - .drv_name = "adl_rt1019p_nau8825", + .drv_name = "adl_rt1019p_8825", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &adl_rt1019p_amp, .sof_tplg_filename = "sof-adl-rt1019-nau8825.tplg", }, { .id = "10508825", - .drv_name = "adl_max98373_nau8825", + .drv_name = "adl_max98373_8825", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &adl_max98373_amp, .sof_tplg_filename = "sof-adl-max98373-nau8825.tplg", }, { .id = "10508825", - .drv_name = "adl_mx98360a_nau8825", + .drv_name = "adl_mx98360a_8825", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &adl_max98360a_amp, .sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg", @@ -502,7 +502,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { }, { .id = "10508825", - .drv_name = "adl_rt1015p_nau8825", + .drv_name = "adl_rt1015p_8825", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &adl_rt1015p_amp, .sof_tplg_filename = "sof-adl-rt1015-nau8825.tplg", -- 2.35.1

3 2

[PATCH v2] ASoC: Intel: sof_nau8825: add variant with nau8318 amplifier.
by Ajye Huang 27 Dec '22

27 Dec '22

This patch adds the driver data for two nau8318 speaker amplifiers on SSP1 and nau8825 on SSP0 for ADL platform. The nau8315 and nau8318 are both Nuvoton Amp chips. They use the same Amp driver nau8315.c. The acpi_device_id for nau8315 is "NVTN2010", for nau8318 is "NVTN2012". The nau8825 is one of Nuvoton headset codec, and its acpi_device_id is "10508825". Signed-off-by: Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> --- sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/sof_nau8825.c | 23 +++++++++++++++++++ .../intel/common/soc-acpi-intel-adl-match.c | 12 ++++++++++ 3 files changed, 36 insertions(+) diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index a472de1909f4..3f68e9edd853 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -554,6 +554,7 @@ config SND_SOC_INTEL_SOF_NAU8825_MACH select SND_SOC_RT1015P select SND_SOC_MAX98373_I2C select SND_SOC_MAX98357A + select SND_SOC_NAU8315 select SND_SOC_DMIC select SND_SOC_HDAC_HDMI select SND_SOC_INTEL_HDA_DSP_COMMON diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 27880224359d..0936450be153 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -48,6 +48,7 @@ #define SOF_MAX98373_SPEAKER_AMP_PRESENT BIT(15) #define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(16) #define SOF_RT1015P_SPEAKER_AMP_PRESENT BIT(17) +#define SOF_NAU8318_SPEAKER_AMP_PRESENT BIT(18) static unsigned long sof_nau8825_quirk = SOF_NAU8825_SSP_CODEC(0); @@ -338,6 +339,13 @@ static struct snd_soc_dai_link_component rt1019p_component[] = { } }; +static struct snd_soc_dai_link_component nau8318_components[] = { + { + .name = "NVTN2012:00", + .dai_name = "nau8315-hifi", + } +}; + static struct snd_soc_dai_link_component dummy_component[] = { { .name = "snd-soc-dummy", @@ -486,6 +494,11 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, max_98360a_dai_link(&links[id]); } else if (sof_nau8825_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT) { sof_rt1015p_dai_link(&links[id]); + } else if (sof_nau8825_quirk & + SOF_NAU8318_SPEAKER_AMP_PRESENT) { + links[id].codecs = nau8318_components; + links[id].num_codecs = ARRAY_SIZE(nau8318_components); + links[id].init = speaker_codec_init; } else { goto devm_err; } @@ -657,6 +670,16 @@ static const struct platform_device_id board_ids[] = { SOF_BT_OFFLOAD_SSP(2) | SOF_SSP_BT_OFFLOAD_PRESENT), }, + { + .name = "adl_nau8318_nau8825", + .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_NAU8318_SPEAKER_AMP_PRESENT | + SOF_NAU8825_SSP_AMP(1) | + SOF_NAU8825_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 60aee56f94bd..1a69cd8c5e18 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -450,6 +450,11 @@ static const struct snd_soc_acpi_codecs adl_lt6911_hdmi = { .codecs = {"INTC10B0"} }; +static const struct snd_soc_acpi_codecs adl_nau8318_amp = { + .num_codecs = 1, + .codecs = {"NVTN2012"} +}; + struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { { .comp_ids = &adl_rt5682_rt5682s_hp, @@ -507,6 +512,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { .quirk_data = &adl_rt1015p_amp, .sof_tplg_filename = "sof-adl-rt1015-nau8825.tplg", }, + { + .id = "10508825", + .drv_name = "adl_nau8318_nau8825", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &adl_nau8318_amp, + .sof_tplg_filename = "sof-adl-nau8318-nau8825.tplg", + }, { .id = "10508825", .drv_name = "sof_nau8825", -- 2.25.1

3 11

Re: [PATCH] ASoC: amd: yc: Add Razer Blade 14 2022 into DMI table
by Mark Brown 27 Dec '22

27 Dec '22

On Fri, 16 Dec 2022 09:18:27 +0100, Wim Van Boven wrote: > Razer Blade 14 (2022) - RZ09-0427 needs the quirk to enable the built in microphone > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: amd: yc: Add Razer Blade 14 2022 into DMI table commit: 68506a173dd700c2bd794dcc3489edcdb8ee35c6 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

[PATCH 1/2] ALSA: line6: correct midi status byte when receiving data from podxt
by Artem Egorkine 26 Dec '22

26 Dec '22

A PODxt device sends 0xb2, 0xc2 or 0xf2 as a status byte for MIDI messages over USB that should otherwise have a 0xb0, 0xc0 or 0xf0 status byte. This is usually corrected by the driver on other OSes. This fixes MIDI sysex messages sent by PODxt. Signed-off-by: Artem Egorkine <arteme(a)gmail.com> --- sound/usb/line6/driver.c | 3 ++- sound/usb/line6/midi.c | 3 ++- sound/usb/line6/midibuf.c | 25 +++++++++++++++++-------- sound/usb/line6/midibuf.h | 5 ++++- sound/usb/line6/pod.c | 3 ++- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index 59faa5a9a714..b41373413224 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -304,7 +304,8 @@ static void line6_data_received(struct urb *urb) for (;;) { done = line6_midibuf_read(mb, line6->buffer_message, - LINE6_MIDI_MESSAGE_MAXLEN); + LINE6_MIDI_MESSAGE_MAXLEN, + LINE6_MIDIBUF_READ_RX); if (done <= 0) break; diff --git a/sound/usb/line6/midi.c b/sound/usb/line6/midi.c index ba0e2b7e8fe1..d52355de2bbc 100644 --- a/sound/usb/line6/midi.c +++ b/sound/usb/line6/midi.c @@ -56,7 +56,8 @@ static void line6_midi_transmit(struct snd_rawmidi_substream *substream) for (;;) { done = line6_midibuf_read(mb, chunk, - LINE6_FALLBACK_MAXPACKETSIZE); + LINE6_FALLBACK_MAXPACKETSIZE, + LINE6_MIDIBUF_READ_TX); if (done == 0) break; diff --git a/sound/usb/line6/midibuf.c b/sound/usb/line6/midibuf.c index 6a70463f82c4..e7f830f7526c 100644 --- a/sound/usb/line6/midibuf.c +++ b/sound/usb/line6/midibuf.c @@ -9,6 +9,7 @@ #include "midibuf.h" + static int midibuf_message_length(unsigned char code) { int message_length; @@ -20,12 +21,7 @@ static int midibuf_message_length(unsigned char code) message_length = length[(code >> 4) - 8]; } else { - /* - Note that according to the MIDI specification 0xf2 is - the "Song Position Pointer", but this is used by Line 6 - to send sysex messages to the host. - */ - static const int length[] = { -1, 2, -1, 2, -1, -1, 1, 1, 1, 1, + static const int length[] = { -1, 2, 2, 2, -1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, 1 }; message_length = length[code & 0x0f]; @@ -125,7 +121,7 @@ int line6_midibuf_write(struct midi_buffer *this, unsigned char *data, } int line6_midibuf_read(struct midi_buffer *this, unsigned char *data, - int length) + int length, int read_type) { int bytes_used; int length1, length2; @@ -148,9 +144,22 @@ int line6_midibuf_read(struct midi_buffer *this, unsigned char *data, length1 = this->size - this->pos_read; - /* check MIDI command length */ command = this->buf[this->pos_read]; + /* + PODxt always has status byte lower nibble set to 0010, + when it means to send 0000, so we correct if here so + that control/program changes come on channel 1 and + sysex message status byte is correct + */ + if (read_type == LINE6_MIDIBUF_READ_RX) { + if (command == 0xb2 || command == 0xc2 || command == 0xf2) { + unsigned char fixed = command & 0xf0; + this->buf[this->pos_read] = fixed; + command = fixed; + } + } + /* check MIDI command length */ if (command & 0x80) { midi_length = midibuf_message_length(command); this->command_prev = command; diff --git a/sound/usb/line6/midibuf.h b/sound/usb/line6/midibuf.h index 124a8f9f7e96..542e8d836f87 100644 --- a/sound/usb/line6/midibuf.h +++ b/sound/usb/line6/midibuf.h @@ -8,6 +8,9 @@ #ifndef MIDIBUF_H #define MIDIBUF_H +#define LINE6_MIDIBUF_READ_TX 0 +#define LINE6_MIDIBUF_READ_RX 1 + struct midi_buffer { unsigned char *buf; int size; @@ -23,7 +26,7 @@ extern void line6_midibuf_destroy(struct midi_buffer *mb); extern int line6_midibuf_ignore(struct midi_buffer *mb, int length); extern int line6_midibuf_init(struct midi_buffer *mb, int size, int split); extern int line6_midibuf_read(struct midi_buffer *mb, unsigned char *data, - int length); + int length, int read_type); extern void line6_midibuf_reset(struct midi_buffer *mb); extern int line6_midibuf_write(struct midi_buffer *mb, unsigned char *data, int length); diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c index cd41aa7f0385..d173971e5f02 100644 --- a/sound/usb/line6/pod.c +++ b/sound/usb/line6/pod.c @@ -159,8 +159,9 @@ static struct line6_pcm_properties pod_pcm_properties = { .bytes_per_channel = 3 /* SNDRV_PCM_FMTBIT_S24_3LE */ }; + static const char pod_version_header[] = { - 0xf2, 0x7e, 0x7f, 0x06, 0x02 + 0xf0, 0x7e, 0x7f, 0x06, 0x02 }; static char *pod_alloc_sysex_buffer(struct usb_line6_pod *pod, int code, -- 2.38.1

2 2

[PATCH 1/3] ASoC: dt-bindings: Extend name-prefix.yaml into common DAI properties
by Krzysztof Kozlowski 26 Dec '22

26 Dec '22

Rename name-prefix.yaml into common DAI schema and document '#sound-dai-cells' for completeness. The '#sound-dai-cells' cannot be really constrained, as there are users with value of 0, 1 and 2, but at least it brings definition to one common place. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- This is an output of discussion here: https://lore.kernel.org/all/Y255C+TGNVJ9fs8A@sirena.org.uk/ --- .../devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml | 2 +- Documentation/devicetree/bindings/sound/amlogic,aiu.yaml | 2 +- .../devicetree/bindings/sound/amlogic,g12a-toacodec.yaml | 2 +- Documentation/devicetree/bindings/sound/amlogic,t9015.yaml | 2 +- Documentation/devicetree/bindings/sound/awinic,aw8738.yaml | 2 +- .../bindings/sound/{name-prefix.yaml => dai-common.yaml} | 6 ++++-- Documentation/devicetree/bindings/sound/dmic-codec.yaml | 2 +- .../devicetree/bindings/sound/linux,spdif-dit.yaml | 2 +- .../devicetree/bindings/sound/nvidia,tegra186-asrc.yaml | 2 +- .../devicetree/bindings/sound/nvidia,tegra186-dspk.yaml | 2 +- .../devicetree/bindings/sound/nvidia,tegra210-adx.yaml | 2 +- .../devicetree/bindings/sound/nvidia,tegra210-amx.yaml | 2 +- .../devicetree/bindings/sound/nvidia,tegra210-dmic.yaml | 2 +- .../devicetree/bindings/sound/nvidia,tegra210-i2s.yaml | 2 +- .../devicetree/bindings/sound/nvidia,tegra210-mixer.yaml | 2 +- .../devicetree/bindings/sound/nvidia,tegra210-mvc.yaml | 2 +- .../devicetree/bindings/sound/nvidia,tegra210-ope.yaml | 2 +- .../devicetree/bindings/sound/nvidia,tegra210-sfc.yaml | 2 +- Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml | 2 +- Documentation/devicetree/bindings/sound/rt5659.txt | 2 +- .../devicetree/bindings/sound/simple-audio-amplifier.yaml | 2 +- .../devicetree/bindings/sound/simple-audio-mux.yaml | 2 +- Documentation/devicetree/bindings/sound/ti,src4xxx.yaml | 2 +- 23 files changed, 26 insertions(+), 24 deletions(-) rename Documentation/devicetree/bindings/sound/{name-prefix.yaml => dai-common.yaml} (81%) diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml index 7cdffdb131ac..74cefdf1b843 100644 --- a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml @@ -11,7 +11,7 @@ maintainers: - Neil Armstrong <neil.armstrong(a)linaro.org> allOf: - - $ref: /schemas/sound/name-prefix.yaml# + - $ref: /schemas/sound/dai-common.yaml# description: | The Amlogic Meson Synopsys Designware Integration is composed of diff --git a/Documentation/devicetree/bindings/sound/amlogic,aiu.yaml b/Documentation/devicetree/bindings/sound/amlogic,aiu.yaml index 0705f91199a0..6350dfc0a926 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,aiu.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,aiu.yaml @@ -10,7 +10,7 @@ maintainers: - Jerome Brunet <jbrunet(a)baylibre.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml b/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml index 77469a45bb7a..23f82bb89750 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml @@ -10,7 +10,7 @@ maintainers: - Jerome Brunet <jbrunet(a)baylibre.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml b/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml index 580a3d040abc..5f5cccdbeb34 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml @@ -10,7 +10,7 @@ maintainers: - Jerome Brunet <jbrunet(a)baylibre.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/awinic,aw8738.yaml b/Documentation/devicetree/bindings/sound/awinic,aw8738.yaml index dce86dafe382..bc6c6b172238 100644 --- a/Documentation/devicetree/bindings/sound/awinic,aw8738.yaml +++ b/Documentation/devicetree/bindings/sound/awinic,aw8738.yaml @@ -15,7 +15,7 @@ description: function (primarily the power limit for the amplifier). allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/sound/name-prefix.yaml b/Documentation/devicetree/bindings/sound/dai-common.yaml similarity index 81% rename from Documentation/devicetree/bindings/sound/name-prefix.yaml rename to Documentation/devicetree/bindings/sound/dai-common.yaml index 2fe57f87ac52..d858eea73ed7 100644 --- a/Documentation/devicetree/bindings/sound/name-prefix.yaml +++ b/Documentation/devicetree/bindings/sound/dai-common.yaml @@ -1,10 +1,10 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/sound/name-prefix.yaml# +$id: http://devicetree.org/schemas/sound/dai-common.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Component sound name prefix +title: Digital Audio Interface Common Properties maintainers: - Jerome Brunet <jbrunet(a)baylibre.com> @@ -18,4 +18,6 @@ properties: sink/source names may use this property to prepend the name of their sinks/sources with the provided string. + '#sound-dai-cells': true + additionalProperties: true diff --git a/Documentation/devicetree/bindings/sound/dmic-codec.yaml b/Documentation/devicetree/bindings/sound/dmic-codec.yaml index bba27c985996..59ef0cf6b6e5 100644 --- a/Documentation/devicetree/bindings/sound/dmic-codec.yaml +++ b/Documentation/devicetree/bindings/sound/dmic-codec.yaml @@ -10,7 +10,7 @@ maintainers: - Arnaud Pouliquen <arnaud.pouliquen(a)foss.st.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml b/Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml index 808f6d2736c7..fe5f0756af2f 100644 --- a/Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml +++ b/Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml @@ -10,7 +10,7 @@ maintainers: - Mark Brown <broonie(a)kernel.org> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml index d82415c21271..e15f387c4c29 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml @@ -23,7 +23,7 @@ maintainers: - Sameer Pujar <spujar(a)nvidia.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml index 3d538df878ea..e1362c77472b 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml @@ -18,7 +18,7 @@ maintainers: - Sameer Pujar <spujar(a)nvidia.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml index ea0dc0ece1bc..e4c871797fa6 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml @@ -19,7 +19,7 @@ maintainers: - Sameer Pujar <spujar(a)nvidia.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml index 1aff61f072bb..021b72546ba4 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml @@ -18,7 +18,7 @@ maintainers: - Sameer Pujar <spujar(a)nvidia.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml index 0f9d2b461e02..bff551c35da7 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml @@ -17,7 +17,7 @@ maintainers: - Sameer Pujar <spujar(a)nvidia.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml index 12cd17eede99..a82f11fb6c9a 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml @@ -17,7 +17,7 @@ maintainers: - Sameer Pujar <spujar(a)nvidia.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml index 570b03282aeb..049898f02e85 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml @@ -17,7 +17,7 @@ maintainers: - Sameer Pujar <spujar(a)nvidia.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml index 4aecbc847b98..d0280d8aa3af 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml @@ -20,7 +20,7 @@ maintainers: - Sameer Pujar <spujar(a)nvidia.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml index 9dc9ba590fa3..5fc03b8771b1 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml @@ -17,7 +17,7 @@ maintainers: - Sameer Pujar <spujar(a)nvidia.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml index 694f890d6305..185ca0be4f02 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml @@ -17,7 +17,7 @@ maintainers: - Sameer Pujar <spujar(a)nvidia.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: $nodename: diff --git a/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml b/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml index 7f2e68ff6d34..fd2415e231eb 100644 --- a/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml +++ b/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml @@ -10,7 +10,7 @@ maintainers: - Stephan Gerhold <stephan(a)gerhold.net> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/sound/rt5659.txt b/Documentation/devicetree/bindings/sound/rt5659.txt index 013f534fa059..8f3f62c0226a 100644 --- a/Documentation/devicetree/bindings/sound/rt5659.txt +++ b/Documentation/devicetree/bindings/sound/rt5659.txt @@ -42,7 +42,7 @@ Optional properties: - realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin. - realtek,reset-gpios : The GPIO that controls the CODEC's RESET pin. -- sound-name-prefix: Please refer to name-prefix.yaml +- sound-name-prefix: Please refer to dai-common.yaml - ports: A Codec may have a single or multiple I2S interfaces. These interfaces on Codec side can be described under 'ports' or 'port'. diff --git a/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml b/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml index 5428ba9e23a6..5db1f989d050 100644 --- a/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml +++ b/Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml @@ -10,7 +10,7 @@ maintainers: - Jerome Brunet <jbrunet(a)baylibre.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/sound/simple-audio-mux.yaml b/Documentation/devicetree/bindings/sound/simple-audio-mux.yaml index b5fc35ee9b65..9f319caf3db7 100644 --- a/Documentation/devicetree/bindings/sound/simple-audio-mux.yaml +++ b/Documentation/devicetree/bindings/sound/simple-audio-mux.yaml @@ -14,7 +14,7 @@ description: | their input line is connected to the output line. allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/sound/ti,src4xxx.yaml b/Documentation/devicetree/bindings/sound/ti,src4xxx.yaml index 9681b72b4918..988ce8d8028f 100644 --- a/Documentation/devicetree/bindings/sound/ti,src4xxx.yaml +++ b/Documentation/devicetree/bindings/sound/ti,src4xxx.yaml @@ -14,7 +14,7 @@ maintainers: - Matt Flax <flatmax(a)flatmax.com> allOf: - - $ref: name-prefix.yaml# + - $ref: dai-common.yaml# properties: compatible: -- 2.34.1

4 8

sof-hda-dsp: Set Dmic0 Capture Switch on
by GitHub pull_request - opened 26 Dec '22

26 Dec '22

alsa-project/alsa-ucm-conf pull request #259 was opened from KaiChuan-Hsieh: Internal microphone default is off after fresh installation. Add operation to set the control on to align with other sound architecture. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/259 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/259.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2 0/2] ASoC: codec: lpass-va: add npl clock support
by Srinivas Kandagatla 24 Dec '22

24 Dec '22

New versions of VA Macro has soundwire integrated, so handle the soundwire npl clock correctly in the codec driver and add related bindings. Changes since v1: - updated bindings as per Kryz comments. - added error handling during npl and mclk enable. Srinivas Kandagatla (2): ASoC: dt-bindings: lpass-va: add npl clock for new VA macro ASoC: codecs: va-macro: add npl clk .../bindings/sound/qcom,lpass-va-macro.yaml | 63 ++++++++++++++++--- sound/soc/codecs/lpass-va-macro.c | 46 ++++++++++++++ 2 files changed, 101 insertions(+), 8 deletions(-) -- 2.25.1

2 5

ucm2: sof-essx8336: don't use disdevall for this device
by GitHub pull_request - opened 24 Dec '22

24 Dec '22

alsa-project/alsa-ucm-conf pull request #258 was opened from mchehab: disdevall causes undesired side effects on this device, as it breaks main microphone's detection, and makes hdmi outputs invisible at pavucontrol (tested with pipewire-pulse). So, rely on cset to disable what's not needed at the enable sequence. Fixes: 15a12508003c ("ucm2: put disdevall to HDA/Soundwire configs") Signed-off-by: Mauro Carvalho Chehab <mchehab(a)kernel.org> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/258 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/258.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[6.2][regression] after commit ffcb754584603adf7039d7972564fbf6febdc542 all sound devices disappeared (due BUG at mm/page_alloc.c:3592!)
by Mikhail Gavrilov 24 Dec '22

24 Dec '22

Hi, The kernel 6.2 preparation cycle has begun and yesterday after the kernel was updated on my Fedora Rawhide all audio devices disappeared. The backtrace of the issue looks like: [ 133.033269] page:00000000e4a2c44b refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x207490 [ 133.033353] head:00000000e4a2c44b order:2 compound_mapcount:0 subpages_mapcount:0 compound_pincount:0 [ 133.033360] flags: 0x17ffffc0010000(head|node=0|zone=2|lastcpupid=0x1fffff) [ 133.033369] raw: 0017ffffc0010000 0000000000000000 dead000000000122 0000000000000000 [ 133.033376] raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000 [ 133.033381] page dumped because: VM_BUG_ON_PAGE(PageCompound(page)) [ 133.033392] ------------[ cut here ]------------ [ 133.033397] kernel BUG at mm/page_alloc.c:3592! [ 133.033406] invalid opcode: 0000 [#1] PREEMPT SMP NOPTI [ 133.033410] CPU: 22 PID: 1673 Comm: wireplumber Tainted: G W L ------- --- 6.2.0-0.rc0.20221214gite2ca6ba6ba01.3.fc38.x86_64 #1 [ 133.033415] Hardware name: System manufacturer System Product Name/ROG STRIX X570-I GAMING, BIOS 4408 10/28/2022 [ 133.033417] RIP: 0010:split_page+0xa2/0x160 [ 133.033425] Code: 00 48 83 c7 40 48 39 d7 75 d7 0f 1f 44 00 00 89 ee 48 89 df 5b 5d e9 2d fe 06 00 48 c7 c6 d8 ca 9a 95 48 89 df e8 8e 77 fc ff <0f> 0b 48 89 f8 f7 c7 ff 0f 00 00 0f 85 7a ff ff ff 48 8b 17 f7 c2 [ 133.033428] RSP: 0018:ffff9f5645177b98 EFLAGS: 00010286 [ 133.033432] RAX: 0000000000000037 RBX: ffffeb89c81d2400 RCX: 0000000000000000 [ 133.033435] RDX: 0000000000000001 RSI: ffffffff959f0673 RDI: 00000000ffffffff [ 133.033438] RBP: 0000000000000002 R08: 0000000000000000 R09: ffff9f5645177a08 [ 133.033440] R10: 0000000000000003 R11: ffff8d032e2fffe8 R12: 0000000000000007 [ 133.033442] R13: 0000000000000004 R14: 0000000000000000 R15: 0000000000000001 [ 133.033445] FS: 00007f7e55702800(0000) GS:ffff8d02e8200000(0000) knlGS:0000000000000000 [ 133.033448] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 133.033450] CR2: 00007f7e556cb000 CR3: 00000001f604e000 CR4: 0000000000350ee0 [ 133.033453] Call Trace: [ 133.033455] <TASK> [ 133.033458] __iommu_dma_alloc_noncontiguous.constprop.0+0x2de/0x3e0 [ 133.033468] ? rcu_read_lock_sched_held+0x3f/0x80 [ 133.033475] iommu_dma_alloc_noncontiguous+0x66/0xb0 [ 133.033481] dma_alloc_noncontiguous+0x54/0x1a0 [ 133.033489] snd_dma_noncontig_alloc+0x25/0x120 [snd_pcm] [ 133.033505] snd_dma_sg_wc_alloc+0x13/0xb0 [snd_pcm] [ 133.033519] snd_dma_alloc_dir_pages+0x50/0x90 [snd_pcm] [ 133.033532] do_alloc_pages+0x49/0xa0 [snd_pcm] [ 133.033546] snd_pcm_lib_malloc_pages+0xf1/0x1e0 [snd_pcm] [ 133.033560] snd_pcm_hw_params+0x57f/0x620 [snd_pcm] [ 133.033576] snd_pcm_common_ioctl+0x1e4/0x12a0 [snd_pcm] [ 133.033595] snd_pcm_ioctl+0x23/0x40 [snd_pcm] [ 133.033607] __x64_sys_ioctl+0x90/0xd0 [ 133.033613] do_syscall_64+0x5b/0x80 [ 133.033618] ? do_syscall_64+0x67/0x80 [ 133.033622] ? lockdep_hardirqs_on+0x7d/0x100 [ 133.033627] ? do_syscall_64+0x67/0x80 [ 133.033630] ? do_syscall_64+0x67/0x80 [ 133.033633] ? do_syscall_64+0x67/0x80 [ 133.033636] ? do_syscall_64+0x67/0x80 [ 133.033640] ? lockdep_hardirqs_on+0x7d/0x100 [ 133.033644] entry_SYSCALL_64_after_hwframe+0x63/0xcd [ 133.033648] RIP: 0033:0x7f7e55b5f65f [ 133.033671] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28 00 00 [ 133.033674] RSP: 002b:00007ffd24c51ec0 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 133.033678] RAX: ffffffffffffffda RBX: 00007ffd24c520f0 RCX: 00007f7e55b5f65f [ 133.033681] RDX: 00007ffd24c520f0 RSI: 00000000c2604111 RDI: 0000000000000023 [ 133.033683] RBP: 0000556c04c4ff60 R08: 0000000000000000 R09: 0000000000000000 [ 133.033685] R10: 0000000000000004 R11: 0000000000000246 R12: 0000556c04c4fee0 [ 133.033688] R13: 00007ffd24c52360 R14: 00007ffd24c527b0 R15: 00007ffd24c520f0 [ 133.033696] </TASK> [ 133.033698] Modules linked in: snd_seq_dummy snd_hrtimer nf_conntrack_netbios_ns nf_conntrack_broadcast nft_fib_inet nft_fib_ipv4 nft_fib_ipv6 nft_fib nft_reject_inet nf_reject_ipv4 nf_reject_ipv6 nft_reject nft_ct nft_chain_nat nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 ip_set nf_tables nfnetlink qrtr bnep sunrpc binfmt_misc iwlmvm hid_logitech_hidpp btusb btrtl btbcm snd_seq_midi snd_seq_midi_event btintel btmtk snd_usb_audio bluetooth snd_usbmidi_lib iwlwifi xpad snd_rawmidi ff_memless mc intel_rapl_msr joydev intel_rapl_common snd_hda_codec_realtek edac_mce_amd snd_hda_codec_generic snd_hda_codec_hdmi mt76x2u snd_hda_intel kvm_amd snd_intel_dspcfg mt76x2_common snd_intel_sdw_acpi mt76x02_usb snd_hda_codec asus_ec_sensors mt76_usb kvm vfat snd_hda_core fat mt76x02_lib snd_hwdep eeepc_wmi mt76 snd_seq asus_wmi ledtrig_audio snd_seq_device irqbypass sparse_keymap snd_pcm rapl platform_profile wmi_bmof pcspkr snd_timer mac80211 k10temp snd i2c_piix4 soundcore libarc4 acpi_cpufreq [ 133.033777] cfg80211 hid_logitech_dj rfkill zram amdgpu drm_ttm_helper ttm crct10dif_pclmul crc32_pclmul video crc32c_intel polyval_clmulni iommu_v2 gpu_sched polyval_generic drm_buddy nvme ucsi_ccg drm_display_helper typec_ucsi ghash_clmulni_intel ccp igb sha512_ssse3 typec nvme_core sp5100_tco cec dca nvme_common wmi ip6_tables ip_tables fuse [ 133.033832] ---[ end trace 0000000000000000 ]--- I bisected problematic commit and find this: ffcb754584603adf7039d7972564fbf6febdc542 is the first bad commit commit ffcb754584603adf7039d7972564fbf6febdc542 Author: Christoph Hellwig <hch(a)lst.de> Date: Wed Nov 9 08:37:17 2022 +0100 dma-mapping: reject __GFP_COMP in dma_alloc_attrs DMA allocations can never be turned back into a page pointer, so requesting compound pages doesn't make sense and it can't even be supported at all by various backends. Reject __GFP_COMP with a warning in dma_alloc_attrs, and stop clearing the flag in the arm dma ops and dma-iommu. Signed-off-by: Christoph Hellwig <hch(a)lst.de> Acked-by: Marek Szyprowski <m.szyprowski(a)samsung.com> arch/arm/mm/dma-mapping.c | 17 ----------------- drivers/iommu/dma-iommu.c | 3 --- kernel/dma/mapping.c | 8 ++++++++ 3 files changed, 8 insertions(+), 20 deletions(-) Reverting this commit and rebuilding the kernel confirmed the correctness of the find. I hope my report helps fix the problem quickly. Full kernel log is here: https://pastebin.com/5hsuhifY -- Best Regards, Mike Gavrilov.

5 7

rt5650 on HP Chromebook G5 Setzer faults
by Mark Hills 23 Dec '22

23 Dec '22

HP Chromebook (11a, G5 "Setzer") uses snd_soc_sst_cht_bsw_rt5645 module and presents a device "rt5650". Audio works briefly, until after about 30 seconds it's interrupted by a square wave or short buffer cycling. With no clear fault in dmesg when the audio goes bad, I'm not sure where to turn next. Removing PulseAudio etc., I'm able to confirm the problem exists close to the ALSA driver: $ aplay -D plughw:rt5650,0,0 mixdownfinal.wav Playing WAVE 'mixdownfinal.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo Once gone bad, it can still be interrupted: ^CAborted by signal Interrupt... aplay: pcm_write:2127: write error: Interrupted system call I did once hear playback recover and continue, too. When it happens with eg. YouTube + Firefox + PulseAudio, the video halts. So it seems like the clock has gone awry. At the time it happens, the status is stuck (see below) dmesg shows some faults on startup (see below), but they seem to relate to alsactl, however I thought they should be reported. It doesn't help that I'm not familiar with these SOC devices or have a dev environment in XUbuntu. It's easy to reproduce though, so is there any reasonable step to get closer to a fix to make this system usable? Many thanks -- Mark /proc/asound/rt5650/pcm0p/sub0$ cat status state: RUNNING owner_pid : 11666 trigger_time: 177701.111960109 tstamp : 0.000000000 delay : 16384 avail : 0 avail_max : 0 ----- hw_ptr : 7102464 appl_ptr : 7118848 $ uname -a Linux wren 5.19.0-26-generic #27-Ubuntu SMP PREEMPT_DYNAMIC Wed Nov 23 20:44:15 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux # Intel PCH card seems to be the HDMI output $ cat /proc/asound/cards 0 [rt5650 ]: SOF - sof-bytcht rt5650 GOOGLE-Setzer-1.0 1 [PCH ]: HDA-Intel - HDA Intel PCH HDA Intel PCH at 0x91314000 irq 316 $ lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 22.10 Release: 22.10 Codename: kinetic $ dmesg [ 0.000000] Linux version 5.19.0-26-generic (buildd@lcy02-amd64-064) (x86_64-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0, GNU ld (GNU Binutils for Ubuntu) 2.39) #27-Ubuntu SMP PREEMPT_DYNAMIC Wed Nov 23 20:44:15 UTC 2022 (Ubuntu 5.19.0-26.27-generic 5.19.7) [ 0.000000] Command line: BOOT_IMAGE=/boot/vmlinuz-5.19.0-26-generic root=UUID=f3696ad1-610d-47df-af28-f4fc95355175 ro quiet splash vt.handoff=7 [ 0.000000] KERNEL supported cpus: [ 0.000000] Intel GenuineIntel [ 0.000000] AMD AuthenticAMD [ 0.000000] Hygon HygonGenuine [ 0.000000] Centaur CentaurHauls [ 0.000000] zhaoxin Shanghai [ 0.000000] x86/fpu: x87 FPU will use FXSAVE [ 0.000000] signal: max sigframe size: 1440 [ 0.000000] BIOS-provided physical RAM map: [ 0.000000] BIOS-e820: [mem 0x0000000000000000-0x0000000000000fff] reserved [ 0.000000] BIOS-e820: [mem 0x0000000000001000-0x000000000009ffff] usable [ 0.000000] BIOS-e820: [mem 0x00000000000a0000-0x00000000000fffff] reserved [ 0.000000] BIOS-e820: [mem 0x0000000000100000-0x000000001ec4afff] usable [ 0.000000] BIOS-e820: [mem 0x000000001ec4b000-0x000000001ec4bfff] ACPI data [ 0.000000] BIOS-e820: [mem 0x000000001ec4c000-0x000000001fc91fff] usable [ 0.000000] BIOS-e820: [mem 0x000000001fc92000-0x000000001fc94fff] ACPI data [ 0.000000] BIOS-e820: [mem 0x000000001fc95000-0x000000001fca8fff] usable [ 0.000000] BIOS-e820: [mem 0x000000001fca9000-0x000000001fcabfff] ACPI data [ 0.000000] BIOS-e820: [mem 0x000000001fcac000-0x000000001feaefff] usable [ 0.000000] BIOS-e820: [mem 0x000000001feaf000-0x000000001fff2fff] reserved [ 0.000000] BIOS-e820: [mem 0x000000001fff3000-0x000000001fff6fff] ACPI NVS [ 0.000000] BIOS-e820: [mem 0x000000001fff7000-0x000000001fffefff] ACPI data [ 0.000000] BIOS-e820: [mem 0x000000001ffff000-0x000000001fffffff] usable [ 0.000000] BIOS-e820: [mem 0x0000000020000000-0x00000000201fffff] reserved [ 0.000000] BIOS-e820: [mem 0x0000000020200000-0x000000007cccdfff] usable [ 0.000000] BIOS-e820: [mem 0x000000007ccce000-0x000000007fffffff] reserved [ 0.000000] BIOS-e820: [mem 0x00000000ffdc0000-0x00000000ffdfffff] reserved [ 0.000000] BIOS-e820: [mem 0x0000000100000000-0x000000017fffffff] usable [ 0.000000] NX (Execute Disable) protection: active [ 0.000000] efi: EFI v2.70 by EDK II [ 0.000000] efi: SMBIOS=0x1ffd6000 SMBIOS 3.0=0x1ffd4000 ACPI=0x1fffe000 ACPI 2.0=0x1fffe014 MEMATTR=0x1e78f398 MOKvar=0x1ec37000 [ 0.000000] secureboot: Secure boot disabled [ 0.000000] SMBIOS 3.0.0 present. [ 0.000000] DMI: GOOGLE Setzer/Setzer, BIOS MrChromebox-4.18.2 11/29/2022 [ 0.000000] tsc: Detected 1600.000 MHz processor [ 0.000029] e820: update [mem 0x00000000-0x00000fff] usable ==> reserved [ 0.000036] e820: remove [mem 0x000a0000-0x000fffff] usable [ 0.000052] last_pfn = 0x180000 max_arch_pfn = 0x400000000 [ 0.000124] x86/PAT: Configuration [0-7]: WB WC UC- UC WB WP UC- WT [ 0.000401] last_pfn = 0x7ccce max_arch_pfn = 0x400000000 [ 0.005769] e820: update [mem 0x1ec37000-0x1ec37fff] usable ==> reserved [ 0.007683] secureboot: Secure boot disabled [ 0.007685] RAMDISK: [mem 0x1a0a7000-0x1e237fff] [ 0.007700] ACPI: Early table checksum verification disabled [ 0.007708] ACPI: RSDP 0x000000001FFFE014 000024 (v02 COREv4) [ 0.007717] ACPI: XSDT 0x000000001FFFD0E8 00005C (v01 COREv4 COREBOOT 00000000 01000013) [ 0.007730] ACPI: FACP 0x000000001FFFC000 000114 (v06 COREv4 COREBOOT 00000000 CORE 20220331) [ 0.007744] ACPI: DSDT 0x000000001FFF7000 0044F5 (v02 COREv4 COREBOOT 20110725 INTL 20220331) [ 0.007753] ACPI: FACS 0x000000007CCE6240 000040 [ 0.007761] ACPI: SSDT 0x000000001FCAA000 001094 (v02 COREv4 COREBOOT 0000002A CORE 20220331) [ 0.007769] ACPI: MCFG 0x000000001FCA9000 00003C (v01 COREv4 COREBOOT 00000000 CORE 20220331) [ 0.007777] ACPI: TCPA 0x000000001FC94000 000032 (v02 COREv4 COREBOOT 00000000 CORE 20220331) [ 0.007785] ACPI: APIC 0x000000001FC93000 00005C (v03 COREv4 COREBOOT 00000000 CORE 20220331) [ 0.007793] ACPI: HPET 0x000000001FC92000 000038 (v01 COREv4 COREBOOT 00000000 CORE 20220331) [ 0.007801] ACPI: BGRT 0x000000001EC4B000 000038 (v01 INTEL EDK2 00000002 01000013) [ 0.007808] ACPI: Reserving FACP table memory at [mem 0x1fffc000-0x1fffc113] [ 0.007812] ACPI: Reserving DSDT table memory at [mem 0x1fff7000-0x1fffb4f4] [ 0.007814] ACPI: Reserving FACS table memory at [mem 0x7cce6240-0x7cce627f] [ 0.007817] ACPI: Reserving SSDT table memory at [mem 0x1fcaa000-0x1fcab093] [ 0.007819] ACPI: Reserving MCFG table memory at [mem 0x1fca9000-0x1fca903b] [ 0.007822] ACPI: Reserving TCPA table memory at [mem 0x1fc94000-0x1fc94031] [ 0.007824] ACPI: Reserving APIC table memory at [mem 0x1fc93000-0x1fc9305b] [ 0.007826] ACPI: Reserving HPET table memory at [mem 0x1fc92000-0x1fc92037] [ 0.007829] ACPI: Reserving BGRT table memory at [mem 0x1ec4b000-0x1ec4b037] [ 0.008098] No NUMA configuration found [ 0.008101] Faking a node at [mem 0x0000000000000000-0x000000017fffffff] [ 0.008118] NODE_DATA(0) allocated [mem 0x17ffd4000-0x17fffefff] [ 0.008889] Zone ranges: [ 0.008891] DMA [mem 0x0000000000001000-0x0000000000ffffff] [ 0.008895] DMA32 [mem 0x0000000001000000-0x00000000ffffffff] [ 0.008899] Normal [mem 0x0000000100000000-0x000000017fffffff] [ 0.008902] Device empty [ 0.008904] Movable zone start for each node [ 0.008909] Early memory node ranges [ 0.008910] node 0: [mem 0x0000000000001000-0x000000000009ffff] [ 0.008913] node 0: [mem 0x0000000000100000-0x000000001ec4afff] [ 0.008916] node 0: [mem 0x000000001ec4c000-0x000000001fc91fff] [ 0.008918] node 0: [mem 0x000000001fc95000-0x000000001fca8fff] [ 0.008920] node 0: [mem 0x000000001fcac000-0x000000001feaefff] [ 0.008923] node 0: [mem 0x000000001ffff000-0x000000001fffffff] [ 0.008925] node 0: [mem 0x0000000020200000-0x000000007cccdfff] [ 0.008928] node 0: [mem 0x0000000100000000-0x000000017fffffff] [ 0.008931] Initmem setup node 0 [mem 0x0000000000001000-0x000000017fffffff] [ 0.008944] On node 0, zone DMA: 1 pages in unavailable ranges [ 0.009013] On node 0, zone DMA: 96 pages in unavailable ranges [ 0.011504] On node 0, zone DMA32: 1 pages in unavailable ranges [ 0.011508] On node 0, zone DMA32: 3 pages in unavailable ranges [ 0.011521] On node 0, zone DMA32: 3 pages in unavailable ranges [ 0.011532] On node 0, zone DMA32: 336 pages in unavailable ranges [ 0.019163] On node 0, zone DMA32: 512 pages in unavailable ranges [ 0.030033] On node 0, zone Normal: 13106 pages in unavailable ranges [ 0.030054] Reserving Intel graphics memory at [mem 0x7e000000-0x7fffffff] [ 0.030229] ACPI: PM-Timer IO Port: 0x408 [ 0.030268] IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-114 [ 0.030278] ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl) [ 0.030284] ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level) [ 0.030293] ACPI: Using ACPI (MADT) for SMP configuration information [ 0.030296] ACPI: HPET id: 0x8086a201 base: 0xfed00000 [ 0.030318] e820: update [mem 0x1e74c000-0x1e770fff] usable ==> reserved [ 0.030343] TSC deadline timer available [ 0.030346] smpboot: Allowing 2 CPUs, 0 hotplug CPUs [ 0.030390] PM: hibernation: Registered nosave memory: [mem 0x00000000-0x00000fff] [ 0.030396] PM: hibernation: Registered nosave memory: [mem 0x000a0000-0x000fffff] [ 0.030400] PM: hibernation: Registered nosave memory: [mem 0x1e74c000-0x1e770fff] [ 0.030404] PM: hibernation: Registered nosave memory: [mem 0x1ec37000-0x1ec37fff] [ 0.030408] PM: hibernation: Registered nosave memory: [mem 0x1ec4b000-0x1ec4bfff] [ 0.030412] PM: hibernation: Registered nosave memory: [mem 0x1fc92000-0x1fc94fff] [ 0.030416] PM: hibernation: Registered nosave memory: [mem 0x1fca9000-0x1fcabfff] [ 0.030420] PM: hibernation: Registered nosave memory: [mem 0x1feaf000-0x1fff2fff] [ 0.030422] PM: hibernation: Registered nosave memory: [mem 0x1fff3000-0x1fff6fff] [ 0.030424] PM: hibernation: Registered nosave memory: [mem 0x1fff7000-0x1fffefff] [ 0.030428] PM: hibernation: Registered nosave memory: [mem 0x20000000-0x201fffff] [ 0.030432] PM: hibernation: Registered nosave memory: [mem 0x7ccce000-0x7fffffff] [ 0.030434] PM: hibernation: Registered nosave memory: [mem 0x80000000-0xffdbffff] [ 0.030436] PM: hibernation: Registered nosave memory: [mem 0xffdc0000-0xffdfffff] [ 0.030438] PM: hibernation: Registered nosave memory: [mem 0xffe00000-0xffffffff] [ 0.030442] [mem 0x80000000-0xffdbffff] available for PCI devices [ 0.030445] Booting paravirtualized kernel on bare hardware [ 0.030450] clocksource: refined-jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645519600211568 ns [ 0.030468] setup_percpu: NR_CPUS:8192 nr_cpumask_bits:2 nr_cpu_ids:2 nr_node_ids:1 [ 0.031317] percpu: Embedded 61 pages/cpu s212992 r8192 d28672 u1048576 [ 0.031338] pcpu-alloc: s212992 r8192 d28672 u1048576 alloc=1*2097152 [ 0.031346] pcpu-alloc: [0] 0 1 [ 0.031420] Fallback order for Node 0: 0 [ 0.031430] Built 1 zonelists, mobility grouping on. Total pages: 1016769 [ 0.031433] Policy zone: Normal [ 0.031437] Kernel command line: BOOT_IMAGE=/boot/vmlinuz-5.19.0-26-generic root=UUID=f3696ad1-610d-47df-af28-f4fc95355175 ro quiet splash vt.handoff=7 [ 0.031588] Unknown kernel command line parameters "splash BOOT_IMAGE=/boot/vmlinuz-5.19.0-26-generic", will be passed to user space. [ 0.032846] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) [ 0.033503] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes, linear) [ 0.033569] mem auto-init: stack:all(zero), heap alloc:on, heap free:off [ 0.103799] Memory: 3857072K/4138072K available (18440K kernel code, 4054K rwdata, 11244K rodata, 3148K init, 4924K bss, 280740K reserved, 0K cma-reserved) [ 0.104833] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=2, Nodes=1 [ 0.104887] Kernel/User page tables isolation: enabled [ 0.104926] ftrace: allocating 51983 entries in 204 pages [ 0.116119] ftrace: allocated 204 pages with 4 groups [ 0.117340] Dynamic Preempt: voluntary [ 0.117456] rcu: Preemptible hierarchical RCU implementation. [ 0.117459] rcu: RCU restricting CPUs from NR_CPUS=8192 to nr_cpu_ids=2. [ 0.117462] Trampoline variant of Tasks RCU enabled. [ 0.117464] Rude variant of Tasks RCU enabled. [ 0.117465] Tracing variant of Tasks RCU enabled. [ 0.117467] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. [ 0.117469] rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=2 [ 0.128183] NR_IRQS: 524544, nr_irqs: 512, preallocated irqs: 16 [ 0.128455] rcu: srcu_init: Setting srcu_struct sizes based on contention. [ 0.128534] random: crng init done [ 0.128600] Console: colour dummy device 80x25 [ 0.128641] printk: console [tty0] enabled [ 0.128692] ACPI: Core revision 20220331 [ 0.128828] hpet: HPET dysfunctional in PC10. Force disabled. [ 0.128832] APIC: Switch to symmetric I/O mode setup [ 0.130360] clocksource: tsc-early: mask: 0xffffffffffffffff max_cycles: 0x171024fa93b, max_idle_ns: 440795253189 ns [ 0.130373] Calibrating delay loop (skipped), value calculated using timer frequency.. 3200.00 BogoMIPS (lpj=6400000) [ 0.130380] pid_max: default: 32768 minimum: 301 [ 0.132857] LSM: Security Framework initializing [ 0.132890] landlock: Up and running. [ 0.132893] Yama: becoming mindful. [ 0.132963] AppArmor: AppArmor initialized [ 0.133068] Mount-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.133094] Mountpoint-cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.133615] CPU0: Thermal monitoring enabled (TM1) [ 0.133657] process: using mwait in idle threads [ 0.133665] Last level iTLB entries: 4KB 48, 2MB 0, 4MB 0 [ 0.133668] Last level dTLB entries: 4KB 256, 2MB 16, 4MB 16, 1GB 0 [ 0.133681] Spectre V1 : Mitigation: usercopy/swapgs barriers and __user pointer sanitization [ 0.133687] Spectre V2 : Mitigation: Retpolines [ 0.133689] Spectre V2 : Spectre v2 / SpectreRSB mitigation: Filling RSB on context switch [ 0.133691] Spectre V2 : Spectre v2 / SpectreRSB : Filling RSB on VMEXIT [ 0.133692] Spectre V2 : Enabling Restricted Speculation for firmware calls [ 0.133696] Spectre V2 : mitigation: Enabling conditional Indirect Branch Prediction Barrier [ 0.133702] MDS: Mitigation: Clear CPU buffers [ 0.133704] MMIO Stale Data: Unknown: No mitigations [ 0.134369] Freeing SMP alternatives memory: 44K [ 0.134369] smpboot: CPU0: Intel(R) Celeron(R) CPU N3060 @ 1.60GHz (family: 0x6, model: 0x4c, stepping: 0x4) [ 0.134369] cblist_init_generic: Setting adjustable number of callback queues. [ 0.134369] cblist_init_generic: Setting shift to 1 and lim to 1. [ 0.134369] cblist_init_generic: Setting shift to 1 and lim to 1. [ 0.134369] cblist_init_generic: Setting shift to 1 and lim to 1. [ 0.134369] Performance Events: PEBS fmt2+, 8-deep LBR, Silvermont events, 8-deep LBR, full-width counters, Intel PMU driver. [ 0.134369] ... version: 3 [ 0.134369] ... bit width: 40 [ 0.134369] ... generic registers: 2 [ 0.134369] ... value mask: 000000ffffffffff [ 0.134369] ... max period: 0000007fffffffff [ 0.134369] ... fixed-purpose events: 3 [ 0.134369] ... event mask: 0000000700000003 [ 0.134369] Estimated ratio of average max frequency by base frequency (times 1024): 1587 [ 0.134369] rcu: Hierarchical SRCU implementation. [ 0.134369] rcu: Max phase no-delay instances is 1000. [ 0.134369] NMI watchdog: Enabled. Permanently consumes one hw-PMU counter. [ 0.134369] smp: Bringing up secondary CPUs ... [ 0.134369] x86: Booting SMP configuration: [ 0.134369] .... node #0, CPUs: #1 [ 0.134749] smp: Brought up 1 node, 2 CPUs [ 0.134749] smpboot: Max logical packages: 1 [ 0.134749] smpboot: Total of 2 processors activated (6400.00 BogoMIPS) [ 0.135208] devtmpfs: initialized [ 0.135208] x86/mm: Memory block size: 128MB [ 0.135700] ACPI: PM: Registering ACPI NVS region [mem 0x1fff3000-0x1fff6fff] (16384 bytes) [ 0.135791] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns [ 0.135810] futex hash table entries: 512 (order: 3, 32768 bytes, linear) [ 0.135933] pinctrl core: initialized pinctrl subsystem [ 0.136181] PM: RTC time: 11:04:10, date: 2022-12-16 [ 0.138887] NET: Registered PF_NETLINK/PF_ROUTE protocol family [ 0.139255] DMA: preallocated 512 KiB GFP_KERNEL pool for atomic allocations [ 0.139421] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA pool for atomic allocations [ 0.139608] DMA: preallocated 512 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations [ 0.139654] audit: initializing netlink subsys (disabled) [ 0.139840] audit: type=2000 audit(1671188650.008:1): state=initialized audit_enabled=0 res=1 [ 0.140158] thermal_sys: Registered thermal governor 'fair_share' [ 0.140165] thermal_sys: Registered thermal governor 'bang_bang' [ 0.140169] thermal_sys: Registered thermal governor 'step_wise' [ 0.140171] thermal_sys: Registered thermal governor 'user_space' [ 0.140173] thermal_sys: Registered thermal governor 'power_allocator' [ 0.140193] EISA bus registered [ 0.140223] cpuidle: using governor ladder [ 0.140236] cpuidle: using governor menu [ 0.140349] acpiphp: ACPI Hot Plug PCI Controller Driver version: 0.5 [ 0.140505] PCI: MMCONFIG for domain 0000 [bus 00-ff] at [mem 0xe0000000-0xefffffff] (base 0xe0000000) [ 0.140519] PCI: not using MMCONFIG [ 0.140528] PCI: Using configuration type 1 for base access [ 0.140748] ENERGY_PERF_BIAS: Set to 'normal', was 'performance' [ 0.144193] kprobes: kprobe jump-optimization is enabled. All kprobes are optimized if possible. [ 0.175620] HugeTLB: can optimize 7 vmemmap pages for hugepages-2048kB [ 0.175620] HugeTLB registered 2.00 MiB page size, pre-allocated 0 pages [ 0.175620] ACPI: Added _OSI(Module Device) [ 0.175620] ACPI: Added _OSI(Processor Device) [ 0.175620] ACPI: Added _OSI(3.0 _SCP Extensions) [ 0.175620] ACPI: Added _OSI(Processor Aggregator Device) [ 0.175620] ACPI: Added _OSI(Linux-Dell-Video) [ 0.175620] ACPI: Added _OSI(Linux-Lenovo-NV-HDMI-Audio) [ 0.175620] ACPI: Added _OSI(Linux-HPI-Hybrid-Graphics) [ 0.186294] ACPI: 2 ACPI AML tables successfully acquired and loaded [ 0.188470] ACPI: EC: EC started [ 0.188475] ACPI: EC: interrupt blocked [ 0.190416] ACPI: EC: EC_CMD/EC_SC=0x66, EC_DATA=0x62 [ 0.190423] ACPI: \_SB_.PCI0.LPCB.EC0_: Boot DSDT EC used to handle transactions [ 0.190428] ACPI: Interpreter enabled [ 0.190468] ACPI: PM: (supports S0 S3 S4 S5) [ 0.190473] ACPI: Using IOAPIC for interrupt routing [ 0.190529] PCI: MMCONFIG for domain 0000 [bus 00-ff] at [mem 0xe0000000-0xefffffff] (base 0xe0000000) [ 0.191150] PCI: MMCONFIG at [mem 0xe0000000-0xefffffff] reserved in ACPI motherboard resources [ 0.191192] PCI: Using host bridge windows from ACPI; if necessary, use "pci=nocrs" and report a bug [ 0.191196] PCI: Using E820 reservations for host bridge windows [ 0.203140] ACPI: PM: Power Resource [PLPE] [ 0.206136] ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff]) [ 0.206155] acpi PNP0A08:00: _OSC: OS supports [ExtendedConfig ASPM ClockPM Segments MSI EDR HPX-Type3] [ 0.206261] acpi PNP0A08:00: _OSC: OS now controls [PCIeHotplug SHPCHotplug PME AER PCIeCapability LTR DPC] [ 0.206942] PCI host bridge to bus 0000:00 [ 0.206948] pci_bus 0000:00: root bus resource [io 0x0000-0x0cf7 window] [ 0.206953] pci_bus 0000:00: root bus resource [io 0x0d00-0xffff window] [ 0.206957] pci_bus 0000:00: root bus resource [mem 0x000a0000-0x000fffff window] [ 0.206961] pci_bus 0000:00: root bus resource [mem 0x20000000-0x201fffff window] [ 0.206965] pci_bus 0000:00: root bus resource [mem 0x80000000-0xdfffffff window] [ 0.206968] pci_bus 0000:00: root bus resource [mem 0xfed40000-0xfed44fff window] [ 0.206973] pci_bus 0000:00: root bus resource [bus 00-ff] [ 0.207008] pci 0000:00:00.0: [8086:2280] type 00 class 0x060000 [ 0.207139] pci 0000:00:02.0: [8086:22b1] type 00 class 0x030000 [ 0.207159] pci 0000:00:02.0: reg 0x10: [mem 0x90000000-0x90ffffff 64bit] [ 0.207172] pci 0000:00:02.0: reg 0x18: [mem 0x80000000-0x8fffffff 64bit pref] [ 0.207181] pci 0000:00:02.0: reg 0x20: [io 0x1000-0x103f] [ 0.207207] pci 0000:00:02.0: BAR 2: assigned to efifb [ 0.207215] pci 0000:00:02.0: Video device with shadowed ROM at [mem 0x000c0000-0x000dffff] [ 0.207397] pci 0000:00:0b.0: [8086:22dc] type 00 class 0x118000 [ 0.207416] pci 0000:00:0b.0: reg 0x10: [mem 0x00000000-0x00000fff 64bit] [ 0.207621] pci 0000:00:10.0: [8086:2294] type 00 class 0x080501 [ 0.207643] pci 0000:00:10.0: reg 0x10: [mem 0x9131c000-0x9131cfff] [ 0.207733] pci 0000:00:10.0: PME# supported from D0 D3hot [ 0.207894] pci 0000:00:12.0: [8086:2296] type 00 class 0x080501 [ 0.207916] pci 0000:00:12.0: reg 0x10: [mem 0x9131d000-0x9131dfff] [ 0.208007] pci 0000:00:12.0: PME# supported from D0 D3hot [ 0.208090] pci 0000:00:14.0: [8086:22b5] type 00 class 0x0c0330 [ 0.208114] pci 0000:00:14.0: reg 0x10: [mem 0x91300000-0x9130ffff 64bit] [ 0.208187] pci 0000:00:14.0: PME# supported from D3hot D3cold [ 0.208343] pci 0000:00:1b.0: [8086:2284] type 00 class 0x040300 [ 0.208370] pci 0000:00:1b.0: reg 0x10: [mem 0x91314000-0x91317fff 64bit] [ 0.208456] pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold [ 0.208702] pci 0000:00:1c.0: [8086:22c8] type 01 class 0x060400 [ 0.209601] pci 0000:00:1c.0: PME# supported from D0 D3hot D3cold [ 0.210100] pci 0000:00:1c.2: [8086:22cc] type 01 class 0x060400 [ 0.211001] pci 0000:00:1c.2: PME# supported from D0 D3hot D3cold [ 0.211416] pci 0000:00:1f.0: [8086:229c] type 00 class 0x060100 [ 0.211923] pci 0000:00:1c.0: PCI bridge to [bus 01] [ 0.212663] pci 0000:02:00.0: [8086:095a] type 00 class 0x028000 [ 0.212887] pci 0000:02:00.0: reg 0x10: [mem 0x91200000-0x91201fff 64bit] [ 0.213557] pci 0000:02:00.0: PME# supported from D0 D3hot D3cold [ 0.214911] pci 0000:00:1c.2: PCI bridge to [bus 02] [ 0.214967] pci 0000:00:1c.2: bridge window [mem 0x91200000-0x912fffff] [ 0.215432] ACPI: PCI: Interrupt link LNKA configured for IRQ 0 [ 0.215437] ACPI: PCI: Interrupt link LNKA disabled [ 0.215631] ACPI: PCI: Interrupt link LNKB configured for IRQ 0 [ 0.215636] ACPI: PCI: Interrupt link LNKB disabled [ 0.215837] ACPI: PCI: Interrupt link LNKC configured for IRQ 0 [ 0.215842] ACPI: PCI: Interrupt link LNKC disabled [ 0.216035] ACPI: PCI: Interrupt link LNKD configured for IRQ 0 [ 0.216040] ACPI: PCI: Interrupt link LNKD disabled [ 0.216235] ACPI: PCI: Interrupt link LNKE configured for IRQ 0 [ 0.216239] ACPI: PCI: Interrupt link LNKE disabled [ 0.216434] ACPI: PCI: Interrupt link LNKF configured for IRQ 0 [ 0.216438] ACPI: PCI: Interrupt link LNKF disabled [ 0.216632] ACPI: PCI: Interrupt link LNKG configured for IRQ 0 [ 0.216636] ACPI: PCI: Interrupt link LNKG disabled [ 0.216829] ACPI: PCI: Interrupt link LNKH configured for IRQ 0 [ 0.216834] ACPI: PCI: Interrupt link LNKH disabled [ 0.227347] ACPI: EC: interrupt unblocked [ 0.227357] ACPI: EC: event unblocked [ 0.227364] ACPI: EC: EC_CMD/EC_SC=0x66, EC_DATA=0x62 [ 0.227367] ACPI: EC: GPE=0x10 [ 0.227371] ACPI: \_SB_.PCI0.LPCB.EC0_: Boot DSDT EC initialization complete [ 0.227377] ACPI: \_SB_.PCI0.LPCB.EC0_: EC: Used to handle transactions and events [ 0.227524] iommu: Default domain type: Translated [ 0.227524] iommu: DMA domain TLB invalidation policy: lazy mode [ 0.227524] SCSI subsystem initialized [ 0.227524] libata version 3.00 loaded. [ 0.227524] ACPI: bus type USB registered [ 0.227524] usbcore: registered new interface driver usbfs [ 0.227524] usbcore: registered new interface driver hub [ 0.227524] usbcore: registered new device driver usb [ 0.301846] pps_core: LinuxPPS API ver. 1 registered [ 0.301855] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti(a)linux.it> [ 0.301864] PTP clock support registered [ 0.301906] EDAC MC: Ver: 3.0.0 [ 0.302470] Registered efivars operations [ 0.302775] NetLabel: Initializing [ 0.302779] NetLabel: domain hash size = 128 [ 0.302781] NetLabel: protocols = UNLABELED CIPSOv4 CALIPSO [ 0.302816] NetLabel: unlabeled traffic allowed by default [ 0.302862] mctp: management component transport protocol core [ 0.302862] NET: Registered PF_MCTP protocol family [ 0.302862] PCI: Using ACPI for IRQ routing [ 0.311294] PCI: pci_cache_line_size set to 64 bytes [ 0.311747] e820: reserve RAM buffer [mem 0x1e74c000-0x1fffffff] [ 0.311752] e820: reserve RAM buffer [mem 0x1ec37000-0x1fffffff] [ 0.311756] e820: reserve RAM buffer [mem 0x1ec4b000-0x1fffffff] [ 0.311759] e820: reserve RAM buffer [mem 0x1fc92000-0x1fffffff] [ 0.311762] e820: reserve RAM buffer [mem 0x1fca9000-0x1fffffff] [ 0.311764] e820: reserve RAM buffer [mem 0x1feaf000-0x1fffffff] [ 0.311767] e820: reserve RAM buffer [mem 0x7ccce000-0x7fffffff] [ 0.311799] pci 0000:00:02.0: vgaarb: setting as boot VGA device [ 0.311799] pci 0000:00:02.0: vgaarb: bridge control possible [ 0.311799] pci 0000:00:02.0: vgaarb: VGA device added: decodes=io+mem,owns=io+mem,locks=none [ 0.311799] vgaarb: loaded [ 0.312430] clocksource: Switched to clocksource tsc-early [ 0.335628] VFS: Disk quotas dquot_6.6.0 [ 0.335675] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes) [ 0.335958] AppArmor: AppArmor Filesystem Enabled [ 0.336008] pnp: PnP ACPI init [ 0.336236] system 00:00: [mem 0xfeb00000-0xfebfffff] has been reserved [ 0.336245] system 00:00: [mem 0xe0000000-0xefffffff] has been reserved [ 0.336255] system 00:00: [mem 0xfed03000-0xfed033ff] has been reserved [ 0.336260] system 00:00: [mem 0xfed08000-0xfed09fff] has been reserved [ 0.336264] system 00:00: [mem 0xfed01000-0xfed013ff] has been reserved [ 0.336268] system 00:00: [mem 0xfea00000-0xfeafffff] has been reserved [ 0.336272] system 00:00: [mem 0xfed06000-0xfed067ff] has been reserved [ 0.336276] system 00:00: [mem 0xfed1c000-0xfed1c3ff] has been reserved [ 0.350569] system 00:01: [mem 0xfed00000-0xfed003ff] has been reserved [ 0.350681] system 00:02: [io 0x0400-0x047f] has been reserved [ 0.350688] system 00:02: [io 0x0500-0x05fe] has been reserved [ 0.350841] system 00:04: [io 0x0900-0x09fe] has been reserved [ 0.350944] system 00:05: [io 0x0200] has been reserved [ 0.350950] system 00:05: [io 0x0204] has been reserved [ 0.350955] system 00:05: [io 0x0800-0x087f] has been reserved [ 0.350959] system 00:05: [io 0x0880-0x08ff] has been reserved [ 0.352379] pnp: PnP ACPI: found 8 devices [ 0.360575] clocksource: acpi_pm: mask: 0xffffff max_cycles: 0xffffff, max_idle_ns: 2085701024 ns [ 0.360728] NET: Registered PF_INET protocol family [ 0.360931] IP idents hash table entries: 65536 (order: 7, 524288 bytes, linear) [ 0.364234] tcp_listen_portaddr_hash hash table entries: 2048 (order: 3, 32768 bytes, linear) [ 0.364335] Table-perturb hash table entries: 65536 (order: 6, 262144 bytes, linear) [ 0.364415] TCP established hash table entries: 32768 (order: 6, 262144 bytes, linear) [ 0.364638] TCP bind hash table entries: 32768 (order: 7, 524288 bytes, linear) [ 0.364764] TCP: Hash tables configured (established 32768 bind 32768) [ 0.364981] MPTCP token hash table entries: 4096 (order: 4, 98304 bytes, linear) [ 0.365058] UDP hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 0.365108] UDP-Lite hash table entries: 2048 (order: 4, 65536 bytes, linear) [ 0.365220] NET: Registered PF_UNIX/PF_LOCAL protocol family [ 0.365234] NET: Registered PF_XDP protocol family [ 0.365253] pci 0000:00:1c.0: bridge window [io 0x1000-0x0fff] to [bus 01] add_size 1000 [ 0.365263] pci 0000:00:1c.0: bridge window [mem 0x00100000-0x000fffff 64bit pref] to [bus 01] add_size 200000 add_align 100000 [ 0.365269] pci 0000:00:1c.0: bridge window [mem 0x00100000-0x000fffff] to [bus 01] add_size 200000 add_align 100000 [ 0.365287] clipped [mem size 0x00050000] to [mem size 0xffffffffffff0000] for e820 entry [mem 0x000a0000-0x000fffff] [ 0.365294] clipped [mem size 0x00200000] to [mem size 0x00000000] for e820 entry [mem 0x20000000-0x201fffff] [ 0.365302] pci 0000:00:1c.0: BAR 14: assigned [mem 0x91400000-0x915fffff] [ 0.365311] clipped [mem size 0x00050000 64bit pref] to [mem size 0xffffffffffff0000 64bit pref] for e820 entry [mem 0x000a0000-0x000fffff] [ 0.365316] clipped [mem size 0x00200000 64bit pref] to [mem size 0x00000000 64bit pref] for e820 entry [mem 0x20000000-0x201fffff] [ 0.365323] pci 0000:00:1c.0: BAR 15: assigned [mem 0x91600000-0x917fffff 64bit pref] [ 0.365330] clipped [mem size 0x00050000 64bit] to [mem size 0xffffffffffff0000 64bit] for e820 entry [mem 0x000a0000-0x000fffff] [ 0.365335] clipped [mem size 0x00200000 64bit] to [mem size 0x00000000 64bit] for e820 entry [mem 0x20000000-0x201fffff] [ 0.365341] pci 0000:00:0b.0: BAR 0: assigned [mem 0x91311000-0x91311fff 64bit] [ 0.365358] pci 0000:00:1c.0: BAR 13: assigned [io 0x2000-0x2fff] [ 0.365366] pci 0000:00:1c.0: PCI bridge to [bus 01] [ 0.365391] pci 0000:00:1c.0: bridge window [io 0x2000-0x2fff] [ 0.365434] pci 0000:00:1c.0: bridge window [mem 0x91400000-0x915fffff] [ 0.365468] pci 0000:00:1c.0: bridge window [mem 0x91600000-0x917fffff 64bit pref] [ 0.365523] pci 0000:00:1c.2: PCI bridge to [bus 02] [ 0.365566] pci 0000:00:1c.2: bridge window [mem 0x91200000-0x912fffff] [ 0.365641] pci_bus 0000:00: resource 4 [io 0x0000-0x0cf7 window] [ 0.365645] pci_bus 0000:00: resource 5 [io 0x0d00-0xffff window] [ 0.365649] pci_bus 0000:00: resource 6 [mem 0x000a0000-0x000fffff window] [ 0.365652] pci_bus 0000:00: resource 7 [mem 0x20000000-0x201fffff window] [ 0.365656] pci_bus 0000:00: resource 8 [mem 0x80000000-0xdfffffff window] [ 0.365660] pci_bus 0000:00: resource 9 [mem 0xfed40000-0xfed44fff window] [ 0.365664] pci_bus 0000:01: resource 0 [io 0x2000-0x2fff] [ 0.365667] pci_bus 0000:01: resource 1 [mem 0x91400000-0x915fffff] [ 0.365671] pci_bus 0000:01: resource 2 [mem 0x91600000-0x917fffff 64bit pref] [ 0.365675] pci_bus 0000:02: resource 1 [mem 0x91200000-0x912fffff] [ 0.367667] PCI: CLS 64 bytes, default 64 [ 0.367687] PCI-DMA: Using software bounce buffering for IO (SWIOTLB) [ 0.367690] software IO TLB: mapped [mem 0x0000000078cce000-0x000000007ccce000] (64MB) [ 0.367829] Trying to unpack rootfs image as initramfs... [ 0.368018] clocksource: tsc: mask: 0xffffffffffffffff max_cycles: 0x171024fa93b, max_idle_ns: 440795253189 ns [ 0.368059] clocksource: Switched to clocksource tsc [ 0.368873] Initialise system trusted keyrings [ 0.368902] Key type blacklist registered [ 0.369052] workingset: timestamp_bits=36 max_order=20 bucket_order=0 [ 0.371642] zbud: loaded [ 0.372310] squashfs: version 4.0 (2009/01/31) Phillip Lougher [ 0.372737] fuse: init (API version 7.36) [ 0.373074] integrity: Platform Keyring initialized [ 0.373084] integrity: Machine keyring initialized [ 0.386098] Key type asymmetric registered [ 0.386103] Asymmetric key parser 'x509' registered [ 1.414827] Freeing initrd memory: 67140K [ 1.424528] alg: self-tests for CTR-KDF (hmac(sha256)) passed [ 1.424594] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 243) [ 1.424684] io scheduler mq-deadline registered [ 1.442960] pcieport 0000:00:1c.0: PME: Signaling with IRQ 310 [ 1.443114] pcieport 0000:00:1c.0: pciehp: Slot #0 AttnBtn- PwrCtrl- MRL- AttnInd- PwrInd- HotPlug+ Surprise+ Interlock- NoCompl+ IbPresDis- LLActRep+ [ 1.444990] pcieport 0000:00:1c.2: PME: Signaling with IRQ 311 [ 1.445492] shpchp: Standard Hot Plug PCI Controller Driver version: 0.4 [ 1.459670] ACPI: AC: AC Adapter [AC] (on-line) [ 1.459911] input: Lid Switch as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:00/PNP0C09:00/PNP0C0D:00/input/input0 [ 1.459988] ACPI: button: Lid Switch [LID0] [ 1.460109] input: Power Button as /devices/LNXSYSTM:00/LNXPWRBN:00/input/input1 [ 1.460868] ACPI: button: Power Button [PWRF] [ 1.465668] Serial: 8250/16550 driver, 32 ports, IRQ sharing enabled [ 1.486295] serial8250: ttyS0 at I/O 0x3f8 (irq = 4, base_baud = 115200) is a 16550A [ 1.489959] hpet_acpi_add: no address or irqs in _CRS [ 1.490004] Linux agpgart interface v0.103 [ 1.494109] tpm_tis 00:07: 1.2 TPM (device-id 0xB, rev-id 16) [ 1.526942] loop: module loaded [ 1.527579] tun: Universal TUN/TAP device driver, 1.6 [ 1.527651] PPP generic driver version 2.4.2 [ 1.527785] VFIO - User Level meta-driver version: 0.3 [ 1.528426] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver [ 1.528451] ehci-pci: EHCI PCI platform driver [ 1.528472] ehci-platform: EHCI generic platform driver [ 1.528490] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver [ 1.528497] ohci-pci: OHCI PCI platform driver [ 1.528514] ohci-platform: OHCI generic platform driver [ 1.528537] uhci_hcd: USB Universal Host Controller Interface driver [ 1.528659] i8042: PNP: PS/2 Controller [PNP0303:PS2K] at 0x60,0x64 irq 182 [ 1.528664] i8042: PNP: PS/2 appears to have AUX port disabled, if this is incorrect please boot with i8042.nopnp [ 1.533075] i8042: Warning: Keylock active [ 1.533393] serio: i8042 KBD port at 0x60,0x64 irq 182 [ 1.533610] mousedev: PS/2 mouse device common for all mice [ 1.533898] rtc_cmos 00:03: RTC can wake from S4 [ 1.534255] rtc_cmos 00:03: registered as rtc0 [ 1.534300] rtc_cmos 00:03: setting system clock to 2022-12-16T11:04:11 UTC (1671188651) [ 1.534339] rtc_cmos 00:03: alarms up to one month, y3k, 242 bytes nvram [ 1.534361] i2c_dev: i2c /dev entries driver [ 1.534845] device-mapper: core: CONFIG_IMA_DISABLE_HTABLE is disabled. Duplicate IMA measurements will not be recorded in the IMA log. [ 1.534929] device-mapper: uevent: version 1.0.3 [ 1.535087] device-mapper: ioctl: 4.47.0-ioctl (2022-07-28) initialised: dm-devel(a)redhat.com [ 1.535157] platform eisa.0: Probing EISA bus 0 [ 1.535165] platform eisa.0: EISA: Cannot allocate resource for mainboard [ 1.535169] platform eisa.0: Cannot allocate resource for EISA slot 1 [ 1.535172] platform eisa.0: Cannot allocate resource for EISA slot 2 [ 1.535176] platform eisa.0: Cannot allocate resource for EISA slot 3 [ 1.535179] platform eisa.0: Cannot allocate resource for EISA slot 4 [ 1.535182] platform eisa.0: Cannot allocate resource for EISA slot 5 [ 1.535185] platform eisa.0: Cannot allocate resource for EISA slot 6 [ 1.535188] platform eisa.0: Cannot allocate resource for EISA slot 7 [ 1.535191] platform eisa.0: Cannot allocate resource for EISA slot 8 [ 1.535194] platform eisa.0: EISA: Detected 0 cards [ 1.535204] intel_pstate: Intel P-state driver initializing [ 1.536630] ledtrig-cpu: registered to indicate activity on CPUs [ 1.536721] efifb: probing for efifb [ 1.536779] efifb: showing boot graphics [ 1.539558] efifb: framebuffer at 0x80000000, using 4128k, total 4128k [ 1.539564] efifb: mode is 1366x768x32, linelength=5504, pages=1 [ 1.539567] efifb: scrolling: redraw [ 1.539569] efifb: Truecolor: size=8:8:8:8, shift=24:16:8:0 [ 1.539672] fbcon: Deferring console take-over [ 1.539676] fb0: EFI VGA frame buffer device [ 1.539695] EFI Variables Facility v0.08 2004-May-17 [ 1.540979] drop_monitor: Initializing network drop monitor service [ 1.545153] input: AT Translated Set 2 keyboard as /devices/platform/i8042/serio0/input/input2 [ 1.567360] NET: Registered PF_INET6 protocol family [ 1.583135] Segment Routing with IPv6 [ 1.583180] In-situ OAM (IOAM) with IPv6 [ 1.583257] NET: Registered PF_PACKET protocol family [ 1.584623] Key type dns_resolver registered [ 1.586178] microcode: sig=0x406c4, pf=0x1, revision=0x411 [ 1.586200] microcode: Microcode Update Driver: v2.2. [ 1.586216] IPI shorthand broadcast: enabled [ 1.586263] sched_clock: Marking stable (1583656212, 1883100)->(1624829613, -39290301) [ 1.586583] registered taskstats version 1 [ 1.586707] Loading compiled-in X.509 certificates [ 1.591183] Loaded X.509 cert 'Build time autogenerated kernel key: f9e2a7b4bb7c8535a4f1629cbe7dbe9ae9388590' [ 1.592671] Loaded X.509 cert 'Canonical Ltd. Live Patch Signing: 14df34d1a87cf37625abec039ef2bf521249b969' [ 1.594147] Loaded X.509 cert 'Canonical Ltd. Kernel Module Signing: 88f752e560a1e0737e31163a466ad7b70a850c19' [ 1.594152] blacklist: Loading compiled-in revocation X.509 certificates [ 1.594198] Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing: 61482aa2830d0ab2ad5af10b7250da9033ddcef0' [ 1.595521] zswap: loaded using pool lzo/zbud [ 1.597372] Key type ._fscrypt registered [ 1.597384] Key type .fscrypt registered [ 1.597388] Key type fscrypt-provisioning registered [ 1.597831] Key type trusted registered [ 1.609484] Key type encrypted registered [ 1.609501] AppArmor: AppArmor sha1 policy hashing enabled [ 1.610112] Loading compiled-in module X.509 certificates [ 1.611664] Loaded X.509 cert 'Build time autogenerated kernel key: f9e2a7b4bb7c8535a4f1629cbe7dbe9ae9388590' [ 1.611671] ima: Allocated hash algorithm: sha1 [ 1.655620] ima: No architecture policies found [ 1.655674] evm: Initialising EVM extended attributes: [ 1.655679] evm: security.selinux [ 1.655683] evm: security.SMACK64 [ 1.655687] evm: security.SMACK64EXEC [ 1.655689] evm: security.SMACK64TRANSMUTE [ 1.655692] evm: security.SMACK64MMAP [ 1.655694] evm: security.apparmor [ 1.655697] evm: security.ima [ 1.655699] evm: security.capability [ 1.655702] evm: HMAC attrs: 0x1 [ 1.674791] PM: Magic number: 2:917:74 [ 1.675577] RAS: Correctable Errors collector initialized. [ 1.733102] ACPI: battery: Slot [BAT0] (battery present) [ 1.750787] Freeing unused decrypted memory: 2036K [ 1.752556] Freeing unused kernel image (initmem) memory: 3148K [ 1.752872] Write protecting the kernel read-only data: 32768k [ 1.754655] Freeing unused kernel image (text/rodata gap) memory: 2036K [ 1.755508] Freeing unused kernel image (rodata/data gap) memory: 1044K [ 1.824937] x86/mm: Checked W+X mappings: passed, no W+X pages found. [ 1.825148] x86/mm: Checking user space page tables [ 1.891999] x86/mm: Checked W+X mappings: passed, no W+X pages found. [ 1.892014] Run /init as init process [ 1.892017] with arguments: [ 1.892020] /init [ 1.892022] splash [ 1.892024] with environment: [ 1.892026] HOME=/ [ 1.892028] TERM=linux [ 1.892030] BOOT_IMAGE=/boot/vmlinuz-5.19.0-26-generic [ 2.340912] xhci_hcd 0000:00:14.0: xHCI Host Controller [ 2.340933] xhci_hcd 0000:00:14.0: new USB bus registered, assigned bus number 1 [ 2.342036] xhci_hcd 0000:00:14.0: hcc params 0x200077c1 hci version 0x100 quirks 0x0000000081509810 [ 2.346952] xhci_hcd 0000:00:14.0: xHCI Host Controller [ 2.346968] xhci_hcd 0000:00:14.0: new USB bus registered, assigned bus number 2 [ 2.346980] xhci_hcd 0000:00:14.0: Host supports USB 3.0 SuperSpeed [ 2.347095] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.19 [ 2.347102] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 2.347106] usb usb1: Product: xHCI Host Controller [ 2.347109] usb usb1: Manufacturer: Linux 5.19.0-26-generic xhci-hcd [ 2.347112] usb usb1: SerialNumber: 0000:00:14.0 [ 2.347356] hub 1-0:1.0: USB hub found [ 2.347385] hub 1-0:1.0: 7 ports detected [ 2.350624] usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.19 [ 2.350636] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 2.350641] usb usb2: Product: xHCI Host Controller [ 2.350644] usb usb2: Manufacturer: Linux 5.19.0-26-generic xhci-hcd [ 2.350647] usb usb2: SerialNumber: 0000:00:14.0 [ 2.352408] hub 2-0:1.0: USB hub found [ 2.353633] hub 2-0:1.0: 6 ports detected [ 2.377837] sdhci: Secure Digital Host Controller Interface driver [ 2.377846] sdhci: Copyright(c) Pierre Ossman [ 2.402835] dw_dmac INTL9C60:00: DesignWare DMA Controller, 8 channels [ 2.434470] hid: raw HID events driver (C) Jiri Kosina [ 2.442904] dw_dmac INTL9C60:01: DesignWare DMA Controller, 8 channels [ 2.443032] sdhci-pci 0000:00:10.0: SDHCI controller found [8086:2294] (rev 35) [ 2.468381] cros_ec_lpcs GOOG0004:00: Chrome EC device registered [ 2.500575] mmc0: SDHCI controller on PCI [0000:00:10.0] using ADMA [ 2.500716] sdhci-pci 0000:00:12.0: SDHCI controller found [8086:2296] (rev 35) [ 2.501796] ACPI: \: failed to evaluate _DSM a53ec1f6-cd65-1f46-ab7a-29f7e8d5bd61 (0x1001) [ 2.501837] sdhci-pci 0000:00:12.0: failed to setup card detect gpio [ 2.503887] mmc1: SDHCI controller on PCI [0000:00:12.0] using ADMA [ 2.602431] usb 1-4: new high-speed USB device number 2 using xhci_hcd [ 2.675518] mmc0: new HS200 MMC card at address 0001 [ 2.685188] mmcblk0: mmc0:0001 016G72 14.7 GiB [ 2.689998] mmcblk0: p1 p2 [ 2.690600] mmcblk0boot0: mmc0:0001 016G72 4.00 MiB [ 2.691560] mmcblk0boot1: mmc0:0001 016G72 4.00 MiB [ 2.692437] mmcblk0rpmb: mmc0:0001 016G72 4.00 MiB, chardev (238:0) [ 2.780030] usb 1-4: New USB device found, idVendor=0bda, idProduct=57c4, bcdDevice= 0.03 [ 2.780048] usb 1-4: New USB device strings: Mfr=3, Product=1, SerialNumber=2 [ 2.780054] usb 1-4: Product: HP Truevision HD [ 2.780059] usb 1-4: Manufacturer: Generic [ 2.780064] usb 1-4: SerialNumber: \x07DETGB019IAI5L5 [ 2.910837] usb 1-5: new full-speed USB device number 3 using xhci_hcd [ 3.068094] usb 1-5: New USB device found, idVendor=8087, idProduct=0a2a, bcdDevice= 0.03 [ 3.068137] usb 1-5: New USB device strings: Mfr=0, Product=0, SerialNumber=0 [ 3.254135] fbcon: Taking over console [ 3.254332] Console: switching to colour frame buffer device 170x48 [ 3.271156] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Quota mode: none. [ 3.649170] systemd[1]: Inserted module 'autofs4' [ 3.696574] systemd[1]: systemd 251.4-1ubuntu7 running in system mode (+PAM +AUDIT +SELINUX +APPARMOR +IMA +SMACK +SECCOMP +GCRYPT -GNUTLS +OPENSSL +ACL +BLKID +CURL +ELFUTILS +FIDO2 +IDN2 -IDN +IPTC +KMOD +LIBCRYPTSETUP +LIBFDISK +PCRE2 -PWQUALITY -P11KIT -QRENCODE +TPM2 +BZIP2 +LZ4 +XZ +ZLIB +ZSTD -BPF_FRAMEWORK -XKBCOMMON +UTMP +SYSVINIT default-hierarchy=unified) [ 3.696598] systemd[1]: Detected architecture x86-64. [ 3.698185] systemd[1]: Hostname set to <wren>. [ 5.295496] systemd[1]: Queued start job for default target Graphical Interface. [ 5.299184] systemd[1]: Created slice Slice /system/modprobe. [ 5.300534] systemd[1]: Created slice Slice /system/postfix. [ 5.301578] systemd[1]: Created slice Slice /system/systemd-fsck. [ 5.302424] systemd[1]: Created slice User and Session Slice. [ 5.302712] systemd[1]: Started Forward Password Requests to Wall Directory Watch. [ 5.303315] systemd[1]: Set up automount Arbitrary Executable File Formats File System Automount Point. [ 5.303456] systemd[1]: Reached target Local Integrity Protected Volumes. [ 5.303548] systemd[1]: Reached target User and Group Name Lookups. [ 5.303594] systemd[1]: Reached target Remote File Systems. [ 5.303640] systemd[1]: Reached target Slice Units. [ 5.303732] systemd[1]: Reached target Local Verity Protected Volumes. [ 5.304241] systemd[1]: Listening on Syslog Socket. [ 5.304572] systemd[1]: Listening on fsck to fsckd communication Socket. [ 5.304772] systemd[1]: Listening on initctl Compatibility Named Pipe. [ 5.305468] systemd[1]: Listening on Journal Audit Socket. [ 5.305839] systemd[1]: Listening on Journal Socket (/dev/log). [ 5.306281] systemd[1]: Listening on Journal Socket. [ 5.307783] systemd[1]: Listening on udev Control Socket. [ 5.308179] systemd[1]: Listening on udev Kernel Socket. [ 5.310780] systemd[1]: Mounting Huge Pages File System... [ 5.313843] systemd[1]: Mounting POSIX Message Queue File System... [ 5.317364] systemd[1]: Mounting Kernel Debug File System... [ 5.320621] systemd[1]: Mounting Kernel Trace File System... [ 5.325886] systemd[1]: Starting Journal Service... [ 5.330368] systemd[1]: Starting Set the console keyboard layout... [ 5.337810] systemd[1]: Starting Create List of Static Device Nodes... [ 5.345311] systemd[1]: Starting Load Kernel Module chromeos_pstore... [ 5.352307] systemd[1]: Starting Load Kernel Module configfs... [ 5.358529] systemd[1]: Starting Load Kernel Module drm... [ 5.368693] systemd[1]: Starting Load Kernel Module efi_pstore... [ 5.372075] systemd[1]: Starting Load Kernel Module fuse... [ 5.382540] systemd[1]: Starting Load Kernel Module pstore_blk... [ 5.389013] pstore: Using crash dump compression: deflate [ 5.389034] pstore: Registered efi as persistent store backend [ 5.390249] systemd[1]: Starting Load Kernel Module pstore_zone... [ 5.401112] systemd[1]: Starting Load Kernel Module ramoops... [ 5.401616] systemd[1]: File System Check on Root Device was skipped because of a failed condition check (ConditionPathExists=!/run/initramfs/fsck-root). [ 5.417262] systemd[1]: Starting Load Kernel Modules... [ 5.420280] systemd[1]: Starting Remount Root and Kernel File Systems... [ 5.420572] systemd[1]: Repartition Root Disk was skipped because all trigger condition checks failed. [ 5.425261] systemd[1]: Starting Coldplug All udev Devices... [ 5.475263] ACPI: bus type drm_connector registered [ 5.497434] systemd[1]: Mounted Huge Pages File System. [ 5.497810] systemd[1]: Mounted POSIX Message Queue File System. [ 5.498116] systemd[1]: Mounted Kernel Debug File System. [ 5.498521] EXT4-fs (mmcblk0p2): re-mounted. Quota mode: none. [ 5.519772] systemd[1]: Mounted Kernel Trace File System. [ 5.520525] systemd[1]: Finished Create List of Static Device Nodes. [ 5.522235] systemd[1]: modprobe(a)chromeos_pstore.service: Deactivated successfully. [ 5.526526] systemd[1]: Finished Load Kernel Module chromeos_pstore. [ 5.527576] systemd[1]: modprobe(a)configfs.service: Deactivated successfully. [ 5.534558] systemd[1]: Finished Load Kernel Module configfs. [ 5.535670] systemd[1]: modprobe(a)drm.service: Deactivated successfully. [ 5.538509] systemd[1]: Finished Load Kernel Module drm. [ 5.539572] systemd[1]: modprobe(a)efi_pstore.service: Deactivated successfully. [ 5.542238] lp: driver loaded but no devices found [ 5.543362] systemd[1]: Finished Load Kernel Module efi_pstore. [ 5.547538] systemd[1]: modprobe(a)fuse.service: Deactivated successfully. [ 5.554545] systemd[1]: Finished Load Kernel Module fuse. [ 5.555623] systemd[1]: modprobe(a)pstore_blk.service: Deactivated successfully. [ 5.558799] systemd[1]: Finished Load Kernel Module pstore_blk. [ 5.559385] ppdev: user-space parallel port driver [ 5.560493] systemd[1]: modprobe(a)pstore_zone.service: Deactivated successfully. [ 5.561431] systemd[1]: Finished Load Kernel Module pstore_zone. [ 5.575494] systemd[1]: modprobe(a)ramoops.service: Deactivated successfully. [ 5.576375] systemd[1]: Finished Load Kernel Module ramoops. [ 5.580274] systemd[1]: Finished Remount Root and Kernel File Systems. [ 5.588145] systemd[1]: Activating swap /swapfile... [ 5.600259] Adding 1607676k swap on /swapfile. Priority:-2 extents:7 across:8699900k SSFS [ 5.600516] systemd[1]: Mounting FUSE Control File System... [ 5.611314] systemd[1]: Mounting Kernel Configuration File System... [ 5.611581] systemd[1]: Platform Persistent Storage Archival was skipped because of a failed condition check (ConditionDirectoryNotEmpty=/sys/fs/pstore). [ 5.642749] systemd[1]: Starting Load/Save Random Seed... [ 5.653723] systemd[1]: Starting Create System Users... [ 5.654170] systemd[1]: Activated swap /swapfile. [ 5.668179] systemd[1]: Finished Load Kernel Modules. [ 5.669206] systemd[1]: Mounted FUSE Control File System. [ 5.683974] systemd[1]: Mounted Kernel Configuration File System. [ 5.690500] systemd[1]: Finished Load/Save Random Seed. [ 5.691314] systemd[1]: First Boot Complete was skipped because of a failed condition check (ConditionFirstBoot=yes). [ 5.691371] systemd[1]: Reached target Swaps. [ 5.694469] systemd[1]: Starting Apply Kernel Variables... [ 5.718998] systemd[1]: Finished Create System Users. [ 5.722865] systemd[1]: Starting Create Static Device Nodes in /dev... [ 5.737270] systemd[1]: Finished Apply Kernel Variables. [ 5.766204] systemd[1]: Finished Create Static Device Nodes in /dev. [ 5.771106] systemd[1]: Starting Rule-based Manager for Device Events and Files... [ 5.783966] systemd[1]: Finished Set the console keyboard layout. [ 5.784457] systemd[1]: Reached target Preparation for Local File Systems. [ 5.788902] systemd[1]: Mounting Mount unit for bare, revision 5... [ 5.796708] systemd[1]: Mounting Mount unit for core20, revision 1623... [ 5.810144] systemd[1]: Mounting Mount unit for core20, revision 1738... [ 5.815480] loop0: detected capacity change from 0 to 8 [ 5.816912] systemd[1]: Mounting Mount unit for firefox, revision 1969... [ 5.818539] Dev loop0: unable to read RDB block 8 [ 5.818597] loop0: unable to read partition table [ 5.818611] loop0: partition table beyond EOD, truncated [ 5.821755] loop1: detected capacity change from 0 to 129496 [ 5.826709] systemd[1]: Mounting Mount unit for firefox, revision 2154... [ 5.835106] loop2: detected capacity change from 0 to 129480 [ 5.842728] systemd[1]: Mounting Mount unit for gnome-3-38-2004, revision 119... [ 5.852115] loop3: detected capacity change from 0 to 488424 [ 5.852727] systemd[1]: Mounting Mount unit for gtk-common-themes, revision 1535... [ 5.857542] loop4: detected capacity change from 0 to 486424 [ 5.864528] loop5: detected capacity change from 0 to 709280 [ 5.870703] systemd[1]: Mounting Mount unit for snapd, revision 17883... [ 5.882935] loop6: detected capacity change from 0 to 187776 [ 5.883635] systemd[1]: Mounting Mount unit for firefox, revision 1969 via mount-control... [ 5.902337] systemd[1]: Started Journal Service. [ 5.902665] loop7: detected capacity change from 0 to 101624 [ 5.953129] systemd-journald[244]: Received client request to flush runtime journal. [ 7.050902] audit: type=1400 audit(1671188657.016:2): apparmor="STATUS" operation="profile_load" profile="unconfined" name="lsb_release" pid=341 comm="apparmor_parser" [ 7.068971] audit: type=1400 audit(1671188657.032:3): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/lightdm/lightdm-guest-session" pid=340 comm="apparmor_parser" [ 7.068997] audit: type=1400 audit(1671188657.032:4): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/lightdm/lightdm-guest-session//chromium" pid=340 comm="apparmor_parser" [ 7.078690] audit: type=1400 audit(1671188657.044:5): apparmor="STATUS" operation="profile_load" profile="unconfined" name="nvidia_modprobe" pid=342 comm="apparmor_parser" [ 7.078707] audit: type=1400 audit(1671188657.044:6): apparmor="STATUS" operation="profile_load" profile="unconfined" name="nvidia_modprobe//kmod" pid=342 comm="apparmor_parser" [ 7.090675] audit: type=1400 audit(1671188657.056:7): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/NetworkManager/nm-dhcp-client.action" pid=343 comm="apparmor_parser" [ 7.090697] audit: type=1400 audit(1671188657.056:8): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/NetworkManager/nm-dhcp-helper" pid=343 comm="apparmor_parser" [ 7.090707] audit: type=1400 audit(1671188657.056:9): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/connman/scripts/dhclient-script" pid=343 comm="apparmor_parser" [ 7.090716] audit: type=1400 audit(1671188657.056:10): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/{,usr/}sbin/dhclient" pid=343 comm="apparmor_parser" [ 7.104236] audit: type=1400 audit(1671188657.068:11): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/bin/man" pid=344 comm="apparmor_parser" [ 7.845728] cfg80211: Loading compiled-in X.509 certificates for regulatory database [ 7.848620] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' [ 7.869625] Consider using thermal netlink events interface [ 8.142616] proc_thermal 0000:00:0b.0: can't derive routing for PCI INT A [ 8.142629] proc_thermal 0000:00:0b.0: PCI INT A: not connected [ 8.166680] elan_i2c i2c-ELAN0000:00: supply vcc not found, using dummy regulator [ 8.284165] elan_i2c i2c-ELAN0000:00: Elan Touchpad: Module ID: 0x007b, Firmware: 0x0003, Sample: 0x0007, IAP: 0x000d [ 8.311290] input: Elan Touchpad as /devices/pci0000:00/808622C1:05/i2c-2/i2c-ELAN0000:00/input/input3 [ 8.552837] Bluetooth: Core ver 2.22 [ 8.552944] NET: Registered PF_BLUETOOTH protocol family [ 8.552949] Bluetooth: HCI device and connection manager initialized [ 8.553187] Bluetooth: HCI socket layer initialized [ 8.553194] Bluetooth: L2CAP socket layer initialized [ 8.553205] Bluetooth: SCO socket layer initialized [ 9.388104] Bluetooth: hci0: Legacy ROM 2.x revision 5.0 build 25 week 20 2015 [ 9.393723] Bluetooth: hci0: Intel Bluetooth firmware file: intel/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq [ 9.426486] usbcore: registered new interface driver btusb [ 9.669799] Console: switching to colour dummy device 80x25 [ 9.669874] i915 0000:00:02.0: vgaarb: deactivate vga console [ 9.674122] Intel(R) Wireless WiFi driver for Linux [ 9.775205] Bluetooth: hci0: Intel BT fw patch 0x43 completed & activated [ 9.815942] mc: Linux media interface: v0.10 [ 9.817112] spi-nor spi0.0: w25q64dw (8192 Kbytes) [ 9.901940] iwlwifi 0000:02:00.0: Found debug destination: EXTERNAL_DRAM [ 9.901954] iwlwifi 0000:02:00.0: Found debug configuration: 0 [ 9.903069] iwlwifi 0000:02:00.0: loaded firmware version 29.4063824552.0 7265D-29.ucode op_mode iwlmvm [ 9.953541] Creating 1 MTD partitions on "intel-spi": [ 9.953556] 0x000000000000-0x000000800000 : "BIOS" [ 10.137012] [drm] Initialized i915 1.6.0 20201103 for 0000:00:02.0 on minor 0 [ 10.227097] ACPI: video: Video Device [GFX0] (multi-head: yes rom: no post: no) [ 10.227448] input: Video Bus as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/LNXVIDEO:00/input/input4 [ 10.490768] cros-ec-sensorhub cros-ec-sensorhub.3.auto: no info for EC sensor 0 : -22/3 [ 10.492210] cros-ec-sensorhub cros-ec-sensorhub.3.auto: no info for EC sensor 1 : -22/3 [ 10.843112] videodev: Linux video capture interface: v2.00 [ 10.848142] fbcon: i915drmfb (fb0) is primary device [ 11.072678] cryptd: max_cpu_qlen set to 1000 [ 11.105581] intel_rapl_common: Found RAPL domain package [ 11.105588] intel_rapl_common: Found RAPL domain core [ 11.593502] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 [ 11.593511] Bluetooth: BNEP filters: protocol multicast [ 11.593520] Bluetooth: BNEP socket layer initialized [ 12.096881] Console: switching to colour frame buffer device 170x48 [ 12.125606] i915 0000:00:02.0: [drm] fb0: i915drmfb frame buffer device [ 12.191524] NET: Registered PF_ALG protocol family [ 12.217110] iwlwifi 0000:02:00.0: Detected Intel(R) Dual Band Wireless AC 7265, REV=0x210 [ 12.217267] thermal thermal_zone7: failed to read out thermal zone (-61) [ 12.232155] iwlwifi 0000:02:00.0: Applying debug destination EXTERNAL_DRAM [ 12.234923] iwlwifi 0000:02:00.0: Allocated 0x00400000 bytes for firmware monitor. [ 12.252693] iwlwifi 0000:02:00.0: base HW address: 14:4f:8a:5c:18:8b, OTP minor version: 0x0 [ 12.255467] SSE version of gcm_enc/dec engaged. [ 12.271741] rt5640 i2c-10EC5650:00: Device with ID register 0x6419 is not rt5640/39 [ 12.284810] rt5645 i2c-10EC5650:00: Detected Google Chrome platform [ 12.284829] rt5645 i2c-10EC5650:00: supply avdd not found, using dummy regulator [ 12.284923] rt5645 i2c-10EC5650:00: supply cpvdd not found, using dummy regulator [ 12.314889] ieee80211 phy0: Selected rate control algorithm 'iwl-mvm-rs' [ 12.658858] iwlwifi 0000:02:00.0 wlp2s0: renamed from wlan0 [ 12.701141] usb 1-4: Found UVC 1.00 device HP Truevision HD (0bda:57c4) [ 12.712974] sof-audio-acpi-intel-byt 808622A8:00: Firmware info: version 2:1:1-3964a [ 12.712986] sof-audio-acpi-intel-byt 808622A8:00: Firmware: ABI 3:21:0 Kernel ABI 3:21:0 [ 12.713006] sof-audio-acpi-intel-byt 808622A8:00: unknown sof_ext_man header type 3 size 0x30 [ 12.736727] sof-audio-acpi-intel-byt 808622A8:00: Firmware info: version 2:1:1-3964a [ 12.736739] sof-audio-acpi-intel-byt 808622A8:00: Firmware: ABI 3:21:0 Kernel ABI 3:21:0 [ 12.802246] input: HP Truevision HD: HP Truevision as /devices/pci0000:00/0000:00:14.0/usb1/1-4/1-4:1.0/input/input5 [ 12.802850] usbcore: registered new interface driver uvcvideo [ 12.807098] loop8: detected capacity change from 0 to 8 [ 12.809772] Dev loop8: unable to read RDB block 8 [ 12.809791] loop8: unable to read partition table [ 12.809803] loop8: partition table beyond EOD, truncated [ 12.842252] cht-bsw-rt5645 cht-bsw-rt5645: quirk PMC_PLT_CLK_0 enabled [ 12.903744] sof-audio-acpi-intel-byt 808622A8:00: Topology: ABI 3:21:0 Kernel ABI 3:21:0 [ 12.905121] cht-bsw-rt5645 cht-bsw-rt5645: ASoC: Parent card not yet available, widget card binding deferred [ 13.084774] ================================================================================ [ 13.084781] UBSAN: shift-out-of-bounds in /build/linux-ke3rPq/linux-5.19.0/sound/soc/soc-dapm.c:815:15 [ 13.084788] shift exponent 16384 is too large for 32-bit type 'unsigned int' [ 13.084792] CPU: 0 PID: 294 Comm: systemd-udevd Not tainted 5.19.0-26-generic #27-Ubuntu [ 13.084797] Hardware name: GOOGLE Setzer/Setzer, BIOS MrChromebox-4.18.2 11/29/2022 [ 13.084799] Call Trace: [ 13.084803] <TASK> [ 13.084808] show_stack+0x4e/0x61 [ 13.084820] dump_stack_lvl+0x4a/0x6d [ 13.084826] dump_stack+0x10/0x18 [ 13.084830] ubsan_epilogue+0x9/0x43 [ 13.084834] __ubsan_handle_shift_out_of_bounds.cold+0x61/0xef [ 13.084842] snd_soc_dapm_add_path.cold+0x67/0x12a [snd_soc_core] [ 13.084897] snd_soc_dapm_add_route+0x120/0x330 [snd_soc_core] [ 13.084938] snd_soc_dapm_add_routes+0x4c/0xa0 [snd_soc_core] [ 13.084975] soc_probe_component+0x21c/0x2a0 [snd_soc_core] [ 13.085011] snd_soc_bind_card+0x2e3/0x730 [snd_soc_core] [ 13.085046] ? devm_snd_soc_register_card+0x38/0xb0 [snd_soc_core] [ 13.085087] snd_soc_register_card+0x145/0x170 [snd_soc_core] [ 13.085122] devm_snd_soc_register_card+0x48/0xb0 [snd_soc_core] [ 13.085162] snd_cht_mc_probe+0x49e/0x6b0 [snd_soc_sst_cht_bsw_rt5645] [ 13.085171] ? kernfs_create_link+0x66/0xe0 [ 13.085176] ? acpi_dev_pm_attach+0x25/0x120 [ 13.085182] platform_probe+0x48/0xe0 [ 13.085189] really_probe+0x1df/0x3b0 [ 13.085193] __driver_probe_device+0x12c/0x1b0 [ 13.085197] driver_probe_device+0x24/0xd0 [ 13.085201] __driver_attach+0xe0/0x210 [ 13.085205] ? __device_attach_driver+0x130/0x130 [ 13.085208] bus_for_each_dev+0x90/0xe0 [ 13.085213] driver_attach+0x1e/0x30 [ 13.085216] bus_add_driver+0x187/0x230 [ 13.085220] driver_register+0x8f/0x100 [ 13.085224] ? 0xffffffffc0cca000 [ 13.085228] __platform_driver_register+0x1e/0x30 [ 13.085232] snd_cht_mc_driver_init+0x1c/0x1000 [snd_soc_sst_cht_bsw_rt5645] [ 13.085238] do_one_initcall+0x5e/0x240 [ 13.085245] do_init_module+0x50/0x210 [ 13.085250] load_module+0xb7d/0xcd0 [ 13.085257] __do_sys_finit_module+0xc4/0x140 [ 13.085260] ? __do_sys_finit_module+0xc4/0x140 [ 13.085266] __x64_sys_finit_module+0x18/0x30 [ 13.085269] do_syscall_64+0x5b/0x90 [ 13.085273] ? exit_to_user_mode_prepare+0x30/0xb0 [ 13.085278] ? syscall_exit_to_user_mode+0x26/0x50 [ 13.085282] ? __x64_sys_mmap+0x33/0x70 [ 13.085286] ? do_syscall_64+0x67/0x90 [ 13.085289] ? do_syscall_64+0x67/0x90 [ 13.085292] ? do_syscall_64+0x67/0x90 [ 13.085295] ? sysvec_apic_timer_interrupt+0x4b/0xd0 [ 13.085298] entry_SYSCALL_64_after_hwframe+0x63/0xcd [ 13.085303] RIP: 0033:0x7f285cd16c4d [ 13.085309] Code: 5d c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 83 f1 0d 00 f7 d8 64 89 01 48 [ 13.085312] RSP: 002b:00007ffe75652028 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 [ 13.085318] RAX: ffffffffffffffda RBX: 000055abf33f9f50 RCX: 00007f285cd16c4d [ 13.085320] RDX: 0000000000000000 RSI: 00007f285cfc4458 RDI: 0000000000000006 [ 13.085323] RBP: 00007f285cfc4458 R08: 0000000000000000 R09: 00007ffe75652150 [ 13.085325] R10: 0000000000000006 R11: 0000000000000246 R12: 0000000000020000 [ 13.085327] R13: 000055abf33f69b0 R14: 0000000000000000 R15: 000055abf33f6660 [ 13.085332] </TASK> [ 13.085333] ================================================================================ [ 13.112949] snd_hda_intel 0000:00:1b.0: bound 0000:00:02.0 (ops i915_audio_component_bind_ops [i915]) [ 13.151710] input: sof-bytcht rt5650 Headset as /devices/pci0000:00/808622A8:00/cht-bsw-rt5645/sound/card0/input6 [ 13.186899] iwlwifi 0000:02:00.0: Applying debug destination EXTERNAL_DRAM [ 13.251449] input: HDA Intel PCH HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:1b.0/sound/card1/input7 [ 13.251587] input: HDA Intel PCH HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:1b.0/sound/card1/input8 [ 13.251701] input: HDA Intel PCH HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:1b.0/sound/card1/input9 [ 13.285015] iwlwifi 0000:02:00.0: Applying debug destination EXTERNAL_DRAM [ 13.287519] iwlwifi 0000:02:00.0: FW already configured (0) - re-configuring [ 13.912231] ================================================================================ [ 13.912248] UBSAN: shift-out-of-bounds in /build/linux-ke3rPq/linux-5.19.0/sound/soc/soc-dapm.c:3420:13 [ 13.912256] shift exponent 16384 is too large for 32-bit type 'unsigned int' [ 13.912261] CPU: 0 PID: 750 Comm: alsactl Not tainted 5.19.0-26-generic #27-Ubuntu [ 13.912266] Hardware name: GOOGLE Setzer/Setzer, BIOS MrChromebox-4.18.2 11/29/2022 [ 13.912270] Call Trace: [ 13.912274] <TASK> [ 13.912280] show_stack+0x4e/0x61 [ 13.912291] dump_stack_lvl+0x4a/0x6d [ 13.912303] dump_stack+0x10/0x18 [ 13.912307] ubsan_epilogue+0x9/0x43 [ 13.912312] __ubsan_handle_shift_out_of_bounds.cold+0x61/0xef [ 13.912320] snd_soc_dapm_put_volsw.cold+0x60/0x2be [snd_soc_core] [ 13.912376] snd_ctl_elem_write+0x115/0x200 [snd] [ 13.912396] snd_ctl_ioctl+0x12e/0x690 [snd] [ 13.912414] __x64_sys_ioctl+0xa0/0xe0 [ 13.912420] do_syscall_64+0x5b/0x90 [ 13.912425] ? do_syscall_64+0x67/0x90 [ 13.912429] ? syscall_exit_to_user_mode+0x26/0x50 [ 13.912434] ? do_syscall_64+0x67/0x90 [ 13.912437] ? do_syscall_64+0x67/0x90 [ 13.912441] entry_SYSCALL_64_after_hwframe+0x63/0xcd [ 13.912447] RIP: 0033:0x7f5d6c512d8f [ 13.912453] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28 00 00 [ 13.912457] RSP: 002b:00007ffcc29180e0 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 13.912462] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f5d6c512d8f [ 13.912465] RDX: 00007ffcc2918270 RSI: 00000000c4c85513 RDI: 0000000000000003 [ 13.912468] RBP: 00007ffcc2918810 R08: 0000000000000001 R09: 000055dbbd456116 [ 13.912471] R10: fffffffffffff725 R11: 0000000000000246 R12: 0000000000000082 [ 13.912473] R13: 0000000000000001 R14: 0000000000000001 R15: 00007ffcc2918160 [ 13.912479] </TASK> [ 13.912497] ================================================================================ [ 13.912502] ================================================================================ [ 13.912505] UBSAN: shift-out-of-bounds in /build/linux-ke3rPq/linux-5.19.0/sound/soc/soc-dapm.c:3421:15 [ 13.912510] shift exponent 16384 is too large for 32-bit type 'unsigned int' [ 13.912514] CPU: 0 PID: 750 Comm: alsactl Not tainted 5.19.0-26-generic #27-Ubuntu [ 13.912518] Hardware name: GOOGLE Setzer/Setzer, BIOS MrChromebox-4.18.2 11/29/2022 [ 13.912520] Call Trace: [ 13.912523] <TASK> [ 13.912525] show_stack+0x4e/0x61 [ 13.912531] dump_stack_lvl+0x4a/0x6d [ 13.912537] dump_stack+0x10/0x18 [ 13.912542] ubsan_epilogue+0x9/0x43 [ 13.912546] __ubsan_handle_shift_out_of_bounds.cold+0x61/0xef [ 13.912553] snd_soc_dapm_put_volsw.cold+0x205/0x2be [snd_soc_core] [ 13.912597] snd_ctl_elem_write+0x115/0x200 [snd] [ 13.912614] snd_ctl_ioctl+0x12e/0x690 [snd] [ 13.912631] __x64_sys_ioctl+0xa0/0xe0 [ 13.912636] do_syscall_64+0x5b/0x90 [ 13.912639] ? do_syscall_64+0x67/0x90 [ 13.912643] ? syscall_exit_to_user_mode+0x26/0x50 [ 13.912648] ? do_syscall_64+0x67/0x90 [ 13.912651] ? do_syscall_64+0x67/0x90 [ 13.912655] entry_SYSCALL_64_after_hwframe+0x63/0xcd [ 13.912660] RIP: 0033:0x7f5d6c512d8f [ 13.912664] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28 00 00 [ 13.912667] RSP: 002b:00007ffcc29180e0 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 13.912672] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f5d6c512d8f [ 13.912675] RDX: 00007ffcc2918270 RSI: 00000000c4c85513 RDI: 0000000000000003 [ 13.912677] RBP: 00007ffcc2918810 R08: 0000000000000001 R09: 000055dbbd456116 [ 13.912680] R10: fffffffffffff725 R11: 0000000000000246 R12: 0000000000000082 [ 13.912682] R13: 0000000000000001 R14: 0000000000000001 R15: 00007ffcc2918160 [ 13.912688] </TASK> [ 13.912690] ================================================================================ [ 13.912693] ================================================================================ [ 13.912695] UBSAN: shift-out-of-bounds in /build/linux-ke3rPq/linux-5.19.0/sound/soc/soc-dapm.c:3423:51 [ 13.912700] shift exponent 16384 is too large for 32-bit type 'unsigned int' [ 13.912703] CPU: 0 PID: 750 Comm: alsactl Not tainted 5.19.0-26-generic #27-Ubuntu [ 13.912707] Hardware name: GOOGLE Setzer/Setzer, BIOS MrChromebox-4.18.2 11/29/2022 [ 13.912709] Call Trace: [ 13.912711] <TASK> [ 13.912713] show_stack+0x4e/0x61 [ 13.912719] dump_stack_lvl+0x4a/0x6d [ 13.912724] dump_stack+0x10/0x18 [ 13.912729] ubsan_epilogue+0x9/0x43 [ 13.912733] __ubsan_handle_shift_out_of_bounds.cold+0x61/0xef [ 13.912740] snd_soc_dapm_put_volsw.cold+0x97/0x2be [snd_soc_core] [ 13.912784] snd_ctl_elem_write+0x115/0x200 [snd] [ 13.912800] snd_ctl_ioctl+0x12e/0x690 [snd] [ 13.912818] __x64_sys_ioctl+0xa0/0xe0 [ 13.912822] do_syscall_64+0x5b/0x90 [ 13.912826] ? do_syscall_64+0x67/0x90 [ 13.912830] ? syscall_exit_to_user_mode+0x26/0x50 [ 13.912834] ? do_syscall_64+0x67/0x90 [ 13.912838] ? do_syscall_64+0x67/0x90 [ 13.912842] entry_SYSCALL_64_after_hwframe+0x63/0xcd [ 13.912846] RIP: 0033:0x7f5d6c512d8f [ 13.912850] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28 00 00 [ 13.912854] RSP: 002b:00007ffcc29180e0 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 13.912858] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f5d6c512d8f [ 13.912861] RDX: 00007ffcc2918270 RSI: 00000000c4c85513 RDI: 0000000000000003 [ 13.912863] RBP: 00007ffcc2918810 R08: 0000000000000001 R09: 000055dbbd456116 [ 13.912866] R10: fffffffffffff725 R11: 0000000000000246 R12: 0000000000000082 [ 13.912868] R13: 0000000000000001 R14: 0000000000000001 R15: 00007ffcc2918160 [ 13.912874] </TASK> [ 13.912875] ================================================================================ [ 13.913215] ================================================================================ [ 13.913224] UBSAN: shift-out-of-bounds in /build/linux-ke3rPq/linux-5.19.0/sound/soc/soc-dapm.c:3441:23 [ 13.913230] shift exponent 16384 is too large for 32-bit type 'unsigned int' [ 13.913235] CPU: 0 PID: 750 Comm: alsactl Not tainted 5.19.0-26-generic #27-Ubuntu [ 13.913239] Hardware name: GOOGLE Setzer/Setzer, BIOS MrChromebox-4.18.2 11/29/2022 [ 13.913242] Call Trace: [ 13.913245] <TASK> [ 13.913249] show_stack+0x4e/0x61 [ 13.913258] dump_stack_lvl+0x4a/0x6d [ 13.913267] dump_stack+0x10/0x18 [ 13.913272] ubsan_epilogue+0x9/0x43 [ 13.913276] __ubsan_handle_shift_out_of_bounds.cold+0x61/0xef [ 13.913284] snd_soc_dapm_put_volsw.cold+0x2b5/0x2be [snd_soc_core] [ 13.913337] snd_ctl_elem_write+0x115/0x200 [snd] [ 13.913356] snd_ctl_ioctl+0x12e/0x690 [snd] [ 13.913373] __x64_sys_ioctl+0xa0/0xe0 [ 13.913380] do_syscall_64+0x5b/0x90 [ 13.913384] ? do_syscall_64+0x67/0x90 [ 13.913388] ? syscall_exit_to_user_mode+0x26/0x50 [ 13.913393] ? do_syscall_64+0x67/0x90 [ 13.913396] ? do_syscall_64+0x67/0x90 [ 13.913400] entry_SYSCALL_64_after_hwframe+0x63/0xcd [ 13.913406] RIP: 0033:0x7f5d6c512d8f [ 13.913412] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28 00 00 [ 13.913415] RSP: 002b:00007ffcc29180e0 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 13.913420] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f5d6c512d8f [ 13.913423] RDX: 00007ffcc2918270 RSI: 00000000c4c85513 RDI: 0000000000000003 [ 13.913425] RBP: 00007ffcc2918810 R08: 0000000000000001 R09: 000055dbbd456116 [ 13.913428] R10: fffffffffffff725 R11: 0000000000000246 R12: 0000000000000082 [ 13.913430] R13: 0000000000000001 R14: 0000000000000001 R15: 00007ffcc2918160 [ 13.913436] </TASK> [ 13.913438] ================================================================================ [ 17.172434] wlp2s0: authenticate with 00:18:0a:d8:7d:12 [ 17.172483] wlp2s0: bad VHT capabilities, disabling VHT [ 17.180519] wlp2s0: send auth to 00:18:0a:d8:7d:12 (try 1/3) [ 17.183085] wlp2s0: authenticated [ 17.183797] wlp2s0: VHT capa missing/short, disabling VHT/HE/EHT [ 17.186440] wlp2s0: associate with 00:18:0a:d8:7d:12 (try 1/3) [ 17.188389] wlp2s0: RX AssocResp from 00:18:0a:d8:7d:12 (capab=0x11 status=0 aid=1) [ 17.199694] wlp2s0: associated [ 17.351258] IPv6: ADDRCONF(NETDEV_CHANGE): wlp2s0: link becomes ready [ 17.377833] SSP2-Codec: dpcm_be_connect: FE is nonatomic but BE is not, forcing BE as nonatomic [ 18.115144] Bluetooth: RFCOMM TTY layer initialized [ 18.115165] Bluetooth: RFCOMM socket layer initialized [ 18.115184] Bluetooth: RFCOMM ver 1.11

2 2

[PATCH] treewide: Convert del_timer*() to timer_shutdown*()
by Steven Rostedt 23 Dec '22

23 Dec '22

[ Linus, I ran the script against your latest master branch: commit b6bb9676f2165d518b35ba3bea5f1fcfc0d969bf As the timer_shutdown*() code is now in your tree, I figured we can start doing the conversions. At least add the trivial ones now as Thomas suggested that this gets applied at the end of the merge window, to avoid conflicts with linux-next during the development cycle. I can wait to Friday to run it again, and resubmit. What is the best way to handle this? ] From: "Steven Rostedt (Google)" <rostedt(a)goodmis.org> Due to several bugs caused by timers being re-armed after they are shutdown and just before they are freed, a new state of timers was added called "shutdown". After a timer is set to this state, then it can no longer be re-armed. The following script was run to find all the trivial locations where del_timer() or del_timer_sync() is called in the same function that the object holding the timer is freed. It also ignores any locations where the timer->function is modified between the del_timer*() and the free(), as that is not considered a "trivial" case. This was created by using a coccinelle script and the following commands: $ cat timer.cocci @@ expression ptr, slab; identifier timer, rfield; @@ ( - del_timer(&ptr->timer); + timer_shutdown(&ptr->timer); | - del_timer_sync(&ptr->timer); + timer_shutdown_sync(&ptr->timer); ) ... when strict when != ptr->timer ( kfree_rcu(ptr, rfield); | kmem_cache_free(slab, ptr); | kfree(ptr); ) $ spatch timer.cocci . > /tmp/t.patch $ patch -p1 < /tmp/t.patch Link: https://lore.kernel.org/lkml/20221123201306.823305113@linutronix.de/ Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> --- arch/sh/drivers/push-switch.c | 2 +- block/blk-iocost.c | 2 +- block/blk-iolatency.c | 2 +- block/kyber-iosched.c | 2 +- drivers/acpi/apei/ghes.c | 2 +- drivers/atm/idt77252.c | 6 +++--- drivers/block/drbd/drbd_main.c | 2 +- drivers/block/loop.c | 2 +- drivers/bluetooth/hci_bcsp.c | 2 +- drivers/gpu/drm/i915/i915_sw_fence.c | 2 +- drivers/hid/hid-wiimote-core.c | 2 +- drivers/input/keyboard/locomokbd.c | 2 +- drivers/input/keyboard/omap-keypad.c | 2 +- drivers/input/mouse/alps.c | 2 +- drivers/isdn/mISDN/l1oip_core.c | 4 ++-- drivers/isdn/mISDN/timerdev.c | 4 ++-- drivers/leds/trigger/ledtrig-activity.c | 2 +- drivers/leds/trigger/ledtrig-heartbeat.c | 2 +- drivers/leds/trigger/ledtrig-pattern.c | 2 +- drivers/leds/trigger/ledtrig-transient.c | 2 +- drivers/media/pci/ivtv/ivtv-driver.c | 2 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 16 ++++++++-------- drivers/media/usb/s2255/s2255drv.c | 4 ++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +++--- drivers/net/ethernet/marvell/sky2.c | 2 +- drivers/net/ethernet/sun/sunvnet.c | 2 +- drivers/net/usb/sierra_net.c | 2 +- .../broadcom/brcm80211/brcmfmac/btcoex.c | 2 +- drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 2 +- drivers/net/wireless/intersil/hostap/hostap_ap.c | 2 +- drivers/net/wireless/marvell/mwifiex/main.c | 2 +- drivers/net/wireless/microchip/wilc1000/hif.c | 6 +++--- drivers/nfc/pn533/pn533.c | 2 +- drivers/nfc/pn533/uart.c | 2 +- drivers/pcmcia/bcm63xx_pcmcia.c | 2 +- drivers/pcmcia/electra_cf.c | 2 +- drivers/pcmcia/omap_cf.c | 2 +- drivers/pcmcia/pd6729.c | 4 ++-- drivers/pcmcia/yenta_socket.c | 4 ++-- drivers/scsi/qla2xxx/qla_edif.c | 4 ++-- .../staging/media/atomisp/i2c/atomisp-lm3554.c | 2 +- drivers/staging/wlan-ng/prism2usb.c | 6 +++--- drivers/tty/n_gsm.c | 2 +- drivers/tty/sysrq.c | 2 +- drivers/usb/gadget/udc/m66592-udc.c | 2 +- drivers/usb/serial/garmin_gps.c | 2 +- drivers/usb/serial/mos7840.c | 4 ++-- fs/ext4/super.c | 2 +- fs/nilfs2/segment.c | 2 +- net/802/garp.c | 2 +- net/802/mrp.c | 4 ++-- net/bridge/br_multicast.c | 8 ++++---- net/bridge/br_multicast_eht.c | 4 ++-- net/core/gen_estimator.c | 2 +- net/ipv4/ipmr.c | 2 +- net/ipv6/ip6mr.c | 2 +- net/mac80211/mesh_pathtbl.c | 2 +- net/netfilter/ipset/ip_set_list_set.c | 2 +- net/netfilter/ipvs/ip_vs_lblc.c | 2 +- net/netfilter/ipvs/ip_vs_lblcr.c | 2 +- net/netfilter/xt_IDLETIMER.c | 4 ++-- net/netfilter/xt_LED.c | 2 +- net/sched/cls_flow.c | 2 +- net/sunrpc/svc.c | 2 +- net/tipc/discover.c | 2 +- net/tipc/monitor.c | 2 +- sound/i2c/other/ak4117.c | 2 +- sound/synth/emux/emux.c | 2 +- 69 files changed, 97 insertions(+), 97 deletions(-) diff --git a/arch/sh/drivers/push-switch.c b/arch/sh/drivers/push-switch.c index 2813140fd92b..c95f48ff3f6f 100644 --- a/arch/sh/drivers/push-switch.c +++ b/arch/sh/drivers/push-switch.c @@ -102,7 +102,7 @@ static int switch_drv_remove(struct platform_device *pdev) platform_set_drvdata(pdev, NULL); flush_work(&psw->work); - del_timer_sync(&psw->debounce); + timer_shutdown_sync(&psw->debounce); free_irq(irq, pdev); kfree(psw); diff --git a/block/blk-iocost.c b/block/blk-iocost.c index d1bdc12deaa7..aeea49870c0e 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -2818,7 +2818,7 @@ static void ioc_rqos_exit(struct rq_qos *rqos) ioc->running = IOC_STOP; spin_unlock_irq(&ioc->lock); - del_timer_sync(&ioc->timer); + timer_shutdown_sync(&ioc->timer); free_percpu(ioc->pcpu_stat); kfree(ioc); } diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c index 778a0057193e..ecdc10741836 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -644,7 +644,7 @@ static void blkcg_iolatency_exit(struct rq_qos *rqos) { struct blk_iolatency *blkiolat = BLKIOLATENCY(rqos); - del_timer_sync(&blkiolat->timer); + timer_shutdown_sync(&blkiolat->timer); flush_work(&blkiolat->enable_work); blkcg_deactivate_policy(rqos->q, &blkcg_policy_iolatency); kfree(blkiolat); diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c index b05357bced99..2146969237bf 100644 --- a/block/kyber-iosched.c +++ b/block/kyber-iosched.c @@ -434,7 +434,7 @@ static void kyber_exit_sched(struct elevator_queue *e) struct kyber_queue_data *kqd = e->elevator_data; int i; - del_timer_sync(&kqd->timer); + timer_shutdown_sync(&kqd->timer); blk_stat_disable_accounting(kqd->q); for (i = 0; i < KYBER_NUM_DOMAINS; i++) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 066dc1f5c235..34ad071a64e9 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -1431,7 +1431,7 @@ static int ghes_remove(struct platform_device *ghes_dev) ghes->flags |= GHES_EXITING; switch (generic->notify.type) { case ACPI_HEST_NOTIFY_POLLED: - del_timer_sync(&ghes->timer); + timer_shutdown_sync(&ghes->timer); break; case ACPI_HEST_NOTIFY_EXTERNAL: free_irq(ghes->irq, ghes); diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 681cb3786794..eec0cc2144e0 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -2213,7 +2213,7 @@ idt77252_init_ubr(struct idt77252_dev *card, struct vc_map *vc, } spin_unlock_irqrestore(&vc->lock, flags); if (est) { - del_timer_sync(&est->timer); + timer_shutdown_sync(&est->timer); kfree(est); } @@ -2530,7 +2530,7 @@ idt77252_close(struct atm_vcc *vcc) vc->tx_vcc = NULL; if (vc->estimator) { - del_timer(&vc->estimator->timer); + timer_shutdown(&vc->estimator->timer); kfree(vc->estimator); vc->estimator = NULL; } @@ -3752,7 +3752,7 @@ static void __exit idt77252_exit(void) card = idt77252_chain; dev = card->atmdev; idt77252_chain = card->next; - del_timer_sync(&card->tst_timer); + timer_shutdown_sync(&card->tst_timer); if (dev->phy->stop) dev->phy->stop(dev); diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 2f16e1bfb6e7..e43dfb9eb6ad 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2184,7 +2184,7 @@ void drbd_destroy_device(struct kref *kref) struct drbd_resource *resource = device->resource; struct drbd_peer_device *peer_device, *tmp_peer_device; - del_timer_sync(&device->request_timer); + timer_shutdown_sync(&device->request_timer); /* paranoia asserts */ D_ASSERT(device, device->open_cnt == 0); diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 1f8f3b87bdfa..4b366b658eea 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1755,7 +1755,7 @@ static void lo_free_disk(struct gendisk *disk) if (lo->workqueue) destroy_workqueue(lo->workqueue); loop_free_idle_workers(lo, true); - del_timer_sync(&lo->timer); + timer_shutdown_sync(&lo->timer); mutex_destroy(&lo->lo_mutex); kfree(lo); } diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c index 8055f63603f4..2a5a27d713f8 100644 --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c @@ -737,7 +737,7 @@ static int bcsp_close(struct hci_uart *hu) { struct bcsp_struct *bcsp = hu->priv; - del_timer_sync(&bcsp->tbcsp); + timer_shutdown_sync(&bcsp->tbcsp); hu->priv = NULL; diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c index cc2a8821d22a..8a9aad523eec 100644 --- a/drivers/gpu/drm/i915/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/i915_sw_fence.c @@ -465,7 +465,7 @@ static void irq_i915_sw_fence_work(struct irq_work *wrk) struct i915_sw_dma_fence_cb_timer *cb = container_of(wrk, typeof(*cb), work); - del_timer_sync(&cb->timer); + timer_shutdown_sync(&cb->timer); dma_fence_put(cb->dma); kfree_rcu(cb, rcu); diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c index 09db8111dc26..26167cfb696f 100644 --- a/drivers/hid/hid-wiimote-core.c +++ b/drivers/hid/hid-wiimote-core.c @@ -1771,7 +1771,7 @@ static void wiimote_destroy(struct wiimote_data *wdata) spin_unlock_irqrestore(&wdata->state.lock, flags); cancel_work_sync(&wdata->init_worker); - del_timer_sync(&wdata->timer); + timer_shutdown_sync(&wdata->timer); device_remove_file(&wdata->hdev->dev, &dev_attr_devtype); device_remove_file(&wdata->hdev->dev, &dev_attr_extension); diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c index dae053596572..f866c03b9d0e 100644 --- a/drivers/input/keyboard/locomokbd.c +++ b/drivers/input/keyboard/locomokbd.c @@ -310,7 +310,7 @@ static void locomokbd_remove(struct locomo_dev *dev) free_irq(dev->irq[0], locomokbd); - del_timer_sync(&locomokbd->timer); + timer_shutdown_sync(&locomokbd->timer); input_unregister_device(locomokbd->input); locomo_set_drvdata(dev, NULL); diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 57447d6c9007..24440b498645 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c @@ -296,7 +296,7 @@ static int omap_kp_remove(struct platform_device *pdev) omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); free_irq(omap_kp->irq, omap_kp); - del_timer_sync(&omap_kp->timer); + timer_shutdown_sync(&omap_kp->timer); tasklet_kill(&kp_tasklet); /* unregister everything */ diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 4a6b33bbe7ea..989228b5a0a4 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -2970,7 +2970,7 @@ static void alps_disconnect(struct psmouse *psmouse) struct alps_data *priv = psmouse->private; psmouse_reset(psmouse); - del_timer_sync(&priv->timer); + timer_shutdown_sync(&priv->timer); if (priv->dev2) input_unregister_device(priv->dev2); if (!IS_ERR_OR_NULL(priv->dev3)) diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index c24771336f61..f010b35a0531 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c @@ -1236,8 +1236,8 @@ release_card(struct l1oip *hc) hc->shutdown = true; - del_timer_sync(&hc->keep_tl); - del_timer_sync(&hc->timeout_tl); + timer_shutdown_sync(&hc->keep_tl); + timer_shutdown_sync(&hc->timeout_tl); cancel_work_sync(&hc->workq); diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c index abdf36ac3bee..83d6b484d3c6 100644 --- a/drivers/isdn/mISDN/timerdev.c +++ b/drivers/isdn/mISDN/timerdev.c @@ -74,7 +74,7 @@ mISDN_close(struct inode *ino, struct file *filep) while (!list_empty(list)) { timer = list_first_entry(list, struct mISDNtimer, list); spin_unlock_irq(&dev->lock); - del_timer_sync(&timer->tl); + timer_shutdown_sync(&timer->tl); spin_lock_irq(&dev->lock); /* it might have been moved to ->expired */ list_del(&timer->list); @@ -204,7 +204,7 @@ misdn_del_timer(struct mISDNtimerdev *dev, int id) list_del_init(&timer->list); timer->id = -1; spin_unlock_irq(&dev->lock); - del_timer_sync(&timer->tl); + timer_shutdown_sync(&timer->tl); kfree(timer); return id; } diff --git a/drivers/leds/trigger/ledtrig-activity.c b/drivers/leds/trigger/ledtrig-activity.c index 30bc9df03636..33cbf8413658 100644 --- a/drivers/leds/trigger/ledtrig-activity.c +++ b/drivers/leds/trigger/ledtrig-activity.c @@ -208,7 +208,7 @@ static void activity_deactivate(struct led_classdev *led_cdev) { struct activity_data *activity_data = led_get_trigger_data(led_cdev); - del_timer_sync(&activity_data->timer); + timer_shutdown_sync(&activity_data->timer); kfree(activity_data); clear_bit(LED_BLINK_SW, &led_cdev->work_flags); } diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c index 7fe0a05574d2..393b3ae832f4 100644 --- a/drivers/leds/trigger/ledtrig-heartbeat.c +++ b/drivers/leds/trigger/ledtrig-heartbeat.c @@ -151,7 +151,7 @@ static void heartbeat_trig_deactivate(struct led_classdev *led_cdev) struct heartbeat_trig_data *heartbeat_data = led_get_trigger_data(led_cdev); - del_timer_sync(&heartbeat_data->timer); + timer_shutdown_sync(&heartbeat_data->timer); kfree(heartbeat_data); clear_bit(LED_BLINK_SW, &led_cdev->work_flags); } diff --git a/drivers/leds/trigger/ledtrig-pattern.c b/drivers/leds/trigger/ledtrig-pattern.c index 885ca63f383f..fadd87dbe993 100644 --- a/drivers/leds/trigger/ledtrig-pattern.c +++ b/drivers/leds/trigger/ledtrig-pattern.c @@ -430,7 +430,7 @@ static void pattern_trig_deactivate(struct led_classdev *led_cdev) if (led_cdev->pattern_clear) led_cdev->pattern_clear(led_cdev); - del_timer_sync(&data->timer); + timer_shutdown_sync(&data->timer); led_set_brightness(led_cdev, LED_OFF); kfree(data); diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c index 80635183fac8..f111fa7635e5 100644 --- a/drivers/leds/trigger/ledtrig-transient.c +++ b/drivers/leds/trigger/ledtrig-transient.c @@ -180,7 +180,7 @@ static void transient_trig_deactivate(struct led_classdev *led_cdev) { struct transient_trig_data *transient_data = led_get_trigger_data(led_cdev); - del_timer_sync(&transient_data->timer); + timer_shutdown_sync(&transient_data->timer); led_set_brightness_nosleep(led_cdev, transient_data->restore_state); kfree(transient_data); } diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c index f5846c22c799..ba503d820e48 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.c +++ b/drivers/media/pci/ivtv/ivtv-driver.c @@ -1425,7 +1425,7 @@ static void ivtv_remove(struct pci_dev *pdev) /* Interrupts */ ivtv_set_irq_mask(itv, 0xffffffff); - del_timer_sync(&itv->dma_timer); + timer_shutdown_sync(&itv->dma_timer); /* Kill irq worker */ kthread_flush_worker(&itv->irq_worker); diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c index 62ff1fa1c753..75c89b07e86a 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c @@ -2605,10 +2605,10 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, return hdw; fail: if (hdw) { - del_timer_sync(&hdw->quiescent_timer); - del_timer_sync(&hdw->decoder_stabilization_timer); - del_timer_sync(&hdw->encoder_run_timer); - del_timer_sync(&hdw->encoder_wait_timer); + timer_shutdown_sync(&hdw->quiescent_timer); + timer_shutdown_sync(&hdw->decoder_stabilization_timer); + timer_shutdown_sync(&hdw->encoder_run_timer); + timer_shutdown_sync(&hdw->encoder_wait_timer); flush_work(&hdw->workpoll); v4l2_device_unregister(&hdw->v4l2_dev); usb_free_urb(hdw->ctl_read_urb); @@ -2668,10 +2668,10 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw) if (!hdw) return; pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_destroy: hdw=%p",hdw); flush_work(&hdw->workpoll); - del_timer_sync(&hdw->quiescent_timer); - del_timer_sync(&hdw->decoder_stabilization_timer); - del_timer_sync(&hdw->encoder_run_timer); - del_timer_sync(&hdw->encoder_wait_timer); + timer_shutdown_sync(&hdw->quiescent_timer); + timer_shutdown_sync(&hdw->decoder_stabilization_timer); + timer_shutdown_sync(&hdw->encoder_run_timer); + timer_shutdown_sync(&hdw->encoder_wait_timer); if (hdw->fw_buffer) { kfree(hdw->fw_buffer); hdw->fw_buffer = NULL; diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c index acf18e2251a5..3c2627712fe9 100644 --- a/drivers/media/usb/s2255/s2255drv.c +++ b/drivers/media/usb/s2255/s2255drv.c @@ -1487,7 +1487,7 @@ static void s2255_destroy(struct s2255_dev *dev) /* board shutdown stops the read pipe if it is running */ s2255_board_shutdown(dev); /* make sure firmware still not trying to load */ - del_timer_sync(&dev->timer); /* only started in .probe and .open */ + timer_shutdown_sync(&dev->timer); /* only started in .probe and .open */ if (dev->fw_data->fw_urb) { usb_kill_urb(dev->fw_data->fw_urb); usb_free_urb(dev->fw_data->fw_urb); @@ -2322,7 +2322,7 @@ static int s2255_probe(struct usb_interface *interface, errorFWDATA2: usb_free_urb(dev->fw_data->fw_urb); errorFWURB: - del_timer_sync(&dev->timer); + timer_shutdown_sync(&dev->timer); errorEP: usb_put_dev(dev->udev); errorUDEV: diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 94feea3b2599..53d0083e35da 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -15586,7 +15586,7 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw) err_switch_setup: i40e_reset_interrupt_capability(pf); - del_timer_sync(&pf->service_timer); + timer_shutdown_sync(&pf->service_timer); i40e_shutdown_adminq(hw); iounmap(hw->hw_addr); pci_disable_pcie_error_reporting(pf->pdev); @@ -16205,7 +16205,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) kfree(pf->vsi); err_switch_setup: i40e_reset_interrupt_capability(pf); - del_timer_sync(&pf->service_timer); + timer_shutdown_sync(&pf->service_timer); err_mac_addr: err_configure_lan_hmc: (void)i40e_shutdown_lan_hmc(hw); @@ -16267,7 +16267,7 @@ static void i40e_remove(struct pci_dev *pdev) set_bit(__I40E_SUSPENDED, pf->state); set_bit(__I40E_DOWN, pf->state); if (pf->service_timer.function) - del_timer_sync(&pf->service_timer); + timer_shutdown_sync(&pf->service_timer); if (pf->service_task.func) cancel_work_sync(&pf->service_task); diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index ff97b140886a..7c487f9b36ec 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -5013,7 +5013,7 @@ static void sky2_remove(struct pci_dev *pdev) if (!hw) return; - del_timer_sync(&hw->watchdog_timer); + timer_shutdown_sync(&hw->watchdog_timer); cancel_work_sync(&hw->restart_work); for (i = hw->ports-1; i >= 0; --i) diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index acda6cbd0238..fe86fbd58586 100644 --- a/drivers/net/ethernet/sun/sunvnet.c +++ b/drivers/net/ethernet/sun/sunvnet.c @@ -524,7 +524,7 @@ static void vnet_port_remove(struct vio_dev *vdev) hlist_del_rcu(&port->hash); synchronize_rcu(); - del_timer_sync(&port->clean_timer); + timer_shutdown_sync(&port->clean_timer); sunvnet_port_rm_txq_common(port); netif_napi_del(&port->napi); sunvnet_port_free_tx_bufs_common(port); diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c index b3ae949e6f1c..673d3aa83792 100644 --- a/drivers/net/usb/sierra_net.c +++ b/drivers/net/usb/sierra_net.c @@ -759,7 +759,7 @@ static void sierra_net_unbind(struct usbnet *dev, struct usb_interface *intf) dev_dbg(&dev->udev->dev, "%s", __func__); /* kill the timer and work */ - del_timer_sync(&priv->sync_timer); + timer_shutdown_sync(&priv->sync_timer); cancel_work_sync(&priv->sierra_net_kevent); /* tell modem we are going away */ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c index f9f18ff451ea..7ea2631b8069 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c @@ -394,7 +394,7 @@ void brcmf_btcoex_detach(struct brcmf_cfg80211_info *cfg) if (cfg->btcoex->timer_on) { cfg->btcoex->timer_on = false; - del_timer_sync(&cfg->btcoex->timer); + timer_shutdown_sync(&cfg->btcoex->timer); } cancel_work_sync(&cfg->btcoex->work); diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c index 6d6c12999645..48e7376a5fea 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c @@ -371,7 +371,7 @@ void iwl_dbg_tlv_del_timers(struct iwl_trans *trans) struct iwl_dbg_tlv_timer_node *node, *tmp; list_for_each_entry_safe(node, tmp, timer_list, list) { - del_timer_sync(&node->timer); + timer_shutdown_sync(&node->timer); list_del(&node->list); kfree(node); } diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c index 6c9c5d6e7783..69634fb82a9b 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c @@ -2835,7 +2835,7 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta, /* synchronize all rx queues so we can safely delete */ iwl_mvm_free_reorder(mvm, baid_data); - del_timer_sync(&baid_data->session_timer); + timer_shutdown_sync(&baid_data->session_timer); RCU_INIT_POINTER(mvm->baid_map[baid], NULL); kfree_rcu(baid_data, rcu_head); IWL_DEBUG_HT(mvm, "BAID %d is free\n", baid); diff --git a/drivers/net/wireless/intersil/hostap/hostap_ap.c b/drivers/net/wireless/intersil/hostap/hostap_ap.c index 462ccc7d7d1a..9b546a71e7a2 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_ap.c +++ b/drivers/net/wireless/intersil/hostap/hostap_ap.c @@ -135,7 +135,7 @@ static void ap_free_sta(struct ap_data *ap, struct sta_info *sta) if (!sta->ap) kfree(sta->u.sta.challenge); - del_timer_sync(&sta->timer); + timer_shutdown_sync(&sta->timer); #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ kfree(sta); diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index da2e6557e684..ea22a08e6c08 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -123,7 +123,7 @@ static int mwifiex_unregister(struct mwifiex_adapter *adapter) if (adapter->if_ops.cleanup_if) adapter->if_ops.cleanup_if(adapter); - del_timer_sync(&adapter->cmd_timer); + timer_shutdown_sync(&adapter->cmd_timer); /* Free private structures */ for (i = 0; i < adapter->priv_num; i++) { diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c index 67df8221b5ae..5adc69d5bcae 100644 --- a/drivers/net/wireless/microchip/wilc1000/hif.c +++ b/drivers/net/wireless/microchip/wilc1000/hif.c @@ -1531,10 +1531,10 @@ int wilc_deinit(struct wilc_vif *vif) mutex_lock(&vif->wilc->deinit_lock); - del_timer_sync(&hif_drv->scan_timer); - del_timer_sync(&hif_drv->connect_timer); + timer_shutdown_sync(&hif_drv->scan_timer); + timer_shutdown_sync(&hif_drv->connect_timer); del_timer_sync(&vif->periodic_rssi); - del_timer_sync(&hif_drv->remain_on_ch_timer); + timer_shutdown_sync(&hif_drv->remain_on_ch_timer); if (hif_drv->usr_scan_req.scan_result) { hif_drv->usr_scan_req.scan_result(SCAN_EVENT_ABORTED, NULL, diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index d9f6367b9993..0a1d0b4e3bb8 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -2788,7 +2788,7 @@ void pn53x_common_clean(struct pn533 *priv) struct pn533_cmd *cmd, *n; /* delete the timer before cleanup the worker */ - del_timer_sync(&priv->listen_timer); + timer_shutdown_sync(&priv->listen_timer); flush_delayed_work(&priv->poll_work); destroy_workqueue(priv->wq); diff --git a/drivers/nfc/pn533/uart.c b/drivers/nfc/pn533/uart.c index 07596bf5f7d6..a556acdb947b 100644 --- a/drivers/nfc/pn533/uart.c +++ b/drivers/nfc/pn533/uart.c @@ -310,7 +310,7 @@ static void pn532_uart_remove(struct serdev_device *serdev) pn53x_unregister_nfc(pn532->priv); serdev_device_close(serdev); pn53x_common_clean(pn532->priv); - del_timer_sync(&pn532->cmd_timeout); + timer_shutdown_sync(&pn532->cmd_timeout); kfree_skb(pn532->recv_skb); kfree(pn532); } diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c index bb06311d0b5f..dd3c26099048 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.c +++ b/drivers/pcmcia/bcm63xx_pcmcia.c @@ -443,7 +443,7 @@ static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev) struct resource *res; skt = platform_get_drvdata(pdev); - del_timer_sync(&skt->timer); + timer_shutdown_sync(&skt->timer); iounmap(skt->base); iounmap(skt->io_base); res = skt->reg_res; diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c index 40a5cffe24a4..efc27bc15152 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c @@ -317,7 +317,7 @@ static int electra_cf_remove(struct platform_device *ofdev) cf->active = 0; pcmcia_unregister_socket(&cf->socket); free_irq(cf->irq, cf); - del_timer_sync(&cf->timer); + timer_shutdown_sync(&cf->timer); iounmap(cf->io_virt); iounmap(cf->mem_base); diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c index d3f827d4224a..e613818dc0bc 100644 --- a/drivers/pcmcia/omap_cf.c +++ b/drivers/pcmcia/omap_cf.c @@ -296,7 +296,7 @@ static int __exit omap_cf_remove(struct platform_device *pdev) cf->active = 0; pcmcia_unregister_socket(&cf->socket); - del_timer_sync(&cf->timer); + timer_shutdown_sync(&cf->timer); release_mem_region(cf->phys_cf, SZ_8K); free_irq(cf->irq, cf); kfree(cf); diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index f0af9985ca09..a0a2e7f18356 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c @@ -727,7 +727,7 @@ static int pd6729_pci_probe(struct pci_dev *dev, if (irq_mode == 1) free_irq(dev->irq, socket); else - del_timer_sync(&socket->poll_timer); + timer_shutdown_sync(&socket->poll_timer); err_out_free_res: pci_release_regions(dev); err_out_disable: @@ -754,7 +754,7 @@ static void pd6729_pci_remove(struct pci_dev *dev) if (irq_mode == 1) free_irq(dev->irq, socket); else - del_timer_sync(&socket->poll_timer); + timer_shutdown_sync(&socket->poll_timer); pci_release_regions(dev); pci_disable_device(dev); diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 3966a6ceb1ac..1365eaa20ff4 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c @@ -814,7 +814,7 @@ static void yenta_close(struct pci_dev *dev) if (sock->cb_irq) free_irq(sock->cb_irq, sock); else - del_timer_sync(&sock->poll_timer); + timer_shutdown_sync(&sock->poll_timer); iounmap(sock->base); yenta_free_resources(sock); @@ -1285,7 +1285,7 @@ static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id) if (socket->cb_irq) free_irq(socket->cb_irq, socket); else - del_timer_sync(&socket->poll_timer); + timer_shutdown_sync(&socket->poll_timer); unmap: iounmap(socket->base); yenta_free_resources(socket); diff --git a/drivers/scsi/qla2xxx/qla_edif.c b/drivers/scsi/qla2xxx/qla_edif.c index 00ccc41cef14..e4240aae5f9e 100644 --- a/drivers/scsi/qla2xxx/qla_edif.c +++ b/drivers/scsi/qla2xxx/qla_edif.c @@ -416,7 +416,7 @@ static void __qla2x00_release_all_sadb(struct scsi_qla_host *vha, */ if (edif_entry->delete_sa_index != INVALID_EDIF_SA_INDEX) { - del_timer(&edif_entry->timer); + timer_shutdown(&edif_entry->timer); /* build and send the aen */ fcport->edif.rx_sa_set = 1; @@ -2799,7 +2799,7 @@ qla28xx_sa_update_iocb_entry(scsi_qla_host_t *v, struct req_que *req, "%s: removing edif_entry %p, new sa_index: 0x%x\n", __func__, edif_entry, pkt->sa_index); qla_edif_list_delete_sa_index(sp->fcport, edif_entry); - del_timer(&edif_entry->timer); + timer_shutdown(&edif_entry->timer); ql_dbg(ql_dbg_edif, vha, 0x5033, "%s: releasing edif_entry %p, new sa_index: 0x%x\n", diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c index 75d16b525294..c4ce4cd445d7 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c @@ -921,7 +921,7 @@ static void lm3554_remove(struct i2c_client *client) atomisp_gmin_remove_subdev(sd); - del_timer_sync(&flash->flash_off_delay); + timer_shutdown_sync(&flash->flash_off_delay); lm3554_gpio_uninit(client); diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c index c13f1699e5a2..80e36d03c4e2 100644 --- a/drivers/staging/wlan-ng/prism2usb.c +++ b/drivers/staging/wlan-ng/prism2usb.c @@ -170,9 +170,9 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface) */ prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable); - del_timer_sync(&hw->throttle); - del_timer_sync(&hw->reqtimer); - del_timer_sync(&hw->resptimer); + timer_shutdown_sync(&hw->throttle); + timer_shutdown_sync(&hw->reqtimer); + timer_shutdown_sync(&hw->resptimer); /* Unlink all the URBs. This "removes the wheels" * from the entire CTLX handling mechanism. diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index daf12132deb1..348d85c13f91 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -2444,7 +2444,7 @@ static void gsm_dlci_free(struct tty_port *port) { struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port); - del_timer_sync(&dlci->t1); + timer_shutdown_sync(&dlci->t1); dlci->gsm->dlci[dlci->addr] = NULL; kfifo_free(&dlci->fifo); while ((dlci->skb = skb_dequeue(&dlci->skb_list))) diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index d2b2720db6ca..b6e70c5cfa17 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -1003,7 +1003,7 @@ static void sysrq_disconnect(struct input_handle *handle) input_close_device(handle); cancel_work_sync(&sysrq->reinject_work); - del_timer_sync(&sysrq->keyreset_timer); + timer_shutdown_sync(&sysrq->keyreset_timer); input_unregister_handle(handle); kfree(sysrq); } diff --git a/drivers/usb/gadget/udc/m66592-udc.c b/drivers/usb/gadget/udc/m66592-udc.c index 931e6362a13d..c7e421b449f3 100644 --- a/drivers/usb/gadget/udc/m66592-udc.c +++ b/drivers/usb/gadget/udc/m66592-udc.c @@ -1519,7 +1519,7 @@ static int m66592_remove(struct platform_device *pdev) usb_del_gadget_udc(&m66592->gadget); - del_timer_sync(&m66592->timer); + timer_shutdown_sync(&m66592->timer); iounmap(m66592->reg); free_irq(platform_get_irq(pdev, 0), m66592); m66592_free_request(&m66592->ep[0].ep, m66592->ep0_req); diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index f1a8d8343623..670e942fdaaa 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c @@ -1405,7 +1405,7 @@ static void garmin_port_remove(struct usb_serial_port *port) usb_kill_anchored_urbs(&garmin_data_p->write_urbs); usb_kill_urb(port->interrupt_in_urb); - del_timer_sync(&garmin_data_p->timer); + timer_shutdown_sync(&garmin_data_p->timer); kfree(garmin_data_p); } diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 6b12bb4648b8..73370eaae0ab 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -1725,8 +1725,8 @@ static void mos7840_port_remove(struct usb_serial_port *port) /* Turn off LED */ mos7840_set_led_sync(port, MODEM_CONTROL_REGISTER, 0x0300); - del_timer_sync(&mos7840_port->led_timer1); - del_timer_sync(&mos7840_port->led_timer2); + timer_shutdown_sync(&mos7840_port->led_timer1); + timer_shutdown_sync(&mos7840_port->led_timer2); usb_kill_urb(mos7840_port->led_urb); usb_free_urb(mos7840_port->led_urb); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 16a343e8047d..260c1b3e3ef2 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1225,7 +1225,7 @@ static void ext4_put_super(struct super_block *sb) } ext4_es_unregister_shrinker(sbi); - del_timer_sync(&sbi->s_err_report); + timer_shutdown_sync(&sbi->s_err_report); ext4_release_system_zone(sb); ext4_mb_release(sb); ext4_ext_release(sb); diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 3335ef352915..76c3bd88b858 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2752,7 +2752,7 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci) down_write(&nilfs->ns_segctor_sem); - del_timer_sync(&sci->sc_timer); + timer_shutdown_sync(&sci->sc_timer); kfree(sci); } diff --git a/net/802/garp.c b/net/802/garp.c index 77aac2763835..ab24b21fbb49 100644 --- a/net/802/garp.c +++ b/net/802/garp.c @@ -618,7 +618,7 @@ void garp_uninit_applicant(struct net_device *dev, struct garp_application *appl /* Delete timer and generate a final TRANSMIT_PDU event to flush out * all pending messages before the applicant is gone. */ - del_timer_sync(&app->join_timer); + timer_shutdown_sync(&app->join_timer); spin_lock_bh(&app->lock); garp_gid_event(app, GARP_EVENT_TRANSMIT_PDU); diff --git a/net/802/mrp.c b/net/802/mrp.c index 66fcbf23b486..eafc21ecc287 100644 --- a/net/802/mrp.c +++ b/net/802/mrp.c @@ -911,8 +911,8 @@ void mrp_uninit_applicant(struct net_device *dev, struct mrp_application *appl) /* Delete timer and generate a final TX event to flush out * all pending messages before the applicant is gone. */ - del_timer_sync(&app->join_timer); - del_timer_sync(&app->periodic_timer); + timer_shutdown_sync(&app->join_timer); + timer_shutdown_sync(&app->periodic_timer); spin_lock_bh(&app->lock); mrp_mad_event(app, MRP_EVENT_TX); diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 48170bd3785e..dea1ee1bd095 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -606,7 +606,7 @@ static void br_multicast_destroy_mdb_entry(struct net_bridge_mcast_gc *gc) WARN_ON(!hlist_unhashed(&mp->mdb_node)); WARN_ON(mp->ports); - del_timer_sync(&mp->timer); + timer_shutdown_sync(&mp->timer); kfree_rcu(mp, rcu); } @@ -647,7 +647,7 @@ static void br_multicast_destroy_group_src(struct net_bridge_mcast_gc *gc) src = container_of(gc, struct net_bridge_group_src, mcast_gc); WARN_ON(!hlist_unhashed(&src->node)); - del_timer_sync(&src->timer); + timer_shutdown_sync(&src->timer); kfree_rcu(src, rcu); } @@ -676,8 +676,8 @@ static void br_multicast_destroy_port_group(struct net_bridge_mcast_gc *gc) WARN_ON(!hlist_unhashed(&pg->mglist)); WARN_ON(!hlist_empty(&pg->src_list)); - del_timer_sync(&pg->rexmit_timer); - del_timer_sync(&pg->timer); + timer_shutdown_sync(&pg->rexmit_timer); + timer_shutdown_sync(&pg->timer); kfree_rcu(pg, rcu); } diff --git a/net/bridge/br_multicast_eht.c b/net/bridge/br_multicast_eht.c index f91c071d1608..c126aa4e7551 100644 --- a/net/bridge/br_multicast_eht.c +++ b/net/bridge/br_multicast_eht.c @@ -142,7 +142,7 @@ static void br_multicast_destroy_eht_set_entry(struct net_bridge_mcast_gc *gc) set_h = container_of(gc, struct net_bridge_group_eht_set_entry, mcast_gc); WARN_ON(!RB_EMPTY_NODE(&set_h->rb_node)); - del_timer_sync(&set_h->timer); + timer_shutdown_sync(&set_h->timer); kfree(set_h); } @@ -154,7 +154,7 @@ static void br_multicast_destroy_eht_set(struct net_bridge_mcast_gc *gc) WARN_ON(!RB_EMPTY_NODE(&eht_set->rb_node)); WARN_ON(!RB_EMPTY_ROOT(&eht_set->entry_tree)); - del_timer_sync(&eht_set->timer); + timer_shutdown_sync(&eht_set->timer); kfree(eht_set); } diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c index 4fcbdd71c59f..fae9c4694186 100644 --- a/net/core/gen_estimator.c +++ b/net/core/gen_estimator.c @@ -208,7 +208,7 @@ void gen_kill_estimator(struct net_rate_estimator __rcu **rate_est) est = xchg((__force struct net_rate_estimator **)rate_est, NULL); if (est) { - del_timer_sync(&est->timer); + timer_shutdown_sync(&est->timer); kfree_rcu(est, rcu); } } diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index b58df3c1bf7d..eec1f6df80d8 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -412,7 +412,7 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id) static void ipmr_free_table(struct mr_table *mrt) { - del_timer_sync(&mrt->ipmr_expire_timer); + timer_shutdown_sync(&mrt->ipmr_expire_timer); mroute_clean_tables(mrt, MRT_FLUSH_VIFS | MRT_FLUSH_VIFS_STATIC | MRT_FLUSH_MFC | MRT_FLUSH_MFC_STATIC); rhltable_destroy(&mrt->mfc_hash); diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 23e766597f36..51cf37abd142 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -392,7 +392,7 @@ static struct mr_table *ip6mr_new_table(struct net *net, u32 id) static void ip6mr_free_table(struct mr_table *mrt) { - del_timer_sync(&mrt->ipmr_expire_timer); + timer_shutdown_sync(&mrt->ipmr_expire_timer); mroute_clean_tables(mrt, MRT6_FLUSH_MIFS | MRT6_FLUSH_MIFS_STATIC | MRT6_FLUSH_MFC | MRT6_FLUSH_MFC_STATIC); rhltable_destroy(&mrt->mfc_hash); diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 69d5e1ec6ede..3b81e6df3f34 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c @@ -512,7 +512,7 @@ static void mesh_path_free_rcu(struct mesh_table *tbl, mpath->flags |= MESH_PATH_RESOLVING | MESH_PATH_DELETED; mesh_gate_del(tbl, mpath); spin_unlock_bh(&mpath->state_lock); - del_timer_sync(&mpath->timer); + timer_shutdown_sync(&mpath->timer); atomic_dec(&sdata->u.mesh.mpaths); atomic_dec(&tbl->entries); mesh_path_flush_pending(mpath); diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c index 5a67f7966574..e162636525cf 100644 --- a/net/netfilter/ipset/ip_set_list_set.c +++ b/net/netfilter/ipset/ip_set_list_set.c @@ -427,7 +427,7 @@ list_set_destroy(struct ip_set *set) struct set_elem *e, *n; if (SET_WITH_TIMEOUT(set)) - del_timer_sync(&map->gc); + timer_shutdown_sync(&map->gc); list_for_each_entry_safe(e, n, &map->members, list) { list_del(&e->list); diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c index 7ac7473e3804..1b87214d385e 100644 --- a/net/netfilter/ipvs/ip_vs_lblc.c +++ b/net/netfilter/ipvs/ip_vs_lblc.c @@ -384,7 +384,7 @@ static void ip_vs_lblc_done_svc(struct ip_vs_service *svc) struct ip_vs_lblc_table *tbl = svc->sched_data; /* remove periodic timer */ - del_timer_sync(&tbl->periodic_timer); + timer_shutdown_sync(&tbl->periodic_timer); /* got to clean up table entries here */ ip_vs_lblc_flush(svc); diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c index 77c323c36a88..ad8f5fea6d3a 100644 --- a/net/netfilter/ipvs/ip_vs_lblcr.c +++ b/net/netfilter/ipvs/ip_vs_lblcr.c @@ -547,7 +547,7 @@ static void ip_vs_lblcr_done_svc(struct ip_vs_service *svc) struct ip_vs_lblcr_table *tbl = svc->sched_data; /* remove periodic timer */ - del_timer_sync(&tbl->periodic_timer); + timer_shutdown_sync(&tbl->periodic_timer); /* got to clean up table entries here */ ip_vs_lblcr_flush(svc); diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c index 0f8bb0bf558f..8d36303f3935 100644 --- a/net/netfilter/xt_IDLETIMER.c +++ b/net/netfilter/xt_IDLETIMER.c @@ -413,7 +413,7 @@ static void idletimer_tg_destroy(const struct xt_tgdtor_param *par) pr_debug("deleting timer %s\n", info->label); list_del(&info->timer->entry); - del_timer_sync(&info->timer->timer); + timer_shutdown_sync(&info->timer->timer); cancel_work_sync(&info->timer->work); sysfs_remove_file(idletimer_tg_kobj, &info->timer->attr.attr); kfree(info->timer->attr.attr.name); @@ -441,7 +441,7 @@ static void idletimer_tg_destroy_v1(const struct xt_tgdtor_param *par) if (info->timer->timer_type & XT_IDLETIMER_ALARM) { alarm_cancel(&info->timer->alarm); } else { - del_timer_sync(&info->timer->timer); + timer_shutdown_sync(&info->timer->timer); } cancel_work_sync(&info->timer->work); sysfs_remove_file(idletimer_tg_kobj, &info->timer->attr.attr); diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c index 0371c387b0d1..66b0f941d8fb 100644 --- a/net/netfilter/xt_LED.c +++ b/net/netfilter/xt_LED.c @@ -166,7 +166,7 @@ static void led_tg_destroy(const struct xt_tgdtor_param *par) list_del(&ledinternal->list); - del_timer_sync(&ledinternal->timer); + timer_shutdown_sync(&ledinternal->timer); led_trigger_unregister(&ledinternal->netfilter_led_trigger); diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index 535668e1f748..6ab317b48d6c 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c @@ -369,7 +369,7 @@ static const struct nla_policy flow_policy[TCA_FLOW_MAX + 1] = { static void __flow_destroy_filter(struct flow_filter *f) { - del_timer_sync(&f->perturb_timer); + timer_shutdown_sync(&f->perturb_timer); tcf_exts_destroy(&f->exts); tcf_em_tree_destroy(&f->ematches); tcf_exts_put_net(&f->exts); diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 8f1b596db33f..85f0c3cfc877 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -567,7 +567,7 @@ svc_destroy(struct kref *ref) struct svc_serv *serv = container_of(ref, struct svc_serv, sv_refcnt); dprintk("svc: svc_destroy(%s)\n", serv->sv_program->pg_name); - del_timer_sync(&serv->sv_temptimer); + timer_shutdown_sync(&serv->sv_temptimer); /* * The last user is gone and thus all sockets have to be destroyed to diff --git a/net/tipc/discover.c b/net/tipc/discover.c index e8dcdf267c0c..685389d4b245 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c @@ -388,7 +388,7 @@ int tipc_disc_create(struct net *net, struct tipc_bearer *b, */ void tipc_disc_delete(struct tipc_discoverer *d) { - del_timer_sync(&d->timer); + timer_shutdown_sync(&d->timer); kfree_skb(d->skb); kfree(d); } diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c index 9618e4429f0f..77a3d016cade 100644 --- a/net/tipc/monitor.c +++ b/net/tipc/monitor.c @@ -700,7 +700,7 @@ void tipc_mon_delete(struct net *net, int bearer_id) } mon->self = NULL; write_unlock_bh(&mon->lock); - del_timer_sync(&mon->timer); + timer_shutdown_sync(&mon->timer); kfree(self->domain); kfree(self); kfree(mon); diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index 1bc43e927d82..640501bb3ca6 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c @@ -47,7 +47,7 @@ static void reg_dump(struct ak4117 *ak4117) static void snd_ak4117_free(struct ak4117 *chip) { - del_timer_sync(&chip->timer); + timer_shutdown_sync(&chip->timer); kfree(chip); } diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c index a870759d179e..0006c3ddb51d 100644 --- a/sound/synth/emux/emux.c +++ b/sound/synth/emux/emux.c @@ -129,7 +129,7 @@ int snd_emux_free(struct snd_emux *emu) if (! emu) return -EINVAL; - del_timer_sync(&emu->tlist); + timer_shutdown_sync(&emu->tlist); snd_emux_proc_free(emu); snd_emux_delete_virmidi(emu); -- 2.35.1

4 4

alsaloop: confusing line of code and easier example of the use of snd_pcm_poll_descriptors API
by GitHub issues - edited 23 Dec '22

23 Dec '22

alsa-project/alsa-utils issue #185 was edited from anthonio9: Hi! Recently I've been studying the `alsaloop` software, I'm trying to understand how should the `snd_pcm_poll_descriptors` api be used reliably. Reading through the `pcmjob.c` file I've noticed that in the `pcmjob_pollfds_handle` function in line 1964 there's a condition that does not exactly make sense to me. What's the purpose of variable `loopcount`? If the code is more or less ```cpp int loopcount = 0; do { // instructions loopcount++; } while ((ccount > 0 || pcount > 0) && loopcount > 10); // line 1964 ``` isn't it equal to running the loop just once without any loops? After all, the `loopcount` will never reach 10 and the conditional statement will always turn false finishing the loop after one iteration. Correct me if I'm wrong. I suppose that condition would make more sense if it was as below: ```cpp } while ((ccount > 0 || pcount > 0) && loopcount < 10); // line 1964 ``` then the loop would be stop for iterating too many times, assuming that 10 is "too many". With the part `loopcount < 10` deleted, the loop usually runs twice. I'd also appreciate a simpler example than `alsaloop` focusing just on the audio parts, on transferring audio from input to output reliably with the use of `snd_pcm_poll_descriptors`. Thanks Issue URL : https://github.com/alsa-project/alsa-utils/issues/185 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

alsaloop: confusing line of code and easier example of the use of snd_pcm_poll_descriptors API
by GitHub issues - opened 23 Dec '22

23 Dec '22

alsa-project/alsa-utils issue #185 was opened from anthonio9: Hi! Recently I've been studying the `alsaloop` software, I'm trying to understand how should the `snd_pcm_poll_descriptors` api be used reliably. Reading through the `pcmjob.c` file I've noticed that in the `pcmjob_pollfds_handle` function in line 1964 there's a condition that does not exactly make sense to me. What's the purpose of variable `loopcount`? If the code is more or less ```cpp int loopcount = 0; do { // instructions loopcount++; } while ((ccount > 0 || pcount > 0) && loopcount > 10); // line 1964 ``` isn't it equal to running the loop just once without any loops? After all, the `loopcount` will never reach 10 and the conditional statement will always turn false finishing the loop after one iteration. Correct me if I'm wrong. I'd also appreciate a simpler example than `alsaloop` focusing just on the audio parts, on transferring audio from input to output reliably with the use of `snd_pcm_poll_descriptors`. Thanks Issue URL : https://github.com/alsa-project/alsa-utils/issues/185 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

Re: [PATCH 0/2] drm: Add component_match_add_of and convert users of drm_of_component_match_add
by Sean Anderson 22 Dec '22

22 Dec '22

Hi Robin, On 12/16/22 12:41, Robin Murphy wrote: > On 2022-12-16 17:08, Sean Anderson wrote: >> On 11/3/22 14:22, Sean Anderson wrote: >>> This series adds a new function component_match_add_of to simplify the >>> common case of calling component_match_add_release with >>> component_release_of and component_compare_of. There is already >>> drm_of_component_match_add, which allows for a custom compare function. >>> However, all existing users just use component_compare_of (or an >>> equivalent). >>> >>> I can split the second commit up if that is easier to review. >>> >>> >>> Sean Anderson (2): >>> component: Add helper for device nodes >>> drm: Convert users of drm_of_component_match_add to >>> component_match_add_of >>> >>> .../gpu/drm/arm/display/komeda/komeda_drv.c | 6 ++-- >>> drivers/gpu/drm/arm/hdlcd_drv.c | 9 +----- >>> drivers/gpu/drm/arm/malidp_drv.c | 11 +------ >>> drivers/gpu/drm/armada/armada_drv.c | 10 ++++--- >>> drivers/gpu/drm/drm_of.c | 29 +++---------------- >>> drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +-- >>> .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 3 +- >>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 3 +- >>> drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +-- >>> drivers/gpu/drm/msm/msm_drv.c | 14 ++++----- >>> drivers/gpu/drm/sti/sti_drv.c | 3 +- >>> drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +- >>> drivers/gpu/drm/tilcdc/tilcdc_external.c | 10 ++----- >>> drivers/iommu/mtk_iommu.c | 3 +- >>> drivers/iommu/mtk_iommu_v1.c | 3 +- >>> include/drm/drm_of.h | 12 -------- >>> include/linux/component.h | 9 ++++++ >>> sound/soc/codecs/wcd938x.c | 6 ++-- >>> 18 files changed, 46 insertions(+), 96 deletions(-) >>> >> >> ping? >> >> Should I send a v2 broken up like Mark suggested? > > FWIW you'll need to rebase the IOMMU changes on 6.2-rc1 anyway - mtk_iommu stops using component_match_add_release() at all. > > Thanks, > Robin. I am preparing v2 of this series, but I don't see these changes on drm-next, which seems to have been updated to at least 6.2-rc1. I tried searching for these changes on lore [1], but I don't see them there either. Do you have a commit hash/lore link for these changes? --Sean [1] https://lore.kernel.org/all/?q=dfn%3Adrivers%2Fiommu%2Fmtk_iommu.c+b%3Acomp…

1 0

ALC4080 z790 apex no sound
by GitHub issues - opened 22 Dec '22

22 Dec '22

alsa-project/alsa-ucm-conf issue #257 was opened from pipes80-collab: good evening everyone, I have a problem with the realtek alc4080 audio peripheral integrated in the Z790 apex, the peripheral connected to my yamaha 5.1 amplifier signals the pcm but no sound comes out, everything works normally under windows, I followed some solutions on the alsa-ucm configuration -conf for the device but to no avail. then invo output lsusb and aplay -l Bus 006 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 005 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 002 Device 002: ID 174c:3074 ASMedia Technology Inc. ASM1074 SuperSpeed hub Bus 002 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 001 Device 005: ID 046d:c08b Logitech, Inc. G502 SE HERO Gaming Mouse Bus 001 Device 003: ID 054c:0ce6 Sony Corp. DualSense wireless controller (PS5) Bus 001 Device 006: ID 195d:2030 Itron Technology iONE Func KB-460 Gaming Keyboard Bus 001 Device 004: ID 05e3:0608 Genesys Logic, Inc. Hub Bus 001 Device 002: ID 174c:2074 ASMedia Technology Inc. ASM1074 High-Speed hub Bus 001 Device 009: ID 05e3:0608 Genesys Logic, Inc. Hub Bus 001 Device 008: ID 0b05:1a52 ASUSTek Computer, Inc. USB Audio Bus 001 Device 007: ID 0b05:18f3 ASUSTek Computer, Inc. AURA LED Controller Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub [filippo@pipes ~]$ aplay -l **** List of PLAYBACK Hardware Devices **** card 0: Audio [USB Audio], device 0: USB Audio [USB Audio] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: Audio [USB Audio], device 1: USB Audio [USB Audio #1] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: Audio [USB Audio], device 2: USB Audio [USB Audio #2] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: Audio [USB Audio], device 3: USB Audio [USB Audio #3] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: Controller [Wireless Controller], device 0: USB Audio [USB Audio] Subdevices: 1/1 Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/257 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ASoC: Intel: avs: Add support for RT5663 codec
by Alicja Michalska 22 Dec '22

22 Dec '22

This patch adds support for RT5663 codec on KBL platform. Such hardware configuration can be found in Google Pixelbook (Google/Eve). Reported-and-tested-by: CoolStar <coolstarorganization(a)gmail.com> Signed-off-by: Alicja Michalska <ahplka19(a)gmail.com> diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c index b2823c2107f7..b167a641d1d5 100644 --- a/sound/soc/intel/avs/board_selection.c +++ b/sound/soc/intel/avs/board_selection.c @@ -159,6 +159,14 @@ static struct snd_soc_acpi_mach avs_kbl_i2s_machines[] = { }, .tplg_filename = "da7219-tplg.bin", }, + { + .id = "10EC5663", + .drv_name = "avs_rt5663", + .mach_params = { + .i2s_link_mask = AVS_SSP(1), + }, + .tplg_filename = "rt5663-tplg.bin", + }, {}, }; diff --git a/sound/soc/intel/avs/boards/Kconfig b/sound/soc/intel/avs/boards/Kconfig index e4c230efe8d7..04c090c3f9b5 100644 --- a/sound/soc/intel/avs/boards/Kconfig +++ b/sound/soc/intel/avs/boards/Kconfig @@ -125,6 +125,16 @@ config SND_SOC_INTEL_AVS_MACH_RT5682 Say Y or m if you have such a device. This is a recommended option. If unsure select "N". +config SND_SOC_INTEL_AVS_MACH_RT5663 + tristate "rt5663 in I2S mode" + depends on I2C + depends on MFD_INTEL_LPSS || COMPILE_TEST + select SND_SOC_RT5663_I2C + help + This adds support for ASoC machine driver with RT5663 I2S audio codec. + Say Y or m if you have such a device. This is a recommended option. + If unsure select "N". + config SND_SOC_INTEL_AVS_MACH_SSM4567 tristate "ssm4567 I2S board" depends on I2C diff --git a/sound/soc/intel/avs/boards/Makefile b/sound/soc/intel/avs/boards/Makefile index b81343420370..3db863fc26a7 100644 --- a/sound/soc/intel/avs/boards/Makefile +++ b/sound/soc/intel/avs/boards/Makefile @@ -13,6 +13,7 @@ snd-soc-avs-rt274-objs := rt274.o snd-soc-avs-rt286-objs := rt286.o snd-soc-avs-rt298-objs := rt298.o snd-soc-avs-rt5682-objs := rt5682.o +snd-soc-avs-rt5663-objs := rt5663.o snd-soc-avs-ssm4567-objs := ssm4567.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219) += snd-soc-avs-da7219.o @@ -28,4 +29,5 @@ obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT274) += snd-soc-avs-rt274.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT286) += snd-soc-avs-rt286.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT298) += snd-soc-avs-rt298.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682) += snd-soc-avs-rt5682.o +obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663) += snd-soc-avs-rt5663.o obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567) += snd-soc-avs-ssm4567.o diff --git a/sound/soc/intel/avs/boards/rt5663.c b/sound/soc/intel/avs/boards/rt5663.c new file mode 100644 index 000000000000..7d8f45267d27 --- /dev/null +++ b/sound/soc/intel/avs/boards/rt5663.c @@ -0,0 +1,249 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// Copyright(c) CoolStar. All rights reserved. +// Based off da7219 module +// Copyright(c) 2021-2022 Intel Corporation. All rights reserved. +// +// Author: CoolStar <coolstarorganization.com> +// Author: Cezary Rojewski <cezary.rojewski(a)intel.com> +// + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <sound/jack.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-acpi.h> +#include <sound/soc-dapm.h> +#include <uapi/linux/input-event-codes.h> +#include "../../../codecs/rt5663.h" + +#define RT5663_DAI_NAME "rt5663-aif" + +static const struct snd_kcontrol_new card_controls[] = { + SOC_DAPM_PIN_SWITCH("Headphone Jack"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), +}; + +static const struct snd_soc_dapm_widget card_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), +}; + +static const struct snd_soc_dapm_route card_base_routes[] = { + /* HP jack connectors - unknown if we have jack detection */ + {"Headphone Jack", NULL, "HPOL"}, + {"Headphone Jack", NULL, "HPOR"}, + + {"IN1P", NULL, "Headset Mic"}, + {"IN1N", NULL, "Headset Mic"}, +}; + +static int avs_rt5663_codec_init(struct snd_soc_pcm_runtime *runtime) +{ + struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; + struct snd_soc_card *card = runtime->card; + struct snd_soc_jack *jack; + struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); + int ret; + + jack = snd_soc_card_get_drvdata(card); + + rt5663_sel_asrc_clk_src(component, + RT5663_DA_STEREO_FILTER | RT5663_AD_STEREO_FILTER, + RT5663_CLK_SEL_I2S1_ASRC); + + snd_soc_dai_set_sysclk(codec_dai, + RT5663_SCLK_S_MCLK, 24576000, SND_SOC_CLOCK_IN); + + /* + * Headset buttons map to the google Reference headset. + * These can be configured by userspace. + */ + ret = snd_soc_card_jack_new(card, "Headset Jack", + SND_JACK_HEADSET | SND_JACK_BTN_0 | + SND_JACK_BTN_1 | SND_JACK_BTN_2 | + SND_JACK_BTN_3 | SND_JACK_LINEOUT, jack); + if (ret) { + dev_err(card->dev, "Headset Jack creation failed: %d\n", ret); + return ret; + } + + snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); + snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); + snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); + snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); + + return 0; +} + +static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port, + struct snd_soc_dai_link **dai_link) +{ + struct snd_soc_dai_link_component *platform; + struct snd_soc_dai_link *dl; + + dl = devm_kzalloc(dev, sizeof(*dl), GFP_KERNEL); + platform = devm_kzalloc(dev, sizeof(*platform), GFP_KERNEL); + if (!dl || !platform) + return -ENOMEM; + + platform->name = platform_name; + + dl->name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-Codec", ssp_port); + dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL); + dl->codecs = devm_kzalloc(dev, sizeof(*dl->codecs), GFP_KERNEL); + if (!dl->name || !dl->cpus || !dl->codecs) + return -ENOMEM; + + dl->cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", ssp_port); + dl->codecs->name = devm_kasprintf(dev, GFP_KERNEL, "i2c-10EC5663:00"); + dl->codecs->dai_name = RT5663_DAI_NAME; + if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name) + return -ENOMEM; + + dl->num_cpus = 1; + dl->num_codecs = 1; + dl->platforms = platform; + dl->num_platforms = 1; + dl->id = 0; + dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; + dl->init = avs_rt5663_codec_init; + dl->nonatomic = 1; + dl->no_pcm = 1; + dl->dpcm_capture = 1; + dl->dpcm_playback = 1; + + *dai_link = dl; + + return 0; +} + +static int avs_create_dapm_routes(struct device *dev, int ssp_port, + struct snd_soc_dapm_route **routes, int *num_routes) +{ + struct snd_soc_dapm_route *dr; + const int num_base = ARRAY_SIZE(card_base_routes); + const int num_dr = num_base + 2; + int idx; + + dr = devm_kcalloc(dev, num_dr, sizeof(*dr), GFP_KERNEL); + if (!dr) + return -ENOMEM; + + memcpy(dr, card_base_routes, num_base * sizeof(*dr)); + + idx = num_base; + dr[idx].sink = devm_kasprintf(dev, GFP_KERNEL, "AIF Playback"); + dr[idx].source = devm_kasprintf(dev, GFP_KERNEL, "ssp%d Tx", ssp_port); + if (!dr[idx].sink || !dr[idx].source) + return -ENOMEM; + + idx++; + dr[idx].sink = devm_kasprintf(dev, GFP_KERNEL, "ssp%d Rx", ssp_port); + dr[idx].source = devm_kasprintf(dev, GFP_KERNEL, "AIF Capture"); + if (!dr[idx].sink || !dr[idx].source) + return -ENOMEM; + + *routes = dr; + *num_routes = num_dr; + + return 0; +} + +static int avs_card_set_jack(struct snd_soc_card *card, struct snd_soc_jack *jack) +{ + struct snd_soc_component *component; + + for_each_card_components(card, component) + snd_soc_component_set_jack(component, jack, NULL); + return 0; +} + +static int avs_card_remove(struct snd_soc_card *card) +{ + return avs_card_set_jack(card, NULL); +} + +static int avs_card_suspend_pre(struct snd_soc_card *card) +{ + return avs_card_set_jack(card, NULL); +} + +static int avs_card_resume_post(struct snd_soc_card *card) +{ + struct snd_soc_jack *jack = snd_soc_card_get_drvdata(card); + + return avs_card_set_jack(card, jack); +} + +static int avs_rt5663_probe(struct platform_device *pdev) +{ + struct snd_soc_dapm_route *routes; + struct snd_soc_dai_link *dai_link; + struct snd_soc_acpi_mach *mach; + struct snd_soc_card *card; + struct snd_soc_jack *jack; + struct device *dev = &pdev->dev; + const char *pname; + int num_routes, ssp_port, ret; + + mach = dev_get_platdata(dev); + pname = mach->mach_params.platform; + ssp_port = __ffs(mach->mach_params.i2s_link_mask); + + ret = avs_create_dai_link(dev, pname, ssp_port, &dai_link); + if (ret) { + dev_err(dev, "Failed to create dai link: %d", ret); + return ret; + } + + ret = avs_create_dapm_routes(dev, ssp_port, &routes, &num_routes); + if (ret) { + dev_err(dev, "Failed to create dapm routes: %d", ret); + return ret; + } + + jack = devm_kzalloc(dev, sizeof(*jack), GFP_KERNEL); + card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL); + if (!jack || !card) + return -ENOMEM; + + card->name = "avs_rt5663"; + card->dev = dev; + card->owner = THIS_MODULE; + card->remove = avs_card_remove; + card->suspend_pre = avs_card_suspend_pre; + card->resume_post = avs_card_resume_post; + card->dai_link = dai_link; + card->num_links = 1; + card->controls = card_controls; + card->num_controls = ARRAY_SIZE(card_controls); + card->dapm_widgets = card_widgets; + card->num_dapm_widgets = ARRAY_SIZE(card_widgets); + card->dapm_routes = routes; + card->num_dapm_routes = num_routes; + card->fully_routed = true; + snd_soc_card_set_drvdata(card, jack); + + ret = snd_soc_fixup_dai_links_platform_name(card, pname); + if (ret) + return ret; + + return devm_snd_soc_register_card(dev, card); +} + +static struct platform_driver avs_rt5663_driver = { + .probe = avs_rt5663_probe, + .driver = { + .name = "avs_rt5663", + .pm = &snd_soc_pm_ops, + }, +}; + +module_platform_driver(avs_rt5663_driver); + +MODULE_AUTHOR("CoolStar <coolstarorganization(a)gmail.com>"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:avs_rt5663");

3 4

[PATCH V7 0/5] ASoC: codecs: Add Awinic AW883XX audio amplifier driver
by wangweidong.a＠awinic.com 22 Dec '22

22 Dec '22

From: Weidong Wang <wangweidong.a(a)awinic.com> The Awinic AW883XX is an I2S/TDM input, high efficiency digital Smart K audio amplifier with an integrated 10.25V smart boost convert Add a DT schema for describing Awinic AW883xx audio amplifiers. They are controlled using I2C v6 -> v7: Change name-prefix.yaml to dai-common.yaml in awinic,aw883xx.yaml file Delete redundant header files Use EINVAL and so on instead of custom error return values Remove unnecessary comment No longer assign NULL to pointer Change the way the if statement is written Use devm_kcalloc instead of devm_kzalloc Use crc8 and crc32 that come with linux Weidong Wang (5): ASoC: codecs: Add i2c and codec registration for aw883xx and their associated operation functions ASoC: codecs: Aw883xx function for ACF file parse and check ASoC: codecs: Aw883xx common function for ALSA Audio Driver ASoC: codecs: Aw883xx chip register file, data type file and Kconfig Makefile ASoC: dt-bindings: Add schema for "awinic,aw883xx" .../bindings/sound/awinic,aw883xx.yaml | 49 + sound/soc/codecs/Kconfig | 10 + sound/soc/codecs/Makefile | 6 + sound/soc/codecs/aw883xx/aw883xx.c | 706 +++++++ sound/soc/codecs/aw883xx/aw883xx.h | 61 + sound/soc/codecs/aw883xx/aw883xx_bin_parse.c | 1138 ++++++++++ sound/soc/codecs/aw883xx/aw883xx_bin_parse.h | 123 ++ sound/soc/codecs/aw883xx/aw883xx_data_type.h | 143 ++ sound/soc/codecs/aw883xx/aw883xx_device.c | 1840 +++++++++++++++++ sound/soc/codecs/aw883xx/aw883xx_device.h | 201 ++ .../soc/codecs/aw883xx/aw883xx_pid_2049_reg.h | 490 +++++ 11 files changed, 4767 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml create mode 100644 sound/soc/codecs/aw883xx/aw883xx.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_bin_parse.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx_bin_parse.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_data_type.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_device.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx_device.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_pid_2049_reg.h base-commit: 9d2f6060fe4c3b49d0cdc1dce1c99296f33379c8 -- 2.38.1

2 8

[PATCH 0/3] Add support for XCVR on i.MX93 platform
by Chancel Liu 22 Dec '22

22 Dec '22

This patchset supports XCVR on i.MX93 platform. Chancel Liu (3): ASoC: dt-bindings: fsl,xcvr: Add compatible string for i.MX93 platform ASoC: fsl_xcvr: Add support for i.MX93 platform ASoC: fsl_xcvr: Add constraints of period size while using eDMA .../devicetree/bindings/sound/fsl,xcvr.yaml | 1 + sound/soc/fsl/fsl_xcvr.c | 167 +++++++++++++----- sound/soc/fsl/fsl_xcvr.h | 7 + 3 files changed, 127 insertions(+), 48 deletions(-) -- 2.25.1

3 6

[PATCH V7 5/5] ASoC: dt-bindings: Add schema for "awinic,aw883xx"
by wangweidong.a＠awinic.com 22 Dec '22

22 Dec '22

From: Weidong Wang <wangweidong.a(a)awinic.com> Add a DT schema for describing Awinic AW883xx audio amplifiers. They are controlled using I2C. Signed-off-by: Weidong Wang <wangweidong.a(a)awinic.com> --- .../bindings/sound/awinic,aw883xx.yaml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml diff --git a/Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml b/Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml new file mode 100644 index 000000000000..af4e0e27f8f7 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml @@ -0,0 +1,49 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/awinic,aw883xx.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Awinic AW883xx Smart Audio Amplifier + +maintainers: + - Stephan Gerhold <stephan(a)gerhold.net> + +description: + The Awinic AW883XX is an I2S/TDM input, high efficiency + digital Smart K audio amplifier with an integrated 10.25V + smart boost convert. + +allOf: + - $ref: dai-common.yaml# + +properties: + compatible: + const: awinic,aw883xx_smartpa + + reg: + maxItems: 1 + + reset-gpios: + maxItems: 1 + + sound-name-prefix: true + +required: + - compatible + - reg + - reset-gpios + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + audio-codec@34 { + compatible = "awinic,aw883xx_smartpa"; + reg = <0x34>; + reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + }; + }; -- 2.38.1

3 2

nhlt ssp aux data and blob ver 1.5
by GitHub pull_request - opened 22 Dec '22

22 Dec '22

alsa-project/alsa-utils pull request #184 was opened from juimonen: Add support in nhlt plugin for: - ssp blob ver 1.5 - ssp auxiliary data Request URL : https://github.com/alsa-project/alsa-utils/pull/184 Patch URL : https://github.com/alsa-project/alsa-utils/pull/184.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[GIT PULL] ASoC updates for v6.2-3
by Mark Brown 22 Dec '22

22 Dec '22

The following changes since commit 9472382db38452df15f9f2f74b1dff34848e56b2: Add SOF panic dump support for AMD platform. (2022-12-05 17:28:07 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v6.2-3 for you to fetch changes up to a12a383e59ce486abd719b6bda33c353a3b385e7: ASoC: lochnagar: Fix unused lochnagar_of_match warning (2022-12-15 13:53:00 +0000) ---------------------------------------------------------------- ASoC: Updates for v6.2 Some more small fixes and board quirks that came in since my last update, the main one being the fixes from Kai for issues around the attempts to get kexec working well on SOF based systems. ---------------------------------------------------------------- Bard Liao (1): ASoC: Intel: sof_realtek_common: set ret = 0 as initial value Brent Lu (1): ASoC: Intel: sof_rt5682: add jsl_rt5682 board config Cezary Rojewski (22): ALSA: hda: Allow for compress stream to hdac_ext_stream assignment ALSA: hda: Prepare for compress stream support ALSA: hda: Interrupt servicing and BDL setup for compress streams ASoC: Intel: avs: Introduce avs_log_buffer_status_locked() ASoC: Intel: avs: Drop fifo_lock ASoC: Intel: avs: Introduce debug-context aware helpers ASoC: Intel: avs: Make enable_logs() dependent on DEBUG_FS ASoC: Intel: avs: Drop usage of debug members in non-debug code ASoC: Intel: avs: Add data probing requests ASoC: Intel: avs: Probe compress operations ASoC: Intel: avs: Data probing soc-component ASoC: Intel: avs: Add probe machine board ASoC: Intel: avs: Probing and firmware tracing over debugfs ASoC: Intel: avs: Gather remaining logs on strace_release() ASoC: Intel: avs: Allow for dumping FW_REGS area ASoC: Intel: avs: Allow for dumping debug window snapshot ASoC: Intel: Skylake: Update pipe_config_idx before filling BE params ASoC: Intel: Skylake: Remove skl_tplg_is_multi_fmt() ASoC: Intel: Skylake: Drop pipe_config_idx ASoC: Intel: Skylake: Introduce single place for pipe-config selection ASoC: Intel: Skylake: Fix driver hang during shutdown ASoC: Intel: Skylake: Use SG allocation for SKL-based firmware load Chancel Liu (1): ASoC: soc-pcm.c: Clear DAIs parameters after stream_active is updated Gongjun Song (2): ASoC: Intel: sof_sdw: use common helpers for all Realtek amps ASoC: Intel: soc-acpi: update codec addr on 0C11/0C4F product Hans de Goede (2): ASoC: Intel: bytcr_rt5640: Add quirk for the Advantech MICA-071 tablet ASoC: rt5670: Remove unbalanced pm_runtime_put() Jiapeng Chong (1): ASoC: codecs: wcd-clsh: Remove the unused function Kai Vehmanen (2): ASoC: SOF: Intel: pci-tgl: unblock S5 entry if DMA stop has failed" ASoC: SOF: Revert: "core: unregister clients and machine drivers in .shutdown" Krzysztof Kozlowski (1): ASoC: lochnagar: Fix unused lochnagar_of_match warning Marek Szyprowski (1): ASoC: wm8994: Fix potential deadlock Marek Vasut (1): ASoC: dt-bindings: fsl-sai: Reinstate i.MX93 SAI compatible string Mark Brown (4): ASoC: Intel: avs: Data probing and fw logging ASoC: Intel: Skylake: Topology and shutdown fixes ASoC: Intel: boards: updates for SOF boards ASoC: SOF: remove unregister calls from shutdown Moises Cardona (1): ASoC: Intel: Add HP Stream 8 to bytcr_rt5640.c Wang Jingjin (2): ASoC: rockchip: pdm: Add missing clk_disable_unprepare() in rockchip_pdm_runtime_resume() ASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rk_spdif_runtime_resume() Wang Yufen (3): ASoC: mediatek: mt8173-rt5650-rt5514: fix refcount leak in mt8173_rt5650_rt5514_dev_probe() ASoC: audio-graph-card: fix refcount leak of cpu_ep in __graph_for_each_link() ASoC: mediatek: mt8183: fix refcount leak in mt8183_mt6358_ts3a227_max98357_dev_probe() YC Hung (2): ASoC: mediatek: mt8195: add sof be ops to check audio active ASoC: SOF: mediatek: initialize panic_info to zero Yang Yingliang (1): ASoC: sof_es8336: fix possible use-after-free in sof_es8336_remove() ye xingchen (1): ASoC: imx-audmux: use sysfs_emit() to instead of scnprintf() .../devicetree/bindings/sound/fsl,sai.yaml | 1 + include/sound/hdaudio_ext.h | 2 + sound/hda/ext/hdac_ext_stream.c | 41 ++ sound/hda/hdac_controller.c | 4 +- sound/hda/hdac_stream.c | 51 ++- sound/soc/codecs/lochnagar-sc.c | 2 +- sound/soc/codecs/rt5670.c | 2 - sound/soc/codecs/wcd-clsh-v2.c | 6 - sound/soc/codecs/wm8994.c | 5 + sound/soc/fsl/imx-audmux.c | 3 +- sound/soc/generic/audio-graph-card.c | 4 +- sound/soc/intel/Kconfig | 1 + sound/soc/intel/avs/Makefile | 4 + sound/soc/intel/avs/apl.c | 24 +- sound/soc/intel/avs/avs.h | 80 +++- sound/soc/intel/avs/board_selection.c | 33 ++ sound/soc/intel/avs/boards/Kconfig | 8 + sound/soc/intel/avs/boards/Makefile | 2 + sound/soc/intel/avs/boards/probe.c | 64 +++ sound/soc/intel/avs/core.c | 2 + sound/soc/intel/avs/debugfs.c | 436 +++++++++++++++++++++ sound/soc/intel/avs/ipc.c | 2 +- sound/soc/intel/avs/messages.c | 104 ++++- sound/soc/intel/avs/messages.h | 53 +++ sound/soc/intel/avs/pcm.c | 6 +- sound/soc/intel/avs/probes.c | 313 +++++++++++++++ sound/soc/intel/avs/registers.h | 3 +- sound/soc/intel/avs/skl.c | 17 +- sound/soc/intel/avs/utils.c | 22 -- sound/soc/intel/boards/Makefile | 3 +- sound/soc/intel/boards/bytcr_rt5640.c | 25 ++ sound/soc/intel/boards/sof_es8336.c | 2 +- sound/soc/intel/boards/sof_realtek_common.c | 3 +- sound/soc/intel/boards/sof_rt5682.c | 6 + sound/soc/intel/boards/sof_sdw.c | 10 +- sound/soc/intel/boards/sof_sdw_common.h | 20 +- sound/soc/intel/boards/sof_sdw_rt1316.c | 239 ----------- sound/soc/intel/boards/sof_sdw_rt1318.c | 120 ------ .../boards/{sof_sdw_rt1308.c => sof_sdw_rt_amp.c} | 139 +++++-- sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 5 + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 2 +- sound/soc/intel/skylake/skl-sst-cldma.c | 27 +- sound/soc/intel/skylake/skl-topology.c | 73 ++-- sound/soc/intel/skylake/skl-topology.h | 1 - sound/soc/intel/skylake/skl.c | 5 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 7 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 14 +- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 30 ++ sound/soc/rockchip/rockchip_pdm.c | 1 + sound/soc/rockchip/rockchip_spdif.c | 1 + sound/soc/soc-pcm.c | 20 +- sound/soc/sof/core.c | 9 - sound/soc/sof/intel/hda-dsp.c | 72 ++++ sound/soc/sof/intel/hda.h | 1 + sound/soc/sof/intel/tgl.c | 2 +- sound/soc/sof/mediatek/mtk-adsp-common.c | 2 +- 56 files changed, 1519 insertions(+), 615 deletions(-) create mode 100644 sound/soc/intel/avs/boards/probe.c create mode 100644 sound/soc/intel/avs/debugfs.c create mode 100644 sound/soc/intel/avs/probes.c delete mode 100644 sound/soc/intel/boards/sof_sdw_rt1316.c delete mode 100644 sound/soc/intel/boards/sof_sdw_rt1318.c rename sound/soc/intel/boards/{sof_sdw_rt1308.c => sof_sdw_rt_amp.c} (59%)

2 1

[PATCH] ALSA: usb-audio: Add new quirk FIXED_RATE for JBL Quantum810 Wireless
by Jaroslav Kysela 22 Dec '22

22 Dec '22

It seems that the firmware is broken and does not accept the UAC_EP_CS_ATTR_SAMPLE_RATE URB. There is only one rate (48000Hz) available in the descriptors for the output endpoint. Create a new quirk QUIRK_FLAG_FIXED_RATE to skip the rate setup when only one rate is available (fixed). BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=216798 Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- sound/usb/card.h | 1 + sound/usb/endpoint.c | 16 ++++++++++------ sound/usb/endpoint.h | 3 ++- sound/usb/implicit.c | 6 +++++- sound/usb/implicit.h | 2 +- sound/usb/pcm.c | 36 +++++++++++++++++++++++++++++++++--- sound/usb/pcm.h | 2 ++ sound/usb/quirks.c | 2 ++ sound/usb/usbaudio.h | 4 ++++ 9 files changed, 60 insertions(+), 12 deletions(-) diff --git a/sound/usb/card.h b/sound/usb/card.h index 40061550105a..6ec95b2edf86 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -131,6 +131,7 @@ struct snd_usb_endpoint { bool lowlatency_playback; /* low-latency playback mode */ bool need_setup; /* (re-)need for hw_params? */ bool need_prepare; /* (re-)need for prepare? */ + bool fixed_rate; /* skip rate setup */ /* for hw constraints */ const struct audioformat *cur_audiofmt; diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 4aaf0784940b..419302e2057e 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -769,7 +769,8 @@ struct snd_usb_endpoint * snd_usb_endpoint_open(struct snd_usb_audio *chip, const struct audioformat *fp, const struct snd_pcm_hw_params *params, - bool is_sync_ep) + bool is_sync_ep, + bool fixed_rate) { struct snd_usb_endpoint *ep; int ep_num = is_sync_ep ? fp->sync_ep : fp->endpoint; @@ -825,6 +826,7 @@ snd_usb_endpoint_open(struct snd_usb_audio *chip, ep->implicit_fb_sync = fp->implicit_fb; ep->need_setup = true; ep->need_prepare = true; + ep->fixed_rate = fixed_rate; usb_audio_dbg(chip, " channels=%d, rate=%d, format=%s, period_bytes=%d, periods=%d, implicit_fb=%d\n", ep->cur_channels, ep->cur_rate, @@ -1413,11 +1415,13 @@ static int init_sample_rate(struct snd_usb_audio *chip, if (clock && !clock->need_setup) return 0; - err = snd_usb_init_sample_rate(chip, ep->cur_audiofmt, rate); - if (err < 0) { - if (clock) - clock->rate = 0; /* reset rate */ - return err; + if (!ep->fixed_rate) { + err = snd_usb_init_sample_rate(chip, ep->cur_audiofmt, rate); + if (err < 0) { + if (clock) + clock->rate = 0; /* reset rate */ + return err; + } } if (clock) diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h index e67ea28faa54..924f4351588c 100644 --- a/sound/usb/endpoint.h +++ b/sound/usb/endpoint.h @@ -14,7 +14,8 @@ struct snd_usb_endpoint * snd_usb_endpoint_open(struct snd_usb_audio *chip, const struct audioformat *fp, const struct snd_pcm_hw_params *params, - bool is_sync_ep); + bool is_sync_ep, + bool fixed_rate); void snd_usb_endpoint_close(struct snd_usb_audio *chip, struct snd_usb_endpoint *ep); int snd_usb_endpoint_set_params(struct snd_usb_audio *chip, diff --git a/sound/usb/implicit.c b/sound/usb/implicit.c index f3e8484b3d9c..41ac7185b42b 100644 --- a/sound/usb/implicit.c +++ b/sound/usb/implicit.c @@ -15,6 +15,7 @@ #include "usbaudio.h" #include "card.h" #include "helper.h" +#include "pcm.h" #include "implicit.h" enum { @@ -455,7 +456,8 @@ const struct audioformat * snd_usb_find_implicit_fb_sync_format(struct snd_usb_audio *chip, const struct audioformat *target, const struct snd_pcm_hw_params *params, - int stream) + int stream, + bool *fixed_rate) { struct snd_usb_substream *subs; const struct audioformat *fp, *sync_fmt = NULL; @@ -483,6 +485,8 @@ snd_usb_find_implicit_fb_sync_format(struct snd_usb_audio *chip, } } + if (fixed_rate) + *fixed_rate = snd_usb_pcm_has_fixed_rate(subs); return sync_fmt; } diff --git a/sound/usb/implicit.h b/sound/usb/implicit.h index ccb415a0ea86..7f1577b6c4d3 100644 --- a/sound/usb/implicit.h +++ b/sound/usb/implicit.h @@ -9,6 +9,6 @@ const struct audioformat * snd_usb_find_implicit_fb_sync_format(struct snd_usb_audio *chip, const struct audioformat *target, const struct snd_pcm_hw_params *params, - int stream); + int stream, bool *fixed_rate); #endif /* __USBAUDIO_IMPLICIT_H */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 9557bd4d1bbc..99a66d0ef5b2 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -157,6 +157,31 @@ find_substream_format(struct snd_usb_substream *subs, true, subs); } +bool snd_usb_pcm_has_fixed_rate(struct snd_usb_substream *subs) +{ + const struct audioformat *fp; + struct snd_usb_audio *chip = subs->stream->chip; + int rate = -1; + + if (!(chip->quirk_flags & QUIRK_FLAG_FIXED_RATE)) + return false; + list_for_each_entry(fp, &subs->fmt_list, list) { + if (fp->rates & SNDRV_PCM_RATE_CONTINUOUS) + return false; + if (fp->nr_rates < 1) + continue; + if (fp->nr_rates > 1) + return false; + if (rate < 0) { + rate = fp->rate_table[0]; + continue; + } + if (rate != fp->rate_table[0]) + return false; + } + return true; +} + static int init_pitch_v1(struct snd_usb_audio *chip, int ep) { struct usb_device *dev = chip->dev; @@ -450,12 +475,14 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, struct snd_usb_audio *chip = subs->stream->chip; const struct audioformat *fmt; const struct audioformat *sync_fmt; + bool fixed_rate, sync_fixed_rate; int ret; ret = snd_media_start_pipeline(subs); if (ret) return ret; + fixed_rate = snd_usb_pcm_has_fixed_rate(subs); fmt = find_substream_format(subs, hw_params); if (!fmt) { usb_audio_dbg(chip, @@ -469,7 +496,8 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, if (fmt->implicit_fb) { sync_fmt = snd_usb_find_implicit_fb_sync_format(chip, fmt, hw_params, - !substream->stream); + !substream->stream, + &sync_fixed_rate); if (!sync_fmt) { usb_audio_dbg(chip, "cannot find sync format: ep=0x%x, iface=%d:%d, format=%s, rate=%d, channels=%d\n", @@ -482,6 +510,7 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, } } else { sync_fmt = fmt; + sync_fixed_rate = fixed_rate; } ret = snd_usb_lock_shutdown(chip); @@ -499,7 +528,7 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, close_endpoints(chip, subs); } - subs->data_endpoint = snd_usb_endpoint_open(chip, fmt, hw_params, false); + subs->data_endpoint = snd_usb_endpoint_open(chip, fmt, hw_params, false, fixed_rate); if (!subs->data_endpoint) { ret = -EINVAL; goto unlock; @@ -508,7 +537,8 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, if (fmt->sync_ep) { subs->sync_endpoint = snd_usb_endpoint_open(chip, sync_fmt, hw_params, - fmt == sync_fmt); + fmt == sync_fmt, + sync_fixed_rate); if (!subs->sync_endpoint) { ret = -EINVAL; goto unlock; diff --git a/sound/usb/pcm.h b/sound/usb/pcm.h index 493a4e34d78d..388fe2ba346d 100644 --- a/sound/usb/pcm.h +++ b/sound/usb/pcm.h @@ -6,6 +6,8 @@ void snd_usb_set_pcm_ops(struct snd_pcm *pcm, int stream); int snd_usb_pcm_suspend(struct snd_usb_stream *as); int snd_usb_pcm_resume(struct snd_usb_stream *as); +bool snd_usb_pcm_has_fixed_rate(struct snd_usb_substream *as); + int snd_usb_init_pitch(struct snd_usb_audio *chip, const struct audioformat *fmt); void snd_usb_preallocate_buffer(struct snd_usb_substream *subs); diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 58b37bfc885c..3d13fdf7590c 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -2152,6 +2152,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_GENERIC_IMPLICIT_FB), DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */ QUIRK_FLAG_IFACE_SKIP_CLOSE), + DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */ + QUIRK_FLAG_FIXED_RATE), /* Vendor matches */ VENDOR_FLG(0x045e, /* MS Lifecam */ diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 2aba508a4831..f5a8dca66457 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -175,6 +175,9 @@ extern bool snd_usb_skip_validation; * QUIRK_FLAG_FORCE_IFACE_RESET * Force an interface reset whenever stopping & restarting a stream * (e.g. after xrun) + * QUIRK_FLAG_FIXED_RATE + * Do not set PCM rate (frequency) when only one rate is available + * for the given endpoint. */ #define QUIRK_FLAG_GET_SAMPLE_RATE (1U << 0) @@ -198,5 +201,6 @@ extern bool snd_usb_skip_validation; #define QUIRK_FLAG_SKIP_IMPLICIT_FB (1U << 18) #define QUIRK_FLAG_IFACE_SKIP_CLOSE (1U << 19) #define QUIRK_FLAG_FORCE_IFACE_RESET (1U << 20) +#define QUIRK_FLAG_FIXED_RATE (1U << 21) #endif /* __USBAUDIO_H */ -- 2.38.1

2 1

[PATCH] ALSA: azt3328: Remove the unused function snd_azf3328_codec_outl()
by Jiapeng Chong 22 Dec '22

22 Dec '22

The function snd_azf3328_codec_outl is defined in the azt3328.c file, but not called elsewhere, so remove this unused function. sound/pci/azt3328.c:367:1: warning: unused function 'snd_azf3328_codec_outl'. Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3432 Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- sound/pci/azt3328.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index 7f329dfc5404..0c6754bf9455 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c @@ -363,15 +363,6 @@ snd_azf3328_codec_inw(const struct snd_azf3328_codec_data *codec, unsigned reg) return inw(codec->io_base + reg); } -static inline void -snd_azf3328_codec_outl(const struct snd_azf3328_codec_data *codec, - unsigned reg, - u32 value -) -{ - outl(value, codec->io_base + reg); -} - static inline void snd_azf3328_codec_outl_multi(const struct snd_azf3328_codec_data *codec, unsigned reg, const void *buffer, int count -- 2.20.1.7.g153144c

2 1

Re: Re: [PATCH] ASoC: Intel: avs: Add support for RT5663 codec
by CoolStar 21 Dec '22

21 Dec '22

This is a question that Cezary would need to answer, as setting the format was simply brought over from the da7219 AVS machine driver.

1 0

Re: Re: [PATCH] ASoC: Intel: avs: Add support for RT5663 codec
by CoolStar 21 Dec '22

21 Dec '22

1 0

ALC4080 broken on MSI MPG X570S Carbon Max Wifi
by GitHub issues - opened 21 Dec '22

21 Dec '22

alsa-project/alsa-ucm-conf issue #256 was opened from lordhoto: With the current ALC4080 UCM2 configuration, sound is completely broken on my MSI MPG X570S Carbon Max Wifi Mainboard with an ALC4080. Regardless of whether I use the "HiFi 2.0 channels", "HiFi 5.1 channels" or "HiFi 7.1 channels" configuration on the front headphone output, the audio is sometimes "stuck" and not playing at all. This causes all sorts of issues: when you play a YouTube video it might not even start, after a while sound might play for a bit and then suddenly stop again. Even in Gnome's audio settings dialog when testing left/right the sound sometimes just does not play at all. I'm using pulseaudio 16.1. When I insert my old ALSA UCM2 configuration, the sound works flawlessly. I suppose there is something wrong with the current configuration, but I can't figure out what. Are there any logs or similar I might look into? Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/256 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH V2 1/4] ASoC: amd: ps: implement api to retrieve acp device config
by Vijendar Mukunda 21 Dec '22

21 Dec '22

Implement API to retrieve acp device config and calculate platform device count and dev mask for platform device node creation. Currently for DMIC configuration, mask and dev count are calculated. Same api will be used to extend support for different ACP device configurations. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- v1->v2: - used ACP_DMIC_DEV macro instead of hard coded value - changed is_dmic_dev variable initialization - changed debug level sound/soc/amd/ps/acp63.h | 7 +++++++ sound/soc/amd/ps/pci-ps.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h index 5e7f9c1c1b0e..b015e845e5fa 100644 --- a/sound/soc/amd/ps/acp63.h +++ b/sound/soc/amd/ps/acp63.h @@ -54,6 +54,11 @@ /* time in ms for runtime suspend delay */ #define ACP_SUSPEND_DELAY_MS 2000 +#define ACP63_DMIC_ADDR 2 +#define ACP63_PDM_MODE_DEVS 3 +#define ACP63_PDM_DEV_MASK 1 +#define ACP_DMIC_DEV 2 + enum acp_config { ACP_CONFIG_0 = 0, ACP_CONFIG_1, @@ -102,4 +107,6 @@ struct acp63_dev_data { struct resource *res; bool acp63_audio_mode; struct platform_device *pdev[ACP63_DEVS]; + u16 pdev_mask; + u16 pdev_count; }; diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c index 489f01a20699..9066a625e501 100644 --- a/sound/soc/amd/ps/pci-ps.c +++ b/sound/soc/amd/ps/pci-ps.c @@ -132,6 +132,38 @@ static irqreturn_t acp63_irq_handler(int irq, void *dev_id) return IRQ_NONE; } +void get_acp63_device_config(u32 config, struct pci_dev *pci, struct acp63_dev_data *acp_data) +{ + struct acpi_device *dmic_dev; + const union acpi_object *obj; + bool is_dmic_dev = false; + + dmic_dev = acpi_find_child_device(ACPI_COMPANION(&pci->dev), ACP63_DMIC_ADDR, 0); + if (dmic_dev) { + if (!acpi_dev_get_property(dmic_dev, "acp-audio-device-type", + ACPI_TYPE_INTEGER, &obj) && + obj->integer.value == ACP_DMIC_DEV) + is_dmic_dev = true; + } + + switch (config) { + case ACP_CONFIG_0: + case ACP_CONFIG_1: + case ACP_CONFIG_2: + case ACP_CONFIG_3: + case ACP_CONFIG_9: + case ACP_CONFIG_15: + dev_dbg(&pci->dev, "Audio Mode %d\n", config); + break; + default: + if (is_dmic_dev) { + acp_data->pdev_mask = ACP63_PDM_DEV_MASK; + acp_data->pdev_count = ACP63_PDM_MODE_DEVS; + } + break; + } +} + static int snd_acp63_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { @@ -183,6 +215,7 @@ static int snd_acp63_probe(struct pci_dev *pci, if (ret) goto release_regions; val = acp63_readl(adata->acp63_base + ACP_PIN_CONFIG); + get_acp63_device_config(val, pci, adata); switch (val) { case ACP_CONFIG_0: case ACP_CONFIG_1: @@ -195,14 +228,14 @@ static int snd_acp63_probe(struct pci_dev *pci, default: /* Checking DMIC hardware*/ - adev = acpi_find_child_device(ACPI_COMPANION(&pci->dev), 0x02, 0); + adev = acpi_find_child_device(ACPI_COMPANION(&pci->dev), ACP_DMIC_ADDR, 0); if (!adev) break; if (!acpi_dev_get_property(adev, "acp-audio-device-type", ACPI_TYPE_INTEGER, &obj) && - obj->integer.value == 2) { + obj->integer.value == ACP_DMIC_DEV) { adata->res = devm_kzalloc(&pci->dev, sizeof(struct resource), GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; -- 2.34.1

3 8

[PATCH v1] ALSA SoC: Texas Instruments TAS2781 Audio Smart Amp
by Kevin Lu 21 Dec '22

21 Dec '22

The TAS2781 driver implements a flexible and configurable register setting for one, two, even multiple TAS2781 chips. All the register setting are in a bin file. Almost no specific register setting can be found in the code. Signed-off-by: Kevin Lu <luminlong(a)139.com> --- sound/soc/codecs/Kconfig | 13 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tas2781-dsp.c | 2483 ++++++++++++++++++++++++++++++++ sound/soc/codecs/tas2781-dsp.h | 213 +++ sound/soc/codecs/tas2781-i2c.c | 2143 +++++++++++++++++++++++++++ sound/soc/codecs/tas2781.h | 208 +++ 6 files changed, 5062 insertions(+) create mode 100644 sound/soc/codecs/tas2781-dsp.c create mode 100644 sound/soc/codecs/tas2781-dsp.h create mode 100644 sound/soc/codecs/tas2781-i2c.c create mode 100644 sound/soc/codecs/tas2781.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 7022e6286..31d2d9594 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -222,6 +222,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_TAS2764 imply SND_SOC_TAS2770 imply SND_SOC_TAS2780 + imply SND_SOC_TAS2781 imply SND_SOC_TAS5086 imply SND_SOC_TAS571X imply SND_SOC_TAS5720 @@ -1573,6 +1574,18 @@ config SND_SOC_TAS2780 Enable support for Texas Instruments TAS2780 high-efficiency digital input mono Class-D audio power amplifiers. +config SND_SOC_TAS2781 + tristate "Texas Instruments TAS2781 speaker amplifier" + depends on I2C + select REGMAP_I2C + help + Enable support for Texas Instruments TAS2781 Smart Amplifier + Digital input mono Class-D and DSP-inside audio power amplifiers. + Note the TAS2781 driver implements a flexible and configurable + register setting, for one, two, even multiple TAS2781 chips. + All the register setting are in a bin file. Almost no specific + register setting can be found in the code. + config SND_SOC_TAS5086 tristate "Texas Instruments TAS5086 speaker amplifier" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 9170ee144..088fed9e7 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -354,6 +354,7 @@ snd-soc-tas2552-objs := tas2552.o snd-soc-tas2562-objs := tas2562.o snd-soc-tas2764-objs := tas2764.o snd-soc-tas2780-objs := tas2780.o +snd-soc-tas2781-objs := tas2781-i2c.o tas2781-dsp.o # Mux snd-soc-simple-mux-objs := simple-mux.o @@ -604,6 +605,7 @@ obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o obj-$(CONFIG_SND_SOC_TAS2562) += snd-soc-tas2562.o obj-$(CONFIG_SND_SOC_TAS2764) += snd-soc-tas2764.o obj-$(CONFIG_SND_SOC_TAS2780) += snd-soc-tas2780.o +obj-$(CONFIG_SND_SOC_TAS2781) += snd-soc-tas2781.o obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o diff --git a/sound/soc/codecs/tas2781-dsp.c b/sound/soc/codecs/tas2781-dsp.c new file mode 100644 index 000000000..56c7efd30 --- /dev/null +++ b/sound/soc/codecs/tas2781-dsp.c @@ -0,0 +1,2483 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier + * + * Copyright (C) 2022 - 2023 Texas Instruments Incorporated + * https://www.ti.com + * + * The TAS2781 driver implements a flexible and configurable register setting + * for one, two, even multiple TAS2781 chips. All the register setting are in + * a bin file. Almost no specific register setting can be found in the code. + * + * Author: Shenghao Ding <shenghao-ding(a)ti.com> + * Kevin Lu <kevin-lu(a)ti.com> + */ + +#include <linux/regmap.h> +#include <linux/i2c.h> +#include <linux/string.h> +#include <linux/crc8.h> +#include <linux/slab.h> +#include <linux/fs.h> +#include <linux/firmware.h> + +#include "tas2781.h" + +#define TAS2781_CAL_BIN_PATH ("/lib/firmware/") + +#define ERROR_PRAM_CRCCHK (0x0000000) +#define ERROR_YRAM_CRCCHK (0x0000001) +#define BINFILEDOCVER (0) +#define DRVFWVER (1) +#define PPC_DRIVER_CRCCHK (0x00000200) + +#define TAS2781_SA_COEFF_SWAP_REG TASDEVICE_REG(0, 0x35, 0x2c) +#define TAS2781_YRAM_BOOK1 (140) +#define TAS2781_YRAM1_PAGE (42) +#define TAS2781_YRAM1_START_REG (88) + +#define TAS2781_YRAM2_START_PAGE (43) +#define TAS2781_YRAM2_END_PAGE (49) +#define TAS2781_YRAM2_START_REG (8) +#define TAS2781_YRAM2_END_REG (127) + +#define TAS2781_YRAM3_PAGE (50) +#define TAS2781_YRAM3_START_REG (8) +#define TAS2781_YRAM3_END_REG (27) + +/*should not include B0_P53_R44-R47 */ +#define TAS2781_YRAM_BOOK2 (0) +#define TAS2781_YRAM4_START_PAGE (50) +#define TAS2781_YRAM4_END_PAGE (60) + +#define TAS2781_YRAM5_PAGE (61) +#define TAS2781_YRAM5_START_REG (8) +#define TAS2781_YRAM5_END_REG (27) + +#define TASDEVICE_MAXPROGRAM_NUM_KERNEL (5) +#define TASDEVICE_MAXCONFIG_NUM_KERNEL_MULTIPLE_AMPS (64) +#define TASDEVICE_MAXCONFIG_NUM_KERNEL (10) +#define MAIN_ALL_DEVICES_1X (0x01) +#define MAIN_DEVICE_A_1X (0x02) +#define MAIN_DEVICE_B_1X (0x03) +#define MAIN_DEVICE_C_1X (0x04) +#define MAIN_DEVICE_D_1X (0x05) +#define COEFF_DEVICE_A_1X (0x12) +#define COEFF_DEVICE_B_1X (0x13) +#define COEFF_DEVICE_C_1X (0x14) +#define COEFF_DEVICE_D_1X (0x15) +#define PRE_DEVICE_A_1X (0x22) +#define PRE_DEVICE_B_1X (0x23) +#define PRE_DEVICE_C_1X (0x24) +#define PRE_DEVICE_D_1X (0x25) + +struct TYCRC { + unsigned char mnOffset; + unsigned char mnLen; +}; + +const unsigned int BinFileformatVerInfo[][2] = { + {0x100, 0x100}, + {0x110, 0x200}, + {0x200, 0x300}, + {0x210, 0x310}, + {0x230, 0x320}, + {0x300, 0x400} +}; + +const char *devicefamily[1] = { + "TAS Devices" }; + +const char *devicelist[TASDEVICE_DSP_TAS_MAX_DEVICE] = { + "TAS2555", + "TAS2555 Stereo", + "TAS2557 Mono", + "TAS2557 Dual Mono", + "TAS2559", + "TAS2563", + NULL, + "TAS2563 Dual Mono", + "TAS2563 Quad", + "TAS2563 2.1", + "TAS2781", + "TAS2781 Stereo", + "TAS2781 2.1", + "TAS2781 Quad" +}; + +const char deviceNumber[TASDEVICE_DSP_TAS_MAX_DEVICE] = { + 1, 2, 1, 2, 1, 1, 0, 2, 4, 3, 1, 2, 3, 4 +}; + +static int fw_parse_block_data_kernel(struct TFirmware *pFirmware, + struct TBlock *pBlock, const struct firmware *pFW, int offset) +{ + const unsigned char *pData = pFW->data; + + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pBlock->mnType = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mbPChkSumPresent error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mbPChkSumPresent = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnPChkSum error\n", __func__); + offset = -1; + goto out; + } + pBlock->mnPChkSum = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mbYChkSumPresent error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mbYChkSumPresent = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnYChkSum error\n", __func__); + offset = -1; + goto out; + } + pBlock->mnYChkSum = pData[offset]; + offset++; + + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: blk_size error\n", __func__); + offset = -1; + goto out; + } + pBlock->blk_size = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: nSublocks error\n", __func__); + offset = -1; + goto out; + } + pBlock->nSublocks = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], pData[offset + 3]); + offset += 4; + + pBlock->mpData = kzalloc(pBlock->blk_size, GFP_KERNEL); + if (pBlock->mpData == NULL) { + offset = -1; + goto out; + } + memcpy(pBlock->mpData, &pData[offset], pBlock->blk_size); + offset += pBlock->blk_size; +out: + return offset; +} + +static int fw_parse_data_kernel(struct TFirmware *pFirmware, + struct TData *pImageData, const struct firmware *pFW, int offset) +{ + const unsigned char *pData = pFW->data; + unsigned int nBlock; + + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pImageData->mnBlocks = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], pData[offset + 3]); + offset += 4; + + pImageData->mpBlocks = + kcalloc(pImageData->mnBlocks, sizeof(struct TBlock), + GFP_KERNEL); + if (pImageData->mpBlocks == NULL) { + dev_err(pFirmware->dev, "%s: FW memory failed!\n", __func__); + goto out; + } + + for (nBlock = 0; nBlock < pImageData->mnBlocks; nBlock++) { + offset = fw_parse_block_data_kernel(pFirmware, + &(pImageData->mpBlocks[nBlock]), pFW, offset); + if (offset < 0) { + offset = -1; + goto out; + } + } +out: + return offset; +} + +int fw_parse_program_data_kernel(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, + const struct firmware *pFW, int offset) +{ + struct TProgram *pProgram; + const unsigned char *buf = pFW->data; + unsigned int nProgram = 0; + + for (nProgram = 0; nProgram < pFirmware->mnPrograms; nProgram++) { + pProgram = &(pFirmware->mpPrograms[nProgram]); + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: mpName error\n", + __func__); + offset = -1; + goto out; + } + memcpy(pProgram->mpName, &buf[offset], 64); + offset += 64; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnAppMode error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnAppMode = buf[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPDMI2SMode error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnPDMI2SMode = buf[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnISnsPD error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnISnsPD = buf[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnVSnsPD error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnVSnsPD = buf[offset]; + offset++; + //skip 3-byte reserved + offset += 3; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPowerLDG error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnPowerLDG = buf[offset]; + offset++; + + offset = fw_parse_data_kernel(pFirmware, &(pProgram->mData), + pFW, offset); + if (offset < 0) + goto out; + } +out: + return offset; +} + +int fw_parse_configuration_data_kernel( + struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, const struct firmware *pFW, int offset) +{ + const unsigned char *pData = pFW->data; + + unsigned int nConfiguration; + struct TConfiguration *pConfiguration; + + for (nConfiguration = 0; nConfiguration < pFirmware->mnConfigurations; + nConfiguration++) { + pConfiguration = + &(pFirmware->mpConfigurations[nConfiguration]); + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: mpName error\n", + __func__); + offset = -1; + goto out; + } + memcpy(pConfiguration->mpName, &pData[offset], 64); + offset += 64; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, + "%s: mnDevice_orientation error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnDevice_orientation = pData[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnDevices error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnDevices = pData[offset + 1]; + offset += 1; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mProgram error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mProgram = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnSamplingRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnSamplingRate = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPLLSrc error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnPLLSrc = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnFsRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnFsRate = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPLLSrcRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnPLLSrcRate = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + offset = fw_parse_data_kernel(pFirmware, + &(pConfiguration->mData), pFW, offset); + if (offset < 0) + goto out; + } +out: + return offset; +} + +int fw_parse_variable_header_kernel(struct tasdevice_priv *tas_dev, + const struct firmware *pFW, int offset) +{ + struct TFirmware *pFirmware = tas_dev->mpFirmware; + struct tasdevice_dspfw_hdr *pFw_hdr = &(pFirmware->fw_hdr); + const unsigned char *buf = pFW->data; + struct TProgram *pProgram; + struct TConfiguration *pConfiguration; + unsigned int nProgram = 0, nConfiguration = 0; + unsigned short maxConf = TASDEVICE_MAXCONFIG_NUM_KERNEL; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDeviceFamily = SMS_HTONS(buf[offset], buf[offset + 1]); + if (pFw_hdr->mnDeviceFamily != 0) { + dev_err(tas_dev->dev, "ERROR:%s:not TAS device\n", __func__); + offset = -1; + goto out; + } + offset += 2; + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnDevice error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDevice = SMS_HTONS(buf[offset], buf[offset + 1]); + if (pFw_hdr->mnDevice >= TASDEVICE_DSP_TAS_MAX_DEVICE || + pFw_hdr->mnDevice == 6) { + dev_err(tas_dev->dev, "ERROR:%s: not support device %d\n", + __func__, pFw_hdr->mnDevice); + offset = -1; + goto out; + } + offset += 2; + pFw_hdr->ndev = deviceNumber[pFw_hdr->mnDevice]; + + if (pFw_hdr->ndev != tas_dev->ndev) { + dev_err(tas_dev->dev, + "%s: ndev(%u) in dspbin dismatch ndev(%u) in DTS\n", + __func__, pFw_hdr->ndev, tas_dev->ndev); + offset = -1; + goto out; + } + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPrograms error\n", __func__); + offset = -1; + goto out; + } + pFirmware->mnPrograms = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + + if (pFirmware->mnPrograms == 0 || pFirmware->mnPrograms > + TASDEVICE_MAXPROGRAM_NUM_KERNEL) { + dev_err(tas_dev->dev, "%s: mnPrograms is invalid\n", __func__); + offset = -1; + goto out; + } + + if (offset + 4 * TASDEVICE_MAXPROGRAM_NUM_KERNEL > pFW->size) { + dev_err(tas_dev->dev, "%s: mpPrograms error\n", __func__); + offset = -1; + goto out; + } + + pFirmware->mpPrograms = + kcalloc(pFirmware->mnPrograms, + sizeof(struct TProgram), GFP_KERNEL); + if (pFirmware->mpPrograms == NULL) { + dev_err(tas_dev->dev, "%s: mpPrograms memory failed!\n", + __func__); + offset = -1; + goto out; + } + + for (nProgram = 0; nProgram < pFirmware->mnPrograms; nProgram++) { + pProgram = &(pFirmware->mpPrograms[nProgram]); + pProgram->prog_size = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + pFirmware->cfg_start_offset += pProgram->prog_size; + offset += 4; + } + offset += (4 * (5 - nProgram)); + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnConfigurations error\n", + __func__); + offset = -1; + goto out; + } + pFirmware->mnConfigurations = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + maxConf = (pFw_hdr->ndev >= 4) ? + TASDEVICE_MAXCONFIG_NUM_KERNEL_MULTIPLE_AMPS : + TASDEVICE_MAXCONFIG_NUM_KERNEL; + if (pFirmware->mnConfigurations == 0 || + pFirmware->mnConfigurations > maxConf) { + dev_err(tas_dev->dev, "%s: mnConfigurations is invalid\n", + __func__); + offset = -1; + goto out; + } + + if (offset + 4 * maxConf > pFW->size) { + dev_err(tas_dev->dev, "%s: mpConfigurations error\n", + __func__); + offset = -1; + goto out; + } + + pFirmware->mpConfigurations = kcalloc(pFirmware->mnConfigurations, + sizeof(struct TConfiguration), GFP_KERNEL); + if (pFirmware->mpConfigurations == NULL) { + offset = -1; + goto out; + } + + for (nConfiguration = 0; nConfiguration < pFirmware->mnPrograms; + nConfiguration++) { + pConfiguration = + &(pFirmware->mpConfigurations[nConfiguration]); + pConfiguration->cfg_size = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + } + + offset += (4 * (maxConf - nConfiguration)); + pFirmware->prog_start_offset = offset; + pFirmware->cfg_start_offset += offset; +out: + return offset; +} + +int tasdevice_load_block_kernel(struct tasdevice_priv *pTAS2781, + struct TBlock *pBlock) +{ + int nResult = 0; + + unsigned char *pData = pBlock->mpData; + unsigned int i = 0, length = 0; + const unsigned int blk_size = pBlock->blk_size; + unsigned char dev_idx = 0; + struct tasdevice_dspfw_hdr *pFw_hdr = &(pTAS2781->mpFirmware->fw_hdr); + struct tasdevice_fw_fixed_hdr *pFw_fixed_hdr = &(pFw_hdr->mnFixedHdr); + + if (pFw_fixed_hdr->mnPPCVersion >= PPC3_VERSION) { + switch (pBlock->mnType) { + case MAIN_ALL_DEVICES_1X: + dev_idx = 0|0x80; + break; + case MAIN_DEVICE_A_1X: + dev_idx = 1|0x80; + break; + case COEFF_DEVICE_A_1X: + case PRE_DEVICE_A_1X: + dev_idx = 1|0xC0; + break; + case MAIN_DEVICE_B_1X: + dev_idx = 2|0x80; + break; + case COEFF_DEVICE_B_1X: + case PRE_DEVICE_B_1X: + dev_idx = 2|0xC0; + break; + case MAIN_DEVICE_C_1X: + dev_idx = 3|0x80; + break; + case COEFF_DEVICE_C_1X: + case PRE_DEVICE_C_1X: + dev_idx = 3|0xC0; + break; + case MAIN_DEVICE_D_1X: + dev_idx = 4|0x80; + break; + case COEFF_DEVICE_D_1X: + case PRE_DEVICE_D_1X: + dev_idx = 4|0xC0; + break; + default: + dev_info(pTAS2781->dev, + "%s: TAS2781 load block: Other Type = 0x%02x\n", + __func__, pBlock->mnType); + break; + } + } else { + switch (pBlock->mnType) { + case MAIN_ALL_DEVICES: + dev_idx = 0|0x80; + break; + case MAIN_DEVICE_A: + dev_idx = 1|0x80; + break; + case COEFF_DEVICE_A: + case PRE_DEVICE_A: + dev_idx = 1|0xC0; + break; + case MAIN_DEVICE_B: + dev_idx = 2|0x80; + break; + case COEFF_DEVICE_B: + case PRE_DEVICE_B: + dev_idx = 2|0xC0; + break; + case MAIN_DEVICE_C: + dev_idx = 3|0x80; + break; + case COEFF_DEVICE_C: + case PRE_DEVICE_C: + dev_idx = 3|0xC0; + break; + case MAIN_DEVICE_D: + dev_idx = 4|0x80; + break; + case COEFF_DEVICE_D: + case PRE_DEVICE_D: + dev_idx = 4|0xC0; + break; + default: + dev_info(pTAS2781->dev, + "%s: TAS2781 load block: Other Type = 0x%02x\n", + __func__, + pBlock->mnType); + break; + } + } + + for (i = 0; i < pBlock->nSublocks; i++) { + int rc = tasdevice_process_block(pTAS2781, pData + length, + dev_idx, blk_size - length); + if (rc < 0) { + dev_err(pTAS2781->dev, + "%s: ERROR:%u %u sublock write error\n", + __func__, length, blk_size); + break; + } + length += (unsigned int)rc; + if (blk_size < length) { + dev_err(pTAS2781->dev, + "%s: ERROR:%u %u out of memory\n", + __func__, length, blk_size); + break; + } + } + + return nResult; +} + +int fw_parse_variable_header_git(struct tasdevice_priv *tas_dev, + const struct firmware *pFW, int offset) +{ + const unsigned char *buf = pFW->data; + struct TFirmware *pFirmware = tas_dev->mpFirmware; + struct tasdevice_dspfw_hdr *pFw_hdr = &(pFirmware->fw_hdr); + int i = strlen((char *)&buf[offset]); + + i++; + + if (offset + i > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + + pFw_hdr->mpDescription = kmemdup(&buf[offset], i, GFP_KERNEL); + if (pFw_hdr->mpDescription == NULL) + goto out; + offset += i; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDeviceFamily = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + if (pFw_hdr->mnDeviceFamily != 0) { + dev_err(tas_dev->dev, "ERROR:%s: not TAS device\n", __func__); + offset = -1; + goto out; + } + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDevice = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + if (pFw_hdr->mnDevice >= TASDEVICE_DSP_TAS_MAX_DEVICE || + pFw_hdr->mnDevice == 6) { + dev_err(tas_dev->dev, "ERROR:%s: not support device %d\n", + __func__, pFw_hdr->mnDevice); + offset = -1; + goto out; + } + offset += 4; + pFw_hdr->ndev = deviceNumber[pFw_hdr->mnDevice]; + if (pFw_hdr->ndev != tas_dev->ndev) { + dev_err(tas_dev->dev, + "%s: ndev(%u) in dspbin dismatch ndev(%u) in DTS\n", + __func__, pFw_hdr->ndev, + tas_dev->ndev); + offset = -1; + } + +out: + return offset; +} + +int fw_parse_variable_header_cal(struct tasdevice_priv *tas_dev, + struct TFirmware *pCalFirmware, const struct firmware *pFW, int offset) +{ + const unsigned char *buf = pFW->data; + struct tasdevice_dspfw_hdr *pFw_hdr = &(pCalFirmware->fw_hdr); + int i = strlen((char *)&buf[offset]); + + i++; + + if (offset + i > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + + pFw_hdr->mpDescription = kmemdup(&buf[offset], i, GFP_KERNEL); + if (pFw_hdr->mpDescription == NULL) + goto out; + offset += i; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnDeviceFamily error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDeviceFamily = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + if (pFw_hdr->mnDeviceFamily != 0) { + dev_err(tas_dev->dev, "ERROR:%s: not TAS device\n", __func__); + offset = -1; + goto out; + } + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnDevice error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDevice = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + if (pFw_hdr->mnDevice >= TASDEVICE_DSP_TAS_MAX_DEVICE || + pFw_hdr->mnDevice == 6) { + dev_err(tas_dev->dev, "ERROR:%s: not support device %d\n", + __func__, pFw_hdr->mnDevice); + offset = -1; + goto out; + } + offset += 4; + pFw_hdr->ndev = deviceNumber[pFw_hdr->mnDevice]; + if (pFw_hdr->ndev != 1) { + dev_err(tas_dev->dev, + "%s: calbin must be 1, but currently ndev(%u)\n", + __func__, pFw_hdr->ndev); + offset = -1; + } + +out: + return offset; +} + +static inline void tas2781_clear_Calfirmware(struct TFirmware + *mpCalFirmware) +{ + int i = 0; + unsigned int nBlock = 0; + + if (mpCalFirmware->mpCalibrations) { + struct TCalibration *pCalibration; + + for (i = 0; i < mpCalFirmware->mnCalibrations; i++) { + pCalibration = &(mpCalFirmware->mpCalibrations[i]); + if (pCalibration) { + struct TData *pImageData = + &(pCalibration->mData); + + if (pImageData->mpBlocks) { + struct TBlock *pBlock; + + for (nBlock = 0; nBlock < + pImageData->mnBlocks; + nBlock++) { + pBlock = + &(pImageData->mpBlocks[nBlock]); + kfree(pBlock->mpData); + } + kfree(pImageData->mpBlocks); + } + kfree(pCalibration->mpDescription); + } + } + kfree(mpCalFirmware->mpCalibrations); + } + kfree(mpCalFirmware); +} + +static int fw_parse_block_data(struct TFirmware *pFirmware, + struct TBlock *pBlock, const struct firmware *pFW, int offset) +{ + unsigned char *pData = (unsigned char *)pFW->data; + int n; + + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnType error\n", __func__); + offset = -1; + goto out; + } + pBlock->mnType = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], pData[offset + 3]); + offset += 4; + + if (pFirmware->fw_hdr.mnFixedHdr.mnDriverVersion >= + PPC_DRIVER_CRCCHK) { + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mbPChkSumPresent error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mbPChkSumPresent = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnPChkSum error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mnPChkSum = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mbYChkSumPresent error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mbYChkSumPresent = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnYChkSum error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mnYChkSum = pData[offset]; + offset++; + } else { + pBlock->mbPChkSumPresent = 0; + pBlock->mbYChkSumPresent = 0; + } + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnCommands error\n", __func__); + offset = -1; + goto out; + } + pBlock->mnCommands = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], pData[offset + 3]); + offset += 4; + + n = pBlock->mnCommands * 4; + if (offset + n > pFW->size) { + dev_err(pFirmware->dev, + "%s: File Size(%u) error offset = %d n = %d\n", + __func__, pFW->size, offset, n); + offset = -1; + goto out; + } + pBlock->mpData = kmemdup(&pData[offset], n, GFP_KERNEL); + if (pBlock->mpData == NULL) { + offset = -1; + goto out; + } + offset += n; +out: + return offset; +} + +static int fw_parse_data(struct TFirmware *pFirmware, + struct TData *pImageData, const struct firmware *pFW, int offset) +{ + const unsigned char *pData = (unsigned char *)pFW->data; + int n = 0; + unsigned int nBlock; + + if (offset + 64 > pFW->size) { + dev_err(pFirmware->dev, "%s: mpName error\n", __func__); + n = -1; + goto out; + } + memcpy(pImageData->mpName, &pData[offset], 64); + offset += 64; + + n = strlen((char *)&pData[offset]); + n++; + if (offset + n > pFW->size) { + dev_err(pFirmware->dev, "%s: mpDescription error\n", __func__); + offset = -1; + goto out; + } + pImageData->mpDescription = kmemdup(pData, n, GFP_KERNEL); + if (pImageData->mpDescription == NULL) + goto out; + offset += n; + + if (offset + 2 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnBlocks error\n", __func__); + offset = -1; + goto out; + } + pImageData->mnBlocks = SMS_HTONS(pData[offset], pData[offset + 1]); + offset += 2; + + pImageData->mpBlocks = + kcalloc(pImageData->mnBlocks, sizeof(struct TBlock), + GFP_KERNEL); + if (pImageData->mpBlocks == NULL) { + dev_err(pFirmware->dev, "%s: FW memory failed!\n", __func__); + goto out; + } + for (nBlock = 0; nBlock < pImageData->mnBlocks; nBlock++) { + offset = fw_parse_block_data(pFirmware, + &(pImageData->mpBlocks[nBlock]), pFW, offset); + if (offset < 0) { + offset = -1; + goto out; + } + } +out: + return offset; +} + +static int fw_parse_calibration_data(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, const struct firmware *pFW, int offset) +{ + unsigned char *pData = (unsigned char *)pFW->data; + unsigned int n = 0; + unsigned int nCalibration = 0; + struct TCalibration *pCalibration = NULL; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnCalibrations error\n", __func__); + offset = -1; + goto out; + } + pFirmware->mnCalibrations = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + if (pFirmware->mnCalibrations != 1) { + dev_err(tas_dev->dev, + "%s: only support one calibraiton(%d)!\n", + __func__, pFirmware->mnCalibrations); + goto out; + } + + pFirmware->mpCalibrations = + kcalloc(pFirmware->mnCalibrations, sizeof(struct TCalibration), + GFP_KERNEL); + if (pFirmware->mpCalibrations == NULL) { + dev_err(tas_dev->dev, "%s: mpCalibrations memory failed!\n", + __func__); + offset = -1; + goto out; + } + for (nCalibration = 0; nCalibration < pFirmware->mnCalibrations; + nCalibration++) { + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: mpCalibrations error\n", + __func__); + offset = -1; + goto out; + } + pCalibration = &(pFirmware->mpCalibrations[nCalibration]); + memcpy(pCalibration->mpName, &pData[offset], 64); + offset += 64; + + n = strlen((char *)&pData[offset]); + n++; + if (offset + n > pFW->size) { + dev_err(tas_dev->dev, "%s: mpDescription error\n", + __func__); + offset = -1; + goto out; + } + pCalibration->mpDescription = kmemdup(&pData[offset], n, + GFP_KERNEL); + if (pCalibration->mpDescription == NULL) { + offset = -1; + goto out; + } + offset += n; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, + "%s: mnProgram error, offset = %d\n", __func__, + offset); + offset = -1; + goto out; + } + pCalibration->mnProgram = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, + "%s: mnConfiguration error, offset = %d\n", + __func__, + offset); + offset = -1; + goto out; + } + pCalibration->mnConfiguration = pData[offset]; + offset++; + + offset = fw_parse_data(pFirmware, &(pCalibration->mData), pFW, + offset); + if (offset < 0) + goto out; + } + +out: + + return offset; +} + +static int fw_parse_program_data(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, const struct firmware *pFW, int offset) +{ + struct TProgram *pProgram; + unsigned char *buf = (unsigned char *)pFW->data; + int nProgram = 0; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pFirmware->mnPrograms = SMS_HTONS(buf[offset], buf[offset + 1]); + offset += 2; + + if (pFirmware->mnPrograms == 0) { + dev_err(tas_dev->dev, "%s: mnPrograms is null, maybe calbin\n", + __func__); + //Do not "offset = -1;", because of calbin + goto out; + } + + pFirmware->mpPrograms = + kcalloc(pFirmware->mnPrograms, sizeof(struct TProgram), + GFP_KERNEL); + if (pFirmware->mpPrograms == NULL) { + offset = -1; + goto out; + } + for (nProgram = 0; nProgram < pFirmware->mnPrograms; nProgram++) { + int n = 0; + + pProgram = &(pFirmware->mpPrograms[nProgram]); + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: mpName error\n", __func__); + offset = -1; + goto out; + } + memcpy(pProgram->mpName, &buf[offset], 64); + offset += 64; + + n = strlen((char *)&buf[offset]); + n++; + if (offset + n > pFW->size) { + dev_err(tas_dev->dev, "%s: mpDescription error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mpDescription = kmemdup(&buf[offset], n, GFP_KERNEL); + if (pProgram->mpDescription == NULL) { + offset = -1; + goto out; + } + + offset += n; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnAppMode error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnAppMode = buf[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPDMI2SMode error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnPDMI2SMode = buf[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnISnsPD error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnISnsPD = buf[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnVSnsPD error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnVSnsPD = buf[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPowerLDG error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnPowerLDG = buf[offset]; + offset++; + + offset = fw_parse_data(pFirmware, &(pProgram->mData), pFW, + offset); + if (offset < 0) + goto out; + } +out: + return offset; +} + +static int fw_parse_configuration_data( + struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, + const struct firmware *pFW, int offset) +{ + unsigned char *pData = (unsigned char *)pFW->data; + int n; + unsigned int nConfiguration; + struct TConfiguration *pConfiguration; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pFirmware->mnConfigurations = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + if (pFirmware->mnConfigurations == 0) { + dev_err(tas_dev->dev, "%s: mnConfigurations is zero\n", + __func__); + //Do not "offset = -1;", because of calbin + goto out; + } + pFirmware->mpConfigurations = + kcalloc(pFirmware->mnConfigurations, + sizeof(struct TConfiguration), GFP_KERNEL); + + for (nConfiguration = 0; nConfiguration < pFirmware->mnConfigurations; + nConfiguration++) { + pConfiguration = + &(pFirmware->mpConfigurations[nConfiguration]); + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", + __func__); + offset = -1; + goto out; + } + memcpy(pConfiguration->mpName, &pData[offset], 64); + offset += 64; + + n = strlen((char *)&pData[offset]); + n++; + if (offset + n > pFW->size) { + dev_err(tas_dev->dev, "%s: mpDescription error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mpDescription = kmemdup(&pData[offset], n, + GFP_KERNEL); + + if (pConfiguration->mpDescription == NULL) { + dev_err(tas_dev->dev, "%s: FW memory failed!\n", + __func__); + goto out; + } + offset += n; + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, + "%s: mnDevice_orientation error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnDevice_orientation = pData[offset]; + + pConfiguration->mnDevices = pData[offset + 1]; + offset += 2; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mProgram error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mProgram = pData[offset]; + offset++; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnSamplingRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnSamplingRate = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPLLSrc error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnPLLSrc = pData[offset]; + offset++; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPLLSrcRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnPLLSrcRate = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnFsRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnFsRate = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + offset = fw_parse_data(pFirmware, &(pConfiguration->mData), + pFW, offset); + if (offset < 0) + goto out; + } +out: + return offset; +} + +static int fw_parse_header(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, const struct firmware *pFW, int offset) +{ + struct tasdevice_dspfw_hdr *pFw_hdr = &(pFirmware->fw_hdr); + struct tasdevice_fw_fixed_hdr *pFw_fixed_hdr = &(pFw_hdr->mnFixedHdr); + const unsigned char *buf = (unsigned char *)pFW->data; + int i = 0; + unsigned char pMagicNumber[] = { 0x35, 0x35, 0x35, 0x32 }; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -EINVAL; + goto out; + } + if (memcmp(&buf[offset], pMagicNumber, 4)) { + dev_err(tas_dev->dev, "%s: Magic number doesn't match", + __func__); + offset = -EINVAL; + goto out; + } + pFw_fixed_hdr->mnMagicNumber = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnFWSize error\n", __func__); + offset = -1; + goto out; + } + pFw_fixed_hdr->mnFWSize = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + if (pFw_fixed_hdr->mnFWSize != pFW->size) { + dev_err(tas_dev->dev, "File size not match, %d %d", pFW->size, + pFw_fixed_hdr->mnFWSize); + offset = -1; + goto out; + } + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnChecksum error\n", __func__); + offset = -1; + goto out; + } + pFw_fixed_hdr->mnChecksum = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPPCVersion error\n", __func__); + offset = -1; + goto out; + } + pFw_fixed_hdr->mnPPCVersion = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnFWVersion error\n", __func__); + offset = -1; + goto out; + } + pFw_fixed_hdr->mnFWVersion = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnDriverVersion error\n", __func__); + offset = -1; + goto out; + } + pFw_fixed_hdr->mnDriverVersion = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnTimeStamp error\n", __func__); + offset = -1; + goto out; + } + for (i = 0; i < sizeof(BinFileformatVerInfo) / + sizeof(BinFileformatVerInfo[0]); i++) { + if (BinFileformatVerInfo[i][DRVFWVER] == + pFw_fixed_hdr->mnDriverVersion) { + pFw_hdr->mnBinFileDocVer = + BinFileformatVerInfo[i][BINFILEDOCVER]; + break; + } + } + pFw_fixed_hdr->mnTimeStamp = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: mpDDCName error\n", __func__); + offset = -1; + goto out; + } + memcpy(pFw_fixed_hdr->mpDDCName, &buf[offset], 64); + offset += 64; + + out: + return offset; +} + +static const unsigned char crc8_lookup_table[CRC8_TABLE_SIZE] = { + 0x00, 0x4D, 0x9A, 0xD7, 0x79, 0x34, 0xE3, 0xAE, + 0xF2, 0xBF, 0x68, 0x25, 0x8B, 0xC6, 0x11, 0x5C, + 0xA9, 0xE4, 0x33, 0x7E, 0xD0, 0x9D, 0x4A, 0x07, + 0x5B, 0x16, 0xC1, 0x8C, 0x22, 0x6F, 0xB8, 0xF5, + 0x1F, 0x52, 0x85, 0xC8, 0x66, 0x2B, 0xFC, 0xB1, + 0xED, 0xA0, 0x77, 0x3A, 0x94, 0xD9, 0x0E, 0x43, + 0xB6, 0xFB, 0x2C, 0x61, 0xCF, 0x82, 0x55, 0x18, + 0x44, 0x09, 0xDE, 0x93, 0x3D, 0x70, 0xA7, 0xEA, + 0x3E, 0x73, 0xA4, 0xE9, 0x47, 0x0A, 0xDD, 0x90, + 0xCC, 0x81, 0x56, 0x1B, 0xB5, 0xF8, 0x2F, 0x62, + 0x97, 0xDA, 0x0D, 0x40, 0xEE, 0xA3, 0x74, 0x39, + 0x65, 0x28, 0xFF, 0xB2, 0x1C, 0x51, 0x86, 0xCB, + 0x21, 0x6C, 0xBB, 0xF6, 0x58, 0x15, 0xC2, 0x8F, + 0xD3, 0x9E, 0x49, 0x04, 0xAA, 0xE7, 0x30, 0x7D, + 0x88, 0xC5, 0x12, 0x5F, 0xF1, 0xBC, 0x6B, 0x26, + 0x7A, 0x37, 0xE0, 0xAD, 0x03, 0x4E, 0x99, 0xD4, + 0x7C, 0x31, 0xE6, 0xAB, 0x05, 0x48, 0x9F, 0xD2, + 0x8E, 0xC3, 0x14, 0x59, 0xF7, 0xBA, 0x6D, 0x20, + 0xD5, 0x98, 0x4F, 0x02, 0xAC, 0xE1, 0x36, 0x7B, + 0x27, 0x6A, 0xBD, 0xF0, 0x5E, 0x13, 0xC4, 0x89, + 0x63, 0x2E, 0xF9, 0xB4, 0x1A, 0x57, 0x80, 0xCD, + 0x91, 0xDC, 0x0B, 0x46, 0xE8, 0xA5, 0x72, 0x3F, + 0xCA, 0x87, 0x50, 0x1D, 0xB3, 0xFE, 0x29, 0x64, + 0x38, 0x75, 0xA2, 0xEF, 0x41, 0x0C, 0xDB, 0x96, + 0x42, 0x0F, 0xD8, 0x95, 0x3B, 0x76, 0xA1, 0xEC, + 0xB0, 0xFD, 0x2A, 0x67, 0xC9, 0x84, 0x53, 0x1E, + 0xEB, 0xA6, 0x71, 0x3C, 0x92, 0xDF, 0x08, 0x45, + 0x19, 0x54, 0x83, 0xCE, 0x60, 0x2D, 0xFA, 0xB7, + 0x5D, 0x10, 0xC7, 0x8A, 0x24, 0x69, 0xBE, 0xF3, + 0xAF, 0xE2, 0x35, 0x78, 0xD6, 0x9B, 0x4C, 0x01, + 0xF4, 0xB9, 0x6E, 0x23, 0x8D, 0xC0, 0x17, 0x5A, + 0x06, 0x4B, 0x9C, 0xD1, 0x7F, 0x32, 0xE5, 0xA8 +}; + +static int isInPageYRAM(struct tasdevice_priv *pTAS2781, + struct TYCRC *pCRCData, + unsigned char nBook, unsigned char nPage, + unsigned char nReg, unsigned char len) +{ + int nResult = 0; + + if (nBook == TAS2781_YRAM_BOOK1) { + if (nPage == TAS2781_YRAM1_PAGE) { + if (nReg >= TAS2781_YRAM1_START_REG) { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = len; + nResult = 1; + } else if ((nReg + len) > TAS2781_YRAM1_START_REG) { + pCRCData->mnOffset = TAS2781_YRAM1_START_REG; + pCRCData->mnLen = + len - (TAS2781_YRAM1_START_REG - nReg); + nResult = 1; + } else + nResult = 0; + } else if (nPage == TAS2781_YRAM3_PAGE) { + if (nReg > TAS2781_YRAM3_END_REG) { + nResult = 0; + } else if (nReg >= TAS2781_YRAM3_START_REG) { + if ((nReg + len) > TAS2781_YRAM3_END_REG) { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = + TAS2781_YRAM3_END_REG - nReg + 1; + nResult = 1; + } else { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = len; + nResult = 1; + } + } else { + if ((nReg + (len-1)) < + TAS2781_YRAM3_START_REG) + nResult = 0; + else { + pCRCData->mnOffset = + TAS2781_YRAM3_START_REG; + pCRCData->mnLen = + len - (TAS2781_YRAM3_START_REG - nReg); + nResult = 1; + } + } + } + } else if (nBook == + TAS2781_YRAM_BOOK2) { + if (nPage == TAS2781_YRAM5_PAGE) { + if (nReg > TAS2781_YRAM5_END_REG) { + nResult = 0; + } else if (nReg >= TAS2781_YRAM5_START_REG) { + if ((nReg + len) > TAS2781_YRAM5_END_REG) { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = + TAS2781_YRAM5_END_REG - nReg + 1; + nResult = 1; + } else { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = len; + nResult = 1; + } + } else { + if ((nReg + (len-1)) < + TAS2781_YRAM5_START_REG) + nResult = 0; + else { + pCRCData->mnOffset = + TAS2781_YRAM5_START_REG; + pCRCData->mnLen = + len - (TAS2781_YRAM5_START_REG - nReg); + nResult = 1; + } + } + } + } else + nResult = 0; + + return nResult; +} + +static int isInBlockYRAM(struct tasdevice_priv *pTAS2781, + struct TYCRC *pCRCData, + unsigned char nBook, unsigned char nPage, + unsigned char nReg, unsigned char len) +{ + int nResult = 0; + + if (nBook == TAS2781_YRAM_BOOK1) { + if (nPage < TAS2781_YRAM2_START_PAGE) + nResult = 0; + else if (nPage <= TAS2781_YRAM2_END_PAGE) { + if (nReg > TAS2781_YRAM2_END_REG) + nResult = 0; + else if (nReg >= TAS2781_YRAM2_START_REG) { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = len; + nResult = 1; + } else { + if ((nReg + (len-1)) < + TAS2781_YRAM2_START_REG) + nResult = 0; + else { + pCRCData->mnOffset = + TAS2781_YRAM2_START_REG; + pCRCData->mnLen = + nReg + len - TAS2781_YRAM2_START_REG; + nResult = 1; + } + } + } else + nResult = 0; + } else if (nBook == + TAS2781_YRAM_BOOK2) { + if (nPage < TAS2781_YRAM4_START_PAGE) + nResult = 0; + else if (nPage <= TAS2781_YRAM4_END_PAGE) { + if (nReg > TAS2781_YRAM2_END_REG) + nResult = 0; + else if (nReg >= TAS2781_YRAM2_START_REG) { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = len; + nResult = 1; + } else { + if ((nReg + (len-1)) + < TAS2781_YRAM2_START_REG) + nResult = 0; + else { + pCRCData->mnOffset = + TAS2781_YRAM2_START_REG; + pCRCData->mnLen = + nReg + len - TAS2781_YRAM2_START_REG; + nResult = 1; + } + } + } else + nResult = 0; + } else + nResult = 0; + + return nResult; +} + +static int isYRAM(struct tasdevice_priv *pTAS2781, struct TYCRC *pCRCData, + unsigned char nBook, unsigned char nPage, + unsigned char nReg, unsigned char len) +{ + int nResult = 0; + + nResult = isInPageYRAM(pTAS2781, pCRCData, nBook, nPage, nReg, len); + if (nResult == 0) + nResult = isInBlockYRAM(pTAS2781, pCRCData, nBook, + nPage, nReg, len); + + return nResult; +} + +/* + * crc8-calculate a crc8 over the given input data. + * + * table: crc table used for calculation. + * pdata: pointer to data buffer. + * nbytes: number of bytes in data buffer. + * crc: previous returned crc8 value. + */ +static u8 ti_crc8(const u8 table[CRC8_TABLE_SIZE], u8 *pdata, + size_t nbytes, u8 crc) +{ + /*loop over the buffer data */ + while (nbytes-- > 0) + crc = table[(crc ^ *(pdata += 1)) & 0xff]; + + return crc; +} + +static int doSingleRegCheckSum(struct tasdevice_priv *pTAS2781, + enum channel chl, + unsigned char nBook, unsigned char nPage, + unsigned char nReg, unsigned char nValue) +{ + int nResult = 0; + struct TYCRC sCRCData; + unsigned int nData1 = 0; + + if ((nBook == TASDEVICE_BOOK_ID(TAS2781_SA_COEFF_SWAP_REG)) + && (nPage == TASDEVICE_PAGE_ID(TAS2781_SA_COEFF_SWAP_REG)) + && (nReg >= TASDEVICE_PAGE_REG(TAS2781_SA_COEFF_SWAP_REG)) + && (nReg <= (TASDEVICE_PAGE_REG( + TAS2781_SA_COEFF_SWAP_REG) + 4))) { + /*DSP swap command, pass */ + nResult = 0; + goto end; + } + + nResult = isYRAM(pTAS2781, &sCRCData, nBook, nPage, nReg, 1); + if (nResult == 1) { + nResult = pTAS2781->read(pTAS2781, chl, + TASDEVICE_REG(nBook, nPage, nReg), &nData1); + if (nResult < 0) + goto end; + + if (nData1 != nValue) { + dev_err(pTAS2781->dev, + "error2, B[0x%x]P[0x%x]R[0x%x] W[0x%x], R[0x%x]\n", + nBook, nPage, nReg, + nValue, nData1); + nResult = -EAGAIN; + pTAS2781->tasdevice[chl].mnErrCode |= + ERROR_YRAM_CRCCHK; + goto end; + } + + if (nData1 != nValue) { + dev_err(pTAS2781->dev, + "error2, B[0x%x]P[0x%x]R[0x%x] W[0x%x], R[0x%x]\n", + nBook, nPage, nReg, + nValue, nData1); + nResult = -EAGAIN; + goto end; + } + + nResult = ti_crc8(crc8_lookup_table, &nValue, 1, 0); + } + +end: + return nResult; +} + +static int doMultiRegCheckSum(struct tasdevice_priv *pTAS2781, + enum channel chn, unsigned char nBook, unsigned char nPage, + unsigned char nReg, unsigned int len) +{ + int nResult = 0, i = 0; + unsigned char nCRCChkSum = 0; + unsigned char nBuf1[128] = {0}; + struct TYCRC TCRCData; + + if ((nReg + len-1) > 127) { + nResult = -EINVAL; + dev_err(pTAS2781->dev, "firmware error\n"); + goto end; + } + + if ((nBook == TASDEVICE_BOOK_ID(TAS2781_SA_COEFF_SWAP_REG)) + && (nPage == TASDEVICE_PAGE_ID(TAS2781_SA_COEFF_SWAP_REG)) + && (nReg == TASDEVICE_PAGE_REG(TAS2781_SA_COEFF_SWAP_REG)) + && (len == 4)) { + /*DSP swap command, pass */ + nResult = 0; + goto end; + } + + nResult = isYRAM(pTAS2781, &TCRCData, nBook, nPage, nReg, len); + dev_info(pTAS2781->dev, + "isYRAM: nBook 0x%x, nPage 0x%x, nReg 0x%x\n", + nBook, nPage, nReg); + dev_info(pTAS2781->dev, + "isYRAM: TCRCData.mnLen 0x%x, len 0x%x, nResult %d\n", + TCRCData.mnLen, len, nResult); + dev_info(pTAS2781->dev, "TCRCData.mnOffset %x\n", TCRCData.mnOffset); + if (nResult == 1) { + if (len == 1) { + dev_err(pTAS2781->dev, "firmware error\n"); + nResult = -EINVAL; + goto end; + } else { + nResult = pTAS2781->bulk_read(pTAS2781, chn, + TASDEVICE_REG(nBook, nPage, TCRCData.mnOffset), + nBuf1, TCRCData.mnLen); + if (nResult < 0) + goto end; + + for (i = 0; i < TCRCData.mnLen; i++) { + if ((nBook == TASDEVICE_BOOK_ID( + TAS2781_SA_COEFF_SWAP_REG)) + && (nPage == TASDEVICE_PAGE_ID( + TAS2781_SA_COEFF_SWAP_REG)) + && ((i + TCRCData.mnOffset) + >= TASDEVICE_PAGE_REG( + TAS2781_SA_COEFF_SWAP_REG)) + && ((i + TCRCData.mnOffset) + <= (TASDEVICE_PAGE_REG( + TAS2781_SA_COEFF_SWAP_REG) + + 4))) { + /*DSP swap command, bypass */ + continue; + } else + nCRCChkSum += + ti_crc8(crc8_lookup_table, &nBuf1[i], + 1, 0); + } + + nResult = nCRCChkSum; + } + } + +end: + return nResult; +} + +static int tasdevice_load_block(struct tasdevice_priv *tas_dev, + struct TBlock *pBlock) +{ + int nResult = 0; + unsigned int nCommand = 0; + unsigned char nBook = 0; + unsigned char nPage = 0; + unsigned char nOffset = 0; + unsigned char nData = 0; + unsigned int nLength = 0; + unsigned int nSleep = 0; + unsigned char nCRCChkSum = 0; + unsigned int nValue = 0; + int nRetry = 6; + unsigned char *pData = pBlock->mpData; + int chn = 0, chnend = 0; + + dev_info(tas_dev->dev, + "TAS2781 load block: Type = %d, commands = %d\n", + pBlock->mnType, pBlock->mnCommands); + switch (pBlock->mnType) { + case MAIN_ALL_DEVICES: + chn = 0; + chnend = tas_dev->ndev; + break; + case MAIN_DEVICE_A: + case COEFF_DEVICE_A: + case PRE_DEVICE_A: + chn = 0; + chnend = 1; + break; + case MAIN_DEVICE_B: + case COEFF_DEVICE_B: + case PRE_DEVICE_B: + chn = 1; + chnend = 2; + break; + case MAIN_DEVICE_C: + case COEFF_DEVICE_C: + case PRE_DEVICE_C: + chn = 2; + chnend = 3; + break; + case MAIN_DEVICE_D: + case COEFF_DEVICE_D: + case PRE_DEVICE_D: + chn = 3; + chnend = 4; + break; + default: + dev_info(tas_dev->dev, + "TAS2781 load block: Other Type = 0x%02x\n", + pBlock->mnType); + break; + } + + for (; chn < chnend; chn++) { + if (tas_dev->tasdevice[chn].bLoading == false) + continue; +start: + if (pBlock->mbPChkSumPresent) { + nResult = tas_dev->write(tas_dev, chn, + TASDEVICE_I2CChecksum, 0); + if (nResult < 0) + goto end; + } + + if (pBlock->mbYChkSumPresent) + nCRCChkSum = 0; + + nCommand = 0; + + while (nCommand < pBlock->mnCommands) { + pData = pBlock->mpData + nCommand * 4; + + nBook = pData[0]; + nPage = pData[1]; + nOffset = pData[2]; + nData = pData[3]; + + nCommand++; + + if (nOffset <= 0x7F) { + nResult = tas_dev->write(tas_dev, chn, + TASDEVICE_REG(nBook, nPage, nOffset), + nData); + if (nResult < 0) + goto end; + if (pBlock->mbYChkSumPresent) { + nResult = doSingleRegCheckSum(tas_dev, + chn, nBook, nPage, nOffset, + nData); + if (nResult < 0) + goto check; + nCRCChkSum += (unsigned char)nResult; + } + } else if (nOffset == 0x81) { + nSleep = (nBook << 8) + nPage; + msleep(nSleep); + } else if (nOffset == 0x85) { + pData += 4; + nLength = (nBook << 8) + nPage; + nBook = pData[0]; + nPage = pData[1]; + nOffset = pData[2]; + if (nLength > 1) { + nResult = tas_dev->bulk_write(tas_dev, + chn, TASDEVICE_REG(nBook, + nPage, nOffset), pData + 3, + nLength); + if (nResult < 0) + goto end; + if (pBlock->mbYChkSumPresent) { + nResult = doMultiRegCheckSum( + tas_dev, chn, nBook, + nPage, nOffset, + nLength); + if (nResult < 0) + goto check; + nCRCChkSum += + (unsigned char)nResult; + } + } else { + nResult = tas_dev->write(tas_dev, chn, + TASDEVICE_REG(nBook, nPage, + nOffset), + pData[3]); + if (nResult < 0) + goto end; + if (pBlock->mbYChkSumPresent) { + nResult = doSingleRegCheckSum( + tas_dev, chn, nBook, + nPage, nOffset, + pData[3]); + if (nResult < 0) + goto check; + nCRCChkSum += + (unsigned char)nResult; + } + } + + nCommand++; + if (nLength >= 2) + nCommand += ((nLength - 2) / 4) + 1; + } + } + if (pBlock->mbPChkSumPresent) { + nResult = tas_dev->read(tas_dev, chn, + TASDEVICE_I2CChecksum, &nValue); + if (nResult < 0) { + dev_err(tas_dev->dev, "%s: Channel %d\n", + __func__, chn); + goto check; + } + if ((nValue&0xff) != pBlock->mnPChkSum) { + dev_err(tas_dev->dev, + "Block PChkSum Channel %d Error: FW = 0x%x, Reg = 0x%x\n", + chn, pBlock->mnPChkSum, (nValue&0xff)); + nResult = -EAGAIN; + tas_dev->tasdevice[chn].mnErrCode |= + ERROR_PRAM_CRCCHK; + goto check; + } + nResult = 0; + tas_dev->tasdevice[chn].mnErrCode &= + ~ERROR_PRAM_CRCCHK; + dev_info(tas_dev->dev, "Block[0x%02x] PChkSum match\n", + pBlock->mnType); + } + + if (pBlock->mbYChkSumPresent) { + //TBD, open it when FW ready + dev_err(tas_dev->dev, "Block YChkSum: FW = 0x%x, YCRC = 0x%x\n", + pBlock->mnYChkSum, + nCRCChkSum); + + tas_dev->tasdevice[chn].mnErrCode &= + ~ERROR_YRAM_CRCCHK; + nResult = 0; + dev_info(tas_dev->dev, + "Block[0x%x] YChkSum match\n", pBlock->mnType); + } +check: + if (nResult == -EAGAIN) { + nRetry--; + if (nRetry > 0) + goto start; + else { + if ((pBlock->mnType == MAIN_ALL_DEVICES) + || (pBlock->mnType == MAIN_DEVICE_A) + || (pBlock->mnType == MAIN_DEVICE_B) + || (pBlock->mnType == MAIN_DEVICE_C) + || (pBlock->mnType == MAIN_DEVICE_D)) { + tas_dev->tasdevice[chn].mnCurrentProgram + = -1; + } else { + tas_dev->tasdevice[chn].mnCurrentConfiguration + = -1; + } + nRetry = 6; + } + } + } +end: + if (nResult < 0) { + dev_err(tas_dev->dev, "Block (%d) load error\n", + pBlock->mnType); + } + return nResult; +} + + +static int tasdevice_load_data(struct tasdevice_priv *tas_dev, + struct TData *pData) +{ + int nResult = 0; + unsigned int nBlock = 0; + struct TBlock *pBlock = NULL; + + dev_info(tas_dev->dev, "%s: TAS2781 load data: %s, Blocks = %d\n", + __func__, + pData->mpName, pData->mnBlocks); + + for (nBlock = 0; nBlock < pData->mnBlocks; nBlock++) { + pBlock = &(pData->mpBlocks[nBlock]); + nResult = tas_dev->tasdevice_load_block(tas_dev, pBlock); + if (nResult < 0) + break; + } + + return nResult; +} + +static int tasdevice_load_calibrated_data( + struct tasdevice_priv *tas_dev, struct TData *pData) +{ + int nResult = 0; + unsigned int nBlock = 0; + struct TBlock *pBlock = NULL; + + dev_info(tas_dev->dev, "%s: TAS2781 load data: %s, Blocks = %d\n", + __func__, + pData->mpName, pData->mnBlocks); + + for (nBlock = 0; nBlock < pData->mnBlocks; nBlock++) { + pBlock = &(pData->mpBlocks[nBlock]); + nResult = tasdevice_load_block(tas_dev, pBlock); + if (nResult < 0) + break; + } + + return nResult; +} + +int tas2781_load_calibration(void *pContext, + char *pFileName, enum channel i) +{ + int ret = 0, nSize = 0, offset = 0; + loff_t pos = 0; + struct file *filp = NULL; + struct firmware FW; + const struct firmware *fw_entry = NULL; + char *data = NULL; + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *)pContext; + struct Ttasdevice *pTasdev = &(tas_dev->tasdevice[i]); + struct TFirmware *mpCalFirmware = NULL; + char pHint[256]; + + ret = request_firmware(&fw_entry, pFileName, tas_dev->dev); + if (!ret) { + if (!fw_entry->size) { + dev_err(tas_dev->dev, + "%s: file read error: size = %d\n", + __func__, fw_entry->size); + goto out; + } + FW.size = fw_entry->size; + FW.data = fw_entry->data; + dev_info(tas_dev->dev, + "%s: file = %s, file size %zd\n", + __func__, pFileName, fw_entry->size); + } else { + dev_info(tas_dev->dev, + "%s: Request firmware failed, try flip_open()\n", + __func__); + + scnprintf(pHint, sizeof(pHint), "%s%s\n", + TAS2781_CAL_BIN_PATH, pFileName); + filp = filp_open(pHint, O_RDONLY, 664); + if (!IS_ERR_OR_NULL(filp)) { + FW.size = i_size_read(file_inode(filp)); + dev_info(tas_dev->dev, + "%s: file = %s, file size %ld\n", + __func__, pHint, (long)FW.size); + data = kmalloc(FW.size, GFP_KERNEL); + if (data == NULL) { + dev_err(tas_dev->dev, "%s: malloc error\n", + __func__); + goto out; + } + nSize = (int)kernel_read(filp, data, FW.size, &pos); + if (!nSize) { + dev_err(tas_dev->dev, + "%s: file read error: size = %d\n", + __func__, nSize); + goto out; + } + dev_info(tas_dev->dev, "read filed nSize = %d\n", + nSize); + FW.data = data; + } else { + dev_err(tas_dev->dev, + "%s: cannot open calibration file: %s\n", + __func__, pHint); + goto out; + } + } + + mpCalFirmware = pTasdev->mpCalFirmware = kcalloc(1, + sizeof(struct TFirmware), GFP_KERNEL); + if (pTasdev->mpCalFirmware == NULL) { + dev_err(tas_dev->dev, "%s: FW memory failed!\n", __func__); + ret = -1; + goto out; + } + mpCalFirmware->dev = tas_dev->dev; + offset = fw_parse_header(tas_dev, mpCalFirmware, &FW, offset); + if (offset == -1) { + dev_err(tas_dev->dev, "%s: fw_parse_header EXIT!\n", __func__); + goto out; + } + offset = fw_parse_variable_header_cal(tas_dev, mpCalFirmware, &FW, + offset); + if (offset == -1) { + dev_err(tas_dev->dev, + "%s: fw_parse_variable_header_cal EXIT!\n", __func__); + goto out; + } + offset = fw_parse_program_data(tas_dev, mpCalFirmware, &FW, offset); + if (offset == -1) { + dev_err(tas_dev->dev, "%s: fw_parse_program_data EXIT!\n", + __func__); + goto out; + } + offset = fw_parse_configuration_data(tas_dev, mpCalFirmware, &FW, + offset); + if (offset == -1) { + dev_err(tas_dev->dev, + "%s: fw_parse_configuration_data EXIT!\n", __func__); + goto out; + } + offset = fw_parse_calibration_data(tas_dev, + mpCalFirmware, &FW, offset); + if (offset == -1) { + dev_err(tas_dev->dev, "%s: fw_parse_calibration_data EXIT!\n", + __func__); + goto out; + } + pTasdev->mbCalibrationLoaded = true; +out: + if (!IS_ERR_OR_NULL(filp)) { + filp_close(filp, NULL); + kfree(data); + } + if (fw_entry) { + release_firmware(fw_entry); + fw_entry = NULL; + } + return ret; +} + +int tasdevice_dspfw_ready(const void *pVoid, void *pContext) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + const struct firmware *pFW = (const struct firmware *)pVoid; + struct TFirmware *pFirmware = NULL; + struct tasdevice_fw_fixed_hdr *pFw_fixed_hdr = NULL; + int offset = 0, ret = 0; + + if (!pFW || !pFW->data) { + dev_err(tas_dev->dev, "%s: Failed to read firmware %s\n", + __func__, tas_dev->dsp_binaryname); + ret = -1; + goto out; + } + + tas_dev->mpFirmware = kcalloc(1, + sizeof(struct TFirmware), GFP_KERNEL); + if (tas_dev->mpFirmware == NULL) { + ret = -1; + goto out; + } + pFirmware = tas_dev->mpFirmware; + pFirmware->dev = tas_dev->dev; + offset = fw_parse_header(tas_dev, pFirmware, pFW, offset); + + if (offset == -1) + goto out; + pFw_fixed_hdr = &(pFirmware->fw_hdr.mnFixedHdr); + switch (pFw_fixed_hdr->mnDriverVersion) { + case 0x301: + case 0x302: + case 0x502: + tas_dev->fw_parse_variable_header = + fw_parse_variable_header_kernel; + tas_dev->fw_parse_program_data = + fw_parse_program_data_kernel; + tas_dev->fw_parse_configuration_data = + fw_parse_configuration_data_kernel; + tas_dev->tasdevice_load_block = + tasdevice_load_block_kernel; + pFirmware->bKernelFormat = true; + break; + case 0x202: + case 0x400: + tas_dev->fw_parse_variable_header = + fw_parse_variable_header_git; + tas_dev->fw_parse_program_data = + fw_parse_program_data; + tas_dev->fw_parse_configuration_data = + fw_parse_configuration_data; + tas_dev->tasdevice_load_block = + tasdevice_load_block; + pFirmware->bKernelFormat = false; + break; + default: + if (pFw_fixed_hdr->mnDriverVersion == 0x100) { + if (pFw_fixed_hdr->mnPPCVersion >= PPC3_VERSION) { + tas_dev->fw_parse_variable_header = + fw_parse_variable_header_kernel; + tas_dev->fw_parse_program_data = + fw_parse_program_data_kernel; + tas_dev->fw_parse_configuration_data = + fw_parse_configuration_data_kernel; + tas_dev->tasdevice_load_block = + tasdevice_load_block_kernel; + tas_dev->fw_parse_calibration_data = NULL; + } else { + switch (pFw_fixed_hdr->mnPPCVersion) { + case 0x00: + tas_dev->fw_parse_variable_header = + fw_parse_variable_header_git; + tas_dev->fw_parse_program_data = + fw_parse_program_data; + tas_dev->fw_parse_configuration_data = + fw_parse_configuration_data; + tas_dev->fw_parse_calibration_data = + fw_parse_calibration_data; + tas_dev->tasdevice_load_block = + tasdevice_load_block; + break; + default: + dev_err(tas_dev->dev, + "%s: PPCVersion must be 0x0 or 0x%02x Current:0x%02x\n", + __func__, PPC3_VERSION, + pFw_fixed_hdr->mnPPCVersion); + offset = -1; + break; + } + } + } else { + dev_err(tas_dev->dev, + "%s: DriverVersion must be 0x0, 0x230 or above 0x230:0x%02x\n", + __func__, + pFw_fixed_hdr->mnDriverVersion); + offset = -1; + } + break; + } + + offset = tas_dev->fw_parse_variable_header(tas_dev, pFW, offset); + if (offset == -1) + goto out; + + offset = tas_dev->fw_parse_program_data(tas_dev, pFirmware, pFW, + offset); + if (offset < 0) { + ret = -1; + goto out; + } + offset = tas_dev->fw_parse_configuration_data(tas_dev, + pFirmware, pFW, offset); + if (offset < 0) + ret = -1; + +out: + return ret; +} + +void tasdevice_calbin_remove(void *pContext) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + struct Ttasdevice *pTasdev = NULL; + int i = 0; + + if (tas_dev) { + for (i = 0; i < tas_dev->ndev; i++) { + pTasdev = &(tas_dev->tasdevice[i]); + if (pTasdev->mpCalFirmware) { + tas2781_clear_Calfirmware( + pTasdev->mpCalFirmware); + pTasdev->mpCalFirmware = NULL; + } + } + } +} + +void tasdevice_dsp_remove(void *pContext) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + int i = 0; + + if (tas_dev) { + if (tas_dev->mpFirmware) { + struct TFirmware *pFirmware = tas_dev->mpFirmware; + + if (pFirmware->mpPrograms) { + struct TProgram *pProgram; + + for (i = 0; i < pFirmware->mnPrograms; i++) { + pProgram = &(pFirmware->mpPrograms[i]); + if (pProgram) { + struct TData *pImageData = + &(pProgram->mData); + + if (pImageData->mpBlocks) { + struct TBlock *pBlock; + unsigned int nBlock; + + for (nBlock = 0; + nBlock < + pImageData->mnBlocks; + nBlock++) { + pBlock = + &(pImageData->mpBlocks[nBlock]); + kfree(pBlock->mpData); + } + kfree(pImageData->mpBlocks); + } + kfree(pProgram->mpDescription); + } + } + kfree(pFirmware->mpPrograms); + } + + if (pFirmware->mpConfigurations) { + struct TConfiguration *pConfig; + + for (i = 0; i < pFirmware->mnConfigurations; + i++) { + pConfig = + &(pFirmware->mpConfigurations[i]); + if (pConfig) { + struct TData *pImageData = + &(pConfig->mData); + + if (pImageData->mpBlocks) { + struct TBlock *pBlock; + unsigned int nBlock; + + for (nBlock = 0; + nBlock < + pImageData->mnBlocks; + nBlock++) { + pBlock = + &(pImageData->mpBlocks[nBlock]); + kfree(pBlock->mpData); + } + kfree(pImageData->mpBlocks); + } + kfree(pConfig->mpDescription); + } + } + kfree(pFirmware->mpConfigurations); + } + kfree(pFirmware->fw_hdr.mpDescription); + kfree(pFirmware); + tas_dev->mpFirmware = NULL; + } + } +} + +void tasdevice_select_tuningprm_cfg(void *pContext, int prm_no, + int cfg_no, int regbin_conf_no) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + struct tasdevice_regbin *regbin = &(tas_dev->mtRegbin); + struct tasdevice_config_info **cfg_info = regbin->cfg_info; + struct TFirmware *pFirmware = tas_dev->mpFirmware; + struct TConfiguration *pConfigurations = NULL; + struct TProgram *pProgram = NULL; + int i = 0; + int status = 0; + + if (pFirmware == NULL) { + dev_err(tas_dev->dev, "%s: Firmware is NULL\n", __func__); + goto out; + } + + if (cfg_no >= pFirmware->mnConfigurations) { + dev_err(tas_dev->dev, + "%s: cfg(%d) is not in range of conf %u\n", + __func__, cfg_no, pFirmware->mnConfigurations); + goto out; + } + + if (prm_no >= pFirmware->mnPrograms || prm_no == 1) { + dev_err(tas_dev->dev, + "%s: prm(%d) is not in range of Programs %u\n", + __func__, prm_no, pFirmware->mnPrograms); + goto out; + } + + if (regbin_conf_no > regbin->ncfgs || regbin_conf_no < 0 || + cfg_info == NULL) { + dev_err(tas_dev->dev, + "conf_no:%d should be in range from 0 to %u\n", + regbin_conf_no, regbin->ncfgs-1); + goto out; + } else { + dev_info(tas_dev->dev, "%s: regbin_profile_conf_id = %d\n", + __func__, regbin_conf_no); + } + + tas_dev->mnCurrentConfiguration = cfg_no; + tas_dev->mnCurrentProgram = prm_no; + + pConfigurations = &(pFirmware->mpConfigurations[cfg_no]); + for (i = 0; i < tas_dev->ndev; i++) { + if (cfg_info[regbin_conf_no]->active_dev & (1 << i)) { + if (tas_dev->tasdevice[i].mnCurrentProgram != prm_no) { + tas_dev->tasdevice[i].mnCurrentConfiguration + = -1; + tas_dev->tasdevice[i].bLoading = true; + status++; + } + } else + tas_dev->tasdevice[i].bLoading = false; + tas_dev->tasdevice[i].bLoaderr = false; + } + + if (status) { + pProgram = &(pFirmware->mpPrograms[prm_no]); + tasdevice_load_data(tas_dev, &(pProgram->mData)); + for (i = 0; i < tas_dev->ndev; i++) { + if (tas_dev->tasdevice[i].bLoaderr == true) + continue; + else if (tas_dev->tasdevice[i].bLoaderr == false + && tas_dev->tasdevice[i].bLoading == true) { + struct TFirmware *pCalFirmware = + tas_dev->tasdevice[i].mpCalFirmware; + + if (pCalFirmware) { + struct TCalibration *pCalibration = + pCalFirmware->mpCalibrations; + + if (pCalibration) + tasdevice_load_calibrated_data( + tas_dev, + &(pCalibration->mData)); + } + tas_dev->tasdevice[i].mnCurrentProgram + = prm_no; + } + } + } + + if (tas_dev->mbCalibrationLoaded == false) { + for (i = 0; i < tas_dev->ndev; i++) + tas_dev->set_calibration(tas_dev, i, 0x100); + tas_dev->mbCalibrationLoaded = true; + /* No wise to reload calibrationdata everytime, + * this code will work once even if calibrated + * data still failed to be got + */ + } + + status = 0; + for (i = 0; i < tas_dev->ndev; i++) { + dev_info(tas_dev->dev, "%s,fun %d,%d,%d\n", __func__, + tas_dev->tasdevice[i].mnCurrentConfiguration, + cfg_info[regbin_conf_no]->active_dev, + tas_dev->tasdevice[i].bLoaderr); + if (tas_dev->tasdevice[i].mnCurrentConfiguration != cfg_no + && (cfg_info[regbin_conf_no]->active_dev & (1 << i)) + && (tas_dev->tasdevice[i].bLoaderr == false)) { + status++; + tas_dev->tasdevice[i].bLoading = true; + } else + tas_dev->tasdevice[i].bLoading = false; + } + + if (status) { + status = 0; + tasdevice_load_data(tas_dev, &(pConfigurations->mData)); + for (i = 0; i < tas_dev->ndev; i++) { + if (tas_dev->tasdevice[i].bLoaderr == true) { + status |= 1 << (i + 4); + continue; + } else if (tas_dev->tasdevice[i].bLoaderr == false + && tas_dev->tasdevice[i].bLoading == true) { + tas_dev->tasdevice[i].mnCurrentConfiguration + = cfg_no; + tas_dev->tasdevice[i].bDSPBypass = false; + } + } + } else { + dev_err(tas_dev->dev, + "%s: No device is in active in conf %d\n", + __func__, regbin_conf_no); + } + + status |= cfg_info[regbin_conf_no]->active_dev; + dev_info(tas_dev->dev, "%s: DSP mode: load status is %08x\n", + __func__, status); +out: + return; +} + +int tas2781_set_calibration(void *pContext, enum channel i, + int nCalibration) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + int nResult = 0; + struct Ttasdevice *pTasdev = &(tas_dev->tasdevice[i]); + struct TFirmware *pCalFirmware = pTasdev->mpCalFirmware; + + if ((!tas_dev->mpFirmware->mpPrograms) + || (!tas_dev->mpFirmware->mpConfigurations)) { + dev_err(tas_dev->dev, "%s, Firmware not loaded\n\r", __func__); + nResult = 0; + goto out; + } + + if (nCalibration == 0xFF || (nCalibration == 0x100 + && pTasdev->mbCalibrationLoaded == false)) { + if (pCalFirmware) { + pTasdev->mbCalibrationLoaded = false; + tas2781_clear_Calfirmware(pCalFirmware); + pCalFirmware = NULL; + } + + scnprintf(tas_dev->cal_binaryname[i], 64, "%s_cal_0x%02x.bin", + tas_dev->dev_name, tas_dev->tasdevice[i].mnDevAddr); + nResult = tas2781_load_calibration(tas_dev, + tas_dev->cal_binaryname[i], i); + if (nResult != 0) { + dev_err(tas_dev->dev, + "%s: load %s error, no-side effect for playback\n", + __func__, tas_dev->cal_binaryname[i]); + nResult = 0; + } + } + pTasdev->bLoading = true; + pTasdev->bLoaderr = false; + + if (pCalFirmware) { + struct TCalibration *pCalibration = + pCalFirmware->mpCalibrations; + + if (pCalibration) + tasdevice_load_calibrated_data(tas_dev, + &(pCalibration->mData)); + } else + dev_err(tas_dev->dev, + "%s: No calibrated data for device %d\n", __func__, i); + +out: + return nResult; +} diff --git a/sound/soc/codecs/tas2781-dsp.h b/sound/soc/codecs/tas2781-dsp.h new file mode 100644 index 000000000..f7b689ad6 --- /dev/null +++ b/sound/soc/codecs/tas2781-dsp.h @@ -0,0 +1,213 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier + * + * Copyright (C) 2022 - 2023 Texas Instruments Incorporated + * https://www.ti.com + * + * The TAS2781 driver implements a flexible and configurable register setting + * for one, two, even multiple TAS2781 chips. All the register setting are in + * a bin file. Almost no specific register setting can be found in the code. + * + * Author: Shenghao Ding <shenghao-ding(a)ti.com> + * Kevin Lu <kevin-lu(a)ti.com> + */ + +#ifndef __TASDEVICE_DSP_H__ +#define __TASDEVICE_DSP_H__ + +#define MAIN_ALL_DEVICES (0x0d) +#define MAIN_DEVICE_A (0x01) +#define MAIN_DEVICE_B (0x08) +#define MAIN_DEVICE_C (0x10) +#define MAIN_DEVICE_D (0x14) +#define COEFF_DEVICE_A (0x03) +#define COEFF_DEVICE_B (0x0a) +#define COEFF_DEVICE_C (0x11) +#define COEFF_DEVICE_D (0x15) +#define PRE_DEVICE_A (0x04) +#define PRE_DEVICE_B (0x0b) +#define PRE_DEVICE_C (0x12) +#define PRE_DEVICE_D (0x16) + +#define PPC3_VERSION 0x4100 +#define REGBIN_CONFIGID_BYPASS_ALL (0) +#define TASDEVICE_DEVICE_SUM (8) +#define TASDEVICE_CONFIG_SUM (64) + +enum channel { + TopLeftChn = 0x00, + TopRightChn = 0x01, + BottomLeftChn = 0x02, + BottomRightChn = 0x03, + MaxChn, +}; + +enum tasdevice_dsp_dev_idx { + TASDEVICE_DSP_TAS_2555 = 0, + TASDEVICE_DSP_TAS_2555_STEREO, + TASDEVICE_DSP_TAS_2557_MONO, + TASDEVICE_DSP_TAS_2557_DUAL_MONO, + TASDEVICE_DSP_TAS_2559, + TASDEVICE_DSP_TAS_2563, + TASDEVICE_DSP_TAS_2563_DUAL_MONO = 7, + TASDEVICE_DSP_TAS_2563_QUAD, + TASDEVICE_DSP_TAS_2563_21, + TASDEVICE_DSP_TAS_2781, + TASDEVICE_DSP_TAS_2781_DUAL_MONO, + TASDEVICE_DSP_TAS_2781_21, + TASDEVICE_DSP_TAS_2781_QUAD, + TASDEVICE_DSP_TAS_MAX_DEVICE +}; + +struct tasdevice_fw_fixed_hdr { + unsigned int mnMagicNumber; + unsigned int mnFWSize; + unsigned int mnChecksum; + unsigned int mnPPCVersion; + unsigned int mnFWVersion; + unsigned int mnDriverVersion; + unsigned int mnTimeStamp; + char mpDDCName[64]; +}; + +struct tasdevice_dspfw_hdr { + struct tasdevice_fw_fixed_hdr mnFixedHdr; + unsigned int mnBinFileDocVer; + char *mpDescription; + unsigned short mnDeviceFamily; + unsigned short mnDevice; + unsigned char ndev; +}; + +struct TBlock { + unsigned int mnType; + unsigned char mbPChkSumPresent; + unsigned char mnPChkSum; + unsigned char mbYChkSumPresent; + unsigned char mnYChkSum; + unsigned int mnCommands; + unsigned int blk_size; + unsigned int nSublocks; + unsigned char *mpData; +}; + +struct TData { + char mpName[64]; + char *mpDescription; + unsigned int mnBlocks; + struct TBlock *mpBlocks; +}; +struct TProgram { + unsigned int prog_size; + char mpName[64]; + char *mpDescription; + unsigned char mnAppMode; + unsigned char mnPDMI2SMode; + unsigned char mnISnsPD; + unsigned char mnVSnsPD; + unsigned char mnPowerLDG; + struct TData mData; +}; + +struct TConfiguration { + unsigned int cfg_size; + char mpName[64]; + char *mpDescription; + unsigned char mnDevice_orientation; + unsigned char mnDevices; + unsigned int mProgram; + unsigned int mnSamplingRate; + unsigned short mnPLLSrc; + unsigned int mnPLLSrcRate; + unsigned int mnFsRate; + struct TData mData; +}; + +struct TCalibration { + char mpName[64]; + char *mpDescription; + unsigned int mnProgram; + unsigned int mnConfiguration; + struct TData mData; +}; + +struct TFirmware { + struct tasdevice_dspfw_hdr fw_hdr; + unsigned int prog_start_offset; + unsigned short mnPrograms; + struct TProgram *mpPrograms; + unsigned int cfg_start_offset; + unsigned short mnConfigurations; + struct TConfiguration *mpConfigurations; + unsigned short mnCalibrations; + struct TCalibration *mpCalibrations; + bool bKernelFormat; + struct device *dev; +}; + +enum tasdevice_dsp_fw_state { + TASDEVICE_DSP_FW_NONE = 0, + TASDEVICE_DSP_FW_PENDING, + TASDEVICE_DSP_FW_FAIL, + TASDEVICE_DSP_FW_ALL_OK, +}; + +enum tasdevice_bin_blk_type { + TASDEVICE_BIN_BLK_COEFF = 1, + TASDEVICE_BIN_BLK_POST_POWER_UP, + TASDEVICE_BIN_BLK_PRE_SHUTDOWN, + TASDEVICE_BIN_BLK_PRE_POWER_UP, + TASDEVICE_BIN_BLK_POST_SHUTDOWN +}; + +struct tasdevice_regbin_hdr { + unsigned int img_sz; + unsigned int checksum; + unsigned int binary_version_num; + unsigned int drv_fw_version; + unsigned int timestamp; + unsigned char plat_type; + unsigned char dev_family; + unsigned char reserve; + unsigned char ndev; + unsigned char devs[TASDEVICE_DEVICE_SUM]; + unsigned int nconfig; + unsigned int config_size[TASDEVICE_CONFIG_SUM]; +}; + +struct tasdevice_block_data { + unsigned char dev_idx; + unsigned char block_type; + unsigned short yram_checksum; + unsigned int block_size; + unsigned int nSublocks; + unsigned char *regdata; +}; + +struct tasdevice_config_info { + char mpName[64]; + unsigned int nblocks; + unsigned int real_nblocks; + unsigned char active_dev; + struct tasdevice_block_data **blk_data; +}; + +struct tasdevice_regbin { + struct tasdevice_regbin_hdr fw_hdr; + int ncfgs; + struct tasdevice_config_info **cfg_info; + int profile_cfg_id; +}; + +int tasdevice_dspfw_ready(const void *pVoid, void *pContext); +void tasdevice_dsp_remove(void *pContext); +void tasdevice_calbin_remove(void *pContext); +int tas2781_load_calibration(void *tas_dev, char *pFileName, + enum channel i); +int tas2781_set_calibration(void *pContext, enum channel i, + int nCalibration); +void tasdevice_select_tuningprm_cfg(void *pContext, int prm, + int cfg_no, int regbin_conf_no); + +#endif diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c new file mode 100644 index 000000000..3ee254777 --- /dev/null +++ b/sound/soc/codecs/tas2781-i2c.c @@ -0,0 +1,2143 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier + * + * Copyright (C) 2022 - 2023 Texas Instruments Incorporated + * https://www.ti.com + * + * The TAS2781 driver implements a flexible and configurable register setting + * for one, two, even multiple TAS2781 chips. All the register setting are in + * a bin file. Almost no specific register setting can be found in the code. + * + * Author: Shenghao Ding <shenghao-ding(a)ti.com> + * Kevin Lu <kevin-lu(a)ti.com> + */ + +#include <linux/module.h> +#include <linux/regmap.h> +#include <linux/init.h> +#include <linux/pm.h> +#include <linux/i2c.h> +#include <linux/of.h> +#include <linux/slab.h> +#include <linux/firmware.h> +#include <linux/of_gpio.h> +#include <linux/interrupt.h> +#include <sound/soc.h> +#include <sound/pcm_params.h> +#include <sound/tlv.h> + +#include "tas2781.h" + +/* max. length of a alsa mixer control name */ +#define MAX_CONTROL_NAME (48) +#define TASDEVICE_CLK_DIR_IN (0) +#define TASDEVICE_CLK_DIR_OUT (1) + +#define TASDEVICE_IRQ_DET_TIMEOUT (30000) +#define TASDEVICE_IRQ_DET_CNT_LIMIT (500) +#define TAS2781_REG_INT_LTCH0 TASDEVICE_REG(0X0, 0x0, 0x49) +#define TAS2781_REG_INT_LTCH1 TASDEVICE_REG(0X0, 0x0, 0x4A) +#define TAS2781_REG_INT_LTCH1_0 TASDEVICE_REG(0X0, 0x0, 0x4B) +#define TAS2781_REG_INT_LTCH2 TASDEVICE_REG(0X0, 0x0, 0x4F) +#define TAS2781_REG_INT_LTCH3 TASDEVICE_REG(0X0, 0x0, 0x50) +#define TAS2781_REG_INT_LTCH4 TASDEVICE_REG(0X0, 0x0, 0x51) + +const char *blocktype[5] = { + "COEFF", + "POST_POWER_UP", + "PRE_SHUTDOWN", + "PRE_POWER_UP", + "POST_SHUTDOWN" +}; + +static const char * const dts_dev_addr_tag[] = { + "ti,topleft-channel", + "ti,topright-channel", + "ti,bottomleft-channel", + "ti,bottomright-channel" +}; + +static const char *dts_rst_tag = "ti,%s-gpio%d"; + +static const char *dts_glb_addr_tag = "ti,global-address"; + +static const struct i2c_device_id tasdevice_id[] = { + { "audev", GENERAL_AUDEV }, + { "tas2781", TAS2781 }, + {} +}; + +MODULE_DEVICE_TABLE(i2c, tasdevice_id); + +static bool tasdevice_volatile(struct device *dev, unsigned int reg) +{ + return true; +} + +static bool tasdevice_writeable(struct device *dev, unsigned int reg) +{ + return true; +} + +static const struct regmap_config tasdevice_regmap = { + .reg_bits = 8, + .val_bits = 8, + .writeable_reg = tasdevice_writeable, + .volatile_reg = tasdevice_volatile, + .cache_type = REGCACHE_FLAT, + .max_register = 1 * 128, +}; + +static const struct of_device_id tasdevice_of_match[] = { + { .compatible = "ti,audev" }, + { .compatible = "ti,tas2781" }, + {}, +}; + +MODULE_DEVICE_TABLE(of, tasdevice_of_match); + +int tasdevice_process_block(void *pContext, + unsigned char *data, unsigned char dev_idx, int sublocksize) +{ + struct tasdevice_priv *tas_dev = + (struct tasdevice_priv *)pContext; + unsigned char subblk_typ = data[1]; + int subblk_offset = 2; + int chn = 0, chnend = 0; + int rc = 0; + int blktyp = dev_idx & 0xC0, idx = dev_idx & 0x3F; + bool bError = false; + + if (idx) { + chn = idx-1; + chnend = idx; + } else { + if (tas_dev->glb_addr.mnDevAddr) { + chn = tas_dev->ndev; + chnend = tas_dev->ndev + 1; + } else { + chn = 0; + chnend = tas_dev->ndev; + } + } + + for (; chn < chnend; chn++) { + if (tas_dev->glb_addr.mnDevAddr == 0 && + tas_dev->tasdevice[chn].bLoading == false) + continue; + + bError = false; + subblk_offset = 2; + switch (subblk_typ) { + case TASDEVICE_CMD_SING_W: { + int i = 0; + unsigned short len = SMS_HTONS(data[2], data[3]); + + subblk_offset += 2; + if (subblk_offset + 4 * len > sublocksize) { + dev_err(tas_dev->dev, + "process_block: Out of memory\n"); + bError = true; + break; + } + + for (i = 0; i < len; i++) { + rc = tasdevice_dev_write(tas_dev, chn, + TASDEVICE_REG(data[subblk_offset], + data[subblk_offset + 1], + data[subblk_offset + 2]), + data[subblk_offset + 3]); + if (rc < 0) { + bError = true; + dev_err(tas_dev->dev, + "process_block: single write error\n"); + } + subblk_offset += 4; + } + } + break; + case TASDEVICE_CMD_BURST: { + unsigned short len = SMS_HTONS(data[2], data[3]); + + subblk_offset += 2; + if (subblk_offset + 4 + len > sublocksize) { + dev_err(tas_dev->dev, + "process_block: BURST Out of memory\n"); + bError = true; + break; + } + if (len % 4) { + dev_err(tas_dev->dev, + "process_block: Burst len(%u) can be divided by 4\n", + len); + break; + } + + rc = tasdevice_dev_bulk_write(tas_dev, chn, + TASDEVICE_REG(data[subblk_offset], + data[subblk_offset + 1], + data[subblk_offset + 2]), + &(data[subblk_offset + 4]), len); + if (rc < 0) { + bError = true; + dev_err(tas_dev->dev, + "process_block: bulk_write error = %d\n", + rc); + } + subblk_offset += (len + 4); + } + break; + case TASDEVICE_CMD_DELAY: { + unsigned short delay_time = 0; + + if (subblk_offset + 2 > sublocksize) { + dev_err(tas_dev->dev, + "process_block: deley Out of memory\n"); + bError = true; + break; + } + delay_time = SMS_HTONS(data[2], data[3]); + usleep_range(delay_time*1000, delay_time*1000); + subblk_offset += 2; + } + break; + case TASDEVICE_CMD_FIELD_W: + if (subblk_offset + 6 > sublocksize) { + dev_err(tas_dev->dev, + "process_block: bit write Out of memory\n"); + bError = true; + break; + } + rc = tasdevice_dev_update_bits(tas_dev, chn, + TASDEVICE_REG(data[subblk_offset + 2], + data[subblk_offset + 3], + data[subblk_offset + 4]), + data[subblk_offset + 1], + data[subblk_offset + 5]); + if (rc < 0) { + bError = true; + dev_err(tas_dev->dev, + "process_block: update_bits error = %d\n", rc); + } + subblk_offset += 6; + break; + default: + break; + }; + if (bError == true && blktyp != 0) { + if (blktyp == 0x80) { + tas_dev->tasdevice[chn].mnCurrentProgram = -1; + tas_dev->tasdevice[chn].mnCurrentConfiguration = + -1; + } else + tas_dev->tasdevice[chn].mnCurrentConfiguration = + -1; + } + } + return subblk_offset; +} + +void tasdevice_select_cfg_blk(void *pContext, int conf_no, + unsigned char block_type) +{ + struct tasdevice_priv *tas_dev = + (struct tasdevice_priv *) pContext; + struct tasdevice_regbin *regbin = &(tas_dev->mtRegbin); + struct tasdevice_config_info **cfg_info = regbin->cfg_info; + int j = 0, k = 0, chn = 0, chnend = 0; + + if (conf_no >= regbin->ncfgs || conf_no < 0 || NULL == cfg_info) { + dev_err(tas_dev->dev, + "conf_no should be not more than %u\n", + regbin->ncfgs); + goto out; + } else + dev_info(tas_dev->dev, + "select_cfg_blk: profile_conf_id = %d\n", + conf_no); + + for (j = 0; j < (int)cfg_info[conf_no]->real_nblocks; j++) { + unsigned int length = 0, rc = 0; + + if (block_type > 5 || block_type < 2) { + dev_err(tas_dev->dev, + "ERROR!!!block_type should be in range from 2 to 5\n"); + goto out; + } + if (block_type != cfg_info[conf_no]->blk_data[j]->block_type) + continue; + dev_info(tas_dev->dev, + "select_cfg_blk: conf %d, block type:%s\t device idx = 0x%02x\n", + conf_no, blocktype[cfg_info[conf_no]->blk_data[j] + ->block_type-1], cfg_info[conf_no]->blk_data[j] + ->dev_idx); + + for (k = 0; k < (int)cfg_info[conf_no]->blk_data[j] + ->nSublocks; k++) { + if (cfg_info[conf_no]->blk_data[j]->dev_idx) { + chn = + cfg_info[conf_no]->blk_data[j]->dev_idx + - 1; + chnend = + cfg_info[conf_no]->blk_data[j]->dev_idx; + } else { + chn = 0; + chnend = tas_dev->ndev; + } + for (; chn < chnend; chn++) + tas_dev->tasdevice[chn].bLoading = true; + + rc = tasdevice_process_block(tas_dev, + cfg_info[conf_no]->blk_data[j]->regdata + + length, + cfg_info[conf_no]->blk_data[j]->dev_idx, + cfg_info[conf_no]->blk_data[j]->block_size - + length); + length += rc; + if (cfg_info[conf_no]->blk_data[j]->block_size < + length) { + dev_err(tas_dev->dev, + "select_cfg_blk: ERROR:%u %u out of memory\n", + length, + cfg_info[conf_no]->blk_data[j]->block_size); + break; + } + } + if (length != cfg_info[conf_no]->blk_data[j]->block_size) + dev_err(tas_dev->dev, + "select_cfg_blk: ERROR: %u %u size is not same\n", + length, + cfg_info[conf_no]->blk_data[j]->block_size); + + } + +out: + return; +} + +static struct tasdevice_config_info *tasdevice_add_config( + void *pContext, unsigned char *config_data, + unsigned int config_size) +{ + struct tasdevice_priv *tas_dev = + (struct tasdevice_priv *)pContext; + struct tasdevice_config_info *cfg_info = NULL; + int config_offset = 0, i = 0; + + cfg_info = kzalloc( + sizeof(struct tasdevice_config_info), GFP_KERNEL); + if (!cfg_info) + goto out; + + if (tas_dev->mtRegbin.fw_hdr.binary_version_num >= 0x105) { + if (config_offset + 64 > (int)config_size) { + dev_err(tas_dev->dev, + "add config: Out of memory\n"); + goto out; + } + memcpy(cfg_info->mpName, &config_data[config_offset], 64); + config_offset += 64; + } + + if (config_offset + 4 > (int)config_size) { + dev_err(tas_dev->dev, + "add config: Out of memory\n"); + goto out; + } + cfg_info->nblocks = + SMS_HTONL(config_data[config_offset], + config_data[config_offset + 1], + config_data[config_offset + 2], config_data[config_offset + 3]); + config_offset += 4; + + cfg_info->blk_data = kcalloc( + cfg_info->nblocks, sizeof(struct tasdevice_block_data *), + GFP_KERNEL); + if (!cfg_info->blk_data) { + dev_err(tas_dev->dev, + "add config: blk_data alloc failed!\n"); + goto out; + } + cfg_info->real_nblocks = 0; + for (i = 0; i < (int)cfg_info->nblocks; i++) { + if (config_offset + 12 > config_size) { + dev_err(tas_dev->dev, + "add config: Out of memory: i = %d nblocks = %u!\n", + i, cfg_info->nblocks); + break; + } + cfg_info->blk_data[i] = kzalloc( + sizeof(struct tasdevice_block_data), GFP_KERNEL); + if (!cfg_info->blk_data[i]) + break; + + cfg_info->blk_data[i]->dev_idx = config_data[config_offset]; + config_offset++; + + cfg_info->blk_data[i]->block_type = config_data[config_offset]; + config_offset++; + + if (cfg_info->blk_data[i]->block_type == + TASDEVICE_BIN_BLK_PRE_POWER_UP) { + if (cfg_info->blk_data[i]->dev_idx == 0) { + cfg_info->active_dev = 1; + } else { + cfg_info->active_dev = + 1 << + (cfg_info->blk_data[i]->dev_idx - 1); + } + } + cfg_info->blk_data[i]->yram_checksum = + SMS_HTONS(config_data[config_offset], + config_data[config_offset + 1]); + config_offset += 2; + cfg_info->blk_data[i]->block_size = + SMS_HTONL(config_data[config_offset], + config_data[config_offset + 1], + config_data[config_offset + 2], + config_data[config_offset + 3]); + config_offset += 4; + + cfg_info->blk_data[i]->nSublocks = + SMS_HTONL(config_data[config_offset], + config_data[config_offset + 1], + config_data[config_offset + 2], + config_data[config_offset + 3]); + + config_offset += 4; + cfg_info->blk_data[i]->regdata = kzalloc( + cfg_info->blk_data[i]->block_size, GFP_KERNEL); + if (cfg_info->blk_data[i]->regdata == 0) { + dev_err(tas_dev->dev, + "add config: regdata alloc failed!\n"); + goto out; + } + if (config_offset + cfg_info->blk_data[i]->block_size + > config_size) { + dev_err(tas_dev->dev, + "add config: block_size Out of memory: i = %d nblocks = %u!\n", + i, + cfg_info->nblocks); + break; + } + memcpy(cfg_info->blk_data[i]->regdata, + &config_data[config_offset], + cfg_info->blk_data[i]->block_size); + config_offset += cfg_info->blk_data[i]->block_size; + cfg_info->real_nblocks += 1; + } +out: + return cfg_info; +} +static int tas2781_digital_getvol(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + unsigned int val; + int ret = 0; + + /* Read the primary device as the whole */ + ret = tasdevice_dev_read(tas_dev, 0, mc->reg, &val); + if (ret) { + dev_err(tas_dev->dev, + "%s, get digital vol error\n", + __func__); + goto out; + } + val = (val > mc->max) ? mc->max : val; + val = mc->invert ? mc->max - val : val; + ucontrol->value.integer.value[0] = val; + +out: + return ret; +} + +static int tas2781_digital_putvol(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + unsigned int val; + int i, ret = 0; + + val = ucontrol->value.integer.value[0]; + val = (val > mc->max) ? mc->max : val; + val = mc->invert ? mc->max - val : val; + val = (val < 0) ? 0 : val; + if (tas_dev->tas2781_set_global != NULL) { + ret = tasdevice_dev_write(tas_dev, tas_dev->ndev, + mc->reg, val); + if (ret) + dev_err(tas_dev->dev, + "%s, set digital vol error in global mode\n", + __func__); + } else { + for (i = 0; i < tas_dev->ndev; i++) { + ret = tasdevice_dev_write(tas_dev, i, + mc->reg, val); + if (ret) + dev_err(tas_dev->dev, + "%s, set digital vol error in device %d\n", + __func__, i); + } + } + + return ret; +} + +static int tas2781_amp_getvol(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + unsigned int val; + unsigned char mask = 0; + int ret = 0; + + /* Read the primary device */ + ret = tasdevice_dev_read(tas_dev, 0, mc->reg, &val); + if (ret) { + dev_err(tas_dev->dev, + "%s, get AMP vol error\n", + __func__); + goto out; + } + + mask = (1 << fls(mc->max)) - 1; + mask <<= mc->shift; + val = (val & mask) >> mc->shift; + val = (val > mc->max) ? mc->max : val; + val = mc->invert ? mc->max - val : val; + ucontrol->value.integer.value[0] = val; + +out: + return ret; +} + +static int tas2781_amp_putvol(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + unsigned int val; + int i, ret = 0; + unsigned char mask = 0; + + mask = (1 << fls(mc->max)) - 1; + mask <<= mc->shift; + val = ucontrol->value.integer.value[0]; + val = (val > mc->max) ? mc->max : val; + val = mc->invert ? mc->max - val : val; + val = (val < 0) ? 0 : val; + for (i = 0; i < tas_dev->ndev; i++) { + ret = tasdevice_dev_update_bits(tas_dev, i, + mc->reg, + mask, + val << mc->shift); + if (ret) + dev_err(tas_dev->dev, + "%s, set AMP vol error in device %d\n", + __func__, i); + } + + return ret; +} + +static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); +static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0); + +static const struct snd_kcontrol_new tas2781_snd_controls[] = { + SOC_SINGLE_RANGE_EXT_TLV("Amp Gain Volume", TAS2781_AMP_LEVEL, + 1, 0, 20, 0, tas2781_amp_getvol, + tas2781_amp_putvol, amp_vol_tlv), + SOC_SINGLE_RANGE_EXT_TLV("Digital Volume Control", TAS2781_DVC_LVL, + 0, 0, 200, 1, tas2781_digital_getvol, + tas2781_digital_putvol, dvc_tlv), +}; + +static int tasdevice_set_profile_id(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *p_tasdevice = + snd_soc_component_get_drvdata(codec); + + /* Codec Lock Hold*/ + mutex_lock(&p_tasdevice->codec_lock); + p_tasdevice->mtRegbin.profile_cfg_id = + ucontrol->value.integer.value[0]; + /* Codec Lock Release*/ + mutex_unlock(&p_tasdevice->codec_lock); + + return 0; +} + +static int tasdevice_info_programs(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *p_tasdevice = + snd_soc_component_get_drvdata(codec); + struct TFirmware *Tfw = p_tasdevice->mpFirmware; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + /* Codec Lock Hold*/ + mutex_lock(&p_tasdevice->codec_lock); + uinfo->count = 1; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = (int)Tfw->mnPrograms; + /* Codec Lock Release*/ + mutex_unlock(&p_tasdevice->codec_lock); + return 0; +} + +static int tasdevice_info_configurations( + struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *p_tasdevice = + snd_soc_component_get_drvdata(codec); + struct TFirmware *Tfw = p_tasdevice->mpFirmware; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + /* Codec Lock Hold*/ + mutex_lock(&p_tasdevice->codec_lock); + uinfo->count = 1; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = (int)Tfw->mnConfigurations - 1; + /* Codec Lock Release*/ + mutex_unlock(&p_tasdevice->codec_lock); + + return 0; +} + +static int tasdevice_info_profile(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *p_tasdevice = + snd_soc_component_get_drvdata(codec); + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + /* Codec Lock Hold*/ + mutex_lock(&p_tasdevice->codec_lock); + uinfo->count = 1; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = max(0, p_tasdevice->mtRegbin.ncfgs); + /* Codec Lock Release*/ + mutex_unlock(&p_tasdevice->codec_lock); + return 0; +} + +static int tasdevice_get_profile_id(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *p_tasdevice + = snd_soc_component_get_drvdata(codec); + + /* Codec Lock Hold*/ + mutex_lock(&p_tasdevice->codec_lock); + ucontrol->value.integer.value[0] = + p_tasdevice->mtRegbin.profile_cfg_id; + /* Codec Lock Release*/ + mutex_unlock(&p_tasdevice->codec_lock); + + return 0; +} + +static int tasdevice_create_controls(struct tasdevice_priv *tas_dev) +{ + int nr_controls = 1, ret = 0, mix_index = 0; + char *name = NULL; + struct snd_kcontrol_new *tasdevice_profile_controls = NULL; + + tasdevice_profile_controls = devm_kzalloc(tas_dev->dev, + nr_controls * sizeof(tasdevice_profile_controls[0]), + GFP_KERNEL); + if (tasdevice_profile_controls == NULL) { + ret = -ENOMEM; + goto out; + } + + /* Create a mixer item for selecting the active profile */ + name = devm_kzalloc(tas_dev->dev, + MAX_CONTROL_NAME, GFP_KERNEL); + if (!name) { + ret = -ENOMEM; + goto out; + } + scnprintf(name, MAX_CONTROL_NAME, "TASDEVICE Profile id"); + tasdevice_profile_controls[mix_index].name = name; + tasdevice_profile_controls[mix_index].iface = + SNDRV_CTL_ELEM_IFACE_MIXER; + tasdevice_profile_controls[mix_index].info = + tasdevice_info_profile; + tasdevice_profile_controls[mix_index].get = + tasdevice_get_profile_id; + tasdevice_profile_controls[mix_index].put = + tasdevice_set_profile_id; + mix_index++; + + ret = snd_soc_add_component_controls(tas_dev->codec, + tasdevice_profile_controls, + nr_controls < mix_index ? nr_controls : mix_index); + + tas_dev->tas_ctrl.nr_controls = + nr_controls < mix_index ? nr_controls : mix_index; +out: + return ret; +} + +static int tasdevice_program_get(struct snd_kcontrol *pKcontrol, + struct snd_ctl_elem_value *pValue) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(pKcontrol); + struct tasdevice_priv *pTAS2781 = snd_soc_component_get_drvdata(codec); + + mutex_lock(&pTAS2781->codec_lock); + pValue->value.integer.value[0] = pTAS2781->mnCurrentProgram; + mutex_unlock(&pTAS2781->codec_lock); + return 0; +} + +static int tasdevice_program_put(struct snd_kcontrol *pKcontrol, + struct snd_ctl_elem_value *pValue) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(pKcontrol); + struct tasdevice_priv *pTAS2781 = snd_soc_component_get_drvdata(codec); + unsigned int nProgram = pValue->value.integer.value[0]; + + mutex_lock(&pTAS2781->codec_lock); + pTAS2781->mnCurrentProgram = nProgram; + mutex_unlock(&pTAS2781->codec_lock); + return 0; +} + +static int tasdevice_configuration_get( + struct snd_kcontrol *pKcontrol, + struct snd_ctl_elem_value *pValue) +{ + + struct snd_soc_component *codec + = snd_soc_kcontrol_component(pKcontrol); + struct tasdevice_priv *pTAS2781 = snd_soc_component_get_drvdata(codec); + + mutex_lock(&pTAS2781->codec_lock); + pValue->value.integer.value[0] = pTAS2781->mnCurrentConfiguration; + mutex_unlock(&pTAS2781->codec_lock); + return 0; +} + +static int tasdevice_configuration_put( + struct snd_kcontrol *pKcontrol, + struct snd_ctl_elem_value *pValue) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(pKcontrol); + struct tasdevice_priv *pTAS2781 = snd_soc_component_get_drvdata(codec); + unsigned int nConfiguration = pValue->value.integer.value[0]; + + mutex_lock(&pTAS2781->codec_lock); + pTAS2781->mnCurrentConfiguration = nConfiguration; + mutex_unlock(&pTAS2781->codec_lock); + return 0; +} + +static int tasdevice_dsp_create_control( + struct tasdevice_priv *tas_dev) +{ + int nr_controls = 2, ret = 0, mix_index = 0; + char *program_name = NULL; + char *configuration_name = NULL; + struct snd_kcontrol_new *tasdevice_dsp_controls = NULL; + + tasdevice_dsp_controls = devm_kzalloc(tas_dev->dev, + nr_controls * sizeof(tasdevice_dsp_controls[0]), + GFP_KERNEL); + if (tasdevice_dsp_controls == NULL) { + ret = -ENOMEM; + goto out; + } + + /* Create a mixer item for selecting the active profile */ + program_name = devm_kzalloc(tas_dev->dev, + MAX_CONTROL_NAME, GFP_KERNEL); + configuration_name = devm_kzalloc(tas_dev->dev, + MAX_CONTROL_NAME, GFP_KERNEL); + if (!program_name || !configuration_name) { + ret = -ENOMEM; + goto out; + } + + scnprintf(program_name, MAX_CONTROL_NAME, "Program"); + tasdevice_dsp_controls[mix_index].name = program_name; + tasdevice_dsp_controls[mix_index].iface = + SNDRV_CTL_ELEM_IFACE_MIXER; + tasdevice_dsp_controls[mix_index].info = + tasdevice_info_programs; + tasdevice_dsp_controls[mix_index].get = + tasdevice_program_get; + tasdevice_dsp_controls[mix_index].put = + tasdevice_program_put; + mix_index++; + + scnprintf(configuration_name, MAX_CONTROL_NAME, "Configuration"); + tasdevice_dsp_controls[mix_index].name = configuration_name; + tasdevice_dsp_controls[mix_index].iface = + SNDRV_CTL_ELEM_IFACE_MIXER; + tasdevice_dsp_controls[mix_index].info = + tasdevice_info_configurations; + tasdevice_dsp_controls[mix_index].get = + tasdevice_configuration_get; + tasdevice_dsp_controls[mix_index].put = + tasdevice_configuration_put; + mix_index++; + + ret = snd_soc_add_component_controls(tas_dev->codec, + tasdevice_dsp_controls, + nr_controls < mix_index ? nr_controls : mix_index); + + tas_dev->tas_ctrl.nr_controls += nr_controls; +out: + return ret; +} + +void tasdevice_regbin_ready(const struct firmware *pFW, + void *pContext) +{ + struct tasdevice_priv *tas_dev = + (struct tasdevice_priv *) pContext; + struct tasdevice_regbin *regbin = NULL; + struct tasdevice_regbin_hdr *fw_hdr = NULL; + struct tasdevice_config_info **cfg_info = NULL; + const struct firmware *fw_entry = NULL; + unsigned char *buf = NULL; + int offset = 0, i = 0; + unsigned int total_config_sz = 0; + int ret = 0; + + if (tas_dev == NULL) { + dev_err(tas_dev->dev, + "tasdev: regbin_ready: handle is NULL\n"); + return; + } + mutex_lock(&tas_dev->codec_lock); + regbin = &(tas_dev->mtRegbin); + fw_hdr = &(regbin->fw_hdr); + if (unlikely(!pFW) || unlikely(!pFW->data)) { + dev_err(tas_dev->dev, + "Failed to read %s, no side - effect on driver running\n", + tas_dev->regbin_binaryname); + ret = -1; + goto out; + } + buf = (unsigned char *)pFW->data; + + dev_info(tas_dev->dev, "tasdev: regbin_ready start\n"); + fw_hdr->img_sz = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + if (fw_hdr->img_sz != pFW->size) { + dev_err(tas_dev->dev, + "File size not match, %d %u", (int)pFW->size, + fw_hdr->img_sz); + ret = -1; + goto out; + } + + fw_hdr->checksum = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + fw_hdr->binary_version_num = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + if (fw_hdr->binary_version_num < 0x103) { + dev_err(tas_dev->dev, + "File version 0x%04x is too low", + fw_hdr->binary_version_num); + ret = -1; + goto out; + } + offset += 4; + fw_hdr->drv_fw_version = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + fw_hdr->timestamp = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + fw_hdr->plat_type = buf[offset]; + offset += 1; + fw_hdr->dev_family = buf[offset]; + offset += 1; + fw_hdr->reserve = buf[offset]; + offset += 1; + fw_hdr->ndev = buf[offset]; + offset += 1; + if (fw_hdr->ndev != tas_dev->ndev) { + dev_err(tas_dev->dev, + "ndev(%u) from Regbin and ndev(%u) from DTS does not match\n", + fw_hdr->ndev, + tas_dev->ndev); + ret = -1; + goto out; + } + if (offset + TASDEVICE_DEVICE_SUM > fw_hdr->img_sz) { + dev_err(tas_dev->dev, + "regbin_ready: Out of Memory!\n"); + ret = -1; + goto out; + } + + for (i = 0; i < TASDEVICE_DEVICE_SUM; i++, offset++) + fw_hdr->devs[i] = buf[offset]; + + fw_hdr->nconfig = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + dev_info(tas_dev->dev, "nconfig = %u\n", fw_hdr->nconfig); + for (i = 0; i < TASDEVICE_CONFIG_SUM; i++) { + fw_hdr->config_size[i] = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + total_config_sz += fw_hdr->config_size[i]; + } + dev_info(tas_dev->dev, + "img_sz = %u total_config_sz = %u offset = %d\n", + fw_hdr->img_sz, total_config_sz, offset); + if (fw_hdr->img_sz - total_config_sz != (unsigned int)offset) { + dev_err(tas_dev->dev, "Bin file error!\n"); + ret = -1; + goto out; + } + cfg_info = kcalloc(fw_hdr->nconfig, + sizeof(struct tasdevice_config_info *), + GFP_KERNEL); + + if (!cfg_info) { + ret = -1; + dev_err(tas_dev->dev, "nconfig Memory alloc failed!\n"); + goto out; + } + regbin->cfg_info = cfg_info; + regbin->ncfgs = 0; + for (i = 0; i < (int)fw_hdr->nconfig; i++) { + cfg_info[i] = tasdevice_add_config(pContext, &buf[offset], + fw_hdr->config_size[i]); + if (!cfg_info[i]) { + ret = -1; + dev_err(tas_dev->dev, + "add_config Memory alloc failed!\n"); + break; + } + offset += (int)fw_hdr->config_size[i]; + regbin->ncfgs += 1; + } + tasdevice_create_controls(tas_dev); + + tasdevice_dsp_remove(tas_dev); + tasdevice_calbin_remove(tas_dev); + tas_dev->fw_state = TASDEVICE_DSP_FW_PENDING; + scnprintf(tas_dev->dsp_binaryname, 64, "%s_dsp.bin", + tas_dev->dev_name); + ret = request_firmware(&fw_entry, tas_dev->dsp_binaryname, + tas_dev->dev); + if (!ret) { + ret = tasdevice_dspfw_ready(fw_entry, tas_dev); + release_firmware(fw_entry); + fw_entry = NULL; + } else { + tas_dev->fw_state = TASDEVICE_DSP_FW_FAIL; + dev_err(tas_dev->dev, "%s: load %s error\n", __func__, + tas_dev->dsp_binaryname); + goto out; + } + tasdevice_dsp_create_control(tas_dev); + + tas_dev->fw_state = TASDEVICE_DSP_FW_ALL_OK; + tas_dev->mbCalibrationLoaded = true; + for (i = 0; i < tas_dev->ndev; i++) { + scnprintf(tas_dev->cal_binaryname[i], 64, "%s_cal_0x%02x.bin", + tas_dev->dev_name, tas_dev->tasdevice[i].mnDevAddr); + ret = tas2781_load_calibration(tas_dev, + tas_dev->cal_binaryname[i], i); + if (ret != 0) { + dev_err(tas_dev->dev, + "%s: load %s error, no-side effect for playback\n", + __func__, + tas_dev->cal_binaryname[i]); + ret = 0; + tas_dev->mbCalibrationLoaded = false; + } + } + +out: + mutex_unlock(&tas_dev->codec_lock); + if (pFW) + release_firmware(pFW); + dev_info(tas_dev->dev, "Firmware init complete\n"); +} + +void tasdevice_config_info_remove(void *pContext) +{ + struct tasdevice_priv *tas_dev = + (struct tasdevice_priv *) pContext; + struct tasdevice_regbin *regbin = &(tas_dev->mtRegbin); + struct tasdevice_config_info **cfg_info = regbin->cfg_info; + int i = 0, j = 0; + + mutex_lock(&tas_dev->dev_lock); + if (cfg_info) { + for (i = 0; i < regbin->ncfgs; i++) { + if (cfg_info[i]) { + for (j = 0; j < (int)cfg_info[i]->real_nblocks; + j++) { + kfree( + cfg_info[i]->blk_data[j]->regdata); + kfree(cfg_info[i]->blk_data[j]); + } + kfree(cfg_info[i]->blk_data); + kfree(cfg_info[i]); + } + } + kfree(cfg_info); + } + mutex_unlock(&tas_dev->dev_lock); +} + +static int tasdevice_dac_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *codec = snd_soc_dapm_to_component(w->dapm); + struct tasdevice_priv *tas_dev = snd_soc_component_get_drvdata(codec); + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + dev_info(tas_dev->dev, "SND_SOC_DAPM_POST_PMU\n"); + break; + case SND_SOC_DAPM_PRE_PMD: + dev_info(tas_dev->dev, "SND_SOC_DAPM_PRE_PMD\n"); + break; + } + + return 0; +} + +static const struct snd_soc_dapm_widget tasdevice_dapm_widgets[] = { + SND_SOC_DAPM_AIF_IN("ASI", "ASI Playback", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_OUT("ASI OUT", "ASI Capture", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_DAC_E("DAC", NULL, SND_SOC_NOPM, 0, 0, + tasdevice_dac_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_OUTPUT("OUT"), + SND_SOC_DAPM_INPUT("DMIC"), + SND_SOC_DAPM_SIGGEN("VMON"), + SND_SOC_DAPM_SIGGEN("IMON") +}; + +static const struct snd_soc_dapm_route tasdevice_audio_map[] = { + {"DAC", NULL, "ASI"}, + {"OUT", NULL, "DAC"}, + {"ASI OUT", NULL, "DMIC"} +}; + +static int tasdevice_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_component *codec = dai->component; + struct tasdevice_priv *tas_dev = snd_soc_component_get_drvdata(codec); + int ret = 0; + + if (tas_dev->fw_state != TASDEVICE_DSP_FW_ALL_OK) { + dev_err(tas_dev->dev, "DSP bin file not loaded\n"); + ret = -EINVAL; + } + return ret; +} + +static int tasdevice_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) +{ + struct tasdevice_priv *tas_dev = snd_soc_dai_get_drvdata(dai); + unsigned int fsrate; + unsigned int slot_width; + int bclk_rate; + int rc = 0; + + dev_info(tas_dev->dev, "%s: %s\n", + __func__, substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? + "Playback":"Capture"); + + fsrate = params_rate(params); + switch (fsrate) { + case 48000: + break; + case 44100: + break; + default: + dev_err(tas_dev->dev, + "%s: incorrect sample rate = %u\n", + __func__, fsrate); + rc = -EINVAL; + goto out; + } + + slot_width = params_width(params); + switch (slot_width) { + case 16: + break; + case 20: + break; + case 24: + break; + case 32: + break; + default: + dev_err(tas_dev->dev, + "%s: incorrect slot width = %u\n", + __func__, slot_width); + rc = -EINVAL; + goto out; + } + + bclk_rate = snd_soc_params_to_bclk(params); + if (bclk_rate < 0) { + dev_err(tas_dev->dev, + "%s: incorrect bclk rate = %d\n", + __func__, bclk_rate); + rc = bclk_rate; + goto out; + } + dev_info(tas_dev->dev, + "%s: BCLK rate = %d Channel = %d Sample rate = %u slot width = %u\n", + __func__, bclk_rate, params_channels(params), + fsrate, slot_width); +out: + return rc; +} + +static void tasdevice_enable_irq( + struct tasdevice_priv *tas_dev, bool enable) +{ + struct irq_desc *desc = NULL; + + if (enable) { + if (tas_dev->mIrqInfo.mb_irq_enable) + return; + if (gpio_is_valid(tas_dev->mIrqInfo.mn_irq_gpio)) { + desc = irq_to_desc(tas_dev->mIrqInfo.mn_irq); + if (desc && desc->depth > 0) + enable_irq(tas_dev->mIrqInfo.mn_irq); + else + dev_info(tas_dev->dev, + "### irq already enabled\n"); + } + tas_dev->mIrqInfo.mb_irq_enable = true; + } else { + if (gpio_is_valid(tas_dev->mIrqInfo.mn_irq_gpio)) + disable_irq_nosync(tas_dev->mIrqInfo.mn_irq); + tas_dev->mIrqInfo.mb_irq_enable = false; + } +} + +static int tasdevice_set_dai_sysclk(struct snd_soc_dai *codec_dai, + int clk_id, unsigned int freq, int dir) +{ + struct tasdevice_priv *tas_dev = snd_soc_dai_get_drvdata(codec_dai); + + dev_info(tas_dev->dev, + "%s: clk_id = %d, freq = %u, CLK direction %s\n", + __func__, clk_id, freq, + dir == TASDEVICE_CLK_DIR_OUT ? "OUT":"IN"); + + return 0; +} + +static void powercontrol_routine(struct work_struct *work) +{ + struct tasdevice_priv *tas_dev = + container_of(work, struct tasdevice_priv, + powercontrol_work.work); + struct TFirmware *pFw = NULL; + int profile_cfg_id = 0; + + mutex_lock(&tas_dev->codec_lock); + /*mnCurrentProgram != 0 is dsp mode or tuning mode*/ + if (tas_dev->mnCurrentProgram) { + /*bypass all in regbin is profile id 0*/ + profile_cfg_id = REGBIN_CONFIGID_BYPASS_ALL; + } else { + profile_cfg_id = tas_dev->mtRegbin.profile_cfg_id; + pFw = tas_dev->mpFirmware; + dev_info(tas_dev->dev, "%s: %s\n", __func__, + pFw->mpConfigurations[tas_dev->mnCurrentConfiguration] + .mpName); + tasdevice_select_tuningprm_cfg(tas_dev, + tas_dev->mnCurrentProgram, + tas_dev->mnCurrentConfiguration, + profile_cfg_id); + if (tas_dev->tas2781_set_global != NULL) + tas_dev->tas2781_set_global(tas_dev); + } + tasdevice_select_cfg_blk(tas_dev, profile_cfg_id, + TASDEVICE_BIN_BLK_PRE_POWER_UP); + + if (tas_dev->chip_id != GENERAL_AUDEV) + tasdevice_enable_irq(tas_dev, true); + mutex_unlock(&tas_dev->codec_lock); +} + +static void tasdevice_set_power_state( + struct tasdevice_priv *tas_dev, int state) +{ + switch (state) { + case 0: + schedule_delayed_work(&tas_dev->powercontrol_work, + msecs_to_jiffies(20)); + break; + default: + if (!(tas_dev->pstream || tas_dev->cstream)) { + if (tas_dev->chip_id != GENERAL_AUDEV) + tasdevice_enable_irq(tas_dev, false); + tasdevice_select_cfg_blk(tas_dev, + tas_dev->mtRegbin.profile_cfg_id, + TASDEVICE_BIN_BLK_PRE_SHUTDOWN); + } + break; + } +} + +static int tasdevice_mute(struct snd_soc_dai *dai, int mute, int stream) +{ + struct snd_soc_component *codec = dai->component; + struct tasdevice_priv *tas_dev = snd_soc_component_get_drvdata(codec); + + /* Codec Lock Hold */ + mutex_lock(&tas_dev->codec_lock); + + if (mute) { + /* stop DSP only when both playback and capture streams + * are deactivated + */ + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + tas_dev->pstream = 0; + else + tas_dev->cstream = 0; + if (tas_dev->pstream != 0 || tas_dev->cstream != 0) + goto out; + } else { + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + tas_dev->pstream = 1; + else + tas_dev->cstream = 1; + + } + tasdevice_set_power_state(tas_dev, mute); +out: + /* Codec Lock Release*/ + mutex_unlock(&tas_dev->codec_lock); + + return 0; +} + +static const struct snd_soc_dai_ops tasdevice_dai_ops = { + .startup = tasdevice_startup, + .hw_params = tasdevice_hw_params, + .set_sysclk = tasdevice_set_dai_sysclk, + .mute_stream = tasdevice_mute, +}; + +static struct snd_soc_dai_driver tasdevice_dai_driver[] = { + { + .name = "tas2781_codec", + .id = 0, + .playback = { + .stream_name = "Playback", + .channels_min = 1, + .channels_max = 4, + .rates = TASDEVICE_RATES, + .formats = TASDEVICE_FORMATS, + }, + .capture = { + .stream_name = "Capture", + .channels_min = 1, + .channels_max = 4, + .rates = TASDEVICE_RATES, + .formats = TASDEVICE_FORMATS, + }, + .ops = &tasdevice_dai_ops, + .symmetric_rate = 1, + }, +}; + +static int tasdevice_codec_probe( + struct snd_soc_component *codec) +{ + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + int ret; + + /* Codec Lock Hold */ + mutex_lock(&tas_dev->codec_lock); + + tas_dev->codec = codec; + scnprintf(tas_dev->regbin_binaryname, 64, "%s_regbin.bin", + tas_dev->dev_name); + ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, + tas_dev->regbin_binaryname, tas_dev->dev, GFP_KERNEL, tas_dev, + tasdevice_regbin_ready); + if (ret) + dev_err(tas_dev->dev, + "%s: request_firmware_nowait error:0x%08x\n", + __func__, ret); + + /* Codec Lock Release*/ + mutex_unlock(&tas_dev->codec_lock); + + if (tas_dev->tas2781_reset != NULL) + tas_dev->tas2781_reset(tas_dev); + if (tas_dev->tas2781_set_global != NULL) + tas_dev->tas2781_set_global(tas_dev); + + return ret; +} + +static void tasdevice_deinit(void *pContext) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + + tasdevice_config_info_remove(tas_dev); + tasdevice_dsp_remove(tas_dev); + tasdevice_calbin_remove(tas_dev); + tas_dev->fw_state = TASDEVICE_DSP_FW_PENDING; +} + +static void tasdevice_codec_remove( + struct snd_soc_component *codec) +{ + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + /* Codec Lock Hold */ + mutex_lock(&tas_dev->codec_lock); + tasdevice_deinit(tas_dev); + /* Codec Lock Release*/ + mutex_unlock(&tas_dev->codec_lock); + + return; + +} + +static const struct snd_soc_component_driver + soc_codec_driver_tasdevice = { + .probe = tasdevice_codec_probe, + .remove = tasdevice_codec_remove, + .controls = tas2781_snd_controls, + .num_controls = ARRAY_SIZE(tas2781_snd_controls), + .dapm_widgets = tasdevice_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(tasdevice_dapm_widgets), + .dapm_routes = tasdevice_audio_map, + .num_dapm_routes = ARRAY_SIZE(tasdevice_audio_map), + .idle_bias_on = 1, + .endianness = 1, +}; + +static void irq_work_routine(struct work_struct *pWork) +{ + struct tasdevice_priv *tas_dev = + container_of(pWork, struct tasdevice_priv, + mIrqInfo.irq_work.work); + + mutex_lock(&tas_dev->codec_lock); + if (tas_dev->mb_runtime_suspend) { + dev_info(tas_dev->dev, "%s, Runtime Suspended\n", __func__); + goto end; + } + /*Logical Layer IRQ function, return is ignored*/ + if (tas_dev->irq_work_func) + tas_dev->irq_work_func(tas_dev); + else + dev_info(tas_dev->dev, + "%s, irq_work_func is NULL\n", __func__); +end: + mutex_unlock(&tas_dev->codec_lock); +} + +static void tas2781_irq_work_func(struct tasdevice_priv *tas_dev) +{ + int rc = 0; + unsigned int reg_val = 0, array_size = 0, i = 0, ndev = 0; + unsigned int int_reg_array[] = { + TAS2781_REG_INT_LTCH0, + TAS2781_REG_INT_LTCH1, + TAS2781_REG_INT_LTCH1_0, + TAS2781_REG_INT_LTCH2, + TAS2781_REG_INT_LTCH3, + TAS2781_REG_INT_LTCH4}; + + tasdevice_enable_irq(tas_dev, false); + + array_size = ARRAY_SIZE(int_reg_array); + + for (ndev = 0; ndev < tas_dev->ndev; ndev++) { + for (i = 0; i < array_size; i++) { + rc = tasdevice_dev_read(tas_dev, + ndev, int_reg_array[i], &reg_val); + if (!rc) + dev_info(tas_dev->dev, + "INT STATUS REG 0x%04x=0x%02x\n", + int_reg_array[i], reg_val); + else + dev_err(tas_dev->dev, + "Read Reg 0x%04x error(rc=%d)\n", + int_reg_array[i], rc); + } + } + +} + +static irqreturn_t tasdevice_irq_handler(int irq, + void *dev_id) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *)dev_id; +; + /* get IRQ status after 100 ms */ + schedule_delayed_work(&tas_dev->mIrqInfo.irq_work, + msecs_to_jiffies(100)); + return IRQ_HANDLED; +} + +int tasdevice_parse_dt(struct tasdevice_priv *tas_dev) +{ + struct device_node *np = tas_dev->dev->of_node; + int rc = 0, i = 0, ndev = 0; + char buf[32]; + + + for (i = 0, ndev = 0; i < MaxChn; i++) { + rc = of_property_read_u32(np, dts_dev_addr_tag[i], + &(tas_dev->tasdevice[ndev].mnDevAddr)); + if (rc) + dev_err(tas_dev->dev, + "Looking up %s property in node %s failed %d\n", + dts_dev_addr_tag[i], + np->full_name, rc); + else { + dev_dbg(tas_dev->dev, "%s=0x%02x", dts_dev_addr_tag[i], + tas_dev->tasdevice[ndev].mnDevAddr); + ndev++; + } + } + + rc = of_property_read_u32(np, dts_glb_addr_tag, + &(tas_dev->glb_addr.mnDevAddr)); + if (rc) { + dev_err(tas_dev->dev, + "Looking up %s property in node %s failed %d\n", + dts_glb_addr_tag, np->full_name, rc); + tas_dev->glb_addr.mnDevAddr = 0; + } + tas_dev->ndev = (ndev == 0) ? 1 : ndev; + + for (i = 0, ndev = 0; i < tas_dev->ndev; i++) { + scnprintf(buf, sizeof(buf), dts_rst_tag, "reset", i); + tas_dev->tasdevice[ndev].mnResetGpio = of_get_named_gpio(np, + buf, 0); + if (gpio_is_valid(tas_dev->tasdevice[ndev].mnResetGpio)) { + rc = gpio_request(tas_dev->tasdevice[ndev].mnResetGpio, + buf); + if (!rc) { + gpio_direction_output( + tas_dev->tasdevice[ndev].mnResetGpio, + 1); + dev_info(tas_dev->dev, "%s = %d", buf, + tas_dev->tasdevice[ndev].mnResetGpio); + ndev++; + } else + dev_err(tas_dev->dev, + "%s: Failed to request dev[%d] gpio %d\n", + __func__, ndev, + tas_dev->tasdevice[ndev].mnResetGpio); + } else + dev_err(tas_dev->dev, + "Looking up %s property in node %s failed %d\n", + buf, np->full_name, + tas_dev->tasdevice[ndev].mnResetGpio); + } + strcpy(tas_dev->dev_name, tasdevice_id[tas_dev->chip_id].name); + if (tas_dev->chip_id != GENERAL_AUDEV) { + tas_dev->mIrqInfo.mn_irq_gpio = of_get_named_gpio(np, + "ti,irq-gpio", 0); + if (gpio_is_valid(tas_dev->mIrqInfo.mn_irq_gpio)) { + dev_dbg(tas_dev->dev, "irq-gpio = %d", + tas_dev->mIrqInfo.mn_irq_gpio); + INIT_DELAYED_WORK(&tas_dev->mIrqInfo.irq_work, + irq_work_routine); + + rc = gpio_request(tas_dev->mIrqInfo.mn_irq_gpio, + "AUDEV-IRQ"); + if (!rc) { + gpio_direction_input( + tas_dev->mIrqInfo.mn_irq_gpio); + + tas_dev->mIrqInfo.mn_irq = + gpio_to_irq( + tas_dev->mIrqInfo.mn_irq_gpio); + dev_info(tas_dev->dev, + "irq = %d\n", + tas_dev->mIrqInfo.mn_irq); + + rc = request_threaded_irq( + tas_dev->mIrqInfo.mn_irq, + tasdevice_irq_handler, + NULL, IRQF_TRIGGER_FALLING| + IRQF_ONESHOT, + SMARTAMP_MODULE_NAME, tas_dev); + if (!rc) + disable_irq_nosync( + tas_dev->mIrqInfo.mn_irq); + else + dev_err(tas_dev->dev, + "request_irq failed, %d\n", + rc); + } else + dev_err(tas_dev->dev, + "%s: GPIO %d request error\n", + __func__, + tas_dev->mIrqInfo.mn_irq_gpio); + } else + dev_err(tas_dev->dev, + "Looking up irq-gpio property in node %s failed %d\n", + np->full_name, + tas_dev->mIrqInfo.mn_irq_gpio); + } + + if (tas_dev->chip_id != GENERAL_AUDEV && rc == 0) { + if (tas_dev->chip_id == TAS2781) + tas_dev->irq_work_func = tas2781_irq_work_func; + else + dev_info(tas_dev->dev, "%s: No match irq_work_func\n", + __func__); + } + + return 0; +} + +static int tasdevice_regmap_write( + struct tasdevice_priv *tas_dev, + unsigned int reg, unsigned int value) +{ + int nResult = 0; + int retry_count = TASDEVICE_RETRY_COUNT; + + while (retry_count--) { + nResult = regmap_write(tas_dev->regmap, reg, + value); + if (nResult >= 0) + break; + usleep_range(5000, 5050); + } + if (retry_count == -1) + return TASDEVICE_ERROR_FAILED; + else + return 0; +} + +static int tasdevice_regmap_bulk_write( + struct tasdevice_priv *tas_dev, unsigned int reg, + unsigned char *pData, unsigned int nLength) +{ + int nResult = 0; + int retry_count = TASDEVICE_RETRY_COUNT; + + while (retry_count--) { + nResult = regmap_bulk_write(tas_dev->regmap, reg, + pData, nLength); + if (nResult >= 0) + break; + usleep_range(5000, 5050); + } + if (retry_count == -1) + return TASDEVICE_ERROR_FAILED; + else + return 0; +} + +static int tasdevice_regmap_read( + struct tasdevice_priv *tas_dev, + unsigned int reg, unsigned int *value) +{ + int nResult = 0; + int retry_count = TASDEVICE_RETRY_COUNT; + + while (retry_count--) { + nResult = regmap_read(tas_dev->regmap, reg, + value); + if (nResult >= 0) + break; + usleep_range(5000, 5050); + } + if (retry_count == -1) + return TASDEVICE_ERROR_FAILED; + else + return 0; +} + +static int tasdevice_regmap_bulk_read( + struct tasdevice_priv *tas_dev, unsigned int reg, + unsigned char *pData, unsigned int nLength) +{ + int nResult = 0; + int retry_count = TASDEVICE_RETRY_COUNT; + + while (retry_count--) { + nResult = regmap_bulk_read(tas_dev->regmap, reg, + pData, nLength); + if (nResult >= 0) + break; + usleep_range(5000, 5050); + } + if (retry_count == -1) + return TASDEVICE_ERROR_FAILED; + else + return 0; +} + +static int tasdevice_regmap_update_bits( + struct tasdevice_priv *tas_dev, unsigned int reg, + unsigned int mask, unsigned int value) +{ + int nResult = 0; + int retry_count = TASDEVICE_RETRY_COUNT; + + while (retry_count--) { + nResult = regmap_update_bits(tas_dev->regmap, reg, + mask, value); + if (nResult >= 0) + break; + usleep_range(5000, 5050); + } + if (retry_count == -1) + return TASDEVICE_ERROR_FAILED; + else + return 0; +} + +static int tasdevice_change_chn_book_page( + struct tasdevice_priv *tas_dev, enum channel chn, + int book, int page) +{ + int n_result = 0; + struct i2c_client *pClient = + (struct i2c_client *)tas_dev->client; + + if (chn < tas_dev->ndev) { + if (tas_dev->glb_addr.ref_cnt != 0) { + tas_dev->glb_addr.ref_cnt = 0; + tas_dev->glb_addr.mnBkPg.mnBook = -1; + tas_dev->glb_addr.mnBkPg.mnPage = -1; + } + pClient->addr = tas_dev->tasdevice[chn].mnDevAddr; + if (tas_dev->tasdevice[chn].mnBkPg.mnBook != book) { + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_PAGE, 0); + if (n_result < 0) { + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + goto out; + } + tas_dev->tasdevice[chn].mnBkPg.mnPage = 0; + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_REG, book); + if (n_result < 0) { + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + goto out; + } + tas_dev->tasdevice[chn].mnBkPg.mnBook = book; + } + + if (tas_dev->tasdevice[chn].mnBkPg.mnPage != page) { + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_PAGE, page); + if (n_result < 0) { + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + goto out; + } + tas_dev->tasdevice[chn].mnBkPg.mnPage = page; + } + } else if (chn == tas_dev->ndev) { + int i = 0; + + if (tas_dev->glb_addr.ref_cnt == 0) + for (i = 0; i < tas_dev->ndev; i++) { + tas_dev->tasdevice[i].mnBkPg.mnBook + = -1; + tas_dev->tasdevice[i].mnBkPg.mnPage + = -1; + } + pClient->addr = tas_dev->glb_addr.mnDevAddr; + if (tas_dev->glb_addr.mnBkPg.mnBook != book) { + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_PAGE, 0); + if (n_result < 0) { + dev_err(tas_dev->dev, + "%s, 0ERROR, E=%d\n", + __func__, n_result); + goto out; + } + tas_dev->glb_addr.mnBkPg.mnPage = 0; + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_REG, book); + if (n_result < 0) { + dev_err(tas_dev->dev, + "%s, book%xERROR, E=%d\n", + __func__, book, n_result); + goto out; + } + tas_dev->glb_addr.mnBkPg.mnBook = book; + } + + if (tas_dev->glb_addr.mnBkPg.mnPage != page) { + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_PAGE, page); + if (n_result < 0) { + dev_err(tas_dev->dev, + "%s, page%xERROR, E=%d\n", + __func__, page, n_result); + goto out; + } + tas_dev->glb_addr.mnBkPg.mnPage = page; + } + tas_dev->glb_addr.ref_cnt++; + } else + dev_err(tas_dev->dev, + "%s, ERROR, no such channel(%d)\n", + __func__, chn); + +out: + return n_result; +} + +int tasdevice_dev_read(struct tasdevice_priv *tas_dev, + enum channel chn, unsigned int reg, unsigned int *pValue) +{ + int n_result = 0; + + mutex_lock(&tas_dev->dev_lock); + if (chn < tas_dev->ndev) { + n_result = tasdevice_change_chn_book_page(tas_dev, chn, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg)); + if (n_result < 0) + goto out; + + n_result = tasdevice_regmap_read(tas_dev, + TASDEVICE_PAGE_REG(reg), pValue); + if (n_result < 0) + dev_err(tas_dev->dev, "%s, ERROR,E=%d\n", + __func__, n_result); + else + dev_dbg(tas_dev->dev, + "%s: chn:0x%02x:BOOK:PAGE:REG 0x%02x:0x%02x:0x%02x, 0x%02x\n", + __func__, + tas_dev->tasdevice[chn].mnDevAddr, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg), + TASDEVICE_PAGE_REG(reg), *pValue); + } else { + + dev_err(tas_dev->dev, "%s, ERROR, no such channel(%d)\n", + __func__, chn); + } + +out: + mutex_unlock(&tas_dev->dev_lock); + return n_result; +} + +int tasdevice_dev_write(struct tasdevice_priv *tas_dev, + enum channel chn, unsigned int reg, unsigned int value) +{ + int n_result = 0; + + mutex_lock(&tas_dev->dev_lock); + if (chn <= tas_dev->ndev) { + n_result = tasdevice_change_chn_book_page(tas_dev, chn, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg)); + if (n_result < 0) + goto out; + + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_PAGE_REG(reg), value); + if (n_result < 0) + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + else { + dev_dbg(tas_dev->dev, + "%s: %s-0x%02x:BOOK:PAGE:REG 0x%02x:0x%02x:0x%02x, VAL: 0x%02x\n", + __func__, (chn == tas_dev->ndev)?"glb":"chn", + (chn == tas_dev->ndev) ? + tas_dev->glb_addr.mnDevAddr + : tas_dev->tasdevice[chn].mnDevAddr, + TASDEVICE_BOOK_ID(reg), + TASDEVICE_PAGE_ID(reg), + TASDEVICE_PAGE_REG(reg), value); + } + } else + dev_err(tas_dev->dev, "%s, ERROR, no such channel(%d)\n", + __func__, chn); +out: + mutex_unlock(&tas_dev->dev_lock); + return n_result; +} + +int tasdevice_dev_bulk_write( + struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned char *p_data, + unsigned int n_length) +{ + int n_result = 0; + + mutex_lock(&tas_dev->dev_lock); + if (chn <= tas_dev->ndev) { + n_result = tasdevice_change_chn_book_page(tas_dev, chn, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg)); + if (n_result < 0) + goto out; + + n_result = tasdevice_regmap_bulk_write(tas_dev, + TASDEVICE_PAGE_REG(reg), p_data, n_length); + if (n_result < 0) + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + else { + dev_dbg(tas_dev->dev, + "%s: %s-0x%02x:BOOK:PAGE:REG 0x%02x:0x%02x: 0x%02x, len: 0x%02x\n", + __func__, + (chn == tas_dev->ndev)?"glb":"chn", + (chn == tas_dev->ndev) ? + tas_dev->glb_addr.mnDevAddr + : tas_dev->tasdevice[chn].mnDevAddr, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg), + TASDEVICE_PAGE_REG(reg), n_length); + } + } else + dev_err(tas_dev->dev, "%s, ERROR, no such channel(%d)\n", + __func__, chn); +out: + mutex_unlock(&tas_dev->dev_lock); + return n_result; +} + +int tasdevice_dev_bulk_read(struct tasdevice_priv *tas_dev, + enum channel chn, unsigned int reg, unsigned char *p_data, + unsigned int n_length) +{ + int n_result = 0; + + mutex_lock(&tas_dev->dev_lock); + if (chn < tas_dev->ndev) { + n_result = tasdevice_change_chn_book_page(tas_dev, chn, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg)); + if (n_result < 0) + goto out; + + n_result = tasdevice_regmap_bulk_read(tas_dev, + TASDEVICE_PAGE_REG(reg), p_data, n_length); + if (n_result < 0) + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + else + dev_dbg(tas_dev->dev, + "%s: chn0x%02x:BOOK:PAGE:REG 0x%02x:0x%02x: 0x%02x, len: 0x%02x\n", + __func__, + tas_dev->tasdevice[chn].mnDevAddr, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg), + TASDEVICE_PAGE_REG(reg), n_length); + } else + dev_err(tas_dev->dev, "%s, ERROR, no such channel(%d)\n", + __func__, chn); + +out: + mutex_unlock(&tas_dev->dev_lock); + return n_result; +} + +int tasdevice_dev_update_bits( + struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned int mask, unsigned int value) +{ + int n_result = 0; + struct i2c_client *pClient = + (struct i2c_client *)tas_dev->client; + + mutex_lock(&tas_dev->dev_lock); + if (chn < tas_dev->ndev) { + n_result = tasdevice_change_chn_book_page(tas_dev, chn, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg)); + if (n_result < 0) + goto out; + pClient->addr = tas_dev->tasdevice[chn].mnDevAddr; + n_result = tasdevice_regmap_update_bits(tas_dev, + TASDEVICE_PAGE_REG(reg), mask, value); + if (n_result < 0) + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + else + dev_dbg(tas_dev->dev, + "%s: chn0x%02x:BOOK:PAGE:REG 0x%02x:0x%02x:0x%02x, mask: 0x%02x, val: 0x%02x\n", + __func__, tas_dev->tasdevice[chn].mnDevAddr, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg), + TASDEVICE_PAGE_REG(reg), mask, value); + } else { + dev_err(tas_dev->dev, "%s, ERROR, no such channel(%d)\n", + __func__, chn); + n_result = -1; + } + +out: + mutex_unlock(&tas_dev->dev_lock); + return n_result; +} + +static void tas2781_reset(struct tasdevice_priv *tas_dev) +{ + int ret = 0; + int i = 0; + + for (; i < tas_dev->ndev; i++) { + ret = tasdevice_dev_write(tas_dev, i, + TAS2871_REG_SWRESET, + TAS2871_REG_SWRESET_RESET); + if (ret < 0) { + dev_err(tas_dev->dev, "%s: chn %d reset fail, %d\n", + __func__, i, ret); + continue; + } + } + usleep_range(1000, 1050); +} + +static void tas2781_set_global(struct tasdevice_priv *tas_dev) +{ + int i = 0; + int ret = 0; + + for (; i < tas_dev->ndev; i++) { + ret = tasdevice_dev_update_bits(tas_dev, i, + TAS2871_MISC_CFG2, + TAS2871_GLOBAL_MASK, 0x02); + if (ret < 0) { + dev_err(tas_dev->dev, "%s: chn %d set global fail, %d\n", + __func__, i, ret); + continue; + } + } +} + +static int tasdevice_init(struct tasdevice_priv *tas_dev) +{ + int nResult = 0, i = 0; + + tas_dev->mnCurrentProgram = -1; + tas_dev->mnCurrentConfiguration = -1; + + for (i = 0; i < tas_dev->ndev; i++) { + tas_dev->tasdevice[i].mnBkPg.mnBook = -1; + tas_dev->tasdevice[i].mnBkPg.mnPage = -1; + tas_dev->tasdevice[i].mnCurrentProgram = -1; + tas_dev->tasdevice[i].mnCurrentConfiguration = -1; + } + mutex_init(&tas_dev->dev_lock); + tas_dev->read = tasdevice_dev_read; + tas_dev->write = tasdevice_dev_write; + tas_dev->bulk_read = tasdevice_dev_bulk_read; + tas_dev->bulk_write = tasdevice_dev_bulk_write; + tas_dev->set_calibration = tas2781_set_calibration; + tas_dev->tas2781_reset = tas2781_reset; + if (tas_dev->glb_addr.mnDevAddr != 0 + && tas_dev->glb_addr.mnDevAddr < 0x7F) + tas_dev->tas2781_set_global = tas2781_set_global; + dev_set_drvdata(tas_dev->dev, tas_dev); + + INIT_DELAYED_WORK(&tas_dev->powercontrol_work, + powercontrol_routine); + + mutex_init(&tas_dev->codec_lock); + nResult = devm_snd_soc_register_component(tas_dev->dev, + &soc_codec_driver_tasdevice, + tasdevice_dai_driver, ARRAY_SIZE(tasdevice_dai_driver)); + if (nResult) + dev_err(tas_dev->dev, "%s: codec register error:0x%08x\n", + __func__, nResult); + + INIT_DELAYED_WORK(&tas_dev->mIrqInfo.irq_work, irq_work_routine); + tas_dev->mIrqInfo.mb_irq_enable = false; + + dev_info(tas_dev->dev, "i2c register success\n"); + + return nResult; +} + +void tasdevice_remove(struct tasdevice_priv *tas_dev) +{ + int i = 0; + + for (i = 0; i < tas_dev->mtRstGPIOs.ndev; i++) { + if (gpio_is_valid(tas_dev->mtRstGPIOs.mnResetGpio[i])) + gpio_free(tas_dev->mtRstGPIOs.mnResetGpio[i]); + } + + for (i = 0; i < tas_dev->ndev; i++) { + if (gpio_is_valid(tas_dev->tasdevice[i].mnIRQGPIO)) + gpio_free(tas_dev->tasdevice[i].mnIRQGPIO); + } + + if (delayed_work_pending(&tas_dev->mIrqInfo.irq_work)) { + dev_info(tas_dev->dev, "cancel IRQ work\n"); + cancel_delayed_work(&tas_dev->mIrqInfo.irq_work); + } + cancel_delayed_work_sync(&tas_dev->mIrqInfo.irq_work); + + mutex_destroy(&tas_dev->dev_lock); + mutex_destroy(&tas_dev->codec_lock); + snd_soc_unregister_component(tas_dev->dev); +} + +static int tasdevice_pm_suspend(struct device *dev) +{ + struct tasdevice_priv *tas_dev = dev_get_drvdata(dev); + + if (!tas_dev) { + dev_err(tas_dev->dev, "%s: drvdata is NULL\n", __func__); + return -EINVAL; + } + + mutex_lock(&tas_dev->codec_lock); + + tas_dev->mb_runtime_suspend = true; + + if (tas_dev->chip_id != GENERAL_AUDEV) { + if (delayed_work_pending(&tas_dev->mIrqInfo.irq_work)) { + dev_dbg(tas_dev->dev, "cancel IRQ work\n"); + cancel_delayed_work_sync(&tas_dev->mIrqInfo.irq_work); + } + } + mutex_unlock(&tas_dev->codec_lock); + return 0; +} + +static int tasdevice_pm_resume(struct device *dev) +{ + struct tasdevice_priv *tas_dev = dev_get_drvdata(dev); + + if (!tas_dev) + return -EINVAL; + + mutex_lock(&tas_dev->codec_lock); + tas_dev->mb_runtime_suspend = false; + mutex_unlock(&tas_dev->codec_lock); + return 0; +} + +const struct dev_pm_ops tasdevice_pm_ops = { + .suspend = tasdevice_pm_suspend, + .resume = tasdevice_pm_resume +}; + +static int tasdevice_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct tasdevice_priv *tas_dev = NULL; + int ret = 0; + + if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C)) { + dev_err(&i2c->dev, + "%s: I2C check failed\n", __func__); + ret = -ENODEV; + goto out; + } + + tas_dev = devm_kzalloc(&i2c->dev, sizeof(*tas_dev), GFP_KERNEL); + if (!tas_dev) { + ret = -ENOMEM; + goto out; + } + tas_dev->dev = &i2c->dev; + tas_dev->client = (void *)i2c; + tas_dev->chip_id = id->driver_data; + + if (i2c->dev.of_node) + ret = tasdevice_parse_dt(tas_dev); + else { + dev_err(tas_dev->dev, "No DTS info\n"); + goto out; + } + + tas_dev->regmap = devm_regmap_init_i2c(i2c, + &tasdevice_regmap); + if (IS_ERR(tas_dev->regmap)) { + ret = PTR_ERR(tas_dev->regmap); + dev_err(&i2c->dev, "Failed to allocate register map: %d\n", + ret); + return ret; + } + ret = tasdevice_init(tas_dev); + +out: + if (ret < 0 && tas_dev != NULL) + tasdevice_remove(tas_dev); + return ret; + +} + +static void tasdevice_i2c_remove(struct i2c_client *pClient) +{ + struct tasdevice_priv *tas_dev = i2c_get_clientdata(pClient); + + if (tas_dev) + tasdevice_remove(tas_dev); + +} + +static struct i2c_driver tasdevice_i2c_driver = { + .driver = { + .name = "tas2781-codec", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(tasdevice_of_match), + .pm = &tasdevice_pm_ops, + }, + .probe = tasdevice_i2c_probe, + .remove = tasdevice_i2c_remove, + .id_table = tasdevice_id, +}; + +module_i2c_driver(tasdevice_i2c_driver); + +MODULE_AUTHOR("Shenghao Ding <shenghao-ding(a)ti.com>"); +MODULE_AUTHOR("Kevin Lu <kevin-lu(a)ti.com>"); +MODULE_DESCRIPTION("ASoC TAS2781 Driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/tas2781.h b/sound/soc/codecs/tas2781.h new file mode 100644 index 000000000..db4ec752b --- /dev/null +++ b/sound/soc/codecs/tas2781.h @@ -0,0 +1,208 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier + * + * Copyright (C) 2022 - 2023 Texas Instruments Incorporated + * https://www.ti.com + * + * The TAS2781 driver implements a flexible and configurable register setting + * for one, two, even multiple TAS2781 chips. All the register setting are in + * a bin file. Almost no specific register setting can be found in the code. + * + * Author: Shenghao Ding <shenghao-ding(a)ti.com> + * Kevin Lu <kevin-lu(a)ti.com> + */ + +#ifndef __TAS2781_H__ +#define __TAS2781_H__ + +#include "tas2781-dsp.h" + +#define SMARTAMP_MODULE_NAME ("tas2781") +#define MAX_LENGTH (128) + +#define TASDEVICE_RETRY_COUNT (3) +#define TASDEVICE_ERROR_FAILED (-2) + +#define TASDEVICE_RATES (SNDRV_PCM_RATE_44100 |\ + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |\ + SNDRV_PCM_RATE_88200) +#define TASDEVICE_MAX_CHANNELS (8) + +#define TASDEVICE_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S24_LE | \ + SNDRV_PCM_FMTBIT_S32_LE) + +/*PAGE Control Register (available in page0 of each book) */ +#define TASDEVICE_PAGE_SELECT (0x00) +#define TASDEVICE_BOOKCTL_PAGE (0x00) +#define TASDEVICE_BOOKCTL_REG (127) +#define TASDEVICE_BOOK_ID(reg) (reg / (256 * 128)) +#define TASDEVICE_PAGE_ID(reg) ((reg % (256 * 128)) / 128) +#define TASDEVICE_PAGE_REG(reg) ((reg % (256 * 128)) % 128) +#define TASDEVICE_REG(book, page, reg) (((book * 256 * 128) + \ + (page * 128)) + reg) + + /*Software Reset */ +#define TAS2871_REG_SWRESET TASDEVICE_REG(0x0, 0X0, 0x02) +#define TAS2871_REG_SWRESET_RESET (0x1 << 0) + + /* Enable Global addresses */ +#define TAS2871_MISC_CFG2 TASDEVICE_REG(0x0, 0X0, 0x07) +#define TAS2871_GLOBAL_MASK (0x1 << 1) + +#define SMS_HTONS(a, b) ((((a)&0x00FF)<<8) | \ + ((b)&0x00FF)) +#define SMS_HTONL(a, b, c, d) ((((a)&0x000000FF)<<24) |\ + (((b)&0x000000FF)<<16) | \ + (((c)&0x000000FF)<<8) | \ + ((d)&0x000000FF)) + + /*I2C Checksum */ +#define TASDEVICE_I2CChecksum TASDEVICE_REG(0x0, 0x0, 0x7E) + + /* Volume control */ +#define TAS2781_DVC_LVL TASDEVICE_REG(0x0, 0x0, 0x1A) +#define TAS2781_AMP_LEVEL TASDEVICE_REG(0x0, 0x0, 0x03) +#define TAS2781_AMP_LEVEL_MASK GENMASK(5, 1) + +#define TASDEVICE_CMD_SING_W (0x1) +#define TASDEVICE_CMD_BURST (0x2) +#define TASDEVICE_CMD_DELAY (0x3) +#define TASDEVICE_CMD_FIELD_W (0x4) + +enum audio_device { + GENERAL_AUDEV = 0, + TAS2781 = 1, +}; + +struct smartpa_gpio_info { + unsigned char ndev; + int mnResetGpio[MaxChn]; +}; + +#define SMS_HTONS(a, b) ((((a)&0x00FF)<<8) | ((b)&0x00FF)) +#define SMS_HTONL(a, b, c, d) ((((a)&0x000000FF)<<24) | \ + (((b)&0x000000FF)<<16) | (((c)&0x000000FF)<<8) | \ + ((d)&0x000000FF)) + +struct Tbookpage { + unsigned char mnBook; + unsigned char mnPage; +}; + +struct Ttasdevice { + unsigned int mnDevAddr; + unsigned int mnErrCode; + short mnCurrentProgram; + short mnCurrentConfiguration; + short mnCurrentRegConf; + int mnIRQGPIO; + int mnResetGpio; + int mn_irq; + int PowerStatus; + bool bDSPBypass; + bool bIrq_enabled; + bool bLoading; + bool bLoaderr; + bool mbCalibrationLoaded; + struct Tbookpage mnBkPg; + struct TFirmware *mpCalFirmware; +}; + +struct global_addr { + struct Tbookpage mnBkPg; + unsigned int mnDevAddr; + int ref_cnt; +}; + +struct tas_control { + struct snd_kcontrol_new *tasdevice_profile_controls; + int nr_controls; +}; + +struct tasdevice_irqinfo { + int mn_irq_gpio; + int mn_irq; + struct delayed_work irq_work; + bool mb_irq_enable; +}; + +struct tasdevice_priv { + struct device *dev; + void *client; + struct regmap *regmap; + struct mutex codec_lock; + struct mutex dev_lock; + struct Ttasdevice tasdevice[MaxChn]; + struct TFirmware *mpFirmware; + struct tasdevice_regbin mtRegbin; + struct smartpa_gpio_info mtRstGPIOs; + struct tasdevice_irqinfo mIrqInfo; + struct tas_control tas_ctrl; + struct global_addr glb_addr; + int mnCurrentProgram; + int mnCurrentConfiguration; + unsigned int chip_id; + int (*read)(struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned int *pValue); + int (*write)(struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned int Value); + int (*bulk_read)(struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned char *pData, unsigned int len); + int (*bulk_write)(struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned char *pData, unsigned int len); + int (*set_calibration)(void *tas_dev, enum channel chl, + int calibration); + void (*tas2781_reset)(struct tasdevice_priv *tas_dev); + void (*tas2781_set_global)(struct tasdevice_priv *tas_dev); + int (*fw_parse_variable_header)(struct tasdevice_priv *tas_dev, + const struct firmware *pFW, int offset); + int (*fw_parse_program_data)(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, + const struct firmware *pFW, int offset); + int (*fw_parse_configuration_data)(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, + const struct firmware *pFW, int offset); + int (*tasdevice_load_block)(struct tasdevice_priv *tas_dev, + struct TBlock *pBlock); + int (*fw_parse_calibration_data)(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, + const struct firmware *pFW, int offset); + void (*irq_work_func)(struct tasdevice_priv *tas_dev); + int fw_state; + unsigned int magic_num; + unsigned char ndev; + unsigned char dev_name[32]; + unsigned char regbin_binaryname[64]; + unsigned char dsp_binaryname[64]; + unsigned char cal_binaryname[MaxChn][64]; + bool mb_runtime_suspend; + struct delayed_work powercontrol_work; + void *codec; + int sysclk; + int pstream; + int cstream; + bool mbCalibrationLoaded; +}; + +int tasdevice_dev_read(struct tasdevice_priv *pPcmdev, + enum channel chn, unsigned int reg, unsigned int *pValue); +int tasdevice_process_block(void *pContext, + unsigned char *data, unsigned char dev_idx, int sublocksize); +int tasdevice_dev_write(struct tasdevice_priv *pPcmdev, + enum channel chn, unsigned int reg, unsigned int value); + +int tasdevice_dev_bulk_write( + struct tasdevice_priv *pPcmdev, enum channel chn, + unsigned int reg, unsigned char *p_data, unsigned int n_length); + +int tasdevice_dev_bulk_read(struct tasdevice_priv *pPcmdev, + enum channel chn, unsigned int reg, unsigned char *p_data, + unsigned int n_length); + +int tasdevice_dev_update_bits( + struct tasdevice_priv *pPcmdev, enum channel chn, + unsigned int reg, unsigned int mask, unsigned int value); + +#endif /*__TAS2781_H__ */ -- 2.17.1

3 7

Alsa device
by GitHub issues - opened 21 Dec '22

21 Dec '22

alsa-project/alsa-lib issue #288 was opened from andy155: alsa device disappears completely after a random time usually after about a day [ 2.192815] ALSA device list: [ 2.192818] #0: HDA ATI SB at 0xfe300000 irq 16 [ 2.360481] Freeing unused kernel image (initmem) memory: 1424K -- [54091.430777] Hardware name: To be filled by O.E.M. To be filled by O.E.M./M5A97 R2.0, BIOS 2603 06/26/2015 [54091.430779] RIP: 0010:snd_dma_vmalloc_get_addr+0x19/0x46 [54091.430787] Code: e9 c3 5a 58 00 48 03 77 18 48 89 f7 e9 0c 16 92 ff 53 48 8b 47 18 48 89 f3 81 e3 ff 0f 00 00 48 01 f0 48 89 c7 e8 f3 15 92 ff <48> 8b 38 48 89 c1 48 c1 ef 2d e8 76 fe ff ff 48 8b 10 48 89 c8 48 -- [54091.430812] <TASK> [54091.430814] snd_dma_sg_fallback_alloc+0x148/0x16e [54091.430819] snd_dma_alloc_dir_pages+0x60/0x7e [54091.430822] do_alloc_pages+0x47/0x7e [54091.430826] snd_pcm_lib_malloc_pages+0xce/0x15a [54091.430829] snd_pcm_hw_params+0x175/0x393 [54091.430832] snd_pcm_common_ioctl+0x355/0xe36 [54091.430835] ? __seccomp_filter+0x81/0x36b [54091.430841] snd_pcm_ioctl+0x2a/0x31 [54091.430844] vfs_ioctl+0x19/0x2a -- [54091.430898] ---[ end trace 0000000000000000 ]--- [54091.430900] RIP: 0010:snd_dma_vmalloc_get_addr+0x19/0x46 [54091.430903] Code: e9 c3 5a 58 00 48 03 77 18 48 89 f7 e9 0c 16 92 ff 53 48 8b 47 18 48 89 f3 81 e3 ff 0f 00 00 48 01 f0 48 89 c7 e8 f3 15 92 ff <48> 8b 38 48 89 c1 48 c1 ef 2d e8 76 fe ff ff 48 8b 10 48 89 c8 48 -- [140042.480211] Hardware name: To be filled by O.E.M. To be filled by O.E.M./M5A97 R2.0, BIOS 2603 06/26/2015 [140042.480214] RIP: 0010:snd_dma_vmalloc_get_addr+0x19/0x46 [140042.480222] Code: e9 c3 5a 58 00 48 03 77 18 48 89 f7 e9 0c 16 92 ff 53 48 8b 47 18 48 89 f3 81 e3 ff 0f 00 00 48 01 f0 48 89 c7 e8 f3 15 92 ff <48> 8b 38 48 89 c1 48 c1 ef 2d e8 76 fe ff ff 48 8b 10 48 89 c8 48 -- [140042.480253] <TASK> [140042.480255] snd_dma_sg_fallback_alloc+0x148/0x16e [140042.480261] snd_dma_alloc_dir_pages+0x60/0x7e [140042.480265] do_alloc_pages+0x47/0x7e [140042.480269] snd_pcm_lib_malloc_pages+0xce/0x15a [140042.480274] snd_pcm_hw_params+0x175/0x393 [140042.480278] snd_pcm_common_ioctl+0x355/0xe36 [140042.480282] ? __seccomp_filter+0x81/0x36b [140042.480288] snd_pcm_ioctl+0x2a/0x31 [140042.480291] vfs_ioctl+0x19/0x2a -- [140042.480365] ---[ end trace 0000000000000000 ]--- [140042.480367] RIP: 0010:snd_dma_vmalloc_get_addr+0x19/0x46 [140042.480372] Code: e9 c3 5a 58 00 48 03 77 18 48 89 f7 e9 0c 16 92 ff 53 48 8b 47 18 48 89 f3 81 e3 ff 0f 00 00 48 01 f0 48 89 c7 e8 f3 15 92 ff <48> 8b 38 48 89 c1 48 c1 ef 2d e8 76 fe ff ff 48 8b 10 48 89 c8 48 Issue URL : https://github.com/alsa-project/alsa-lib/issues/288 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH v3] dt-bindings: sound: tlv320aic3x: Convert to dtschema
by Jai Luthra 21 Dec '22

21 Dec '22

Convert bindings for TI's TLV320AIC3x audio codecs to dtschema. The following properties are still found in some old dts files, but will be ignored by the driver: - adc-settle-ms - assigned-clock-paranets, assigned-clock-rates, assigned-clocks - port Signed-off-by: Jai Luthra <j-luthra(a)ti.com> --- Changes in v3: - Add comment about old undocumented properties - Address comments on minItems/maxItems v2: https://lore.kernel.org/linux-devicetree/20220803151726.31628-1-j-luthra@ti… .../bindings/sound/ti,tlv320aic3x.yaml | 158 ++++++++++++++++++ .../devicetree/bindings/sound/tlv320aic3x.txt | 97 ----------- 2 files changed, 158 insertions(+), 97 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ti,tlv320aic3x.yaml delete mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt diff --git a/Documentation/devicetree/bindings/sound/ti,tlv320aic3x.yaml b/Documentation/devicetree/bindings/sound/ti,tlv320aic3x.yaml new file mode 100644 index 000000000000..442b3d7633ef --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ti,tlv320aic3x.yaml @@ -0,0 +1,158 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +# Copyright (C) 2022 Texas Instruments Incorporated +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ti,tlv320aic3x.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments TLV320AIC3x Codec + +description: | + TLV320AIC3x are a series of low-power stereo audio codecs with stereo + headphone amplifier, as well as multiple inputs and outputs programmable in + single-ended or fully differential configurations. + + The serial control bus supports SPI or I2C protocols, while the serial audio + data bus is programmable for I2S, left/right-justified, DSP, or TDM modes. + + The following pins can be referred in the sound node's audio routing property: + + CODEC output pins: + LLOUT + RLOUT + MONO_LOUT + HPLOUT + HPROUT + HPLCOM + HPRCOM + + CODEC input pins for TLV320AIC3104: + MIC2L + MIC2R + LINE1L + LINE1R + + CODEC input pins for other compatible codecs: + MIC3L + MIC3R + LINE1L + LINE2L + LINE1R + LINE2R + +maintainers: + - Jai Luthra <j-luthra(a)ti.com> + +properties: + compatible: + enum: + - ti,tlv320aic3x + - ti,tlv320aic33 + - ti,tlv320aic3007 + - ti,tlv320aic3106 + - ti,tlv320aic3104 + + reg: + maxItems: 1 + + reset-gpios: + maxItems: 1 + description: + GPIO specification for the active low RESET input. + + gpio-reset: + maxItems: 1 + description: + Deprecated, please use reset-gpios instead. + deprecated: true + + ai3x-gpio-func: + description: AIC3X_GPIO1 & AIC3X_GPIO2 Functionality + $ref: /schemas/types.yaml#/definitions/uint32-array + maxItems: 2 + + ai3x-micbias-vg: + description: MicBias required voltage. If node is omitted then MicBias is powered down. + $ref: /schemas/types.yaml#/definitions/uint32 + oneOf: + - const: 1 + description: MICBIAS output is powered to 2.0V. + - const: 2 + description: MICBIAS output is powered to 2.5V. + - const: 3 + description: MICBIAS output is connected to AVDD. + + ai3x-ocmv: + description: Output Common-Mode Voltage selection. + $ref: /schemas/types.yaml#/definitions/uint32 + oneOf: + - const: 0 + description: 1.35V + - const: 1 + description: 1.5V + - const: 2 + description: 1.65V + - const: 3 + description: 1.8V + + AVDD-supply: + description: Analog DAC voltage. + + IOVDD-supply: + description: I/O voltage. + + DRVDD-supply: + description: ADC analog and output driver voltage. + + DVDD-supply: + description: Digital core voltage. + + '#sound-dai-cells': + const: 0 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + + tlv320aic3x_i2c: tlv320aic3x@1b { + compatible = "ti,tlv320aic3x"; + reg = <0x1b>; + + reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + + AVDD-supply = <&regulator>; + IOVDD-supply = <&regulator>; + DRVDD-supply = <&regulator>; + DVDD-supply = <&regulator>; + }; + }; + + - | + #include <dt-bindings/gpio/gpio.h> + spi { + #address-cells = <1>; + #size-cells = <0>; + + tlv320aic3x_spi: codec@0 { + compatible = "ti,tlv320aic3x"; + reg = <0>; /* CS number */ + #sound-dai-cells = <0>; + + AVDD-supply = <&regulator>; + IOVDD-supply = <&regulator>; + DRVDD-supply = <&regulator>; + DVDD-supply = <&regulator>; + ai3x-ocmv = <0>; + }; + }; + +... diff --git a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt deleted file mode 100644 index 20931a63fd64..000000000000 --- a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt +++ /dev/null @@ -1,97 +0,0 @@ -Texas Instruments - tlv320aic3x Codec module - -The tlv320aic3x serial control bus communicates through both I2C and SPI bus protocols - -Required properties: - -- compatible - "string" - One of: - "ti,tlv320aic3x" - Generic TLV320AIC3x device - "ti,tlv320aic33" - TLV320AIC33 - "ti,tlv320aic3007" - TLV320AIC3007 - "ti,tlv320aic3106" - TLV320AIC3106 - "ti,tlv320aic3104" - TLV320AIC3104 - - -- reg - <int> - I2C slave address - - -Optional properties: - -- reset-gpios - GPIO specification for the active low RESET input. -- ai3x-gpio-func - <array of 2 int> - AIC3X_GPIO1 & AIC3X_GPIO2 Functionality - - Not supported on tlv320aic3104 -- ai3x-micbias-vg - MicBias Voltage required. - 1 - MICBIAS output is powered to 2.0V, - 2 - MICBIAS output is powered to 2.5V, - 3 - MICBIAS output is connected to AVDD, - If this node is not mentioned or if the value is incorrect, then MicBias - is powered down. -- ai3x-ocmv - Output Common-Mode Voltage selection: - 0 - 1.35V, - 1 - 1.5V, - 2 - 1.65V, - 3 - 1.8V -- AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the - device as covered in Documentation/devicetree/bindings/regulator/regulator.txt - -Deprecated properties: - -- gpio-reset - gpio pin number used for codec reset - -CODEC output pins: - * LLOUT - * RLOUT - * MONO_LOUT - * HPLOUT - * HPROUT - * HPLCOM - * HPRCOM - -CODEC input pins for TLV320AIC3104: - * MIC2L - * MIC2R - * LINE1L - * LINE1R - -CODEC input pins for other compatible codecs: - * MIC3L - * MIC3R - * LINE1L - * LINE2L - * LINE1R - * LINE2R - -The pins can be used in referring sound node's audio-routing property. - -I2C example: - -#include <dt-bindings/gpio/gpio.h> - -tlv320aic3x: tlv320aic3x@1b { - compatible = "ti,tlv320aic3x"; - reg = <0x1b>; - - reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; - - AVDD-supply = <&regulator>; - IOVDD-supply = <&regulator>; - DRVDD-supply = <&regulator>; - DVDD-supply = <&regulator>; -}; - -SPI example: - -spi0: spi@f0000000 { - tlv320aic3x: codec@0 { - compatible = "ti,tlv320aic3x"; - reg = <0>; /* CS number */ - #sound-dai-cells = <0>; - spi-max-frequency = <1000000>; - - AVDD-supply = <&regulator>; - IOVDD-supply = <&regulator>; - DRVDD-supply = <&regulator>; - DVDD-supply = <&regulator>; - ai3x-ocmv = <0>; - }; -}; -- 2.17.1

2 2

fix GFP_COMP use in noncoherent dma allocators
by Christoph Hellwig 21 Dec '22

21 Dec '22

Hi all, this series fixe the regression where dma-iommu stopped clearing GFP_COMP from noncoherent dma allocations by never requesting those in the sound code and rejecting them in the core DMA API code. Diffstat: kernel/dma/mapping.c | 4 ++++ sound/core/memalloc.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

4 6

rt715-sdca soundwire micphone record no sound
by GitHub issues - edited 21 Dec '22

21 Dec '22

alsa-project/alsa-ucm-conf issue #255 was edited from KaiChuan-Hsieh: On linux kernel 6.0, with rt715-sdca codec on Dell platform. The internal mic can't record sound after boot. Try $ amixer cset name='PGA5.0 5 Master Capture' 1 Then the internal mic can record sound successfully. Upload alsa-info for reference, [alsa-info.txt.G6EnxHQlnM.zip](https://github.com/alsa-project/alsa-ucm-conf… Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/255 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

rt715-sdca soundwire micphone record no sound
by GitHub issues - opened 21 Dec '22

21 Dec '22

alsa-project/alsa-ucm-conf issue #255 was opened from KaiChuan-Hsieh: On linux kernel 6.0, with rt715-sdca codec on Dell platform. The internal mic can't record sound after boot. Try $ amixer cset name='PGA5.0 5 Master Capture' 1 Then the internal mic can record sound successfully. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/255 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] New yaml file: tas2781
by Kevin Lu 20 Dec '22

20 Dec '22

Add DTS discription for tas2781 driver code Signed-off-by: Kevin Lu <luminlong(a)139.com> --- .../devicetree/bindings/sound/tas2781.yaml | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tas2781.yaml diff --git a/Documentation/devicetree/bindings/sound/tas2781.yaml b/Documentation/devicetree/bindings/sound/tas2781.yaml new file mode 100644 index 000000000..96fa45bf6 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tas2781.yaml @@ -0,0 +1,90 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2022 Texas Instruments Incorporated +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/sound/tas2781.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Texas Instruments TAS2781 Smart PA + +maintainers: + - Shenghao Ding <shenghao-ding(a)ti.com> + - Kevin Lu <kevin-lu(a)ti.com> + +description: | + The TAS2781 is a mono, digital input Class-D audio amplifier + optimized for efficiently driving high peak power into small + loudspeakers. Integrated an on-chip DSP supports Texas Instruments + Smart Amp speaker protection algorithm. The integrated speaker + voltage and current sense provides for real time + monitoring of loudspeaker behavior. + +properties: + compatible: + enum: + - ti,tas2781 + - ti,audev + description: | + ti,audev will disable the irq of tas2781. + reg: + maxItems: 1 + description: | + I2C address of the device can be between 0x38 to 0x40. + + reset-gpioN: + maxItems: 4 + description: GPIO used to reset the device. + + ti,topleft-channel: + maxItems: 1 + description: I2C Address for each specific device. + + ti,topright-channel: + maxItems: 1 + + ti,bottomleft-channel: + maxItems: 1 + + ti,bottomright-channel: + maxItems: 1 + + ti,global-address: + maxItems: 1 + description: This item is not mandatory. if the device support gloabel mode, this item should be active. + + ti,irq-gpio: + maxItems: 1 + description: GPIO used to interrupt the device. + + '#sound-dai-cells': + const: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + i2c0 { + #address-cells = <1>; + #size-cells = <0>; + codec: codec@38 { + compatible = "ti,tas2781"; + reg = <0x38>; + #sound-dai-cells = <1>; + ti,topleft-channel = <0x38>; + ti,topright-channel = <0x39>; + ti,bottomright-channel = <0x3a>; + ti,bottomright-channel = <0x3b>; + ti,global-address = <0x40>; + ti,reset-gpio0 = <&gpio1 10 GPIO_ACTIVE_HIGH>; + ti,reset-gpio1 = <&gpio1 11 GPIO_ACTIVE_HIGH>; + ti,reset-gpio2 = <&gpio1 12 GPIO_ACTIVE_HIGH>; + ti,reset-gpio3 = <&gpio1 13 GPIO_ACTIVE_HIGH>; + ti,irq-gpio = <&gpio1 15 0>; + }; + }; +... -- 2.17.1

3 2

[PATCH] ALSA SoC: Texas Instruments TAS2781 Audio Smart Amp
by Kevin Lu 20 Dec '22

20 Dec '22

The TAS2781 driver implements a flexible and configurable register setting for one, two, even multiple TAS2781 chips. All the register setting are in a bin file. Almost no specific register setting can be found in the code. Signed-off-by: Kevin Lu <luminlong(a)139.com> --- sound/soc/codecs/Kconfig | 13 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tas2781-dsp.c | 2483 ++++++++++++++++++++++++++++++++ sound/soc/codecs/tas2781-dsp.h | 213 +++ sound/soc/codecs/tas2781-i2c.c | 2143 +++++++++++++++++++++++++++ sound/soc/codecs/tas2781.h | 208 +++ 6 files changed, 5062 insertions(+) create mode 100644 sound/soc/codecs/tas2781-dsp.c create mode 100644 sound/soc/codecs/tas2781-dsp.h create mode 100644 sound/soc/codecs/tas2781-i2c.c create mode 100644 sound/soc/codecs/tas2781.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 7022e6286..31d2d9594 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -222,6 +222,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_TAS2764 imply SND_SOC_TAS2770 imply SND_SOC_TAS2780 + imply SND_SOC_TAS2781 imply SND_SOC_TAS5086 imply SND_SOC_TAS571X imply SND_SOC_TAS5720 @@ -1573,6 +1574,18 @@ config SND_SOC_TAS2780 Enable support for Texas Instruments TAS2780 high-efficiency digital input mono Class-D audio power amplifiers. +config SND_SOC_TAS2781 + tristate "Texas Instruments TAS2781 speaker amplifier" + depends on I2C + select REGMAP_I2C + help + Enable support for Texas Instruments TAS2781 Smart Amplifier + Digital input mono Class-D and DSP-inside audio power amplifiers. + Note the TAS2781 driver implements a flexible and configurable + register setting, for one, two, even multiple TAS2781 chips. + All the register setting are in a bin file. Almost no specific + register setting can be found in the code. + config SND_SOC_TAS5086 tristate "Texas Instruments TAS5086 speaker amplifier" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 9170ee144..088fed9e7 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -354,6 +354,7 @@ snd-soc-tas2552-objs := tas2552.o snd-soc-tas2562-objs := tas2562.o snd-soc-tas2764-objs := tas2764.o snd-soc-tas2780-objs := tas2780.o +snd-soc-tas2781-objs := tas2781-i2c.o tas2781-dsp.o # Mux snd-soc-simple-mux-objs := simple-mux.o @@ -604,6 +605,7 @@ obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o obj-$(CONFIG_SND_SOC_TAS2562) += snd-soc-tas2562.o obj-$(CONFIG_SND_SOC_TAS2764) += snd-soc-tas2764.o obj-$(CONFIG_SND_SOC_TAS2780) += snd-soc-tas2780.o +obj-$(CONFIG_SND_SOC_TAS2781) += snd-soc-tas2781.o obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o diff --git a/sound/soc/codecs/tas2781-dsp.c b/sound/soc/codecs/tas2781-dsp.c new file mode 100644 index 000000000..56c7efd30 --- /dev/null +++ b/sound/soc/codecs/tas2781-dsp.c @@ -0,0 +1,2483 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier + * + * Copyright (C) 2022 - 2023 Texas Instruments Incorporated + * https://www.ti.com + * + * The TAS2781 driver implements a flexible and configurable register setting + * for one, two, even multiple TAS2781 chips. All the register setting are in + * a bin file. Almost no specific register setting can be found in the code. + * + * Author: Shenghao Ding <shenghao-ding(a)ti.com> + * Kevin Lu <kevin-lu(a)ti.com> + */ + +#include <linux/regmap.h> +#include <linux/i2c.h> +#include <linux/string.h> +#include <linux/crc8.h> +#include <linux/slab.h> +#include <linux/fs.h> +#include <linux/firmware.h> + +#include "tas2781.h" + +#define TAS2781_CAL_BIN_PATH ("/lib/firmware/") + +#define ERROR_PRAM_CRCCHK (0x0000000) +#define ERROR_YRAM_CRCCHK (0x0000001) +#define BINFILEDOCVER (0) +#define DRVFWVER (1) +#define PPC_DRIVER_CRCCHK (0x00000200) + +#define TAS2781_SA_COEFF_SWAP_REG TASDEVICE_REG(0, 0x35, 0x2c) +#define TAS2781_YRAM_BOOK1 (140) +#define TAS2781_YRAM1_PAGE (42) +#define TAS2781_YRAM1_START_REG (88) + +#define TAS2781_YRAM2_START_PAGE (43) +#define TAS2781_YRAM2_END_PAGE (49) +#define TAS2781_YRAM2_START_REG (8) +#define TAS2781_YRAM2_END_REG (127) + +#define TAS2781_YRAM3_PAGE (50) +#define TAS2781_YRAM3_START_REG (8) +#define TAS2781_YRAM3_END_REG (27) + +/*should not include B0_P53_R44-R47 */ +#define TAS2781_YRAM_BOOK2 (0) +#define TAS2781_YRAM4_START_PAGE (50) +#define TAS2781_YRAM4_END_PAGE (60) + +#define TAS2781_YRAM5_PAGE (61) +#define TAS2781_YRAM5_START_REG (8) +#define TAS2781_YRAM5_END_REG (27) + +#define TASDEVICE_MAXPROGRAM_NUM_KERNEL (5) +#define TASDEVICE_MAXCONFIG_NUM_KERNEL_MULTIPLE_AMPS (64) +#define TASDEVICE_MAXCONFIG_NUM_KERNEL (10) +#define MAIN_ALL_DEVICES_1X (0x01) +#define MAIN_DEVICE_A_1X (0x02) +#define MAIN_DEVICE_B_1X (0x03) +#define MAIN_DEVICE_C_1X (0x04) +#define MAIN_DEVICE_D_1X (0x05) +#define COEFF_DEVICE_A_1X (0x12) +#define COEFF_DEVICE_B_1X (0x13) +#define COEFF_DEVICE_C_1X (0x14) +#define COEFF_DEVICE_D_1X (0x15) +#define PRE_DEVICE_A_1X (0x22) +#define PRE_DEVICE_B_1X (0x23) +#define PRE_DEVICE_C_1X (0x24) +#define PRE_DEVICE_D_1X (0x25) + +struct TYCRC { + unsigned char mnOffset; + unsigned char mnLen; +}; + +const unsigned int BinFileformatVerInfo[][2] = { + {0x100, 0x100}, + {0x110, 0x200}, + {0x200, 0x300}, + {0x210, 0x310}, + {0x230, 0x320}, + {0x300, 0x400} +}; + +const char *devicefamily[1] = { + "TAS Devices" }; + +const char *devicelist[TASDEVICE_DSP_TAS_MAX_DEVICE] = { + "TAS2555", + "TAS2555 Stereo", + "TAS2557 Mono", + "TAS2557 Dual Mono", + "TAS2559", + "TAS2563", + NULL, + "TAS2563 Dual Mono", + "TAS2563 Quad", + "TAS2563 2.1", + "TAS2781", + "TAS2781 Stereo", + "TAS2781 2.1", + "TAS2781 Quad" +}; + +const char deviceNumber[TASDEVICE_DSP_TAS_MAX_DEVICE] = { + 1, 2, 1, 2, 1, 1, 0, 2, 4, 3, 1, 2, 3, 4 +}; + +static int fw_parse_block_data_kernel(struct TFirmware *pFirmware, + struct TBlock *pBlock, const struct firmware *pFW, int offset) +{ + const unsigned char *pData = pFW->data; + + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pBlock->mnType = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mbPChkSumPresent error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mbPChkSumPresent = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnPChkSum error\n", __func__); + offset = -1; + goto out; + } + pBlock->mnPChkSum = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mbYChkSumPresent error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mbYChkSumPresent = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnYChkSum error\n", __func__); + offset = -1; + goto out; + } + pBlock->mnYChkSum = pData[offset]; + offset++; + + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: blk_size error\n", __func__); + offset = -1; + goto out; + } + pBlock->blk_size = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: nSublocks error\n", __func__); + offset = -1; + goto out; + } + pBlock->nSublocks = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], pData[offset + 3]); + offset += 4; + + pBlock->mpData = kzalloc(pBlock->blk_size, GFP_KERNEL); + if (pBlock->mpData == NULL) { + offset = -1; + goto out; + } + memcpy(pBlock->mpData, &pData[offset], pBlock->blk_size); + offset += pBlock->blk_size; +out: + return offset; +} + +static int fw_parse_data_kernel(struct TFirmware *pFirmware, + struct TData *pImageData, const struct firmware *pFW, int offset) +{ + const unsigned char *pData = pFW->data; + unsigned int nBlock; + + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pImageData->mnBlocks = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], pData[offset + 3]); + offset += 4; + + pImageData->mpBlocks = + kcalloc(pImageData->mnBlocks, sizeof(struct TBlock), + GFP_KERNEL); + if (pImageData->mpBlocks == NULL) { + dev_err(pFirmware->dev, "%s: FW memory failed!\n", __func__); + goto out; + } + + for (nBlock = 0; nBlock < pImageData->mnBlocks; nBlock++) { + offset = fw_parse_block_data_kernel(pFirmware, + &(pImageData->mpBlocks[nBlock]), pFW, offset); + if (offset < 0) { + offset = -1; + goto out; + } + } +out: + return offset; +} + +int fw_parse_program_data_kernel(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, + const struct firmware *pFW, int offset) +{ + struct TProgram *pProgram; + const unsigned char *buf = pFW->data; + unsigned int nProgram = 0; + + for (nProgram = 0; nProgram < pFirmware->mnPrograms; nProgram++) { + pProgram = &(pFirmware->mpPrograms[nProgram]); + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: mpName error\n", + __func__); + offset = -1; + goto out; + } + memcpy(pProgram->mpName, &buf[offset], 64); + offset += 64; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnAppMode error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnAppMode = buf[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPDMI2SMode error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnPDMI2SMode = buf[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnISnsPD error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnISnsPD = buf[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnVSnsPD error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnVSnsPD = buf[offset]; + offset++; + //skip 3-byte reserved + offset += 3; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPowerLDG error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnPowerLDG = buf[offset]; + offset++; + + offset = fw_parse_data_kernel(pFirmware, &(pProgram->mData), + pFW, offset); + if (offset < 0) + goto out; + } +out: + return offset; +} + +int fw_parse_configuration_data_kernel( + struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, const struct firmware *pFW, int offset) +{ + const unsigned char *pData = pFW->data; + + unsigned int nConfiguration; + struct TConfiguration *pConfiguration; + + for (nConfiguration = 0; nConfiguration < pFirmware->mnConfigurations; + nConfiguration++) { + pConfiguration = + &(pFirmware->mpConfigurations[nConfiguration]); + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: mpName error\n", + __func__); + offset = -1; + goto out; + } + memcpy(pConfiguration->mpName, &pData[offset], 64); + offset += 64; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, + "%s: mnDevice_orientation error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnDevice_orientation = pData[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnDevices error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnDevices = pData[offset + 1]; + offset += 1; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mProgram error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mProgram = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnSamplingRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnSamplingRate = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPLLSrc error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnPLLSrc = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnFsRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnFsRate = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPLLSrcRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnPLLSrcRate = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + offset = fw_parse_data_kernel(pFirmware, + &(pConfiguration->mData), pFW, offset); + if (offset < 0) + goto out; + } +out: + return offset; +} + +int fw_parse_variable_header_kernel(struct tasdevice_priv *tas_dev, + const struct firmware *pFW, int offset) +{ + struct TFirmware *pFirmware = tas_dev->mpFirmware; + struct tasdevice_dspfw_hdr *pFw_hdr = &(pFirmware->fw_hdr); + const unsigned char *buf = pFW->data; + struct TProgram *pProgram; + struct TConfiguration *pConfiguration; + unsigned int nProgram = 0, nConfiguration = 0; + unsigned short maxConf = TASDEVICE_MAXCONFIG_NUM_KERNEL; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDeviceFamily = SMS_HTONS(buf[offset], buf[offset + 1]); + if (pFw_hdr->mnDeviceFamily != 0) { + dev_err(tas_dev->dev, "ERROR:%s:not TAS device\n", __func__); + offset = -1; + goto out; + } + offset += 2; + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnDevice error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDevice = SMS_HTONS(buf[offset], buf[offset + 1]); + if (pFw_hdr->mnDevice >= TASDEVICE_DSP_TAS_MAX_DEVICE || + pFw_hdr->mnDevice == 6) { + dev_err(tas_dev->dev, "ERROR:%s: not support device %d\n", + __func__, pFw_hdr->mnDevice); + offset = -1; + goto out; + } + offset += 2; + pFw_hdr->ndev = deviceNumber[pFw_hdr->mnDevice]; + + if (pFw_hdr->ndev != tas_dev->ndev) { + dev_err(tas_dev->dev, + "%s: ndev(%u) in dspbin dismatch ndev(%u) in DTS\n", + __func__, pFw_hdr->ndev, tas_dev->ndev); + offset = -1; + goto out; + } + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPrograms error\n", __func__); + offset = -1; + goto out; + } + pFirmware->mnPrograms = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + + if (pFirmware->mnPrograms == 0 || pFirmware->mnPrograms > + TASDEVICE_MAXPROGRAM_NUM_KERNEL) { + dev_err(tas_dev->dev, "%s: mnPrograms is invalid\n", __func__); + offset = -1; + goto out; + } + + if (offset + 4 * TASDEVICE_MAXPROGRAM_NUM_KERNEL > pFW->size) { + dev_err(tas_dev->dev, "%s: mpPrograms error\n", __func__); + offset = -1; + goto out; + } + + pFirmware->mpPrograms = + kcalloc(pFirmware->mnPrograms, + sizeof(struct TProgram), GFP_KERNEL); + if (pFirmware->mpPrograms == NULL) { + dev_err(tas_dev->dev, "%s: mpPrograms memory failed!\n", + __func__); + offset = -1; + goto out; + } + + for (nProgram = 0; nProgram < pFirmware->mnPrograms; nProgram++) { + pProgram = &(pFirmware->mpPrograms[nProgram]); + pProgram->prog_size = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + pFirmware->cfg_start_offset += pProgram->prog_size; + offset += 4; + } + offset += (4 * (5 - nProgram)); + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnConfigurations error\n", + __func__); + offset = -1; + goto out; + } + pFirmware->mnConfigurations = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + maxConf = (pFw_hdr->ndev >= 4) ? + TASDEVICE_MAXCONFIG_NUM_KERNEL_MULTIPLE_AMPS : + TASDEVICE_MAXCONFIG_NUM_KERNEL; + if (pFirmware->mnConfigurations == 0 || + pFirmware->mnConfigurations > maxConf) { + dev_err(tas_dev->dev, "%s: mnConfigurations is invalid\n", + __func__); + offset = -1; + goto out; + } + + if (offset + 4 * maxConf > pFW->size) { + dev_err(tas_dev->dev, "%s: mpConfigurations error\n", + __func__); + offset = -1; + goto out; + } + + pFirmware->mpConfigurations = kcalloc(pFirmware->mnConfigurations, + sizeof(struct TConfiguration), GFP_KERNEL); + if (pFirmware->mpConfigurations == NULL) { + offset = -1; + goto out; + } + + for (nConfiguration = 0; nConfiguration < pFirmware->mnPrograms; + nConfiguration++) { + pConfiguration = + &(pFirmware->mpConfigurations[nConfiguration]); + pConfiguration->cfg_size = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + } + + offset += (4 * (maxConf - nConfiguration)); + pFirmware->prog_start_offset = offset; + pFirmware->cfg_start_offset += offset; +out: + return offset; +} + +int tasdevice_load_block_kernel(struct tasdevice_priv *pTAS2781, + struct TBlock *pBlock) +{ + int nResult = 0; + + unsigned char *pData = pBlock->mpData; + unsigned int i = 0, length = 0; + const unsigned int blk_size = pBlock->blk_size; + unsigned char dev_idx = 0; + struct tasdevice_dspfw_hdr *pFw_hdr = &(pTAS2781->mpFirmware->fw_hdr); + struct tasdevice_fw_fixed_hdr *pFw_fixed_hdr = &(pFw_hdr->mnFixedHdr); + + if (pFw_fixed_hdr->mnPPCVersion >= PPC3_VERSION) { + switch (pBlock->mnType) { + case MAIN_ALL_DEVICES_1X: + dev_idx = 0|0x80; + break; + case MAIN_DEVICE_A_1X: + dev_idx = 1|0x80; + break; + case COEFF_DEVICE_A_1X: + case PRE_DEVICE_A_1X: + dev_idx = 1|0xC0; + break; + case MAIN_DEVICE_B_1X: + dev_idx = 2|0x80; + break; + case COEFF_DEVICE_B_1X: + case PRE_DEVICE_B_1X: + dev_idx = 2|0xC0; + break; + case MAIN_DEVICE_C_1X: + dev_idx = 3|0x80; + break; + case COEFF_DEVICE_C_1X: + case PRE_DEVICE_C_1X: + dev_idx = 3|0xC0; + break; + case MAIN_DEVICE_D_1X: + dev_idx = 4|0x80; + break; + case COEFF_DEVICE_D_1X: + case PRE_DEVICE_D_1X: + dev_idx = 4|0xC0; + break; + default: + dev_info(pTAS2781->dev, + "%s: TAS2781 load block: Other Type = 0x%02x\n", + __func__, pBlock->mnType); + break; + } + } else { + switch (pBlock->mnType) { + case MAIN_ALL_DEVICES: + dev_idx = 0|0x80; + break; + case MAIN_DEVICE_A: + dev_idx = 1|0x80; + break; + case COEFF_DEVICE_A: + case PRE_DEVICE_A: + dev_idx = 1|0xC0; + break; + case MAIN_DEVICE_B: + dev_idx = 2|0x80; + break; + case COEFF_DEVICE_B: + case PRE_DEVICE_B: + dev_idx = 2|0xC0; + break; + case MAIN_DEVICE_C: + dev_idx = 3|0x80; + break; + case COEFF_DEVICE_C: + case PRE_DEVICE_C: + dev_idx = 3|0xC0; + break; + case MAIN_DEVICE_D: + dev_idx = 4|0x80; + break; + case COEFF_DEVICE_D: + case PRE_DEVICE_D: + dev_idx = 4|0xC0; + break; + default: + dev_info(pTAS2781->dev, + "%s: TAS2781 load block: Other Type = 0x%02x\n", + __func__, + pBlock->mnType); + break; + } + } + + for (i = 0; i < pBlock->nSublocks; i++) { + int rc = tasdevice_process_block(pTAS2781, pData + length, + dev_idx, blk_size - length); + if (rc < 0) { + dev_err(pTAS2781->dev, + "%s: ERROR:%u %u sublock write error\n", + __func__, length, blk_size); + break; + } + length += (unsigned int)rc; + if (blk_size < length) { + dev_err(pTAS2781->dev, + "%s: ERROR:%u %u out of memory\n", + __func__, length, blk_size); + break; + } + } + + return nResult; +} + +int fw_parse_variable_header_git(struct tasdevice_priv *tas_dev, + const struct firmware *pFW, int offset) +{ + const unsigned char *buf = pFW->data; + struct TFirmware *pFirmware = tas_dev->mpFirmware; + struct tasdevice_dspfw_hdr *pFw_hdr = &(pFirmware->fw_hdr); + int i = strlen((char *)&buf[offset]); + + i++; + + if (offset + i > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + + pFw_hdr->mpDescription = kmemdup(&buf[offset], i, GFP_KERNEL); + if (pFw_hdr->mpDescription == NULL) + goto out; + offset += i; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDeviceFamily = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + if (pFw_hdr->mnDeviceFamily != 0) { + dev_err(tas_dev->dev, "ERROR:%s: not TAS device\n", __func__); + offset = -1; + goto out; + } + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDevice = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + if (pFw_hdr->mnDevice >= TASDEVICE_DSP_TAS_MAX_DEVICE || + pFw_hdr->mnDevice == 6) { + dev_err(tas_dev->dev, "ERROR:%s: not support device %d\n", + __func__, pFw_hdr->mnDevice); + offset = -1; + goto out; + } + offset += 4; + pFw_hdr->ndev = deviceNumber[pFw_hdr->mnDevice]; + if (pFw_hdr->ndev != tas_dev->ndev) { + dev_err(tas_dev->dev, + "%s: ndev(%u) in dspbin dismatch ndev(%u) in DTS\n", + __func__, pFw_hdr->ndev, + tas_dev->ndev); + offset = -1; + } + +out: + return offset; +} + +int fw_parse_variable_header_cal(struct tasdevice_priv *tas_dev, + struct TFirmware *pCalFirmware, const struct firmware *pFW, int offset) +{ + const unsigned char *buf = pFW->data; + struct tasdevice_dspfw_hdr *pFw_hdr = &(pCalFirmware->fw_hdr); + int i = strlen((char *)&buf[offset]); + + i++; + + if (offset + i > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + + pFw_hdr->mpDescription = kmemdup(&buf[offset], i, GFP_KERNEL); + if (pFw_hdr->mpDescription == NULL) + goto out; + offset += i; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnDeviceFamily error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDeviceFamily = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + if (pFw_hdr->mnDeviceFamily != 0) { + dev_err(tas_dev->dev, "ERROR:%s: not TAS device\n", __func__); + offset = -1; + goto out; + } + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnDevice error\n", __func__); + offset = -1; + goto out; + } + pFw_hdr->mnDevice = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + if (pFw_hdr->mnDevice >= TASDEVICE_DSP_TAS_MAX_DEVICE || + pFw_hdr->mnDevice == 6) { + dev_err(tas_dev->dev, "ERROR:%s: not support device %d\n", + __func__, pFw_hdr->mnDevice); + offset = -1; + goto out; + } + offset += 4; + pFw_hdr->ndev = deviceNumber[pFw_hdr->mnDevice]; + if (pFw_hdr->ndev != 1) { + dev_err(tas_dev->dev, + "%s: calbin must be 1, but currently ndev(%u)\n", + __func__, pFw_hdr->ndev); + offset = -1; + } + +out: + return offset; +} + +static inline void tas2781_clear_Calfirmware(struct TFirmware + *mpCalFirmware) +{ + int i = 0; + unsigned int nBlock = 0; + + if (mpCalFirmware->mpCalibrations) { + struct TCalibration *pCalibration; + + for (i = 0; i < mpCalFirmware->mnCalibrations; i++) { + pCalibration = &(mpCalFirmware->mpCalibrations[i]); + if (pCalibration) { + struct TData *pImageData = + &(pCalibration->mData); + + if (pImageData->mpBlocks) { + struct TBlock *pBlock; + + for (nBlock = 0; nBlock < + pImageData->mnBlocks; + nBlock++) { + pBlock = + &(pImageData->mpBlocks[nBlock]); + kfree(pBlock->mpData); + } + kfree(pImageData->mpBlocks); + } + kfree(pCalibration->mpDescription); + } + } + kfree(mpCalFirmware->mpCalibrations); + } + kfree(mpCalFirmware); +} + +static int fw_parse_block_data(struct TFirmware *pFirmware, + struct TBlock *pBlock, const struct firmware *pFW, int offset) +{ + unsigned char *pData = (unsigned char *)pFW->data; + int n; + + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnType error\n", __func__); + offset = -1; + goto out; + } + pBlock->mnType = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], pData[offset + 3]); + offset += 4; + + if (pFirmware->fw_hdr.mnFixedHdr.mnDriverVersion >= + PPC_DRIVER_CRCCHK) { + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mbPChkSumPresent error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mbPChkSumPresent = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnPChkSum error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mnPChkSum = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mbYChkSumPresent error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mbYChkSumPresent = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnYChkSum error\n", + __func__); + offset = -1; + goto out; + } + pBlock->mnYChkSum = pData[offset]; + offset++; + } else { + pBlock->mbPChkSumPresent = 0; + pBlock->mbYChkSumPresent = 0; + } + if (offset + 4 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnCommands error\n", __func__); + offset = -1; + goto out; + } + pBlock->mnCommands = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], pData[offset + 3]); + offset += 4; + + n = pBlock->mnCommands * 4; + if (offset + n > pFW->size) { + dev_err(pFirmware->dev, + "%s: File Size(%u) error offset = %d n = %d\n", + __func__, pFW->size, offset, n); + offset = -1; + goto out; + } + pBlock->mpData = kmemdup(&pData[offset], n, GFP_KERNEL); + if (pBlock->mpData == NULL) { + offset = -1; + goto out; + } + offset += n; +out: + return offset; +} + +static int fw_parse_data(struct TFirmware *pFirmware, + struct TData *pImageData, const struct firmware *pFW, int offset) +{ + const unsigned char *pData = (unsigned char *)pFW->data; + int n = 0; + unsigned int nBlock; + + if (offset + 64 > pFW->size) { + dev_err(pFirmware->dev, "%s: mpName error\n", __func__); + n = -1; + goto out; + } + memcpy(pImageData->mpName, &pData[offset], 64); + offset += 64; + + n = strlen((char *)&pData[offset]); + n++; + if (offset + n > pFW->size) { + dev_err(pFirmware->dev, "%s: mpDescription error\n", __func__); + offset = -1; + goto out; + } + pImageData->mpDescription = kmemdup(pData, n, GFP_KERNEL); + if (pImageData->mpDescription == NULL) + goto out; + offset += n; + + if (offset + 2 > pFW->size) { + dev_err(pFirmware->dev, "%s: mnBlocks error\n", __func__); + offset = -1; + goto out; + } + pImageData->mnBlocks = SMS_HTONS(pData[offset], pData[offset + 1]); + offset += 2; + + pImageData->mpBlocks = + kcalloc(pImageData->mnBlocks, sizeof(struct TBlock), + GFP_KERNEL); + if (pImageData->mpBlocks == NULL) { + dev_err(pFirmware->dev, "%s: FW memory failed!\n", __func__); + goto out; + } + for (nBlock = 0; nBlock < pImageData->mnBlocks; nBlock++) { + offset = fw_parse_block_data(pFirmware, + &(pImageData->mpBlocks[nBlock]), pFW, offset); + if (offset < 0) { + offset = -1; + goto out; + } + } +out: + return offset; +} + +static int fw_parse_calibration_data(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, const struct firmware *pFW, int offset) +{ + unsigned char *pData = (unsigned char *)pFW->data; + unsigned int n = 0; + unsigned int nCalibration = 0; + struct TCalibration *pCalibration = NULL; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnCalibrations error\n", __func__); + offset = -1; + goto out; + } + pFirmware->mnCalibrations = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + if (pFirmware->mnCalibrations != 1) { + dev_err(tas_dev->dev, + "%s: only support one calibraiton(%d)!\n", + __func__, pFirmware->mnCalibrations); + goto out; + } + + pFirmware->mpCalibrations = + kcalloc(pFirmware->mnCalibrations, sizeof(struct TCalibration), + GFP_KERNEL); + if (pFirmware->mpCalibrations == NULL) { + dev_err(tas_dev->dev, "%s: mpCalibrations memory failed!\n", + __func__); + offset = -1; + goto out; + } + for (nCalibration = 0; nCalibration < pFirmware->mnCalibrations; + nCalibration++) { + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: mpCalibrations error\n", + __func__); + offset = -1; + goto out; + } + pCalibration = &(pFirmware->mpCalibrations[nCalibration]); + memcpy(pCalibration->mpName, &pData[offset], 64); + offset += 64; + + n = strlen((char *)&pData[offset]); + n++; + if (offset + n > pFW->size) { + dev_err(tas_dev->dev, "%s: mpDescription error\n", + __func__); + offset = -1; + goto out; + } + pCalibration->mpDescription = kmemdup(&pData[offset], n, + GFP_KERNEL); + if (pCalibration->mpDescription == NULL) { + offset = -1; + goto out; + } + offset += n; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, + "%s: mnProgram error, offset = %d\n", __func__, + offset); + offset = -1; + goto out; + } + pCalibration->mnProgram = pData[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, + "%s: mnConfiguration error, offset = %d\n", + __func__, + offset); + offset = -1; + goto out; + } + pCalibration->mnConfiguration = pData[offset]; + offset++; + + offset = fw_parse_data(pFirmware, &(pCalibration->mData), pFW, + offset); + if (offset < 0) + goto out; + } + +out: + + return offset; +} + +static int fw_parse_program_data(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, const struct firmware *pFW, int offset) +{ + struct TProgram *pProgram; + unsigned char *buf = (unsigned char *)pFW->data; + int nProgram = 0; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pFirmware->mnPrograms = SMS_HTONS(buf[offset], buf[offset + 1]); + offset += 2; + + if (pFirmware->mnPrograms == 0) { + dev_err(tas_dev->dev, "%s: mnPrograms is null, maybe calbin\n", + __func__); + //Do not "offset = -1;", because of calbin + goto out; + } + + pFirmware->mpPrograms = + kcalloc(pFirmware->mnPrograms, sizeof(struct TProgram), + GFP_KERNEL); + if (pFirmware->mpPrograms == NULL) { + offset = -1; + goto out; + } + for (nProgram = 0; nProgram < pFirmware->mnPrograms; nProgram++) { + int n = 0; + + pProgram = &(pFirmware->mpPrograms[nProgram]); + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: mpName error\n", __func__); + offset = -1; + goto out; + } + memcpy(pProgram->mpName, &buf[offset], 64); + offset += 64; + + n = strlen((char *)&buf[offset]); + n++; + if (offset + n > pFW->size) { + dev_err(tas_dev->dev, "%s: mpDescription error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mpDescription = kmemdup(&buf[offset], n, GFP_KERNEL); + if (pProgram->mpDescription == NULL) { + offset = -1; + goto out; + } + + offset += n; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnAppMode error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnAppMode = buf[offset]; + offset++; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPDMI2SMode error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnPDMI2SMode = buf[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnISnsPD error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnISnsPD = buf[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnVSnsPD error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnVSnsPD = buf[offset]; + offset++; + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPowerLDG error\n", + __func__); + offset = -1; + goto out; + } + pProgram->mnPowerLDG = buf[offset]; + offset++; + + offset = fw_parse_data(pFirmware, &(pProgram->mData), pFW, + offset); + if (offset < 0) + goto out; + } +out: + return offset; +} + +static int fw_parse_configuration_data( + struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, + const struct firmware *pFW, int offset) +{ + unsigned char *pData = (unsigned char *)pFW->data; + int n; + unsigned int nConfiguration; + struct TConfiguration *pConfiguration; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + pFirmware->mnConfigurations = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + if (pFirmware->mnConfigurations == 0) { + dev_err(tas_dev->dev, "%s: mnConfigurations is zero\n", + __func__); + //Do not "offset = -1;", because of calbin + goto out; + } + pFirmware->mpConfigurations = + kcalloc(pFirmware->mnConfigurations, + sizeof(struct TConfiguration), GFP_KERNEL); + + for (nConfiguration = 0; nConfiguration < pFirmware->mnConfigurations; + nConfiguration++) { + pConfiguration = + &(pFirmware->mpConfigurations[nConfiguration]); + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", + __func__); + offset = -1; + goto out; + } + memcpy(pConfiguration->mpName, &pData[offset], 64); + offset += 64; + + n = strlen((char *)&pData[offset]); + n++; + if (offset + n > pFW->size) { + dev_err(tas_dev->dev, "%s: mpDescription error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mpDescription = kmemdup(&pData[offset], n, + GFP_KERNEL); + + if (pConfiguration->mpDescription == NULL) { + dev_err(tas_dev->dev, "%s: FW memory failed!\n", + __func__); + goto out; + } + offset += n; + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, + "%s: mnDevice_orientation error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnDevice_orientation = pData[offset]; + + pConfiguration->mnDevices = pData[offset + 1]; + offset += 2; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mProgram error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mProgram = pData[offset]; + offset++; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnSamplingRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnSamplingRate = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + + if (offset + 1 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPLLSrc error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnPLLSrc = pData[offset]; + offset++; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPLLSrcRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnPLLSrcRate = SMS_HTONL(pData[offset], + pData[offset + 1], pData[offset + 2], + pData[offset + 3]); + offset += 4; + + if (offset + 2 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnFsRate error\n", + __func__); + offset = -1; + goto out; + } + pConfiguration->mnFsRate = SMS_HTONS(pData[offset], + pData[offset + 1]); + offset += 2; + + offset = fw_parse_data(pFirmware, &(pConfiguration->mData), + pFW, offset); + if (offset < 0) + goto out; + } +out: + return offset; +} + +static int fw_parse_header(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, const struct firmware *pFW, int offset) +{ + struct tasdevice_dspfw_hdr *pFw_hdr = &(pFirmware->fw_hdr); + struct tasdevice_fw_fixed_hdr *pFw_fixed_hdr = &(pFw_hdr->mnFixedHdr); + const unsigned char *buf = (unsigned char *)pFW->data; + int i = 0; + unsigned char pMagicNumber[] = { 0x35, 0x35, 0x35, 0x32 }; + + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -EINVAL; + goto out; + } + if (memcmp(&buf[offset], pMagicNumber, 4)) { + dev_err(tas_dev->dev, "%s: Magic number doesn't match", + __func__); + offset = -EINVAL; + goto out; + } + pFw_fixed_hdr->mnMagicNumber = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnFWSize error\n", __func__); + offset = -1; + goto out; + } + pFw_fixed_hdr->mnFWSize = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: File Size error\n", __func__); + offset = -1; + goto out; + } + if (pFw_fixed_hdr->mnFWSize != pFW->size) { + dev_err(tas_dev->dev, "File size not match, %d %d", pFW->size, + pFw_fixed_hdr->mnFWSize); + offset = -1; + goto out; + } + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnChecksum error\n", __func__); + offset = -1; + goto out; + } + pFw_fixed_hdr->mnChecksum = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnPPCVersion error\n", __func__); + offset = -1; + goto out; + } + pFw_fixed_hdr->mnPPCVersion = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnFWVersion error\n", __func__); + offset = -1; + goto out; + } + pFw_fixed_hdr->mnFWVersion = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnDriverVersion error\n", __func__); + offset = -1; + goto out; + } + pFw_fixed_hdr->mnDriverVersion = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 4 > pFW->size) { + dev_err(tas_dev->dev, "%s: mnTimeStamp error\n", __func__); + offset = -1; + goto out; + } + for (i = 0; i < sizeof(BinFileformatVerInfo) / + sizeof(BinFileformatVerInfo[0]); i++) { + if (BinFileformatVerInfo[i][DRVFWVER] == + pFw_fixed_hdr->mnDriverVersion) { + pFw_hdr->mnBinFileDocVer = + BinFileformatVerInfo[i][BINFILEDOCVER]; + break; + } + } + pFw_fixed_hdr->mnTimeStamp = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + if (offset + 64 > pFW->size) { + dev_err(tas_dev->dev, "%s: mpDDCName error\n", __func__); + offset = -1; + goto out; + } + memcpy(pFw_fixed_hdr->mpDDCName, &buf[offset], 64); + offset += 64; + + out: + return offset; +} + +static const unsigned char crc8_lookup_table[CRC8_TABLE_SIZE] = { + 0x00, 0x4D, 0x9A, 0xD7, 0x79, 0x34, 0xE3, 0xAE, + 0xF2, 0xBF, 0x68, 0x25, 0x8B, 0xC6, 0x11, 0x5C, + 0xA9, 0xE4, 0x33, 0x7E, 0xD0, 0x9D, 0x4A, 0x07, + 0x5B, 0x16, 0xC1, 0x8C, 0x22, 0x6F, 0xB8, 0xF5, + 0x1F, 0x52, 0x85, 0xC8, 0x66, 0x2B, 0xFC, 0xB1, + 0xED, 0xA0, 0x77, 0x3A, 0x94, 0xD9, 0x0E, 0x43, + 0xB6, 0xFB, 0x2C, 0x61, 0xCF, 0x82, 0x55, 0x18, + 0x44, 0x09, 0xDE, 0x93, 0x3D, 0x70, 0xA7, 0xEA, + 0x3E, 0x73, 0xA4, 0xE9, 0x47, 0x0A, 0xDD, 0x90, + 0xCC, 0x81, 0x56, 0x1B, 0xB5, 0xF8, 0x2F, 0x62, + 0x97, 0xDA, 0x0D, 0x40, 0xEE, 0xA3, 0x74, 0x39, + 0x65, 0x28, 0xFF, 0xB2, 0x1C, 0x51, 0x86, 0xCB, + 0x21, 0x6C, 0xBB, 0xF6, 0x58, 0x15, 0xC2, 0x8F, + 0xD3, 0x9E, 0x49, 0x04, 0xAA, 0xE7, 0x30, 0x7D, + 0x88, 0xC5, 0x12, 0x5F, 0xF1, 0xBC, 0x6B, 0x26, + 0x7A, 0x37, 0xE0, 0xAD, 0x03, 0x4E, 0x99, 0xD4, + 0x7C, 0x31, 0xE6, 0xAB, 0x05, 0x48, 0x9F, 0xD2, + 0x8E, 0xC3, 0x14, 0x59, 0xF7, 0xBA, 0x6D, 0x20, + 0xD5, 0x98, 0x4F, 0x02, 0xAC, 0xE1, 0x36, 0x7B, + 0x27, 0x6A, 0xBD, 0xF0, 0x5E, 0x13, 0xC4, 0x89, + 0x63, 0x2E, 0xF9, 0xB4, 0x1A, 0x57, 0x80, 0xCD, + 0x91, 0xDC, 0x0B, 0x46, 0xE8, 0xA5, 0x72, 0x3F, + 0xCA, 0x87, 0x50, 0x1D, 0xB3, 0xFE, 0x29, 0x64, + 0x38, 0x75, 0xA2, 0xEF, 0x41, 0x0C, 0xDB, 0x96, + 0x42, 0x0F, 0xD8, 0x95, 0x3B, 0x76, 0xA1, 0xEC, + 0xB0, 0xFD, 0x2A, 0x67, 0xC9, 0x84, 0x53, 0x1E, + 0xEB, 0xA6, 0x71, 0x3C, 0x92, 0xDF, 0x08, 0x45, + 0x19, 0x54, 0x83, 0xCE, 0x60, 0x2D, 0xFA, 0xB7, + 0x5D, 0x10, 0xC7, 0x8A, 0x24, 0x69, 0xBE, 0xF3, + 0xAF, 0xE2, 0x35, 0x78, 0xD6, 0x9B, 0x4C, 0x01, + 0xF4, 0xB9, 0x6E, 0x23, 0x8D, 0xC0, 0x17, 0x5A, + 0x06, 0x4B, 0x9C, 0xD1, 0x7F, 0x32, 0xE5, 0xA8 +}; + +static int isInPageYRAM(struct tasdevice_priv *pTAS2781, + struct TYCRC *pCRCData, + unsigned char nBook, unsigned char nPage, + unsigned char nReg, unsigned char len) +{ + int nResult = 0; + + if (nBook == TAS2781_YRAM_BOOK1) { + if (nPage == TAS2781_YRAM1_PAGE) { + if (nReg >= TAS2781_YRAM1_START_REG) { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = len; + nResult = 1; + } else if ((nReg + len) > TAS2781_YRAM1_START_REG) { + pCRCData->mnOffset = TAS2781_YRAM1_START_REG; + pCRCData->mnLen = + len - (TAS2781_YRAM1_START_REG - nReg); + nResult = 1; + } else + nResult = 0; + } else if (nPage == TAS2781_YRAM3_PAGE) { + if (nReg > TAS2781_YRAM3_END_REG) { + nResult = 0; + } else if (nReg >= TAS2781_YRAM3_START_REG) { + if ((nReg + len) > TAS2781_YRAM3_END_REG) { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = + TAS2781_YRAM3_END_REG - nReg + 1; + nResult = 1; + } else { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = len; + nResult = 1; + } + } else { + if ((nReg + (len-1)) < + TAS2781_YRAM3_START_REG) + nResult = 0; + else { + pCRCData->mnOffset = + TAS2781_YRAM3_START_REG; + pCRCData->mnLen = + len - (TAS2781_YRAM3_START_REG - nReg); + nResult = 1; + } + } + } + } else if (nBook == + TAS2781_YRAM_BOOK2) { + if (nPage == TAS2781_YRAM5_PAGE) { + if (nReg > TAS2781_YRAM5_END_REG) { + nResult = 0; + } else if (nReg >= TAS2781_YRAM5_START_REG) { + if ((nReg + len) > TAS2781_YRAM5_END_REG) { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = + TAS2781_YRAM5_END_REG - nReg + 1; + nResult = 1; + } else { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = len; + nResult = 1; + } + } else { + if ((nReg + (len-1)) < + TAS2781_YRAM5_START_REG) + nResult = 0; + else { + pCRCData->mnOffset = + TAS2781_YRAM5_START_REG; + pCRCData->mnLen = + len - (TAS2781_YRAM5_START_REG - nReg); + nResult = 1; + } + } + } + } else + nResult = 0; + + return nResult; +} + +static int isInBlockYRAM(struct tasdevice_priv *pTAS2781, + struct TYCRC *pCRCData, + unsigned char nBook, unsigned char nPage, + unsigned char nReg, unsigned char len) +{ + int nResult = 0; + + if (nBook == TAS2781_YRAM_BOOK1) { + if (nPage < TAS2781_YRAM2_START_PAGE) + nResult = 0; + else if (nPage <= TAS2781_YRAM2_END_PAGE) { + if (nReg > TAS2781_YRAM2_END_REG) + nResult = 0; + else if (nReg >= TAS2781_YRAM2_START_REG) { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = len; + nResult = 1; + } else { + if ((nReg + (len-1)) < + TAS2781_YRAM2_START_REG) + nResult = 0; + else { + pCRCData->mnOffset = + TAS2781_YRAM2_START_REG; + pCRCData->mnLen = + nReg + len - TAS2781_YRAM2_START_REG; + nResult = 1; + } + } + } else + nResult = 0; + } else if (nBook == + TAS2781_YRAM_BOOK2) { + if (nPage < TAS2781_YRAM4_START_PAGE) + nResult = 0; + else if (nPage <= TAS2781_YRAM4_END_PAGE) { + if (nReg > TAS2781_YRAM2_END_REG) + nResult = 0; + else if (nReg >= TAS2781_YRAM2_START_REG) { + pCRCData->mnOffset = nReg; + pCRCData->mnLen = len; + nResult = 1; + } else { + if ((nReg + (len-1)) + < TAS2781_YRAM2_START_REG) + nResult = 0; + else { + pCRCData->mnOffset = + TAS2781_YRAM2_START_REG; + pCRCData->mnLen = + nReg + len - TAS2781_YRAM2_START_REG; + nResult = 1; + } + } + } else + nResult = 0; + } else + nResult = 0; + + return nResult; +} + +static int isYRAM(struct tasdevice_priv *pTAS2781, struct TYCRC *pCRCData, + unsigned char nBook, unsigned char nPage, + unsigned char nReg, unsigned char len) +{ + int nResult = 0; + + nResult = isInPageYRAM(pTAS2781, pCRCData, nBook, nPage, nReg, len); + if (nResult == 0) + nResult = isInBlockYRAM(pTAS2781, pCRCData, nBook, + nPage, nReg, len); + + return nResult; +} + +/* + * crc8-calculate a crc8 over the given input data. + * + * table: crc table used for calculation. + * pdata: pointer to data buffer. + * nbytes: number of bytes in data buffer. + * crc: previous returned crc8 value. + */ +static u8 ti_crc8(const u8 table[CRC8_TABLE_SIZE], u8 *pdata, + size_t nbytes, u8 crc) +{ + /*loop over the buffer data */ + while (nbytes-- > 0) + crc = table[(crc ^ *(pdata += 1)) & 0xff]; + + return crc; +} + +static int doSingleRegCheckSum(struct tasdevice_priv *pTAS2781, + enum channel chl, + unsigned char nBook, unsigned char nPage, + unsigned char nReg, unsigned char nValue) +{ + int nResult = 0; + struct TYCRC sCRCData; + unsigned int nData1 = 0; + + if ((nBook == TASDEVICE_BOOK_ID(TAS2781_SA_COEFF_SWAP_REG)) + && (nPage == TASDEVICE_PAGE_ID(TAS2781_SA_COEFF_SWAP_REG)) + && (nReg >= TASDEVICE_PAGE_REG(TAS2781_SA_COEFF_SWAP_REG)) + && (nReg <= (TASDEVICE_PAGE_REG( + TAS2781_SA_COEFF_SWAP_REG) + 4))) { + /*DSP swap command, pass */ + nResult = 0; + goto end; + } + + nResult = isYRAM(pTAS2781, &sCRCData, nBook, nPage, nReg, 1); + if (nResult == 1) { + nResult = pTAS2781->read(pTAS2781, chl, + TASDEVICE_REG(nBook, nPage, nReg), &nData1); + if (nResult < 0) + goto end; + + if (nData1 != nValue) { + dev_err(pTAS2781->dev, + "error2, B[0x%x]P[0x%x]R[0x%x] W[0x%x], R[0x%x]\n", + nBook, nPage, nReg, + nValue, nData1); + nResult = -EAGAIN; + pTAS2781->tasdevice[chl].mnErrCode |= + ERROR_YRAM_CRCCHK; + goto end; + } + + if (nData1 != nValue) { + dev_err(pTAS2781->dev, + "error2, B[0x%x]P[0x%x]R[0x%x] W[0x%x], R[0x%x]\n", + nBook, nPage, nReg, + nValue, nData1); + nResult = -EAGAIN; + goto end; + } + + nResult = ti_crc8(crc8_lookup_table, &nValue, 1, 0); + } + +end: + return nResult; +} + +static int doMultiRegCheckSum(struct tasdevice_priv *pTAS2781, + enum channel chn, unsigned char nBook, unsigned char nPage, + unsigned char nReg, unsigned int len) +{ + int nResult = 0, i = 0; + unsigned char nCRCChkSum = 0; + unsigned char nBuf1[128] = {0}; + struct TYCRC TCRCData; + + if ((nReg + len-1) > 127) { + nResult = -EINVAL; + dev_err(pTAS2781->dev, "firmware error\n"); + goto end; + } + + if ((nBook == TASDEVICE_BOOK_ID(TAS2781_SA_COEFF_SWAP_REG)) + && (nPage == TASDEVICE_PAGE_ID(TAS2781_SA_COEFF_SWAP_REG)) + && (nReg == TASDEVICE_PAGE_REG(TAS2781_SA_COEFF_SWAP_REG)) + && (len == 4)) { + /*DSP swap command, pass */ + nResult = 0; + goto end; + } + + nResult = isYRAM(pTAS2781, &TCRCData, nBook, nPage, nReg, len); + dev_info(pTAS2781->dev, + "isYRAM: nBook 0x%x, nPage 0x%x, nReg 0x%x\n", + nBook, nPage, nReg); + dev_info(pTAS2781->dev, + "isYRAM: TCRCData.mnLen 0x%x, len 0x%x, nResult %d\n", + TCRCData.mnLen, len, nResult); + dev_info(pTAS2781->dev, "TCRCData.mnOffset %x\n", TCRCData.mnOffset); + if (nResult == 1) { + if (len == 1) { + dev_err(pTAS2781->dev, "firmware error\n"); + nResult = -EINVAL; + goto end; + } else { + nResult = pTAS2781->bulk_read(pTAS2781, chn, + TASDEVICE_REG(nBook, nPage, TCRCData.mnOffset), + nBuf1, TCRCData.mnLen); + if (nResult < 0) + goto end; + + for (i = 0; i < TCRCData.mnLen; i++) { + if ((nBook == TASDEVICE_BOOK_ID( + TAS2781_SA_COEFF_SWAP_REG)) + && (nPage == TASDEVICE_PAGE_ID( + TAS2781_SA_COEFF_SWAP_REG)) + && ((i + TCRCData.mnOffset) + >= TASDEVICE_PAGE_REG( + TAS2781_SA_COEFF_SWAP_REG)) + && ((i + TCRCData.mnOffset) + <= (TASDEVICE_PAGE_REG( + TAS2781_SA_COEFF_SWAP_REG) + + 4))) { + /*DSP swap command, bypass */ + continue; + } else + nCRCChkSum += + ti_crc8(crc8_lookup_table, &nBuf1[i], + 1, 0); + } + + nResult = nCRCChkSum; + } + } + +end: + return nResult; +} + +static int tasdevice_load_block(struct tasdevice_priv *tas_dev, + struct TBlock *pBlock) +{ + int nResult = 0; + unsigned int nCommand = 0; + unsigned char nBook = 0; + unsigned char nPage = 0; + unsigned char nOffset = 0; + unsigned char nData = 0; + unsigned int nLength = 0; + unsigned int nSleep = 0; + unsigned char nCRCChkSum = 0; + unsigned int nValue = 0; + int nRetry = 6; + unsigned char *pData = pBlock->mpData; + int chn = 0, chnend = 0; + + dev_info(tas_dev->dev, + "TAS2781 load block: Type = %d, commands = %d\n", + pBlock->mnType, pBlock->mnCommands); + switch (pBlock->mnType) { + case MAIN_ALL_DEVICES: + chn = 0; + chnend = tas_dev->ndev; + break; + case MAIN_DEVICE_A: + case COEFF_DEVICE_A: + case PRE_DEVICE_A: + chn = 0; + chnend = 1; + break; + case MAIN_DEVICE_B: + case COEFF_DEVICE_B: + case PRE_DEVICE_B: + chn = 1; + chnend = 2; + break; + case MAIN_DEVICE_C: + case COEFF_DEVICE_C: + case PRE_DEVICE_C: + chn = 2; + chnend = 3; + break; + case MAIN_DEVICE_D: + case COEFF_DEVICE_D: + case PRE_DEVICE_D: + chn = 3; + chnend = 4; + break; + default: + dev_info(tas_dev->dev, + "TAS2781 load block: Other Type = 0x%02x\n", + pBlock->mnType); + break; + } + + for (; chn < chnend; chn++) { + if (tas_dev->tasdevice[chn].bLoading == false) + continue; +start: + if (pBlock->mbPChkSumPresent) { + nResult = tas_dev->write(tas_dev, chn, + TASDEVICE_I2CChecksum, 0); + if (nResult < 0) + goto end; + } + + if (pBlock->mbYChkSumPresent) + nCRCChkSum = 0; + + nCommand = 0; + + while (nCommand < pBlock->mnCommands) { + pData = pBlock->mpData + nCommand * 4; + + nBook = pData[0]; + nPage = pData[1]; + nOffset = pData[2]; + nData = pData[3]; + + nCommand++; + + if (nOffset <= 0x7F) { + nResult = tas_dev->write(tas_dev, chn, + TASDEVICE_REG(nBook, nPage, nOffset), + nData); + if (nResult < 0) + goto end; + if (pBlock->mbYChkSumPresent) { + nResult = doSingleRegCheckSum(tas_dev, + chn, nBook, nPage, nOffset, + nData); + if (nResult < 0) + goto check; + nCRCChkSum += (unsigned char)nResult; + } + } else if (nOffset == 0x81) { + nSleep = (nBook << 8) + nPage; + msleep(nSleep); + } else if (nOffset == 0x85) { + pData += 4; + nLength = (nBook << 8) + nPage; + nBook = pData[0]; + nPage = pData[1]; + nOffset = pData[2]; + if (nLength > 1) { + nResult = tas_dev->bulk_write(tas_dev, + chn, TASDEVICE_REG(nBook, + nPage, nOffset), pData + 3, + nLength); + if (nResult < 0) + goto end; + if (pBlock->mbYChkSumPresent) { + nResult = doMultiRegCheckSum( + tas_dev, chn, nBook, + nPage, nOffset, + nLength); + if (nResult < 0) + goto check; + nCRCChkSum += + (unsigned char)nResult; + } + } else { + nResult = tas_dev->write(tas_dev, chn, + TASDEVICE_REG(nBook, nPage, + nOffset), + pData[3]); + if (nResult < 0) + goto end; + if (pBlock->mbYChkSumPresent) { + nResult = doSingleRegCheckSum( + tas_dev, chn, nBook, + nPage, nOffset, + pData[3]); + if (nResult < 0) + goto check; + nCRCChkSum += + (unsigned char)nResult; + } + } + + nCommand++; + if (nLength >= 2) + nCommand += ((nLength - 2) / 4) + 1; + } + } + if (pBlock->mbPChkSumPresent) { + nResult = tas_dev->read(tas_dev, chn, + TASDEVICE_I2CChecksum, &nValue); + if (nResult < 0) { + dev_err(tas_dev->dev, "%s: Channel %d\n", + __func__, chn); + goto check; + } + if ((nValue&0xff) != pBlock->mnPChkSum) { + dev_err(tas_dev->dev, + "Block PChkSum Channel %d Error: FW = 0x%x, Reg = 0x%x\n", + chn, pBlock->mnPChkSum, (nValue&0xff)); + nResult = -EAGAIN; + tas_dev->tasdevice[chn].mnErrCode |= + ERROR_PRAM_CRCCHK; + goto check; + } + nResult = 0; + tas_dev->tasdevice[chn].mnErrCode &= + ~ERROR_PRAM_CRCCHK; + dev_info(tas_dev->dev, "Block[0x%02x] PChkSum match\n", + pBlock->mnType); + } + + if (pBlock->mbYChkSumPresent) { + //TBD, open it when FW ready + dev_err(tas_dev->dev, "Block YChkSum: FW = 0x%x, YCRC = 0x%x\n", + pBlock->mnYChkSum, + nCRCChkSum); + + tas_dev->tasdevice[chn].mnErrCode &= + ~ERROR_YRAM_CRCCHK; + nResult = 0; + dev_info(tas_dev->dev, + "Block[0x%x] YChkSum match\n", pBlock->mnType); + } +check: + if (nResult == -EAGAIN) { + nRetry--; + if (nRetry > 0) + goto start; + else { + if ((pBlock->mnType == MAIN_ALL_DEVICES) + || (pBlock->mnType == MAIN_DEVICE_A) + || (pBlock->mnType == MAIN_DEVICE_B) + || (pBlock->mnType == MAIN_DEVICE_C) + || (pBlock->mnType == MAIN_DEVICE_D)) { + tas_dev->tasdevice[chn].mnCurrentProgram + = -1; + } else { + tas_dev->tasdevice[chn].mnCurrentConfiguration + = -1; + } + nRetry = 6; + } + } + } +end: + if (nResult < 0) { + dev_err(tas_dev->dev, "Block (%d) load error\n", + pBlock->mnType); + } + return nResult; +} + + +static int tasdevice_load_data(struct tasdevice_priv *tas_dev, + struct TData *pData) +{ + int nResult = 0; + unsigned int nBlock = 0; + struct TBlock *pBlock = NULL; + + dev_info(tas_dev->dev, "%s: TAS2781 load data: %s, Blocks = %d\n", + __func__, + pData->mpName, pData->mnBlocks); + + for (nBlock = 0; nBlock < pData->mnBlocks; nBlock++) { + pBlock = &(pData->mpBlocks[nBlock]); + nResult = tas_dev->tasdevice_load_block(tas_dev, pBlock); + if (nResult < 0) + break; + } + + return nResult; +} + +static int tasdevice_load_calibrated_data( + struct tasdevice_priv *tas_dev, struct TData *pData) +{ + int nResult = 0; + unsigned int nBlock = 0; + struct TBlock *pBlock = NULL; + + dev_info(tas_dev->dev, "%s: TAS2781 load data: %s, Blocks = %d\n", + __func__, + pData->mpName, pData->mnBlocks); + + for (nBlock = 0; nBlock < pData->mnBlocks; nBlock++) { + pBlock = &(pData->mpBlocks[nBlock]); + nResult = tasdevice_load_block(tas_dev, pBlock); + if (nResult < 0) + break; + } + + return nResult; +} + +int tas2781_load_calibration(void *pContext, + char *pFileName, enum channel i) +{ + int ret = 0, nSize = 0, offset = 0; + loff_t pos = 0; + struct file *filp = NULL; + struct firmware FW; + const struct firmware *fw_entry = NULL; + char *data = NULL; + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *)pContext; + struct Ttasdevice *pTasdev = &(tas_dev->tasdevice[i]); + struct TFirmware *mpCalFirmware = NULL; + char pHint[256]; + + ret = request_firmware(&fw_entry, pFileName, tas_dev->dev); + if (!ret) { + if (!fw_entry->size) { + dev_err(tas_dev->dev, + "%s: file read error: size = %d\n", + __func__, fw_entry->size); + goto out; + } + FW.size = fw_entry->size; + FW.data = fw_entry->data; + dev_info(tas_dev->dev, + "%s: file = %s, file size %zd\n", + __func__, pFileName, fw_entry->size); + } else { + dev_info(tas_dev->dev, + "%s: Request firmware failed, try flip_open()\n", + __func__); + + scnprintf(pHint, sizeof(pHint), "%s%s\n", + TAS2781_CAL_BIN_PATH, pFileName); + filp = filp_open(pHint, O_RDONLY, 664); + if (!IS_ERR_OR_NULL(filp)) { + FW.size = i_size_read(file_inode(filp)); + dev_info(tas_dev->dev, + "%s: file = %s, file size %ld\n", + __func__, pHint, (long)FW.size); + data = kmalloc(FW.size, GFP_KERNEL); + if (data == NULL) { + dev_err(tas_dev->dev, "%s: malloc error\n", + __func__); + goto out; + } + nSize = (int)kernel_read(filp, data, FW.size, &pos); + if (!nSize) { + dev_err(tas_dev->dev, + "%s: file read error: size = %d\n", + __func__, nSize); + goto out; + } + dev_info(tas_dev->dev, "read filed nSize = %d\n", + nSize); + FW.data = data; + } else { + dev_err(tas_dev->dev, + "%s: cannot open calibration file: %s\n", + __func__, pHint); + goto out; + } + } + + mpCalFirmware = pTasdev->mpCalFirmware = kcalloc(1, + sizeof(struct TFirmware), GFP_KERNEL); + if (pTasdev->mpCalFirmware == NULL) { + dev_err(tas_dev->dev, "%s: FW memory failed!\n", __func__); + ret = -1; + goto out; + } + mpCalFirmware->dev = tas_dev->dev; + offset = fw_parse_header(tas_dev, mpCalFirmware, &FW, offset); + if (offset == -1) { + dev_err(tas_dev->dev, "%s: fw_parse_header EXIT!\n", __func__); + goto out; + } + offset = fw_parse_variable_header_cal(tas_dev, mpCalFirmware, &FW, + offset); + if (offset == -1) { + dev_err(tas_dev->dev, + "%s: fw_parse_variable_header_cal EXIT!\n", __func__); + goto out; + } + offset = fw_parse_program_data(tas_dev, mpCalFirmware, &FW, offset); + if (offset == -1) { + dev_err(tas_dev->dev, "%s: fw_parse_program_data EXIT!\n", + __func__); + goto out; + } + offset = fw_parse_configuration_data(tas_dev, mpCalFirmware, &FW, + offset); + if (offset == -1) { + dev_err(tas_dev->dev, + "%s: fw_parse_configuration_data EXIT!\n", __func__); + goto out; + } + offset = fw_parse_calibration_data(tas_dev, + mpCalFirmware, &FW, offset); + if (offset == -1) { + dev_err(tas_dev->dev, "%s: fw_parse_calibration_data EXIT!\n", + __func__); + goto out; + } + pTasdev->mbCalibrationLoaded = true; +out: + if (!IS_ERR_OR_NULL(filp)) { + filp_close(filp, NULL); + kfree(data); + } + if (fw_entry) { + release_firmware(fw_entry); + fw_entry = NULL; + } + return ret; +} + +int tasdevice_dspfw_ready(const void *pVoid, void *pContext) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + const struct firmware *pFW = (const struct firmware *)pVoid; + struct TFirmware *pFirmware = NULL; + struct tasdevice_fw_fixed_hdr *pFw_fixed_hdr = NULL; + int offset = 0, ret = 0; + + if (!pFW || !pFW->data) { + dev_err(tas_dev->dev, "%s: Failed to read firmware %s\n", + __func__, tas_dev->dsp_binaryname); + ret = -1; + goto out; + } + + tas_dev->mpFirmware = kcalloc(1, + sizeof(struct TFirmware), GFP_KERNEL); + if (tas_dev->mpFirmware == NULL) { + ret = -1; + goto out; + } + pFirmware = tas_dev->mpFirmware; + pFirmware->dev = tas_dev->dev; + offset = fw_parse_header(tas_dev, pFirmware, pFW, offset); + + if (offset == -1) + goto out; + pFw_fixed_hdr = &(pFirmware->fw_hdr.mnFixedHdr); + switch (pFw_fixed_hdr->mnDriverVersion) { + case 0x301: + case 0x302: + case 0x502: + tas_dev->fw_parse_variable_header = + fw_parse_variable_header_kernel; + tas_dev->fw_parse_program_data = + fw_parse_program_data_kernel; + tas_dev->fw_parse_configuration_data = + fw_parse_configuration_data_kernel; + tas_dev->tasdevice_load_block = + tasdevice_load_block_kernel; + pFirmware->bKernelFormat = true; + break; + case 0x202: + case 0x400: + tas_dev->fw_parse_variable_header = + fw_parse_variable_header_git; + tas_dev->fw_parse_program_data = + fw_parse_program_data; + tas_dev->fw_parse_configuration_data = + fw_parse_configuration_data; + tas_dev->tasdevice_load_block = + tasdevice_load_block; + pFirmware->bKernelFormat = false; + break; + default: + if (pFw_fixed_hdr->mnDriverVersion == 0x100) { + if (pFw_fixed_hdr->mnPPCVersion >= PPC3_VERSION) { + tas_dev->fw_parse_variable_header = + fw_parse_variable_header_kernel; + tas_dev->fw_parse_program_data = + fw_parse_program_data_kernel; + tas_dev->fw_parse_configuration_data = + fw_parse_configuration_data_kernel; + tas_dev->tasdevice_load_block = + tasdevice_load_block_kernel; + tas_dev->fw_parse_calibration_data = NULL; + } else { + switch (pFw_fixed_hdr->mnPPCVersion) { + case 0x00: + tas_dev->fw_parse_variable_header = + fw_parse_variable_header_git; + tas_dev->fw_parse_program_data = + fw_parse_program_data; + tas_dev->fw_parse_configuration_data = + fw_parse_configuration_data; + tas_dev->fw_parse_calibration_data = + fw_parse_calibration_data; + tas_dev->tasdevice_load_block = + tasdevice_load_block; + break; + default: + dev_err(tas_dev->dev, + "%s: PPCVersion must be 0x0 or 0x%02x Current:0x%02x\n", + __func__, PPC3_VERSION, + pFw_fixed_hdr->mnPPCVersion); + offset = -1; + break; + } + } + } else { + dev_err(tas_dev->dev, + "%s: DriverVersion must be 0x0, 0x230 or above 0x230:0x%02x\n", + __func__, + pFw_fixed_hdr->mnDriverVersion); + offset = -1; + } + break; + } + + offset = tas_dev->fw_parse_variable_header(tas_dev, pFW, offset); + if (offset == -1) + goto out; + + offset = tas_dev->fw_parse_program_data(tas_dev, pFirmware, pFW, + offset); + if (offset < 0) { + ret = -1; + goto out; + } + offset = tas_dev->fw_parse_configuration_data(tas_dev, + pFirmware, pFW, offset); + if (offset < 0) + ret = -1; + +out: + return ret; +} + +void tasdevice_calbin_remove(void *pContext) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + struct Ttasdevice *pTasdev = NULL; + int i = 0; + + if (tas_dev) { + for (i = 0; i < tas_dev->ndev; i++) { + pTasdev = &(tas_dev->tasdevice[i]); + if (pTasdev->mpCalFirmware) { + tas2781_clear_Calfirmware( + pTasdev->mpCalFirmware); + pTasdev->mpCalFirmware = NULL; + } + } + } +} + +void tasdevice_dsp_remove(void *pContext) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + int i = 0; + + if (tas_dev) { + if (tas_dev->mpFirmware) { + struct TFirmware *pFirmware = tas_dev->mpFirmware; + + if (pFirmware->mpPrograms) { + struct TProgram *pProgram; + + for (i = 0; i < pFirmware->mnPrograms; i++) { + pProgram = &(pFirmware->mpPrograms[i]); + if (pProgram) { + struct TData *pImageData = + &(pProgram->mData); + + if (pImageData->mpBlocks) { + struct TBlock *pBlock; + unsigned int nBlock; + + for (nBlock = 0; + nBlock < + pImageData->mnBlocks; + nBlock++) { + pBlock = + &(pImageData->mpBlocks[nBlock]); + kfree(pBlock->mpData); + } + kfree(pImageData->mpBlocks); + } + kfree(pProgram->mpDescription); + } + } + kfree(pFirmware->mpPrograms); + } + + if (pFirmware->mpConfigurations) { + struct TConfiguration *pConfig; + + for (i = 0; i < pFirmware->mnConfigurations; + i++) { + pConfig = + &(pFirmware->mpConfigurations[i]); + if (pConfig) { + struct TData *pImageData = + &(pConfig->mData); + + if (pImageData->mpBlocks) { + struct TBlock *pBlock; + unsigned int nBlock; + + for (nBlock = 0; + nBlock < + pImageData->mnBlocks; + nBlock++) { + pBlock = + &(pImageData->mpBlocks[nBlock]); + kfree(pBlock->mpData); + } + kfree(pImageData->mpBlocks); + } + kfree(pConfig->mpDescription); + } + } + kfree(pFirmware->mpConfigurations); + } + kfree(pFirmware->fw_hdr.mpDescription); + kfree(pFirmware); + tas_dev->mpFirmware = NULL; + } + } +} + +void tasdevice_select_tuningprm_cfg(void *pContext, int prm_no, + int cfg_no, int regbin_conf_no) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + struct tasdevice_regbin *regbin = &(tas_dev->mtRegbin); + struct tasdevice_config_info **cfg_info = regbin->cfg_info; + struct TFirmware *pFirmware = tas_dev->mpFirmware; + struct TConfiguration *pConfigurations = NULL; + struct TProgram *pProgram = NULL; + int i = 0; + int status = 0; + + if (pFirmware == NULL) { + dev_err(tas_dev->dev, "%s: Firmware is NULL\n", __func__); + goto out; + } + + if (cfg_no >= pFirmware->mnConfigurations) { + dev_err(tas_dev->dev, + "%s: cfg(%d) is not in range of conf %u\n", + __func__, cfg_no, pFirmware->mnConfigurations); + goto out; + } + + if (prm_no >= pFirmware->mnPrograms || prm_no == 1) { + dev_err(tas_dev->dev, + "%s: prm(%d) is not in range of Programs %u\n", + __func__, prm_no, pFirmware->mnPrograms); + goto out; + } + + if (regbin_conf_no > regbin->ncfgs || regbin_conf_no < 0 || + cfg_info == NULL) { + dev_err(tas_dev->dev, + "conf_no:%d should be in range from 0 to %u\n", + regbin_conf_no, regbin->ncfgs-1); + goto out; + } else { + dev_info(tas_dev->dev, "%s: regbin_profile_conf_id = %d\n", + __func__, regbin_conf_no); + } + + tas_dev->mnCurrentConfiguration = cfg_no; + tas_dev->mnCurrentProgram = prm_no; + + pConfigurations = &(pFirmware->mpConfigurations[cfg_no]); + for (i = 0; i < tas_dev->ndev; i++) { + if (cfg_info[regbin_conf_no]->active_dev & (1 << i)) { + if (tas_dev->tasdevice[i].mnCurrentProgram != prm_no) { + tas_dev->tasdevice[i].mnCurrentConfiguration + = -1; + tas_dev->tasdevice[i].bLoading = true; + status++; + } + } else + tas_dev->tasdevice[i].bLoading = false; + tas_dev->tasdevice[i].bLoaderr = false; + } + + if (status) { + pProgram = &(pFirmware->mpPrograms[prm_no]); + tasdevice_load_data(tas_dev, &(pProgram->mData)); + for (i = 0; i < tas_dev->ndev; i++) { + if (tas_dev->tasdevice[i].bLoaderr == true) + continue; + else if (tas_dev->tasdevice[i].bLoaderr == false + && tas_dev->tasdevice[i].bLoading == true) { + struct TFirmware *pCalFirmware = + tas_dev->tasdevice[i].mpCalFirmware; + + if (pCalFirmware) { + struct TCalibration *pCalibration = + pCalFirmware->mpCalibrations; + + if (pCalibration) + tasdevice_load_calibrated_data( + tas_dev, + &(pCalibration->mData)); + } + tas_dev->tasdevice[i].mnCurrentProgram + = prm_no; + } + } + } + + if (tas_dev->mbCalibrationLoaded == false) { + for (i = 0; i < tas_dev->ndev; i++) + tas_dev->set_calibration(tas_dev, i, 0x100); + tas_dev->mbCalibrationLoaded = true; + /* No wise to reload calibrationdata everytime, + * this code will work once even if calibrated + * data still failed to be got + */ + } + + status = 0; + for (i = 0; i < tas_dev->ndev; i++) { + dev_info(tas_dev->dev, "%s,fun %d,%d,%d\n", __func__, + tas_dev->tasdevice[i].mnCurrentConfiguration, + cfg_info[regbin_conf_no]->active_dev, + tas_dev->tasdevice[i].bLoaderr); + if (tas_dev->tasdevice[i].mnCurrentConfiguration != cfg_no + && (cfg_info[regbin_conf_no]->active_dev & (1 << i)) + && (tas_dev->tasdevice[i].bLoaderr == false)) { + status++; + tas_dev->tasdevice[i].bLoading = true; + } else + tas_dev->tasdevice[i].bLoading = false; + } + + if (status) { + status = 0; + tasdevice_load_data(tas_dev, &(pConfigurations->mData)); + for (i = 0; i < tas_dev->ndev; i++) { + if (tas_dev->tasdevice[i].bLoaderr == true) { + status |= 1 << (i + 4); + continue; + } else if (tas_dev->tasdevice[i].bLoaderr == false + && tas_dev->tasdevice[i].bLoading == true) { + tas_dev->tasdevice[i].mnCurrentConfiguration + = cfg_no; + tas_dev->tasdevice[i].bDSPBypass = false; + } + } + } else { + dev_err(tas_dev->dev, + "%s: No device is in active in conf %d\n", + __func__, regbin_conf_no); + } + + status |= cfg_info[regbin_conf_no]->active_dev; + dev_info(tas_dev->dev, "%s: DSP mode: load status is %08x\n", + __func__, status); +out: + return; +} + +int tas2781_set_calibration(void *pContext, enum channel i, + int nCalibration) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + int nResult = 0; + struct Ttasdevice *pTasdev = &(tas_dev->tasdevice[i]); + struct TFirmware *pCalFirmware = pTasdev->mpCalFirmware; + + if ((!tas_dev->mpFirmware->mpPrograms) + || (!tas_dev->mpFirmware->mpConfigurations)) { + dev_err(tas_dev->dev, "%s, Firmware not loaded\n\r", __func__); + nResult = 0; + goto out; + } + + if (nCalibration == 0xFF || (nCalibration == 0x100 + && pTasdev->mbCalibrationLoaded == false)) { + if (pCalFirmware) { + pTasdev->mbCalibrationLoaded = false; + tas2781_clear_Calfirmware(pCalFirmware); + pCalFirmware = NULL; + } + + scnprintf(tas_dev->cal_binaryname[i], 64, "%s_cal_0x%02x.bin", + tas_dev->dev_name, tas_dev->tasdevice[i].mnDevAddr); + nResult = tas2781_load_calibration(tas_dev, + tas_dev->cal_binaryname[i], i); + if (nResult != 0) { + dev_err(tas_dev->dev, + "%s: load %s error, no-side effect for playback\n", + __func__, tas_dev->cal_binaryname[i]); + nResult = 0; + } + } + pTasdev->bLoading = true; + pTasdev->bLoaderr = false; + + if (pCalFirmware) { + struct TCalibration *pCalibration = + pCalFirmware->mpCalibrations; + + if (pCalibration) + tasdevice_load_calibrated_data(tas_dev, + &(pCalibration->mData)); + } else + dev_err(tas_dev->dev, + "%s: No calibrated data for device %d\n", __func__, i); + +out: + return nResult; +} diff --git a/sound/soc/codecs/tas2781-dsp.h b/sound/soc/codecs/tas2781-dsp.h new file mode 100644 index 000000000..f7b689ad6 --- /dev/null +++ b/sound/soc/codecs/tas2781-dsp.h @@ -0,0 +1,213 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier + * + * Copyright (C) 2022 - 2023 Texas Instruments Incorporated + * https://www.ti.com + * + * The TAS2781 driver implements a flexible and configurable register setting + * for one, two, even multiple TAS2781 chips. All the register setting are in + * a bin file. Almost no specific register setting can be found in the code. + * + * Author: Shenghao Ding <shenghao-ding(a)ti.com> + * Kevin Lu <kevin-lu(a)ti.com> + */ + +#ifndef __TASDEVICE_DSP_H__ +#define __TASDEVICE_DSP_H__ + +#define MAIN_ALL_DEVICES (0x0d) +#define MAIN_DEVICE_A (0x01) +#define MAIN_DEVICE_B (0x08) +#define MAIN_DEVICE_C (0x10) +#define MAIN_DEVICE_D (0x14) +#define COEFF_DEVICE_A (0x03) +#define COEFF_DEVICE_B (0x0a) +#define COEFF_DEVICE_C (0x11) +#define COEFF_DEVICE_D (0x15) +#define PRE_DEVICE_A (0x04) +#define PRE_DEVICE_B (0x0b) +#define PRE_DEVICE_C (0x12) +#define PRE_DEVICE_D (0x16) + +#define PPC3_VERSION 0x4100 +#define REGBIN_CONFIGID_BYPASS_ALL (0) +#define TASDEVICE_DEVICE_SUM (8) +#define TASDEVICE_CONFIG_SUM (64) + +enum channel { + TopLeftChn = 0x00, + TopRightChn = 0x01, + BottomLeftChn = 0x02, + BottomRightChn = 0x03, + MaxChn, +}; + +enum tasdevice_dsp_dev_idx { + TASDEVICE_DSP_TAS_2555 = 0, + TASDEVICE_DSP_TAS_2555_STEREO, + TASDEVICE_DSP_TAS_2557_MONO, + TASDEVICE_DSP_TAS_2557_DUAL_MONO, + TASDEVICE_DSP_TAS_2559, + TASDEVICE_DSP_TAS_2563, + TASDEVICE_DSP_TAS_2563_DUAL_MONO = 7, + TASDEVICE_DSP_TAS_2563_QUAD, + TASDEVICE_DSP_TAS_2563_21, + TASDEVICE_DSP_TAS_2781, + TASDEVICE_DSP_TAS_2781_DUAL_MONO, + TASDEVICE_DSP_TAS_2781_21, + TASDEVICE_DSP_TAS_2781_QUAD, + TASDEVICE_DSP_TAS_MAX_DEVICE +}; + +struct tasdevice_fw_fixed_hdr { + unsigned int mnMagicNumber; + unsigned int mnFWSize; + unsigned int mnChecksum; + unsigned int mnPPCVersion; + unsigned int mnFWVersion; + unsigned int mnDriverVersion; + unsigned int mnTimeStamp; + char mpDDCName[64]; +}; + +struct tasdevice_dspfw_hdr { + struct tasdevice_fw_fixed_hdr mnFixedHdr; + unsigned int mnBinFileDocVer; + char *mpDescription; + unsigned short mnDeviceFamily; + unsigned short mnDevice; + unsigned char ndev; +}; + +struct TBlock { + unsigned int mnType; + unsigned char mbPChkSumPresent; + unsigned char mnPChkSum; + unsigned char mbYChkSumPresent; + unsigned char mnYChkSum; + unsigned int mnCommands; + unsigned int blk_size; + unsigned int nSublocks; + unsigned char *mpData; +}; + +struct TData { + char mpName[64]; + char *mpDescription; + unsigned int mnBlocks; + struct TBlock *mpBlocks; +}; +struct TProgram { + unsigned int prog_size; + char mpName[64]; + char *mpDescription; + unsigned char mnAppMode; + unsigned char mnPDMI2SMode; + unsigned char mnISnsPD; + unsigned char mnVSnsPD; + unsigned char mnPowerLDG; + struct TData mData; +}; + +struct TConfiguration { + unsigned int cfg_size; + char mpName[64]; + char *mpDescription; + unsigned char mnDevice_orientation; + unsigned char mnDevices; + unsigned int mProgram; + unsigned int mnSamplingRate; + unsigned short mnPLLSrc; + unsigned int mnPLLSrcRate; + unsigned int mnFsRate; + struct TData mData; +}; + +struct TCalibration { + char mpName[64]; + char *mpDescription; + unsigned int mnProgram; + unsigned int mnConfiguration; + struct TData mData; +}; + +struct TFirmware { + struct tasdevice_dspfw_hdr fw_hdr; + unsigned int prog_start_offset; + unsigned short mnPrograms; + struct TProgram *mpPrograms; + unsigned int cfg_start_offset; + unsigned short mnConfigurations; + struct TConfiguration *mpConfigurations; + unsigned short mnCalibrations; + struct TCalibration *mpCalibrations; + bool bKernelFormat; + struct device *dev; +}; + +enum tasdevice_dsp_fw_state { + TASDEVICE_DSP_FW_NONE = 0, + TASDEVICE_DSP_FW_PENDING, + TASDEVICE_DSP_FW_FAIL, + TASDEVICE_DSP_FW_ALL_OK, +}; + +enum tasdevice_bin_blk_type { + TASDEVICE_BIN_BLK_COEFF = 1, + TASDEVICE_BIN_BLK_POST_POWER_UP, + TASDEVICE_BIN_BLK_PRE_SHUTDOWN, + TASDEVICE_BIN_BLK_PRE_POWER_UP, + TASDEVICE_BIN_BLK_POST_SHUTDOWN +}; + +struct tasdevice_regbin_hdr { + unsigned int img_sz; + unsigned int checksum; + unsigned int binary_version_num; + unsigned int drv_fw_version; + unsigned int timestamp; + unsigned char plat_type; + unsigned char dev_family; + unsigned char reserve; + unsigned char ndev; + unsigned char devs[TASDEVICE_DEVICE_SUM]; + unsigned int nconfig; + unsigned int config_size[TASDEVICE_CONFIG_SUM]; +}; + +struct tasdevice_block_data { + unsigned char dev_idx; + unsigned char block_type; + unsigned short yram_checksum; + unsigned int block_size; + unsigned int nSublocks; + unsigned char *regdata; +}; + +struct tasdevice_config_info { + char mpName[64]; + unsigned int nblocks; + unsigned int real_nblocks; + unsigned char active_dev; + struct tasdevice_block_data **blk_data; +}; + +struct tasdevice_regbin { + struct tasdevice_regbin_hdr fw_hdr; + int ncfgs; + struct tasdevice_config_info **cfg_info; + int profile_cfg_id; +}; + +int tasdevice_dspfw_ready(const void *pVoid, void *pContext); +void tasdevice_dsp_remove(void *pContext); +void tasdevice_calbin_remove(void *pContext); +int tas2781_load_calibration(void *tas_dev, char *pFileName, + enum channel i); +int tas2781_set_calibration(void *pContext, enum channel i, + int nCalibration); +void tasdevice_select_tuningprm_cfg(void *pContext, int prm, + int cfg_no, int regbin_conf_no); + +#endif diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c new file mode 100644 index 000000000..3ee254777 --- /dev/null +++ b/sound/soc/codecs/tas2781-i2c.c @@ -0,0 +1,2143 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier + * + * Copyright (C) 2022 - 2023 Texas Instruments Incorporated + * https://www.ti.com + * + * The TAS2781 driver implements a flexible and configurable register setting + * for one, two, even multiple TAS2781 chips. All the register setting are in + * a bin file. Almost no specific register setting can be found in the code. + * + * Author: Shenghao Ding <shenghao-ding(a)ti.com> + * Kevin Lu <kevin-lu(a)ti.com> + */ + +#include <linux/module.h> +#include <linux/regmap.h> +#include <linux/init.h> +#include <linux/pm.h> +#include <linux/i2c.h> +#include <linux/of.h> +#include <linux/slab.h> +#include <linux/firmware.h> +#include <linux/of_gpio.h> +#include <linux/interrupt.h> +#include <sound/soc.h> +#include <sound/pcm_params.h> +#include <sound/tlv.h> + +#include "tas2781.h" + +/* max. length of a alsa mixer control name */ +#define MAX_CONTROL_NAME (48) +#define TASDEVICE_CLK_DIR_IN (0) +#define TASDEVICE_CLK_DIR_OUT (1) + +#define TASDEVICE_IRQ_DET_TIMEOUT (30000) +#define TASDEVICE_IRQ_DET_CNT_LIMIT (500) +#define TAS2781_REG_INT_LTCH0 TASDEVICE_REG(0X0, 0x0, 0x49) +#define TAS2781_REG_INT_LTCH1 TASDEVICE_REG(0X0, 0x0, 0x4A) +#define TAS2781_REG_INT_LTCH1_0 TASDEVICE_REG(0X0, 0x0, 0x4B) +#define TAS2781_REG_INT_LTCH2 TASDEVICE_REG(0X0, 0x0, 0x4F) +#define TAS2781_REG_INT_LTCH3 TASDEVICE_REG(0X0, 0x0, 0x50) +#define TAS2781_REG_INT_LTCH4 TASDEVICE_REG(0X0, 0x0, 0x51) + +const char *blocktype[5] = { + "COEFF", + "POST_POWER_UP", + "PRE_SHUTDOWN", + "PRE_POWER_UP", + "POST_SHUTDOWN" +}; + +static const char * const dts_dev_addr_tag[] = { + "ti,topleft-channel", + "ti,topright-channel", + "ti,bottomleft-channel", + "ti,bottomright-channel" +}; + +static const char *dts_rst_tag = "ti,%s-gpio%d"; + +static const char *dts_glb_addr_tag = "ti,global-address"; + +static const struct i2c_device_id tasdevice_id[] = { + { "audev", GENERAL_AUDEV }, + { "tas2781", TAS2781 }, + {} +}; + +MODULE_DEVICE_TABLE(i2c, tasdevice_id); + +static bool tasdevice_volatile(struct device *dev, unsigned int reg) +{ + return true; +} + +static bool tasdevice_writeable(struct device *dev, unsigned int reg) +{ + return true; +} + +static const struct regmap_config tasdevice_regmap = { + .reg_bits = 8, + .val_bits = 8, + .writeable_reg = tasdevice_writeable, + .volatile_reg = tasdevice_volatile, + .cache_type = REGCACHE_FLAT, + .max_register = 1 * 128, +}; + +static const struct of_device_id tasdevice_of_match[] = { + { .compatible = "ti,audev" }, + { .compatible = "ti,tas2781" }, + {}, +}; + +MODULE_DEVICE_TABLE(of, tasdevice_of_match); + +int tasdevice_process_block(void *pContext, + unsigned char *data, unsigned char dev_idx, int sublocksize) +{ + struct tasdevice_priv *tas_dev = + (struct tasdevice_priv *)pContext; + unsigned char subblk_typ = data[1]; + int subblk_offset = 2; + int chn = 0, chnend = 0; + int rc = 0; + int blktyp = dev_idx & 0xC0, idx = dev_idx & 0x3F; + bool bError = false; + + if (idx) { + chn = idx-1; + chnend = idx; + } else { + if (tas_dev->glb_addr.mnDevAddr) { + chn = tas_dev->ndev; + chnend = tas_dev->ndev + 1; + } else { + chn = 0; + chnend = tas_dev->ndev; + } + } + + for (; chn < chnend; chn++) { + if (tas_dev->glb_addr.mnDevAddr == 0 && + tas_dev->tasdevice[chn].bLoading == false) + continue; + + bError = false; + subblk_offset = 2; + switch (subblk_typ) { + case TASDEVICE_CMD_SING_W: { + int i = 0; + unsigned short len = SMS_HTONS(data[2], data[3]); + + subblk_offset += 2; + if (subblk_offset + 4 * len > sublocksize) { + dev_err(tas_dev->dev, + "process_block: Out of memory\n"); + bError = true; + break; + } + + for (i = 0; i < len; i++) { + rc = tasdevice_dev_write(tas_dev, chn, + TASDEVICE_REG(data[subblk_offset], + data[subblk_offset + 1], + data[subblk_offset + 2]), + data[subblk_offset + 3]); + if (rc < 0) { + bError = true; + dev_err(tas_dev->dev, + "process_block: single write error\n"); + } + subblk_offset += 4; + } + } + break; + case TASDEVICE_CMD_BURST: { + unsigned short len = SMS_HTONS(data[2], data[3]); + + subblk_offset += 2; + if (subblk_offset + 4 + len > sublocksize) { + dev_err(tas_dev->dev, + "process_block: BURST Out of memory\n"); + bError = true; + break; + } + if (len % 4) { + dev_err(tas_dev->dev, + "process_block: Burst len(%u) can be divided by 4\n", + len); + break; + } + + rc = tasdevice_dev_bulk_write(tas_dev, chn, + TASDEVICE_REG(data[subblk_offset], + data[subblk_offset + 1], + data[subblk_offset + 2]), + &(data[subblk_offset + 4]), len); + if (rc < 0) { + bError = true; + dev_err(tas_dev->dev, + "process_block: bulk_write error = %d\n", + rc); + } + subblk_offset += (len + 4); + } + break; + case TASDEVICE_CMD_DELAY: { + unsigned short delay_time = 0; + + if (subblk_offset + 2 > sublocksize) { + dev_err(tas_dev->dev, + "process_block: deley Out of memory\n"); + bError = true; + break; + } + delay_time = SMS_HTONS(data[2], data[3]); + usleep_range(delay_time*1000, delay_time*1000); + subblk_offset += 2; + } + break; + case TASDEVICE_CMD_FIELD_W: + if (subblk_offset + 6 > sublocksize) { + dev_err(tas_dev->dev, + "process_block: bit write Out of memory\n"); + bError = true; + break; + } + rc = tasdevice_dev_update_bits(tas_dev, chn, + TASDEVICE_REG(data[subblk_offset + 2], + data[subblk_offset + 3], + data[subblk_offset + 4]), + data[subblk_offset + 1], + data[subblk_offset + 5]); + if (rc < 0) { + bError = true; + dev_err(tas_dev->dev, + "process_block: update_bits error = %d\n", rc); + } + subblk_offset += 6; + break; + default: + break; + }; + if (bError == true && blktyp != 0) { + if (blktyp == 0x80) { + tas_dev->tasdevice[chn].mnCurrentProgram = -1; + tas_dev->tasdevice[chn].mnCurrentConfiguration = + -1; + } else + tas_dev->tasdevice[chn].mnCurrentConfiguration = + -1; + } + } + return subblk_offset; +} + +void tasdevice_select_cfg_blk(void *pContext, int conf_no, + unsigned char block_type) +{ + struct tasdevice_priv *tas_dev = + (struct tasdevice_priv *) pContext; + struct tasdevice_regbin *regbin = &(tas_dev->mtRegbin); + struct tasdevice_config_info **cfg_info = regbin->cfg_info; + int j = 0, k = 0, chn = 0, chnend = 0; + + if (conf_no >= regbin->ncfgs || conf_no < 0 || NULL == cfg_info) { + dev_err(tas_dev->dev, + "conf_no should be not more than %u\n", + regbin->ncfgs); + goto out; + } else + dev_info(tas_dev->dev, + "select_cfg_blk: profile_conf_id = %d\n", + conf_no); + + for (j = 0; j < (int)cfg_info[conf_no]->real_nblocks; j++) { + unsigned int length = 0, rc = 0; + + if (block_type > 5 || block_type < 2) { + dev_err(tas_dev->dev, + "ERROR!!!block_type should be in range from 2 to 5\n"); + goto out; + } + if (block_type != cfg_info[conf_no]->blk_data[j]->block_type) + continue; + dev_info(tas_dev->dev, + "select_cfg_blk: conf %d, block type:%s\t device idx = 0x%02x\n", + conf_no, blocktype[cfg_info[conf_no]->blk_data[j] + ->block_type-1], cfg_info[conf_no]->blk_data[j] + ->dev_idx); + + for (k = 0; k < (int)cfg_info[conf_no]->blk_data[j] + ->nSublocks; k++) { + if (cfg_info[conf_no]->blk_data[j]->dev_idx) { + chn = + cfg_info[conf_no]->blk_data[j]->dev_idx + - 1; + chnend = + cfg_info[conf_no]->blk_data[j]->dev_idx; + } else { + chn = 0; + chnend = tas_dev->ndev; + } + for (; chn < chnend; chn++) + tas_dev->tasdevice[chn].bLoading = true; + + rc = tasdevice_process_block(tas_dev, + cfg_info[conf_no]->blk_data[j]->regdata + + length, + cfg_info[conf_no]->blk_data[j]->dev_idx, + cfg_info[conf_no]->blk_data[j]->block_size - + length); + length += rc; + if (cfg_info[conf_no]->blk_data[j]->block_size < + length) { + dev_err(tas_dev->dev, + "select_cfg_blk: ERROR:%u %u out of memory\n", + length, + cfg_info[conf_no]->blk_data[j]->block_size); + break; + } + } + if (length != cfg_info[conf_no]->blk_data[j]->block_size) + dev_err(tas_dev->dev, + "select_cfg_blk: ERROR: %u %u size is not same\n", + length, + cfg_info[conf_no]->blk_data[j]->block_size); + + } + +out: + return; +} + +static struct tasdevice_config_info *tasdevice_add_config( + void *pContext, unsigned char *config_data, + unsigned int config_size) +{ + struct tasdevice_priv *tas_dev = + (struct tasdevice_priv *)pContext; + struct tasdevice_config_info *cfg_info = NULL; + int config_offset = 0, i = 0; + + cfg_info = kzalloc( + sizeof(struct tasdevice_config_info), GFP_KERNEL); + if (!cfg_info) + goto out; + + if (tas_dev->mtRegbin.fw_hdr.binary_version_num >= 0x105) { + if (config_offset + 64 > (int)config_size) { + dev_err(tas_dev->dev, + "add config: Out of memory\n"); + goto out; + } + memcpy(cfg_info->mpName, &config_data[config_offset], 64); + config_offset += 64; + } + + if (config_offset + 4 > (int)config_size) { + dev_err(tas_dev->dev, + "add config: Out of memory\n"); + goto out; + } + cfg_info->nblocks = + SMS_HTONL(config_data[config_offset], + config_data[config_offset + 1], + config_data[config_offset + 2], config_data[config_offset + 3]); + config_offset += 4; + + cfg_info->blk_data = kcalloc( + cfg_info->nblocks, sizeof(struct tasdevice_block_data *), + GFP_KERNEL); + if (!cfg_info->blk_data) { + dev_err(tas_dev->dev, + "add config: blk_data alloc failed!\n"); + goto out; + } + cfg_info->real_nblocks = 0; + for (i = 0; i < (int)cfg_info->nblocks; i++) { + if (config_offset + 12 > config_size) { + dev_err(tas_dev->dev, + "add config: Out of memory: i = %d nblocks = %u!\n", + i, cfg_info->nblocks); + break; + } + cfg_info->blk_data[i] = kzalloc( + sizeof(struct tasdevice_block_data), GFP_KERNEL); + if (!cfg_info->blk_data[i]) + break; + + cfg_info->blk_data[i]->dev_idx = config_data[config_offset]; + config_offset++; + + cfg_info->blk_data[i]->block_type = config_data[config_offset]; + config_offset++; + + if (cfg_info->blk_data[i]->block_type == + TASDEVICE_BIN_BLK_PRE_POWER_UP) { + if (cfg_info->blk_data[i]->dev_idx == 0) { + cfg_info->active_dev = 1; + } else { + cfg_info->active_dev = + 1 << + (cfg_info->blk_data[i]->dev_idx - 1); + } + } + cfg_info->blk_data[i]->yram_checksum = + SMS_HTONS(config_data[config_offset], + config_data[config_offset + 1]); + config_offset += 2; + cfg_info->blk_data[i]->block_size = + SMS_HTONL(config_data[config_offset], + config_data[config_offset + 1], + config_data[config_offset + 2], + config_data[config_offset + 3]); + config_offset += 4; + + cfg_info->blk_data[i]->nSublocks = + SMS_HTONL(config_data[config_offset], + config_data[config_offset + 1], + config_data[config_offset + 2], + config_data[config_offset + 3]); + + config_offset += 4; + cfg_info->blk_data[i]->regdata = kzalloc( + cfg_info->blk_data[i]->block_size, GFP_KERNEL); + if (cfg_info->blk_data[i]->regdata == 0) { + dev_err(tas_dev->dev, + "add config: regdata alloc failed!\n"); + goto out; + } + if (config_offset + cfg_info->blk_data[i]->block_size + > config_size) { + dev_err(tas_dev->dev, + "add config: block_size Out of memory: i = %d nblocks = %u!\n", + i, + cfg_info->nblocks); + break; + } + memcpy(cfg_info->blk_data[i]->regdata, + &config_data[config_offset], + cfg_info->blk_data[i]->block_size); + config_offset += cfg_info->blk_data[i]->block_size; + cfg_info->real_nblocks += 1; + } +out: + return cfg_info; +} +static int tas2781_digital_getvol(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + unsigned int val; + int ret = 0; + + /* Read the primary device as the whole */ + ret = tasdevice_dev_read(tas_dev, 0, mc->reg, &val); + if (ret) { + dev_err(tas_dev->dev, + "%s, get digital vol error\n", + __func__); + goto out; + } + val = (val > mc->max) ? mc->max : val; + val = mc->invert ? mc->max - val : val; + ucontrol->value.integer.value[0] = val; + +out: + return ret; +} + +static int tas2781_digital_putvol(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + unsigned int val; + int i, ret = 0; + + val = ucontrol->value.integer.value[0]; + val = (val > mc->max) ? mc->max : val; + val = mc->invert ? mc->max - val : val; + val = (val < 0) ? 0 : val; + if (tas_dev->tas2781_set_global != NULL) { + ret = tasdevice_dev_write(tas_dev, tas_dev->ndev, + mc->reg, val); + if (ret) + dev_err(tas_dev->dev, + "%s, set digital vol error in global mode\n", + __func__); + } else { + for (i = 0; i < tas_dev->ndev; i++) { + ret = tasdevice_dev_write(tas_dev, i, + mc->reg, val); + if (ret) + dev_err(tas_dev->dev, + "%s, set digital vol error in device %d\n", + __func__, i); + } + } + + return ret; +} + +static int tas2781_amp_getvol(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + unsigned int val; + unsigned char mask = 0; + int ret = 0; + + /* Read the primary device */ + ret = tasdevice_dev_read(tas_dev, 0, mc->reg, &val); + if (ret) { + dev_err(tas_dev->dev, + "%s, get AMP vol error\n", + __func__); + goto out; + } + + mask = (1 << fls(mc->max)) - 1; + mask <<= mc->shift; + val = (val & mask) >> mc->shift; + val = (val > mc->max) ? mc->max : val; + val = mc->invert ? mc->max - val : val; + ucontrol->value.integer.value[0] = val; + +out: + return ret; +} + +static int tas2781_amp_putvol(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + unsigned int val; + int i, ret = 0; + unsigned char mask = 0; + + mask = (1 << fls(mc->max)) - 1; + mask <<= mc->shift; + val = ucontrol->value.integer.value[0]; + val = (val > mc->max) ? mc->max : val; + val = mc->invert ? mc->max - val : val; + val = (val < 0) ? 0 : val; + for (i = 0; i < tas_dev->ndev; i++) { + ret = tasdevice_dev_update_bits(tas_dev, i, + mc->reg, + mask, + val << mc->shift); + if (ret) + dev_err(tas_dev->dev, + "%s, set AMP vol error in device %d\n", + __func__, i); + } + + return ret; +} + +static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); +static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0); + +static const struct snd_kcontrol_new tas2781_snd_controls[] = { + SOC_SINGLE_RANGE_EXT_TLV("Amp Gain Volume", TAS2781_AMP_LEVEL, + 1, 0, 20, 0, tas2781_amp_getvol, + tas2781_amp_putvol, amp_vol_tlv), + SOC_SINGLE_RANGE_EXT_TLV("Digital Volume Control", TAS2781_DVC_LVL, + 0, 0, 200, 1, tas2781_digital_getvol, + tas2781_digital_putvol, dvc_tlv), +}; + +static int tasdevice_set_profile_id(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *p_tasdevice = + snd_soc_component_get_drvdata(codec); + + /* Codec Lock Hold*/ + mutex_lock(&p_tasdevice->codec_lock); + p_tasdevice->mtRegbin.profile_cfg_id = + ucontrol->value.integer.value[0]; + /* Codec Lock Release*/ + mutex_unlock(&p_tasdevice->codec_lock); + + return 0; +} + +static int tasdevice_info_programs(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *p_tasdevice = + snd_soc_component_get_drvdata(codec); + struct TFirmware *Tfw = p_tasdevice->mpFirmware; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + /* Codec Lock Hold*/ + mutex_lock(&p_tasdevice->codec_lock); + uinfo->count = 1; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = (int)Tfw->mnPrograms; + /* Codec Lock Release*/ + mutex_unlock(&p_tasdevice->codec_lock); + return 0; +} + +static int tasdevice_info_configurations( + struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *p_tasdevice = + snd_soc_component_get_drvdata(codec); + struct TFirmware *Tfw = p_tasdevice->mpFirmware; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + /* Codec Lock Hold*/ + mutex_lock(&p_tasdevice->codec_lock); + uinfo->count = 1; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = (int)Tfw->mnConfigurations - 1; + /* Codec Lock Release*/ + mutex_unlock(&p_tasdevice->codec_lock); + + return 0; +} + +static int tasdevice_info_profile(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *p_tasdevice = + snd_soc_component_get_drvdata(codec); + + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + /* Codec Lock Hold*/ + mutex_lock(&p_tasdevice->codec_lock); + uinfo->count = 1; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = max(0, p_tasdevice->mtRegbin.ncfgs); + /* Codec Lock Release*/ + mutex_unlock(&p_tasdevice->codec_lock); + return 0; +} + +static int tasdevice_get_profile_id(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *p_tasdevice + = snd_soc_component_get_drvdata(codec); + + /* Codec Lock Hold*/ + mutex_lock(&p_tasdevice->codec_lock); + ucontrol->value.integer.value[0] = + p_tasdevice->mtRegbin.profile_cfg_id; + /* Codec Lock Release*/ + mutex_unlock(&p_tasdevice->codec_lock); + + return 0; +} + +static int tasdevice_create_controls(struct tasdevice_priv *tas_dev) +{ + int nr_controls = 1, ret = 0, mix_index = 0; + char *name = NULL; + struct snd_kcontrol_new *tasdevice_profile_controls = NULL; + + tasdevice_profile_controls = devm_kzalloc(tas_dev->dev, + nr_controls * sizeof(tasdevice_profile_controls[0]), + GFP_KERNEL); + if (tasdevice_profile_controls == NULL) { + ret = -ENOMEM; + goto out; + } + + /* Create a mixer item for selecting the active profile */ + name = devm_kzalloc(tas_dev->dev, + MAX_CONTROL_NAME, GFP_KERNEL); + if (!name) { + ret = -ENOMEM; + goto out; + } + scnprintf(name, MAX_CONTROL_NAME, "TASDEVICE Profile id"); + tasdevice_profile_controls[mix_index].name = name; + tasdevice_profile_controls[mix_index].iface = + SNDRV_CTL_ELEM_IFACE_MIXER; + tasdevice_profile_controls[mix_index].info = + tasdevice_info_profile; + tasdevice_profile_controls[mix_index].get = + tasdevice_get_profile_id; + tasdevice_profile_controls[mix_index].put = + tasdevice_set_profile_id; + mix_index++; + + ret = snd_soc_add_component_controls(tas_dev->codec, + tasdevice_profile_controls, + nr_controls < mix_index ? nr_controls : mix_index); + + tas_dev->tas_ctrl.nr_controls = + nr_controls < mix_index ? nr_controls : mix_index; +out: + return ret; +} + +static int tasdevice_program_get(struct snd_kcontrol *pKcontrol, + struct snd_ctl_elem_value *pValue) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(pKcontrol); + struct tasdevice_priv *pTAS2781 = snd_soc_component_get_drvdata(codec); + + mutex_lock(&pTAS2781->codec_lock); + pValue->value.integer.value[0] = pTAS2781->mnCurrentProgram; + mutex_unlock(&pTAS2781->codec_lock); + return 0; +} + +static int tasdevice_program_put(struct snd_kcontrol *pKcontrol, + struct snd_ctl_elem_value *pValue) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(pKcontrol); + struct tasdevice_priv *pTAS2781 = snd_soc_component_get_drvdata(codec); + unsigned int nProgram = pValue->value.integer.value[0]; + + mutex_lock(&pTAS2781->codec_lock); + pTAS2781->mnCurrentProgram = nProgram; + mutex_unlock(&pTAS2781->codec_lock); + return 0; +} + +static int tasdevice_configuration_get( + struct snd_kcontrol *pKcontrol, + struct snd_ctl_elem_value *pValue) +{ + + struct snd_soc_component *codec + = snd_soc_kcontrol_component(pKcontrol); + struct tasdevice_priv *pTAS2781 = snd_soc_component_get_drvdata(codec); + + mutex_lock(&pTAS2781->codec_lock); + pValue->value.integer.value[0] = pTAS2781->mnCurrentConfiguration; + mutex_unlock(&pTAS2781->codec_lock); + return 0; +} + +static int tasdevice_configuration_put( + struct snd_kcontrol *pKcontrol, + struct snd_ctl_elem_value *pValue) +{ + struct snd_soc_component *codec + = snd_soc_kcontrol_component(pKcontrol); + struct tasdevice_priv *pTAS2781 = snd_soc_component_get_drvdata(codec); + unsigned int nConfiguration = pValue->value.integer.value[0]; + + mutex_lock(&pTAS2781->codec_lock); + pTAS2781->mnCurrentConfiguration = nConfiguration; + mutex_unlock(&pTAS2781->codec_lock); + return 0; +} + +static int tasdevice_dsp_create_control( + struct tasdevice_priv *tas_dev) +{ + int nr_controls = 2, ret = 0, mix_index = 0; + char *program_name = NULL; + char *configuration_name = NULL; + struct snd_kcontrol_new *tasdevice_dsp_controls = NULL; + + tasdevice_dsp_controls = devm_kzalloc(tas_dev->dev, + nr_controls * sizeof(tasdevice_dsp_controls[0]), + GFP_KERNEL); + if (tasdevice_dsp_controls == NULL) { + ret = -ENOMEM; + goto out; + } + + /* Create a mixer item for selecting the active profile */ + program_name = devm_kzalloc(tas_dev->dev, + MAX_CONTROL_NAME, GFP_KERNEL); + configuration_name = devm_kzalloc(tas_dev->dev, + MAX_CONTROL_NAME, GFP_KERNEL); + if (!program_name || !configuration_name) { + ret = -ENOMEM; + goto out; + } + + scnprintf(program_name, MAX_CONTROL_NAME, "Program"); + tasdevice_dsp_controls[mix_index].name = program_name; + tasdevice_dsp_controls[mix_index].iface = + SNDRV_CTL_ELEM_IFACE_MIXER; + tasdevice_dsp_controls[mix_index].info = + tasdevice_info_programs; + tasdevice_dsp_controls[mix_index].get = + tasdevice_program_get; + tasdevice_dsp_controls[mix_index].put = + tasdevice_program_put; + mix_index++; + + scnprintf(configuration_name, MAX_CONTROL_NAME, "Configuration"); + tasdevice_dsp_controls[mix_index].name = configuration_name; + tasdevice_dsp_controls[mix_index].iface = + SNDRV_CTL_ELEM_IFACE_MIXER; + tasdevice_dsp_controls[mix_index].info = + tasdevice_info_configurations; + tasdevice_dsp_controls[mix_index].get = + tasdevice_configuration_get; + tasdevice_dsp_controls[mix_index].put = + tasdevice_configuration_put; + mix_index++; + + ret = snd_soc_add_component_controls(tas_dev->codec, + tasdevice_dsp_controls, + nr_controls < mix_index ? nr_controls : mix_index); + + tas_dev->tas_ctrl.nr_controls += nr_controls; +out: + return ret; +} + +void tasdevice_regbin_ready(const struct firmware *pFW, + void *pContext) +{ + struct tasdevice_priv *tas_dev = + (struct tasdevice_priv *) pContext; + struct tasdevice_regbin *regbin = NULL; + struct tasdevice_regbin_hdr *fw_hdr = NULL; + struct tasdevice_config_info **cfg_info = NULL; + const struct firmware *fw_entry = NULL; + unsigned char *buf = NULL; + int offset = 0, i = 0; + unsigned int total_config_sz = 0; + int ret = 0; + + if (tas_dev == NULL) { + dev_err(tas_dev->dev, + "tasdev: regbin_ready: handle is NULL\n"); + return; + } + mutex_lock(&tas_dev->codec_lock); + regbin = &(tas_dev->mtRegbin); + fw_hdr = &(regbin->fw_hdr); + if (unlikely(!pFW) || unlikely(!pFW->data)) { + dev_err(tas_dev->dev, + "Failed to read %s, no side - effect on driver running\n", + tas_dev->regbin_binaryname); + ret = -1; + goto out; + } + buf = (unsigned char *)pFW->data; + + dev_info(tas_dev->dev, "tasdev: regbin_ready start\n"); + fw_hdr->img_sz = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + if (fw_hdr->img_sz != pFW->size) { + dev_err(tas_dev->dev, + "File size not match, %d %u", (int)pFW->size, + fw_hdr->img_sz); + ret = -1; + goto out; + } + + fw_hdr->checksum = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + fw_hdr->binary_version_num = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + if (fw_hdr->binary_version_num < 0x103) { + dev_err(tas_dev->dev, + "File version 0x%04x is too low", + fw_hdr->binary_version_num); + ret = -1; + goto out; + } + offset += 4; + fw_hdr->drv_fw_version = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + fw_hdr->timestamp = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + fw_hdr->plat_type = buf[offset]; + offset += 1; + fw_hdr->dev_family = buf[offset]; + offset += 1; + fw_hdr->reserve = buf[offset]; + offset += 1; + fw_hdr->ndev = buf[offset]; + offset += 1; + if (fw_hdr->ndev != tas_dev->ndev) { + dev_err(tas_dev->dev, + "ndev(%u) from Regbin and ndev(%u) from DTS does not match\n", + fw_hdr->ndev, + tas_dev->ndev); + ret = -1; + goto out; + } + if (offset + TASDEVICE_DEVICE_SUM > fw_hdr->img_sz) { + dev_err(tas_dev->dev, + "regbin_ready: Out of Memory!\n"); + ret = -1; + goto out; + } + + for (i = 0; i < TASDEVICE_DEVICE_SUM; i++, offset++) + fw_hdr->devs[i] = buf[offset]; + + fw_hdr->nconfig = SMS_HTONL(buf[offset], buf[offset + 1], + buf[offset + 2], buf[offset + 3]); + offset += 4; + dev_info(tas_dev->dev, "nconfig = %u\n", fw_hdr->nconfig); + for (i = 0; i < TASDEVICE_CONFIG_SUM; i++) { + fw_hdr->config_size[i] = SMS_HTONL(buf[offset], + buf[offset + 1], buf[offset + 2], buf[offset + 3]); + offset += 4; + total_config_sz += fw_hdr->config_size[i]; + } + dev_info(tas_dev->dev, + "img_sz = %u total_config_sz = %u offset = %d\n", + fw_hdr->img_sz, total_config_sz, offset); + if (fw_hdr->img_sz - total_config_sz != (unsigned int)offset) { + dev_err(tas_dev->dev, "Bin file error!\n"); + ret = -1; + goto out; + } + cfg_info = kcalloc(fw_hdr->nconfig, + sizeof(struct tasdevice_config_info *), + GFP_KERNEL); + + if (!cfg_info) { + ret = -1; + dev_err(tas_dev->dev, "nconfig Memory alloc failed!\n"); + goto out; + } + regbin->cfg_info = cfg_info; + regbin->ncfgs = 0; + for (i = 0; i < (int)fw_hdr->nconfig; i++) { + cfg_info[i] = tasdevice_add_config(pContext, &buf[offset], + fw_hdr->config_size[i]); + if (!cfg_info[i]) { + ret = -1; + dev_err(tas_dev->dev, + "add_config Memory alloc failed!\n"); + break; + } + offset += (int)fw_hdr->config_size[i]; + regbin->ncfgs += 1; + } + tasdevice_create_controls(tas_dev); + + tasdevice_dsp_remove(tas_dev); + tasdevice_calbin_remove(tas_dev); + tas_dev->fw_state = TASDEVICE_DSP_FW_PENDING; + scnprintf(tas_dev->dsp_binaryname, 64, "%s_dsp.bin", + tas_dev->dev_name); + ret = request_firmware(&fw_entry, tas_dev->dsp_binaryname, + tas_dev->dev); + if (!ret) { + ret = tasdevice_dspfw_ready(fw_entry, tas_dev); + release_firmware(fw_entry); + fw_entry = NULL; + } else { + tas_dev->fw_state = TASDEVICE_DSP_FW_FAIL; + dev_err(tas_dev->dev, "%s: load %s error\n", __func__, + tas_dev->dsp_binaryname); + goto out; + } + tasdevice_dsp_create_control(tas_dev); + + tas_dev->fw_state = TASDEVICE_DSP_FW_ALL_OK; + tas_dev->mbCalibrationLoaded = true; + for (i = 0; i < tas_dev->ndev; i++) { + scnprintf(tas_dev->cal_binaryname[i], 64, "%s_cal_0x%02x.bin", + tas_dev->dev_name, tas_dev->tasdevice[i].mnDevAddr); + ret = tas2781_load_calibration(tas_dev, + tas_dev->cal_binaryname[i], i); + if (ret != 0) { + dev_err(tas_dev->dev, + "%s: load %s error, no-side effect for playback\n", + __func__, + tas_dev->cal_binaryname[i]); + ret = 0; + tas_dev->mbCalibrationLoaded = false; + } + } + +out: + mutex_unlock(&tas_dev->codec_lock); + if (pFW) + release_firmware(pFW); + dev_info(tas_dev->dev, "Firmware init complete\n"); +} + +void tasdevice_config_info_remove(void *pContext) +{ + struct tasdevice_priv *tas_dev = + (struct tasdevice_priv *) pContext; + struct tasdevice_regbin *regbin = &(tas_dev->mtRegbin); + struct tasdevice_config_info **cfg_info = regbin->cfg_info; + int i = 0, j = 0; + + mutex_lock(&tas_dev->dev_lock); + if (cfg_info) { + for (i = 0; i < regbin->ncfgs; i++) { + if (cfg_info[i]) { + for (j = 0; j < (int)cfg_info[i]->real_nblocks; + j++) { + kfree( + cfg_info[i]->blk_data[j]->regdata); + kfree(cfg_info[i]->blk_data[j]); + } + kfree(cfg_info[i]->blk_data); + kfree(cfg_info[i]); + } + } + kfree(cfg_info); + } + mutex_unlock(&tas_dev->dev_lock); +} + +static int tasdevice_dac_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *codec = snd_soc_dapm_to_component(w->dapm); + struct tasdevice_priv *tas_dev = snd_soc_component_get_drvdata(codec); + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + dev_info(tas_dev->dev, "SND_SOC_DAPM_POST_PMU\n"); + break; + case SND_SOC_DAPM_PRE_PMD: + dev_info(tas_dev->dev, "SND_SOC_DAPM_PRE_PMD\n"); + break; + } + + return 0; +} + +static const struct snd_soc_dapm_widget tasdevice_dapm_widgets[] = { + SND_SOC_DAPM_AIF_IN("ASI", "ASI Playback", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_OUT("ASI OUT", "ASI Capture", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_DAC_E("DAC", NULL, SND_SOC_NOPM, 0, 0, + tasdevice_dac_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_OUTPUT("OUT"), + SND_SOC_DAPM_INPUT("DMIC"), + SND_SOC_DAPM_SIGGEN("VMON"), + SND_SOC_DAPM_SIGGEN("IMON") +}; + +static const struct snd_soc_dapm_route tasdevice_audio_map[] = { + {"DAC", NULL, "ASI"}, + {"OUT", NULL, "DAC"}, + {"ASI OUT", NULL, "DMIC"} +}; + +static int tasdevice_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_component *codec = dai->component; + struct tasdevice_priv *tas_dev = snd_soc_component_get_drvdata(codec); + int ret = 0; + + if (tas_dev->fw_state != TASDEVICE_DSP_FW_ALL_OK) { + dev_err(tas_dev->dev, "DSP bin file not loaded\n"); + ret = -EINVAL; + } + return ret; +} + +static int tasdevice_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) +{ + struct tasdevice_priv *tas_dev = snd_soc_dai_get_drvdata(dai); + unsigned int fsrate; + unsigned int slot_width; + int bclk_rate; + int rc = 0; + + dev_info(tas_dev->dev, "%s: %s\n", + __func__, substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? + "Playback":"Capture"); + + fsrate = params_rate(params); + switch (fsrate) { + case 48000: + break; + case 44100: + break; + default: + dev_err(tas_dev->dev, + "%s: incorrect sample rate = %u\n", + __func__, fsrate); + rc = -EINVAL; + goto out; + } + + slot_width = params_width(params); + switch (slot_width) { + case 16: + break; + case 20: + break; + case 24: + break; + case 32: + break; + default: + dev_err(tas_dev->dev, + "%s: incorrect slot width = %u\n", + __func__, slot_width); + rc = -EINVAL; + goto out; + } + + bclk_rate = snd_soc_params_to_bclk(params); + if (bclk_rate < 0) { + dev_err(tas_dev->dev, + "%s: incorrect bclk rate = %d\n", + __func__, bclk_rate); + rc = bclk_rate; + goto out; + } + dev_info(tas_dev->dev, + "%s: BCLK rate = %d Channel = %d Sample rate = %u slot width = %u\n", + __func__, bclk_rate, params_channels(params), + fsrate, slot_width); +out: + return rc; +} + +static void tasdevice_enable_irq( + struct tasdevice_priv *tas_dev, bool enable) +{ + struct irq_desc *desc = NULL; + + if (enable) { + if (tas_dev->mIrqInfo.mb_irq_enable) + return; + if (gpio_is_valid(tas_dev->mIrqInfo.mn_irq_gpio)) { + desc = irq_to_desc(tas_dev->mIrqInfo.mn_irq); + if (desc && desc->depth > 0) + enable_irq(tas_dev->mIrqInfo.mn_irq); + else + dev_info(tas_dev->dev, + "### irq already enabled\n"); + } + tas_dev->mIrqInfo.mb_irq_enable = true; + } else { + if (gpio_is_valid(tas_dev->mIrqInfo.mn_irq_gpio)) + disable_irq_nosync(tas_dev->mIrqInfo.mn_irq); + tas_dev->mIrqInfo.mb_irq_enable = false; + } +} + +static int tasdevice_set_dai_sysclk(struct snd_soc_dai *codec_dai, + int clk_id, unsigned int freq, int dir) +{ + struct tasdevice_priv *tas_dev = snd_soc_dai_get_drvdata(codec_dai); + + dev_info(tas_dev->dev, + "%s: clk_id = %d, freq = %u, CLK direction %s\n", + __func__, clk_id, freq, + dir == TASDEVICE_CLK_DIR_OUT ? "OUT":"IN"); + + return 0; +} + +static void powercontrol_routine(struct work_struct *work) +{ + struct tasdevice_priv *tas_dev = + container_of(work, struct tasdevice_priv, + powercontrol_work.work); + struct TFirmware *pFw = NULL; + int profile_cfg_id = 0; + + mutex_lock(&tas_dev->codec_lock); + /*mnCurrentProgram != 0 is dsp mode or tuning mode*/ + if (tas_dev->mnCurrentProgram) { + /*bypass all in regbin is profile id 0*/ + profile_cfg_id = REGBIN_CONFIGID_BYPASS_ALL; + } else { + profile_cfg_id = tas_dev->mtRegbin.profile_cfg_id; + pFw = tas_dev->mpFirmware; + dev_info(tas_dev->dev, "%s: %s\n", __func__, + pFw->mpConfigurations[tas_dev->mnCurrentConfiguration] + .mpName); + tasdevice_select_tuningprm_cfg(tas_dev, + tas_dev->mnCurrentProgram, + tas_dev->mnCurrentConfiguration, + profile_cfg_id); + if (tas_dev->tas2781_set_global != NULL) + tas_dev->tas2781_set_global(tas_dev); + } + tasdevice_select_cfg_blk(tas_dev, profile_cfg_id, + TASDEVICE_BIN_BLK_PRE_POWER_UP); + + if (tas_dev->chip_id != GENERAL_AUDEV) + tasdevice_enable_irq(tas_dev, true); + mutex_unlock(&tas_dev->codec_lock); +} + +static void tasdevice_set_power_state( + struct tasdevice_priv *tas_dev, int state) +{ + switch (state) { + case 0: + schedule_delayed_work(&tas_dev->powercontrol_work, + msecs_to_jiffies(20)); + break; + default: + if (!(tas_dev->pstream || tas_dev->cstream)) { + if (tas_dev->chip_id != GENERAL_AUDEV) + tasdevice_enable_irq(tas_dev, false); + tasdevice_select_cfg_blk(tas_dev, + tas_dev->mtRegbin.profile_cfg_id, + TASDEVICE_BIN_BLK_PRE_SHUTDOWN); + } + break; + } +} + +static int tasdevice_mute(struct snd_soc_dai *dai, int mute, int stream) +{ + struct snd_soc_component *codec = dai->component; + struct tasdevice_priv *tas_dev = snd_soc_component_get_drvdata(codec); + + /* Codec Lock Hold */ + mutex_lock(&tas_dev->codec_lock); + + if (mute) { + /* stop DSP only when both playback and capture streams + * are deactivated + */ + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + tas_dev->pstream = 0; + else + tas_dev->cstream = 0; + if (tas_dev->pstream != 0 || tas_dev->cstream != 0) + goto out; + } else { + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + tas_dev->pstream = 1; + else + tas_dev->cstream = 1; + + } + tasdevice_set_power_state(tas_dev, mute); +out: + /* Codec Lock Release*/ + mutex_unlock(&tas_dev->codec_lock); + + return 0; +} + +static const struct snd_soc_dai_ops tasdevice_dai_ops = { + .startup = tasdevice_startup, + .hw_params = tasdevice_hw_params, + .set_sysclk = tasdevice_set_dai_sysclk, + .mute_stream = tasdevice_mute, +}; + +static struct snd_soc_dai_driver tasdevice_dai_driver[] = { + { + .name = "tas2781_codec", + .id = 0, + .playback = { + .stream_name = "Playback", + .channels_min = 1, + .channels_max = 4, + .rates = TASDEVICE_RATES, + .formats = TASDEVICE_FORMATS, + }, + .capture = { + .stream_name = "Capture", + .channels_min = 1, + .channels_max = 4, + .rates = TASDEVICE_RATES, + .formats = TASDEVICE_FORMATS, + }, + .ops = &tasdevice_dai_ops, + .symmetric_rate = 1, + }, +}; + +static int tasdevice_codec_probe( + struct snd_soc_component *codec) +{ + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + int ret; + + /* Codec Lock Hold */ + mutex_lock(&tas_dev->codec_lock); + + tas_dev->codec = codec; + scnprintf(tas_dev->regbin_binaryname, 64, "%s_regbin.bin", + tas_dev->dev_name); + ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, + tas_dev->regbin_binaryname, tas_dev->dev, GFP_KERNEL, tas_dev, + tasdevice_regbin_ready); + if (ret) + dev_err(tas_dev->dev, + "%s: request_firmware_nowait error:0x%08x\n", + __func__, ret); + + /* Codec Lock Release*/ + mutex_unlock(&tas_dev->codec_lock); + + if (tas_dev->tas2781_reset != NULL) + tas_dev->tas2781_reset(tas_dev); + if (tas_dev->tas2781_set_global != NULL) + tas_dev->tas2781_set_global(tas_dev); + + return ret; +} + +static void tasdevice_deinit(void *pContext) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *) pContext; + + tasdevice_config_info_remove(tas_dev); + tasdevice_dsp_remove(tas_dev); + tasdevice_calbin_remove(tas_dev); + tas_dev->fw_state = TASDEVICE_DSP_FW_PENDING; +} + +static void tasdevice_codec_remove( + struct snd_soc_component *codec) +{ + struct tasdevice_priv *tas_dev = + snd_soc_component_get_drvdata(codec); + /* Codec Lock Hold */ + mutex_lock(&tas_dev->codec_lock); + tasdevice_deinit(tas_dev); + /* Codec Lock Release*/ + mutex_unlock(&tas_dev->codec_lock); + + return; + +} + +static const struct snd_soc_component_driver + soc_codec_driver_tasdevice = { + .probe = tasdevice_codec_probe, + .remove = tasdevice_codec_remove, + .controls = tas2781_snd_controls, + .num_controls = ARRAY_SIZE(tas2781_snd_controls), + .dapm_widgets = tasdevice_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(tasdevice_dapm_widgets), + .dapm_routes = tasdevice_audio_map, + .num_dapm_routes = ARRAY_SIZE(tasdevice_audio_map), + .idle_bias_on = 1, + .endianness = 1, +}; + +static void irq_work_routine(struct work_struct *pWork) +{ + struct tasdevice_priv *tas_dev = + container_of(pWork, struct tasdevice_priv, + mIrqInfo.irq_work.work); + + mutex_lock(&tas_dev->codec_lock); + if (tas_dev->mb_runtime_suspend) { + dev_info(tas_dev->dev, "%s, Runtime Suspended\n", __func__); + goto end; + } + /*Logical Layer IRQ function, return is ignored*/ + if (tas_dev->irq_work_func) + tas_dev->irq_work_func(tas_dev); + else + dev_info(tas_dev->dev, + "%s, irq_work_func is NULL\n", __func__); +end: + mutex_unlock(&tas_dev->codec_lock); +} + +static void tas2781_irq_work_func(struct tasdevice_priv *tas_dev) +{ + int rc = 0; + unsigned int reg_val = 0, array_size = 0, i = 0, ndev = 0; + unsigned int int_reg_array[] = { + TAS2781_REG_INT_LTCH0, + TAS2781_REG_INT_LTCH1, + TAS2781_REG_INT_LTCH1_0, + TAS2781_REG_INT_LTCH2, + TAS2781_REG_INT_LTCH3, + TAS2781_REG_INT_LTCH4}; + + tasdevice_enable_irq(tas_dev, false); + + array_size = ARRAY_SIZE(int_reg_array); + + for (ndev = 0; ndev < tas_dev->ndev; ndev++) { + for (i = 0; i < array_size; i++) { + rc = tasdevice_dev_read(tas_dev, + ndev, int_reg_array[i], &reg_val); + if (!rc) + dev_info(tas_dev->dev, + "INT STATUS REG 0x%04x=0x%02x\n", + int_reg_array[i], reg_val); + else + dev_err(tas_dev->dev, + "Read Reg 0x%04x error(rc=%d)\n", + int_reg_array[i], rc); + } + } + +} + +static irqreturn_t tasdevice_irq_handler(int irq, + void *dev_id) +{ + struct tasdevice_priv *tas_dev = (struct tasdevice_priv *)dev_id; +; + /* get IRQ status after 100 ms */ + schedule_delayed_work(&tas_dev->mIrqInfo.irq_work, + msecs_to_jiffies(100)); + return IRQ_HANDLED; +} + +int tasdevice_parse_dt(struct tasdevice_priv *tas_dev) +{ + struct device_node *np = tas_dev->dev->of_node; + int rc = 0, i = 0, ndev = 0; + char buf[32]; + + + for (i = 0, ndev = 0; i < MaxChn; i++) { + rc = of_property_read_u32(np, dts_dev_addr_tag[i], + &(tas_dev->tasdevice[ndev].mnDevAddr)); + if (rc) + dev_err(tas_dev->dev, + "Looking up %s property in node %s failed %d\n", + dts_dev_addr_tag[i], + np->full_name, rc); + else { + dev_dbg(tas_dev->dev, "%s=0x%02x", dts_dev_addr_tag[i], + tas_dev->tasdevice[ndev].mnDevAddr); + ndev++; + } + } + + rc = of_property_read_u32(np, dts_glb_addr_tag, + &(tas_dev->glb_addr.mnDevAddr)); + if (rc) { + dev_err(tas_dev->dev, + "Looking up %s property in node %s failed %d\n", + dts_glb_addr_tag, np->full_name, rc); + tas_dev->glb_addr.mnDevAddr = 0; + } + tas_dev->ndev = (ndev == 0) ? 1 : ndev; + + for (i = 0, ndev = 0; i < tas_dev->ndev; i++) { + scnprintf(buf, sizeof(buf), dts_rst_tag, "reset", i); + tas_dev->tasdevice[ndev].mnResetGpio = of_get_named_gpio(np, + buf, 0); + if (gpio_is_valid(tas_dev->tasdevice[ndev].mnResetGpio)) { + rc = gpio_request(tas_dev->tasdevice[ndev].mnResetGpio, + buf); + if (!rc) { + gpio_direction_output( + tas_dev->tasdevice[ndev].mnResetGpio, + 1); + dev_info(tas_dev->dev, "%s = %d", buf, + tas_dev->tasdevice[ndev].mnResetGpio); + ndev++; + } else + dev_err(tas_dev->dev, + "%s: Failed to request dev[%d] gpio %d\n", + __func__, ndev, + tas_dev->tasdevice[ndev].mnResetGpio); + } else + dev_err(tas_dev->dev, + "Looking up %s property in node %s failed %d\n", + buf, np->full_name, + tas_dev->tasdevice[ndev].mnResetGpio); + } + strcpy(tas_dev->dev_name, tasdevice_id[tas_dev->chip_id].name); + if (tas_dev->chip_id != GENERAL_AUDEV) { + tas_dev->mIrqInfo.mn_irq_gpio = of_get_named_gpio(np, + "ti,irq-gpio", 0); + if (gpio_is_valid(tas_dev->mIrqInfo.mn_irq_gpio)) { + dev_dbg(tas_dev->dev, "irq-gpio = %d", + tas_dev->mIrqInfo.mn_irq_gpio); + INIT_DELAYED_WORK(&tas_dev->mIrqInfo.irq_work, + irq_work_routine); + + rc = gpio_request(tas_dev->mIrqInfo.mn_irq_gpio, + "AUDEV-IRQ"); + if (!rc) { + gpio_direction_input( + tas_dev->mIrqInfo.mn_irq_gpio); + + tas_dev->mIrqInfo.mn_irq = + gpio_to_irq( + tas_dev->mIrqInfo.mn_irq_gpio); + dev_info(tas_dev->dev, + "irq = %d\n", + tas_dev->mIrqInfo.mn_irq); + + rc = request_threaded_irq( + tas_dev->mIrqInfo.mn_irq, + tasdevice_irq_handler, + NULL, IRQF_TRIGGER_FALLING| + IRQF_ONESHOT, + SMARTAMP_MODULE_NAME, tas_dev); + if (!rc) + disable_irq_nosync( + tas_dev->mIrqInfo.mn_irq); + else + dev_err(tas_dev->dev, + "request_irq failed, %d\n", + rc); + } else + dev_err(tas_dev->dev, + "%s: GPIO %d request error\n", + __func__, + tas_dev->mIrqInfo.mn_irq_gpio); + } else + dev_err(tas_dev->dev, + "Looking up irq-gpio property in node %s failed %d\n", + np->full_name, + tas_dev->mIrqInfo.mn_irq_gpio); + } + + if (tas_dev->chip_id != GENERAL_AUDEV && rc == 0) { + if (tas_dev->chip_id == TAS2781) + tas_dev->irq_work_func = tas2781_irq_work_func; + else + dev_info(tas_dev->dev, "%s: No match irq_work_func\n", + __func__); + } + + return 0; +} + +static int tasdevice_regmap_write( + struct tasdevice_priv *tas_dev, + unsigned int reg, unsigned int value) +{ + int nResult = 0; + int retry_count = TASDEVICE_RETRY_COUNT; + + while (retry_count--) { + nResult = regmap_write(tas_dev->regmap, reg, + value); + if (nResult >= 0) + break; + usleep_range(5000, 5050); + } + if (retry_count == -1) + return TASDEVICE_ERROR_FAILED; + else + return 0; +} + +static int tasdevice_regmap_bulk_write( + struct tasdevice_priv *tas_dev, unsigned int reg, + unsigned char *pData, unsigned int nLength) +{ + int nResult = 0; + int retry_count = TASDEVICE_RETRY_COUNT; + + while (retry_count--) { + nResult = regmap_bulk_write(tas_dev->regmap, reg, + pData, nLength); + if (nResult >= 0) + break; + usleep_range(5000, 5050); + } + if (retry_count == -1) + return TASDEVICE_ERROR_FAILED; + else + return 0; +} + +static int tasdevice_regmap_read( + struct tasdevice_priv *tas_dev, + unsigned int reg, unsigned int *value) +{ + int nResult = 0; + int retry_count = TASDEVICE_RETRY_COUNT; + + while (retry_count--) { + nResult = regmap_read(tas_dev->regmap, reg, + value); + if (nResult >= 0) + break; + usleep_range(5000, 5050); + } + if (retry_count == -1) + return TASDEVICE_ERROR_FAILED; + else + return 0; +} + +static int tasdevice_regmap_bulk_read( + struct tasdevice_priv *tas_dev, unsigned int reg, + unsigned char *pData, unsigned int nLength) +{ + int nResult = 0; + int retry_count = TASDEVICE_RETRY_COUNT; + + while (retry_count--) { + nResult = regmap_bulk_read(tas_dev->regmap, reg, + pData, nLength); + if (nResult >= 0) + break; + usleep_range(5000, 5050); + } + if (retry_count == -1) + return TASDEVICE_ERROR_FAILED; + else + return 0; +} + +static int tasdevice_regmap_update_bits( + struct tasdevice_priv *tas_dev, unsigned int reg, + unsigned int mask, unsigned int value) +{ + int nResult = 0; + int retry_count = TASDEVICE_RETRY_COUNT; + + while (retry_count--) { + nResult = regmap_update_bits(tas_dev->regmap, reg, + mask, value); + if (nResult >= 0) + break; + usleep_range(5000, 5050); + } + if (retry_count == -1) + return TASDEVICE_ERROR_FAILED; + else + return 0; +} + +static int tasdevice_change_chn_book_page( + struct tasdevice_priv *tas_dev, enum channel chn, + int book, int page) +{ + int n_result = 0; + struct i2c_client *pClient = + (struct i2c_client *)tas_dev->client; + + if (chn < tas_dev->ndev) { + if (tas_dev->glb_addr.ref_cnt != 0) { + tas_dev->glb_addr.ref_cnt = 0; + tas_dev->glb_addr.mnBkPg.mnBook = -1; + tas_dev->glb_addr.mnBkPg.mnPage = -1; + } + pClient->addr = tas_dev->tasdevice[chn].mnDevAddr; + if (tas_dev->tasdevice[chn].mnBkPg.mnBook != book) { + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_PAGE, 0); + if (n_result < 0) { + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + goto out; + } + tas_dev->tasdevice[chn].mnBkPg.mnPage = 0; + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_REG, book); + if (n_result < 0) { + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + goto out; + } + tas_dev->tasdevice[chn].mnBkPg.mnBook = book; + } + + if (tas_dev->tasdevice[chn].mnBkPg.mnPage != page) { + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_PAGE, page); + if (n_result < 0) { + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + goto out; + } + tas_dev->tasdevice[chn].mnBkPg.mnPage = page; + } + } else if (chn == tas_dev->ndev) { + int i = 0; + + if (tas_dev->glb_addr.ref_cnt == 0) + for (i = 0; i < tas_dev->ndev; i++) { + tas_dev->tasdevice[i].mnBkPg.mnBook + = -1; + tas_dev->tasdevice[i].mnBkPg.mnPage + = -1; + } + pClient->addr = tas_dev->glb_addr.mnDevAddr; + if (tas_dev->glb_addr.mnBkPg.mnBook != book) { + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_PAGE, 0); + if (n_result < 0) { + dev_err(tas_dev->dev, + "%s, 0ERROR, E=%d\n", + __func__, n_result); + goto out; + } + tas_dev->glb_addr.mnBkPg.mnPage = 0; + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_REG, book); + if (n_result < 0) { + dev_err(tas_dev->dev, + "%s, book%xERROR, E=%d\n", + __func__, book, n_result); + goto out; + } + tas_dev->glb_addr.mnBkPg.mnBook = book; + } + + if (tas_dev->glb_addr.mnBkPg.mnPage != page) { + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_BOOKCTL_PAGE, page); + if (n_result < 0) { + dev_err(tas_dev->dev, + "%s, page%xERROR, E=%d\n", + __func__, page, n_result); + goto out; + } + tas_dev->glb_addr.mnBkPg.mnPage = page; + } + tas_dev->glb_addr.ref_cnt++; + } else + dev_err(tas_dev->dev, + "%s, ERROR, no such channel(%d)\n", + __func__, chn); + +out: + return n_result; +} + +int tasdevice_dev_read(struct tasdevice_priv *tas_dev, + enum channel chn, unsigned int reg, unsigned int *pValue) +{ + int n_result = 0; + + mutex_lock(&tas_dev->dev_lock); + if (chn < tas_dev->ndev) { + n_result = tasdevice_change_chn_book_page(tas_dev, chn, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg)); + if (n_result < 0) + goto out; + + n_result = tasdevice_regmap_read(tas_dev, + TASDEVICE_PAGE_REG(reg), pValue); + if (n_result < 0) + dev_err(tas_dev->dev, "%s, ERROR,E=%d\n", + __func__, n_result); + else + dev_dbg(tas_dev->dev, + "%s: chn:0x%02x:BOOK:PAGE:REG 0x%02x:0x%02x:0x%02x, 0x%02x\n", + __func__, + tas_dev->tasdevice[chn].mnDevAddr, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg), + TASDEVICE_PAGE_REG(reg), *pValue); + } else { + + dev_err(tas_dev->dev, "%s, ERROR, no such channel(%d)\n", + __func__, chn); + } + +out: + mutex_unlock(&tas_dev->dev_lock); + return n_result; +} + +int tasdevice_dev_write(struct tasdevice_priv *tas_dev, + enum channel chn, unsigned int reg, unsigned int value) +{ + int n_result = 0; + + mutex_lock(&tas_dev->dev_lock); + if (chn <= tas_dev->ndev) { + n_result = tasdevice_change_chn_book_page(tas_dev, chn, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg)); + if (n_result < 0) + goto out; + + n_result = tasdevice_regmap_write(tas_dev, + TASDEVICE_PAGE_REG(reg), value); + if (n_result < 0) + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + else { + dev_dbg(tas_dev->dev, + "%s: %s-0x%02x:BOOK:PAGE:REG 0x%02x:0x%02x:0x%02x, VAL: 0x%02x\n", + __func__, (chn == tas_dev->ndev)?"glb":"chn", + (chn == tas_dev->ndev) ? + tas_dev->glb_addr.mnDevAddr + : tas_dev->tasdevice[chn].mnDevAddr, + TASDEVICE_BOOK_ID(reg), + TASDEVICE_PAGE_ID(reg), + TASDEVICE_PAGE_REG(reg), value); + } + } else + dev_err(tas_dev->dev, "%s, ERROR, no such channel(%d)\n", + __func__, chn); +out: + mutex_unlock(&tas_dev->dev_lock); + return n_result; +} + +int tasdevice_dev_bulk_write( + struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned char *p_data, + unsigned int n_length) +{ + int n_result = 0; + + mutex_lock(&tas_dev->dev_lock); + if (chn <= tas_dev->ndev) { + n_result = tasdevice_change_chn_book_page(tas_dev, chn, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg)); + if (n_result < 0) + goto out; + + n_result = tasdevice_regmap_bulk_write(tas_dev, + TASDEVICE_PAGE_REG(reg), p_data, n_length); + if (n_result < 0) + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + else { + dev_dbg(tas_dev->dev, + "%s: %s-0x%02x:BOOK:PAGE:REG 0x%02x:0x%02x: 0x%02x, len: 0x%02x\n", + __func__, + (chn == tas_dev->ndev)?"glb":"chn", + (chn == tas_dev->ndev) ? + tas_dev->glb_addr.mnDevAddr + : tas_dev->tasdevice[chn].mnDevAddr, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg), + TASDEVICE_PAGE_REG(reg), n_length); + } + } else + dev_err(tas_dev->dev, "%s, ERROR, no such channel(%d)\n", + __func__, chn); +out: + mutex_unlock(&tas_dev->dev_lock); + return n_result; +} + +int tasdevice_dev_bulk_read(struct tasdevice_priv *tas_dev, + enum channel chn, unsigned int reg, unsigned char *p_data, + unsigned int n_length) +{ + int n_result = 0; + + mutex_lock(&tas_dev->dev_lock); + if (chn < tas_dev->ndev) { + n_result = tasdevice_change_chn_book_page(tas_dev, chn, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg)); + if (n_result < 0) + goto out; + + n_result = tasdevice_regmap_bulk_read(tas_dev, + TASDEVICE_PAGE_REG(reg), p_data, n_length); + if (n_result < 0) + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + else + dev_dbg(tas_dev->dev, + "%s: chn0x%02x:BOOK:PAGE:REG 0x%02x:0x%02x: 0x%02x, len: 0x%02x\n", + __func__, + tas_dev->tasdevice[chn].mnDevAddr, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg), + TASDEVICE_PAGE_REG(reg), n_length); + } else + dev_err(tas_dev->dev, "%s, ERROR, no such channel(%d)\n", + __func__, chn); + +out: + mutex_unlock(&tas_dev->dev_lock); + return n_result; +} + +int tasdevice_dev_update_bits( + struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned int mask, unsigned int value) +{ + int n_result = 0; + struct i2c_client *pClient = + (struct i2c_client *)tas_dev->client; + + mutex_lock(&tas_dev->dev_lock); + if (chn < tas_dev->ndev) { + n_result = tasdevice_change_chn_book_page(tas_dev, chn, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg)); + if (n_result < 0) + goto out; + pClient->addr = tas_dev->tasdevice[chn].mnDevAddr; + n_result = tasdevice_regmap_update_bits(tas_dev, + TASDEVICE_PAGE_REG(reg), mask, value); + if (n_result < 0) + dev_err(tas_dev->dev, "%s, ERROR, E=%d\n", + __func__, n_result); + else + dev_dbg(tas_dev->dev, + "%s: chn0x%02x:BOOK:PAGE:REG 0x%02x:0x%02x:0x%02x, mask: 0x%02x, val: 0x%02x\n", + __func__, tas_dev->tasdevice[chn].mnDevAddr, + TASDEVICE_BOOK_ID(reg), TASDEVICE_PAGE_ID(reg), + TASDEVICE_PAGE_REG(reg), mask, value); + } else { + dev_err(tas_dev->dev, "%s, ERROR, no such channel(%d)\n", + __func__, chn); + n_result = -1; + } + +out: + mutex_unlock(&tas_dev->dev_lock); + return n_result; +} + +static void tas2781_reset(struct tasdevice_priv *tas_dev) +{ + int ret = 0; + int i = 0; + + for (; i < tas_dev->ndev; i++) { + ret = tasdevice_dev_write(tas_dev, i, + TAS2871_REG_SWRESET, + TAS2871_REG_SWRESET_RESET); + if (ret < 0) { + dev_err(tas_dev->dev, "%s: chn %d reset fail, %d\n", + __func__, i, ret); + continue; + } + } + usleep_range(1000, 1050); +} + +static void tas2781_set_global(struct tasdevice_priv *tas_dev) +{ + int i = 0; + int ret = 0; + + for (; i < tas_dev->ndev; i++) { + ret = tasdevice_dev_update_bits(tas_dev, i, + TAS2871_MISC_CFG2, + TAS2871_GLOBAL_MASK, 0x02); + if (ret < 0) { + dev_err(tas_dev->dev, "%s: chn %d set global fail, %d\n", + __func__, i, ret); + continue; + } + } +} + +static int tasdevice_init(struct tasdevice_priv *tas_dev) +{ + int nResult = 0, i = 0; + + tas_dev->mnCurrentProgram = -1; + tas_dev->mnCurrentConfiguration = -1; + + for (i = 0; i < tas_dev->ndev; i++) { + tas_dev->tasdevice[i].mnBkPg.mnBook = -1; + tas_dev->tasdevice[i].mnBkPg.mnPage = -1; + tas_dev->tasdevice[i].mnCurrentProgram = -1; + tas_dev->tasdevice[i].mnCurrentConfiguration = -1; + } + mutex_init(&tas_dev->dev_lock); + tas_dev->read = tasdevice_dev_read; + tas_dev->write = tasdevice_dev_write; + tas_dev->bulk_read = tasdevice_dev_bulk_read; + tas_dev->bulk_write = tasdevice_dev_bulk_write; + tas_dev->set_calibration = tas2781_set_calibration; + tas_dev->tas2781_reset = tas2781_reset; + if (tas_dev->glb_addr.mnDevAddr != 0 + && tas_dev->glb_addr.mnDevAddr < 0x7F) + tas_dev->tas2781_set_global = tas2781_set_global; + dev_set_drvdata(tas_dev->dev, tas_dev); + + INIT_DELAYED_WORK(&tas_dev->powercontrol_work, + powercontrol_routine); + + mutex_init(&tas_dev->codec_lock); + nResult = devm_snd_soc_register_component(tas_dev->dev, + &soc_codec_driver_tasdevice, + tasdevice_dai_driver, ARRAY_SIZE(tasdevice_dai_driver)); + if (nResult) + dev_err(tas_dev->dev, "%s: codec register error:0x%08x\n", + __func__, nResult); + + INIT_DELAYED_WORK(&tas_dev->mIrqInfo.irq_work, irq_work_routine); + tas_dev->mIrqInfo.mb_irq_enable = false; + + dev_info(tas_dev->dev, "i2c register success\n"); + + return nResult; +} + +void tasdevice_remove(struct tasdevice_priv *tas_dev) +{ + int i = 0; + + for (i = 0; i < tas_dev->mtRstGPIOs.ndev; i++) { + if (gpio_is_valid(tas_dev->mtRstGPIOs.mnResetGpio[i])) + gpio_free(tas_dev->mtRstGPIOs.mnResetGpio[i]); + } + + for (i = 0; i < tas_dev->ndev; i++) { + if (gpio_is_valid(tas_dev->tasdevice[i].mnIRQGPIO)) + gpio_free(tas_dev->tasdevice[i].mnIRQGPIO); + } + + if (delayed_work_pending(&tas_dev->mIrqInfo.irq_work)) { + dev_info(tas_dev->dev, "cancel IRQ work\n"); + cancel_delayed_work(&tas_dev->mIrqInfo.irq_work); + } + cancel_delayed_work_sync(&tas_dev->mIrqInfo.irq_work); + + mutex_destroy(&tas_dev->dev_lock); + mutex_destroy(&tas_dev->codec_lock); + snd_soc_unregister_component(tas_dev->dev); +} + +static int tasdevice_pm_suspend(struct device *dev) +{ + struct tasdevice_priv *tas_dev = dev_get_drvdata(dev); + + if (!tas_dev) { + dev_err(tas_dev->dev, "%s: drvdata is NULL\n", __func__); + return -EINVAL; + } + + mutex_lock(&tas_dev->codec_lock); + + tas_dev->mb_runtime_suspend = true; + + if (tas_dev->chip_id != GENERAL_AUDEV) { + if (delayed_work_pending(&tas_dev->mIrqInfo.irq_work)) { + dev_dbg(tas_dev->dev, "cancel IRQ work\n"); + cancel_delayed_work_sync(&tas_dev->mIrqInfo.irq_work); + } + } + mutex_unlock(&tas_dev->codec_lock); + return 0; +} + +static int tasdevice_pm_resume(struct device *dev) +{ + struct tasdevice_priv *tas_dev = dev_get_drvdata(dev); + + if (!tas_dev) + return -EINVAL; + + mutex_lock(&tas_dev->codec_lock); + tas_dev->mb_runtime_suspend = false; + mutex_unlock(&tas_dev->codec_lock); + return 0; +} + +const struct dev_pm_ops tasdevice_pm_ops = { + .suspend = tasdevice_pm_suspend, + .resume = tasdevice_pm_resume +}; + +static int tasdevice_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct tasdevice_priv *tas_dev = NULL; + int ret = 0; + + if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C)) { + dev_err(&i2c->dev, + "%s: I2C check failed\n", __func__); + ret = -ENODEV; + goto out; + } + + tas_dev = devm_kzalloc(&i2c->dev, sizeof(*tas_dev), GFP_KERNEL); + if (!tas_dev) { + ret = -ENOMEM; + goto out; + } + tas_dev->dev = &i2c->dev; + tas_dev->client = (void *)i2c; + tas_dev->chip_id = id->driver_data; + + if (i2c->dev.of_node) + ret = tasdevice_parse_dt(tas_dev); + else { + dev_err(tas_dev->dev, "No DTS info\n"); + goto out; + } + + tas_dev->regmap = devm_regmap_init_i2c(i2c, + &tasdevice_regmap); + if (IS_ERR(tas_dev->regmap)) { + ret = PTR_ERR(tas_dev->regmap); + dev_err(&i2c->dev, "Failed to allocate register map: %d\n", + ret); + return ret; + } + ret = tasdevice_init(tas_dev); + +out: + if (ret < 0 && tas_dev != NULL) + tasdevice_remove(tas_dev); + return ret; + +} + +static void tasdevice_i2c_remove(struct i2c_client *pClient) +{ + struct tasdevice_priv *tas_dev = i2c_get_clientdata(pClient); + + if (tas_dev) + tasdevice_remove(tas_dev); + +} + +static struct i2c_driver tasdevice_i2c_driver = { + .driver = { + .name = "tas2781-codec", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(tasdevice_of_match), + .pm = &tasdevice_pm_ops, + }, + .probe = tasdevice_i2c_probe, + .remove = tasdevice_i2c_remove, + .id_table = tasdevice_id, +}; + +module_i2c_driver(tasdevice_i2c_driver); + +MODULE_AUTHOR("Shenghao Ding <shenghao-ding(a)ti.com>"); +MODULE_AUTHOR("Kevin Lu <kevin-lu(a)ti.com>"); +MODULE_DESCRIPTION("ASoC TAS2781 Driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/tas2781.h b/sound/soc/codecs/tas2781.h new file mode 100644 index 000000000..db4ec752b --- /dev/null +++ b/sound/soc/codecs/tas2781.h @@ -0,0 +1,208 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier + * + * Copyright (C) 2022 - 2023 Texas Instruments Incorporated + * https://www.ti.com + * + * The TAS2781 driver implements a flexible and configurable register setting + * for one, two, even multiple TAS2781 chips. All the register setting are in + * a bin file. Almost no specific register setting can be found in the code. + * + * Author: Shenghao Ding <shenghao-ding(a)ti.com> + * Kevin Lu <kevin-lu(a)ti.com> + */ + +#ifndef __TAS2781_H__ +#define __TAS2781_H__ + +#include "tas2781-dsp.h" + +#define SMARTAMP_MODULE_NAME ("tas2781") +#define MAX_LENGTH (128) + +#define TASDEVICE_RETRY_COUNT (3) +#define TASDEVICE_ERROR_FAILED (-2) + +#define TASDEVICE_RATES (SNDRV_PCM_RATE_44100 |\ + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |\ + SNDRV_PCM_RATE_88200) +#define TASDEVICE_MAX_CHANNELS (8) + +#define TASDEVICE_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S24_LE | \ + SNDRV_PCM_FMTBIT_S32_LE) + +/*PAGE Control Register (available in page0 of each book) */ +#define TASDEVICE_PAGE_SELECT (0x00) +#define TASDEVICE_BOOKCTL_PAGE (0x00) +#define TASDEVICE_BOOKCTL_REG (127) +#define TASDEVICE_BOOK_ID(reg) (reg / (256 * 128)) +#define TASDEVICE_PAGE_ID(reg) ((reg % (256 * 128)) / 128) +#define TASDEVICE_PAGE_REG(reg) ((reg % (256 * 128)) % 128) +#define TASDEVICE_REG(book, page, reg) (((book * 256 * 128) + \ + (page * 128)) + reg) + + /*Software Reset */ +#define TAS2871_REG_SWRESET TASDEVICE_REG(0x0, 0X0, 0x02) +#define TAS2871_REG_SWRESET_RESET (0x1 << 0) + + /* Enable Global addresses */ +#define TAS2871_MISC_CFG2 TASDEVICE_REG(0x0, 0X0, 0x07) +#define TAS2871_GLOBAL_MASK (0x1 << 1) + +#define SMS_HTONS(a, b) ((((a)&0x00FF)<<8) | \ + ((b)&0x00FF)) +#define SMS_HTONL(a, b, c, d) ((((a)&0x000000FF)<<24) |\ + (((b)&0x000000FF)<<16) | \ + (((c)&0x000000FF)<<8) | \ + ((d)&0x000000FF)) + + /*I2C Checksum */ +#define TASDEVICE_I2CChecksum TASDEVICE_REG(0x0, 0x0, 0x7E) + + /* Volume control */ +#define TAS2781_DVC_LVL TASDEVICE_REG(0x0, 0x0, 0x1A) +#define TAS2781_AMP_LEVEL TASDEVICE_REG(0x0, 0x0, 0x03) +#define TAS2781_AMP_LEVEL_MASK GENMASK(5, 1) + +#define TASDEVICE_CMD_SING_W (0x1) +#define TASDEVICE_CMD_BURST (0x2) +#define TASDEVICE_CMD_DELAY (0x3) +#define TASDEVICE_CMD_FIELD_W (0x4) + +enum audio_device { + GENERAL_AUDEV = 0, + TAS2781 = 1, +}; + +struct smartpa_gpio_info { + unsigned char ndev; + int mnResetGpio[MaxChn]; +}; + +#define SMS_HTONS(a, b) ((((a)&0x00FF)<<8) | ((b)&0x00FF)) +#define SMS_HTONL(a, b, c, d) ((((a)&0x000000FF)<<24) | \ + (((b)&0x000000FF)<<16) | (((c)&0x000000FF)<<8) | \ + ((d)&0x000000FF)) + +struct Tbookpage { + unsigned char mnBook; + unsigned char mnPage; +}; + +struct Ttasdevice { + unsigned int mnDevAddr; + unsigned int mnErrCode; + short mnCurrentProgram; + short mnCurrentConfiguration; + short mnCurrentRegConf; + int mnIRQGPIO; + int mnResetGpio; + int mn_irq; + int PowerStatus; + bool bDSPBypass; + bool bIrq_enabled; + bool bLoading; + bool bLoaderr; + bool mbCalibrationLoaded; + struct Tbookpage mnBkPg; + struct TFirmware *mpCalFirmware; +}; + +struct global_addr { + struct Tbookpage mnBkPg; + unsigned int mnDevAddr; + int ref_cnt; +}; + +struct tas_control { + struct snd_kcontrol_new *tasdevice_profile_controls; + int nr_controls; +}; + +struct tasdevice_irqinfo { + int mn_irq_gpio; + int mn_irq; + struct delayed_work irq_work; + bool mb_irq_enable; +}; + +struct tasdevice_priv { + struct device *dev; + void *client; + struct regmap *regmap; + struct mutex codec_lock; + struct mutex dev_lock; + struct Ttasdevice tasdevice[MaxChn]; + struct TFirmware *mpFirmware; + struct tasdevice_regbin mtRegbin; + struct smartpa_gpio_info mtRstGPIOs; + struct tasdevice_irqinfo mIrqInfo; + struct tas_control tas_ctrl; + struct global_addr glb_addr; + int mnCurrentProgram; + int mnCurrentConfiguration; + unsigned int chip_id; + int (*read)(struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned int *pValue); + int (*write)(struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned int Value); + int (*bulk_read)(struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned char *pData, unsigned int len); + int (*bulk_write)(struct tasdevice_priv *tas_dev, enum channel chn, + unsigned int reg, unsigned char *pData, unsigned int len); + int (*set_calibration)(void *tas_dev, enum channel chl, + int calibration); + void (*tas2781_reset)(struct tasdevice_priv *tas_dev); + void (*tas2781_set_global)(struct tasdevice_priv *tas_dev); + int (*fw_parse_variable_header)(struct tasdevice_priv *tas_dev, + const struct firmware *pFW, int offset); + int (*fw_parse_program_data)(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, + const struct firmware *pFW, int offset); + int (*fw_parse_configuration_data)(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, + const struct firmware *pFW, int offset); + int (*tasdevice_load_block)(struct tasdevice_priv *tas_dev, + struct TBlock *pBlock); + int (*fw_parse_calibration_data)(struct tasdevice_priv *tas_dev, + struct TFirmware *pFirmware, + const struct firmware *pFW, int offset); + void (*irq_work_func)(struct tasdevice_priv *tas_dev); + int fw_state; + unsigned int magic_num; + unsigned char ndev; + unsigned char dev_name[32]; + unsigned char regbin_binaryname[64]; + unsigned char dsp_binaryname[64]; + unsigned char cal_binaryname[MaxChn][64]; + bool mb_runtime_suspend; + struct delayed_work powercontrol_work; + void *codec; + int sysclk; + int pstream; + int cstream; + bool mbCalibrationLoaded; +}; + +int tasdevice_dev_read(struct tasdevice_priv *pPcmdev, + enum channel chn, unsigned int reg, unsigned int *pValue); +int tasdevice_process_block(void *pContext, + unsigned char *data, unsigned char dev_idx, int sublocksize); +int tasdevice_dev_write(struct tasdevice_priv *pPcmdev, + enum channel chn, unsigned int reg, unsigned int value); + +int tasdevice_dev_bulk_write( + struct tasdevice_priv *pPcmdev, enum channel chn, + unsigned int reg, unsigned char *p_data, unsigned int n_length); + +int tasdevice_dev_bulk_read(struct tasdevice_priv *pPcmdev, + enum channel chn, unsigned int reg, unsigned char *p_data, + unsigned int n_length); + +int tasdevice_dev_update_bits( + struct tasdevice_priv *pPcmdev, enum channel chn, + unsigned int reg, unsigned int mask, unsigned int value); + +#endif /*__TAS2781_H__ */ -- 2.17.1

2 1

[PATCH v2 0/3] ASoC: SOF: Fixes for suspend after firmware crash
by Peter Ujfalusi 20 Dec '22

20 Dec '22

Hi, This is the followup series for the v1 sent out by Ranjani [1]. Unfortunately Ranjani was dragged away to another issue and could not send the update herself. Changes since v1: - In patch 2, move the tear_down_all_pipelines call instead of duplicating it Amadeusz: I have kept the check as it is: if (tplg_ops && tplg_ops->tear_down_all_pipelines) I'm preparing the ops optionality change series which would require this change. [1] https://lore.kernel.org/alsa-devel/20221215185347.1457541-1-ranjani.sridhar… Regards, Peter --- Curtis Malainey (1): ASoC: SOF: Add FW state to debugfs Ranjani Sridharan (2): ASoC: SOF: pm: Set target state earlier ASoC: SOF: pm: Always tear down pipelines before DSP suspend sound/soc/sof/debug.c | 4 +++- sound/soc/sof/pm.c | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) -- 2.39.0

1 0

[PATCH 0/2] ASoC: SOF: remove unregister calls from shutdown
by Kai Vehmanen 20 Dec '22

20 Dec '22

This patchset is an alternative solution to problems reported by Ricardo Ribalda <ribalda(a)chromium.org> and Zhen Ni <nizhen(a)uniontech.com>, as discussed in - "[PATCH] ALSA: core: Fix deadlock when shutdown a frozen userspace" https://mailman.alsa-project.org/pipermail/alsa-devel/2022-November/209248.… - "[PATCH] ASoc: SOF: Fix sof-audio-pci-intel-tgl shutdown timeout during hibernation" https://mailman.alsa-project.org/pipermail/alsa-devel/2022-December/209685.… It was raised by Oliver Neukum <oneukum(a)suse.com> that kernel should not let user-space stall the shutdown process in any scenario and the unregister call in current SOF shutdown code is not right. This series reverts the ASoC SOF patch to unregister clients and the machine drivers at shutdown. To avoid bringing back old bugs, the series includes a patch to fix S5 entry on certain Intel platforms. Kai Vehmanen (2): ASoC: SOF: Intel: pci-tgl: unblock S5 entry if DMA stop has failed" ASoC: SOF: Revert: "core: unregister clients and machine drivers in .shutdown" sound/soc/sof/core.c | 9 ----- sound/soc/sof/intel/hda-dsp.c | 72 +++++++++++++++++++++++++++++++++++ sound/soc/sof/intel/hda.h | 1 + sound/soc/sof/intel/tgl.c | 2 +- 4 files changed, 74 insertions(+), 10 deletions(-) base-commit: e85b1f5a9769ac30f4d2f6fb1cdcd9570c38e0c1 -- 2.38.1

5 12

[PATCH V6 0/5] ASoC: codecs: Add Awinic AW883XX audio amplifier driver
by wangweidong.a＠awinic.com 20 Dec '22

20 Dec '22

From: Weidong Wang <wangweidong.a(a)awinic.com> The Awinic AW883XX is an I2S/TDM input, high efficiency digital Smart K audio amplifier with an integrated 10.25V smart boost convert Add a DT schema for describing Awinic AW883xx audio amplifiers. They are controlled using I2C. v5 -> v6: Modify the return value of Kcontrol Delete error prints in Kcontrol Delete the aw883xx_dynamic_create_controls function Release firmware immediately after memcpy() Change the names of the Widget's input and output Delete the alloc and copy for aw_wiget Delete all debug nodes and use regmap's debugfs Use be32_to_cpup instead of custom macros Change inefficient writing Verify the size of the bin file Changing the function name Register directly with the snd_soc_register_component function Delete the aw_dev_reg_dump function Weidong Wang (5): ASoC: codecs: Add i2c and codec registration for aw883xx and their associated operation functions ASoC: codecs: Implementation of aw883xx configuration file parsing function ASoC: codecs: aw883xx chip control logic, such as power on and off ASoC: codecs: Configure aw883xx chip register as well as Kconfig and Makefile ASoC: dt-bindings: Add schema for "awinic,aw883xx" .../bindings/sound/awinic,aw883xx.yaml | 49 + sound/soc/codecs/Kconfig | 10 + sound/soc/codecs/Makefile | 7 + sound/soc/codecs/aw883xx/aw883xx.c | 909 +++++++ sound/soc/codecs/aw883xx/aw883xx.h | 81 + sound/soc/codecs/aw883xx/aw883xx_bin_parse.c | 1324 ++++++++++ sound/soc/codecs/aw883xx/aw883xx_bin_parse.h | 149 ++ sound/soc/codecs/aw883xx/aw883xx_data_type.h | 146 ++ sound/soc/codecs/aw883xx/aw883xx_device.c | 1613 ++++++++++++ sound/soc/codecs/aw883xx/aw883xx_device.h | 537 ++++ sound/soc/codecs/aw883xx/aw883xx_init.c | 615 +++++ .../soc/codecs/aw883xx/aw883xx_pid_2049_reg.h | 2300 +++++++++++++++++ 12 files changed, 7740 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml create mode 100644 sound/soc/codecs/aw883xx/aw883xx.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_bin_parse.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx_bin_parse.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_data_type.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_device.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx_device.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_init.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx_pid_2049_reg.h base-commit: 479174d402bcf60789106eedc4def3957c060bad -- 2.38.1

4 16

[PATCH] pcm: hw: Do not return error unless there is one
by Jonas Holmberg 20 Dec '22

20 Dec '22

Add a line that was removed by mistake in commit 7f2d6c3aac3505ceee4b0d3e8b3ca423ce29b070. Signed-off-by: Jonas Holmberg <jonashg(a)axis.com> --- src/pcm/pcm_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index 0588ce5e..daa3e1ff 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -356,7 +356,7 @@ static int snd_pcm_hw_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) if (hw->rates.min > 0) { err = _snd_pcm_hw_param_set_minmax(params, SND_PCM_HW_PARAM_RATE, hw->rates.min, 0, hw->rates.max + 1, -1); - + if (err < 0) return err; } -- 2.37.4

1 1

[PATCH 1/2] ASoC: fsl_sai: Factor out SAI reset
by Marek Vasut 19 Dec '22

19 Dec '22

The driver performs SAI reset in three places, factor the reset handling into single function to avoid duplication. No functional change. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: Shengjiu Wang <shengjiu.wang(a)gmail.com> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> To: alsa-devel(a)alsa-project.org --- sound/soc/fsl/fsl_sai.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 1c9be8a5dcb13..ade5a6b44b66a 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -704,6 +704,21 @@ static int fsl_sai_hw_free(struct snd_pcm_substream *substream, return 0; } +static void fsl_sai_reset(struct fsl_sai *sai, bool rx, bool tx) +{ + unsigned int ofs = sai->soc_data->reg_offset; + + if (tx) + regmap_write(sai->regmap, FSL_SAI_TCSR(ofs), FSL_SAI_CSR_SR); + if (rx) + regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), FSL_SAI_CSR_SR); + usleep_range(1000, 2000); + if (tx) + regmap_write(sai->regmap, FSL_SAI_TCSR(ofs), 0); + if (rx) + regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), 0); +} + static void fsl_sai_config_disable(struct fsl_sai *sai, int dir) { unsigned int ofs = sai->soc_data->reg_offset; @@ -729,12 +744,8 @@ static void fsl_sai_config_disable(struct fsl_sai *sai, int dir) * This is a hardware bug, and will be fix in the * next sai version. */ - if (!sai->is_consumer_mode) { - /* Software Reset */ - regmap_write(sai->regmap, FSL_SAI_xCSR(tx, ofs), FSL_SAI_CSR_SR); - /* Clear SR bit to finish the reset */ - regmap_write(sai->regmap, FSL_SAI_xCSR(tx, ofs), 0); - } + if (!sai->is_consumer_mode) + fsl_sai_reset(sai, dir == RX, dir == TX); } static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd, @@ -863,12 +874,7 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai) struct fsl_sai *sai = dev_get_drvdata(cpu_dai->dev); unsigned int ofs = sai->soc_data->reg_offset; - /* Software Reset for both Tx and Rx */ - regmap_write(sai->regmap, FSL_SAI_TCSR(ofs), FSL_SAI_CSR_SR); - regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), FSL_SAI_CSR_SR); - /* Clear SR bit to finish the reset */ - regmap_write(sai->regmap, FSL_SAI_TCSR(ofs), 0); - regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), 0); + fsl_sai_reset(sai, true, true); regmap_update_bits(sai->regmap, FSL_SAI_TCR1(ofs), FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth), @@ -1632,7 +1638,6 @@ static int fsl_sai_runtime_suspend(struct device *dev) static int fsl_sai_runtime_resume(struct device *dev) { struct fsl_sai *sai = dev_get_drvdata(dev); - unsigned int ofs = sai->soc_data->reg_offset; int ret; ret = clk_prepare_enable(sai->bus_clk); @@ -1658,11 +1663,8 @@ static int fsl_sai_runtime_resume(struct device *dev) regcache_cache_only(sai->regmap, false); regcache_mark_dirty(sai->regmap); - regmap_write(sai->regmap, FSL_SAI_TCSR(ofs), FSL_SAI_CSR_SR); - regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), FSL_SAI_CSR_SR); - usleep_range(1000, 2000); - regmap_write(sai->regmap, FSL_SAI_TCSR(ofs), 0); - regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), 0); + + fsl_sai_reset(sai, true, true); ret = regcache_sync(sai->regmap); if (ret) -- 2.35.1

3 5

RE: [PATCH 2/2] ASoC: da7213: Add support for mono, set frame width to 32 when possible
by David.Rau.opensource 19 Dec '22

19 Dec '22

Is there anything I should modify or correct to make this commit move forward? David Rau Renesas -----Original Message----- From: Piotr Wojtaszczyk <piotr.wojtaszczyk(a)timesys.com> Sent: Thursday, December 15, 2022 00:25 To: Mark Brown <broonie(a)kernel.org> Cc: David.Rau.opensource <David.Rau.opensource(a)dm.renesas.com>; tiwai(a)suse.com; perex(a)perex.cz; support.opensource(a)diasemi.com; lgirdwood(a)gmail.com; alsa-devel(a)alsa-project.org; linux-kernel(a)vger.kernel.org Subject: Re: [PATCH 2/2] ASoC: da7213: Add support for mono, set frame width to 32 when possible On Wed, Dec 14, 2022 at 3:56 PM Mark Brown <broonie(a)kernel.org> wrote: > > On Wed, Dec 14, 2022 at 03:31:26PM +0100, Piotr Wojtaszczyk wrote: > > It was a single patch, with no deps. > > > > It's flagged as patch 2/2? That's wrong tag, initially I submitted this as a single patch to `support.opensource(a)diasemi.com` and now it comes on LKML after testing by David Rau. -- Piotr Wojtaszczyk Timesys

2 1

[PATCH 00/11] ASoC: dt-bindings: audio-graph-port related update
by Kuninori Morimoto 19 Dec '22

19 Dec '22

Hi ASoC ML, DT ML Cc Geert, Nvidia member These patches fixups audio-graph-port, and its related DT schema. Audio-Graph-Card and Simple-Audio-Card are similar Card and are sharing same utils. Thus we can also sharing same schema. Renesas and Nvidia are main user of Audio-Graph-Card. This patch-set fixup some Renesas's "make dtbs_check". Geert Uytterhoeven (1): ASoC: dt-bindings: ti,pcm3168a: Convert to json-schema Kuninori Morimoto (10): ASoC: dt-bindings: audio-graph-port: use definitions for port/endpoint ASoC: dt-bindings: audio-graph-port: add definitions/ports ASoC: dt-bindings: audio-graph-port: add missing mclk-fs ASoC: dt-bindings: audio-graph-port: add clocks on endpoint ASoC: dt-bindings: audio-graph-port: remove prefix ASoC: dt-bindings: nvidia: use audio-graph-port.yaml ports ASoC: dt-bindings: ak4613: enable Of-graph (Audio-Graph-Card) style ASoC: dt-bindings: renesas,rsnd: add missing playback/capture ASoC: dt-bindings: renesas,rsnd: #sound-dai-cells is not mandatory ASoC: dt-bindings: simple-card: add missing #address-cells/#size-cells .../devicetree/bindings/sound/ak4613.yaml | 7 ++ .../bindings/sound/audio-graph-port.yaml | 65 ++++++++---- .../bindings/sound/nvidia,tegra186-asrc.yaml | 14 +-- .../bindings/sound/nvidia,tegra186-dspk.yaml | 21 ++-- .../sound/nvidia,tegra210-admaif.yaml | 7 +- .../bindings/sound/nvidia,tegra210-adx.yaml | 14 +-- .../bindings/sound/nvidia,tegra210-ahub.yaml | 7 +- .../bindings/sound/nvidia,tegra210-amx.yaml | 16 +-- .../bindings/sound/nvidia,tegra210-dmic.yaml | 21 ++-- .../bindings/sound/nvidia,tegra210-i2s.yaml | 21 ++-- .../bindings/sound/nvidia,tegra210-mixer.yaml | 14 +-- .../bindings/sound/nvidia,tegra210-mvc.yaml | 21 ++-- .../bindings/sound/nvidia,tegra210-ope.yaml | 21 ++-- .../bindings/sound/nvidia,tegra210-sfc.yaml | 21 ++-- .../bindings/sound/renesas,rsnd.yaml | 29 ++++- .../bindings/sound/simple-card.yaml | 4 + .../devicetree/bindings/sound/ti,pcm3168a.txt | 56 ---------- .../bindings/sound/ti,pcm3168a.yaml | 100 ++++++++++++++++++ 18 files changed, 228 insertions(+), 231 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/ti,pcm3168a.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml -- 2.25.1

5 26

Add rate limitation in a SectionDevice
by GitHub issues - edited 19 Dec '22

19 Dec '22

alsa-project/alsa-ucm-conf issue #253 was edited from fchiby: Hello @perexg, I created an alsa-ucm configuration to my board i350-evk (mt8365-evk). Here my configuration files: [mt8365-evk.conf.txt](https://github.com/alsa-project/alsa-ucm-conf/files/10… [HiFi.conf.txt](https://github.com/alsa-project/alsa-ucm-conf/files/10247429… However pulseaudio initialization failed because of hw:mt8365evk,2, this pcm device is connected to jack_mic and Amic. ``` D: [pulseaudio] alsa-util.c: _buffer_size:4408 , _period_size:1102 I: [pulseaudio] pcm_hw.c: SNDRV_PCM_IOCTL_PREPARE failed (-22) D: [pulseaudio] alsa-util.c: _buffer_size:4408 , _period_size:1102 I: [pulseaudio] pcm_hw.c: SNDRV_PCM_IOCTL_PREPARE failed (-22) D: [pulseaudio] alsa-util.c: _buffer_size:4408 , _period_size:1102 I: [pulseaudio] pcm_hw.c: SNDRV_PCM_IOCTL_PREPARE failed (-22) D: [pulseaudio] alsa-util.c: Set neither period nor buffer size. I: [pulseaudio] pcm_hw.c: SNDRV_PCM_IOCTL_PREPARE failed (-22) I: [pulseaudio] alsa-util.c: snd_pcm_hw_params failed: Invalid argument D: [pulseaudio] alsa-util.c: Trying plug:SLAVE='_ucm0006.hw:mt8365evk,2' with SND_PCM_NO_AUTO_FORMAT ... I: [pulseaudio] pcm.c: Unknown PCM _ucm0006.hw:mt8365evk,2 I: [pulseaudio] alsa-util.c: Error opening PCM device plug:SLAVE='_ucm0006.hw:mt8365evk,2': No such file or directory D: [pulseaudio] alsa-mixer.c: Profile set 0xaaab0a13a700, auto_profiles=no, probed=yes, n_mappings=0, n_profiles=0, n_decibel_fixes=0 E: [pulseaudio] module-alsa-card.c: Failed to find a working profile. E: [pulseaudio] module.c: Failed to load module "module-alsa-card" (argument: "device_id="0" name="platform-sound" card_name="alsa_card.platform-sound" namereg_fail=false tsched=yes fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes avoid_resampling=no card_properties="module-udev-detect.discovered=1""): initialization failed. ``` Whith dmesg I got more details about pulseaudio failure: ``` [ 160.295717] mt8365-afe-pcm 11220000.audio-controller: mt8365_afe_fe_hw_params AWB period = 1102 rate = 44100 channels = 1 [ 160.295865] mt8365-afe-pcm 11220000.audio-controller: mt8365_afe_int_adda_prepare 'Capture' rate = 44100 [ 160.295881] mt8365-afe-pcm 11220000.audio-controller: ASoC: error at snd_soc_pcm_dai_prepare on INT ADDA: -22 [ 160.295891] MTK Codec: ASoC: soc_pcm_prepare() failed (-22) [ 160.295900] AWB_FE: ASoC: dpcm_be_dai_prepare() failed (-22) [ 160.295908] AWB_FE: ASoC: dpcm_fe_dai_prepare() failed (-22) [ 160.296395] mt8365-afe-pcm 11220000.audio-controller: mt8365_afe_fe_hw_params AWB period = 512 rate = 44100 channels = 1 [ 160.296543] mt8365-afe-pcm 11220000.audio-controller: mt8365_afe_int_adda_prepare 'Capture' rate = 44100 [ 160.296559] mt8365-afe-pcm 11220000.audio-controller: ASoC: error at snd_soc_pcm_dai_prepare on INT ADDA: -22 [ 160.296569] MTK Codec: ASoC: soc_pcm_prepare() failed (-22) [ 160.296577] AWB_FE: ASoC: dpcm_be_dai_prepare() failed (-22) [ 160.296585] AWB_FE: ASoC: dpcm_fe_dai_prepare() failed (-22) ``` When I checked the machine driver, hw:mt8365evk,2 FE (AWB) has 8000_192000, while hw:mt8365evk,2 BE (INT_ADDA) has only [8000, 16000, 32000, 48000] as sample rates. Actually, the rate limitation is not on afe dai, it's on PMIC. So we prefer to not restrict hw:mt8365evk,2 FE AWB rates. My question is, **is it possible to specify the rate limitation in a** `SectionDevice` ? I checked the alsa-ucm-conf documentation and did not find any section for this :/ [alsa-ucm-conf docs](https://www.alsa-project.org/alsa-doc/alsa-lib/group__ucm__conf.htmll) Thanks a bunch ! Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/253 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Add rate limitation in a SectionDevice
by GitHub issues - opened 19 Dec '22

19 Dec '22

alsa-project/alsa-ucm-conf issue #253 was opened from fchiby: Hello, I created an alsa-ucm configuration to my board i350-evk (mt8365-evk). Here my configuration files: [mt8365-evk.conf.txt](https://github.com/alsa-project/alsa-ucm-conf/files/10… [HiFi.conf.txt](https://github.com/alsa-project/alsa-ucm-conf/files/10247429… However pulseaudio initialization failed because of hw:mt8365evk,2, this pcm device is connected to jack_mic and Amic. ``` D: [pulseaudio] alsa-util.c: _buffer_size:4408 , _period_size:1102 I: [pulseaudio] pcm_hw.c: SNDRV_PCM_IOCTL_PREPARE failed (-22) D: [pulseaudio] alsa-util.c: _buffer_size:4408 , _period_size:1102 I: [pulseaudio] pcm_hw.c: SNDRV_PCM_IOCTL_PREPARE failed (-22) D: [pulseaudio] alsa-util.c: _buffer_size:4408 , _period_size:1102 I: [pulseaudio] pcm_hw.c: SNDRV_PCM_IOCTL_PREPARE failed (-22) D: [pulseaudio] alsa-util.c: Set neither period nor buffer size. I: [pulseaudio] pcm_hw.c: SNDRV_PCM_IOCTL_PREPARE failed (-22) I: [pulseaudio] alsa-util.c: snd_pcm_hw_params failed: Invalid argument D: [pulseaudio] alsa-util.c: Trying plug:SLAVE='_ucm0006.hw:mt8365evk,2' with SND_PCM_NO_AUTO_FORMAT ... I: [pulseaudio] pcm.c: Unknown PCM _ucm0006.hw:mt8365evk,2 I: [pulseaudio] alsa-util.c: Error opening PCM device plug:SLAVE='_ucm0006.hw:mt8365evk,2': No such file or directory D: [pulseaudio] alsa-mixer.c: Profile set 0xaaab0a13a700, auto_profiles=no, probed=yes, n_mappings=0, n_profiles=0, n_decibel_fixes=0 E: [pulseaudio] module-alsa-card.c: Failed to find a working profile. E: [pulseaudio] module.c: Failed to load module "module-alsa-card" (argument: "device_id="0" name="platform-sound" card_name="alsa_card.platform-sound" namereg_fail=false tsched=yes fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes avoid_resampling=no card_properties="module-udev-detect.discovered=1""): initialization failed. ``` Whith dmesg I got more details about pulseaudio failure: ``` [ 160.295717] mt8365-afe-pcm 11220000.audio-controller: mt8365_afe_fe_hw_params AWB period = 1102 rate = 44100 channels = 1 [ 160.295865] mt8365-afe-pcm 11220000.audio-controller: mt8365_afe_int_adda_prepare 'Capture' rate = 44100 [ 160.295881] mt8365-afe-pcm 11220000.audio-controller: ASoC: error at snd_soc_pcm_dai_prepare on INT ADDA: -22 [ 160.295891] MTK Codec: ASoC: soc_pcm_prepare() failed (-22) [ 160.295900] AWB_FE: ASoC: dpcm_be_dai_prepare() failed (-22) [ 160.295908] AWB_FE: ASoC: dpcm_fe_dai_prepare() failed (-22) [ 160.296395] mt8365-afe-pcm 11220000.audio-controller: mt8365_afe_fe_hw_params AWB period = 512 rate = 44100 channels = 1 [ 160.296543] mt8365-afe-pcm 11220000.audio-controller: mt8365_afe_int_adda_prepare 'Capture' rate = 44100 [ 160.296559] mt8365-afe-pcm 11220000.audio-controller: ASoC: error at snd_soc_pcm_dai_prepare on INT ADDA: -22 [ 160.296569] MTK Codec: ASoC: soc_pcm_prepare() failed (-22) [ 160.296577] AWB_FE: ASoC: dpcm_be_dai_prepare() failed (-22) [ 160.296585] AWB_FE: ASoC: dpcm_fe_dai_prepare() failed (-22) ``` When I checked the machine driver, hw:mt8365evk,2 FE (AWB) has 8000_192000, while hw:mt8365evk,2 BE (INT_ADDA) has only [8000, 16000, 32000, 48000] as sample rates. Actually, the rate limitation is not on afe dai, it's on PMIC. So we prefer to not restrict hw:mt8365evk,2 FE AWB rates. My question is, **is it possible to specify the rate limitation in a** `SectionDevice` ? I checked the alsa-ucm-conf documentation and did not find any section for this :/ [alsa-ucm-conf docs](https://www.alsa-project.org/alsa-doc/alsa-lib/group__ucm__conf.htmll) Thanks a bunch ! Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/253 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v3 00/12] ASoC: mediatek: Add support for MT8188 SoC
by Trevor Wu 19 Dec '22

19 Dec '22

This series of patches adds support for Mediatek AFE of MT8188 SoC. Patches are based on broonie tree "for-next" branch. Changes since v2: - drop CLK_IGNORE_UNUSED flag - include bitfield.h to reslove the issue reported by kernel test robot - rename mt8188-afe-pcm.yaml to mt8188-afe.yaml - refine dt-binding files based on reviewer's suggestions Changes since v1: - remove bus protection functions in case of unmerged dependency problem - replace some bit operation macro with FIELD_PREP - simplify register control by regmap_set_bits and regmap_clear_bits - fix dt-binding errors - rename compatible string for recognition Trevor Wu (12): ASoC: mediatek: common: add SMC ops and SMC CMD ASoC: mediatek: mt8188: add common header ASoC: mediatek: mt8188: support audsys clock ASoC: mediatek: mt8188: support adda in platform driver ASoC: mediatek: mt8188: support etdm in platform driver ASoC: mediatek: mt8188: support pcmif in platform driver ASoC: mediatek: mt8188: support audio clock control ASoC: mediatek: mt8188: add platform driver ASoC: mediatek: mt8188: add control for timing select dt-bindings: mediatek: mt8188: add audio afe document ASoC: mediatek: mt8188: add machine driver with mt6359 dt-bindings: mediatek: mt8188: add mt8188-mt6359 document .../devicetree/bindings/sound/mt8188-afe.yaml | 196 + .../bindings/sound/mt8188-mt6359.yaml | 60 + sound/soc/mediatek/Kconfig | 23 + sound/soc/mediatek/Makefile | 1 + sound/soc/mediatek/common/mtk-base-afe.h | 19 + sound/soc/mediatek/mt8188/Makefile | 15 + sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 656 ++++ sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 114 + sound/soc/mediatek/mt8188/mt8188-afe-common.h | 151 + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 3359 +++++++++++++++++ sound/soc/mediatek/mt8188/mt8188-audsys-clk.c | 205 + sound/soc/mediatek/mt8188/mt8188-audsys-clk.h | 15 + .../soc/mediatek/mt8188/mt8188-audsys-clkid.h | 83 + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 632 ++++ sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 2591 +++++++++++++ sound/soc/mediatek/mt8188/mt8188-dai-pcm.c | 367 ++ sound/soc/mediatek/mt8188/mt8188-mt6359.c | 808 ++++ sound/soc/mediatek/mt8188/mt8188-reg.h | 3180 ++++++++++++++++ 18 files changed, 12475 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/mt8188-afe.yaml create mode 100644 Documentation/devicetree/bindings/sound/mt8188-mt6359.yaml create mode 100644 sound/soc/mediatek/mt8188/Makefile create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-clk.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-clk.h create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-common.h create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-pcm.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clk.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clk.h create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clkid.h create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-adda.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-etdm.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-pcm.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-mt6359.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-reg.h -- 2.18.0

5 32

[PATCH AUTOSEL 4.14 03/23] ASoC: codecs: rt298: Add quirk for KBL-R RVP platform
by Sasha Levin 18 Dec '22

18 Dec '22

From: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> [ Upstream commit 953dbd1cef18ce9ac0d69c1bd735b929fe52a17e ] KBL-R RVP platforms also use combojack, so we need to enable that configuration for them. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Link: https://lore.kernel.org/r/20221010121955.718168-4-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt298.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index ce963768449f..041955eb7922 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1170,6 +1170,13 @@ static const struct dmi_system_id force_combo_jack_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Geminilake") } }, + { + .ident = "Intel Kabylake R RVP", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform") + } + }, { } }; -- 2.35.1

1 0

[PATCH AUTOSEL 4.19 03/26] ASoC: codecs: rt298: Add quirk for KBL-R RVP platform
by Sasha Levin 18 Dec '22

18 Dec '22

From: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> [ Upstream commit 953dbd1cef18ce9ac0d69c1bd735b929fe52a17e ] KBL-R RVP platforms also use combojack, so we need to enable that configuration for them. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Link: https://lore.kernel.org/r/20221010121955.718168-4-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt298.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 06cdba4edfe2..3181b91a025b 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1169,6 +1169,13 @@ static const struct dmi_system_id force_combo_jack_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Geminilake") } }, + { + .ident = "Intel Kabylake R RVP", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform") + } + }, { } }; -- 2.35.1

1 0

[PATCH AUTOSEL 5.4 05/30] ASoC: codecs: rt298: Add quirk for KBL-R RVP platform
by Sasha Levin 18 Dec '22

18 Dec '22

From: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> [ Upstream commit 953dbd1cef18ce9ac0d69c1bd735b929fe52a17e ] KBL-R RVP platforms also use combojack, so we need to enable that configuration for them. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Link: https://lore.kernel.org/r/20221010121955.718168-4-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt298.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index f8c0f977206c..cc7eb34a641d 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1166,6 +1166,13 @@ static const struct dmi_system_id force_combo_jack_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Geminilake") } }, + { + .ident = "Intel Kabylake R RVP", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform") + } + }, { } }; -- 2.35.1

1 0

[PATCH AUTOSEL 5.10 05/39] ASoC: codecs: rt298: Add quirk for KBL-R RVP platform
by Sasha Levin 18 Dec '22

18 Dec '22

From: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> [ Upstream commit 953dbd1cef18ce9ac0d69c1bd735b929fe52a17e ] KBL-R RVP platforms also use combojack, so we need to enable that configuration for them. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Link: https://lore.kernel.org/r/20221010121955.718168-4-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt298.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index dc0273a5a11f..1ca06213e3a3 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1168,6 +1168,13 @@ static const struct dmi_system_id force_combo_jack_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Geminilake") } }, + { + .ident = "Intel Kabylake R RVP", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform") + } + }, { } }; -- 2.35.1

1 0

[PATCH AUTOSEL 5.15 06/46] ASoC: codecs: rt298: Add quirk for KBL-R RVP platform
by Sasha Levin 18 Dec '22

18 Dec '22

From: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> [ Upstream commit 953dbd1cef18ce9ac0d69c1bd735b929fe52a17e ] KBL-R RVP platforms also use combojack, so we need to enable that configuration for them. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Link: https://lore.kernel.org/r/20221010121955.718168-4-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt298.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index c592c40a7ab3..604754e4b29f 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1173,6 +1173,13 @@ static const struct dmi_system_id force_combo_jack_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Geminilake") } }, + { + .ident = "Intel Kabylake R RVP", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform") + } + }, { } }; -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 57/73] ASoC: amd: yc: Add Xiaomi Redmi Book Pro 14 2022 into DMI table
by Sasha Levin 18 Dec '22

18 Dec '22

From: Artem Lukyanov <dukzcry(a)ya.ru> [ Upstream commit c1dd6bf6199752890d8c59d895dd45094da51d1f ] This model requires an additional detection quirk to enable the internal microphone - BIOS doesn't seem to support AcpDmicConnected (nothing in acpidump output). Signed-off-by: Artem Lukyanov <dukzcry(a)ya.ru> Link: https://lore.kernel.org/r/20221130085247.85126-1-dukzcry@ya.ru Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index d9715bea965e..1f0b5527c594 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -213,6 +213,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17 R5 AMD"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"), + DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 14 2022"), + } + }, {} }; -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 07/73] ASoC: Intel: avs: Add quirk for KBL-R RVP platform
by Sasha Levin 18 Dec '22

18 Dec '22

From: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> [ Upstream commit 9d0737fa0e7530313634c0ecd75f09a95ba8d44a ] KBL-R RVPs contain built-in rt298 codec which requires different PLL clock and .dai_fmt configuration than seen on other boards. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Link: https://lore.kernel.org/r/20221010121955.718168-5-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/avs/boards/rt298.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c index b28d36872dcb..58c9d9edecf0 100644 --- a/sound/soc/intel/avs/boards/rt298.c +++ b/sound/soc/intel/avs/boards/rt298.c @@ -6,6 +6,7 @@ // Amadeusz Slawinski <amadeuszx.slawinski(a)linux.intel.com> // +#include <linux/dmi.h> #include <linux/module.h> #include <sound/jack.h> #include <sound/pcm.h> @@ -14,6 +15,16 @@ #include <sound/soc-acpi.h> #include "../../../codecs/rt298.h" +static const struct dmi_system_id kblr_dmi_table[] = { + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_BOARD_NAME, "Kabylake R DDR4 RVP"), + }, + }, + {} +}; + static const struct snd_kcontrol_new card_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone Jack"), SOC_DAPM_PIN_SWITCH("Mic Jack"), @@ -96,9 +107,15 @@ avs_rt298_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_param { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + unsigned int clk_freq; int ret; - ret = snd_soc_dai_set_sysclk(codec_dai, RT298_SCLK_S_PLL, 19200000, SND_SOC_CLOCK_IN); + if (dmi_first_match(kblr_dmi_table)) + clk_freq = 24000000; + else + clk_freq = 19200000; + + ret = snd_soc_dai_set_sysclk(codec_dai, RT298_SCLK_S_PLL, clk_freq, SND_SOC_CLOCK_IN); if (ret < 0) dev_err(rtd->dev, "Set codec sysclk failed: %d\n", ret); @@ -139,7 +156,10 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->platforms = platform; dl->num_platforms = 1; dl->id = 0; - dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; + if (dmi_first_match(kblr_dmi_table)) + dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; + else + dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; dl->init = avs_rt298_codec_init; dl->be_hw_params_fixup = avs_rt298_be_fixup; dl->ops = &avs_rt298_ops; -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 06/73] ASoC: codecs: rt298: Add quirk for KBL-R RVP platform
by Sasha Levin 18 Dec '22

18 Dec '22

From: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> [ Upstream commit 953dbd1cef18ce9ac0d69c1bd735b929fe52a17e ] KBL-R RVP platforms also use combojack, so we need to enable that configuration for them. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Link: https://lore.kernel.org/r/20221010121955.718168-4-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt298.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index b0b53d4f07df..5f36064ed6e6 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1166,6 +1166,13 @@ static const struct dmi_system_id force_combo_jack_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Geminilake") } }, + { + .ident = "Intel Kabylake R RVP", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform") + } + }, { } }; -- 2.35.1

1 0

[PATCH AUTOSEL 6.1 67/85] ASoC: amd: yc: Add Xiaomi Redmi Book Pro 14 2022 into DMI table
by Sasha Levin 18 Dec '22

18 Dec '22

From: Artem Lukyanov <dukzcry(a)ya.ru> [ Upstream commit c1dd6bf6199752890d8c59d895dd45094da51d1f ] This model requires an additional detection quirk to enable the internal microphone - BIOS doesn't seem to support AcpDmicConnected (nothing in acpidump output). Signed-off-by: Artem Lukyanov <dukzcry(a)ya.ru> Link: https://lore.kernel.org/r/20221130085247.85126-1-dukzcry@ya.ru Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index d9715bea965e..1f0b5527c594 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -213,6 +213,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17 R5 AMD"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"), + DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 14 2022"), + } + }, {} }; -- 2.35.1

1 0

[PATCH AUTOSEL 6.1 63/85] ALSA: usb-audio: Add quirk for Tascam Model 12
by Sasha Levin 18 Dec '22

18 Dec '22

From: John Keeping <john(a)metanate.com> [ Upstream commit 67df411db3f0209e4bb5227d4dd9d41b21368b9d ] Tascam's Model 12 is a mixer which can also operate as a USB audio interface. The audio interface uses explicit feedback but it seems that it does not correctly handle missing isochronous frames. When injecting an xrun (or doing anything else that pauses the playback stream) the feedback rate climbs (for example, at 44,100Hz nominal, I see a stable rate around 44,099 but xrun injection sees this peak at around 44,135 in most cases) and glitches are heard in the audio stream for several seconds - this is significantly worse than the single glitch expected for an underrun. While the stream does normally recover and the feedback rate returns to a stable value, I have seen some occurrences where this does not happen and the rate continues to increase while no audio is heard from the output. I have not found a solid reproduction for this. This misbehaviour can be avoided by totally resetting the stream state by switching the interface to alt 0 and back before restarting the playback stream. Add a new quirk flag which forces the endpoint and interface to be reconfigured whenever the stream is stopped, and use this for the Tascam Model 12. Separate interfaces are used for the playback and capture endpoints, so resetting the playback interface here will not affect the capture stream if it is running. While there are two endpoints on the interface, these are the OUT data endpoint and the IN explicit feedback endpoint corresponding to it and these are always stopped and started together. Signed-off-by: John Keeping <john(a)metanate.com> Link: https://lore.kernel.org/r/20221129130100.1257904-1-john@metanate.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/usb/endpoint.c | 7 +++++++ sound/usb/quirks.c | 2 ++ sound/usb/usbaudio.h | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 310cd6fb0038..4aaf0784940b 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -1673,6 +1673,13 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep, bool keep_pending) stop_urbs(ep, false, keep_pending); if (ep->clock_ref) atomic_dec(&ep->clock_ref->locked); + + if (ep->chip->quirk_flags & QUIRK_FLAG_FORCE_IFACE_RESET && + usb_pipeout(ep->pipe)) { + ep->need_prepare = true; + if (ep->iface_ref) + ep->iface_ref->need_setup = true; + } } } diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0f4dd3503a6a..58b37bfc885c 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -2044,6 +2044,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { DEVICE_FLG(0x0644, 0x804a, /* TEAC UD-301 */ QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY | QUIRK_FLAG_IFACE_DELAY), + DEVICE_FLG(0x0644, 0x805f, /* TEAC Model 12 */ + QUIRK_FLAG_FORCE_IFACE_RESET), DEVICE_FLG(0x06f8, 0xb000, /* Hercules DJ Console (Windows Edition) */ QUIRK_FLAG_IGNORE_CTL_ERROR), DEVICE_FLG(0x06f8, 0xd002, /* Hercules DJ Console (Macintosh Edition) */ diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index e97141ef730a..2aba508a4831 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -172,6 +172,9 @@ extern bool snd_usb_skip_validation; * Don't apply implicit feedback sync mode * QUIRK_FLAG_IFACE_SKIP_CLOSE * Don't closed interface during setting sample rate + * QUIRK_FLAG_FORCE_IFACE_RESET + * Force an interface reset whenever stopping & restarting a stream + * (e.g. after xrun) */ #define QUIRK_FLAG_GET_SAMPLE_RATE (1U << 0) @@ -194,5 +197,6 @@ extern bool snd_usb_skip_validation; #define QUIRK_FLAG_GENERIC_IMPLICIT_FB (1U << 17) #define QUIRK_FLAG_SKIP_IMPLICIT_FB (1U << 18) #define QUIRK_FLAG_IFACE_SKIP_CLOSE (1U << 19) +#define QUIRK_FLAG_FORCE_IFACE_RESET (1U << 20) #endif /* __USBAUDIO_H */ -- 2.35.1

1 0

[PATCH AUTOSEL 6.1 07/85] ASoC: Intel: avs: Add quirk for KBL-R RVP platform
by Sasha Levin 18 Dec '22

18 Dec '22

From: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> [ Upstream commit 9d0737fa0e7530313634c0ecd75f09a95ba8d44a ] KBL-R RVPs contain built-in rt298 codec which requires different PLL clock and .dai_fmt configuration than seen on other boards. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Link: https://lore.kernel.org/r/20221010121955.718168-5-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/avs/boards/rt298.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c index b28d36872dcb..58c9d9edecf0 100644 --- a/sound/soc/intel/avs/boards/rt298.c +++ b/sound/soc/intel/avs/boards/rt298.c @@ -6,6 +6,7 @@ // Amadeusz Slawinski <amadeuszx.slawinski(a)linux.intel.com> // +#include <linux/dmi.h> #include <linux/module.h> #include <sound/jack.h> #include <sound/pcm.h> @@ -14,6 +15,16 @@ #include <sound/soc-acpi.h> #include "../../../codecs/rt298.h" +static const struct dmi_system_id kblr_dmi_table[] = { + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_BOARD_NAME, "Kabylake R DDR4 RVP"), + }, + }, + {} +}; + static const struct snd_kcontrol_new card_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone Jack"), SOC_DAPM_PIN_SWITCH("Mic Jack"), @@ -96,9 +107,15 @@ avs_rt298_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_param { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + unsigned int clk_freq; int ret; - ret = snd_soc_dai_set_sysclk(codec_dai, RT298_SCLK_S_PLL, 19200000, SND_SOC_CLOCK_IN); + if (dmi_first_match(kblr_dmi_table)) + clk_freq = 24000000; + else + clk_freq = 19200000; + + ret = snd_soc_dai_set_sysclk(codec_dai, RT298_SCLK_S_PLL, clk_freq, SND_SOC_CLOCK_IN); if (ret < 0) dev_err(rtd->dev, "Set codec sysclk failed: %d\n", ret); @@ -139,7 +156,10 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->platforms = platform; dl->num_platforms = 1; dl->id = 0; - dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; + if (dmi_first_match(kblr_dmi_table)) + dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; + else + dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; dl->init = avs_rt298_codec_init; dl->be_hw_params_fixup = avs_rt298_be_fixup; dl->ops = &avs_rt298_ops; -- 2.35.1

1 0

[PATCH AUTOSEL 6.1 06/85] ASoC: codecs: rt298: Add quirk for KBL-R RVP platform
by Sasha Levin 18 Dec '22

18 Dec '22

From: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> [ Upstream commit 953dbd1cef18ce9ac0d69c1bd735b929fe52a17e ] KBL-R RVP platforms also use combojack, so we need to enable that configuration for them. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Link: https://lore.kernel.org/r/20221010121955.718168-4-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt298.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index a2ce52dafea8..cea26f3a02b6 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1166,6 +1166,13 @@ static const struct dmi_system_id force_combo_jack_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Geminilake") } }, + { + .ident = "Intel Kabylake R RVP", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform") + } + }, { } }; -- 2.35.1

1 0

No front panel profile on Xonar D1
by GitHub issues - opened 18 Dec '22

18 Dec '22

alsa-project/alsa-ucm-conf issue #252 was opened from realnc: There is no way to switch to front panel headphone output through pipewire. I have to open a terminal, run `alsamixer` and unmute the "Front Panel" element every time I want to switch to/from front panel input and output: ![image](https://user-images.githubusercontent.com/1665903/208296363-67272f79-b3b9-4783-9f75-8527f0db8457.png) I've been told by a pipewire dev that alsa-ucm-conf must provide a profile, otherwise it can't work. My sound card is an Asus Xonar D1. `alsa-info.sh`: http://alsa-project.org/db/?f=beaa1236f0889f1f0ad8474c4c1825fb9488af1f Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/252 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Dell XPS 9320: Mic-Mute LED not working
by GitHub issues - edited 18 Dec '22

18 Dec '22

alsa-project/alsa-ucm-conf issue #251 was edited from heftig: The mic-mute LED on my XPS 9320 does not work. Reading `/sys/class/sound/ctl-led/mic/card0/list` outputs `52 18`. Control 18 is the expected `rt714 FU02 Capture Switch` set in `ucm2/codecs/rt715-sdca/init.conf`. Control 52 is: ``` numid=52,iface=MIXER,name='PGA5.0 5 Master Capture Switch' ; type=BOOLEAN,access=rw------,values=2 : values=on,on ``` In this state, the LED does turn on when both switches are off, but muting via PipeWire only toggles control 18. Detaching the LED from `52` (so that only `18` remains) makes it work properly. I've tried finding out how 52 gets attached, but couldn't find anything. Is this done in-kernel? Linux 6.1 ALSA 1.2.8 Arch Linux Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/251 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Dell XPS 9320: Mic-Mute LED not working
by GitHub issues - opened 18 Dec '22

18 Dec '22

alsa-project/alsa-ucm-conf issue #251 was opened from heftig: The mic-mute LED on my XPS 9320 does not work. Reading `/sys/class/sound/ctl-led/mic/card0/list` outputs `52 18`. Control `18` is the expected `rt714 FU02 Capture Switch` set in `ucm2/codecs/rt715-sdca/init.conf`. Control `52` is: ``` numid=52,iface=MIXER,name='PGA5.0 5 Master Capture Switch' ; type=BOOLEAN,access=rw------,values=2 : values=on,on ``` In this state, the LED does turn on when both switches are off, but muting via PipeWire only toggles control 18. Detaching the LED from `52` (so that only `18` remains) makes it work properly. I've tried finding out how `52` gets attached, but couldn't find anything. Is this done in-kernel? Linux 6.1 ALSA 1.2.8 Arch Linux Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/251 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

RE: [PATCH] ASoC: amd: yc: Add Razer Blade 14 2022 into DMI table
by Limonciello, Mario 16 Dec '22

16 Dec '22

[Public] > -----Original Message----- > From: Wim Van Boven <wimvanboven(a)gmail.com> > Sent: Friday, December 16, 2022 02:18 > Cc: wimvanboven(a)gmail.com; Liam Girdwood <lgirdwood(a)gmail.com>; > Mark Brown <broonie(a)kernel.org>; Jaroslav Kysela <perex(a)perex.cz>; > Takashi Iwai <tiwai(a)suse.com>; Limonciello, Mario > <Mario.Limonciello(a)amd.com>; Saba Kareem, Syed > <Syed.SabaKareem(a)amd.com>; Leohearts <leohearts(a)leohearts.com>; > Brent Mendelsohn <mendiebm(a)gmail.com>; Xiaoyan Li > <lxy.lixiaoyan(a)gmail.com>; linkt <xazrael(a)hotmail.com>; alsa-devel@alsa- > project.org; linux-kernel(a)vger.kernel.org > Subject: [PATCH] ASoC: amd: yc: Add Razer Blade 14 2022 into DMI table > > Razer Blade 14 (2022) - RZ09-0427 needs the quirk to enable the built in > microphone > > Signed-off-by: Wim Van Boven <wimvanboven(a)gmail.com> Thanks! Link: https://bugzilla.kernel.org/show_bug.cgi?id=216801 Reviewed-by: Mario Limonciello <mario.limonciello(a)amd.com> > --- > sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x- > mach.c > index 1f0b5527c594..469c5e79e0ea 100644 > --- a/sound/soc/amd/yc/acp6x-mach.c > +++ b/sound/soc/amd/yc/acp6x-mach.c > @@ -220,6 +220,13 @@ static const struct dmi_system_id > yc_acp_quirk_table[] = { > DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book > Pro 14 2022"), > } > }, > + { > + .driver_data = &acp6x_card, > + .matches = { > + DMI_MATCH(DMI_BOARD_VENDOR, "Razer"), > + DMI_MATCH(DMI_PRODUCT_NAME, "Blade 14 > (2022) - RZ09-0427"), > + } > + }, > {} > }; > > -- > 2.38.1

1 0

aplay,axfer: Replace off64_t with off_t
by GitHub pull_request - opened 16 Dec '22

16 Dec '22

alsa-project/alsa-utils pull request #183 was opened from kraj: Also replace lseek64 with lseek. _FILE_OFFSET_BITS=64 is passed to needed platforms since configure uses AC_SYS_LARGEFILE macro. Therefore off_t is already 64-bit and lseek is same as lseek64. Additionally this fixes buils with latest musl where these lfs64 functions are moved out from _GNU_SOURCE and under _LARGEFILE64_SOURCE macro alone. This makes the builds fail on 32-bit platforms even though default off_t on musl is 64-bit always. Signed-off-by: Khem Raj <raj.khem(a)gmail.com> Request URL : https://github.com/alsa-project/alsa-utils/pull/183 Patch URL : https://github.com/alsa-project/alsa-utils/pull/183.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH] ASoC: lochnagar: Fix unused lochnagar_of_match warning
by Krzysztof Kozlowski 15 Dec '22

15 Dec '22

lochnagar_of_match is used unconditionally, so COMPILE_TEST builds without OF warn: sound/soc/codecs/lochnagar-sc.c:247:34: error: ‘lochnagar_of_match’ defined but not used [-Werror=unused-const-variable=] Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- sound/soc/codecs/lochnagar-sc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/lochnagar-sc.c b/sound/soc/codecs/lochnagar-sc.c index 13fbd8830b09..5e0bd0d24ed3 100644 --- a/sound/soc/codecs/lochnagar-sc.c +++ b/sound/soc/codecs/lochnagar-sc.c @@ -253,7 +253,7 @@ MODULE_DEVICE_TABLE(of, lochnagar_of_match); static struct platform_driver lochnagar_sc_codec_driver = { .driver = { .name = "lochnagar-soundcard", - .of_match_table = of_match_ptr(lochnagar_of_match), + .of_match_table = lochnagar_of_match, }, .probe = lochnagar_sc_probe, -- 2.34.1

2 1

[PATCH 1/2] ASoC: max98088: fix dai1/2_hw_params access
by Rouven Czerwinski 15 Dec '22

15 Dec '22

From: Marco Felsch <m.felsch(a)pengutronix.de> According the reference manuals [1], [2] updating register 0x14/1c should only be done after #shdn bit is set to 0. [1] https://datasheets.maximintegrated.com/en/ds/MAX98089.pdf [2] https://datasheets.maximintegrated.com/en/ds/MAX98088.pdf Signed-off-by: Marco Felsch <m.felsch(a)pengutronix.de> --- sound/soc/codecs/max98088.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 405ec16be2b6..7f108e147355 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -977,6 +977,8 @@ static int max98088_dai1_hw_params(struct snd_pcm_substream *substream, rate = params_rate(params); + snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, 0); + switch (params_width(params)) { case 16: snd_soc_component_update_bits(component, M98088_REG_14_DAI1_FORMAT, @@ -990,8 +992,6 @@ static int max98088_dai1_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, 0); - if (rate_value(rate, &regval)) return -EINVAL; @@ -1047,6 +1047,8 @@ static int max98088_dai2_hw_params(struct snd_pcm_substream *substream, rate = params_rate(params); + snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, 0); + switch (params_width(params)) { case 16: snd_soc_component_update_bits(component, M98088_REG_1C_DAI2_FORMAT, @@ -1060,8 +1062,6 @@ static int max98088_dai2_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, 0); - if (rate_value(rate, &regval)) return -EINVAL; -- 2.38.1

3 5

Re: [PATCH] Add HP Stream 8 to bytcr_rt5640.c
by Mark Brown 14 Dec '22

14 Dec '22

On Wed, 14 Dec 2022 07:08:30 -0500, Moises Cardona wrote: > The bytcr_rt5640.c file already supports the HP Stream 7. > > The HP Stream 8 is almost identical in terms of the hardware > with the exception of it having stereo speakers, a SIM > card slot and the obvious size difference. > > Signed-off-by Moises Cardona <moisesmcardona(a)gmail.com> > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] Add HP Stream 8 to bytcr_rt5640.c commit: ff5870a76c2abda389650d3711cdddc031d12665 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [PATCH] Add HP Stream 8 to bytcr_rt5640.c
by Pierre-Louis Bossart 14 Dec '22

14 Dec '22

On 12/13/22 11:35, Moises Cardona wrote: > The HP Stream 8 tablet is identical to the HP Stream 7 in terms of the PCB, > with the exception of the added SIM Card Slot. > Therefore, I'm submitting this patch which properly initializes the audio > and enables the headphone jack to work, just like it does in the > HP Stream 7. > > Signed-off-by: Moises Cardona <moisesmcardona(a)gmail.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> > --- > sound/soc/intel/boards/bytcr_rt5640.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c > index fb9d9e271845..1d964b1ceff4 100644 > --- a/sound/soc/intel/boards/bytcr_rt5640.c > +++ b/sound/soc/intel/boards/bytcr_rt5640.c > @@ -796,6 +796,17 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { > BYT_RT5640_SSP0_AIF1 | > BYT_RT5640_MCLK_EN), > }, > + { /* HP Stream 8 */ > + .matches = { > + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), > + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HP Stream 8 Tablet"), > + }, > + .driver_data = (void *)(BYTCR_INPUT_DEFAULTS | > + BYT_RT5640_MONO_SPEAKER | > + BYT_RT5640_JD_NOT_INV | > + BYT_RT5640_SSP0_AIF1 | > + BYT_RT5640_MCLK_EN), > + }, > { /* I.T.Works TW891 */ > .matches = { > DMI_EXACT_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),

3 2

Re: [PATCH] Add HP Stream 8 to bytcr_rt5640.c
by Hans de Goede 14 Dec '22

14 Dec '22

Hi, On 12/14/22 13:08, Moises Cardona wrote: > The bytcr_rt5640.c file already supports the HP Stream 7. > > The HP Stream 8 is almost identical in terms of the hardware > with the exception of it having stereo speakers, a SIM > card slot and the obvious size difference. > > > Signed-off-by Moises Cardona <moisesmcardona(a)gmail.com> Thanks, this new version (which should have been marked as v2) looks good to me: Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> Regards, Hans > > --- > sound/soc/intel/boards/bytcr_rt5640.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c > index fb9d9e271845..569d039d680b 100644 > --- a/sound/soc/intel/boards/bytcr_rt5640.c > +++ b/sound/soc/intel/boards/bytcr_rt5640.c > @@ -796,6 +796,16 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { > BYT_RT5640_SSP0_AIF1 | > BYT_RT5640_MCLK_EN), > }, > + { /* HP Stream 8 */ > + .matches = { > + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), > + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HP Stream 8 Tablet"), > + }, > + .driver_data = (void *)(BYTCR_INPUT_DEFAULTS | > + BYT_RT5640_JD_NOT_INV | > + BYT_RT5640_SSP0_AIF1 | > + BYT_RT5640_MCLK_EN), > + }, > { /* I.T.Works TW891 */ > .matches = { > DMI_EXACT_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),

1 0

Re: [PATCH 2/2] ASoC: da7213: Add support for mono, set frame width to 32 when possible
by Mark Brown 14 Dec '22

14 Dec '22

On Wed, Dec 14, 2022 at 03:31:26PM +0100, Piotr Wojtaszczyk wrote: > It was a single patch, with no deps. > It's flagged as patch 2/2? > On Wed, Dec 14, 2022 at 3:21 PM Mark Brown <broonie(a)kernel.org> wrote: Please don't top post, reply in line with needed context. This allows readers to readily follow the flow of conversation and understand what you are talking about and also helps ensure that everything in the discussion is being addressed.

1 0

[PATCH] ASoC: SOF: mediatek: initialize panic_info to zero
by YC Hung 14 Dec '22

14 Dec '22

Coverity spotted that panic_info is not initialized to zero in mtk_adsp_dump. Using uninitialized value panic_info.linenum when calling snd_sof_get_status. Fix this coverity by initializing panic_info struct as zero. Signed-off-by: YC Hung <yc.hung(a)mediatek.com> --- sound/soc/sof/mediatek/mtk-adsp-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/mediatek/mtk-adsp-common.c b/sound/soc/sof/mediatek/mtk-adsp-common.c index 1e0769c668a7..de8dbe27cd0d 100644 --- a/sound/soc/sof/mediatek/mtk-adsp-common.c +++ b/sound/soc/sof/mediatek/mtk-adsp-common.c @@ -60,7 +60,7 @@ void mtk_adsp_dump(struct snd_sof_dev *sdev, u32 flags) { char *level = (flags & SOF_DBG_DUMP_OPTIONAL) ? KERN_DEBUG : KERN_ERR; struct sof_ipc_dsp_oops_xtensa xoops; - struct sof_ipc_panic_info panic_info; + struct sof_ipc_panic_info panic_info = {}; u32 stack[MTK_ADSP_STACK_DUMP_SIZE]; u32 status; -- 2.18.0

3 2

[PATCH] ASoC: rt5670: Remove unbalanced pm_runtime_put()
by Hans de Goede 14 Dec '22

14 Dec '22

For some reason rt5670_i2c_probe() does a pm_runtime_put() at the end of a successful probe. But it has never done a pm_runtime_get() leading to the following error being logged into dmesg: rt5670 i2c-10EC5640:00: Runtime PM usage count underflow! Fix this by removing the unnecessary pm_runtime_put(). Fixes: 64e89e5f5548 ("ASoC: rt5670: Add runtime PM support") Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/codecs/rt5670.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c index ebac6caeb40a..a230f441559a 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c @@ -3311,8 +3311,6 @@ static int rt5670_i2c_probe(struct i2c_client *i2c) if (ret < 0) goto err; - pm_runtime_put(&i2c->dev); - return 0; err: pm_runtime_disable(&i2c->dev); -- 2.38.1

3 5

[PATCH] ASoC: Intel: bytcr_rt5640: Add quirk for the Advantech MICA-071 tablet
by Hans de Goede 14 Dec '22

14 Dec '22

The Advantech MICA-071 tablet deviates from the defaults for a non CR Bay Trail based tablet in several ways: 1. It uses an analog MIC on IN3 rather then using DMIC1 2. It only has 1 speaker 3. It needs the OVCD current threshold to be set to 1500uA instead of the default 2000uA to reliable differentiate between headphones vs headsets Add a quirk with these settings for this tablet. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/intel/boards/bytcr_rt5640.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index fb9d9e271845..ddd2625bed90 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -570,6 +570,21 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { BYT_RT5640_SSP0_AIF1 | BYT_RT5640_MCLK_EN), }, + { + /* Advantech MICA-071 */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Advantech"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "MICA-071"), + }, + /* OVCD Th = 1500uA to reliable detect head-phones vs -set */ + .driver_data = (void *)(BYT_RT5640_IN3_MAP | + BYT_RT5640_JD_SRC_JD2_IN4N | + BYT_RT5640_OVCD_TH_1500UA | + BYT_RT5640_OVCD_SF_0P75 | + BYT_RT5640_MONO_SPEAKER | + BYT_RT5640_DIFF_MIC | + BYT_RT5640_MCLK_EN), + }, { .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ARCHOS"), -- 2.38.1

3 2

Re: [PATCH 2/2] ASoC: da7213: Add support for mono, set frame width to 32 when possible
by Mark Brown 14 Dec '22

14 Dec '22

On Wed, Dec 14, 2022 at 04:40:58AM +0000, David Rau wrote: > This adds the DAI mono mode support and set the frame width to 32 > > Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk(a)timesys.com> > Tested-by: David Rau <David.Rau.opensource(a)dm.renesas.com> > Signed-off-by: David Rau <David.Rau.opensource(a)dm.renesas.com> I only have patch 2 here, what's the story with dependencies?

1 0

[PATCH] ASoC: Intel: soc-acpi: update codec addr on 0C11/0C4F product
by Bard Liao 14 Dec '22

14 Dec '22

From: Gongjun Song <gongjun.song(a)intel.com> The unique ID is determined by the ADR pin level of rt1318. ODM changed design, update codec addr to match new design. Fixes: 0050e3d3d43d ("ASoC: Intel: soc-acpi: add SKU 0C11 SoundWire configuration") Signed-off-by: Gongjun Song <gongjun.song(a)intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c index 3c5229f41bb0..31b43116e3d8 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -112,7 +112,7 @@ static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = { static const struct snd_soc_acpi_adr_device rt1318_1_group1_adr[] = { { - .adr = 0x000131025D131801ull, + .adr = 0x000132025D131801ull, .num_endpoints = 1, .endpoints = &spk_l_endpoint, .name_prefix = "rt1318-1" -- 2.25.1

2 1

[PATCH] ASoC: mediatek: mt8195: add sof be ops to check audio active
by YC Hung 14 Dec '22

14 Dec '22

In MT8195 SOF design, both DSP and audio driver would access audio registers. Before DSP accesses audio registers, audio power and clock should be enabled. DSP will hang up if DSP access audio register but audio power and clock are disabled. Therefore, we add audio pm runtime active checking before accessing audio registers in SOF BE's callback hw_params function to avoid this situation. Signed-off-by: YC Hung <yc.hung(a)mediatek.com> --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index 61be66f47723..4682748d82be 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -633,6 +633,32 @@ static const struct snd_soc_ops mt8195_rt1011_etdm_ops = { .hw_params = mt8195_rt1011_etdm_hw_params, }; +static int mt8195_sof_be_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_component *cmpnt_afe = NULL; + struct snd_soc_pcm_runtime *runtime; + + /* find afe component */ + for_each_card_rtds(rtd->card, runtime) { + cmpnt_afe = snd_soc_rtdcom_lookup(runtime, AFE_PCM_NAME); + if (cmpnt_afe) + break; + } + + if (cmpnt_afe && !pm_runtime_active(cmpnt_afe->dev)) { + dev_err(rtd->dev, "afe pm runtime is not active!!\n"); + return -EINVAL; + } + + return 0; +} + +static const struct snd_soc_ops mt8195_sof_be_ops = { + .hw_params = mt8195_sof_be_hw_params, +}; + static int mt8195_rt1011_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; @@ -1272,24 +1298,28 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .name = "AFE_SOF_DL2", .no_pcm = 1, .dpcm_playback = 1, + .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, [DAI_LINK_SOF_DL3_BE] = { .name = "AFE_SOF_DL3", .no_pcm = 1, .dpcm_playback = 1, + .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL3), }, [DAI_LINK_SOF_UL4_BE] = { .name = "AFE_SOF_UL4", .no_pcm = 1, .dpcm_capture = 1, + .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL4), }, [DAI_LINK_SOF_UL5_BE] = { .name = "AFE_SOF_UL5", .no_pcm = 1, .dpcm_capture = 1, + .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL5), }, }; -- 2.18.0

4 3

[PATCH] ASoC: wm8994: Fix potential deadlock
by Marek Szyprowski 14 Dec '22

14 Dec '22

Commit c0feea594e05 ("workqueue: don't skip lockdep work dependency in cancel_work_sync()") revealed the following locking issue in the wm8994 codec: ====================================================== WARNING: possible circular locking dependency detected 6.0.0-rc1-00001-gc0feea594e05-dirty #13097 Not tainted ------------------------------------------------------ kworker/1:1/32 is trying to acquire lock: c2bd4300 (&wm8994->accdet_lock){+.+.}-{3:3}, at: wm1811_mic_work+0x38/0xdc but task is already holding lock: f08f5f28 ((work_completion)(&(&wm8994->mic_work)->work)){+.+.}-{0:0}, at: process_one_work+0x1e4/0x778 which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 ((work_completion)(&(&wm8994->mic_work)->work)){+.+.}-{0:0}: __cancel_work_timer+0x198/0x22c wm1811_jackdet_irq+0x124/0x238 process_one_work+0x288/0x778 worker_thread+0x44/0x504 kthread+0xf0/0x124 ret_from_fork+0x14/0x2c 0x0 -> #0 (&wm8994->accdet_lock){+.+.}-{3:3}: lock_acquire+0x124/0x3e4 __mutex_lock+0x90/0x948 mutex_lock_nested+0x1c/0x24 wm1811_mic_work+0x38/0xdc process_one_work+0x288/0x778 worker_thread+0x44/0x504 kthread+0xf0/0x124 ret_from_fork+0x14/0x2c 0x0 other info that might help us debug this: Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock((work_completion)(&(&wm8994->mic_work)->work)); lock(&wm8994->accdet_lock); lock((work_completion)(&(&wm8994->mic_work)->work)); lock(&wm8994->accdet_lock); *** DEADLOCK *** 2 locks held by kworker/1:1/32: #0: c1c072a8 ((wq_completion)events_power_efficient){+.+.}-{0:0}, at: process_one_work+0x1e4/0x778 #1: f08f5f28 ((work_completion)(&(&wm8994->mic_work)->work)){+.+.}-{0:0}, at: process_one_work+0x1e4/0x778 stack backtrace: CPU: 1 PID: 32 Comm: kworker/1:1 Not tainted 6.0.0-rc1-00001-gc0feea594e05-dirty #13097 Hardware name: Samsung Exynos (Flattened Device Tree) Workqueue: events_power_efficient wm1811_mic_work unwind_backtrace from show_stack+0x10/0x14 show_stack from dump_stack_lvl+0x58/0x70 dump_stack_lvl from check_noncircular+0xf0/0x158 check_noncircular from __lock_acquire+0x15e8/0x2a7c __lock_acquire from lock_acquire+0x124/0x3e4 lock_acquire from __mutex_lock+0x90/0x948 __mutex_lock from mutex_lock_nested+0x1c/0x24 mutex_lock_nested from wm1811_mic_work+0x38/0xdc wm1811_mic_work from process_one_work+0x288/0x778 process_one_work from worker_thread+0x44/0x504 worker_thread from kthread+0xf0/0x124 kthread from ret_from_fork+0x14/0x2c Exception stack(0xf08f5fb0 to 0xf08f5ff8) ... --->8--- Fix this by dropping wm8994->accdet_lock while calling cancel_delayed_work_sync(&wm8994->mic_work) in wm1811_jackdet_irq(). Fixes: c0cc3f166525 ("ASoC: wm8994: Allow a delay between jack insertion and microphone detect") Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- sound/soc/codecs/wm8994.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index d3cfd3788f2a..f810135e28d0 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3853,7 +3853,12 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) } else { dev_dbg(component->dev, "Jack not detected\n"); + /* Release wm8994->accdet_lock to avoid deadlock: + * cancel_delayed_work_sync() takes wm8994->mic_work internal + * lock and wm1811_mic_work takes wm8994->accdet_lock */ + mutex_unlock(&wm8994->accdet_lock); cancel_delayed_work_sync(&wm8994->mic_work); + mutex_lock(&wm8994->accdet_lock); snd_soc_component_update_bits(component, WM8958_MICBIAS2, WM8958_MICB2_DISCH, WM8958_MICB2_DISCH); -- 2.38.1

3 2

[PATCH v2] ASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rk_spdif_runtime_resume()
by Wang Jingjin 14 Dec '22

14 Dec '22

rk_spdif_runtime_resume() may have called clk_prepare_enable() before return from failed branches, add missing clk_disable_unprepare() in this case. Fixes: f874b80e1571 ("ASoC: rockchip: Add rockchip SPDIF transceiver driver") Signed-off-by: Wang Jingjin <wangjingjin1(a)huawei.com> --- changes in v2: - Match the subject to the content --- sound/soc/rockchip/rockchip_spdif.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index 8bef572d3cbc..5b4f00457587 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -88,6 +88,7 @@ static int __maybe_unused rk_spdif_runtime_resume(struct device *dev) ret = clk_prepare_enable(spdif->hclk); if (ret) { + clk_disable_unprepare(spdif->mclk); dev_err(spdif->dev, "hclk clock enable failed %d\n", ret); return ret; } -- 2.25.1

2 1

ucm2: add profile for the Samsung Galaxy Note II (Midas)
by GitHub pull_request - opened 14 Dec '22

14 Dec '22

alsa-project/alsa-ucm-conf pull request #250 was opened from FrostI7Alex: Might need few changes in the future, but for now - it works. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/250 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/250.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Re: [PATCH] Add HP Stream 8 to bytcr_rt5640.c
by Hans de Goede 14 Dec '22

14 Dec '22

Hello Moises, On 12/13/22 18:35, Moises Cardona wrote: > The HP Stream 8 tablet is identical to the HP Stream 7 in terms of the PCB, > with the exception of the added SIM Card Slot. > Therefore, I'm submitting this patch which properly initializes the audio > and enables the headphone jack to work, just like it does in the > HP Stream 7. > > Signed-off-by: Moises Cardona <moisesmcardona(a)gmail.com> Thank you for your patch. According to this review: http://techlife101.com/hp-stream-8-review/ The Stream 8 has 2 speakers, so you should drop the BYT_RT5640_MONO_SPEAKER part so that both speakers will be used. Regards, Hans > --- > sound/soc/intel/boards/bytcr_rt5640.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c > index fb9d9e271845..1d964b1ceff4 100644 > --- a/sound/soc/intel/boards/bytcr_rt5640.c > +++ b/sound/soc/intel/boards/bytcr_rt5640.c > @@ -796,6 +796,17 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { > BYT_RT5640_SSP0_AIF1 | > BYT_RT5640_MCLK_EN), > }, > + { /* HP Stream 8 */ > + .matches = { > + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), > + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HP Stream 8 Tablet"), > + }, > + .driver_data = (void *)(BYTCR_INPUT_DEFAULTS | > + BYT_RT5640_MONO_SPEAKER | > + BYT_RT5640_JD_NOT_INV | > + BYT_RT5640_SSP0_AIF1 | > + BYT_RT5640_MCLK_EN), > + }, > { /* I.T.Works TW891 */ > .matches = { > DMI_EXACT_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),

1 0

[PATCH 0/2] dt-bindings: sound: ti, pcm3168a: json-schema conversion and fixes
by Geert Uytterhoeven 14 Dec '22

14 Dec '22

Hi all, This patch series is an attempt to convert the existing DT binding documentation for the Texas Instruments PCM3168A Audio Codec to json-schema ("another one bites the dust" ;-). It consists of two parts: 1. The actual DT binding conversion, 2. An RFC patch to fix the impedance mismatch between the bindings and the description in the Shimafuji Kingfisher board DTS. I'm not super-familiar with the audio details, so I would be very grateful to receive your comments. Thanks! Geert Uytterhoeven (2): dt-bindings: sound: ti,pcm3168a: Convert to json-schema [RFC] arm64: dts: renesas: ulcb-kf: Fix pcm3168a audio codec node .../devicetree/bindings/sound/ti,pcm3168a.txt | 56 ---------- .../bindings/sound/ti,pcm3168a.yaml | 105 ++++++++++++++++++ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 5 +- 3 files changed, 107 insertions(+), 59 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/ti,pcm3168a.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml -- 2.25.1 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org 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

4 9

Re: ASoC: soc-pcm: Don't zero TDM masks in __soc_pcm_open() breaks SOF Audio in Lenovo laptops
by Richard Fitzgerald 13 Dec '22

13 Dec '22

On 9/12/22 16:18, Mark Brown wrote: > On Fri, Dec 09, 2022 at 05:38:54PM +0200, Péter Ujfalusi wrote: >> On 09/12/2022 16:42, Pierre-Louis Bossart wrote: > >>> Agree with the analysis, so what would be the least bad recommendation? >>> a) revert the "don't zero TDM masks" patch >>> b) backport the change to use set_stream()? > >> I would vote for b) unless other platforms report regressions. > > I don't really care either way given the backport policy. Neither do I. If you want to minimize risk, revert the patch in older backports. Lessons learned: Don't hijack a data member to pass something different from what it is intended to hold. Don't depend on a bug. Don't assume all code is using a data member for what is supposed to be in that member.

3 2

Re: [PATCH] Add HP Stream 8 to bytcr_rt5640.c
by Pierre-Louis Bossart 13 Dec '22

13 Dec '22

You need to resubmit and CC Mark Brown, Takashi Iwai, the alsa-mailing list and Hans de Goede On 12/13/22 05:59, Moises Cardona wrote: > The HP Stream 8 tablet is identical to the HP Stream 7 in terms of the PCB, > with the exception of the added SIM Card Slot. > Therefore, I'm submitting this patch which properly initializes the audio > and enables the headphone jack to work, just like it does in the > HP Stream 7. > > Signed-off-by: Moises Cardona <moisesmcardona(a)gmail.com> > --- > sound/soc/intel/boards/bytcr_rt5640.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c > index fb9d9e271845..1d964b1ceff4 100644 > --- a/sound/soc/intel/boards/bytcr_rt5640.c > +++ b/sound/soc/intel/boards/bytcr_rt5640.c > @@ -796,6 +796,17 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { > BYT_RT5640_SSP0_AIF1 | > BYT_RT5640_MCLK_EN), > }, > + { /* HP Stream 8 */ > + .matches = { > + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), > + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HP Stream 8 Tablet"), > + }, > + .driver_data = (void *)(BYTCR_INPUT_DEFAULTS | > + BYT_RT5640_MONO_SPEAKER | > + BYT_RT5640_JD_NOT_INV | > + BYT_RT5640_SSP0_AIF1 | > + BYT_RT5640_MCLK_EN), > + }, > { /* I.T.Works TW891 */ > .matches = { > DMI_EXACT_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),

1 0

[PATCH] ALSA: conf: Save SND_CONFIG_TYPE_REAL with at least one decimal
by Simon Svanbom 13 Dec '22

13 Dec '22

Hi, patch for saving SND_CONFIG_TYPE_REAL with at least one decimal as to not misinterpret the value as an integer in snd_config_get_real. Example would be the sofvol configuration property min_dB and max_dB, that are required to have at least one decimal. All the best // Simon

2 1

[PATCH v2 0/4] ASoC: microchip: power saving features and cleanups
by Claudiu Beznea 13 Dec '22

13 Dec '22

Hi, The following series adds runtime PM and suspend to RAM features for mchp-pdmc driver. Along with it 2 cleanup patches were added: - patch 1/4: use vendor,device.yaml file format for Microchip AT91 ASoC bindings - patch 4/4: use FIELD_PREP() in mchp-spdiftx.c Thank you, Claudiu Beznea Changes in v2: - s/microchip,sama7g5-i2s-mcc/microchip,sama7g5-i2smcc as this is the 1st available compatible Claudiu Beznea (4): ASoC: dt-bindings: microchip: use proper naming syntax ASoC: mchp-pdmc: use runtime pm for clock power saving ASoC: mchp-pdmc: add support for suspend to RAM ASoC: mchp-spdiftx: use FIELD_PREP() where possible .../bindings/sound/mchp,i2s-mcc.yaml | 108 ------------- ...,pdmc.yaml => microchip,sama7g5-pdmc.yaml} | 0 ...rx.yaml => microchip,sama7g5-spdifrx.yaml} | 0 ...tx.yaml => microchip,sama7g5-spdiftx.yaml} | 0 sound/soc/atmel/mchp-pdmc.c | 145 ++++++++++++------ sound/soc/atmel/mchp-spdiftx.c | 8 +- 6 files changed, 101 insertions(+), 160 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/mchp,i2s-mcc.yaml rename Documentation/devicetree/bindings/sound/{microchip,pdmc.yaml => microchip,sama7g5-pdmc.yaml} (100%) rename Documentation/devicetree/bindings/sound/{mchp,spdifrx.yaml => microchip,sama7g5-spdifrx.yaml} (100%) rename Documentation/devicetree/bindings/sound/{mchp,spdiftx.yaml => microchip,sama7g5-spdiftx.yaml} (100%) -- 2.34.1

3 6

[PATCH 4.9 04/31] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Greg Kroah-Hartman 12 Dec '22

12 Dec '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index 4c8cbcd89887..42f4aa841051 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -126,15 +126,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -163,8 +167,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH 4.14 06/38] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Greg Kroah-Hartman 12 Dec '22

12 Dec '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index ab1112e90f88..6f413c711535 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -126,15 +126,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -163,8 +167,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH 4.19 07/49] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Greg Kroah-Hartman 12 Dec '22

12 Dec '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index 5b0388202bac..ac854beb8347 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -126,15 +126,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -163,8 +167,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH 5.4 10/67] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Greg Kroah-Hartman 12 Dec '22

12 Dec '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index 65db1a7c77b7..bb76a2dd0a2f 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -112,15 +112,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -149,8 +153,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH 5.15 019/123] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Greg Kroah-Hartman 12 Dec '22

12 Dec '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index b7aee23fc387..47ef6bc30c0e 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -113,15 +113,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -151,8 +155,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH 6.0 024/157] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Greg Kroah-Hartman 12 Dec '22

12 Dec '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index b7aee23fc387..47ef6bc30c0e 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -113,15 +113,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -151,8 +155,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH 0/4] ASoC: microchip: power saving features and cleanups
by Claudiu Beznea 12 Dec '22

12 Dec '22

Hi, The following series adds runtime PM and suspend to RAM features for mchp-pdmc driver. Along with it 2 cleanup patches were added: - patch 1/4: use vendor,device.yaml file format for Microchip AT91 ASoC bindings - patch 4/4: use FIELD_PREP() in mchp-spdiftx.c Thank you, Claudiu Beznea Claudiu Beznea (4): ASoC: dt-bindings: microchip: use proper naming syntax ASoC: mchp-pdmc: use runtime pm for clock power saving ASoC: mchp-pdmc: add support for suspend to RAM ASoC: mchp-spdiftx: use FIELD_PREP() where possible ...cc.yaml => microchip,sama7g5-i2s-mcc.yaml} | 0 ...,pdmc.yaml => microchip,sama7g5-pdmc.yaml} | 0 ...rx.yaml => microchip,sama7g5-spdifrx.yaml} | 0 ...tx.yaml => microchip,sama7g5-spdiftx.yaml} | 0 sound/soc/atmel/mchp-pdmc.c | 145 ++++++++++++------ sound/soc/atmel/mchp-spdiftx.c | 8 +- 6 files changed, 101 insertions(+), 52 deletions(-) rename Documentation/devicetree/bindings/sound/{mchp,i2s-mcc.yaml => microchip,sama7g5-i2s-mcc.yaml} (100%) rename Documentation/devicetree/bindings/sound/{microchip,pdmc.yaml => microchip,sama7g5-pdmc.yaml} (100%) rename Documentation/devicetree/bindings/sound/{mchp,spdifrx.yaml => microchip,sama7g5-spdifrx.yaml} (100%) rename Documentation/devicetree/bindings/sound/{mchp,spdiftx.yaml => microchip,sama7g5-spdiftx.yaml} (100%) -- 2.34.1

1 4

[PATCH 5.10 019/106] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Greg Kroah-Hartman 12 Dec '22

12 Dec '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index 65db1a7c77b7..bb76a2dd0a2f 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -112,15 +112,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -149,8 +153,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH] slimbus: qcom-ngd: Add check for platform_driver_register
by Jiasheng Jiang 12 Dec '22

12 Dec '22

Add the check for the return value of platform_driver_register in order to catch the exception. Fixes: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- drivers/slimbus/qcom-ngd-ctrl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 76c5e446d243..c16fc9e6d1c6 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1590,7 +1590,10 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) goto err_pdr_lookup; } - platform_driver_register(&qcom_slim_ngd_driver); + ret = platform_driver_register(&qcom_slim_ngd_driver); + if (ret < 0) + goto err_pdr_lookup; + return of_qcom_slim_ngd_register(dev, ctrl); err_pdr_alloc: -- 2.25.1

2 1

Add support for ASUS ROG Crosshair X670 Extreme
by GitHub pull_request - opened 11 Dec '22

11 Dec '22

alsa-project/alsa-ucm-conf pull request #249 was opened from ioquatix: - Confirmed working. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/249 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/249.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Sound is pitched and slowed down when going through the sound card of a mixer controller
by GitHub issues - opened 10 Dec '22

10 Dec '22

alsa-project/alsa-firmware issue #7 was opened from mYnDstrEAm: First of all I'm not sure if that's a bug in ALSA and if so if this is the right repo to file it. When I connect my mixer to my Debian11/KDE machine the sound is slowed and pitched down. Sometimes it takes days or weeks until this effect occurs, most of the time everything works well and I don't know what causes this to occur. **See https://unix.stackexchange.com/questions/572895/linux-sound-is-pitched-and-… (and comments below)** `aplay -l` says the driver is module-alsa-card.c. The track is still pitched down when played with `aplay`. I'm not sure if the sound really is slowed down or if it was changed in a slightly different way in the past (had this bug for years now), but right now when I use my mixer rather than internal audio, the sound is lower in pitch. Let me know if there's something I could check like something in some logs. Issue URL : https://github.com/alsa-project/alsa-firmware/issues/7 Repository URL: https://github.com/alsa-project/alsa-firmware

1 0

Simple card and PLL/FLL
by Emanuele Ghidoli 09 Dec '22

09 Dec '22

Hello, I want to understand what is the right way to implement PLL/FLL usage on audio codec when using simple-card. In wm8904 driver I found that FLL is used if set_sysclk is called (that means mclk-fs property is set, otherwise it is not called). In this case the frequency passed to set_sysclk is assumed to be the "desired" frequency, the codec read the currently clkrate coming from "cpu" ("clk_get_rate(priv->mclk)") and use these information to program FLL. In other codec drives I do not find a similar approach. In general codec register the set_pll function but it is never called by simple-card driver. I guess what is the "right/better" implementation? Have we to add the set_pll call in simple-card? Or have we to add it to e.g. fsl_sai driver? Or, in some way, the wm8904 codec driver is approaching in the right way? Is there any documentation that explain all of that (I have already looked at Documentation/sound)? Any driver that is considered well written and complete I should use as a reference? Thanks a lot for your help Best regards, Emanuele

4 4

[PATCH v1] ASoC: Intel: sof_nau8825: add support for nau8825 with amp nau8318
by Ajye Huang 09 Dec '22

09 Dec '22

This patch adds the driver data for two nau8318 speaker amplifiers on SSP1 and nau8825 on SSP0 for ADL platform. And reusing max98360's topology since DAI setting could be leveraged. Signed-off-by: Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> --- sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/sof_nau8825.c | 23 +++++++++++++++++++ .../intel/common/soc-acpi-intel-adl-match.c | 12 ++++++++++ 3 files changed, 36 insertions(+) diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index a472de1909f4..3f68e9edd853 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -554,6 +554,7 @@ config SND_SOC_INTEL_SOF_NAU8825_MACH select SND_SOC_RT1015P select SND_SOC_MAX98373_I2C select SND_SOC_MAX98357A + select SND_SOC_NAU8315 select SND_SOC_DMIC select SND_SOC_HDAC_HDMI select SND_SOC_INTEL_HDA_DSP_COMMON diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 27880224359d..0936450be153 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -48,6 +48,7 @@ #define SOF_MAX98373_SPEAKER_AMP_PRESENT BIT(15) #define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(16) #define SOF_RT1015P_SPEAKER_AMP_PRESENT BIT(17) +#define SOF_NAU8318_SPEAKER_AMP_PRESENT BIT(18) static unsigned long sof_nau8825_quirk = SOF_NAU8825_SSP_CODEC(0); @@ -338,6 +339,13 @@ static struct snd_soc_dai_link_component rt1019p_component[] = { } }; +static struct snd_soc_dai_link_component nau8318_components[] = { + { + .name = "NVTN2012:00", + .dai_name = "nau8315-hifi", + } +}; + static struct snd_soc_dai_link_component dummy_component[] = { { .name = "snd-soc-dummy", @@ -486,6 +494,11 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, max_98360a_dai_link(&links[id]); } else if (sof_nau8825_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT) { sof_rt1015p_dai_link(&links[id]); + } else if (sof_nau8825_quirk & + SOF_NAU8318_SPEAKER_AMP_PRESENT) { + links[id].codecs = nau8318_components; + links[id].num_codecs = ARRAY_SIZE(nau8318_components); + links[id].init = speaker_codec_init; } else { goto devm_err; } @@ -657,6 +670,16 @@ static const struct platform_device_id board_ids[] = { SOF_BT_OFFLOAD_SSP(2) | SOF_SSP_BT_OFFLOAD_PRESENT), }, + { + .name = "adl_nau8318_nau8825", + .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_NAU8318_SPEAKER_AMP_PRESENT | + SOF_NAU8825_SSP_AMP(1) | + SOF_NAU8825_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 60aee56f94bd..282b9c966ce6 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -450,6 +450,11 @@ static const struct snd_soc_acpi_codecs adl_lt6911_hdmi = { .codecs = {"INTC10B0"} }; +static const struct snd_soc_acpi_codecs adl_nau8318_amp = { + .num_codecs = 1, + .codecs = {"NVTN2012"} +}; + struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { { .comp_ids = &adl_rt5682_rt5682s_hp, @@ -507,6 +512,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { .quirk_data = &adl_rt1015p_amp, .sof_tplg_filename = "sof-adl-rt1015-nau8825.tplg", }, + { + .id = "10508825", + .drv_name = "adl_nau8318_nau8825", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &adl_nau8318_amp, + .sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg", + }, { .id = "10508825", .drv_name = "sof_nau8825", -- 2.25.1

2 4

alsa-project.org is down
by GitHub issues - opened 09 Dec '22

09 Dec '22

alsa-project/alsa-lib issue #287 was opened from afq984: ``` curl -i https://alsa-project.org HTTP/2 404 server: nginx/1.14.1 date: Fri, 09 Dec 2022 16:34:22 GMT content-type: text/html; charset=UTF-8 x-powered-by: PHP/7.4.30 No input file specified. ``` Issue URL : https://github.com/alsa-project/alsa-lib/issues/287 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

Re: ASoC: soc-pcm: Don't zero TDM masks in __soc_pcm_open() breaks SOF Audio in Lenovo laptops
by Richard Fitzgerald 09 Dec '22

09 Dec '22

On 9/12/22 14:42, Pierre-Louis Bossart wrote: > > > On 12/9/22 01:37, Péter Ujfalusi wrote: >> >> >> On 08/12/2022 18:37, Pierre-Louis Bossart wrote: >>> >>> >>> On 12/8/22 10:17, Mark Brown wrote: >>>> On Thu, Dec 08, 2022 at 02:02:02PM +0000, Joakim Tjernlund wrote: >>>>> Several of our Lenovo laptops lost PC audio output in Teams in 5.15.81(also in 5.15.82) >>>>> Revering above patch:https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/comm… >>>>> fixes it. >>>>> >>>>> Any idea what the real fix is? >>>> >>>> Adding the Intel people. I've no idea if there's issues with >>>> dependencies, missing quirks for the hardare or anything in that stable >>>> version. >>> >>> Humm, yes in the past we used the TDM masks to convey the 'stream_tag' >>> for HDaudio. >>> >>> I can still see this in v5.15.85 in sound/soc/sof/intel/hda-dai.c >>> >>> /* set the stream tag in the codec dai dma params */ >>> if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) >>> snd_soc_dai_set_tdm_slot(codec_dai, stream_tag, 0, 0, 0); >>> else >>> snd_soc_dai_set_tdm_slot(codec_dai, 0, stream_tag, 0, 0); >>> >>> >>> That was changed in >>> 636110411ca72 ASoC: Intel/SOF: use set_stream() instead of >>> set_tdm_slots() for HDAudio >>> >>> snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), >>> substream->stream); >>> >>> So my guess is that zeroing out TDM masks has a side effect on older >>> stable kernels, and that effect is not seen on newer kernels. >>> >>> I don't really understand what the side effect might be though. >> >> The reason is that on the the tdm mask now became persistent and the HDA >> code relied on the fact that it is volatile, it is reset for each stream >> open. >> The core would do some fixup if the tx/rx_mask is set: >> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/sound… >> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/sound… >> >> This did not happened when the tx/rx_mask was reset at open - and later >> set bny the HDA driver, I guess after these checks, so the fixup did not >> happened, but without resetting them we would use the previously set >> masks to do fixups for the number of channels (!) based on a stream_tag >> value, which has nothing to do with channels. > > Agree with the analysis, so what would be the least bad recommendation? > a) revert the "don't zero TDM masks" patch > b) backport the change to use set_stream()? Adding alsa-devel(a)alsa-project.org and patches(a)opensource.cirrus.com. Please add relevant lists when sending emails so that other people who might need to know, or have an opinion, are aware of the discussion.

1 0

Re: [PATCH 2/2] dt-bindings: sound: rt5640: Allow to describe how LOUT is wired
by Krzysztof Kozlowski 09 Dec '22

09 Dec '22

On 09/12/2022 11:56, Jarrah Gosbell wrote: > From: Ondrej Jirman <megi(a)xff.cz> > > Depending on HW design, som boards may expect mono differential output > on LOUT. Describe a property that enables it. > > Signed-off-by: Ondrej Jirman <megi(a)xff.cz> > Signed-off-by: Jarrah Gosbell <kernel(a)undef.tools> > --- > Documentation/devicetree/bindings/sound/rt5640.txt | 3 +++ > 1 file changed, 3 insertions(+) Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Best regards, Krzysztof

1 0

[PATCH v2 0/3] ALSA: hda/hdmi: i915 keepalive fixes
by Kai Vehmanen 09 Dec '22

09 Dec '22

A series with multiple fixes to i915 keepalive (KAE) functionality. First patch fixes issue that is hit on some A750/770 cards: https://gitlab.freedesktop.org/drm/intel/-/issues/7353 The two other improve behaviour especially with certain USB-C docks. Changes in v2: - check for errors from pin_id_to_pin_index() Kai Vehmanen (3): ALSA: hda/hdmi: fix i915 silent stream programming flow ALSA: hda/hdmi: set default audio parameters for KAE silent-stream ALSA: hda/hdmi: fix stream-id config keep-alive for rt suspend include/sound/hda_codec.h | 1 + sound/pci/hda/hda_codec.c | 3 +- sound/pci/hda/patch_hdmi.c | 119 ++++++++++++++++++++++++++++++++++++- 3 files changed, 119 insertions(+), 4 deletions(-) base-commit: 81a2da5a10a6eaa6ae16108eed4e74651cc296bf -- 2.38.1

2 4

[PATCH] ALSA: hda: Error out if invalid stream is being setup
by Cezary Rojewski 09 Dec '22

09 Dec '22

Scenario when snd_hdac_stream_setup_periods() receives an instance of struct hdac_stream with neither ->substream nor ->cstream initialized is invalid. Simultaneously addresses "uninitialized symbol 'dmab'" error reported by Smatch. Fixes: 3e9582267e3a ("ALSA: hda: Interrupt servicing and BDL setup for compress streams") Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> --- sound/hda/hdac_stream.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c index 8f625402505f..547adbc22590 100644 --- a/sound/hda/hdac_stream.c +++ b/sound/hda/hdac_stream.c @@ -500,6 +500,9 @@ int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev) dmab = snd_pcm_get_dma_buf(substream); } else if (cstream) { dmab = snd_pcm_get_dma_buf(cstream); + } else { + WARN(1, "No substream or cstream assigned\n"); + return -EINVAL; } /* reset BDL address */ -- 2.25.1

2 1

[GIT PULL] ASoC updates for v6.2-2
by Mark Brown 09 Dec '22

09 Dec '22

The following changes since commit 3d1bb6cc1a654c8693a85b1d262e610196edec8b: ASoC: cs42l51: Correct PGA Volume minimum value (2022-11-25 16:29:52 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v6.2-2 for you to fetch changes up to e85b1f5a9769ac30f4d2f6fb1cdcd9570c38e0c1: ASoC: dt-bindings: fsl-sai: Reinstate i.MX93 SAI compatible string (2022-12-08 11:46:36 +0000) ---------------------------------------------------------------- ASoC: Updates for v6.2 A few more updates for v6.2 which can hopefully go into a later pull request, the bulk of these are fixes, minor cleanups or new board quirks - the one big bit that isn't is support for getting diagnostic data out of the Intel AVS firmwares. ---------------------------------------------------------------- Aidan MacDonald (11): ASoC: jz4740-i2s: Handle independent FIFO flush bits ASoC: jz4740-i2s: Convert to regmap API ASoC: jz4740-i2s: Simplify using regmap fields ASoC: jz4740-i2s: Use FIELD_PREP() macros in hw_params callback ASoC: jz4740-i2s: Align macro values and sort includes ASoC: jz4740-i2s: Support S20_LE and S24_LE sample formats ASoC: jz4740-i2s: Support continuous sample rate ASoC: jz4740-i2s: Move component functions near the component driver ASoC: jz4740-i2s: Refactor DAI probe/remove ops as component ops ASoC: jz4740-i2s: Remove .set_sysclk() ASoC: ingenic: Remove unnecessary clocks from schema Ajye Huang (5): ASoC: mediatek: dt-bindings: modify machine bindings for two MICs case ASoC: mediatek: mt8186-rt5682: Modify machine driver for two DMICs case ASoC: Intel: sof_rt5682: add support for ALC5682I-VD with amp rt1019p ASoC: Intel: sof rt5682: remove the duplicate codes ASoC: SOF: amd: Use poll function instead to read ACP_SHA_DSP_FW_QUALIFIER Alicja Michalska (1): ASoC: Intel: avs: Add missing audio amplifier for KBL Amadeusz Sławiński (21): ASoC: Intel: avs: Add max98927 machine board ASoC: Intel: avs: Load max98927 on target platform ASoC: codecs: rt298: Add quirk for KBL-R RVP platform ASoC: Intel: avs: Add quirk for KBL-R RVP platform ASoC: Intel: avs: Support da7219 on both KBL and APL ASoC: Intel: avs: Add missing include to HDA board ASoC: Intel: boards: Fix typo in comments ASoC: Intel: avs: boards: Fix typo in comments ASoC: Intel: avs: Handle SUSPEND and RESUME triggers ASoC: codecs: da7219: Introduce set_jack() callback ASoC: codecs: da7219: Do not export internal symbols ASoC: Intel: avs: da7219: Refactor jack handling ASoC: Intel: avs: nau8825: Refactor jack handling ASoC: Intel: avs: rt274: Refer to DAI name through a constant ASoC: Intel: avs: rt274: Refactor jack handling ASoC: Intel: avs: rt286: Add define for codec DAI name ASoC: Intel: avs: rt286: Refactor jack handling ASoC: Intel: avs: rt298: Add define for codec DAI name ASoC: Intel: avs: rt298: Refactor jack handling ASoC: Intel: avs: rt5682: Add define for codec DAI name ASoC: Intel: avs: rt5682: Refactor jack handling Andy Shevchenko (1): ASoC: SOF: probes: Check ops before memory allocation Angel Iglesias (1): i2c: core: Introduce i2c_client_get_device_id helper function Artem Lukyanov (1): ASoC: amd: yc: Add Xiaomi Redmi Book Pro 14 2022 into DMI table Ban Tao (1): ASoC: sun50i-dmic: avoid unused variable warning for sun50i_dmic_of_match Bard Liao (4): ASoC: SOF: ipc4-topology: rename sof_ipc4_widget_free_comp ASoC: SOF: ipc4-loader: get max pipeline number ASoC: SOF: ipc4: get pipeline instance id from pipe_widget->instance_id ASoC: Intel: sof_realtek_common: set ret = 0 as initial value Brent Lu (2): ASoC: Intel: sof_nau8825: support rt1015p speaker amplifier ASoC: Intel: sof_rt5682: add jsl_rt5682 board config Cezary Rojewski (50): ASoC: Intel: avs: Fix DMA mask assignment ASoC: Intel: avs: Fix potential RX buffer overflow ASoC: Intel: avs: Support AML with rt286 configuration ASoC: Intel: avs: Add missing SKL-based device IDs ASoC: Intel: avs: Simplify d0ix disabling routine ASoC: Intel: avs: Do not reuse msg between different IPC handlers ASoC: Intel: avs: Do not treat unsupported IPCs as invalid ASoC: Intel: avs: Do not print IPC error message twice ASoC: Intel: avs: Simplify ignore_fw_version description ASoC: Intel: avs: Simplify log control for SKL ASoC: codecs: hda: Fix spelling error in log message ASoC: Intel: avs: Split pcm pages freeing operation from hw_free() ASoC: Intel: avs: Introduce PCM power management routines ALSA: hda: Introduce snd_hdac_stream_wait_drsm() ASoC: Intel: avs: Restart instead of resuming HDA capture streams ASoC: Intel: avs: Count low power streams ASoC: Intel: avs: Power and clock gating policy overriding ASoC: Intel: avs: Enact power gating policy ASoC: Intel: Drop da7219_aad_jack_det() usage ASoC: mediatek: Drop da7219_aad_jack_det() usage ASoC: rockchip: Drop da7219_aad_jack_det() usage ASoC: amd: Drop da7219_aad_jack_det() usage ASoC: Intel: avs: Drop da7219_aad_jack_det() usage ASoC: Intel: avs: Initialize private data for subsequent HDA FEs ASoC: core: Exit all links before removing their components ASoC: Intel: avs: Lock substream before snd_pcm_stop() ASoC: Intel: avs: Disconnect substream if suspend or resume fails ASoC: Intel: bdw_rt286: Refactor jack handling ALSA: hda: Allow for compress stream to hdac_ext_stream assignment ALSA: hda: Prepare for compress stream support ALSA: hda: Interrupt servicing and BDL setup for compress streams ASoC: Intel: avs: Introduce avs_log_buffer_status_locked() ASoC: Intel: avs: Drop fifo_lock ASoC: Intel: avs: Introduce debug-context aware helpers ASoC: Intel: avs: Make enable_logs() dependent on DEBUG_FS ASoC: Intel: avs: Drop usage of debug members in non-debug code ASoC: Intel: avs: Add data probing requests ASoC: Intel: avs: Probe compress operations ASoC: Intel: avs: Data probing soc-component ASoC: Intel: avs: Add probe machine board ASoC: Intel: avs: Probing and firmware tracing over debugfs ASoC: Intel: avs: Gather remaining logs on strace_release() ASoC: Intel: avs: Allow for dumping FW_REGS area ASoC: Intel: avs: Allow for dumping debug window snapshot ASoC: Intel: Skylake: Update pipe_config_idx before filling BE params ASoC: Intel: Skylake: Remove skl_tplg_is_multi_fmt() ASoC: Intel: Skylake: Drop pipe_config_idx ASoC: Intel: Skylake: Introduce single place for pipe-config selection ASoC: Intel: Skylake: Fix driver hang during shutdown ASoC: Intel: Skylake: Use SG allocation for SKL-based firmware load Chancel Liu (14): ASoC: dt-bindings: fsl_rpmsg: Add a property to assign the rpmsg channel ASoC: imx-audio-rpmsg: Create rpmsg channel for MICFIL ASoC: imx-pcm-rpmsg: Register different platform drivers ASoC: imx-pcm-rpmsg: Multi-channel support for sound card based on rpmsg ASoC: fsl_rpmsg: Register different ASoC machine devices ASoC: fsl_rpmsg: Multi-channel support in CPU DAI driver ASoC: imx-rpmsg: Assign platform driver used by machine driver to link with ASoC: dt-bindings: fsl,sai: Add compatible string for i.MX93 platform ASoC: fsl_sai: Add support for i.MX93 platform ASoC: fsl_sai: Specify the maxburst to 8 on i.MX93 platform ASoC: dt-bindings: fsl,micfil: Add compatible string for i.MX93 platform ASoC: fsl_micfil: Add support for i.MX93 platform ASoC: fsl_micfil: Add support when using eDMA ASoC: soc-pcm.c: Clear DAIs parameters after stream_active is updated Chao Song (3): ASoC: SOF: Add support for parsing the number of sink/source pins ASoC: SOF: Add support to parse pin binding array from topology ASoC: SOF: topology: Add helper to get/put widget queue id Charles Keepax (9): sound: sdw: Add hw_params to SoundWire config helper function ASoC: max98373-sdw: Switch to new snd_sdw_params_to_config helper ASoC: rt1308-sdw: Switch to new snd_sdw_params_to_config helper ASoC: rt1316-sdw: Switch to new snd_sdw_params_to_config helper ASoC: rt5682-sdw: Switch to new snd_sdw_params_to_config helper ASoC: rt700: Switch to new snd_sdw_params_to_config helper ASoC: rt711: Switch to new snd_sdw_params_to_config helper ASoC: rt715: Switch to new snd_sdw_params_to_config helper ASoC: sdw-mockup: Switch to new snd_sdw_params_to_config helper Chen Zhongjin (1): ASoC: soc-utils: Remove __exit for snd_soc_util_exit() Christophe JAILLET (1): ASoC: codecs: Remove a useless include Claudiu Beznea (3): ASoC: mchp-spdiftx: simplify locking around ctrl->ch_stat ASoC: mchp-spdiftx: add runtime pm support ASoC: mchp-spdiftx: add support for system suspend/resume Colin Ian King (6): ASoC: twl4030: make read-only array ramp_base static const ASoC: Intel: cirrus-common: Make const array uid_strings static ASoC: tegra: Fix spelling mistake "fliter" -> "filter" ASoC: wcd938x: Make read-only array minCode_param static const ASoC: uniphier: aio-core: Make some read-only arrays static const ASoC: rt715: Make read-only arrays capture_reg_H and capture_reg_L static const David Lin (4): ASoC: nau8825: Adjust internal clock during jack detection ASoC: nau8825: Add a manually mechanism for detection failure ASoC: nau8315: add new acpi id and compatible id ASoC: dt-bindings: add compatible string for NAU8318 David Rau (1): ASoC: da7219: Fix pole orientation detection on OMTP headsets when playing music Dmitry Torokhov (4): ARM: omap2: n8x0: stop instantiating codec platform data ASoC: tlv320aic3x: remove support for platform data ASoC: tlv320aic3x: switch to using gpiod API ASoC: dt-bindings: wcd9335: fix reset line polarity in example Doug Brown (3): ASoC: dt-bindings: add schema for WM8961 ASoC: wm8961: add support for devicetree ASoC: codecs: allow WM8961 to be selected by the user Gaosheng Cui (1): ASoC: amd: acp: Fix possible UAF in acp_dma_open Gongjun Song (13): ASoC: Intel: sof_sdw: Add support for SKU 0C10 product ASoC: Intel: soc-acpi: add SKU 0C10 SoundWire configuration ASoC: Intel: sof_sdw: Add support for SKU 0C40 product ASoC: Intel: soc-acpi: add SKU 0C40 SoundWire configuration ASoC: Intel: sof_sdw: Add support for SKU 0C10 product ASoC: Intel: soc-acpi: add SKU 0C10 SoundWire configuration ASoC: Intel: sof_sdw: Add support for SKU 0C40 product ASoC: Intel: soc-acpi: add SKU 0C40 SoundWire configuration ASoC: Intel: sof_sdw: Add support for SKU 0C4F product ASoC: intel: sof_sdw: add rt1318 codec support. ASoC: Intel: sof_sdw: Add support for SKU 0C11 product ASoC: Intel: soc-acpi: add SKU 0C11 SoundWire configuration ASoC: Intel: sof_sdw: use common helpers for all Realtek amps Jean Delvare (2): ASoC: rsnd: Drop obsolete dependency on COMPILE_TEST ASoC: SOF: Drop obsolete dependency on COMPILE_TEST Jiapeng Chong (1): ASoC: codecs: wcd-clsh: Remove the unused function Jiasheng Jiang (1): ASoC: mediatek: mtk-btcvsd: Add checks for write and read of mtk_btcvsd_snd Jiaxin Yu (1): ASoC: mediatek: mt8186: Correct I2S shared clocks Jyri Sarha (5): ASoC: SOF: probes: Replace [0] union members with DECLARE_FLEX_ARRAY() ASoC: SOF: probes: Separate IPC3 operations to a separate file ASoC: SOF: client: Add sof_client_ipc_set_get_data() ASoC: SOF: client: Add sof_client_ipc4_find_module() function ASoC: SOF: IPC4: probes: Implement IPC4 ops for probes client device Kai Vehmanen (1): ASoC: SOF: Intel: hda-loader: use small buffer for iccmax stream Krzysztof Kozlowski (23): ASoC: dt-bindings: qcom,lpass: do not hard-code clock-output-names ASoC: codecs: lpass-wsa-macro: parse clock-output-names ASoC: qcom: q6prm: Correct module description ASoC: dt-bindings: qcom,wsa883x: Use correct SD_N polarity ASoC: codecs: wsa883x: Use proper shutdown GPIO polarity ASoC: codecs: wsa883x: Shutdown on error path ASoC: codecs: wsa883x: Simplify with dev_err_probe ASoC: dt-bindings: qcom,apr: Add GLINK channel name for SM8450 ASoC: dt-bindings: qcom,apr: Split services to shared schema ASoC: dt-bindings: qcom,apr: Correct and extend example ASoC: dt-bindings: qcom,q6afe: Split to separate schema ASoC: dt-bindings: qcom,q6apm: Split to separate schema ASoC: dt-bindings: qcom,q6adm: Split to separate schema ASoC: dt-bindings: qcom,q6asm: Split to separate schema ASoC: dt-bindings: qcom,q6prm: Split to separate schema ASoC: dt-bindings: qcom,q6core: Split to separate schema ASoC: dt-bindings: qcom,q6apm-lpass-dais: Split to separate schema ASoC: dt-bindings: qcom,q6apm: Add SM8450 bedais node ASoC: dt-bindings: Extend name-prefix.yaml into common DAI properties ASoC: dt-bindings: Reference common DAI properties ASoC: dt-bindings: maxim,max98357a: Convert to DT schema ASoC: dt-bindings: maxim,max98504: Convert to DT schema ASoC: dt-bindings: Correct Alexandre Belloni email Kuninori Morimoto (21): ASoC: soc-dapm.c: replace snd_soc_dapm_wcache to snd_soc_dapm_widget ASoC: soc-dapm.c: tidyup error handling on snd_soc_dapm_add_route() ASoC: soc-dapm.c: remove no meaning variable from snd_soc_dapm_add_path() ASoC: soc-dapm.c: ignore parameter NULL at snd_soc_dapm_free_widget() ASoC: soc-dapm.c: cleanup dapm_widget_set_power() ASoC: soc-dapm.c: replace snd_soc_dapm_wcache to snd_soc_dapm_widget ASoC: soc-dapm.c: tidyup error handling on snd_soc_dapm_add_route() ASoC: soc-dapm.c: remove no meaning variable from snd_soc_dapm_add_path() ASoC: soc-dapm.c: ignore parameter NULL at snd_soc_dapm_free_widget() ASoC: soc-dapm.c: cleanup dapm_widget_set_power() ASoC: soc-dapm.c: merge dapm_power_one_widget() and dapm_widget_set_power() ASoC: soc-dapm.c: cleanup snd_soc_dapm_new_dai() ASoC: soc-dapm.c: numerical order for dapm_up_seq ASoC: soc-dapm.h: cleanup white space ASoC: soc-dapm.h: fixup comment for snd_soc_dapm_widget_for_each_path() ASoC: soc-dpcm.h: remove snd_soc_dpcm::hw_param ASoC: simple-card-utils: remove asoc_simple_convert_fixup() ASoC: audio-graph-card2-custom-sample.dtsi: add convert-rate for DPCM (MIXer) ASoC: audio-graph-card2: check also dpcm node for convert-xxx ASoC: audio-graph-card2: remove Experimental announce ASoC: rsnd: adg: use __clk_get_name() instead of local clk_name[] Lili Li (1): ASoC: Intel: Skylake: Fix Kconfig dependency Maarten Zanders (4): ASoC: simple-mux: add read function ASoC: adau1372: fix mclk ASoC: adau1372: correct PGA enable & mute bit ASoC: adau1372: add support for S24_LE mode Marcin Wojtas (1): ASoC: kirkwood: enable Kirkwood driver for Armada 38x platforms Marek Vasut (4): ASoC: dt-bindings: fsl-sai: Fix mx6ul and mx7d compatible strings ASoC: dt-bindings: fsl-sai: Use minItems 5 for i.MX8MN clock and similar ASoC: dt-bindings: fsl-sai: Sort main section properties ASoC: dt-bindings: fsl-sai: Reinstate i.MX93 SAI compatible string Mark Brown (55): Merge existing fixes from asoc/for-6.1 into new branch ASoC: Intel: avs: Add support for max98927 codec ASoC: Use DIV_ROUND_UP() instead of open-coding it ASoC: codecs: jz4725b: Various improvements and fixes Create a new sound card to access MICFIL based on rpmsg channel ASoC: Intel: avs: Fixes and new boards support ASoC: add devicetree support for WM8961 codec ASoC: Intel/SOF: simplify S3 resume flows ASoC: soc-dapm.c random cleanups ASoC: SOF: Intel: Harden the IPC4 low level sequencing ASoC: soc-dapm.c random cleanups ASoC: Merge HDA/ext cleanup ASoC: SOF: Intel/IPC4: Support for external firmware libraries ASoC: cleanups and improvements for jz4740-i2s ASoC: SOF: Intel: HDaudio cleanups ASoC: Intel: Fix typo in comments Add support for SAI on i.MX93 platform ASoC: Intel: avs: PCM power management ASoC: SOF: Intel: HDA: refactor codec and multi-link suport ASoC: qdsp6: audioreach: add multi-port, SAL and MFC support ASoC: SOF: client-probes: Add support for IPC4 ASoC: jz4740-i2s: Remove .set_sysclk() & friends Add support for MICFIL on i.MX93 platform Modify documentation and machine driver for mt8186_rt1019_rt5682s sound card ASoC: mediatek: Register machine drivers to module device table ASoC: SOF: Intel: update D0i3 registers for MTL ASoC: SOF: get pipeline instance id from pipe_widget->instance_id Adjust usage of rt5682(s) power supply properties ASoC: simpe-card/audio-graph fixups ASoC: SOF: ipc4-topology: Add widget queue support ASoC: codecs: da7219: Do not export da7219_aad_jack_det() ASoC: Set BQ parameters for some Dell models ASoC: Intel: add more ACPI tables/quirks for RPL/MTL ASoC: Intel: add new Dell devices support Adds the combination of headset codec ALC5682I-VD + amp rt1019p ASoC: mchp-spdiftx: add power saving features ASoC: Intel: add Dell SKU 0C11 support ASoC: Intel: avs: DSP recovery and resume fixes Merge branch 'i2c/client_device_id_helper-immutable' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into HEAD ASoC: wm_adsp: Report when a control write changes the value ASoC/soundwire: revisit interrupt and lcount handling firmware: cs_dsp: Switch to using namespaced exports ASoC: adau1372: fixes after debugging custom board RK3588 Audio Support ASoC: dt-bindings: Rework Qualcomm APR/GPR Sound nodes for SM8450 ASoC: Merge up fixes ASoC: Intel: avs: Refactor jack handling ASoC: Intel: avs: rt5682: Refactor jack handling ASoC: hdmi-codec: Allow playback and capture to be disabled drm: tda99x: Don't advertise non-existent capture support ASoC/tda998x: Fix reporting of nonexistent capture streams Add SOF panic dump support for AMD platform. ASoC: Intel: avs: Data probing and fw logging ASoC: Intel: Skylake: Topology and shutdown fixes ASoC: Intel: boards: updates for SOF boards Matthias Kaehlcke (1): ASoC: qcom: lpass-sc7180: Delete redundant error log from _resume() Minghao Chi (1): ASoC: sunxi: use devm_platform_get_and_ioremap_resource() Nicolas Frattaroli (4): ASoC: dt-bindings: rockchip: i2s-tdm: Make grf property optional ASoC: rockchip: i2s_tdm: Make the grf property optional ASoC: dt-bindings: rockchip: i2s-tdm: Add RK3588 compatible ASoC: rockchip: i2s_tdm: Add support for RK3588 Nícolas F. R. A. Prado (20): ASoC: dt-bindings: mt8192-mt6359: Set maxItems, not type, for sound-dai ASoC: dt-bindings: realtek,rt5682s: Add #sound-dai-cells ASoC: dt-bindings: rt5682: Set sound-dai-cells to 1 ASoC: mediatek: mt8183-da7219: Register to module device table ASoC: mediatek: mt8183-mt6358: Register to module device table ASoC: dt-bindings: realtek,rt5682s: Add AVDD and MICVDD supplies ASoC: dt-bindings: realtek,rt5682s: Add DBVDD and LDO1-IN supplies ASoC: dt-bindings: rt5682: Add AVDD, MICVDD and VBAT supplies ASoC: dt-bindings: rt5682: Add DBVDD and LDO1-IN supplies ASoC: rt5682s: Support DBVDD and LDO1-IN supplies ASoC: rt5682: Support DBVDD and LDO1-IN supplies ASoC: mediatek: mt2701-cs42448: Register to module device table ASoC: mediatek: mt2701-wm8960: Register to module device table ASoC: mediatek: mt6797-mt6351: Register to module device table ASoC: mediatek: mt8183-da7219: Register to module device table ASoC: mediatek: mt8183-mt6358: Register to module device table ASoC: mediatek: mt8186-da7219: Register to module device table ASoC: mediatek: mt8186-rt5682: Register to module device table ASoC: mediatek: mt8192-mt6359: Register to module device table ASoC: mediatek: mt8195-mt6359: Register to module device table Oder Chiou (1): ASoC: rt5640: Fix Jack work after system suspend Pavel Dobias (1): ASoC: max9867: Implement exact integer mode Peter Bergin (1): ASoC: cs42xx8-i2c.c: add module device table for of Peter Ujfalusi (25): ASoC: SOF: ipc4: Log the tx message before sending it ASoC: SOF: Intel: ipc4: Read the interrupt reason registers at the same time ASoC: SOF: Intel: ipc4: Wait for channel to be free before sending a message ASoC: SOF: Intel: ipc4: Ack a received reply or notification separately ASoC: SOF: ipc3: Log the tx message before sending it ASoC: SOF: Introduce container struct for SOF firmware ASoC: SOF: amd: Use the basefw firmware container directly ASoC: SOF: Intel: hda-loader: Use the basefw firmware container directly ASoC: SOF: Intel: hda-loader-skl: Use the basefw firmware container directly ASoC: SOF: Drop the firmware and fw_offset from snd_sof_pdata ASoC: SOF: ipc: ops: Add support for optional init and exit callbacks ASoC: SOF: ipc4-loader: Save the maximum number of libraries supported ASoC: SOF: ipc4: Convert the firmware handling (loader) to library convention ASoC: SOF: IPC4: Add helper for looking up module by UUID ASoC: SOF: Add path definition for external firmware libraries ASoC: SOF: Intel: Set the default firmware library path for IPC4 ASoC: SOF: ipc4: Define platform dependent library loading callback ASoC: SOF: Intel: hda: Add flag to indicate that the firmware is IMR booted ASoC: SOF: Intel: Add ipc4 library loading implementation ASoC: SOF: loader: Add support for IPC dependent post firmware boot ops ASoC: SOF: ipc4: Stop using the query_fw_configuration fw_loader ops ASoC: SOF: loader: Remove the query_fw_configuration ops ASoC: SOF: ipc4-loader: Support for loading external libraries ASoC: SOF: ipc4-loader: Return ssize_t from sof_ipc4_fw_parse_ext_man() ASoC: SOF: ipc4-topology: Implement tear_down_all_pipelines callback Pierre-Louis Bossart (60): ASoC: Intel: Skylake: simplify S3 resume flows ASoC: Intel: avs: simplify S3 resume flows ASoC: SOF: Intel: hda-dsp: simplify S3 resume flows ALSA: hda: ext: hdac_ext_controller: use helpers in loop ALSA: hda: ext: hda_ext_controller: use hlink variable/parameter ASoC: SOF: Intel: hda-dai: use hlink variable/parameter ALSA/ASoC: hda: clarify bus_get_link() and bus_link_get() helpers ALSA/ASoC: hda: ext: add 'ext' prefix to snd_hdac_link_free_all ALSA/ASoC: hda: ext: remove 'link' prefix for stream-related operations ALSA/ASoC: hda: ext: add 'bus' prefix for multi-link stream setting ALSA: hda: ext: reduce ambiguity between 'multi-link' and 'link' DMA ALSA: hda: hdac_ext_controller: remove useless loop ALSA/ASoC: hda: move SPIB/DRMS functionality from ext layer ASoC: SOF: ops: fallback to mmio in helpers ASoC: SOF: Intel: use mmio fallback for all platforms ASoC: SOF: ops: add readb/writeb helpers ASoC: SOF: ops: add snd_sof_dsp_updateb() helper ASoC: SOF: Intel: hda-dsp: use SOF helpers for consistency ASoC: SOF: Intel: hda-dai: start removing the use of runtime->private_data in BE ASoC: SOF: Intel: hda-dai: use component_get_drvdata to find hdac_bus ASoC: SOF: Intel: hda-dai: remove useless members in hda_pipe_params ASoC: SOF: Intel: hda-ctrl: remove useless sleep ASoC: SOF: Intel: hda: always do a full reset ASoC: SOF: Intel: hda: remove useless check on GCTL ASoC: SOF: Intel: hda-stream: use SOF helpers for consistency ASoC: SOF: Intel: hda-stream: rename CL_SD_CTL registers as SD_CTL ASoC: SOF: Intel: hda: use SOF helper for consistency ASoC: SOF: Intel: hda-stream: use snd_sof_dsp_updateb() helper ASoC: SOF: Intel: hda-stream: use readb/writeb for stream registers ASoC: SOF: Intel: remove option to disable the common_hdmi handling ASoC: SOF: Intel: remove all dependencies on SND_SOC_HDAC_HDMI ASoC: SOF: Intel: hda-codec: simplify SND_SOC_SOF_HDA_AUDIO_CODEC handling ASoC: SOF: Intel: move codec state change to hda-codec.c ASoC: SOF: Intel: start moving multi-link handling in dedicated file ASoC: SOF: Intel: hda: add multi-link helper for LOSVID ASoC: SOF: Intel: move all RIRB/CMD_IO helpers to hda-codec.c ASoC: SOF: Intel: hda-ctrl: add codec wakeup helper ASoC: SOF: Intel: hda-codec: add hda_codec_device_remove() helper ASoC: SOF: Intel: hda-codec: add stop_cmd_io helper ASoC: SOF: Intel: hda-stream: always allocate CORB/RIRB buffer ASoC: SOF: Intel: hda-codec: add hda_codec_check_rirb_status() helper ASoC: SOF: Intel: hda-ctrl: use helper to clear RIRB status ASoC: SOF: Intel: hda-dsp: clarify dependencies on SND_SOC_SOF_HDA ASoC: SOF: Intel: hda-codec: add helpers to suspend and resume cmd_io ASoC: SOF: Intel: clarify bus_init and bus_exit sequences ASoC: SOF: Intel: hda-mlink: add helpers to suspend/resume links ASoC: SOF: Intel: add hda_bus_ml_free helper ASoC: SOF: Intel: hda: clarify Kconfig dependencies ASoC: SOF: Intel: hda-codec: use GPL-2.0-only license ASoC: SOF: introduce new DEBUG_NOCODEC mode ASoC: SOF: fix compilation issue with readb/writeb helpers ASoC: Intel: sof_sdw_amp: mark coeff tables with __maybe_unused soundwire: intel_init: remove useless interrupt enablement in interrupt thread ASoC: SOF: Intel: hda: add per-chip enable_sdw_irq() callback ASoC: SOF: Intel: mtl: factor interrupt enable/disable interrupt functions ASoC: SOF: Intel: mtl: move SoundWire interrupt enabling to callback ASoC: SOF: Intel: hda: add callback to check SoundWire lcount information soundwire: intel_init: remove sdw_intel_enable_irq() soundwire: intel_init: remove check on number of links ASoC: SOF: Intel: hda: read multi-link capabilities earlier Piotr Maziarz (1): ASoC: Intel: avs: Standby power-state support Rander Wang (3): ASoC: SOF: Intel: add d0i3 definition for MTL ASoC: SOF: Intel: add d0i3_offset in chip_info ASoC: SOF: Intel: set d0i3 register with d0i3_offset Randy Dunlap (1): ASoC: codecs: wsa883x: use correct header file Ranjani Sridharan (1): ASoC: SOF: loader: Set complete state before post_fw_run op Ricardo Ribalda (2): ASoC: mediatek: mt8173: Enable IRQ when pdata is ready ASoC: SOF: mediatek: add shutdown callback Richard Fitzgerald (4): ASoC: wm_adsp: Allow client to hook into pre_run callback ASoC: soc-dai: Do not call snd_soc_link_be_hw_params_fixup() twice firmware: cs_dsp: Rename KConfig symbol CS_DSP -> FW_CS_DSP firmware: cs_dsp: Make the exports namespaced Rob Herring (1): ASoC: dt-bindings: Convert dmic-codec to DT schema Samuel Holland (1): ASoC: dt-bindings: sun50i-dmic: Add D1 compatible string Shang XiaoJing (4): ASoC: cs35l36: Use DIV_ROUND_UP() instead of open-coding it ASoC: wm8978: Use DIV_ROUND_UP() instead of open-coding it ASoC: rsnd: Use DIV_ROUND_UP() instead of open-coding it ASoC: ti: davinci-mcasp: Use DIV_ROUND_UP() instead of open-coding it Shaomin Deng (1): ASoC: meson: axg-pdm: Fix double word in comments Shengjiu Wang (2): ASoC: fsl_micfil: Add Hardware Voice Activity Detector support ASoC: fsl_xcvr: Add Counter registers Shuming Fan (5): ASoC: rt1308-sdw: get BQ params property and apply them ASoC: rt1316-sdw: get BQ params property and apply them ASoC: Intel: sof_sdw_rt1308: add BQ params for the Dell models ASoC: Intel: sof_sdw_rt1316: add BQ params for the Dell models ASoC: rt1318: Add RT1318 SDCA vendor-specific driver Siarhei Volkau (3): ASoC: codecs: jz4725b: use right control for Master Playback ASoC: codecs: jz4725b: add missed Mixer inputs ASoC: codecs: jz4725b: add missed microphone widgets Simon Trimmer (2): firmware: cs_dsp: cs_dsp_coeff_write_ctrl() should report changed ASoC: wm_adsp: Return whether changed when writing controls Srinivas Kandagatla (11): ASoC: qdsp6: audioreach: topology use idr_alloc_u32 ASoC: qdsp6: audioreach: remove unused connection_list ASoC: qdsp6: audioreach: update dapm kcontrol private data ASoC: qdsp6: audioreach: Simplify handing FE and BE graph connections ASoC: qdsp6: audioreach: simplify module_list sz calculation ASoC: qdsp6: audioreach: add support for more port connections ASoC: qdsp6: audioreach: add support to enable SAL Module ASoC: qdsp6: audioreach: add support for MFC Module ASoC: qdsp6: audioreach: add support to enable module command ASoC: codecs: tx-macro: add dmic support via tx macro ASoC: qcom: cleanup and fix dependency of QCOM_COMMON Srinivasa Rao Mandadapu (4): ASoC: qcom: lpass-sc7180: Add system suspend/resume PM ops ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops ASoC: qcom: lpass-sc7180: Add maybe_unused tag for system PM ops ASoC: qcom: lpass-sc7280: Add maybe_unused tag for system PM ops Syed Saba Kareem (2): ASoC: amd: ps: update macros with ps platform naming convention ASoC: amd: ps: Move acp63_dev_data strcture from PCI driver Uwe Kleine-König (4): ASoC: codecs: es8326: Convert to i2c's .probe_new() ASoC: codecs: tas2780: Convert to i2c's .probe_new() ASoC: max98396: Convert to i2c's .probe_new() ASoC: codecs: src4xxx-i2c: Convert to i2c's .probe_new() V sujith kumar Reddy (5): ASoC: SOF: amd: Fix for reading position updates from stream box. ASoC: SOF: amd: Fix for selecting clock source as external clock. ASoC: SOF: amd: ADD HS and SP virtual DAI. ASoC: SOF: Add DAI configuration support for AMD platforms. ASoC : SOF: amd: Add support for IPC and DSP dumps Venkata Prasad Potturu (2): ASoC: amd: acp: Add TDM slots setting support for ACP I2S controller ASoC: amd: acp: Add setbias level for rt5682s codec in machine driver Vijendar Mukunda (1): ASoC: amd: Update Pink Sardine platform ACP register header Viorel Suman (1): ASoC: ak4458: add optional reset control to instead of gpio Wang Jingjin (1): ASoC: rockchip: pdm: Add missing clk_disable_unprepare() in rockchip_pdm_runtime_resume() Wang Yufen (3): ASoC: mediatek: mt8173-rt5650-rt5514: fix refcount leak in mt8173_rt5650_rt5514_dev_probe() ASoC: audio-graph-card: fix refcount leak of cpu_ep in __graph_for_each_link() ASoC: mediatek: mt8183: fix refcount leak in mt8183_mt6358_ts3a227_max98357_dev_probe() Yang Yingliang (4): ASoC: cs42l83: change cs42l83_regmap to static ASoC: Intel: Skylake: fix possible memory leak in skl_codec_device_init() ASoC: SOF: Intel: hda-codec: fix possible memory leak in hda_codec_device_init() ASoC: sof_es8336: fix possible use-after-free in sof_es8336_remove() Yong Zhi (2): ASoC: SOF: Intel: MTL: fix comment error ASoC: Intel: soc-acpi: add MTL AIC SoundWire configurations Yuan Can (1): ASoC: qcom: Add checks for devm_kcalloc Zeng Heng (1): ASoC: pxa: fix null-pointer dereference in filter() Zhang Qilong (1): ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe lishqchn (1): ASoC: core: fix wrong size kzalloc for rtd's components member syed saba kareem (1): ASoC: amd: fix ACP version typo mistake ye xingchen (1): ASoC: imx-audmux: use sysfs_emit() to instead of scnprintf() .mailmap | 4 +- CREDITS | 9 + .../ABI/testing/sysfs-kernel-mm-memory-tiers | 4 +- Documentation/admin-guide/acpi/index.rst | 1 - Documentation/admin-guide/device-mapper/verity.rst | 4 + Documentation/admin-guide/media/vivid.rst | 2 +- Documentation/arm64/booting.rst | 8 + Documentation/arm64/cpu-feature-registers.rst | 38 +- Documentation/block/ublk.rst | 36 + Documentation/core-api/kernel-api.rst | 6 + Documentation/dev-tools/kmsan.rst | 1 + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 2 +- .../bindings/hwlock/qcom-hwspinlock.yaml | 29 +- .../devicetree/bindings/input/goodix,gt7375p.yaml | 5 +- .../bindings/media/i2c/dongwoon,dw9714.txt | 9 - .../bindings/media/i2c/dongwoon,dw9714.yaml | 47 + .../devicetree/bindings/net/engleder,tsnep.yaml | 2 +- .../bindings/net/nfc/samsung,s3fwrn5.yaml | 1 - .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 4 - .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 3 + .../bindings/soc/qcom/qcom,apr-services.yaml | 54 + .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 170 +- .../devicetree/bindings/sound/adi,adau1372.yaml | 7 +- .../devicetree/bindings/sound/adi,adau1977.yaml | 1 + .../devicetree/bindings/sound/adi,adau7118.yaml | 5 +- .../devicetree/bindings/sound/ak4375.yaml | 5 +- .../devicetree/bindings/sound/ak4613.yaml | 5 +- .../devicetree/bindings/sound/ak4642.yaml | 5 +- .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 3 +- .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 3 +- .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 3 +- .../bindings/sound/allwinner,sun50i-h6-dmic.yaml | 12 +- .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 5 +- .../devicetree/bindings/sound/amlogic,aiu.yaml | 2 +- .../bindings/sound/amlogic,g12a-toacodec.yaml | 2 +- .../devicetree/bindings/sound/amlogic,t9015.yaml | 2 +- .../devicetree/bindings/sound/apple,mca.yaml | 5 +- .../devicetree/bindings/sound/awinic,aw8738.yaml | 2 +- .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 3 +- .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 5 +- .../devicetree/bindings/sound/cirrus,cs42l51.yaml | 5 +- .../bindings/sound/cirrus,lochnagar.yaml | 5 +- .../devicetree/bindings/sound/cirrus,madera.yaml | 3 + .../sound/{name-prefix.yaml => dai-common.yaml} | 6 +- .../bindings/sound/davinci-mcasp-audio.yaml | 3 +- .../devicetree/bindings/sound/dmic-codec.yaml | 55 + Documentation/devicetree/bindings/sound/dmic.txt | 22 - .../devicetree/bindings/sound/everest,es8316.yaml | 5 +- .../devicetree/bindings/sound/fsl,micfil.yaml | 1 + .../devicetree/bindings/sound/fsl,rpmsg.yaml | 36 +- .../devicetree/bindings/sound/fsl,sai.yaml | 101 +- .../bindings/sound/google,cros-ec-codec.yaml | 5 +- .../devicetree/bindings/sound/ingenic,aic.yaml | 15 +- .../devicetree/bindings/sound/ingenic,codec.yaml | 5 +- .../bindings/sound/intel,keembay-i2s.yaml | 5 +- .../devicetree/bindings/sound/linux,bt-sco.yaml | 5 +- .../devicetree/bindings/sound/linux,spdif-dit.yaml | 2 +- .../bindings/sound/marvell,mmp-sspa.yaml | 5 +- .../devicetree/bindings/sound/max98357a.txt | 28 - .../devicetree/bindings/sound/max98504.txt | 44 - .../devicetree/bindings/sound/maxim,max98357a.yaml | 52 + .../devicetree/bindings/sound/maxim,max98504.yaml | 86 + .../devicetree/bindings/sound/mchp,i2s-mcc.yaml | 18 +- .../devicetree/bindings/sound/mchp,spdiftx.yaml | 5 +- .../devicetree/bindings/sound/microchip,pdmc.yaml | 5 +- .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 14 +- .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 3 +- .../devicetree/bindings/sound/mvebu-audio.txt | 14 +- .../devicetree/bindings/sound/nau8315.txt | 6 + .../bindings/sound/nvidia,tegra186-asrc.yaml | 2 +- .../bindings/sound/nvidia,tegra186-dspk.yaml | 2 +- .../bindings/sound/nvidia,tegra20-spdif.yaml | 5 +- .../bindings/sound/nvidia,tegra210-adx.yaml | 2 +- .../bindings/sound/nvidia,tegra210-amx.yaml | 2 +- .../bindings/sound/nvidia,tegra210-dmic.yaml | 2 +- .../bindings/sound/nvidia,tegra210-i2s.yaml | 2 +- .../bindings/sound/nvidia,tegra210-mixer.yaml | 2 +- .../bindings/sound/nvidia,tegra210-mvc.yaml | 2 +- .../bindings/sound/nvidia,tegra210-ope.yaml | 2 +- .../bindings/sound/nvidia,tegra210-sfc.yaml | 2 +- .../devicetree/bindings/sound/nxp,tfa989x.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 3 +- .../bindings/sound/qcom,lpass-rx-macro.yaml | 8 +- .../bindings/sound/qcom,lpass-tx-macro.yaml | 8 +- .../bindings/sound/qcom,lpass-va-macro.yaml | 8 +- .../bindings/sound/qcom,lpass-wsa-macro.yaml | 8 +- .../bindings/sound/qcom,q6adm-routing.yaml | 27 +- .../devicetree/bindings/sound/qcom,q6adm.yaml | 51 + .../devicetree/bindings/sound/qcom,q6afe.yaml | 68 + .../devicetree/bindings/sound/qcom,q6apm-dai.yaml | 19 +- .../bindings/sound/qcom,q6apm-lpass-dais.yaml | 35 + .../devicetree/bindings/sound/qcom,q6apm.yaml | 68 + .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 48 +- .../devicetree/bindings/sound/qcom,q6asm.yaml | 68 + .../devicetree/bindings/sound/qcom,q6core.yaml | 39 + .../bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 40 +- .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 57 +- .../devicetree/bindings/sound/qcom,q6prm.yaml | 50 + .../devicetree/bindings/sound/qcom,wcd9335.txt | 2 +- .../devicetree/bindings/sound/qcom,wcd938x.yaml | 5 +- .../devicetree/bindings/sound/qcom,wsa883x.yaml | 15 +- .../devicetree/bindings/sound/realtek,rt5682s.yaml | 31 +- .../devicetree/bindings/sound/renesas,fsi.yaml | 5 +- .../devicetree/bindings/sound/renesas,rsnd.yaml | 3 +- .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 5 +- .../devicetree/bindings/sound/richtek,rt9120.yaml | 5 +- .../bindings/sound/rockchip,i2s-tdm.yaml | 7 +- .../devicetree/bindings/sound/rockchip,pdm.yaml | 5 +- .../bindings/sound/rockchip,rk3328-codec.yaml | 5 +- .../devicetree/bindings/sound/rockchip-i2s.yaml | 5 +- .../devicetree/bindings/sound/rockchip-spdif.yaml | 23 +- .../devicetree/bindings/sound/rohm,bd28623.yaml | 5 +- Documentation/devicetree/bindings/sound/rt5659.txt | 2 +- Documentation/devicetree/bindings/sound/rt5682.txt | 22 +- .../devicetree/bindings/sound/samsung-i2s.yaml | 5 +- .../devicetree/bindings/sound/sgtl5000.yaml | 5 +- .../bindings/sound/simple-audio-amplifier.yaml | 2 +- .../bindings/sound/simple-audio-mux.yaml | 2 +- .../bindings/sound/snps,designware-i2s.yaml | 30 +- .../bindings/sound/socionext,uniphier-aio.yaml | 5 +- .../bindings/sound/socionext,uniphier-evea.yaml | 5 +- .../devicetree/bindings/sound/st,stm32-i2s.yaml | 5 +- .../bindings/sound/st,stm32-spdifrx.yaml | 5 +- .../devicetree/bindings/sound/tas2562.yaml | 5 +- .../devicetree/bindings/sound/tas2770.yaml | 5 +- .../devicetree/bindings/sound/tas27xx.yaml | 5 +- .../devicetree/bindings/sound/ti,src4xxx.yaml | 2 +- .../bindings/sound/ti,tlv320adc3xxx.yaml | 5 +- .../devicetree/bindings/sound/wlf,arizona.yaml | 3 + .../devicetree/bindings/sound/wlf,wm8731.yaml | 1 + .../devicetree/bindings/sound/wlf,wm8940.yaml | 5 +- .../devicetree/bindings/sound/wlf,wm8961.yaml | 43 + .../devicetree/bindings/sound/wlf,wm8962.yaml | 5 +- .../devicetree/bindings/sound/wlf,wm8978.yaml | 5 +- .../devicetree/bindings/sound/zl38060.yaml | 5 +- Documentation/driver-api/basics.rst | 3 - Documentation/driver-api/driver-model/devres.rst | 1 + Documentation/driver-api/media/mc-core.rst | 19 +- Documentation/driver-api/miscellaneous.rst | 5 +- Documentation/hwmon/corsair-psu.rst | 2 + Documentation/kbuild/reproducible-builds.rst | 10 + Documentation/kernel-hacking/hacking.rst | 2 +- Documentation/process/2.Process.rst | 15 +- .../process/code-of-conduct-interpretation.rst | 2 +- Documentation/process/howto.rst | 2 +- Documentation/process/maintainer-netdev.rst | 10 + Documentation/trace/histogram.rst | 2 +- Documentation/translations/it_IT/process/howto.rst | 2 +- Documentation/translations/ja_JP/howto.rst | 2 +- Documentation/translations/ko_KR/howto.rst | 2 +- Documentation/translations/zh_CN/process/howto.rst | 2 +- Documentation/translations/zh_TW/process/howto.rst | 2 +- .../userspace-api/media/cec.h.rst.exceptions | 2 + .../media/v4l/libv4l-introduction.rst | 4 +- Documentation/virt/kvm/devices/vm.rst | 3 + MAINTAINERS | 151 +- Makefile | 4 +- arch/arc/boot/dts/axc003.dtsi | 4 +- arch/arc/boot/dts/axc003_idu.dtsi | 4 +- arch/arc/boot/dts/axs10x_mb.dtsi | 4 +- arch/arc/boot/dts/hsdk.dts | 4 +- arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +- arch/arc/configs/axs101_defconfig | 4 - arch/arc/configs/axs103_defconfig | 4 - arch/arc/configs/axs103_smp_defconfig | 4 - arch/arc/configs/haps_hs_defconfig | 1 - arch/arc/configs/haps_hs_smp_defconfig | 1 - arch/arc/configs/hsdk_defconfig | 1 - arch/arc/configs/nsim_700_defconfig | 1 - arch/arc/configs/nsimosci_defconfig | 1 - arch/arc/configs/nsimosci_hs_defconfig | 1 - arch/arc/configs/nsimosci_hs_smp_defconfig | 6 +- arch/arc/configs/tb10x_defconfig | 7 +- arch/arc/configs/vdk_hs38_defconfig | 3 - arch/arc/configs/vdk_hs38_smp_defconfig | 1 - arch/arc/include/asm/bitops.h | 4 +- arch/arc/include/asm/entry-compact.h | 2 +- arch/arc/include/asm/io.h | 2 +- arch/arc/include/asm/pgtable-levels.h | 2 +- arch/arc/kernel/smp.c | 2 +- arch/arc/mm/cache.c | 4 +- arch/arc/mm/ioremap.c | 2 +- arch/arm/boot/dts/imx6q-yapp4-crux.dts | 4 + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 2 +- arch/arm/boot/dts/imx6qp-yapp4-crux-plus.dts | 4 + arch/arm/boot/dts/imx7s.dtsi | 4 +- arch/arm/boot/dts/lan966x-pcb8291.dts | 20 + arch/arm/boot/dts/sama7g5-pinfunc.h | 2 +- arch/arm/boot/dts/ste-href.dtsi | 8 + arch/arm/boot/dts/ste-snowball.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 8 + arch/arm/mach-at91/pm_suspend.S | 7 +- arch/arm/mach-omap2/board-n8x0.c | 5 - arch/arm/mach-omap2/common-board-devices.h | 2 - arch/arm/mach-omap2/pdata-quirks.c | 1 - arch/arm64/boot/dts/arm/juno-base.dtsi | 14 + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 6 + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 6 + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 6 + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 18 +- arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 16 +- .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 32 +- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 12 +- arch/arm64/boot/dts/freescale/imx8mn.dtsi | 6 +- arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 20 +- arch/arm64/boot/dts/freescale/imx93-pinfunc.h | 0 arch/arm64/boot/dts/freescale/imx93.dtsi | 11 +- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 13 +- arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 12 + arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 +- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 6 + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 36 +- .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 6 + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 6 + arch/arm64/boot/dts/qcom/sm8250.dtsi | 1 + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 12 + arch/arm64/include/asm/cputype.h | 2 +- arch/arm64/include/asm/efi.h | 8 + arch/arm64/include/asm/kvm_pgtable.h | 18 +- arch/arm64/include/asm/pgtable.h | 4 +- arch/arm64/include/asm/stage2_pgtable.h | 20 - arch/arm64/include/asm/syscall_wrapper.h | 2 +- arch/arm64/kernel/cpufeature.c | 42 +- arch/arm64/kernel/efi-rt-wrapper.S | 33 +- arch/arm64/kernel/efi.c | 78 +- arch/arm64/kernel/entry-common.c | 3 +- arch/arm64/kernel/entry-ftrace.S | 7 +- arch/arm64/kvm/hyp/Makefile | 5 +- arch/arm64/kvm/hyp/exception.c | 3 +- arch/arm64/kvm/hyp/include/hyp/switch.h | 20 + arch/arm64/kvm/hyp/nvhe/Makefile | 7 + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 2 +- arch/arm64/kvm/hyp/nvhe/switch.c | 26 - arch/arm64/kvm/hyp/vhe/switch.c | 8 - arch/arm64/kvm/mmu.c | 9 +- arch/arm64/kvm/vgic/vgic-its.c | 5 +- arch/arm64/mm/fault.c | 4 + arch/arm64/mm/pageattr.c | 5 +- arch/loongarch/include/asm/processor.h | 2 +- arch/loongarch/include/asm/ptrace.h | 4 +- arch/loongarch/kernel/head.S | 3 +- arch/loongarch/kernel/process.c | 4 +- arch/loongarch/kernel/switch.S | 2 +- arch/loongarch/net/bpf_jit.c | 31 +- arch/mips/alchemy/common/gpiolib.c | 2 +- arch/mips/boot/compressed/decompress.c | 1 + arch/mips/include/asm/fw/fw.h | 2 +- arch/mips/kernel/jump_label.c | 2 +- arch/mips/kernel/relocate_kernel.S | 15 +- arch/mips/loongson64/reset.c | 10 + arch/mips/pic32/pic32mzda/early_console.c | 13 +- arch/mips/pic32/pic32mzda/init.c | 2 +- arch/parisc/include/asm/hardware.h | 12 +- arch/parisc/include/uapi/asm/pdc.h | 36 +- arch/parisc/kernel/drivers.c | 14 +- arch/powerpc/Kconfig | 3 +- arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 6 + arch/powerpc/include/asm/syscalls.h | 7 + arch/powerpc/kernel/exceptions-64e.S | 7 + arch/powerpc/kernel/exceptions-64s.S | 14 +- arch/powerpc/kernel/interrupt.c | 14 +- arch/powerpc/kernel/interrupt_64.S | 13 +- arch/powerpc/kernel/sys_ppc32.c | 13 +- arch/powerpc/kernel/syscalls/syscall.tbl | 7 +- arch/powerpc/kernel/vmlinux.lds.S | 2 +- arch/powerpc/kvm/Kconfig | 4 + arch/powerpc/lib/vmx-helper.c | 12 +- arch/powerpc/mm/book3s64/hash_native.c | 67 +- arch/powerpc/mm/book3s64/hash_pgtable.c | 8 +- arch/powerpc/mm/book3s64/hash_utils.c | 12 +- arch/powerpc/platforms/pseries/lparcfg.c | 11 + arch/powerpc/platforms/pseries/vas.c | 83 +- arch/powerpc/platforms/pseries/vas.h | 6 + arch/riscv/Kconfig | 17 +- arch/riscv/Makefile | 6 +- .../riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 38 + arch/riscv/include/asm/cacheflush.h | 8 - arch/riscv/include/asm/jump_label.h | 8 +- arch/riscv/include/asm/kvm_vcpu_timer.h | 1 + arch/riscv/include/asm/vdso/processor.h | 2 +- arch/riscv/kernel/cpu.c | 3 + arch/riscv/kernel/process.c | 2 + arch/riscv/kernel/setup.c | 1 + arch/riscv/kernel/vdso/Makefile | 5 +- arch/riscv/kernel/vdso/vdso.lds.S | 2 + arch/riscv/kvm/vcpu.c | 3 + arch/riscv/kvm/vcpu_timer.c | 17 +- arch/riscv/mm/cacheflush.c | 38 + arch/riscv/mm/dma-noncoherent.c | 41 - arch/riscv/mm/init.c | 1 - arch/riscv/mm/kasan_init.c | 7 +- arch/s390/Kconfig | 6 +- arch/s390/Makefile | 2 - arch/s390/boot/Makefile | 3 +- arch/s390/boot/startup.c | 3 +- arch/s390/boot/vmlinux.lds.S | 13 +- arch/s390/configs/btf.config | 1 + arch/s390/configs/debug_defconfig | 65 +- arch/s390/configs/defconfig | 67 +- arch/s390/configs/kasan.config | 3 + arch/s390/configs/zfcpdump_defconfig | 1 - arch/s390/include/asm/futex.h | 3 +- arch/s390/include/asm/processor.h | 11 +- arch/s390/kernel/perf_pai_ext.c | 1 + arch/s390/kvm/kvm-s390.c | 26 +- arch/s390/kvm/kvm-s390.h | 1 - arch/s390/kvm/pci.c | 2 +- arch/s390/lib/uaccess.c | 6 +- arch/s390/pci/pci_mmio.c | 8 +- arch/x86/Kconfig | 1 - arch/x86/coco/tdx/tdx.c | 25 +- arch/x86/crypto/polyval-clmulni_glue.c | 19 +- arch/x86/events/amd/core.c | 5 +- arch/x86/events/amd/ibs.c | 2 +- arch/x86/events/amd/uncore.c | 1 + arch/x86/events/intel/core.c | 1 + arch/x86/events/intel/ds.c | 18 +- arch/x86/events/intel/lbr.c | 2 +- arch/x86/events/intel/pt.c | 9 + arch/x86/events/rapl.c | 10 +- arch/x86/hyperv/hv_init.c | 19 +- arch/x86/include/asm/intel-family.h | 11 +- arch/x86/include/asm/iommu.h | 4 +- arch/x86/include/asm/kvm_host.h | 7 +- arch/x86/include/asm/msr-index.h | 8 +- arch/x86/include/asm/qspinlock_paravirt.h | 2 +- arch/x86/include/asm/spec-ctrl.h | 10 +- arch/x86/include/asm/string_64.h | 11 +- arch/x86/include/asm/syscall_wrapper.h | 2 +- arch/x86/include/asm/uaccess.h | 13 +- arch/x86/kernel/asm-offsets.c | 6 - arch/x86/kernel/cpu/amd.c | 6 +- arch/x86/kernel/cpu/bugs.c | 15 +- arch/x86/kernel/cpu/hygon.c | 4 +- arch/x86/kernel/cpu/microcode/amd.c | 16 +- arch/x86/kernel/cpu/resctrl/core.c | 8 +- arch/x86/kernel/cpu/sgx/ioctl.c | 3 + arch/x86/kernel/cpu/topology.c | 16 +- arch/x86/kernel/fpu/core.c | 2 +- arch/x86/kernel/fpu/init.c | 8 - arch/x86/kernel/fpu/xstate.c | 42 +- arch/x86/kernel/ftrace_64.S | 34 +- arch/x86/kernel/traps.c | 7 + arch/x86/kernel/unwind_orc.c | 2 +- arch/x86/kvm/.gitignore | 2 + arch/x86/kvm/Makefile | 12 + arch/x86/kvm/cpuid.c | 13 +- arch/x86/kvm/debugfs.c | 7 +- arch/x86/kvm/emulate.c | 108 +- arch/x86/kvm/kvm-asm-offsets.c | 29 + arch/x86/kvm/mmu/mmu.c | 4 +- arch/x86/kvm/pmu.c | 2 +- arch/x86/kvm/svm/pmu.c | 7 +- arch/x86/kvm/svm/sev.c | 6 +- arch/x86/kvm/svm/svm.c | 115 +- arch/x86/kvm/svm/svm.h | 11 +- arch/x86/kvm/svm/svm_ops.h | 5 - arch/x86/kvm/svm/vmenter.S | 260 +- arch/x86/kvm/vmx/capabilities.h | 19 +- arch/x86/kvm/vmx/pmu_intel.c | 4 +- arch/x86/kvm/vmx/vmenter.S | 2 +- arch/x86/kvm/vmx/vmx.c | 23 +- arch/x86/kvm/x86.c | 144 +- arch/x86/kvm/xen.c | 64 +- arch/x86/lib/usercopy.c | 3 + arch/x86/mm/hugetlbpage.c | 4 + arch/x86/mm/pat/set_memory.c | 4 + arch/x86/power/cpu.c | 1 + arch/x86/purgatory/Makefile | 1 + arch/x86/xen/enlighten_pv.c | 3 +- arch/x86/xen/pmu.c | 2 +- arch/x86/xen/setup.c | 26 +- block/bfq-cgroup.c | 4 + block/bfq-iosched.h | 4 - block/bio.c | 2 +- block/blk-cgroup.c | 2 +- block/blk-core.c | 1 - block/blk-mq.c | 19 +- block/blk-settings.c | 9 +- block/blk.h | 1 + block/genhd.c | 13 +- block/sed-opal.c | 32 +- drivers/accessibility/speakup/main.c | 2 +- drivers/accessibility/speakup/utils.h | 2 +- drivers/acpi/acpi_extlog.c | 33 +- drivers/acpi/acpi_pcc.c | 2 +- drivers/acpi/apei/ghes.c | 2 +- drivers/acpi/arm64/iort.c | 3 +- drivers/acpi/numa/srat.c | 1 + drivers/acpi/pci_root.c | 1 + drivers/acpi/resource.c | 56 +- drivers/acpi/scan.c | 8 +- drivers/acpi/video_detect.c | 37 +- drivers/acpi/x86/utils.c | 6 + drivers/android/binder_alloc.c | 7 + drivers/ata/ahci.h | 2 +- drivers/ata/ahci_brcm.c | 2 +- drivers/ata/ahci_imx.c | 4 +- drivers/ata/ahci_qoriq.c | 2 +- drivers/ata/ahci_st.c | 2 +- drivers/ata/ahci_xgene.c | 2 +- drivers/ata/libata-scsi.c | 13 + drivers/ata/libata-transport.c | 19 +- drivers/ata/pata_legacy.c | 5 +- drivers/ata/pata_palmld.c | 4 +- drivers/ata/sata_rcar.c | 2 +- drivers/base/power/domain.c | 4 + drivers/base/property.c | 4 +- drivers/block/Kconfig | 6 + drivers/block/drbd/drbd_main.c | 4 +- drivers/block/drbd/drbd_req.c | 14 +- drivers/block/rbd.c | 4 +- drivers/block/ublk_drv.c | 117 +- drivers/bluetooth/virtio_bt.c | 2 +- drivers/char/hw_random/bcm2835-rng.c | 2 +- drivers/char/random.c | 4 +- drivers/clk/clk-renesas-pcie.c | 65 +- drivers/clk/clk.c | 6 +- drivers/clk/mediatek/clk-mt8195-topckgen.c | 4 +- drivers/clk/qcom/gcc-sc7280.c | 1 + drivers/clk/qcom/gpucc-sc7280.c | 1 + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 13 +- drivers/clk/sifive/Kconfig | 4 +- drivers/clocksource/hyperv_timer.c | 29 +- drivers/counter/104-quad-8.c | 64 +- drivers/counter/microchip-tcb-capture.c | 18 +- drivers/counter/ti-ecap-capture.c | 7 +- drivers/cpufreq/cpufreq-dt.c | 6 +- drivers/cpufreq/imx6q-cpufreq.c | 4 +- drivers/cpufreq/intel_pstate.c | 133 +- drivers/cpufreq/qcom-cpufreq-nvmem.c | 25 +- drivers/cpufreq/sun50i-cpufreq-nvmem.c | 9 +- drivers/cpufreq/tegra194-cpufreq.c | 1 + drivers/cxl/core/mbox.c | 2 +- drivers/cxl/core/pmem.c | 2 + drivers/cxl/core/port.c | 11 +- drivers/cxl/core/region.c | 113 +- drivers/cxl/cxl.h | 4 +- drivers/cxl/pmem.c | 105 +- drivers/dma/apple-admac.c | 2 +- drivers/dma/at_hdmac.c | 153 +- drivers/dma/at_hdmac_regs.h | 10 +- drivers/dma/idxd/cdev.c | 18 + drivers/dma/idxd/device.c | 26 +- drivers/dma/idxd/idxd.h | 32 + drivers/dma/idxd/init.c | 4 +- drivers/dma/idxd/sysfs.c | 2 +- drivers/dma/mv_xor_v2.c | 1 + drivers/dma/pxa_dma.c | 4 +- drivers/dma/stm32-dma.c | 14 +- drivers/dma/stm32-mdma.c | 1 + drivers/dma/ti/k3-udma-glue.c | 3 + drivers/extcon/extcon-usbc-tusb320.c | 8 +- drivers/firmware/arm_scmi/bus.c | 11 + drivers/firmware/arm_scmi/common.h | 5 +- drivers/firmware/arm_scmi/driver.c | 41 +- drivers/firmware/arm_scmi/mailbox.c | 2 +- drivers/firmware/arm_scmi/optee.c | 2 +- drivers/firmware/arm_scmi/shmem.c | 31 +- drivers/firmware/arm_scmi/smc.c | 2 +- drivers/firmware/arm_scmi/virtio.c | 26 +- drivers/firmware/cirrus/Kconfig | 2 +- drivers/firmware/cirrus/Makefile | 2 +- drivers/firmware/cirrus/cs_dsp.c | 79 +- drivers/firmware/efi/Kconfig | 22 - drivers/firmware/efi/arm-runtime.c | 2 +- drivers/firmware/efi/efi.c | 4 +- drivers/firmware/efi/libstub/Makefile | 2 +- drivers/firmware/efi/libstub/Makefile.zboot | 29 +- drivers/firmware/efi/libstub/arm64-stub.c | 17 +- drivers/firmware/efi/libstub/efistub.h | 28 + drivers/firmware/efi/libstub/fdt.c | 8 +- drivers/firmware/efi/libstub/random.c | 7 +- drivers/firmware/efi/libstub/smbios.c | 48 + drivers/firmware/efi/libstub/x86-stub.c | 6 +- drivers/firmware/efi/libstub/zboot.lds | 3 +- drivers/firmware/efi/riscv-runtime.c | 2 +- drivers/firmware/efi/tpm.c | 2 +- drivers/firmware/efi/vars.c | 72 +- drivers/firmware/google/coreboot_table.c | 37 +- drivers/gpio/gpio-tegra.c | 60 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 30 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 89 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 25 +- drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 14 - drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 32 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 41 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 54 +- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 28 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 1 - drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 1 - drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 1 - drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 - drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 25 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 21 + drivers/gpu/drm/amd/amdgpu/soc21.c | 7 +- drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 764 +- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 6 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 34 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 106 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 42 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 - .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 10 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 30 + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 32 +- .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 11 +- drivers/gpu/drm/amd/display/dc/dc.h | 2 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 4 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 1 + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 24 +- .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 2 +- .../drm/amd/display/dc/dcn314/dcn314_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 14 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 1 + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- .../drm/amd/display/dc/dcn321/dcn321_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 1 + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 +- .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 22 +- .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 17 +- .../amd/display/dc/dml/dcn32/display_mode_vba_32.h | 5 + .../dc/dml/dcn32/display_mode_vba_util_32.c | 20 +- .../dc/dml/dcn32/display_mode_vba_util_32.h | 6 +- .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 4 +- .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 17 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 4 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 +- .../amd/display/dc/gpio/dcn32/hw_factory_dcn32.c | 14 + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 9 +- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 5 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 27 +- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 8 + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 111 +- .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h | 17 +- .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_ppsmc.h | 15 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 10 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 15 +- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 8 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 8 +- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 9 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 22 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 41 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 42 +- drivers/gpu/drm/bridge/parade-ps8640.c | 25 +- drivers/gpu/drm/display/drm_dp_dual_mode_helper.c | 51 +- drivers/gpu/drm/drm_connector.c | 2 +- drivers/gpu/drm/drm_drv.c | 2 +- drivers/gpu/drm/drm_format_helper.c | 66 +- drivers/gpu/drm/drm_internal.h | 3 +- drivers/gpu/drm/drm_mode_config.c | 3 - drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 + drivers/gpu/drm/i2c/tda998x_drv.c | 2 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_ddi.c | 68 +- drivers/gpu/drm/i915/display/intel_display_core.h | 8 + .../drm/i915/display/intel_display_power_well.c | 7 +- drivers/gpu/drm/i915/display/intel_dkl_phy.c | 109 + drivers/gpu/drm/i915/display/intel_dkl_phy.h | 24 + drivers/gpu/drm/i915/display/intel_dp.c | 4 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 59 +- drivers/gpu/drm/i915/display/intel_lvds.c | 3 +- drivers/gpu/drm/i915/display/intel_panel.c | 4 +- drivers/gpu/drm/i915/display/intel_panel.h | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 5 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 64 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 19 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 10 +- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 7 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +- drivers/gpu/drm/i915/i915_driver.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/i915_scatterlist.h | 34 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +- drivers/gpu/drm/imx/Kconfig | 1 - drivers/gpu/drm/imx/imx-tve.c | 5 +- drivers/gpu/drm/lima/lima_devfreq.c | 15 +- drivers/gpu/drm/msm/Kconfig | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 14 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 10 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 7 +- .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 13 +- drivers/gpu/drm/msm/dp/dp_display.c | 23 +- drivers/gpu/drm/msm/dp/dp_drm.c | 34 + drivers/gpu/drm/msm/dp/dp_parser.c | 6 +- drivers/gpu/drm/msm/dp/dp_parser.h | 5 +- drivers/gpu/drm/msm/dsi/dsi.c | 6 + drivers/gpu/drm/msm/hdmi/hdmi.c | 7 +- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 9 +- drivers/gpu/drm/msm/msm_gpu.c | 2 + drivers/gpu/drm/msm/msm_gpu.h | 4 + drivers/gpu/drm/msm/msm_ringbuffer.c | 3 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 1 + drivers/gpu/drm/panel/panel-simple.c | 2 + drivers/gpu/drm/panfrost/panfrost_dump.c | 36 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 11 +- drivers/gpu/drm/rcar-du/Kconfig | 13 +- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 26 +- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 5 +- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 10 +- drivers/gpu/drm/scheduler/sched_entity.c | 9 +- drivers/gpu/drm/tegra/drm.c | 4 + drivers/gpu/drm/tests/drm_format_helper_test.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.c | 8 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 72 +- drivers/gpu/drm/vc4/vc4_hdmi.h | 1 + drivers/gpu/drm/vc4/vc4_kms.c | 8 +- drivers/gpu/host1x/dev.c | 4 + drivers/hid/hid-asus.c | 4 +- drivers/hid/hid-hyperv.c | 2 +- drivers/hid/hid-ids.h | 2 + drivers/hid/hid-lenovo.c | 2 +- drivers/hid/hid-magicmouse.c | 2 +- drivers/hid/hid-playstation.c | 83 +- drivers/hid/hid-quirks.c | 1 + drivers/hid/hid-saitek.c | 2 + drivers/hid/wacom_wac.c | 11 +- drivers/hv/hv_balloon.c | 2 +- drivers/hwmon/coretemp.c | 56 +- drivers/hwmon/corsair-psu.c | 3 +- drivers/hwmon/pmbus/pmbus.h | 1 - drivers/hwmon/pwm-fan.c | 5 +- drivers/hwmon/scmi-hwmon.c | 116 +- drivers/hwspinlock/qcom_hwspinlock.c | 42 +- drivers/hwtracing/coresight/coresight-core.c | 7 +- drivers/hwtracing/coresight/coresight-cti-core.c | 10 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-i801.c | 1 + drivers/i2c/busses/i2c-mlxbf.c | 9 - drivers/i2c/busses/i2c-mlxcpld.c | 2 +- drivers/i2c/busses/i2c-piix4.c | 1 + drivers/i2c/busses/i2c-qcom-cci.c | 13 +- drivers/i2c/busses/i2c-sis630.c | 2 +- drivers/i2c/busses/i2c-tegra.c | 16 +- drivers/i2c/busses/i2c-xiic.c | 1 + drivers/i2c/i2c-core-base.c | 14 + drivers/iio/accel/adxl367.c | 23 +- drivers/iio/accel/adxl372.c | 23 +- drivers/iio/accel/bma400_core.c | 24 +- drivers/iio/accel/bmc150-accel-core.c | 23 +- drivers/iio/adc/at91-sama5d2_adc.c | 29 +- drivers/iio/adc/at91_adc.c | 4 +- drivers/iio/adc/mcp3911.c | 13 +- drivers/iio/adc/mp2629_adc.c | 5 +- drivers/iio/adc/stm32-adc.c | 11 +- drivers/iio/imu/bno055/bno055.c | 2 +- drivers/iio/light/tsl2583.c | 2 +- drivers/iio/pressure/ms5611.h | 12 +- drivers/iio/pressure/ms5611_core.c | 51 +- drivers/iio/pressure/ms5611_spi.c | 2 +- drivers/iio/temperature/ltc2983.c | 13 +- drivers/iio/trigger/iio-trig-sysfs.c | 6 +- drivers/infiniband/core/cma.c | 2 +- drivers/infiniband/core/device.c | 10 +- drivers/infiniband/core/nldev.c | 2 +- drivers/infiniband/hw/efa/efa_main.c | 4 +- drivers/infiniband/hw/hfi1/pio.c | 3 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 15 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 - drivers/infiniband/hw/qedr/main.c | 9 +- drivers/infiniband/sw/rxe/rxe_resp.c | 4 +- drivers/input/joystick/iforce/iforce-main.c | 8 +- drivers/input/misc/soc_button_array.c | 14 +- drivers/input/mouse/synaptics.c | 1 + drivers/input/serio/i8042-acpipnpio.h | 8 +- drivers/input/serio/i8042.c | 4 - drivers/input/touchscreen/goodix.c | 11 + drivers/iommu/amd/iommu.c | 7 +- drivers/iommu/apple-dart.c | 2 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- drivers/iommu/arm/arm-smmu/arm-smmu.c | 2 +- drivers/iommu/intel/iommu.c | 25 +- drivers/iommu/intel/pasid.c | 5 +- drivers/iommu/iommu.c | 7 +- drivers/iommu/mtk_iommu.c | 3 +- drivers/iommu/virtio-iommu.c | 9 +- drivers/isdn/hardware/mISDN/netjet.c | 2 +- drivers/isdn/mISDN/core.c | 7 +- drivers/isdn/mISDN/dsp_pipeline.c | 3 +- drivers/leds/simple/simatic-ipc-leds-gpio.c | 12 +- drivers/md/dm-bufio.c | 15 +- drivers/md/dm-cache-policy.h | 2 +- drivers/md/dm-clone-target.c | 2 +- drivers/md/dm-crypt.c | 1 + drivers/md/dm-integrity.c | 21 +- drivers/md/dm-ioctl.c | 82 +- drivers/md/dm-log-writes.c | 1 + drivers/md/dm-raid.c | 4 +- drivers/md/dm-rq.c | 4 +- drivers/md/dm-stats.c | 2 +- drivers/md/dm-table.c | 78 +- drivers/md/dm-verity-target.c | 18 +- drivers/md/dm.c | 9 +- drivers/media/Kconfig | 2 +- drivers/media/cec/core/cec-adap.c | 1 + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 4 + drivers/media/cec/platform/s5p/s5p_cec.c | 2 + drivers/media/dvb-frontends/drxk_hard.c | 2 +- drivers/media/i2c/ar0521.c | 11 +- drivers/media/i2c/ir-kbd-i2c.c | 47 + drivers/media/i2c/isl7998x.c | 2 +- drivers/media/i2c/mt9v111.c | 2 +- drivers/media/i2c/ov5640.c | 123 +- drivers/media/i2c/ov8865.c | 10 +- drivers/media/mc/mc-device.c | 13 +- drivers/media/mc/mc-entity.c | 648 +- drivers/media/pci/cx18/cx18-av-core.c | 4 +- drivers/media/pci/cx88/cx88-input.c | 2 +- drivers/media/pci/cx88/cx88-video.c | 1 + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 6 +- drivers/media/platform/amphion/vpu_v4l2.c | 11 +- drivers/media/platform/chips-media/coda-jpeg.c | 13 +- .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 2 +- .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 7 +- .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 3 +- .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 3 +- drivers/media/platform/nxp/dw100/dw100.c | 4 +- drivers/media/platform/qcom/camss/camss-video.c | 6 +- drivers/media/platform/qcom/venus/helpers.c | 13 +- drivers/media/platform/qcom/venus/hfi.c | 5 +- drivers/media/platform/qcom/venus/vdec.c | 2 + drivers/media/platform/qcom/venus/venc.c | 29 +- drivers/media/platform/qcom/venus/venc_ctrls.c | 38 +- .../media/platform/renesas/rcar-vin/rcar-core.c | 5 +- drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 18 +- drivers/media/platform/renesas/vsp1/vsp1_video.c | 6 +- .../platform/rockchip/rkisp1/rkisp1-capture.c | 21 +- .../media/platform/rockchip/rkisp1/rkisp1-common.h | 30 +- .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 144 +- .../media/platform/rockchip/rkisp1/rkisp1-params.c | 531 +- .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 47 +- .../platform/rockchip/rkisp1/rkisp1-resizer.c | 45 +- .../platform/samsung/exynos4-is/fimc-capture.c | 9 +- .../platform/samsung/exynos4-is/fimc-isp-video.c | 9 +- .../media/platform/samsung/exynos4-is/fimc-lite.c | 9 +- .../platform/samsung/s3c-camif/camif-capture.c | 6 +- drivers/media/platform/st/stm32/stm32-dcmi.c | 6 +- drivers/media/platform/sunxi/sun4i-csi/Kconfig | 2 +- drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 6 +- drivers/media/platform/sunxi/sun6i-csi/Kconfig | 12 +- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 592 +- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 64 +- .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 592 +- .../media/platform/sunxi/sun6i-csi/sun6i_video.h | 23 +- .../media/platform/sunxi/sun6i-mipi-csi2/Kconfig | 4 +- .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 20 +- .../platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig | 2 +- .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 23 +- drivers/media/platform/sunxi/sun8i-di/Kconfig | 2 +- drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 2 +- drivers/media/platform/ti/cal/cal-video.c | 6 +- drivers/media/platform/ti/cal/cal.h | 1 - drivers/media/platform/ti/omap3isp/isp.c | 4 +- drivers/media/platform/ti/omap3isp/ispvideo.c | 9 +- drivers/media/platform/ti/omap3isp/ispvideo.h | 11 +- drivers/media/platform/verisilicon/hantro_drv.c | 14 +- .../platform/verisilicon/hantro_g2_hevc_dec.c | 4 +- drivers/media/platform/verisilicon/hantro_hevc.c | 4 +- .../media/platform/verisilicon/hantro_postproc.c | 7 +- drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 27 + drivers/media/platform/xilinx/xilinx-dma.c | 11 +- drivers/media/platform/xilinx/xilinx-dma.h | 9 +- drivers/media/radio/radio-si476x.c | 5 +- drivers/media/radio/si4713/si4713.c | 2 +- drivers/media/rc/imon.c | 4 +- drivers/media/rc/mceusb.c | 2 +- drivers/media/test-drivers/vimc/vimc-capture.c | 7 +- drivers/media/test-drivers/vivid/vivid-core.c | 38 +- drivers/media/test-drivers/vivid/vivid-core.h | 2 + drivers/media/test-drivers/vivid/vivid-osd.c | 2 +- drivers/media/test-drivers/vivid/vivid-vid-cap.c | 35 +- drivers/media/tuners/xc4000.c | 4 +- drivers/media/usb/au0828/au0828-core.c | 8 +- drivers/media/usb/dvb-usb-v2/af9035.c | 2 +- drivers/media/usb/msi2500/msi2500.c | 2 +- drivers/media/v4l2-core/v4l2-ctrls-api.c | 8 +- drivers/media/v4l2-core/v4l2-ctrls-core.c | 19 +- drivers/media/v4l2-core/v4l2-dev.c | 72 + drivers/media/v4l2-core/v4l2-dv-timings.c | 14 + drivers/mfd/syscon.c | 8 + drivers/misc/sgi-gru/grumain.c | 6 +- drivers/misc/sgi-gru/grutables.h | 14 +- drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 + drivers/mmc/core/block.c | 44 +- drivers/mmc/core/core.c | 8 +- drivers/mmc/core/queue.c | 8 + drivers/mmc/core/sdio_bus.c | 3 +- drivers/mmc/host/Kconfig | 3 +- drivers/mmc/host/sdhci-brcmstb.c | 3 +- drivers/mmc/host/sdhci-cqhci.h | 24 + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +- drivers/mmc/host/sdhci-of-arasan.c | 3 +- drivers/mmc/host/sdhci-pci-core.c | 16 +- drivers/mmc/host/sdhci-pci-o2micro.c | 7 + drivers/mmc/host/sdhci-tegra.c | 3 +- drivers/mmc/host/sdhci_am654.c | 7 +- drivers/mtd/mtdcore.c | 2 +- drivers/mtd/nand/onenand/Kconfig | 1 + drivers/mtd/nand/raw/intel-nand-controller.c | 23 +- drivers/mtd/nand/raw/marvell_nand.c | 2 +- drivers/mtd/nand/raw/nand_base.c | 4 +- drivers/mtd/nand/raw/qcom_nandc.c | 12 +- drivers/mtd/nand/raw/tegra_nand.c | 4 +- drivers/mtd/parsers/bcm47xxpart.c | 4 +- drivers/mtd/spi-nor/core.c | 4 +- drivers/net/can/at91_can.c | 2 +- drivers/net/can/c_can/c_can_main.c | 2 +- drivers/net/can/can327.c | 2 +- drivers/net/can/cc770/cc770.c | 2 +- drivers/net/can/ctucanfd/ctucanfd_base.c | 2 +- drivers/net/can/dev/skb.c | 10 +- drivers/net/can/flexcan/flexcan-core.c | 2 +- drivers/net/can/grcan.c | 2 +- drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +- drivers/net/can/janz-ican3.c | 2 +- drivers/net/can/kvaser_pciefd.c | 2 +- drivers/net/can/m_can/m_can.c | 2 +- drivers/net/can/mscan/mpc5xxx_can.c | 8 +- drivers/net/can/mscan/mscan.c | 2 +- drivers/net/can/pch_can.c | 2 +- drivers/net/can/peak_canfd/peak_canfd.c | 2 +- drivers/net/can/rcar/rcar_can.c | 2 +- drivers/net/can/rcar/rcar_canfd.c | 39 +- drivers/net/can/sja1000/sja1000.c | 2 +- drivers/net/can/slcan/slcan-core.c | 2 +- drivers/net/can/softing/softing_main.c | 2 +- drivers/net/can/spi/hi311x.c | 2 +- drivers/net/can/spi/mcp251x.c | 7 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c | 2 +- drivers/net/can/sun4i_can.c | 2 +- drivers/net/can/ti_hecc.c | 2 +- drivers/net/can/usb/ems_usb.c | 2 +- drivers/net/can/usb/esd_usb.c | 2 +- drivers/net/can/usb/etas_es58x/es58x_core.c | 2 +- drivers/net/can/usb/gs_usb.c | 2 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 4 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 4 +- drivers/net/can/usb/mcba_usb.c | 2 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/can/usb/ucan.c | 2 +- drivers/net/can/usb/usb_8dev.c | 2 +- drivers/net/can/xilinx_can.c | 2 +- drivers/net/dsa/dsa_loop.c | 25 +- drivers/net/dsa/qca/qca8k-8xxx.c | 83 +- drivers/net/ethernet/adi/adin1110.c | 38 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 8 +- drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 5 + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 58 +- drivers/net/ethernet/amd/xgbe/xgbe.h | 26 + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 +- drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 98 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 + .../ethernet/aquantia/atlantic/macsec/macsec_api.c | 18 +- drivers/net/ethernet/atheros/ag71xx.c | 3 +- drivers/net/ethernet/broadcom/Kconfig | 2 +- drivers/net/ethernet/broadcom/bcm4908_enet.c | 12 +- drivers/net/ethernet/broadcom/bcmsysport.c | 3 + drivers/net/ethernet/broadcom/bgmac.c | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt.c | 64 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 11 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c | 3 +- drivers/net/ethernet/cadence/macb_main.c | 1 + drivers/net/ethernet/cavium/liquidio/lio_main.c | 34 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 1 + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +- .../net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc.c | 5 + drivers/net/ethernet/freescale/fec_main.c | 50 +- drivers/net/ethernet/freescale/fman/mac.c | 21 +- drivers/net/ethernet/freescale/fman/mac.h | 2 +- drivers/net/ethernet/hisilicon/hns/hnae.c | 4 +- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 - .../hisilicon/hns3/hns3_common/hclge_comm_rss.c | 20 - .../hisilicon/hns3/hns3_common/hclge_comm_rss.h | 2 - drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 167 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 1 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 19 +- drivers/net/ethernet/huawei/hinic/hinic_debugfs.c | 18 +- drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 2 +- drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 2 +- drivers/net/ethernet/huawei/hinic/hinic_main.c | 9 +- drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 1 - drivers/net/ethernet/ibm/ehea/ehea_main.c | 1 + drivers/net/ethernet/ibm/ibmveth.c | 3 +- drivers/net/ethernet/ibm/ibmveth.h | 1 + drivers/net/ethernet/ibm/ibmvnic.c | 16 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 103 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 16 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 +- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 - drivers/net/ethernet/intel/i40e/i40e_type.h | 4 + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 43 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 67 +- drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 +- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 + drivers/net/ethernet/intel/ice/ice_base.c | 2 +- drivers/net/ethernet/intel/ice/ice_lib.c | 25 + drivers/net/ethernet/intel/ice/ice_lib.h | 1 + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 5 +- drivers/net/ethernet/lantiq_etop.c | 1 - drivers/net/ethernet/marvell/mv643xx_eth.c | 1 + .../net/ethernet/marvell/octeon_ep/octep_main.c | 16 +- drivers/net/ethernet/marvell/octeontx2/Kconfig | 2 + .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 2 + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 1 + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 135 +- .../ethernet/marvell/octeontx2/nic/otx2_struct.h | 57 + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 32 +- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 1 + .../net/ethernet/marvell/prestera/prestera_rxtx.c | 7 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 17 +- drivers/net/ethernet/mediatek/mtk_ppe.c | 6 - drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 + drivers/net/ethernet/mediatek/mtk_wed.c | 15 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 21 +- drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 9 + .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 31 + .../ethernet/mellanox/mlx5/core/en/tc/act/act.c | 92 +- .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 30 +- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 +- .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 - .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 27 +- .../mellanox/mlx5/core/en_accel/macsec_fs.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 27 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 88 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 11 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 14 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 18 +- .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 14 +- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 20 +- drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c | 7 + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 3 +- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 + drivers/net/ethernet/micrel/ksz884x.c | 2 +- .../ethernet/microchip/lan966x/lan966x_ethtool.c | 13 +- .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 50 +- .../net/ethernet/microchip/lan966x/lan966x_main.c | 4 +- .../net/ethernet/microchip/lan966x/lan966x_main.h | 2 + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 15 + .../net/ethernet/microchip/lan966x/lan966x_vlan.c | 6 + .../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 3 + .../net/ethernet/microchip/sparx5/sparx5_main.c | 3 + drivers/net/ethernet/neterion/s2io.c | 29 +- drivers/net/ethernet/netronome/nfp/nfp_main.c | 38 +- .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 6 +- drivers/net/ethernet/ni/nixge.c | 1 + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 12 +- drivers/net/ethernet/pensando/ionic/ionic_main.c | 8 +- drivers/net/ethernet/sfc/ef10.c | 58 +- drivers/net/ethernet/sfc/efx.c | 8 +- drivers/net/ethernet/sfc/filter.h | 4 +- drivers/net/ethernet/sfc/rx_common.c | 10 +- drivers/net/ethernet/socionext/netsec.c | 2 + drivers/net/ethernet/socionext/sni_ave.c | 6 + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 11 +- .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 46 +- .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 8 +- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 + drivers/net/ethernet/sun/sunhme.c | 2 +- drivers/net/ethernet/sunplus/spl2sw_driver.c | 1 - drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpsw.c | 2 + drivers/net/ethernet/tundra/tsi108_eth.c | 5 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/hamradio/bpqether.c | 2 +- drivers/net/hyperv/rndis_filter.c | 6 +- drivers/net/ipa/data/ipa_data-v3.5.1.c | 4 +- drivers/net/ipa/ipa_main.c | 3 + drivers/net/ipa/reg/ipa_reg-v3.1.c | 96 +- drivers/net/macsec.c | 50 +- drivers/net/macvlan.c | 10 +- drivers/net/mctp/mctp-i2c.c | 47 +- drivers/net/mhi_net.c | 2 + drivers/net/netdevsim/bus.c | 9 +- drivers/net/netdevsim/dev.c | 32 +- drivers/net/phy/dp83822.c | 3 +- drivers/net/phy/dp83867.c | 15 + drivers/net/phy/marvell.c | 16 +- drivers/net/phy/mdio_bus.c | 2 +- drivers/net/phy/mscc/mscc_macsec.c | 1 + drivers/net/phy/phylink.c | 3 + drivers/net/thunderbolt.c | 19 +- drivers/net/tun.c | 21 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/smsc95xx.c | 46 +- drivers/net/wan/lapbether.c | 3 +- drivers/net/wireless/ath/ath11k/qmi.h | 2 +- drivers/net/wireless/ath/ath11k/reg.c | 6 +- .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 4 + drivers/net/wireless/cisco/airo.c | 18 +- drivers/net/wireless/mac80211_hwsim.c | 5 + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 8 +- drivers/net/wireless/ralink/rt2x00/rt2400pci.h | 2 +- drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 8 +- drivers/net/wireless/ralink/rt2x00/rt2500pci.h | 2 +- drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 8 +- drivers/net/wireless/ralink/rt2x00/rt2500usb.h | 2 +- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 60 +- drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 8 +- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 6 +- drivers/net/wireless/ralink/rt2x00/rt61pci.c | 4 +- drivers/net/wireless/ralink/rt2x00/rt61pci.h | 2 +- drivers/net/wireless/ralink/rt2x00/rt73usb.c | 4 +- drivers/net/wireless/ralink/rt2x00/rt73usb.h | 2 +- drivers/net/wwan/Kconfig | 2 +- drivers/net/wwan/iosm/iosm_ipc_coredump.c | 1 + drivers/net/wwan/iosm/iosm_ipc_devlink.c | 1 + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 8 + drivers/net/wwan/iosm/iosm_ipc_mux.h | 1 + drivers/net/wwan/iosm/iosm_ipc_pcie.c | 18 +- drivers/net/wwan/iosm/iosm_ipc_wwan.c | 43 +- drivers/net/wwan/mhi_wwan_mbim.c | 1 + drivers/net/wwan/wwan_hwsim.c | 2 +- drivers/nfc/fdp/fdp.c | 10 +- drivers/nfc/nfcmrvl/i2c.c | 7 +- drivers/nfc/nxp-nci/core.c | 7 +- drivers/nfc/s3fwrn5/core.c | 8 +- drivers/nfc/virtual_ncidev.c | 3 + drivers/nvme/host/apple.c | 2 + drivers/nvme/host/core.c | 11 +- drivers/nvme/host/hwmon.c | 32 +- drivers/nvme/host/multipath.c | 1 + drivers/nvme/host/pci.c | 16 +- drivers/nvme/host/tcp.c | 13 +- drivers/nvme/target/auth.c | 2 + drivers/nvme/target/configfs.c | 12 +- drivers/nvme/target/core.c | 2 +- drivers/nvmem/lan9662-otpc.c | 2 +- drivers/nvmem/u-boot-env.c | 2 +- drivers/parisc/iosapic.c | 1 + drivers/parisc/pdc_stable.c | 34 +- drivers/parport/parport_pc.c | 2 +- drivers/pci/controller/pci-hyperv.c | 22 +- drivers/pci/controller/pci-tegra.c | 11 +- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 2 +- drivers/phy/ralink/phy-mt7621-pci.c | 3 +- drivers/phy/st/phy-stm32-usbphyc.c | 2 + drivers/phy/sunplus/phy-sunplus-usb2.c | 4 +- drivers/phy/tegra/xusb.c | 20 +- drivers/pinctrl/devicetree.c | 2 + drivers/pinctrl/mediatek/mtk-eint.c | 34 +- drivers/pinctrl/mediatek/mtk-eint.h | 6 + drivers/pinctrl/mediatek/pinctrl-mt2701.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt2712.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt6765.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt6779.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt6795.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt7623.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt7629.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt7986.c | 2 + drivers/pinctrl/mediatek/pinctrl-mt8127.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8167.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8186.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8188.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8195.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8516.c | 1 + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 3 + drivers/pinctrl/pinctrl-ingenic.c | 4 +- drivers/pinctrl/pinctrl-ocelot.c | 17 +- drivers/pinctrl/pinctrl-rockchip.c | 40 + drivers/pinctrl/pinctrl-zynqmp.c | 9 - drivers/pinctrl/qcom/pinctrl-msm.c | 21 + drivers/pinctrl/qcom/pinctrl-sc8280xp.c | 4 +- drivers/platform/loongarch/loongson-laptop.c | 24 +- .../platform/surface/aggregator/ssh_packet_layer.c | 24 +- .../platform/surface/surface_aggregator_registry.c | 37 + drivers/platform/x86/acer-wmi.c | 9 + drivers/platform/x86/amd/pmc.c | 10 +- drivers/platform/x86/asus-nb-wmi.c | 9 + drivers/platform/x86/asus-wmi.c | 2 + drivers/platform/x86/hp-wmi.c | 15 +- drivers/platform/x86/ideapad-laptop.c | 62 +- drivers/platform/x86/intel/hid.c | 3 + drivers/platform/x86/intel/pmc/core.c | 2 + drivers/platform/x86/intel/pmc/pltdrv.c | 9 + drivers/platform/x86/intel/pmt/class.c | 31 +- drivers/platform/x86/p2sb.c | 15 +- drivers/platform/x86/thinkpad_acpi.c | 12 +- drivers/platform/x86/touchscreen_dmi.c | 25 + drivers/rtc/rtc-cmos.c | 14 +- drivers/s390/block/dcssblk.c | 1 + drivers/s390/cio/css.c | 8 +- drivers/s390/crypto/vfio_ap_private.h | 2 +- drivers/s390/crypto/zcrypt_msgtype6.c | 21 +- drivers/s390/scsi/zfcp_fsf.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.c | 14 +- drivers/scsi/lpfc/lpfc_bsg.c | 4 +- drivers/scsi/lpfc/lpfc_ct.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 7 +- drivers/scsi/megaraid/megaraid_sas_base.c | 27 +- drivers/scsi/mpi3mr/Kconfig | 1 + drivers/scsi/mpi3mr/mpi3mr_os.c | 3 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 1 + drivers/scsi/qla2xxx/qla_attr.c | 30 +- drivers/scsi/scsi_debug.c | 13 +- drivers/scsi/scsi_sysfs.c | 8 + drivers/scsi/scsi_transport_iscsi.c | 31 +- drivers/scsi/scsi_transport_sas.c | 13 +- drivers/siox/siox-core.c | 2 + drivers/slimbus/Kconfig | 2 +- drivers/slimbus/stream.c | 8 +- drivers/soc/imx/imx93-pd.c | 17 +- drivers/soc/imx/soc-imx8m.c | 11 + drivers/soundwire/intel.c | 1 + drivers/soundwire/intel_init.c | 37 - drivers/soundwire/qcom.c | 9 + drivers/spi/spi-amd.c | 2 +- drivers/spi/spi-aspeed-smc.c | 6 +- drivers/spi/spi-gxp.c | 2 +- drivers/spi/spi-intel.c | 10 +- drivers/spi/spi-meson-spicc.c | 24 +- drivers/spi/spi-mpc52xx.c | 2 +- drivers/spi/spi-mt65xx.c | 23 +- drivers/spi/spi-qup.c | 2 + drivers/spi/spi-stm32.c | 3 +- drivers/spi/spi-tegra210-quad.c | 11 + drivers/staging/media/atomisp/Makefile | 1 - drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 19 +- drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 6 - .../staging/media/atomisp/include/linux/atomisp.h | 14 - .../atomisp/include/linux/atomisp_gmin_platform.h | 2 - .../media/atomisp/include/linux/atomisp_platform.h | 18 - drivers/staging/media/atomisp/notes.txt | 19 + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 715 +- drivers/staging/media/atomisp/pci/atomisp_cmd.h | 11 +- drivers/staging/media/atomisp/pci/atomisp_compat.h | 10 - .../media/atomisp/pci/atomisp_compat_css20.c | 100 +- drivers/staging/media/atomisp/pci/atomisp_file.c | 229 - drivers/staging/media/atomisp/pci/atomisp_file.h | 44 - drivers/staging/media/atomisp/pci/atomisp_fops.c | 274 +- .../media/atomisp/pci/atomisp_gmin_platform.c | 94 +- .../staging/media/atomisp/pci/atomisp_internal.h | 55 +- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 776 +- drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 14 +- drivers/staging/media/atomisp/pci/atomisp_subdev.c | 133 +- drivers/staging/media/atomisp/pci/atomisp_subdev.h | 71 +- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 164 +- drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 3 - drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 198 +- drivers/staging/media/atomisp/pci/sh_css_params.c | 4 +- drivers/staging/media/imx/imx-media-utils.c | 8 +- drivers/staging/media/imx/imx7-media-csi.c | 6 +- .../staging/media/ipu3/include/uapi/intel-ipu3.h | 7 +- drivers/staging/media/ipu3/ipu3-v4l2.c | 37 +- drivers/staging/media/meson/vdec/vdec.c | 2 + drivers/staging/media/omap4iss/iss.c | 4 +- drivers/staging/media/omap4iss/iss_video.c | 9 +- drivers/staging/media/omap4iss/iss_video.h | 11 +- drivers/staging/media/sunxi/cedrus/Kconfig | 1 + drivers/staging/media/tegra-video/tegra210.c | 6 +- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 9 +- drivers/target/loopback/tcm_loop.c | 3 +- drivers/target/target_core_device.c | 19 + drivers/target/target_core_iblock.c | 19 +- drivers/target/target_core_internal.h | 1 + drivers/target/target_core_pr.c | 33 +- drivers/target/target_core_transport.c | 3 +- drivers/thermal/intel/intel_powerclamp.c | 6 +- drivers/tty/n_gsm.c | 71 +- drivers/tty/serial/8250/8250_lpss.c | 17 +- drivers/tty/serial/8250/8250_omap.c | 52 +- .../tty/serial/8250/{8250_gsc.c => 8250_parisc.c} | 0 drivers/tty/serial/8250/8250_port.c | 7 +- drivers/tty/serial/8250/Kconfig | 4 +- drivers/tty/serial/8250/Makefile | 2 +- drivers/tty/serial/fsl_lpuart.c | 76 +- drivers/tty/serial/imx.c | 1 + drivers/ufs/core/ufshcd.c | 4 +- drivers/ufs/core/ufshpb.c | 6 +- drivers/ufs/host/ufs-qcom-ice.c | 1 - drivers/usb/cdns3/host.c | 56 +- drivers/usb/chipidea/otg_fsm.c | 2 + drivers/usb/core/quirks.c | 3 + drivers/usb/dwc3/core.c | 59 +- drivers/usb/dwc3/drd.c | 50 - drivers/usb/dwc3/dwc3-st.c | 2 +- drivers/usb/dwc3/gadget.c | 22 +- drivers/usb/dwc3/host.c | 10 - drivers/usb/gadget/function/uvc_queue.c | 8 +- drivers/usb/gadget/function/uvc_video.c | 25 +- drivers/usb/gadget/udc/aspeed-vhub/dev.c | 1 + drivers/usb/gadget/udc/bdc/bdc_udc.c | 1 + drivers/usb/host/bcma-hcd.c | 10 +- drivers/usb/host/xhci-mem.c | 20 +- drivers/usb/host/xhci-pci.c | 44 +- drivers/usb/host/xhci.c | 10 +- drivers/usb/host/xhci.h | 1 + drivers/usb/misc/sisusbvga/sisusb_struct.h | 2 +- drivers/usb/serial/option.c | 19 +- drivers/usb/typec/mux/intel_pmc_mux.c | 15 +- drivers/usb/typec/tipd/core.c | 6 +- drivers/usb/typec/ucsi/ucsi.c | 42 +- drivers/usb/typec/ucsi/ucsi_acpi.c | 10 + drivers/vfio/pci/vfio_pci_core.c | 10 +- drivers/vfio/vfio_main.c | 26 +- drivers/video/aperture.c | 5 +- drivers/video/fbdev/cyber2000fb.c | 2 + drivers/video/fbdev/da8xx-fb.c | 3 +- drivers/video/fbdev/gbefb.c | 4 +- drivers/video/fbdev/sis/sis_accel.c | 2 +- drivers/video/fbdev/sis/vstruct.h | 2 +- drivers/video/fbdev/sm501fb.c | 2 +- drivers/video/fbdev/smscufx.c | 55 +- drivers/video/fbdev/stifb.c | 3 +- drivers/video/fbdev/xilinxfb.c | 8 +- drivers/watchdog/exar_wdt.c | 4 +- drivers/watchdog/sp805_wdt.c | 2 +- drivers/watchdog/watchdog_core.c | 4 + drivers/watchdog/watchdog_dev.c | 12 +- drivers/xen/grant-dma-ops.c | 27 +- drivers/xen/pcpu.c | 2 +- drivers/xen/platform-pci.c | 10 +- drivers/xen/xen-pciback/conf_space_capability.c | 9 +- fs/binfmt_elf.c | 3 +- fs/btrfs/backref.c | 138 +- fs/btrfs/backref.h | 1 + fs/btrfs/block-group.c | 2 - fs/btrfs/compression.c | 14 +- fs/btrfs/ctree.c | 16 + fs/btrfs/ctree.h | 16 +- fs/btrfs/disk-io.c | 14 +- fs/btrfs/disk-io.h | 2 + fs/btrfs/export.c | 2 +- fs/btrfs/export.h | 2 +- fs/btrfs/extent-io-tree.c | 15 +- fs/btrfs/extent-tree.c | 25 +- fs/btrfs/file.c | 29 +- fs/btrfs/inode.c | 16 +- fs/btrfs/raid56.c | 18 +- fs/btrfs/scrub.c | 9 +- fs/btrfs/send.c | 29 +- fs/btrfs/send.h | 5 + fs/btrfs/super.c | 16 + fs/btrfs/tests/btrfs-tests.c | 2 +- fs/btrfs/tests/qgroup-tests.c | 36 +- fs/btrfs/volumes.c | 51 +- fs/btrfs/volumes.h | 4 +- fs/btrfs/zoned.c | 40 + fs/btrfs/zoned.h | 11 + fs/ceph/caps.c | 48 +- fs/ceph/inode.c | 2 +- fs/ceph/snap.c | 3 +- fs/cifs/cached_dir.c | 39 +- fs/cifs/cached_dir.h | 4 + fs/cifs/cifsfs.c | 33 +- fs/cifs/cifsfs.h | 4 +- fs/cifs/connect.c | 15 +- fs/cifs/dir.c | 6 +- fs/cifs/file.c | 24 +- fs/cifs/inode.c | 11 +- fs/cifs/ioctl.c | 4 +- fs/cifs/misc.c | 6 +- fs/cifs/sess.c | 1 + fs/cifs/smb2inode.c | 2 + fs/cifs/smb2misc.c | 81 +- fs/cifs/smb2ops.c | 37 +- fs/cifs/smb2pdu.c | 17 +- fs/cifs/smb2transport.c | 19 +- fs/crypto/keyring.c | 17 +- fs/efivarfs/vars.c | 16 - fs/erofs/fscache.c | 38 +- fs/erofs/internal.h | 6 +- fs/erofs/super.c | 39 +- fs/erofs/sysfs.c | 8 +- fs/erofs/zdata.c | 38 +- fs/erofs/zdata.h | 6 +- fs/erofs/zmap.c | 22 +- fs/exec.c | 6 +- fs/ext4/fast_commit.c | 5 +- fs/ext4/ioctl.c | 3 +- fs/ext4/migrate.c | 3 +- fs/ext4/namei.c | 10 +- fs/ext4/resize.c | 5 + fs/ext4/super.c | 6 +- fs/fuse/file.c | 4 + fs/fuse/readdir.c | 10 +- fs/hugetlbfs/inode.c | 13 +- fs/kernfs/dir.c | 14 +- fs/netfs/buffered_read.c | 20 +- fs/netfs/io.c | 3 + fs/nfs/client.c | 4 +- fs/nfs/delegation.c | 36 +- fs/nfs/dir.c | 5 +- fs/nfs/dns_resolve.c | 7 +- fs/nfs/dns_resolve.h | 2 +- fs/nfs/fs_context.c | 14 +- fs/nfs/internal.h | 14 +- fs/nfs/mount_clnt.c | 4 +- fs/nfs/namespace.c | 2 +- fs/nfs/nfs3client.c | 4 +- fs/nfs/nfs42proc.c | 3 + fs/nfs/nfs4_fs.h | 2 +- fs/nfs/nfs4client.c | 19 +- fs/nfs/nfs4namespace.c | 16 +- fs/nfs/nfs4proc.c | 10 +- fs/nfs/nfs4state.c | 2 + fs/nfs/pnfs_nfs.c | 6 +- fs/nfs/super.c | 5 +- fs/nfsd/filecache.c | 6 +- fs/nfsd/nfs4state.c | 1 + fs/nfsd/nfsctl.c | 4 +- fs/nfsd/nfsfh.c | 2 +- fs/nfsd/trace.h | 5 +- fs/nilfs2/segment.c | 15 +- fs/nilfs2/super.c | 2 - fs/nilfs2/the_nilfs.c | 2 - fs/ocfs2/namei.c | 23 +- fs/proc/task_mmu.c | 2 +- fs/squashfs/file.c | 23 +- fs/squashfs/page_actor.c | 3 + fs/squashfs/page_actor.h | 6 +- fs/super.c | 3 +- fs/udf/namei.c | 2 +- fs/userfaultfd.c | 3 + fs/xfs/libxfs/xfs_ag.h | 15 + fs/xfs/libxfs/xfs_alloc.c | 6 +- fs/xfs/libxfs/xfs_dir2_leaf.c | 9 +- fs/xfs/libxfs/xfs_format.h | 22 +- fs/xfs/libxfs/xfs_log_format.h | 60 +- fs/xfs/libxfs/xfs_refcount.c | 286 +- fs/xfs/libxfs/xfs_refcount.h | 40 +- fs/xfs/libxfs/xfs_refcount_btree.c | 15 +- fs/xfs/libxfs/xfs_rmap.c | 9 +- fs/xfs/libxfs/xfs_trans_resv.c | 4 +- fs/xfs/libxfs/xfs_types.h | 30 + fs/xfs/scrub/alloc.c | 4 +- fs/xfs/scrub/ialloc.c | 5 +- fs/xfs/scrub/refcount.c | 72 +- fs/xfs/xfs_attr_item.c | 67 +- fs/xfs/xfs_bmap_item.c | 54 +- fs/xfs/xfs_error.c | 9 +- fs/xfs/xfs_extfree_item.c | 94 +- fs/xfs/xfs_extfree_item.h | 16 + fs/xfs/xfs_file.c | 7 +- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_log_recover.c | 10 +- fs/xfs/xfs_ondisk.h | 23 +- fs/xfs/xfs_refcount_item.c | 57 +- fs/xfs/xfs_rmap_item.c | 70 +- fs/xfs/xfs_super.c | 12 +- fs/xfs/xfs_sysfs.h | 7 +- fs/xfs/xfs_trace.h | 48 +- fs/xfs/xfs_trans_ail.c | 3 +- fs/zonefs/super.c | 37 +- fs/zonefs/sysfs.c | 5 - include/acpi/ghes.h | 2 +- include/asm-generic/compat.h | 2 +- include/asm-generic/hyperv-tlfs.h | 9 + include/asm-generic/vmlinux.lds.h | 20 +- include/drm/gpu_scheduler.h | 9 + include/linux/blk-mq.h | 3 +- include/linux/blkdev.h | 16 +- include/linux/bpf.h | 50 +- include/linux/can/dev.h | 16 + include/linux/cgroup.h | 1 + include/linux/counter.h | 5 +- include/linux/dsa/tag_qca.h | 8 +- include/linux/efi.h | 6 +- include/linux/fb.h | 2 +- include/linux/fortify-string.h | 30 +- include/linux/fscrypt.h | 4 +- include/linux/i2c.h | 1 + include/linux/io_uring.h | 3 + include/linux/iommu.h | 2 +- include/linux/kmsan_string.h | 21 + include/linux/kvm_host.h | 26 +- include/linux/maple_tree.h | 7 + include/linux/mlx5/driver.h | 2 +- include/linux/net.h | 1 + include/linux/netdevice.h | 10 +- include/linux/overflow.h | 38 +- include/linux/perf_event.h | 19 +- include/linux/phylink.h | 2 + include/linux/ring_buffer.h | 2 +- include/linux/skmsg.h | 2 +- include/linux/slab.h | 23 - include/linux/soundwire/sdw_intel.h | 2 - include/linux/spi/spi-mem.h | 2 +- include/linux/trace.h | 4 +- include/linux/userfaultfd_k.h | 6 +- include/linux/utsname.h | 1 + include/linux/vfio.h | 1 + include/media/i2c/ir-kbd-i2c.h | 1 + include/media/media-device.h | 15 - include/media/media-entity.h | 169 +- include/media/v4l2-common.h | 3 +- include/media/v4l2-ctrls.h | 28 +- include/media/v4l2-dev.h | 102 + include/media/v4l2-fwnode.h | 4 - include/media/v4l2-subdev.h | 12 +- include/net/genetlink.h | 18 +- include/net/ip.h | 2 +- include/net/ipv6.h | 2 +- include/net/netlink.h | 48 +- include/net/sock.h | 11 +- include/net/sock_reuseport.h | 11 +- include/soc/at91/sama7-ddr.h | 5 +- ...chip_offset_byte.h => acp63_chip_offset_byte.h} | 216 +- include/sound/control.h | 1 + include/sound/hdaudio.h | 27 + include/sound/hdaudio_ext.h | 71 +- include/sound/hdmi-codec.h | 4 + include/sound/sdw.h | 49 + include/sound/simple_card_utils.h | 2 - include/sound/soc-dapm.h | 188 +- include/sound/soc-dpcm.h | 2 - include/sound/sof.h | 10 +- include/sound/sof/dai-amd.h | 1 + include/sound/sof/dai.h | 2 + include/sound/sof/ipc4/header.h | 4 + include/sound/tlv320aic3x.h | 65 - include/trace/events/watchdog.h | 66 + include/uapi/drm/amdgpu_drm.h | 2 + include/uapi/drm/panfrost_drm.h | 38 +- include/uapi/linux/audit.h | 2 +- include/uapi/linux/capability.h | 2 +- include/uapi/linux/cec-funcs.h | 14 + include/uapi/linux/cec.h | 2 + include/uapi/linux/idxd.h | 1 + include/uapi/linux/in.h | 1 + include/uapi/linux/io_uring.h | 2 +- include/uapi/linux/ip.h | 6 +- include/uapi/linux/ipv6.h | 6 +- include/uapi/linux/perf_event.h | 2 +- include/uapi/linux/rkisp1-config.h | 77 +- include/uapi/linux/videodev2.h | 3 +- include/uapi/sound/snd_ar_tokens.h | 27 + include/uapi/sound/sof/tokens.h | 14 + init/Kconfig | 2 +- io_uring/filetable.h | 16 +- io_uring/io-wq.c | 2 +- io_uring/io_uring.c | 47 +- io_uring/io_uring.h | 17 +- io_uring/kbuf.c | 2 + io_uring/msg_ring.c | 3 + io_uring/net.c | 27 +- io_uring/poll.c | 43 +- io_uring/rsrc.c | 7 +- io_uring/rsrc.h | 4 - io_uring/rw.c | 2 - ipc/msg.c | 4 +- kernel/bpf/btf.c | 5 + kernel/bpf/cgroup_iter.c | 2 +- kernel/bpf/dispatcher.c | 22 +- kernel/bpf/memalloc.c | 18 +- kernel/bpf/percpu_freelist.c | 23 +- kernel/bpf/verifier.c | 32 +- kernel/cgroup/cgroup.c | 99 +- kernel/events/core.c | 165 +- kernel/events/hw_breakpoint_test.c | 4 +- kernel/events/ring_buffer.c | 2 +- kernel/gcov/gcc_4_7.c | 18 +- kernel/kprobes.c | 13 +- kernel/power/hibernate.c | 2 +- kernel/rcu/tree.c | 10 +- kernel/rseq.c | 19 +- kernel/sched/core.c | 76 +- kernel/sched/deadline.c | 4 +- kernel/sched/rt.c | 4 +- kernel/sched/sched.h | 32 +- kernel/trace/blktrace.c | 82 +- kernel/trace/bpf_trace.c | 2 + kernel/trace/fprobe.c | 5 +- kernel/trace/ftrace.c | 21 +- kernel/trace/kprobe_event_gen_test.c | 66 +- kernel/trace/rethook.c | 4 +- kernel/trace/ring_buffer.c | 82 +- kernel/trace/synth_event_gen_test.c | 16 +- kernel/trace/trace.c | 12 +- kernel/trace/trace_eprobe.c | 8 +- kernel/trace/trace_events_synth.c | 5 +- kernel/trace/trace_syscalls.c | 2 - kernel/utsname_sysctl.c | 1 + lib/Kconfig.debug | 7 +- lib/Kconfig.kmsan | 1 + lib/Makefile | 1 + lib/kunit/string-stream.c | 4 +- lib/kunit/test.c | 2 +- lib/maple_tree.c | 62 +- lib/nlattr.c | 41 +- lib/overflow_kunit.c | 47 +- lib/test_maple_tree.c | 37926 +------------------ lib/test_rhashtable.c | 58 +- mm/damon/dbgfs.c | 7 + mm/huge_memory.c | 20 +- mm/hugetlb.c | 41 +- mm/hugetlb_vmemmap.c | 1 + mm/kmemleak.c | 61 +- mm/kmsan/instrumentation.c | 1 + mm/kmsan/kmsan.h | 2 + mm/kmsan/shadow.c | 1 + mm/maccess.c | 2 +- mm/madvise.c | 12 +- mm/memory-failure.c | 5 +- mm/memory-tiers.c | 8 +- mm/mempolicy.c | 17 +- mm/memremap.c | 1 + mm/migrate.c | 7 + mm/mmap.c | 27 +- mm/page_alloc.c | 21 +- mm/page_isolation.c | 2 +- mm/shmem.c | 17 + mm/slab_common.c | 24 +- mm/userfaultfd.c | 27 +- mm/zsmalloc.c | 3 + net/atm/mpoa_proc.c | 3 +- net/bluetooth/hci_conn.c | 18 +- net/bluetooth/iso.c | 14 +- net/bluetooth/l2cap_core.c | 86 +- net/bpf/test_run.c | 1 + net/bridge/br_netlink.c | 2 +- net/bridge/br_sysfs_br.c | 2 +- net/bridge/br_vlan.c | 17 +- net/caif/chnl_net.c | 3 - net/can/af_can.c | 3 +- net/can/isotp.c | 71 +- net/can/j1939/main.c | 3 + net/can/j1939/transport.c | 4 +- net/core/dev.c | 4 + net/core/neighbour.c | 2 +- net/core/net_namespace.c | 7 + net/core/skbuff.c | 38 +- net/core/skmsg.c | 15 +- net/core/sock_map.c | 7 +- net/core/sock_reuseport.c | 16 + net/dsa/dsa2.c | 23 +- net/dsa/dsa_priv.h | 1 + net/dsa/master.c | 3 +- net/dsa/port.c | 16 + net/dsa/slave.c | 2 +- net/ethtool/eeprom.c | 2 +- net/ethtool/pse-pd.c | 2 +- net/hsr/hsr_forward.c | 12 +- net/ieee802154/socket.c | 4 +- net/ipv4/Kconfig | 10 + net/ipv4/af_inet.c | 2 + net/ipv4/datagram.c | 2 +- net/ipv4/fib_frontend.c | 4 +- net/ipv4/fib_semantics.c | 2 +- net/ipv4/inet_hashtables.c | 10 +- net/ipv4/netfilter/ipt_rpfilter.c | 1 + net/ipv4/netfilter/nft_fib_ipv4.c | 1 + net/ipv4/nexthop.c | 2 +- net/ipv4/tcp.c | 3 +- net/ipv4/tcp_bpf.c | 12 +- net/ipv4/tcp_input.c | 3 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/tcp_ulp.c | 3 + net/ipv4/udp.c | 3 +- net/ipv4/udp_bpf.c | 4 +- net/ipv6/addrconf.c | 2 + net/ipv6/addrlabel.c | 1 + net/ipv6/datagram.c | 2 +- net/ipv6/ip6_gre.c | 12 +- net/ipv6/ip6_tunnel.c | 11 +- net/ipv6/netfilter/ip6t_rpfilter.c | 1 + net/ipv6/netfilter/nft_fib_ipv6.c | 2 + net/ipv6/route.c | 14 +- net/ipv6/sit.c | 8 +- net/ipv6/udp.c | 3 +- net/kcm/kcmsock.c | 83 +- net/l2tp/l2tp_core.c | 19 +- net/mac80211/main.c | 8 +- net/mac80211/mesh_pathtbl.c | 2 +- net/mac80211/s1g.c | 3 + net/mac80211/tx.c | 5 + net/mac802154/rx.c | 5 +- net/mctp/af_mctp.c | 4 +- net/mctp/route.c | 2 +- net/mptcp/protocol.c | 182 +- net/mptcp/protocol.h | 5 +- net/mptcp/subflow.c | 7 + net/netfilter/ipset/ip_set_hash_gen.h | 30 +- net/netfilter/ipvs/ip_vs_app.c | 10 +- net/netfilter/ipvs/ip_vs_conn.c | 30 +- net/netfilter/nf_nat_core.c | 11 +- net/netfilter/nf_tables_api.c | 16 +- net/netfilter/nfnetlink.c | 1 + net/netfilter/nft_payload.c | 6 +- net/netlink/genetlink.c | 25 + net/openvswitch/datapath.c | 4 +- net/rose/rose_link.c | 3 + net/sched/sch_api.c | 5 +- net/sched/sch_cake.c | 4 + net/sched/sch_fq_codel.c | 25 +- net/sched/sch_red.c | 4 +- net/sched/sch_sfb.c | 3 +- net/sctp/outqueue.c | 13 +- net/smc/af_smc.c | 6 +- net/smc/smc_core.c | 3 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/sysfs.c | 12 +- net/tipc/discover.c | 2 +- net/tipc/netlink_compat.c | 2 +- net/tipc/topsrv.c | 18 +- net/tls/tls_device_fallback.c | 5 +- net/tls/tls_strp.c | 32 +- net/unix/unix_bpf.c | 8 +- net/vmw_vsock/af_vsock.c | 7 +- net/wireless/reg.c | 12 +- net/wireless/scan.c | 4 +- net/wireless/util.c | 6 +- net/x25/x25_dev.c | 2 +- scripts/Makefile.modpost | 2 +- scripts/kconfig/menu.c | 23 +- scripts/min-tool-version.sh | 2 +- scripts/package/mkdebian | 2 +- security/commoncap.c | 6 +- security/selinux/ss/services.c | 5 +- security/selinux/ss/sidtab.c | 4 +- security/selinux/ss/sidtab.h | 2 +- sound/aoa/soundbus/i2sbus/core.c | 7 +- sound/arm/pxa2xx-ac97-lib.c | 4 +- sound/core/control.c | 23 + sound/core/memalloc.c | 15 +- sound/hda/ext/hdac_ext_controller.c | 116 +- sound/hda/ext/hdac_ext_stream.c | 216 +- sound/hda/hdac_controller.c | 4 +- sound/hda/hdac_stream.c | 209 +- sound/hda/hdac_sysfs.c | 4 +- sound/pci/ac97/ac97_codec.c | 33 +- sound/pci/au88x0/au88x0.h | 6 +- sound/pci/au88x0/au88x0_core.c | 2 +- sound/pci/ca0106/ca0106_mixer.c | 2 +- sound/pci/emu10k1/emumixer.c | 2 +- sound/pci/hda/Kconfig | 2 +- sound/pci/hda/cs35l41_hda.c | 1 + sound/pci/hda/hda_cs_dsp_ctl.c | 1 + sound/pci/hda/hda_intel.c | 11 +- sound/pci/hda/patch_ca0132.c | 1 + sound/pci/hda/patch_realtek.c | 16 +- sound/pci/rme9652/hdsp.c | 26 +- sound/pci/rme9652/rme9652.c | 22 +- sound/soc/amd/Kconfig | 4 +- sound/soc/amd/acp-da7219-max98357a.c | 3 +- sound/soc/amd/acp/acp-i2s.c | 16 +- sound/soc/amd/acp/acp-mach-common.c | 62 +- sound/soc/amd/acp/acp-platform.c | 8 +- sound/soc/amd/ps/{acp62.h => acp63.h} | 25 +- sound/soc/amd/ps/pci-ps.c | 141 +- sound/soc/amd/ps/ps-mach.c | 30 +- sound/soc/amd/ps/ps-pdm-dma.c | 188 +- sound/soc/amd/yc/acp6x-mach.c | 7 + sound/soc/atmel/mchp-spdiftx.c | 165 +- sound/soc/codecs/Kconfig | 10 +- sound/soc/codecs/Makefile | 2 + sound/soc/codecs/adau1372.c | 32 +- sound/soc/codecs/adau1373.c | 1 - sound/soc/codecs/adau17x1.c | 1 - sound/soc/codecs/ak4458.c | 13 +- sound/soc/codecs/cs35l36.c | 4 +- sound/soc/codecs/cs42l83-i2c.c | 2 +- sound/soc/codecs/cs42xx8-i2c.c | 28 +- sound/soc/codecs/cs42xx8.c | 22 +- sound/soc/codecs/cs42xx8.h | 3 +- sound/soc/codecs/da7219-aad.c | 46 +- sound/soc/codecs/da7219-aad.h | 1 + sound/soc/codecs/da7219.c | 9 + sound/soc/codecs/es8326.c | 5 +- sound/soc/codecs/hda.c | 12 +- sound/soc/codecs/hdac_hda.c | 6 +- sound/soc/codecs/hdac_hdmi.c | 8 +- sound/soc/codecs/hdmi-codec.c | 30 +- sound/soc/codecs/jz4725b.c | 81 +- sound/soc/codecs/lpass-tx-macro.c | 149 +- sound/soc/codecs/lpass-wsa-macro.c | 6 +- sound/soc/codecs/max98373-sdw.c | 31 +- sound/soc/codecs/max98396.c | 6 +- sound/soc/codecs/max9867.c | 33 +- sound/soc/codecs/nau8315.c | 2 + sound/soc/codecs/nau8825.c | 135 +- sound/soc/codecs/nau8825.h | 23 + sound/soc/codecs/pcm512x.c | 8 +- sound/soc/codecs/rt1308-sdw.c | 72 +- sound/soc/codecs/rt1308-sdw.h | 2 + sound/soc/codecs/rt1316-sdw.c | 71 +- sound/soc/codecs/rt1316-sdw.h | 2 + sound/soc/codecs/rt1318-sdw.c | 884 + sound/soc/codecs/rt1318-sdw.h | 101 + sound/soc/codecs/rt298.c | 7 + sound/soc/codecs/rt5640.c | 8 + sound/soc/codecs/rt5682-sdw.c | 28 +- sound/soc/codecs/rt5682.c | 2 + sound/soc/codecs/rt5682.h | 2 +- sound/soc/codecs/rt5682s.c | 22 + sound/soc/codecs/rt5682s.h | 2 + sound/soc/codecs/rt700.c | 32 +- sound/soc/codecs/rt711-sdca.c | 27 +- sound/soc/codecs/rt711.c | 27 +- sound/soc/codecs/rt715-sdca.c | 25 +- sound/soc/codecs/rt715.c | 73 +- sound/soc/codecs/sdw-mockup.c | 28 +- sound/soc/codecs/simple-mux.c | 9 + sound/soc/codecs/src4xxx-i2c.c | 5 +- sound/soc/codecs/tas2780.c | 5 +- sound/soc/codecs/tlv320aic3x.c | 120 +- sound/soc/codecs/tlv320aic3x.h | 43 + sound/soc/codecs/twl4030.c | 6 +- sound/soc/codecs/wcd-clsh-v2.c | 6 - sound/soc/codecs/wcd938x.c | 4 +- sound/soc/codecs/wm8961.c | 7 + sound/soc/codecs/wm8978.c | 2 +- sound/soc/codecs/wm_adsp.c | 39 +- sound/soc/codecs/wm_adsp.h | 1 + sound/soc/codecs/wsa883x.c | 28 +- sound/soc/fsl/fsl_micfil.c | 447 + sound/soc/fsl/fsl_micfil.h | 6 +- sound/soc/fsl/fsl_rpmsg.c | 6 +- sound/soc/fsl/fsl_sai.c | 23 +- sound/soc/fsl/fsl_sai.h | 1 + sound/soc/fsl/fsl_xcvr.c | 40 + sound/soc/fsl/fsl_xcvr.h | 21 + sound/soc/fsl/imx-audio-rpmsg.c | 3 +- sound/soc/fsl/imx-audmux.c | 3 +- sound/soc/fsl/imx-pcm-rpmsg.c | 10 +- sound/soc/fsl/imx-rpmsg.c | 6 +- sound/soc/generic/audio-graph-card.c | 4 +- .../generic/audio-graph-card2-custom-sample.dtsi | 10 +- sound/soc/generic/audio-graph-card2.c | 6 +- sound/soc/generic/simple-card-utils.c | 35 +- sound/soc/intel/Kconfig | 3 +- sound/soc/intel/avs/Makefile | 4 + sound/soc/intel/avs/apl.c | 28 +- sound/soc/intel/avs/avs.h | 92 +- sound/soc/intel/avs/board_selection.c | 55 + sound/soc/intel/avs/boards/Kconfig | 18 + sound/soc/intel/avs/boards/Makefile | 4 + sound/soc/intel/avs/boards/da7219.c | 41 +- sound/soc/intel/avs/boards/hdaudio.c | 1 + sound/soc/intel/avs/boards/max98373.c | 2 +- sound/soc/intel/avs/boards/max98927.c | 236 + sound/soc/intel/avs/boards/nau8825.c | 35 +- sound/soc/intel/avs/boards/probe.c | 64 + sound/soc/intel/avs/boards/rt274.c | 30 +- sound/soc/intel/avs/boards/rt286.c | 37 +- sound/soc/intel/avs/boards/rt298.c | 61 +- sound/soc/intel/avs/boards/rt5682.c | 31 +- sound/soc/intel/avs/boards/ssm4567.c | 2 +- sound/soc/intel/avs/core.c | 118 +- sound/soc/intel/avs/debugfs.c | 436 + sound/soc/intel/avs/ipc.c | 10 +- sound/soc/intel/avs/loader.c | 28 +- sound/soc/intel/avs/messages.c | 117 +- sound/soc/intel/avs/messages.h | 55 + sound/soc/intel/avs/pcm.c | 422 +- sound/soc/intel/avs/probes.c | 313 + sound/soc/intel/avs/registers.h | 3 +- sound/soc/intel/avs/skl.c | 21 +- sound/soc/intel/avs/topology.c | 10 + sound/soc/intel/avs/utils.c | 22 - sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/Makefile | 3 +- sound/soc/intel/boards/bdw-rt5650.c | 2 +- sound/soc/intel/boards/bdw-rt5677.c | 2 +- sound/soc/intel/boards/bdw_rt286.c | 55 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 3 +- sound/soc/intel/boards/bxt_rt298.c | 2 +- sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/bytcr_wm5102.c | 2 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 3 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 3 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- sound/soc/intel/boards/sof_cirrus_common.c | 2 +- sound/soc/intel/boards/sof_da7219_max98373.c | 4 +- sound/soc/intel/boards/sof_es8336.c | 2 +- sound/soc/intel/boards/sof_nau8825.c | 16 + sound/soc/intel/boards/sof_realtek_common.c | 3 +- sound/soc/intel/boards/sof_rt5682.c | 13 +- sound/soc/intel/boards/sof_sdw.c | 54 +- sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h | 300 + sound/soc/intel/boards/sof_sdw_common.h | 12 +- sound/soc/intel/boards/sof_sdw_rt1308.c | 158 - sound/soc/intel/boards/sof_sdw_rt1316.c | 120 - sound/soc/intel/boards/sof_sdw_rt_amp.c | 359 + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 16 +- sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 5 + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 59 + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 157 + sound/soc/intel/skylake/skl-messages.c | 6 +- sound/soc/intel/skylake/skl-pcm.c | 35 +- sound/soc/intel/skylake/skl-sst-cldma.c | 27 +- sound/soc/intel/skylake/skl-topology.c | 73 +- sound/soc/intel/skylake/skl-topology.h | 1 - sound/soc/intel/skylake/skl.c | 16 +- sound/soc/jz4740/Kconfig | 1 + sound/soc/jz4740/jz4740-i2s.c | 485 +- sound/soc/jz4740/jz4740-i2s.h | 10 - sound/soc/kirkwood/kirkwood-i2s.c | 135 +- sound/soc/kirkwood/kirkwood.h | 2 + sound/soc/mediatek/common/mtk-btcvsd.c | 6 +- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 1 + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 1 + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 1 + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 20 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 7 +- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 4 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 15 +- .../mt8186/mt8186-mt6366-da7219-max98357.c | 7 +- .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 105 +- .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 1 + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 1 + sound/soc/meson/axg-pdm.c | 2 +- sound/soc/pxa/mmp-pcm.c | 2 +- sound/soc/qcom/Kconfig | 16 +- sound/soc/qcom/common.c | 2 - sound/soc/qcom/common.h | 23 - sound/soc/qcom/lpass-sc7180.c | 23 + sound/soc/qcom/lpass-sc7280.c | 19 + sound/soc/qcom/qdsp6/audioreach.c | 310 +- sound/soc/qcom/qdsp6/audioreach.h | 47 +- sound/soc/qcom/qdsp6/q6apm.c | 84 +- sound/soc/qcom/qdsp6/q6apm.h | 6 +- sound/soc/qcom/qdsp6/q6prm.c | 2 +- sound/soc/qcom/qdsp6/topology.c | 243 +- sound/soc/rockchip/rk3399_gru_sound.c | 3 +- sound/soc/rockchip/rockchip_i2s_tdm.c | 19 +- sound/soc/rockchip/rockchip_pdm.c | 1 + sound/soc/sh/Kconfig | 2 +- sound/soc/sh/rcar/adg.c | 4 +- sound/soc/sh/rcar/core.c | 7 +- sound/soc/soc-core.c | 8 +- sound/soc/soc-dai.c | 11 +- sound/soc/soc-dapm.c | 189 +- sound/soc/soc-pcm.c | 32 +- sound/soc/sof/Kconfig | 20 +- sound/soc/sof/Makefile | 6 + sound/soc/sof/amd/Kconfig | 1 + sound/soc/sof/amd/acp-common.c | 109 + sound/soc/sof/amd/acp-ipc.c | 43 +- sound/soc/sof/amd/acp-loader.c | 6 +- sound/soc/sof/amd/acp.c | 12 +- sound/soc/sof/amd/acp.h | 18 + sound/soc/sof/amd/rembrandt.c | 16 + sound/soc/sof/amd/renoir.c | 16 + sound/soc/sof/intel/Kconfig | 2 +- sound/soc/sof/intel/Makefile | 2 +- sound/soc/sof/intel/apl.c | 4 + sound/soc/sof/intel/bdw.c | 6 +- sound/soc/sof/intel/byt.c | 12 +- sound/soc/sof/intel/cnl.c | 35 +- sound/soc/sof/intel/hda-bus.c | 23 +- sound/soc/sof/intel/hda-codec.c | 252 +- sound/soc/sof/intel/hda-common-ops.c | 6 +- sound/soc/sof/intel/hda-ctrl.c | 102 +- sound/soc/sof/intel/hda-dai.c | 95 +- sound/soc/sof/intel/hda-dsp.c | 83 +- sound/soc/sof/intel/hda-ipc.c | 27 +- sound/soc/sof/intel/hda-loader-skl.c | 37 +- sound/soc/sof/intel/hda-loader.c | 98 +- sound/soc/sof/intel/hda-mlink.c | 89 + sound/soc/sof/intel/hda-pcm.c | 3 +- sound/soc/sof/intel/hda-stream.c | 93 +- sound/soc/sof/intel/hda.c | 139 +- sound/soc/sof/intel/hda.h | 113 +- sound/soc/sof/intel/icl.c | 6 + sound/soc/sof/intel/mtl.c | 161 +- sound/soc/sof/intel/mtl.h | 2 + sound/soc/sof/intel/pci-apl.c | 6 + sound/soc/sof/intel/pci-cnl.c | 9 + sound/soc/sof/intel/pci-icl.c | 6 + sound/soc/sof/intel/pci-mtl.c | 3 + sound/soc/sof/intel/pci-tgl.c | 24 + sound/soc/sof/intel/pci-tng.c | 6 +- sound/soc/sof/intel/shim.h | 3 + sound/soc/sof/intel/tgl.c | 15 + sound/soc/sof/ipc.c | 14 + sound/soc/sof/ipc3-loader.c | 26 +- sound/soc/sof/ipc3-pcm.c | 2 + sound/soc/sof/ipc3-topology.c | 36 +- sound/soc/sof/ipc3.c | 4 +- sound/soc/sof/ipc4-loader.c | 244 +- sound/soc/sof/ipc4-pcm.c | 4 +- sound/soc/sof/ipc4-priv.h | 67 +- sound/soc/sof/ipc4-topology.c | 214 +- sound/soc/sof/ipc4.c | 45 +- sound/soc/sof/loader.c | 25 +- sound/soc/sof/mediatek/mt8186/mt8186.c | 7 + sound/soc/sof/ops.h | 51 +- sound/soc/sof/sof-audio.c | 5 + sound/soc/sof/sof-audio.h | 43 + sound/soc/sof/sof-client-probes-ipc3.c | 236 + sound/soc/sof/sof-client-probes-ipc4.c | 281 + sound/soc/sof/sof-client-probes.c | 278 +- sound/soc/sof/sof-client-probes.h | 34 + sound/soc/sof/sof-client.c | 34 + sound/soc/sof/sof-client.h | 6 + sound/soc/sof/sof-pci-dev.c | 26 + sound/soc/sof/sof-priv.h | 36 +- sound/soc/sof/topology.c | 187 +- sound/soc/sunxi/sun50i-dmic.c | 5 +- sound/soc/tegra/tegra210_mbdrc.c | 4 +- sound/soc/tegra/tegra210_mbdrc.h | 2 +- sound/soc/ti/davinci-mcasp.c | 7 +- sound/soc/uniphier/aio-core.c | 11 +- sound/synth/emux/emux.c | 7 +- sound/usb/card.c | 29 +- sound/usb/endpoint.c | 3 +- sound/usb/implicit.c | 2 + sound/usb/midi.c | 4 +- sound/usb/mixer.c | 2 +- sound/usb/quirks-table.h | 4 + sound/usb/quirks.c | 47 +- sound/usb/usbaudio.h | 3 + tools/arch/arm64/include/asm/cputype.h | 4 + tools/arch/x86/include/asm/cpufeatures.h | 2 +- tools/arch/x86/include/asm/msr-index.h | 8 +- tools/arch/x86/lib/memcpy_64.S | 2 +- tools/bpf/bpftool/common.c | 3 + tools/build/Makefile.feature | 1 + tools/build/feature/Makefile | 4 + .../feature/test-libbpf-bpf_program__set_insns.c | 8 + tools/iio/iio_generic_buffer.c | 4 +- tools/iio/iio_utils.c | 4 + tools/include/nolibc/string.h | 17 +- tools/include/uapi/linux/in.h | 23 +- tools/include/uapi/linux/kvm.h | 1 + tools/include/uapi/linux/perf_event.h | 27 +- tools/include/uapi/linux/stat.h | 4 +- tools/include/uapi/linux/stddef.h | 47 + tools/include/uapi/sound/asound.h | 16 - tools/kvm/kvm_stat/kvm_stat | 98 +- tools/perf/.gitignore | 1 + .../{perf-arm-coresight.txt => arm-coresight.txt} | 0 tools/perf/Makefile.config | 5 + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 16 +- tools/perf/builtin-record.c | 41 +- tools/perf/check-headers.sh | 2 +- .../arch/arm64/hisilicon/hip08/metrics.json | 6 +- .../arch/powerpc/power10/nest_metrics.json | 72 +- .../arch/s390/cf_z16/{pai.json => pai_crypto.json} | 0 tools/perf/tests/shell/test_brstack.sh | 5 +- tools/perf/tests/shell/test_intel_pt.sh | 6 + tools/perf/trace/beauty/statx.c | 1 + tools/perf/util/auxtrace.c | 10 +- tools/perf/util/bpf-event.c | 5 + tools/perf/util/bpf-loader.c | 18 + tools/perf/util/include/linux/linkage.h | 13 + tools/perf/util/parse-branch-options.c | 4 +- tools/perf/util/stat-display.c | 6 +- tools/power/pm-graph/README | 12 +- tools/power/pm-graph/sleepgraph.8 | 3 + tools/power/pm-graph/sleepgraph.py | 225 +- tools/testing/cxl/test/cxl.c | 301 +- tools/testing/radix-tree/.gitignore | 1 + tools/testing/radix-tree/Makefile | 19 +- tools/testing/radix-tree/generated/autoconf.h | 2 +- tools/testing/radix-tree/linux.c | 4 + tools/testing/radix-tree/maple.c | 35770 +++++++++++++++++ tools/testing/selftests/Makefile | 1 + tools/testing/selftests/bpf/prog_tests/btf.c | 13 + tools/testing/selftests/bpf/prog_tests/varlen.c | 7 + tools/testing/selftests/bpf/progs/test_varlen.c | 5 + .../selftests/bpf/progs/user_ringbuf_success.c | 4 +- tools/testing/selftests/bpf/test_progs.c | 2 +- tools/testing/selftests/bpf/test_verifier.c | 2 +- .../testing/selftests/bpf/verifier/ref_tracking.c | 36 + .../testing/selftests/drivers/net/bonding/Makefile | 4 +- .../drivers/net/bonding/dev_addr_lists.sh | 2 +- .../drivers/net/bonding/net_forwarding_lib.sh | 1 + .../drivers/net/dsa/test_bridge_fdb_stress.sh | 4 +- tools/testing/selftests/drivers/net/team/Makefile | 4 + .../selftests/drivers/net/team/dev_addr_lists.sh | 6 +- .../testing/selftests/drivers/net/team/lag_lib.sh | 1 + .../drivers/net/team/net_forwarding_lib.sh | 1 + .../ftrace/test.d/dynevent/test_duplicates.tc | 2 +- .../inter-event/trigger-synthetic-eprobe.tc | 2 +- tools/testing/selftests/futex/functional/Makefile | 6 +- tools/testing/selftests/intel_pstate/Makefile | 6 +- tools/testing/selftests/kexec/Makefile | 6 +- tools/testing/selftests/kvm/aarch64/vgic_init.c | 4 +- .../kvm/memslot_modification_stress_test.c | 2 +- .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 142 +- tools/testing/selftests/landlock/Makefile | 7 +- tools/testing/selftests/lib.mk | 4 +- .../selftests/memory-hotplug/mem-on-off-test.sh | 1 - tools/testing/selftests/net/Makefile | 1 + .../testing/selftests/net/io_uring_zerocopy_tx.sh | 2 +- tools/testing/selftests/net/openvswitch/Makefile | 13 + .../selftests/net/openvswitch/openvswitch.sh | 218 + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 351 + .../selftests/net/test_ingress_egress_chaining.sh | 79 + tools/testing/selftests/net/udpgro.sh | 4 +- tools/testing/selftests/net/udpgro_bench.sh | 2 +- tools/testing/selftests/net/udpgro_frglist.sh | 2 +- tools/testing/selftests/netfilter/rpath.sh | 14 +- .../selftests/perf_events/sigtrap_threads.c | 35 +- tools/testing/selftests/pidfd/Makefile | 2 +- tools/testing/selftests/pidfd/pidfd_test.c | 4 +- tools/testing/selftests/pidfd/pidfd_wait.c | 12 +- tools/verification/dot2/dot2c.py | 2 +- virt/kvm/kvm_main.c | 27 +- virt/kvm/pfncache.c | 62 +- 2062 files changed, 67404 insertions(+), 52353 deletions(-) delete mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml rename Documentation/devicetree/bindings/sound/{name-prefix.yaml => dai-common.yaml} (81%) create mode 100644 Documentation/devicetree/bindings/sound/dmic-codec.yaml delete mode 100644 Documentation/devicetree/bindings/sound/dmic.txt delete mode 100644 Documentation/devicetree/bindings/sound/max98357a.txt delete mode 100644 Documentation/devicetree/bindings/sound/max98504.txt create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98357a.yaml create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98504.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm-lpass-dais.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6prm.yaml create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8961.yaml mode change 100755 => 100644 arch/arm64/boot/dts/freescale/imx93-pinfunc.h create mode 100644 arch/s390/configs/btf.config create mode 100644 arch/s390/configs/kasan.config create mode 100644 arch/x86/kvm/.gitignore create mode 100644 arch/x86/kvm/kvm-asm-offsets.c create mode 100644 drivers/firmware/efi/libstub/smbios.c create mode 100644 drivers/gpu/drm/i915/display/intel_dkl_phy.c create mode 100644 drivers/gpu/drm/i915/display/intel_dkl_phy.h create mode 100644 drivers/mmc/host/sdhci-cqhci.h delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.c delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.h rename drivers/tty/serial/8250/{8250_gsc.c => 8250_parisc.c} (100%) create mode 100644 include/linux/kmsan_string.h rename include/sound/{acp62_chip_offset_byte.h => acp63_chip_offset_byte.h} (65%) create mode 100644 include/sound/sdw.h delete mode 100644 include/sound/tlv320aic3x.h create mode 100644 include/trace/events/watchdog.h rename sound/soc/amd/ps/{acp62.h => acp63.h} (79%) create mode 100644 sound/soc/codecs/rt1318-sdw.c create mode 100644 sound/soc/codecs/rt1318-sdw.h create mode 100644 sound/soc/intel/avs/boards/max98927.c create mode 100644 sound/soc/intel/avs/boards/probe.c create mode 100644 sound/soc/intel/avs/debugfs.c create mode 100644 sound/soc/intel/avs/probes.c create mode 100644 sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h delete mode 100644 sound/soc/intel/boards/sof_sdw_rt1308.c delete mode 100644 sound/soc/intel/boards/sof_sdw_rt1316.c create mode 100644 sound/soc/intel/boards/sof_sdw_rt_amp.c delete mode 100644 sound/soc/jz4740/jz4740-i2s.h create mode 100644 sound/soc/sof/intel/hda-mlink.c create mode 100644 sound/soc/sof/sof-client-probes-ipc3.c create mode 100644 sound/soc/sof/sof-client-probes-ipc4.c create mode 100644 tools/build/feature/test-libbpf-bpf_program__set_insns.c create mode 100644 tools/include/uapi/linux/stddef.h rename tools/perf/Documentation/{perf-arm-coresight.txt => arm-coresight.txt} (100%) rename tools/perf/pmu-events/arch/s390/cf_z16/{pai.json => pai_crypto.json} (100%) create mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh create mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh create mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh create mode 100644 tools/testing/selftests/net/openvswitch/Makefile create mode 100755 tools/testing/selftests/net/openvswitch/openvswitch.sh create mode 100644 tools/testing/selftests/net/openvswitch/ovs-dpctl.py create mode 100644 tools/testing/selftests/net/test_ingress_egress_chaining.sh

2 1

[PATCH 0/3] ALSA: hda/hdmi: i915 keepalive fixes
by Kai Vehmanen 09 Dec '22

09 Dec '22

A series with multiple fixes to i915 keepalive (KAE) functionality. First patch fixes issue that is hit on some A750/770 cards: https://gitlab.freedesktop.org/drm/intel/-/issues/7353 The two other improve behaviour especially with certain USB-C docks. Kai Vehmanen (3): ALSA: hda/hdmi: fix i915 silent stream programming flow ALSA: hda/hdmi: set default audio parameters for KAE silent-stream ALSA: hda/hdmi: fix stream-id config keep-alive for rt suspend include/sound/hda_codec.h | 1 + sound/pci/hda/hda_codec.c | 3 +- sound/pci/hda/patch_hdmi.c | 114 ++++++++++++++++++++++++++++++++++++- 3 files changed, 114 insertions(+), 4 deletions(-) base-commit: 81a2da5a10a6eaa6ae16108eed4e74651cc296bf -- 2.38.1

2 5

Build Fails with AUTOMAKE v1.16.5 on Ubuntu - Solution Provided
by GitHub issues - edited 09 Dec '22

09 Dec '22

alsa-project/alsa-utils issue #182 was edited from frkli1965: I found that the prescribed compilation method in the 'INSTALL' file:- aclocal gettextize autoheader automake --foreign --copy --add-missing autoconf ./configure make did not work on Ubuntu with Linux kernel v6.0.9 using 'automake 'and 'aclocal' v1.16.5! The following errors were encountered:- Updating EXTRA_DIST in m4/Makefile.am (backup is in m4/Makefile.am~) Updating configure.ac (backup is in configure.ac~) Adding an entry to ChangeLog (backup is in ChangeLog~) Please run 'aclocal -I m4' to regenerate the aclocal.m4 file. You need aclocal from GNU automake 1.9 (or newer) to do this. Then run 'autoconf' to regenerate the configure file. You might also want to copy the convenience header file gettext.h from the /usr/share/gettext directory into your package. It is a wrapper around <libintl.h> that implements the configure --disable-nls option. Press Return to acknowledge the previous two paragraphs. configure.ac:466: error: `po/Makefile.in' is already registered with AC_CONFIG_FILES. ./lib/autoconf/status.m4:289: AC_CONFIG_FILES is expanded from... configure.ac:466: the top level autom4te: error: /usr/bin/m4 failed with exit status: 1 autoheader: error: '/usr/bin/autom4te' failed with exit status: 1 configure.ac:466: error: `po/Makefile.in' is already registered with AC_CONFIG_FILES. ./lib/autoconf/status.m4:289: AC_CONFIG_FILES is expanded from... configure.ac:466: the top level autom4te: error: /usr/bin/m4 failed with exit status: 1 automake: error: autoconf failed with exit status: 1 configure.ac:466: error: `po/Makefile.in' is already registered with AC_CONFIG_FILES. ./lib/autoconf/status.m4:289: AC_CONFIG_FILES is expanded from... configure.ac:466: the top level autom4te: error: /usr/bin/m4 failed with exit status: 1 ****************************************** THE FIX ****************************************** git clone https://github.com/alsa-project/alsa-utils.git cd alsa-utils wget https://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.gu… wget https://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub aclocal --force -I m4 autoreconf -fiv gettextize autoheader automake --foreign --copy --add-missing ./configure --disable-alsatest --disable-alsaconf --disable-bat --disable-xmlto --with-curses=ncursesw make ********************************************************************************************* Despite lots of warnings as follows:- libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac, configure.ac:22: warning: The macro `AM_PROG_LIBTOOL' is obsolete. configure.ac:26: warning: The macro `AC_ERROR' is obsolete. configure.ac:223: warning: The macro `AC_HEADER_STDC' is obsolete. configure.ac:313: warning: The macro `AC_TRY_LINK' is obsolete. configure.ac:397: warning: The macro `AC_HEADER_TIME' is obsolete. configure.ac:466: warning: AC_OUTPUT should be used without arguments. alsactl/Makefile.am:69: warning: '%'-style pattern rules are a GNU make extension gettextize: *** po/Makefile.in.in exists: use option -f if you really want to delete it. and ones regarding the .po files e.g. fr.po:828: warning: internationalised messages should not contain the '\r' escape sequence eu.po:849: warning: internationalised messages should not contain the '\r' escape sequence etc... The build and installation succeeded nevertheless. One other issue was that 'alsamixer' refused to run unless a system link was created for 'libasound_module_ctl_pipewire.so' as follows:- sudo ln -s /usr/local/lib/x86_64-linux-gnu/alsa-lib/libasound_module_ctl_pipewire.so /usr/local/lib/alsa-lib/libasound_module_ctl_pipewire.so which is most likely an Ubuntu (Debian) specific problem. The following toolchain was utilised:- aclocal (GNU automake) 1.16.5 autoreconf (GNU Autoconf) 2.71 gettextize (GNU gettext-tools) 0.21 autoheader (GNU Autoconf) 2.71 automake (GNU automake) 1.16.5 gcc version 12.1.0 (Ubuntu 12.1.0-2ubuntu1~22.04) You're welcome!!! Issue URL : https://github.com/alsa-project/alsa-utils/issues/182 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

Build Fails with AUTOMAKE v1.16.5 on Ubuntu - Solution Provided
by GitHub issues - edited 09 Dec '22

09 Dec '22

alsa-project/alsa-utils issue #182 was edited from frkli1965: I found that the prescribed compilation method in the 'INSTALL' file:- aclocal gettextize autoheader automake --foreign --copy --add-missing autoconf ./configure make did not work on Ubuntu with Linux kernel v6.0.9 using 'automake 'and 'aclocal' v1.16.5! The following errors were encountered:- Updating EXTRA_DIST in m4/Makefile.am (backup is in m4/Makefile.am~) Updating configure.ac (backup is in configure.ac~) Adding an entry to ChangeLog (backup is in ChangeLog~) Please run 'aclocal -I m4' to regenerate the aclocal.m4 file. You need aclocal from GNU automake 1.9 (or newer) to do this. Then run 'autoconf' to regenerate the configure file. You might also want to copy the convenience header file gettext.h from the /usr/share/gettext directory into your package. It is a wrapper around <libintl.h> that implements the configure --disable-nls option. Press Return to acknowledge the previous two paragraphs. configure.ac:466: error: `po/Makefile.in' is already registered with AC_CONFIG_FILES. ./lib/autoconf/status.m4:289: AC_CONFIG_FILES is expanded from... configure.ac:466: the top level autom4te: error: /usr/bin/m4 failed with exit status: 1 autoheader: error: '/usr/bin/autom4te' failed with exit status: 1 configure.ac:466: error: `po/Makefile.in' is already registered with AC_CONFIG_FILES. ./lib/autoconf/status.m4:289: AC_CONFIG_FILES is expanded from... configure.ac:466: the top level autom4te: error: /usr/bin/m4 failed with exit status: 1 automake: error: autoconf failed with exit status: 1 configure.ac:466: error: `po/Makefile.in' is already registered with AC_CONFIG_FILES. ./lib/autoconf/status.m4:289: AC_CONFIG_FILES is expanded from... configure.ac:466: the top level autom4te: error: /usr/bin/m4 failed with exit status: 1 ****************************************** THE FIX ****************************************** git clone https://github.com/alsa-project/alsa-utils.git cd alsa-utils wget https://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.gu… wget https://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub aclocal --force -I m4 autoreconf -fiv gettextize autoheader automake --foreign --copy --add-missing ./configure --disable-alsatest --disable-alsaconf --disable-bat --disable-xmlto --with-curses=ncursesw make ********************************************************************************************* Despite lots of warnings as follows:- libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac, configure.ac:22: warning: The macro `AM_PROG_LIBTOOL' is obsolete. configure.ac:26: warning: The macro `AC_ERROR' is obsolete. configure.ac:223: warning: The macro `AC_HEADER_STDC' is obsolete. configure.ac:313: warning: The macro `AC_TRY_LINK' is obsolete. configure.ac:397: warning: The macro `AC_HEADER_TIME' is obsolete. configure.ac:466: warning: AC_OUTPUT should be used without arguments. alsactl/Makefile.am:69: warning: '%'-style pattern rules are a GNU make extension gettextize: *** po/Makefile.in.in exists: use option -f if you really want to delete it. and ones regarding the .po files e.g. fr.po:828: warning: internationalised messages should not contain the '\r' escape sequence eu.po:849: warning: internationalised messages should not contain the '\r' escape sequence etc... The build and installation succeeded nevertheless. One other issue was that 'alsamixer' refused to run unless a system link was created for 'libasound_module_ctl_pipewire.so' as follows:- sudo ln -s /usr/local/lib/x86_64-linux-gnu/alsa-lib/libasound_module_ctl_pipewire.so /usr/local/lib/alsa-lib/libasound_module_ctl_pipewire.so which is most likely an Ubuntu (Debian) specific problem. The following toolchain was utilised:- aclocal (GNU automake) 1.16.5 autoreconf (GNU Autoconf) 2.71 gettextize (GNU gettext-tools) 0.21 autoheader (GNU Autoconf) 2.71 automake (GNU automake) 1.16.5 gcc version 12.1.0 (Ubuntu 12.1.0-2ubuntu1~22.04) You're welcome!!! Issue URL : https://github.com/alsa-project/alsa-utils/issues/182 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

Build Fails with AUTOMAKE v1.16.5 on Ubuntu - Solution Provided
by GitHub issues - opened 09 Dec '22

09 Dec '22

alsa-project/alsa-utils issue #182 was opened from frkli1965: I found that the prescribed compilation method in the 'INSTALL' file did not work on Ubuntu with Linux kernel v6.0.9 using 'automake 'and 'aclocal' v1.16.5! The following errors were encountered:- Updating EXTRA_DIST in m4/Makefile.am (backup is in m4/Makefile.am~) Updating configure.ac (backup is in configure.ac~) Adding an entry to ChangeLog (backup is in ChangeLog~) Please run 'aclocal -I m4' to regenerate the aclocal.m4 file. You need aclocal from GNU automake 1.9 (or newer) to do this. Then run 'autoconf' to regenerate the configure file. You might also want to copy the convenience header file gettext.h from the /usr/share/gettext directory into your package. It is a wrapper around <libintl.h> that implements the configure --disable-nls option. Press Return to acknowledge the previous two paragraphs. configure.ac:466: error: `po/Makefile.in' is already registered with AC_CONFIG_FILES. ./lib/autoconf/status.m4:289: AC_CONFIG_FILES is expanded from... configure.ac:466: the top level autom4te: error: /usr/bin/m4 failed with exit status: 1 autoheader: error: '/usr/bin/autom4te' failed with exit status: 1 configure.ac:466: error: `po/Makefile.in' is already registered with AC_CONFIG_FILES. ./lib/autoconf/status.m4:289: AC_CONFIG_FILES is expanded from... configure.ac:466: the top level autom4te: error: /usr/bin/m4 failed with exit status: 1 automake: error: autoconf failed with exit status: 1 configure.ac:466: error: `po/Makefile.in' is already registered with AC_CONFIG_FILES. ./lib/autoconf/status.m4:289: AC_CONFIG_FILES is expanded from... configure.ac:466: the top level autom4te: error: /usr/bin/m4 failed with exit status: 1 ****************************************** THE FIX ****************************************** git clone https://github.com/alsa-project/alsa-utils.git cd alsa-utils wget https://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.gu… wget https://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub aclocal --force -I m4 autoreconf -fiv gettextize autoheader automake --foreign --copy --add-missing ./configure --disable-alsatest --disable-alsaconf --disable-bat --disable-xmlto --with-curses=ncursesw make ********************************************************************************************* Despite lots of warnings as follows:- libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac, configure.ac:22: warning: The macro `AM_PROG_LIBTOOL' is obsolete. configure.ac:26: warning: The macro `AC_ERROR' is obsolete. configure.ac:223: warning: The macro `AC_HEADER_STDC' is obsolete. configure.ac:313: warning: The macro `AC_TRY_LINK' is obsolete. configure.ac:397: warning: The macro `AC_HEADER_TIME' is obsolete. configure.ac:466: warning: AC_OUTPUT should be used without arguments. alsactl/Makefile.am:69: warning: '%'-style pattern rules are a GNU make extension gettextize: *** po/Makefile.in.in exists: use option -f if you really want to delete it. and ones regarding the .po files e.g. fr.po:828: warning: internationalised messages should not contain the '\r' escape sequence eu.po:849: warning: internationalised messages should not contain the '\r' escape sequence etc... The build and installation succeeded nevertheless. One other issue was that 'alsamixer' refused to run unless a system link was created for 'libasound_module_ctl_pipewire.so' as follows:- sudo ln -s /usr/local/lib/x86_64-linux-gnu/alsa-lib/libasound_module_ctl_pipewire.so /usr/local/lib/alsa-lib/libasound_module_ctl_pipewire.so which is most likely an Ubuntu (Debian) specific problem. The following toolchain was utilised:- aclocal (GNU automake) 1.16.5 autoreconf (GNU Autoconf) 2.71 gettextize (GNU gettext-tools) 0.21 autoheader (GNU Autoconf) 2.71 automake (GNU automake) 1.16.5 gcc version 12.1.0 (Ubuntu 12.1.0-2ubuntu1~22.04) You're welcome!!! Issue URL : https://github.com/alsa-project/alsa-utils/issues/182 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

What device should I have
by GitHub issues - opened 08 Dec '22

08 Dec '22

alsa-project/tinycompress issue #21 was opened from Duty-rok: Hello, I am tesing your library now. lsmod says that kernel has snd_compress module loaded. I have file.mp3 and try to execute cplay next way: $ cplay file.mp3 Next logs were written to output: Unable to open Compress device 0:0 ERR: cannot open device '/dev/snd/comprC0D0': No such file or directory I looked through the contents of the /dev/snd/ folder and found nothing that had prefix 'compr'. So, what device should I have to test it? Issue URL : https://github.com/alsa-project/tinycompress/issues/21 Repository URL: https://github.com/alsa-project/tinycompress

1 0

[PATCH] ASoC: dt-bindings: fsl-sai: Reinstate i.MX93 SAI compatible string
by Marek Vasut 08 Dec '22

08 Dec '22

The ASoC: dt-bindings: fsl-sai: Fix mx6ul and mx7d compatible strings dropped i.MX93 SAI compatible string, reinstate it. Fixes: 81b6c043e7ba ("ASoC: dt-bindings: fsl-sai: Fix mx6ul and mx7d compatible strings") Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt(a)linaro.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Rob Herring <robh+dt(a)kernel.org> Cc: Shengjiu Wang <shengjiu.wang(a)nxp.com> Cc: devicetree(a)vger.kernel.org To: alsa-devel(a)alsa-project.org --- Documentation/devicetree/bindings/sound/fsl,sai.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/fsl,sai.yaml b/Documentation/devicetree/bindings/sound/fsl,sai.yaml index 022da1f4583d6..c59e4edd7570c 100644 --- a/Documentation/devicetree/bindings/sound/fsl,sai.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,sai.yaml @@ -38,6 +38,7 @@ properties: - fsl,imx8mq-sai - fsl,imx8qm-sai - fsl,imx8ulp-sai + - fsl,imx93-sai - fsl,vf610-sai reg: -- 2.35.1

2 1

topology: propagate nhlt plugin error to main program
by GitHub pull_request - opened 08 Dec '22

08 Dec '22

alsa-project/alsa-utils pull request #181 was opened from aiChaoSONG: Let's propagate nhlt plugin error to main program, so that we don't generate a wrong nhlt blob silently. Signed-off-by: Chao Song <chao.song(a)linux.intel.com> Request URL : https://github.com/alsa-project/alsa-utils/pull/181 Patch URL : https://github.com/alsa-project/alsa-utils/pull/181.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH] ASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rockchip_pdm_runtime_resume()
by Wang Jingjin 08 Dec '22

08 Dec '22

The clk_disable_unprepare() should be called in the error handling of rockchip_pdm_runtime_resume(). Fixes: fc05a5b22253 ("ASoC: rockchip: add support for pdm controller") Signed-off-by: Wang Jingjin <wangjingjin1(a)huawei.com> --- sound/soc/rockchip/rockchip_pdm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index a7549f827235..5b1e47bdc376 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -431,6 +431,7 @@ static int rockchip_pdm_runtime_resume(struct device *dev) ret = clk_prepare_enable(pdm->hclk); if (ret) { + clk_disable_unprepare(pdm->clk); dev_err(pdm->dev, "hclock enable failed %d\n", ret); return ret; } -- 2.25.1

3 2

[PATCH 1/3] ASoC: dt-bindings: fsl-sai: Fix mx6ul and mx7d compatible strings
by Marek Vasut 08 Dec '22

08 Dec '22

Describe existing used combinations of compatible strings on MX6UL and MX7D, which are backward compatible with MX6SX. Add the missing imx7d-sai compatible string which is used on i.MX7 . Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt(a)linaro.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: Rob Herring <robh+dt(a)kernel.org> Cc: Shengjiu Wang <shengjiu.wang(a)gmail.com> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> Cc: alsa-devel(a)alsa-project.org To: devicetree(a)vger.kernel.org --- .../devicetree/bindings/sound/fsl,sai.yaml | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/fsl,sai.yaml b/Documentation/devicetree/bindings/sound/fsl,sai.yaml index 11aab891288d2..05bad828cc353 100644 --- a/Documentation/devicetree/bindings/sound/fsl,sai.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,sai.yaml @@ -18,15 +18,12 @@ description: | properties: compatible: oneOf: - - enum: - - fsl,vf610-sai - - fsl,imx6sx-sai - - fsl,imx6ul-sai - - fsl,imx7ulp-sai - - fsl,imx8mq-sai - - fsl,imx8qm-sai - - fsl,imx8ulp-sai - - fsl,imx93-sai + - items: + - enum: + - fsl,imx6ul-sai + - fsl,imx7d-sai + - const: fsl,imx6sx-sai + - items: - enum: - fsl,imx8mm-sai @@ -34,6 +31,15 @@ properties: - fsl,imx8mp-sai - const: fsl,imx8mq-sai + - items: + - enum: + - fsl,imx6sx-sai + - fsl,imx7ulp-sai + - fsl,imx8mq-sai + - fsl,imx8qm-sai + - fsl,imx8ulp-sai + - fsl,vf610-sai + reg: maxItems: 1 -- 2.35.1

3 8

ucm2: alc4080 - add support for MSI PRO Z790-A WIFI
by GitHub pull_request - opened 08 Dec '22

08 Dec '22

alsa-project/alsa-ucm-conf pull request #248 was opened from adrianrudnik: Frontpanel did not work, with this change, back and frontpanel work correctly. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/248 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/248.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ASoC: soc-pcm.c: Clear DAIs parameters after stream_active is updated
by Chancel Liu 07 Dec '22

07 Dec '22

DAIs parameters should be cleared if there's no active stream. Before, we implemented it in soc_pcm_hw_free() by detecting stream_active. If the running stream is the last active stream, we're going to clear parameters. However it will cause DAIs parameters never be cleared if there're more than one stream. For example, we have stream1 and stream2 about to stop. stream2 executes soc_pcm_hw_free() before stream1 executes soc_pcm_close(). At the moment, stream2 should clear DAIs parameters. Since stream_active is not yet updated by stream1 in soc_pcm_close(), stream2 will not clear DAIs parameters. In result both stream1 and stream2 don't clear the parameters. This patch moves DAIs parameters cleanup after stream_active is updated. Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> --- sound/soc/soc-pcm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index fb87d6d23408..85a7f0a3eb70 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -709,8 +709,17 @@ static int soc_pcm_clean(struct snd_soc_pcm_runtime *rtd, snd_soc_dpcm_mutex_assert_held(rtd); - if (!rollback) + if (!rollback) { snd_soc_runtime_deactivate(rtd, substream->stream); + /* clear the corresponding DAIs parameters when going to be inactive */ + for_each_rtd_dais(rtd, i, dai) { + if (snd_soc_dai_active(dai) == 0) + soc_pcm_set_dai_params(dai, NULL); + + if (snd_soc_dai_stream_active(dai, substream->stream) == 0) + snd_soc_dai_digital_mute(dai, 1, substream->stream); + } + } for_each_rtd_dais(rtd, i, dai) snd_soc_dai_shutdown(dai, substream, rollback); @@ -945,15 +954,6 @@ static int soc_pcm_hw_clean(struct snd_soc_pcm_runtime *rtd, snd_soc_dpcm_mutex_assert_held(rtd); - /* clear the corresponding DAIs parameters when going to be inactive */ - for_each_rtd_dais(rtd, i, dai) { - if (snd_soc_dai_active(dai) == 1) - soc_pcm_set_dai_params(dai, NULL); - - if (snd_soc_dai_stream_active(dai, substream->stream) == 1) - snd_soc_dai_digital_mute(dai, 1, substream->stream); - } - /* run the stream event */ snd_soc_dapm_stream_stop(rtd, substream->stream); -- 2.25.1

2 1

[PATCH] ASoC: codecs: wcd-clsh: Remove the unused function
by Jiapeng Chong 07 Dec '22

07 Dec '22

The function wcd_clsh_set_buck_mode() is defined in the wcd-clsh-v2.c file, but not called elsewhere, so remove this unused function. sound/soc/codecs/wcd-clsh-v2.c:133:20: warning: unused function 'wcd_clsh_enable_status'. Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3348 Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- sound/soc/codecs/wcd-clsh-v2.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/codecs/wcd-clsh-v2.c b/sound/soc/codecs/wcd-clsh-v2.c index 4c7ebc7fb400..a75db27e5205 100644 --- a/sound/soc/codecs/wcd-clsh-v2.c +++ b/sound/soc/codecs/wcd-clsh-v2.c @@ -130,12 +130,6 @@ static inline void wcd_enable_clsh_block(struct wcd_clsh_ctrl *ctrl, ctrl->clsh_users = 0; } -static inline bool wcd_clsh_enable_status(struct snd_soc_component *comp) -{ - return snd_soc_component_read(comp, WCD9XXX_A_CDC_CLSH_CRC) & - WCD9XXX_A_CDC_CLSH_CRC_CLK_EN_MASK; -} - static inline void wcd_clsh_set_buck_mode(struct snd_soc_component *comp, int mode) { -- 2.20.1.7.g153144c

2 1

[PATCH] ASoC: rockchip: pdm: Add missing clk_disable_unprepare() in rockchip_pdm_runtime_resume()
by Wang Jingjin 07 Dec '22

07 Dec '22

The clk_disable_unprepare() should be called in the error handling of rockchip_pdm_runtime_resume(). Fixes: fc05a5b22253 ("ASoC: rockchip: add support for pdm controller") Signed-off-by: Wang Jingjin <wangjingjin1(a)huawei.com> --- sound/soc/rockchip/rockchip_pdm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index a7549f827235..5b1e47bdc376 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -431,6 +431,7 @@ static int rockchip_pdm_runtime_resume(struct device *dev) ret = clk_prepare_enable(pdm->hclk); if (ret) { + clk_disable_unprepare(pdm->clk); dev_err(pdm->dev, "hclock enable failed %d\n", ret); return ret; } -- 2.25.1

2 1

[PATCH v2 0/6] ASoC: Intel: Skylake: Topology and shutdown fixes
by Cezary Rojewski 07 Dec '22

07 Dec '22

Even though skylake-driver is going to be replaced by the avs-driver, the goal is to keep it functional on all the configurations it supports until its EOL. When comparing chrome trees against upstream skylake-driver, couple fixes pop up that are not part of upstream repository. These fixes are backed up by real bugs (issue trackers), address real problems. There is no reason for them to stay in the internal tree. Patches 1-4 combined together address issue where the driver updates the presumably static audio format descriptions coming from the topology files through its "fixup" functions. As long as given audio format is used by a single path, nothing collides and any updates are harmless. However, when multiple paths e.g.: DMIC and HDMI1 utilize the same audio format descriptor, any updates caused by the opening of the first path, may cause the second to fail. The 5th change from the set fixes driver hang sporadically occurring during shutdown procedure. Once HDAudio links are powered down along with the AudioDSP, the hang stops reproducing. The last change helps survive in environments with limited/fragmented memory. While the BDL is small already, other buffers can be allocated using scatter-gather. This basically aligns the code with what the avs-driver does. Changes in v2: - no changes to the first 5 patches - added patch that I forgot to add in v1 Cezary Rojewski (6): ASoC: Intel: Skylake: Update pipe_config_idx before filling BE params ASoC: Intel: Skylake: Remove skl_tplg_is_multi_fmt() ASoC: Intel: Skylake: Drop pipe_config_idx ASoC: Intel: Skylake: Introduce single place for pipe-config selection ASoC: Intel: Skylake: Fix driver hang during shutdown ASoC: Intel: Skylake: Use SG allocation for SKL-based firmware load sound/soc/intel/skylake/skl-sst-cldma.c | 27 +++++---- sound/soc/intel/skylake/skl-topology.c | 73 ++++++++----------------- sound/soc/intel/skylake/skl-topology.h | 1 - sound/soc/intel/skylake/skl.c | 5 +- 4 files changed, 44 insertions(+), 62 deletions(-) -- 2.25.1

3 8

[PATCH] ASoC: imx-audmux: use sysfs_emit() to instead of scnprintf()
by ye.xingchen＠zte.com.cn 07 Dec '22

07 Dec '22

From: ye xingchen <ye.xingchen(a)zte.com.cn> Follow the advice of the Documentation/filesystems/sysfs.rst and show() should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space. Signed-off-by: ye xingchen <ye.xingchen(a)zte.com.cn> --- sound/soc/fsl/imx-audmux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 50b71e5d4589..582f1e2431ee 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -75,8 +75,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf, if (!buf) return -ENOMEM; - ret = scnprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n", - pdcr, ptcr); + ret = sysfs_emit(buf, "PDCR: %08x\nPTCR: %08x\n", pdcr, ptcr); if (ptcr & IMX_AUDMUX_V2_PTCR_TFSDIR) ret += scnprintf(buf + ret, PAGE_SIZE - ret, -- 2.25.1

2 1

[PATCH] ASoC: mediatek: mt8173-rt5650-rt5514: fix refcount leak in mt8173_rt5650_rt5514_dev_probe()
by Wang Yufen 07 Dec '22

07 Dec '22

The node returned by of_parse_phandle() with refcount incremented, of_node_put() needs be called when finish using it. So add it in the error path in mt8173_rt5650_rt5514_dev_probe(). Fixes: 0d1d7a664288 ("ASoC: mediatek: Refine mt8173 driver and change config option") Signed-off-by: Wang Yufen <wangyufen(a)huawei.com> --- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c index 12f40c8..f803f12 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c @@ -200,14 +200,16 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) if (!mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - return -EINVAL; + ret = -EINVAL; + goto out; } mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node = of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 1); if (!mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - return -EINVAL; + ret = -EINVAL; + goto out; } mt8173_rt5650_rt5514_codec_conf[0].dlc.of_node = mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node; @@ -216,6 +218,7 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(&pdev->dev, card); +out: of_node_put(platform_node); return ret; } -- 1.8.3.1

2 1

[PATCH] ASoC: mediatek: mt8183: fix refcount leak in mt8183_mt6358_ts3a227_max98357_dev_probe()
by Wang Yufen 07 Dec '22

07 Dec '22

The node returned by of_parse_phandle() with refcount incremented, of_node_put() needs be called when finish using it. So add it in the error path in mt8183_mt6358_ts3a227_max98357_dev_probe(). Fixes: 11c0269017b2 ("ASoC: Mediatek: MT8183: Add machine driver with TS3A227") Signed-off-by: Wang Yufen <wangyufen(a)huawei.com> --- sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index a860852..48c14be 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -677,8 +677,10 @@ static int mt8183_i2s2_init(struct snd_soc_pcm_runtime *rtd) } card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev); - if (!card) + if (!card) { + of_node_put(platform_node); return -EINVAL; + } card->dev = &pdev->dev; ec_codec = of_parse_phandle(pdev->dev.of_node, "mediatek,ec-codec", 0); @@ -767,8 +769,10 @@ static int mt8183_i2s2_init(struct snd_soc_pcm_runtime *rtd) } priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; + if (!priv) { + ret = -ENOMEM; + goto out; + } snd_soc_card_set_drvdata(card, priv); @@ -776,7 +780,8 @@ static int mt8183_i2s2_init(struct snd_soc_pcm_runtime *rtd) if (IS_ERR(priv->pinctrl)) { dev_err(&pdev->dev, "%s devm_pinctrl_get failed\n", __func__); - return PTR_ERR(priv->pinctrl); + ret = PTR_ERR(priv->pinctrl); + goto out; } for (i = 0; i < PIN_STATE_MAX; i++) { @@ -809,6 +814,7 @@ static int mt8183_i2s2_init(struct snd_soc_pcm_runtime *rtd) ret = devm_snd_soc_register_card(&pdev->dev, card); +out: of_node_put(platform_node); of_node_put(ec_codec); of_node_put(hdmi_codec); -- 1.8.3.1

2 1

[PATCH 0/3] ASoC: Intel: boards: updates for SOF boards
by Pierre-Louis Bossart 07 Dec '22

07 Dec '22

One new JasperLake configuration, core refactoring between RT1316 and RT1318 and a minor uninitialized variable corner case. Bard Liao (1): ASoC: Intel: sof_realtek_common: set ret = 0 as initial value Brent Lu (1): ASoC: Intel: sof_rt5682: add jsl_rt5682 board config Gongjun Song (1): ASoC: Intel: sof_sdw: use common helpers for all Realtek amps sound/soc/intel/boards/Makefile | 3 +- sound/soc/intel/boards/sof_realtek_common.c | 3 +- sound/soc/intel/boards/sof_rt5682.c | 6 + sound/soc/intel/boards/sof_sdw.c | 10 +- sound/soc/intel/boards/sof_sdw_common.h | 20 +- sound/soc/intel/boards/sof_sdw_rt1316.c | 239 ------------------ sound/soc/intel/boards/sof_sdw_rt1318.c | 120 --------- .../{sof_sdw_rt1308.c => sof_sdw_rt_amp.c} | 139 +++++++--- .../intel/common/soc-acpi-intel-jsl-match.c | 5 + 9 files changed, 133 insertions(+), 412 deletions(-) delete mode 100644 sound/soc/intel/boards/sof_sdw_rt1316.c delete mode 100644 sound/soc/intel/boards/sof_sdw_rt1318.c rename sound/soc/intel/boards/{sof_sdw_rt1308.c => sof_sdw_rt_amp.c} (59%) -- 2.34.1

2 4

[PATCH] ASoC: audio-graph-card: fix refcount leak of cpu_ep in __graph_for_each_link()
by Wang Yufen 07 Dec '22

07 Dec '22

The of_get_next_child() returns a node with refcount incremented, and decrements the refcount of prev. So in the error path of the while loop, of_node_put() needs be called for cpu_ep. Fixes: fce9b90c1ab7 ("ASoC: audio-graph-card: cleanup DAI link loop method - step2") Signed-off-by: Wang Yufen <wangyufen(a)huawei.com> --- sound/soc/generic/audio-graph-card.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index fe7cf97..5daa824 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -485,8 +485,10 @@ static int __graph_for_each_link(struct asoc_simple_priv *priv, of_node_put(codec_ep); of_node_put(codec_port); - if (ret < 0) + if (ret < 0) { + of_node_put(cpu_ep); return ret; + } codec_port_old = codec_port; } -- 1.8.3.1

3 2

[bug report] ALSA: hda: Interrupt servicing and BDL setup for compress streams
by Dan Carpenter 07 Dec '22

07 Dec '22

Hello Cezary Rojewski, The patch 3e9582267e3a: "ALSA: hda: Interrupt servicing and BDL setup for compress streams" from Dec 2, 2022, leads to the following Smatch static checker warning: sound/hda/hdac_stream.c:544 snd_hdac_stream_setup_periods() error: uninitialized symbol 'dmab'. sound/hda/hdac_stream.c 487 int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev) 488 { 489 struct hdac_bus *bus = azx_dev->bus; 490 struct snd_pcm_substream *substream = azx_dev->substream; 491 struct snd_compr_stream *cstream = azx_dev->cstream; 492 struct snd_pcm_runtime *runtime = NULL; 493 struct snd_dma_buffer *dmab; 494 __le32 *bdl; 495 int i, ofs, periods, period_bytes; 496 int pos_adj, pos_align; 497 498 if (substream) { 499 runtime = substream->runtime; 500 dmab = snd_pcm_get_dma_buf(substream); 501 } else if (cstream) { 502 dmab = snd_pcm_get_dma_buf(cstream); 503 } dmab is not initialized on else path. 504 505 /* reset BDL address */ 506 snd_hdac_stream_writel(azx_dev, SD_BDLPL, 0); 507 snd_hdac_stream_writel(azx_dev, SD_BDLPU, 0); 508 509 period_bytes = azx_dev->period_bytes; 510 periods = azx_dev->bufsize / period_bytes; 511 512 /* program the initial BDL entries */ 513 bdl = (__le32 *)azx_dev->bdl.area; 514 ofs = 0; 515 azx_dev->frags = 0; 516 517 pos_adj = bus->bdl_pos_adj; 518 if (runtime && !azx_dev->no_period_wakeup && pos_adj > 0) { 519 pos_align = pos_adj; 520 pos_adj = DIV_ROUND_UP(pos_adj * runtime->rate, 48000); 521 if (!pos_adj) 522 pos_adj = pos_align; 523 else 524 pos_adj = roundup(pos_adj, pos_align); 525 pos_adj = frames_to_bytes(runtime, pos_adj); 526 if (pos_adj >= period_bytes) { 527 dev_warn(bus->dev, "Too big adjustment %d\n", 528 pos_adj); 529 pos_adj = 0; 530 } else { 531 ofs = setup_bdle(bus, dmab, azx_dev, 532 &bdl, ofs, pos_adj, true); This is okay because runtime is set. 533 if (ofs < 0) 534 goto error; 535 } 536 } else 537 pos_adj = 0; 538 539 for (i = 0; i < periods; i++) { 540 if (i == periods - 1 && pos_adj) 541 ofs = setup_bdle(bus, dmab, azx_dev, This is okay because pos_adj is checked. 542 &bdl, ofs, period_bytes - pos_adj, 0); 543 else 544 ofs = setup_bdle(bus, dmab, azx_dev, ^^^^ Potentially uninitialized? 545 &bdl, ofs, period_bytes, 546 !azx_dev->no_period_wakeup); 547 if (ofs < 0) 548 goto error; 549 } 550 return 0; 551 552 error: 553 dev_err(bus->dev, "Too many BDL entries: buffer=%d, period=%d\n", 554 azx_dev->bufsize, period_bytes); 555 return -EINVAL; 556 } regards, dan carpenter

3 2

[PATCH] ASoc: SOF: Fix sof-audio-pci-intel-tgl shutdown timeout during hibernation
by Zhen Ni 07 Dec '22

07 Dec '22

On Dell Latitude 3420 Notebook, sof-audio-pci-intel-tgl may fail to shutdown sporadically during hibernation as following log: [ 43.281110] PM: Image saving done [ 43.281699] PM: hibernation: Wrote 2828852 kbytes in 2.78 seconds(1017.57 MB/s) [ 43.282359] PM: SI [ 43.345156] kvm: exiting hardware virtualization [ 43.345865] auxiliary snd_sof.hda-probes.0: shutdown [ 43.346359] skl_hda_dsp_generic skl_hda_dsp_generic: shutdown [ 43.346849] skl_hda_codec hdmi ehdaudio0D2: shutdown [ 43.398204] snd_hda_codec_realtek ehdaudio0DO: shutdown [ 43.419621] dmic-codec dmic-codec: shutdown [ 43.420194] sof-audio-pci-intel-tgl 0000:00:1f.3: shutdown Call wait_xxx_timeout() to process the timeout. Signed-off-by: Zhen Ni <nizhen(a)uniontech.com> --- sound/core/init.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/core/init.c b/sound/core/init.c index 5377f94eb211..9bd674d7a0fd 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -574,9 +574,10 @@ void snd_card_disconnect_sync(struct snd_card *card) } spin_lock_irq(&card->files_lock); - wait_event_lock_irq(card->remove_sleep, + wait_event_lock_irq_timeout(card->remove_sleep, list_empty(&card->files_list), - card->files_lock); + card->files_lock, + msecs_to_jiffies(2000)); spin_unlock_irq(&card->files_lock); } EXPORT_SYMBOL_GPL(snd_card_disconnect_sync); @@ -659,7 +660,7 @@ int snd_card_free(struct snd_card *card) if (ret) return ret; /* wait, until all devices are ready for the free operation */ - wait_for_completion(&released); + wait_for_completion_timeout(&released, msecs_to_jiffies(2000)) return 0; } -- 2.20.1

4 4

[PATCH 0/4] Make QMI message rules const
by Jeff Johnson 07 Dec '22

07 Dec '22

Change ff6d365898d ("soc: qcom: qmi: use const for struct qmi_elem_info") allows QMI message encoding/decoding rules to be const. So now update the definitions in the various client to take advantage of this. Patches for ath10k and ath11k were perviously sent separately. This series depends upon: https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git/commit/?h=fo… This is in the for-next banch of: git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git Hence this series is also based upon that tree/branch. Jeff Johnson (4): net: ipa: Make QMI message rules const remoteproc: sysmon: Make QMI message rules const slimbus: qcom-ngd-ctrl: Make QMI message rules const soc: qcom: pdr: Make QMI message rules const drivers/net/ipa/ipa_qmi_msg.c | 20 ++++++++++---------- drivers/net/ipa/ipa_qmi_msg.h | 20 ++++++++++---------- drivers/remoteproc/qcom_sysmon.c | 8 ++++---- drivers/slimbus/qcom-ngd-ctrl.c | 8 ++++---- drivers/soc/qcom/pdr_internal.h | 20 ++++++++++---------- 5 files changed, 38 insertions(+), 38 deletions(-) -- 2.37.0

5 23

[PATCH] ALSA: hda/realtek: Add quirk for Lenovo TianYi510Pro-14IOB
by edward-p 07 Dec '22

07 Dec '22

Lenovo TianYi510Pro-14IOB (17aa:3742) require quirk for enabling headset-mic Signed-off-by: edward-p <edward(a)edward-p.xyz> Link: https://bugzilla.kernel.org/show_bug.cgi?id=216756 --- sound/pci/hda/patch_realtek.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e5c036385666..a2e1bdc06468 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10960,6 +10960,17 @@ static void alc897_fixup_lenovo_headset_mic(struct hda_codec *codec, } } +static void alc897_fixup_lenovo_headset_mode(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + struct alc_spec *spec = codec->spec; + + if (action == HDA_FIXUP_ACT_PRE_PROBE) { + spec->parse_flags |= HDA_PINCFG_HEADSET_MIC; + spec->gen.hp_automute_hook = alc897_hp_automute_hook; + } +} + static const struct coef_fw alc668_coefs[] = { WRITE_COEF(0x01, 0xbebe), WRITE_COEF(0x02, 0xaaaa), WRITE_COEF(0x03, 0x0), WRITE_COEF(0x04, 0x0180), WRITE_COEF(0x06, 0x0), WRITE_COEF(0x07, 0x0f80), @@ -11043,6 +11054,8 @@ enum { ALC897_FIXUP_LENOVO_HEADSET_MIC, ALC897_FIXUP_HEADSET_MIC_PIN, ALC897_FIXUP_HP_HSMIC_VERB, + ALC897_FIXUP_LENOVO_HEADSET_MODE, + ALC897_FIXUP_HEADSET_MIC_PIN2, }; static const struct hda_fixup alc662_fixups[] = { @@ -11469,6 +11482,19 @@ static const struct hda_fixup alc662_fixups[] = { { } }, }, + [ALC897_FIXUP_LENOVO_HEADSET_MODE] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc897_fixup_lenovo_headset_mode, + }, + [ALC897_FIXUP_HEADSET_MIC_PIN2] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x1a, 0x01a11140 }, /* use as headset mic, without its own jack detect */ + { } + }, + .chained = true, + .chain_id = ALC897_FIXUP_LENOVO_HEADSET_MODE + }, }; static const struct snd_pci_quirk alc662_fixup_tbl[] = { @@ -11521,6 +11547,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x32cb, "Lenovo ThinkCentre M70", ALC897_FIXUP_HEADSET_MIC_PIN), SND_PCI_QUIRK(0x17aa, 0x32cf, "Lenovo ThinkCentre M950", ALC897_FIXUP_HEADSET_MIC_PIN), SND_PCI_QUIRK(0x17aa, 0x32f7, "Lenovo ThinkCentre M90", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x3742, "Lenovo TianYi510Pro-14IOB", ALC897_FIXUP_HEADSET_MIC_PIN2), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), SND_PCI_QUIRK(0x1849, 0x5892, "ASRock B150M", ALC892_FIXUP_ASROCK_MOBO), -- 2.38.1

3 3

topology: plugins: nhlt: fix ssp debug
by GitHub pull_request - opened 07 Dec '22

07 Dec '22

alsa-project/alsa-utils pull request #180 was opened from juimonen: Nhlt ssp plugin debug feature was broken due to recent change in ssp indexing, thus fix it. Signed-off-by: Jaska Uimonen <jaska.uimonen(a)linux.intel.com> Request URL : https://github.com/alsa-project/alsa-utils/pull/180 Patch URL : https://github.com/alsa-project/alsa-utils/pull/180.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH v3 -next] ALSA:usb-audio:add the information of KT0206 device driven by USB audio
by Dicheng Wang 07 Dec '22

07 Dec '22

From: wangdicheng <wangdicheng(a)kylinos.cn> Add relevant information to the quirks-table.h file. The test passes and the sound source file plays normally. Signed-off-by: wangdicheng <wangdicheng(a)kylinos.cn> --- v3:add body information v2:use USB_DEVICE_VENDOR_SPEC() suggested by Takashi Iwai sound/usb/quirks-table.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 874fcf245747..271884e35003 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -76,6 +76,8 @@ { USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f0a) }, /* E-Mu 0204 USB */ { USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f19) }, +/* Ktmicro Usb_audio device */ +{ USB_DEVICE_VENDOR_SPEC(0x31b2, 0x0011) }, /* * Creative Technology, Ltd Live! Cam Sync HD [VF0770] -- 2.25.1

2 1

[PATCH v2] ALSA: hda/hdmi: Add HP Device 0x8711 to force connect list
by Jiao Zhou 07 Dec '22

07 Dec '22

HDMI audio is not working on the HP EliteDesk 800 G6 because the pin is unconnected. This issue can be resolved by using the 'hdajackretask' tool to override the unconnected pin to force it to connect. Signed-off-by: Jiao Zhou <jiaozhou(a)google.com> --- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 21edf7a619f07..7a40ddfd695a1 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1975,6 +1975,7 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) static const struct snd_pci_quirk force_connect_list[] = { SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1), SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), + SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1), SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1), SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1), {} -- 2.39.0.rc0.267.gcb52ba06e7-goog

2 1

sof-essx8336: update HiFi.conf
by GitHub pull_request - edited 07 Dec '22

07 Dec '22

alsa-project/alsa-ucm-conf pull request #246 was edited from junocomp: This enables the speakers from startup, detects the HDMI audio and enables the internal microphone. I have tested this on 3 devices with Debian now and it seems to work. Can other people test it too please. If it works, it will be worth pushing it upstream. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/246 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/246.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] slimbus: qcom-ctrl: fix possible memory leak in qcom_slim_probe()
by Gaosheng Cui 07 Dec '22

07 Dec '22

The kfree() should be called to free ctrl->wr_comp when something fails, we should also free it in qcom_slim_remove(), otherwise there will be a memory leak, so use devm_kcalloc instead of kcalloc to fix it. Fixes: ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver") Signed-off-by: Gaosheng Cui <cuigaosheng1(a)huawei.com> --- drivers/slimbus/qcom-ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index 400b7b385a44..e4d92ce52c41 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -529,8 +529,8 @@ static int qcom_slim_probe(struct platform_device *pdev) ctrl->tx.sl_sz = SLIM_MSGQ_BUF_LEN; ctrl->rx.n = QCOM_RX_MSGS; ctrl->rx.sl_sz = SLIM_MSGQ_BUF_LEN; - ctrl->wr_comp = kcalloc(QCOM_TX_MSGS, sizeof(struct completion *), - GFP_KERNEL); + ctrl->wr_comp = devm_kcalloc(&pdev->dev, QCOM_TX_MSGS, sizeof(struct completion *), + GFP_KERNEL); if (!ctrl->wr_comp) return -ENOMEM; -- 2.25.1

1 0

[PATCH v2 -next] ALSA:usb-audio:Add the information of KT0206 device driven by USB audio
by Dicheng Wang 07 Dec '22

07 Dec '22

From: wangdicheng <wangdicheng(a)kylinos.cn> Cc: stable(a)vger.kernel.org Signed-off-by: wangdicheng <wangdicheng(a)kylinos.cn> --- v2:use USB_DEVICE_VENDOR_SPEC() suggested by Takashi Iwai sound/usb/quirks-table.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 874fcf245747..271884e35003 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -76,6 +76,8 @@ { USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f0a) }, /* E-Mu 0204 USB */ { USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f19) }, +/* Ktmicro Usb_audio device */ +{ USB_DEVICE_VENDOR_SPEC(0x31b2, 0x0011) }, /* * Creative Technology, Ltd Live! Cam Sync HD [VF0770] -- 2.25.1

3 4

[PATCH] ALSA: hda/realtek: Add quirk for Lenovo TianYi510Pro-14IOB
by edward-p 07 Dec '22

07 Dec '22

Lenovo TianYi510Pro-14IOB (17aa:3742) require quirk for enabling headset-mic Signed-off-by: edward-p <edward(a)edward-p.xyz> Link: https://bugzilla.kernel.org/show_bug.cgi?id=216756 --- sound/pci/hda/patch_realtek.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e5c036385666..a2e1bdc06468 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10960,6 +10960,17 @@ static void alc897_fixup_lenovo_headset_mic(struct hda_codec *codec, } } +static void alc897_fixup_lenovo_headset_mode(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + struct alc_spec *spec = codec->spec; + + if (action == HDA_FIXUP_ACT_PRE_PROBE) { + spec->parse_flags |= HDA_PINCFG_HEADSET_MIC; + spec->gen.hp_automute_hook = alc897_hp_automute_hook; + } +} + static const struct coef_fw alc668_coefs[] = { WRITE_COEF(0x01, 0xbebe), WRITE_COEF(0x02, 0xaaaa), WRITE_COEF(0x03, 0x0), WRITE_COEF(0x04, 0x0180), WRITE_COEF(0x06, 0x0), WRITE_COEF(0x07, 0x0f80), @@ -11043,6 +11054,8 @@ enum { ALC897_FIXUP_LENOVO_HEADSET_MIC, ALC897_FIXUP_HEADSET_MIC_PIN, ALC897_FIXUP_HP_HSMIC_VERB, + ALC897_FIXUP_LENOVO_HEADSET_MODE, + ALC897_FIXUP_HEADSET_MIC_PIN2, }; static const struct hda_fixup alc662_fixups[] = { @@ -11469,6 +11482,19 @@ static const struct hda_fixup alc662_fixups[] = { { } }, }, + [ALC897_FIXUP_LENOVO_HEADSET_MODE] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc897_fixup_lenovo_headset_mode, + }, + [ALC897_FIXUP_HEADSET_MIC_PIN2] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x1a, 0x01a11140 }, /* use as headset mic, without its own jack detect */ + { } + }, + .chained = true, + .chain_id = ALC897_FIXUP_LENOVO_HEADSET_MODE + }, }; static const struct snd_pci_quirk alc662_fixup_tbl[] = { @@ -11521,6 +11547,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x32cb, "Lenovo ThinkCentre M70", ALC897_FIXUP_HEADSET_MIC_PIN), SND_PCI_QUIRK(0x17aa, 0x32cf, "Lenovo ThinkCentre M950", ALC897_FIXUP_HEADSET_MIC_PIN), SND_PCI_QUIRK(0x17aa, 0x32f7, "Lenovo ThinkCentre M90", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x3742, "Lenovo TianYi510Pro-14IOB", ALC897_FIXUP_HEADSET_MIC_PIN2), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), SND_PCI_QUIRK(0x1849, 0x5892, "ASRock B150M", ALC892_FIXUP_ASROCK_MOBO), -- 2.38.1

1 0

Add: 0b05:1999 ASUS ROG Strix Z590-A Gaming WiFi
by GitHub pull_request - opened 07 Dec '22

07 Dec '22

alsa-project/alsa-ucm-conf pull request #247 was opened from 13r0ck: This works great for 5.1, but I cannot get the line in to become a side left / side right. I'm not sure what I'm missing? Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/247 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/247.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2] arm64: dts: qcom: sc7280: Remove unused sleep pin control nodes
by Srinivasa Rao Mandadapu 06 Dec '22

06 Dec '22

Remove unused and redundant sleep pin control entries as they are not referenced anywhere in sc7280 based platform's device tree variants. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> --- Chnges Since v1: -- Update subject prefixes and commit message. .../qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 8 ----- .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi | 20 ----------- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 20 ----------- arch/arm64/boot/dts/qcom/sc7280.dtsi | 40 ---------------------- 4 files changed, 88 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi index cf34334..1ca11a1 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi @@ -148,10 +148,6 @@ hp_i2c: &i2c2 { bias-disable; }; -&lpass_dmic01_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic01_data { bias-pull-down; }; @@ -161,10 +157,6 @@ hp_i2c: &i2c2 { bias-disable; }; -&lpass_dmic23_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic23_data { bias-pull-down; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi index c72e53a..ae25520 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi @@ -167,10 +167,6 @@ bias-disable; }; -&lpass_dmic01_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic01_data { bias-pull-down; }; @@ -180,10 +176,6 @@ bias-disable; }; -&lpass_dmic23_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic23_data { bias-pull-down; }; @@ -194,30 +186,18 @@ bias-disable; }; -&lpass_rx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_rx_swr_data { drive-strength = <2>; slew-rate = <1>; bias-bus-hold; }; -&lpass_rx_swr_data_sleep { - bias-pull-down; -}; - &lpass_tx_swr_clk { drive-strength = <2>; slew-rate = <1>; bias-disable; }; -&lpass_tx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_tx_swr_data { drive-strength = <2>; slew-rate = <1>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi index 8ca2281..f7efb99 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -576,10 +576,6 @@ bias-disable; }; -&lpass_dmic01_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic01_data { bias-pull-down; }; @@ -589,10 +585,6 @@ bias-disable; }; -&lpass_dmic23_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic23_data { bias-pull-down; }; @@ -603,30 +595,18 @@ bias-disable; }; -&lpass_rx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_rx_swr_data { drive-strength = <2>; slew-rate = <1>; bias-bus-hold; }; -&lpass_rx_swr_data_sleep { - bias-pull-down; -}; - &lpass_tx_swr_clk { drive-strength = <2>; slew-rate = <1>; bias-disable; }; -&lpass_tx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_tx_swr_data { drive-strength = <2>; slew-rate = <1>; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 448879d..4970864 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2483,80 +2483,40 @@ function = "dmic1_clk"; }; - lpass_dmic01_clk_sleep: dmic01-clk-sleep-state { - pins = "gpio6"; - function = "dmic1_clk"; - }; - lpass_dmic01_data: dmic01-data-state { pins = "gpio7"; function = "dmic1_data"; }; - lpass_dmic01_data_sleep: dmic01-data-sleep-state { - pins = "gpio7"; - function = "dmic1_data"; - }; - lpass_dmic23_clk: dmic23-clk-state { pins = "gpio8"; function = "dmic2_clk"; }; - lpass_dmic23_clk_sleep: dmic23-clk-sleep-state { - pins = "gpio8"; - function = "dmic2_clk"; - }; - lpass_dmic23_data: dmic23-data-state { pins = "gpio9"; function = "dmic2_data"; }; - lpass_dmic23_data_sleep: dmic23-data-sleep-state { - pins = "gpio9"; - function = "dmic2_data"; - }; - lpass_rx_swr_clk: rx-swr-clk-state { pins = "gpio3"; function = "swr_rx_clk"; }; - lpass_rx_swr_clk_sleep: rx-swr-clk-sleep-state { - pins = "gpio3"; - function = "swr_rx_clk"; - }; - lpass_rx_swr_data: rx-swr-data-state { pins = "gpio4", "gpio5"; function = "swr_rx_data"; }; - lpass_rx_swr_data_sleep: rx-swr-data-sleep-state { - pins = "gpio4", "gpio5"; - function = "swr_rx_data"; - }; - lpass_tx_swr_clk: tx-swr-clk-state { pins = "gpio0"; function = "swr_tx_clk"; }; - lpass_tx_swr_clk_sleep: tx-swr-clk-sleep-state { - pins = "gpio0"; - function = "swr_tx_clk"; - }; - lpass_tx_swr_data: tx-swr-data-state { pins = "gpio1", "gpio2", "gpio14"; function = "swr_tx_data"; }; - - lpass_tx_swr_data_sleep: tx-swr-data-sleep-state { - pins = "gpio1", "gpio2", "gpio14"; - function = "swr_tx_data"; - }; }; gpu: gpu@3d00000 { -- 2.7.4

4 4

[PATCH v2 0/8] Adjust usage of rt5682(s) power supply properties
by Nícolas F. R. A. Prado 06 Dec '22

06 Dec '22

This series sets straight the usage of power supply properties for the rt5682 and rt5682s audio codecs. These properties were already being used by sc7180-trogdor.dtsi (and derived DTs like sc7180-trogdor-kingoftown.dtsi). We start by documenting the power supplies that are already in use and then add few others that were missing to the bindings. Then we update the drivers to also support the new supplies. Finally we update the trogdor DTs so they have the newly added but required supplies and remove a superfluous one that was causing warnings. v1: https://lore.kernel.org/all/20221028205540.3197304-1-nfraprado@collabora.com Changes in v2: - Made new supply names uppercase to be consistent with the existing ones Nícolas F. R. A. Prado (8): ASoC: dt-bindings: realtek,rt5682s: Add AVDD and MICVDD supplies ASoC: dt-bindings: realtek,rt5682s: Add DBVDD and LDO1-IN supplies ASoC: dt-bindings: rt5682: Add AVDD, MICVDD and VBAT supplies ASoC: dt-bindings: rt5682: Add DBVDD and LDO1-IN supplies ASoC: rt5682s: Support DBVDD and LDO1-IN supplies ASoC: rt5682: Support DBVDD and LDO1-IN supplies arm64: dts: qcom: sc7180-trogdor: Add missing supplies for rt5682 arm64: dts: qcom: sc7180-trogdor: Remove VBAT supply from rt5682s .../bindings/sound/realtek,rt5682s.yaml | 23 +++++++++++++++++++ .../devicetree/bindings/sound/rt5682.txt | 20 ++++++++++++++++ .../dts/qcom/sc7180-trogdor-kingoftown.dtsi | 1 + ...0-trogdor-wormdingler-rev1-boe-rt5682s.dts | 1 + ...0-trogdor-wormdingler-rev1-inx-rt5682s.dts | 1 + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 ++ sound/soc/codecs/rt5682.c | 2 ++ sound/soc/codecs/rt5682.h | 2 +- sound/soc/codecs/rt5682s.c | 22 ++++++++++++++++++ sound/soc/codecs/rt5682s.h | 2 ++ 10 files changed, 75 insertions(+), 1 deletion(-) -- 2.38.1

4 10

[PATCH] dt-bindings: soc: qcom: apr: document generic qcom, apr compatible
by Krzysztof Kozlowski 06 Dec '22

06 Dec '22

Document the qcom,apr compatible, used by Qualcomm Asynchronous Packet Router driver. There are no upstream DTSes using this compatible - instead we have ones with APRv2 (qcom,apr-v2). The driver does not make distinction between both compatibles, which raises the question whether the compatible is really needed. Document it (as compatible with v2) for completeness. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml index 4209c6314996..a6bc3197d5dd 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml @@ -17,6 +17,7 @@ description: | properties: compatible: enum: + - qcom,apr - qcom,apr-v2 - qcom,gpr -- 2.34.1

3 2

[PATCH] ALSA: compress: Add AC3, EAC3, TrueHD, DTS, MPEG-H 3D Audio Stream (MHAS)
by Carlos Rafael Giani 06 Dec '22

06 Dec '22

These audio codecs are used in sound bars and digital TVs, and benefit from off-loading to a DSP. In particular, Dolby Atmos and MPEG-H 3D audio spatialization is done in dedicated DSPs. Thus, adding these codecs to the Compress-Offload API makes sense. Signed-off-by: Carlos Rafael Giani <crg7475(a)mailbox.org> --- include/uapi/sound/compress_params.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/uapi/sound/compress_params.h b/include/uapi/sound/compress_params.h index ddc77322d571..7a58e2026be3 100644 --- a/include/uapi/sound/compress_params.h +++ b/include/uapi/sound/compress_params.h @@ -43,7 +43,13 @@ #define SND_AUDIOCODEC_BESPOKE ((__u32) 0x0000000E) #define SND_AUDIOCODEC_ALAC ((__u32) 0x0000000F) #define SND_AUDIOCODEC_APE ((__u32) 0x00000010) -#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_APE +#define SND_AUDIOCODEC_AC3 ((__u32) 0x00000011) +#define SND_AUDIOCODEC_EAC3 ((__u32) 0x00000012) +#define SND_AUDIOCODEC_TRUEHD ((__u32) 0x00000013) +#define SND_AUDIOCODEC_DTS ((__u32) 0x00000014) +/* MPEG-H 3D Audio Stream (MHAS) as defined in ISO/IEC 23008-3 */ +#define SND_AUDIOCODEC_MHAS ((__u32) 0x00000015) +#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_MHAS /* * Profile and modes are listed with bit masks. This allows for a -- 2.34.1

2 3

[PATCH 0/6] Make remove() of any bus based driver void returned
by Dawei Li 06 Dec '22

06 Dec '22

For bus-based driver, device removal is implemented as: device_remove() => bus->remove() => driver->remove() Driver core needs no feedback from bus driver about the result of remove callback. In which case, commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned. Now we have the situation that both 1st & 2nd part of calling chain are void returned, so it does not make much sense for the last one (driver->remove) to return non-void to its caller. So the basic idea behind this patchset is making remove() callback of any bus-based driver to be void returned. This patchset includes changes for drivers below: 1. hyperv 2. macio 3. apr 4. xen 5. ac87 6. soundbus Q: Why not platform drivers? A: Too many of them.(maybe 4K+) Dawei Li (6): hyperv: Make remove callback of hyperv driver void returned macio: Make remove callback of macio driver void returned apr: make remove callback of apr driver void returned xen: make remove callback of xen driver void returned ac97: make remove callback of ac97 driver void returned soundbus: make remove callback of soundbus driver void returned arch/powerpc/include/asm/macio.h | 12 ++++++------ drivers/ata/pata_macio.c | 4 +--- drivers/block/xen-blkback/xenbus.c | 4 +--- drivers/block/xen-blkfront.c | 3 +-- drivers/char/tpm/xen-tpmfront.c | 3 +-- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +--- drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- drivers/hid/hid-hyperv.c | 4 +--- drivers/hv/hv_balloon.c | 5 +---- drivers/hv/hv_util.c | 4 +--- drivers/input/misc/xen-kbdfront.c | 5 ++--- drivers/input/serio/hyperv-keyboard.c | 4 +--- drivers/macintosh/rack-meter.c | 4 +--- drivers/mfd/wm97xx-core.c | 4 +--- drivers/net/ethernet/apple/bmac.c | 4 +--- drivers/net/ethernet/apple/mace.c | 4 +--- drivers/net/hyperv/netvsc_drv.c | 4 +--- drivers/net/wireless/intersil/orinoco/airport.c | 4 +--- drivers/net/xen-netback/xenbus.c | 3 +-- drivers/net/xen-netfront.c | 4 +--- drivers/pci/controller/pci-hyperv.c | 3 +-- drivers/pci/xen-pcifront.c | 4 +--- drivers/scsi/mac53c94.c | 5 +---- drivers/scsi/mesh.c | 5 +---- drivers/scsi/storvsc_drv.c | 4 +--- drivers/scsi/xen-scsifront.c | 4 +--- drivers/tty/hvc/hvc_xen.c | 4 ++-- drivers/tty/serial/pmac_zilog.c | 7 ++----- drivers/uio/uio_hv_generic.c | 5 ++--- drivers/usb/host/xen-hcd.c | 4 +--- drivers/video/fbdev/hyperv_fb.c | 5 +---- drivers/video/fbdev/xen-fbfront.c | 6 ++---- drivers/xen/pvcalls-back.c | 3 +-- drivers/xen/pvcalls-front.c | 3 +-- drivers/xen/xen-pciback/xenbus.c | 4 +--- drivers/xen/xen-scsiback.c | 4 +--- include/linux/hyperv.h | 2 +- include/linux/soc/qcom/apr.h | 2 +- include/sound/ac97/codec.h | 6 +++--- include/xen/xenbus.h | 2 +- net/9p/trans_xen.c | 3 +-- net/vmw_vsock/hyperv_transport.c | 4 +--- sound/ac97/bus.c | 5 ++--- sound/aoa/fabrics/layout.c | 3 +-- sound/aoa/soundbus/i2sbus/core.c | 4 +--- sound/aoa/soundbus/soundbus.h | 6 +++--- sound/soc/qcom/qdsp6/q6core.c | 4 +--- sound/xen/xen_snd_front.c | 3 +-- 48 files changed, 63 insertions(+), 137 deletions(-) -- 2.25.1

2 2

[PATCH 1/6] hyperv: Make remove callback of hyperv driver void returned
by Dawei Li 06 Dec '22

06 Dec '22

Since commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller. This change is for hyperv bus based drivers. Signed-off-by: Dawei Li <set_pte_at(a)outlook.com> --- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +--- drivers/hid/hid-hyperv.c | 4 +--- drivers/hv/hv_balloon.c | 5 +---- drivers/hv/hv_util.c | 4 +--- drivers/input/serio/hyperv-keyboard.c | 4 +--- drivers/net/hyperv/netvsc_drv.c | 4 +--- drivers/pci/controller/pci-hyperv.c | 3 +-- drivers/scsi/storvsc_drv.c | 4 +--- drivers/uio/uio_hv_generic.c | 5 ++--- drivers/video/fbdev/hyperv_fb.c | 5 +---- include/linux/hyperv.h | 2 +- net/vmw_vsock/hyperv_transport.c | 4 +--- 12 files changed, 13 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c index ca127ff797f7..d117fff26d99 100644 --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c @@ -165,7 +165,7 @@ static int hyperv_vmbus_probe(struct hv_device *hdev, return ret; } -static int hyperv_vmbus_remove(struct hv_device *hdev) +static void hyperv_vmbus_remove(struct hv_device *hdev) { struct drm_device *dev = hv_get_drvdata(hdev); struct hyperv_drm_device *hv = to_hv(dev); @@ -176,8 +176,6 @@ static int hyperv_vmbus_remove(struct hv_device *hdev) hv_set_drvdata(hdev, NULL); vmbus_free_mmio(hv->mem->start, hv->fb_size); - - return 0; } static int hyperv_vmbus_suspend(struct hv_device *hdev) diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c index ab57b49a44ed..ef16c2a54362 100644 --- a/drivers/hid/hid-hyperv.c +++ b/drivers/hid/hid-hyperv.c @@ -535,7 +535,7 @@ static int mousevsc_probe(struct hv_device *device, } -static int mousevsc_remove(struct hv_device *dev) +static void mousevsc_remove(struct hv_device *dev) { struct mousevsc_dev *input_dev = hv_get_drvdata(dev); @@ -544,8 +544,6 @@ static int mousevsc_remove(struct hv_device *dev) hid_hw_stop(input_dev->hid_device); hid_destroy_device(input_dev->hid_device); mousevsc_free_device(input_dev); - - return 0; } static int mousevsc_suspend(struct hv_device *dev) diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c index 6c127f061f06..6bbd2e6fa3d4 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c @@ -1990,7 +1990,7 @@ static int balloon_probe(struct hv_device *dev, return ret; } -static int balloon_remove(struct hv_device *dev) +static void balloon_remove(struct hv_device *dev) { struct hv_dynmem_device *dm = hv_get_drvdata(dev); struct hv_hotadd_state *has, *tmp; @@ -2031,8 +2031,6 @@ static int balloon_remove(struct hv_device *dev) kfree(has); } spin_unlock_irqrestore(&dm_device.ha_lock, flags); - - return 0; } static int balloon_suspend(struct hv_device *hv_dev) @@ -2112,7 +2110,6 @@ static struct hv_driver balloon_drv = { static int __init init_balloon_drv(void) { - return vmbus_driver_register(&balloon_drv); } diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c index 835e6039c186..24995ac41c86 100644 --- a/drivers/hv/hv_util.c +++ b/drivers/hv/hv_util.c @@ -602,7 +602,7 @@ static int util_probe(struct hv_device *dev, return ret; } -static int util_remove(struct hv_device *dev) +static void util_remove(struct hv_device *dev) { struct hv_util_service *srv = hv_get_drvdata(dev); @@ -610,8 +610,6 @@ static int util_remove(struct hv_device *dev) srv->util_deinit(); vmbus_close(dev->channel); kfree(srv->recv_buffer); - - return 0; } /* diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c index d62aefb2e245..31def6ce5157 100644 --- a/drivers/input/serio/hyperv-keyboard.c +++ b/drivers/input/serio/hyperv-keyboard.c @@ -369,7 +369,7 @@ static int hv_kbd_probe(struct hv_device *hv_dev, return error; } -static int hv_kbd_remove(struct hv_device *hv_dev) +static void hv_kbd_remove(struct hv_device *hv_dev) { struct hv_kbd_dev *kbd_dev = hv_get_drvdata(hv_dev); @@ -378,8 +378,6 @@ static int hv_kbd_remove(struct hv_device *hv_dev) kfree(kbd_dev); hv_set_drvdata(hv_dev, NULL); - - return 0; } static int hv_kbd_suspend(struct hv_device *hv_dev) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 89eb4f179a3c..50c20e4d4147 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -2594,7 +2594,7 @@ static int netvsc_probe(struct hv_device *dev, return ret; } -static int netvsc_remove(struct hv_device *dev) +static void netvsc_remove(struct hv_device *dev) { struct net_device_context *ndev_ctx; struct net_device *vf_netdev, *net; @@ -2603,7 +2603,6 @@ static int netvsc_remove(struct hv_device *dev) net = hv_get_drvdata(dev); if (net == NULL) { dev_err(&dev->device, "No net device to remove\n"); - return 0; } ndev_ctx = netdev_priv(net); @@ -2637,7 +2636,6 @@ static int netvsc_remove(struct hv_device *dev) free_percpu(ndev_ctx->vf_stats); free_netdev(net); - return 0; } static int netvsc_suspend(struct hv_device *dev) diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index ba64284eaf9f..3a09de70d6ea 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -3756,7 +3756,7 @@ static int hv_pci_bus_exit(struct hv_device *hdev, bool keep_devs) * * Return: 0 on success, -errno on failure */ -static int hv_pci_remove(struct hv_device *hdev) +static void hv_pci_remove(struct hv_device *hdev) { struct hv_pcibus_device *hbus; int ret; @@ -3795,7 +3795,6 @@ static int hv_pci_remove(struct hv_device *hdev) hv_put_dom_num(hbus->bridge->domain_nr); kfree(hbus); - return ret; } static int hv_pci_suspend(struct hv_device *hdev) diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index bc46721aa01c..d253e7d5959d 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -2093,7 +2093,7 @@ static int storvsc_change_queue_depth(struct scsi_device *sdev, int queue_depth) return scsi_change_queue_depth(sdev, queue_depth); } -static int storvsc_remove(struct hv_device *dev) +static void storvsc_remove(struct hv_device *dev) { struct storvsc_device *stor_device = hv_get_drvdata(dev); struct Scsi_Host *host = stor_device->host; @@ -2109,8 +2109,6 @@ static int storvsc_remove(struct hv_device *dev) scsi_remove_host(host); storvsc_dev_remove(dev); scsi_host_put(host); - - return 0; } static int storvsc_suspend(struct hv_device *hv_dev) diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c index c08a6cfd119f..20d9762331bd 100644 --- a/drivers/uio/uio_hv_generic.c +++ b/drivers/uio/uio_hv_generic.c @@ -355,20 +355,19 @@ hv_uio_probe(struct hv_device *dev, return ret; } -static int +static void hv_uio_remove(struct hv_device *dev) { struct hv_uio_private_data *pdata = hv_get_drvdata(dev); if (!pdata) - return 0; + return; sysfs_remove_bin_file(&dev->channel->kobj, &ring_buffer_bin_attr); uio_unregister_device(&pdata->info); hv_uio_cleanup(dev, pdata); vmbus_free_ring(dev->channel); - return 0; } static struct hv_driver hv_uio_drv = { diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index 072ce07ba9e0..721b7c34a99e 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -1226,8 +1226,7 @@ static int hvfb_probe(struct hv_device *hdev, return ret; } - -static int hvfb_remove(struct hv_device *hdev) +static void hvfb_remove(struct hv_device *hdev) { struct fb_info *info = hv_get_drvdata(hdev); struct hvfb_par *par = info->par; @@ -1248,8 +1247,6 @@ static int hvfb_remove(struct hv_device *hdev) hvfb_putmem(hdev, info); framebuffer_release(info); - - return 0; } static int hvfb_suspend(struct hv_device *hdev) diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 3b42264333ef..1f128f28a487 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1273,7 +1273,7 @@ struct hv_driver { } dynids; int (*probe)(struct hv_device *, const struct hv_vmbus_device_id *); - int (*remove)(struct hv_device *); + void (*remove)(struct hv_device *dev); void (*shutdown)(struct hv_device *); int (*suspend)(struct hv_device *); diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c index 59c3e2697069..7cb1a9d2cdb4 100644 --- a/net/vmw_vsock/hyperv_transport.c +++ b/net/vmw_vsock/hyperv_transport.c @@ -879,13 +879,11 @@ static int hvs_probe(struct hv_device *hdev, return 0; } -static int hvs_remove(struct hv_device *hdev) +static void hvs_remove(struct hv_device *hdev) { struct vmbus_channel *chan = hdev->channel; vmbus_close(chan); - - return 0; } /* hv_sock connections can not persist across hibernation, and all the hv_sock -- 2.25.1

3 3

Adding AC3, TrueHD, and other audio codecs to compress-offload API
by Carlos Rafael Giani 06 Dec '22

06 Dec '22

Hello, currently, the compress-offload API does not include AC3, EAC3, TrueHD, MPEG-H, DTS in its list of audio codecs (found in include/uapi/sound/compress_params.h ). However, in part due to the rise of 3D audio like Dolby Atmos, adding these codecs would be useful if the underlying DSP is able to directly receive the compressed audio frames instead of having to rely on passing the compressed data through IEC958 / IEC61937. From what I see, no special parameters would be needed - these codecs are self contained (no extra codec headers and such required). In the MPEG-H case, I'd limit support to MHAS (MPEG-H 3D Audio Stream), since that seems to be the more popular method of transporting MPEG-H frames, and also does not require any special extra info. As a result, this would amount to just adding a couple of audio codec #defines to compress_params.h . Thoughts? Carlos

1 0

[PATCH v2] dt-bindings: Drop Jee Heng Sia
by Krzysztof Kozlowski 06 Dec '22

06 Dec '22

Emails to Jee Heng Sia bounce ("550 #5.1.0 Address rejected."). Add Keembay platform maintainers as Keembay I2S maintainers. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Acked-by: Mark Brown <broonie(a)kernel.org> --- Changes since v1: 1. Correct email format in keembay-i2s. 2. Add Ack tag. --- Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 1 - Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml index 67aa7bb6d36a..ad107a4d3b33 100644 --- a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml +++ b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml @@ -8,7 +8,6 @@ title: Synopsys DesignWare AXI DMA Controller maintainers: - Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> - - Jee Heng Sia <jee.heng.sia(a)intel.com> description: Synopsys DesignWare AXI DMA Controller DT Binding diff --git a/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml b/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml index 2ac0a4b3cd18..76b6f2cf25df 100644 --- a/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml @@ -8,7 +8,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Intel KeemBay I2S maintainers: - - Sia, Jee Heng <jee.heng.sia(a)intel.com> + - Daniele Alessandrelli <daniele.alessandrelli(a)intel.com> + - Paul J. Murphy <paul.j.murphy(a)intel.com> description: | Intel KeemBay I2S -- 2.34.1

2 1

[GIT PULL] ASoC updates for v6.2
by Mark Brown 06 Dec '22

06 Dec '22

The following changes since commit 3d1bb6cc1a654c8693a85b1d262e610196edec8b: ASoC: cs42l51: Correct PGA Volume minimum value (2022-11-25 16:29:52 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v6.2 for you to fetch changes up to 9472382db38452df15f9f2f74b1dff34848e56b2: Add SOF panic dump support for AMD platform. (2022-12-05 17:28:07 +0000) ---------------------------------------------------------------- ASoC: Updates for v6.2 This is a fairly sedate release for the core code, but there's been a lot of driver work especially around the x86 platforms and device tree updates: - More cleanups of the DAPM code from Morimoto-san. - Factoring out of mapping hw_params onto SoundWire configuration by Charles Keepax. - The ever ongoing overhauls of the Intel DSP code continue, including support for loading libraries and probes with IPC4 on SOF. - Support for more sample formats on JZ4740. - Lots of device tree conversions and fixups. - Support for Allwinner D1, a range of AMD and Intel systems, Mediatek systems with multiple DMICs, Nuvoton NAU8318, NXP fsl_rpmsg and i.MX93, Qualcomm AudioReach Enable, MFC and SAL, RealTek RT1318 and Rockchip RK3588 There's more cross tree updates than usual, though all fairly minor: - Some OMAP board file updates that were depedencies for removing their providers in ASoC, as part of a wider effort removing the support for the relevant OMAP platforms. - A new I2C API required for updates to the new I2C probe API. - A DRM update making use of a new API for fixing the capabilities advertised via hdmi-codec. Since this is being sent early I might send some more stuff if you've not yet sent your pull request and there's more come in. ---------------------------------------------------------------- Aidan MacDonald (11): ASoC: jz4740-i2s: Handle independent FIFO flush bits ASoC: jz4740-i2s: Convert to regmap API ASoC: jz4740-i2s: Simplify using regmap fields ASoC: jz4740-i2s: Use FIELD_PREP() macros in hw_params callback ASoC: jz4740-i2s: Align macro values and sort includes ASoC: jz4740-i2s: Support S20_LE and S24_LE sample formats ASoC: jz4740-i2s: Support continuous sample rate ASoC: jz4740-i2s: Move component functions near the component driver ASoC: jz4740-i2s: Refactor DAI probe/remove ops as component ops ASoC: jz4740-i2s: Remove .set_sysclk() ASoC: ingenic: Remove unnecessary clocks from schema Ajye Huang (5): ASoC: mediatek: dt-bindings: modify machine bindings for two MICs case ASoC: mediatek: mt8186-rt5682: Modify machine driver for two DMICs case ASoC: Intel: sof_rt5682: add support for ALC5682I-VD with amp rt1019p ASoC: Intel: sof rt5682: remove the duplicate codes ASoC: SOF: amd: Use poll function instead to read ACP_SHA_DSP_FW_QUALIFIER Alicja Michalska (1): ASoC: Intel: avs: Add missing audio amplifier for KBL Amadeusz Sławiński (21): ASoC: Intel: avs: Add max98927 machine board ASoC: Intel: avs: Load max98927 on target platform ASoC: codecs: rt298: Add quirk for KBL-R RVP platform ASoC: Intel: avs: Add quirk for KBL-R RVP platform ASoC: Intel: avs: Support da7219 on both KBL and APL ASoC: Intel: avs: Add missing include to HDA board ASoC: Intel: boards: Fix typo in comments ASoC: Intel: avs: boards: Fix typo in comments ASoC: Intel: avs: Handle SUSPEND and RESUME triggers ASoC: codecs: da7219: Introduce set_jack() callback ASoC: codecs: da7219: Do not export internal symbols ASoC: Intel: avs: da7219: Refactor jack handling ASoC: Intel: avs: nau8825: Refactor jack handling ASoC: Intel: avs: rt274: Refer to DAI name through a constant ASoC: Intel: avs: rt274: Refactor jack handling ASoC: Intel: avs: rt286: Add define for codec DAI name ASoC: Intel: avs: rt286: Refactor jack handling ASoC: Intel: avs: rt298: Add define for codec DAI name ASoC: Intel: avs: rt298: Refactor jack handling ASoC: Intel: avs: rt5682: Add define for codec DAI name ASoC: Intel: avs: rt5682: Refactor jack handling Andy Shevchenko (1): ASoC: SOF: probes: Check ops before memory allocation Angel Iglesias (1): i2c: core: Introduce i2c_client_get_device_id helper function Artem Lukyanov (1): ASoC: amd: yc: Add Xiaomi Redmi Book Pro 14 2022 into DMI table Ban Tao (1): ASoC: sun50i-dmic: avoid unused variable warning for sun50i_dmic_of_match Bard Liao (3): ASoC: SOF: ipc4-topology: rename sof_ipc4_widget_free_comp ASoC: SOF: ipc4-loader: get max pipeline number ASoC: SOF: ipc4: get pipeline instance id from pipe_widget->instance_id Brent Lu (1): ASoC: Intel: sof_nau8825: support rt1015p speaker amplifier Cezary Rojewski (28): ASoC: Intel: avs: Fix DMA mask assignment ASoC: Intel: avs: Fix potential RX buffer overflow ASoC: Intel: avs: Support AML with rt286 configuration ASoC: Intel: avs: Add missing SKL-based device IDs ASoC: Intel: avs: Simplify d0ix disabling routine ASoC: Intel: avs: Do not reuse msg between different IPC handlers ASoC: Intel: avs: Do not treat unsupported IPCs as invalid ASoC: Intel: avs: Do not print IPC error message twice ASoC: Intel: avs: Simplify ignore_fw_version description ASoC: Intel: avs: Simplify log control for SKL ASoC: codecs: hda: Fix spelling error in log message ASoC: Intel: avs: Split pcm pages freeing operation from hw_free() ASoC: Intel: avs: Introduce PCM power management routines ALSA: hda: Introduce snd_hdac_stream_wait_drsm() ASoC: Intel: avs: Restart instead of resuming HDA capture streams ASoC: Intel: avs: Count low power streams ASoC: Intel: avs: Power and clock gating policy overriding ASoC: Intel: avs: Enact power gating policy ASoC: Intel: Drop da7219_aad_jack_det() usage ASoC: mediatek: Drop da7219_aad_jack_det() usage ASoC: rockchip: Drop da7219_aad_jack_det() usage ASoC: amd: Drop da7219_aad_jack_det() usage ASoC: Intel: avs: Drop da7219_aad_jack_det() usage ASoC: Intel: avs: Initialize private data for subsequent HDA FEs ASoC: core: Exit all links before removing their components ASoC: Intel: avs: Lock substream before snd_pcm_stop() ASoC: Intel: avs: Disconnect substream if suspend or resume fails ASoC: Intel: bdw_rt286: Refactor jack handling Chancel Liu (13): ASoC: dt-bindings: fsl_rpmsg: Add a property to assign the rpmsg channel ASoC: imx-audio-rpmsg: Create rpmsg channel for MICFIL ASoC: imx-pcm-rpmsg: Register different platform drivers ASoC: imx-pcm-rpmsg: Multi-channel support for sound card based on rpmsg ASoC: fsl_rpmsg: Register different ASoC machine devices ASoC: fsl_rpmsg: Multi-channel support in CPU DAI driver ASoC: imx-rpmsg: Assign platform driver used by machine driver to link with ASoC: dt-bindings: fsl,sai: Add compatible string for i.MX93 platform ASoC: fsl_sai: Add support for i.MX93 platform ASoC: fsl_sai: Specify the maxburst to 8 on i.MX93 platform ASoC: dt-bindings: fsl,micfil: Add compatible string for i.MX93 platform ASoC: fsl_micfil: Add support for i.MX93 platform ASoC: fsl_micfil: Add support when using eDMA Chao Song (3): ASoC: SOF: Add support for parsing the number of sink/source pins ASoC: SOF: Add support to parse pin binding array from topology ASoC: SOF: topology: Add helper to get/put widget queue id Charles Keepax (9): sound: sdw: Add hw_params to SoundWire config helper function ASoC: max98373-sdw: Switch to new snd_sdw_params_to_config helper ASoC: rt1308-sdw: Switch to new snd_sdw_params_to_config helper ASoC: rt1316-sdw: Switch to new snd_sdw_params_to_config helper ASoC: rt5682-sdw: Switch to new snd_sdw_params_to_config helper ASoC: rt700: Switch to new snd_sdw_params_to_config helper ASoC: rt711: Switch to new snd_sdw_params_to_config helper ASoC: rt715: Switch to new snd_sdw_params_to_config helper ASoC: sdw-mockup: Switch to new snd_sdw_params_to_config helper Chen Zhongjin (1): ASoC: soc-utils: Remove __exit for snd_soc_util_exit() Christophe JAILLET (1): ASoC: codecs: Remove a useless include Claudiu Beznea (3): ASoC: mchp-spdiftx: simplify locking around ctrl->ch_stat ASoC: mchp-spdiftx: add runtime pm support ASoC: mchp-spdiftx: add support for system suspend/resume Colin Ian King (6): ASoC: twl4030: make read-only array ramp_base static const ASoC: Intel: cirrus-common: Make const array uid_strings static ASoC: tegra: Fix spelling mistake "fliter" -> "filter" ASoC: wcd938x: Make read-only array minCode_param static const ASoC: uniphier: aio-core: Make some read-only arrays static const ASoC: rt715: Make read-only arrays capture_reg_H and capture_reg_L static const David Lin (4): ASoC: nau8825: Adjust internal clock during jack detection ASoC: nau8825: Add a manually mechanism for detection failure ASoC: nau8315: add new acpi id and compatible id ASoC: dt-bindings: add compatible string for NAU8318 David Rau (1): ASoC: da7219: Fix pole orientation detection on OMTP headsets when playing music Dmitry Torokhov (4): ARM: omap2: n8x0: stop instantiating codec platform data ASoC: tlv320aic3x: remove support for platform data ASoC: tlv320aic3x: switch to using gpiod API ASoC: dt-bindings: wcd9335: fix reset line polarity in example Doug Brown (3): ASoC: dt-bindings: add schema for WM8961 ASoC: wm8961: add support for devicetree ASoC: codecs: allow WM8961 to be selected by the user Gaosheng Cui (1): ASoC: amd: acp: Fix possible UAF in acp_dma_open Gongjun Song (12): ASoC: Intel: sof_sdw: Add support for SKU 0C10 product ASoC: Intel: soc-acpi: add SKU 0C10 SoundWire configuration ASoC: Intel: sof_sdw: Add support for SKU 0C40 product ASoC: Intel: soc-acpi: add SKU 0C40 SoundWire configuration ASoC: Intel: sof_sdw: Add support for SKU 0C10 product ASoC: Intel: soc-acpi: add SKU 0C10 SoundWire configuration ASoC: Intel: sof_sdw: Add support for SKU 0C40 product ASoC: Intel: soc-acpi: add SKU 0C40 SoundWire configuration ASoC: Intel: sof_sdw: Add support for SKU 0C4F product ASoC: intel: sof_sdw: add rt1318 codec support. ASoC: Intel: sof_sdw: Add support for SKU 0C11 product ASoC: Intel: soc-acpi: add SKU 0C11 SoundWire configuration Jean Delvare (2): ASoC: rsnd: Drop obsolete dependency on COMPILE_TEST ASoC: SOF: Drop obsolete dependency on COMPILE_TEST Jiasheng Jiang (1): ASoC: mediatek: mtk-btcvsd: Add checks for write and read of mtk_btcvsd_snd Jiaxin Yu (1): ASoC: mediatek: mt8186: Correct I2S shared clocks Jyri Sarha (5): ASoC: SOF: probes: Replace [0] union members with DECLARE_FLEX_ARRAY() ASoC: SOF: probes: Separate IPC3 operations to a separate file ASoC: SOF: client: Add sof_client_ipc_set_get_data() ASoC: SOF: client: Add sof_client_ipc4_find_module() function ASoC: SOF: IPC4: probes: Implement IPC4 ops for probes client device Kai Vehmanen (1): ASoC: SOF: Intel: hda-loader: use small buffer for iccmax stream Krzysztof Kozlowski (23): ASoC: dt-bindings: qcom,lpass: do not hard-code clock-output-names ASoC: codecs: lpass-wsa-macro: parse clock-output-names ASoC: qcom: q6prm: Correct module description ASoC: dt-bindings: qcom,wsa883x: Use correct SD_N polarity ASoC: codecs: wsa883x: Use proper shutdown GPIO polarity ASoC: codecs: wsa883x: Shutdown on error path ASoC: codecs: wsa883x: Simplify with dev_err_probe ASoC: dt-bindings: qcom,apr: Add GLINK channel name for SM8450 ASoC: dt-bindings: qcom,apr: Split services to shared schema ASoC: dt-bindings: qcom,apr: Correct and extend example ASoC: dt-bindings: qcom,q6afe: Split to separate schema ASoC: dt-bindings: qcom,q6apm: Split to separate schema ASoC: dt-bindings: qcom,q6adm: Split to separate schema ASoC: dt-bindings: qcom,q6asm: Split to separate schema ASoC: dt-bindings: qcom,q6prm: Split to separate schema ASoC: dt-bindings: qcom,q6core: Split to separate schema ASoC: dt-bindings: qcom,q6apm-lpass-dais: Split to separate schema ASoC: dt-bindings: qcom,q6apm: Add SM8450 bedais node ASoC: dt-bindings: Extend name-prefix.yaml into common DAI properties ASoC: dt-bindings: Reference common DAI properties ASoC: dt-bindings: maxim,max98357a: Convert to DT schema ASoC: dt-bindings: maxim,max98504: Convert to DT schema ASoC: dt-bindings: Correct Alexandre Belloni email Kuninori Morimoto (21): ASoC: soc-dapm.c: replace snd_soc_dapm_wcache to snd_soc_dapm_widget ASoC: soc-dapm.c: tidyup error handling on snd_soc_dapm_add_route() ASoC: soc-dapm.c: remove no meaning variable from snd_soc_dapm_add_path() ASoC: soc-dapm.c: ignore parameter NULL at snd_soc_dapm_free_widget() ASoC: soc-dapm.c: cleanup dapm_widget_set_power() ASoC: soc-dapm.c: replace snd_soc_dapm_wcache to snd_soc_dapm_widget ASoC: soc-dapm.c: tidyup error handling on snd_soc_dapm_add_route() ASoC: soc-dapm.c: remove no meaning variable from snd_soc_dapm_add_path() ASoC: soc-dapm.c: ignore parameter NULL at snd_soc_dapm_free_widget() ASoC: soc-dapm.c: cleanup dapm_widget_set_power() ASoC: soc-dapm.c: merge dapm_power_one_widget() and dapm_widget_set_power() ASoC: soc-dapm.c: cleanup snd_soc_dapm_new_dai() ASoC: soc-dapm.c: numerical order for dapm_up_seq ASoC: soc-dapm.h: cleanup white space ASoC: soc-dapm.h: fixup comment for snd_soc_dapm_widget_for_each_path() ASoC: soc-dpcm.h: remove snd_soc_dpcm::hw_param ASoC: simple-card-utils: remove asoc_simple_convert_fixup() ASoC: audio-graph-card2-custom-sample.dtsi: add convert-rate for DPCM (MIXer) ASoC: audio-graph-card2: check also dpcm node for convert-xxx ASoC: audio-graph-card2: remove Experimental announce ASoC: rsnd: adg: use __clk_get_name() instead of local clk_name[] Lili Li (1): ASoC: Intel: Skylake: Fix Kconfig dependency Maarten Zanders (4): ASoC: simple-mux: add read function ASoC: adau1372: fix mclk ASoC: adau1372: correct PGA enable & mute bit ASoC: adau1372: add support for S24_LE mode Marcin Wojtas (1): ASoC: kirkwood: enable Kirkwood driver for Armada 38x platforms Marek Vasut (3): ASoC: dt-bindings: fsl-sai: Fix mx6ul and mx7d compatible strings ASoC: dt-bindings: fsl-sai: Use minItems 5 for i.MX8MN clock and similar ASoC: dt-bindings: fsl-sai: Sort main section properties Mark Brown (52): Merge existing fixes from asoc/for-6.1 into new branch ASoC: Intel: avs: Add support for max98927 codec ASoC: Use DIV_ROUND_UP() instead of open-coding it ASoC: codecs: jz4725b: Various improvements and fixes Create a new sound card to access MICFIL based on rpmsg channel ASoC: Intel: avs: Fixes and new boards support ASoC: add devicetree support for WM8961 codec ASoC: Intel/SOF: simplify S3 resume flows ASoC: soc-dapm.c random cleanups ASoC: SOF: Intel: Harden the IPC4 low level sequencing ASoC: soc-dapm.c random cleanups ASoC: Merge HDA/ext cleanup ASoC: SOF: Intel/IPC4: Support for external firmware libraries ASoC: cleanups and improvements for jz4740-i2s ASoC: SOF: Intel: HDaudio cleanups ASoC: Intel: Fix typo in comments Add support for SAI on i.MX93 platform ASoC: Intel: avs: PCM power management ASoC: SOF: Intel: HDA: refactor codec and multi-link suport ASoC: qdsp6: audioreach: add multi-port, SAL and MFC support ASoC: SOF: client-probes: Add support for IPC4 ASoC: jz4740-i2s: Remove .set_sysclk() & friends Add support for MICFIL on i.MX93 platform Modify documentation and machine driver for mt8186_rt1019_rt5682s sound card ASoC: mediatek: Register machine drivers to module device table ASoC: SOF: Intel: update D0i3 registers for MTL ASoC: SOF: get pipeline instance id from pipe_widget->instance_id Adjust usage of rt5682(s) power supply properties ASoC: simpe-card/audio-graph fixups ASoC: SOF: ipc4-topology: Add widget queue support ASoC: codecs: da7219: Do not export da7219_aad_jack_det() ASoC: Set BQ parameters for some Dell models ASoC: Intel: add more ACPI tables/quirks for RPL/MTL ASoC: Intel: add new Dell devices support Adds the combination of headset codec ALC5682I-VD + amp rt1019p ASoC: mchp-spdiftx: add power saving features ASoC: Intel: add Dell SKU 0C11 support ASoC: Intel: avs: DSP recovery and resume fixes Merge branch 'i2c/client_device_id_helper-immutable' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into HEAD ASoC: wm_adsp: Report when a control write changes the value ASoC/soundwire: revisit interrupt and lcount handling firmware: cs_dsp: Switch to using namespaced exports ASoC: adau1372: fixes after debugging custom board RK3588 Audio Support ASoC: dt-bindings: Rework Qualcomm APR/GPR Sound nodes for SM8450 ASoC: Merge up fixes ASoC: Intel: avs: Refactor jack handling ASoC: Intel: avs: rt5682: Refactor jack handling ASoC: hdmi-codec: Allow playback and capture to be disabled drm: tda99x: Don't advertise non-existent capture support ASoC/tda998x: Fix reporting of nonexistent capture streams Add SOF panic dump support for AMD platform. Matthias Kaehlcke (1): ASoC: qcom: lpass-sc7180: Delete redundant error log from _resume() Minghao Chi (1): ASoC: sunxi: use devm_platform_get_and_ioremap_resource() Nicolas Frattaroli (4): ASoC: dt-bindings: rockchip: i2s-tdm: Make grf property optional ASoC: rockchip: i2s_tdm: Make the grf property optional ASoC: dt-bindings: rockchip: i2s-tdm: Add RK3588 compatible ASoC: rockchip: i2s_tdm: Add support for RK3588 Nícolas F. R. A. Prado (20): ASoC: dt-bindings: mt8192-mt6359: Set maxItems, not type, for sound-dai ASoC: dt-bindings: realtek,rt5682s: Add #sound-dai-cells ASoC: dt-bindings: rt5682: Set sound-dai-cells to 1 ASoC: mediatek: mt8183-da7219: Register to module device table ASoC: mediatek: mt8183-mt6358: Register to module device table ASoC: dt-bindings: realtek,rt5682s: Add AVDD and MICVDD supplies ASoC: dt-bindings: realtek,rt5682s: Add DBVDD and LDO1-IN supplies ASoC: dt-bindings: rt5682: Add AVDD, MICVDD and VBAT supplies ASoC: dt-bindings: rt5682: Add DBVDD and LDO1-IN supplies ASoC: rt5682s: Support DBVDD and LDO1-IN supplies ASoC: rt5682: Support DBVDD and LDO1-IN supplies ASoC: mediatek: mt2701-cs42448: Register to module device table ASoC: mediatek: mt2701-wm8960: Register to module device table ASoC: mediatek: mt6797-mt6351: Register to module device table ASoC: mediatek: mt8183-da7219: Register to module device table ASoC: mediatek: mt8183-mt6358: Register to module device table ASoC: mediatek: mt8186-da7219: Register to module device table ASoC: mediatek: mt8186-rt5682: Register to module device table ASoC: mediatek: mt8192-mt6359: Register to module device table ASoC: mediatek: mt8195-mt6359: Register to module device table Oder Chiou (1): ASoC: rt5640: Fix Jack work after system suspend Pavel Dobias (1): ASoC: max9867: Implement exact integer mode Peter Bergin (1): ASoC: cs42xx8-i2c.c: add module device table for of Peter Ujfalusi (25): ASoC: SOF: ipc4: Log the tx message before sending it ASoC: SOF: Intel: ipc4: Read the interrupt reason registers at the same time ASoC: SOF: Intel: ipc4: Wait for channel to be free before sending a message ASoC: SOF: Intel: ipc4: Ack a received reply or notification separately ASoC: SOF: ipc3: Log the tx message before sending it ASoC: SOF: Introduce container struct for SOF firmware ASoC: SOF: amd: Use the basefw firmware container directly ASoC: SOF: Intel: hda-loader: Use the basefw firmware container directly ASoC: SOF: Intel: hda-loader-skl: Use the basefw firmware container directly ASoC: SOF: Drop the firmware and fw_offset from snd_sof_pdata ASoC: SOF: ipc: ops: Add support for optional init and exit callbacks ASoC: SOF: ipc4-loader: Save the maximum number of libraries supported ASoC: SOF: ipc4: Convert the firmware handling (loader) to library convention ASoC: SOF: IPC4: Add helper for looking up module by UUID ASoC: SOF: Add path definition for external firmware libraries ASoC: SOF: Intel: Set the default firmware library path for IPC4 ASoC: SOF: ipc4: Define platform dependent library loading callback ASoC: SOF: Intel: hda: Add flag to indicate that the firmware is IMR booted ASoC: SOF: Intel: Add ipc4 library loading implementation ASoC: SOF: loader: Add support for IPC dependent post firmware boot ops ASoC: SOF: ipc4: Stop using the query_fw_configuration fw_loader ops ASoC: SOF: loader: Remove the query_fw_configuration ops ASoC: SOF: ipc4-loader: Support for loading external libraries ASoC: SOF: ipc4-loader: Return ssize_t from sof_ipc4_fw_parse_ext_man() ASoC: SOF: ipc4-topology: Implement tear_down_all_pipelines callback Pierre-Louis Bossart (60): ASoC: Intel: Skylake: simplify S3 resume flows ASoC: Intel: avs: simplify S3 resume flows ASoC: SOF: Intel: hda-dsp: simplify S3 resume flows ALSA: hda: ext: hdac_ext_controller: use helpers in loop ALSA: hda: ext: hda_ext_controller: use hlink variable/parameter ASoC: SOF: Intel: hda-dai: use hlink variable/parameter ALSA/ASoC: hda: clarify bus_get_link() and bus_link_get() helpers ALSA/ASoC: hda: ext: add 'ext' prefix to snd_hdac_link_free_all ALSA/ASoC: hda: ext: remove 'link' prefix for stream-related operations ALSA/ASoC: hda: ext: add 'bus' prefix for multi-link stream setting ALSA: hda: ext: reduce ambiguity between 'multi-link' and 'link' DMA ALSA: hda: hdac_ext_controller: remove useless loop ALSA/ASoC: hda: move SPIB/DRMS functionality from ext layer ASoC: SOF: ops: fallback to mmio in helpers ASoC: SOF: Intel: use mmio fallback for all platforms ASoC: SOF: ops: add readb/writeb helpers ASoC: SOF: ops: add snd_sof_dsp_updateb() helper ASoC: SOF: Intel: hda-dsp: use SOF helpers for consistency ASoC: SOF: Intel: hda-dai: start removing the use of runtime->private_data in BE ASoC: SOF: Intel: hda-dai: use component_get_drvdata to find hdac_bus ASoC: SOF: Intel: hda-dai: remove useless members in hda_pipe_params ASoC: SOF: Intel: hda-ctrl: remove useless sleep ASoC: SOF: Intel: hda: always do a full reset ASoC: SOF: Intel: hda: remove useless check on GCTL ASoC: SOF: Intel: hda-stream: use SOF helpers for consistency ASoC: SOF: Intel: hda-stream: rename CL_SD_CTL registers as SD_CTL ASoC: SOF: Intel: hda: use SOF helper for consistency ASoC: SOF: Intel: hda-stream: use snd_sof_dsp_updateb() helper ASoC: SOF: Intel: hda-stream: use readb/writeb for stream registers ASoC: SOF: Intel: remove option to disable the common_hdmi handling ASoC: SOF: Intel: remove all dependencies on SND_SOC_HDAC_HDMI ASoC: SOF: Intel: hda-codec: simplify SND_SOC_SOF_HDA_AUDIO_CODEC handling ASoC: SOF: Intel: move codec state change to hda-codec.c ASoC: SOF: Intel: start moving multi-link handling in dedicated file ASoC: SOF: Intel: hda: add multi-link helper for LOSVID ASoC: SOF: Intel: move all RIRB/CMD_IO helpers to hda-codec.c ASoC: SOF: Intel: hda-ctrl: add codec wakeup helper ASoC: SOF: Intel: hda-codec: add hda_codec_device_remove() helper ASoC: SOF: Intel: hda-codec: add stop_cmd_io helper ASoC: SOF: Intel: hda-stream: always allocate CORB/RIRB buffer ASoC: SOF: Intel: hda-codec: add hda_codec_check_rirb_status() helper ASoC: SOF: Intel: hda-ctrl: use helper to clear RIRB status ASoC: SOF: Intel: hda-dsp: clarify dependencies on SND_SOC_SOF_HDA ASoC: SOF: Intel: hda-codec: add helpers to suspend and resume cmd_io ASoC: SOF: Intel: clarify bus_init and bus_exit sequences ASoC: SOF: Intel: hda-mlink: add helpers to suspend/resume links ASoC: SOF: Intel: add hda_bus_ml_free helper ASoC: SOF: Intel: hda: clarify Kconfig dependencies ASoC: SOF: Intel: hda-codec: use GPL-2.0-only license ASoC: SOF: introduce new DEBUG_NOCODEC mode ASoC: SOF: fix compilation issue with readb/writeb helpers ASoC: Intel: sof_sdw_amp: mark coeff tables with __maybe_unused soundwire: intel_init: remove useless interrupt enablement in interrupt thread ASoC: SOF: Intel: hda: add per-chip enable_sdw_irq() callback ASoC: SOF: Intel: mtl: factor interrupt enable/disable interrupt functions ASoC: SOF: Intel: mtl: move SoundWire interrupt enabling to callback ASoC: SOF: Intel: hda: add callback to check SoundWire lcount information soundwire: intel_init: remove sdw_intel_enable_irq() soundwire: intel_init: remove check on number of links ASoC: SOF: Intel: hda: read multi-link capabilities earlier Piotr Maziarz (1): ASoC: Intel: avs: Standby power-state support Rander Wang (3): ASoC: SOF: Intel: add d0i3 definition for MTL ASoC: SOF: Intel: add d0i3_offset in chip_info ASoC: SOF: Intel: set d0i3 register with d0i3_offset Randy Dunlap (1): ASoC: codecs: wsa883x: use correct header file Ranjani Sridharan (1): ASoC: SOF: loader: Set complete state before post_fw_run op Ricardo Ribalda (2): ASoC: mediatek: mt8173: Enable IRQ when pdata is ready ASoC: SOF: mediatek: add shutdown callback Richard Fitzgerald (4): ASoC: wm_adsp: Allow client to hook into pre_run callback ASoC: soc-dai: Do not call snd_soc_link_be_hw_params_fixup() twice firmware: cs_dsp: Rename KConfig symbol CS_DSP -> FW_CS_DSP firmware: cs_dsp: Make the exports namespaced Rob Herring (1): ASoC: dt-bindings: Convert dmic-codec to DT schema Samuel Holland (1): ASoC: dt-bindings: sun50i-dmic: Add D1 compatible string Shang XiaoJing (4): ASoC: cs35l36: Use DIV_ROUND_UP() instead of open-coding it ASoC: wm8978: Use DIV_ROUND_UP() instead of open-coding it ASoC: rsnd: Use DIV_ROUND_UP() instead of open-coding it ASoC: ti: davinci-mcasp: Use DIV_ROUND_UP() instead of open-coding it Shaomin Deng (1): ASoC: meson: axg-pdm: Fix double word in comments Shengjiu Wang (2): ASoC: fsl_micfil: Add Hardware Voice Activity Detector support ASoC: fsl_xcvr: Add Counter registers Shuming Fan (5): ASoC: rt1308-sdw: get BQ params property and apply them ASoC: rt1316-sdw: get BQ params property and apply them ASoC: Intel: sof_sdw_rt1308: add BQ params for the Dell models ASoC: Intel: sof_sdw_rt1316: add BQ params for the Dell models ASoC: rt1318: Add RT1318 SDCA vendor-specific driver Siarhei Volkau (3): ASoC: codecs: jz4725b: use right control for Master Playback ASoC: codecs: jz4725b: add missed Mixer inputs ASoC: codecs: jz4725b: add missed microphone widgets Simon Trimmer (2): firmware: cs_dsp: cs_dsp_coeff_write_ctrl() should report changed ASoC: wm_adsp: Return whether changed when writing controls Srinivas Kandagatla (11): ASoC: qdsp6: audioreach: topology use idr_alloc_u32 ASoC: qdsp6: audioreach: remove unused connection_list ASoC: qdsp6: audioreach: update dapm kcontrol private data ASoC: qdsp6: audioreach: Simplify handing FE and BE graph connections ASoC: qdsp6: audioreach: simplify module_list sz calculation ASoC: qdsp6: audioreach: add support for more port connections ASoC: qdsp6: audioreach: add support to enable SAL Module ASoC: qdsp6: audioreach: add support for MFC Module ASoC: qdsp6: audioreach: add support to enable module command ASoC: codecs: tx-macro: add dmic support via tx macro ASoC: qcom: cleanup and fix dependency of QCOM_COMMON Srinivasa Rao Mandadapu (4): ASoC: qcom: lpass-sc7180: Add system suspend/resume PM ops ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops ASoC: qcom: lpass-sc7180: Add maybe_unused tag for system PM ops ASoC: qcom: lpass-sc7280: Add maybe_unused tag for system PM ops Syed Saba Kareem (2): ASoC: amd: ps: update macros with ps platform naming convention ASoC: amd: ps: Move acp63_dev_data strcture from PCI driver Uwe Kleine-König (4): ASoC: codecs: es8326: Convert to i2c's .probe_new() ASoC: codecs: tas2780: Convert to i2c's .probe_new() ASoC: max98396: Convert to i2c's .probe_new() ASoC: codecs: src4xxx-i2c: Convert to i2c's .probe_new() V sujith kumar Reddy (5): ASoC: SOF: amd: Fix for reading position updates from stream box. ASoC: SOF: amd: Fix for selecting clock source as external clock. ASoC: SOF: amd: ADD HS and SP virtual DAI. ASoC: SOF: Add DAI configuration support for AMD platforms. ASoC : SOF: amd: Add support for IPC and DSP dumps Venkata Prasad Potturu (2): ASoC: amd: acp: Add TDM slots setting support for ACP I2S controller ASoC: amd: acp: Add setbias level for rt5682s codec in machine driver Vijendar Mukunda (1): ASoC: amd: Update Pink Sardine platform ACP register header Viorel Suman (1): ASoC: ak4458: add optional reset control to instead of gpio Yang Yingliang (3): ASoC: cs42l83: change cs42l83_regmap to static ASoC: Intel: Skylake: fix possible memory leak in skl_codec_device_init() ASoC: SOF: Intel: hda-codec: fix possible memory leak in hda_codec_device_init() Yong Zhi (2): ASoC: SOF: Intel: MTL: fix comment error ASoC: Intel: soc-acpi: add MTL AIC SoundWire configurations Yuan Can (1): ASoC: qcom: Add checks for devm_kcalloc Zeng Heng (1): ASoC: pxa: fix null-pointer dereference in filter() Zhang Qilong (1): ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe lishqchn (1): ASoC: core: fix wrong size kzalloc for rtd's components member syed saba kareem (1): ASoC: amd: fix ACP version typo mistake .mailmap | 4 +- CREDITS | 9 + .../ABI/testing/sysfs-kernel-mm-memory-tiers | 4 +- Documentation/admin-guide/acpi/index.rst | 1 - Documentation/admin-guide/device-mapper/verity.rst | 4 + Documentation/admin-guide/media/vivid.rst | 2 +- Documentation/arm64/booting.rst | 8 + Documentation/arm64/cpu-feature-registers.rst | 38 +- Documentation/block/ublk.rst | 36 + Documentation/core-api/kernel-api.rst | 6 + Documentation/dev-tools/kmsan.rst | 1 + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 2 +- .../bindings/hwlock/qcom-hwspinlock.yaml | 29 +- .../devicetree/bindings/input/goodix,gt7375p.yaml | 5 +- .../bindings/media/i2c/dongwoon,dw9714.txt | 9 - .../bindings/media/i2c/dongwoon,dw9714.yaml | 47 + .../devicetree/bindings/net/engleder,tsnep.yaml | 2 +- .../bindings/net/nfc/samsung,s3fwrn5.yaml | 1 - .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 4 - .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 3 + .../bindings/soc/qcom/qcom,apr-services.yaml | 54 + .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 170 +- .../devicetree/bindings/sound/adi,adau1372.yaml | 7 +- .../devicetree/bindings/sound/adi,adau1977.yaml | 1 + .../devicetree/bindings/sound/adi,adau7118.yaml | 5 +- .../devicetree/bindings/sound/ak4375.yaml | 5 +- .../devicetree/bindings/sound/ak4613.yaml | 5 +- .../devicetree/bindings/sound/ak4642.yaml | 5 +- .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 3 +- .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 3 +- .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 3 +- .../bindings/sound/allwinner,sun50i-h6-dmic.yaml | 12 +- .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 5 +- .../devicetree/bindings/sound/amlogic,aiu.yaml | 2 +- .../bindings/sound/amlogic,g12a-toacodec.yaml | 2 +- .../devicetree/bindings/sound/amlogic,t9015.yaml | 2 +- .../devicetree/bindings/sound/apple,mca.yaml | 5 +- .../devicetree/bindings/sound/awinic,aw8738.yaml | 2 +- .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 3 +- .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 5 +- .../devicetree/bindings/sound/cirrus,cs42l51.yaml | 5 +- .../bindings/sound/cirrus,lochnagar.yaml | 5 +- .../devicetree/bindings/sound/cirrus,madera.yaml | 3 + .../sound/{name-prefix.yaml => dai-common.yaml} | 6 +- .../bindings/sound/davinci-mcasp-audio.yaml | 3 +- .../devicetree/bindings/sound/dmic-codec.yaml | 55 + Documentation/devicetree/bindings/sound/dmic.txt | 22 - .../devicetree/bindings/sound/everest,es8316.yaml | 5 +- .../devicetree/bindings/sound/fsl,micfil.yaml | 1 + .../devicetree/bindings/sound/fsl,rpmsg.yaml | 36 +- .../devicetree/bindings/sound/fsl,sai.yaml | 100 +- .../bindings/sound/google,cros-ec-codec.yaml | 5 +- .../devicetree/bindings/sound/ingenic,aic.yaml | 15 +- .../devicetree/bindings/sound/ingenic,codec.yaml | 5 +- .../bindings/sound/intel,keembay-i2s.yaml | 5 +- .../devicetree/bindings/sound/linux,bt-sco.yaml | 5 +- .../devicetree/bindings/sound/linux,spdif-dit.yaml | 2 +- .../bindings/sound/marvell,mmp-sspa.yaml | 5 +- .../devicetree/bindings/sound/max98357a.txt | 28 - .../devicetree/bindings/sound/max98504.txt | 44 - .../devicetree/bindings/sound/maxim,max98357a.yaml | 52 + .../devicetree/bindings/sound/maxim,max98504.yaml | 86 + .../devicetree/bindings/sound/mchp,i2s-mcc.yaml | 18 +- .../devicetree/bindings/sound/mchp,spdiftx.yaml | 5 +- .../devicetree/bindings/sound/microchip,pdmc.yaml | 5 +- .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 14 +- .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 3 +- .../devicetree/bindings/sound/mvebu-audio.txt | 14 +- .../devicetree/bindings/sound/nau8315.txt | 6 + .../bindings/sound/nvidia,tegra186-asrc.yaml | 2 +- .../bindings/sound/nvidia,tegra186-dspk.yaml | 2 +- .../bindings/sound/nvidia,tegra20-spdif.yaml | 5 +- .../bindings/sound/nvidia,tegra210-adx.yaml | 2 +- .../bindings/sound/nvidia,tegra210-amx.yaml | 2 +- .../bindings/sound/nvidia,tegra210-dmic.yaml | 2 +- .../bindings/sound/nvidia,tegra210-i2s.yaml | 2 +- .../bindings/sound/nvidia,tegra210-mixer.yaml | 2 +- .../bindings/sound/nvidia,tegra210-mvc.yaml | 2 +- .../bindings/sound/nvidia,tegra210-ope.yaml | 2 +- .../bindings/sound/nvidia,tegra210-sfc.yaml | 2 +- .../devicetree/bindings/sound/nxp,tfa989x.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 3 +- .../bindings/sound/qcom,lpass-rx-macro.yaml | 8 +- .../bindings/sound/qcom,lpass-tx-macro.yaml | 8 +- .../bindings/sound/qcom,lpass-va-macro.yaml | 8 +- .../bindings/sound/qcom,lpass-wsa-macro.yaml | 8 +- .../bindings/sound/qcom,q6adm-routing.yaml | 27 +- .../devicetree/bindings/sound/qcom,q6adm.yaml | 51 + .../devicetree/bindings/sound/qcom,q6afe.yaml | 68 + .../devicetree/bindings/sound/qcom,q6apm-dai.yaml | 19 +- .../bindings/sound/qcom,q6apm-lpass-dais.yaml | 35 + .../devicetree/bindings/sound/qcom,q6apm.yaml | 68 + .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 48 +- .../devicetree/bindings/sound/qcom,q6asm.yaml | 68 + .../devicetree/bindings/sound/qcom,q6core.yaml | 39 + .../bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 40 +- .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 57 +- .../devicetree/bindings/sound/qcom,q6prm.yaml | 50 + .../devicetree/bindings/sound/qcom,wcd9335.txt | 2 +- .../devicetree/bindings/sound/qcom,wcd938x.yaml | 5 +- .../devicetree/bindings/sound/qcom,wsa883x.yaml | 15 +- .../devicetree/bindings/sound/realtek,rt5682s.yaml | 31 +- .../devicetree/bindings/sound/renesas,fsi.yaml | 5 +- .../devicetree/bindings/sound/renesas,rsnd.yaml | 3 +- .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 5 +- .../devicetree/bindings/sound/richtek,rt9120.yaml | 5 +- .../bindings/sound/rockchip,i2s-tdm.yaml | 7 +- .../devicetree/bindings/sound/rockchip,pdm.yaml | 5 +- .../bindings/sound/rockchip,rk3328-codec.yaml | 5 +- .../devicetree/bindings/sound/rockchip-i2s.yaml | 5 +- .../devicetree/bindings/sound/rockchip-spdif.yaml | 23 +- .../devicetree/bindings/sound/rohm,bd28623.yaml | 5 +- Documentation/devicetree/bindings/sound/rt5659.txt | 2 +- Documentation/devicetree/bindings/sound/rt5682.txt | 22 +- .../devicetree/bindings/sound/samsung-i2s.yaml | 5 +- .../devicetree/bindings/sound/sgtl5000.yaml | 5 +- .../bindings/sound/simple-audio-amplifier.yaml | 2 +- .../bindings/sound/simple-audio-mux.yaml | 2 +- .../bindings/sound/snps,designware-i2s.yaml | 30 +- .../bindings/sound/socionext,uniphier-aio.yaml | 5 +- .../bindings/sound/socionext,uniphier-evea.yaml | 5 +- .../devicetree/bindings/sound/st,stm32-i2s.yaml | 5 +- .../bindings/sound/st,stm32-spdifrx.yaml | 5 +- .../devicetree/bindings/sound/tas2562.yaml | 5 +- .../devicetree/bindings/sound/tas2770.yaml | 5 +- .../devicetree/bindings/sound/tas27xx.yaml | 5 +- .../devicetree/bindings/sound/ti,src4xxx.yaml | 2 +- .../bindings/sound/ti,tlv320adc3xxx.yaml | 5 +- .../devicetree/bindings/sound/wlf,arizona.yaml | 3 + .../devicetree/bindings/sound/wlf,wm8731.yaml | 1 + .../devicetree/bindings/sound/wlf,wm8940.yaml | 5 +- .../devicetree/bindings/sound/wlf,wm8961.yaml | 43 + .../devicetree/bindings/sound/wlf,wm8962.yaml | 5 +- .../devicetree/bindings/sound/wlf,wm8978.yaml | 5 +- .../devicetree/bindings/sound/zl38060.yaml | 5 +- Documentation/driver-api/basics.rst | 3 - Documentation/driver-api/driver-model/devres.rst | 1 + Documentation/driver-api/media/mc-core.rst | 19 +- Documentation/driver-api/miscellaneous.rst | 5 +- Documentation/hwmon/corsair-psu.rst | 2 + Documentation/kbuild/reproducible-builds.rst | 10 + Documentation/kernel-hacking/hacking.rst | 2 +- Documentation/process/2.Process.rst | 15 +- .../process/code-of-conduct-interpretation.rst | 2 +- Documentation/process/howto.rst | 2 +- Documentation/process/maintainer-netdev.rst | 10 + Documentation/trace/histogram.rst | 2 +- Documentation/translations/it_IT/process/howto.rst | 2 +- Documentation/translations/ja_JP/howto.rst | 2 +- Documentation/translations/ko_KR/howto.rst | 2 +- Documentation/translations/zh_CN/process/howto.rst | 2 +- Documentation/translations/zh_TW/process/howto.rst | 2 +- .../userspace-api/media/cec.h.rst.exceptions | 2 + .../media/v4l/libv4l-introduction.rst | 4 +- Documentation/virt/kvm/devices/vm.rst | 3 + MAINTAINERS | 151 +- Makefile | 4 +- arch/arc/boot/dts/axc003.dtsi | 4 +- arch/arc/boot/dts/axc003_idu.dtsi | 4 +- arch/arc/boot/dts/axs10x_mb.dtsi | 4 +- arch/arc/boot/dts/hsdk.dts | 4 +- arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +- arch/arc/configs/axs101_defconfig | 4 - arch/arc/configs/axs103_defconfig | 4 - arch/arc/configs/axs103_smp_defconfig | 4 - arch/arc/configs/haps_hs_defconfig | 1 - arch/arc/configs/haps_hs_smp_defconfig | 1 - arch/arc/configs/hsdk_defconfig | 1 - arch/arc/configs/nsim_700_defconfig | 1 - arch/arc/configs/nsimosci_defconfig | 1 - arch/arc/configs/nsimosci_hs_defconfig | 1 - arch/arc/configs/nsimosci_hs_smp_defconfig | 6 +- arch/arc/configs/tb10x_defconfig | 7 +- arch/arc/configs/vdk_hs38_defconfig | 3 - arch/arc/configs/vdk_hs38_smp_defconfig | 1 - arch/arc/include/asm/bitops.h | 4 +- arch/arc/include/asm/entry-compact.h | 2 +- arch/arc/include/asm/io.h | 2 +- arch/arc/include/asm/pgtable-levels.h | 2 +- arch/arc/kernel/smp.c | 2 +- arch/arc/mm/cache.c | 4 +- arch/arc/mm/ioremap.c | 2 +- arch/arm/boot/dts/imx6q-yapp4-crux.dts | 4 + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 2 +- arch/arm/boot/dts/imx6qp-yapp4-crux-plus.dts | 4 + arch/arm/boot/dts/imx7s.dtsi | 4 +- arch/arm/boot/dts/lan966x-pcb8291.dts | 20 + arch/arm/boot/dts/sama7g5-pinfunc.h | 2 +- arch/arm/boot/dts/ste-href.dtsi | 8 + arch/arm/boot/dts/ste-snowball.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 8 + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 8 + arch/arm/mach-at91/pm_suspend.S | 7 +- arch/arm/mach-omap2/board-n8x0.c | 5 - arch/arm/mach-omap2/common-board-devices.h | 2 - arch/arm/mach-omap2/pdata-quirks.c | 1 - arch/arm64/boot/dts/arm/juno-base.dtsi | 14 + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 6 + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 6 + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 6 + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 18 +- arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 16 +- .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 32 +- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 12 +- arch/arm64/boot/dts/freescale/imx8mn.dtsi | 6 +- arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 20 +- arch/arm64/boot/dts/freescale/imx93-pinfunc.h | 0 arch/arm64/boot/dts/freescale/imx93.dtsi | 11 +- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 13 +- arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 12 + arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 +- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 6 + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 36 +- .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 6 + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 6 + arch/arm64/boot/dts/qcom/sm8250.dtsi | 1 + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 12 + arch/arm64/include/asm/cputype.h | 2 +- arch/arm64/include/asm/efi.h | 8 + arch/arm64/include/asm/kvm_pgtable.h | 18 +- arch/arm64/include/asm/pgtable.h | 4 +- arch/arm64/include/asm/stage2_pgtable.h | 20 - arch/arm64/include/asm/syscall_wrapper.h | 2 +- arch/arm64/kernel/cpufeature.c | 42 +- arch/arm64/kernel/efi-rt-wrapper.S | 33 +- arch/arm64/kernel/efi.c | 78 +- arch/arm64/kernel/entry-common.c | 3 +- arch/arm64/kernel/entry-ftrace.S | 7 +- arch/arm64/kvm/hyp/Makefile | 5 +- arch/arm64/kvm/hyp/exception.c | 3 +- arch/arm64/kvm/hyp/include/hyp/switch.h | 20 + arch/arm64/kvm/hyp/nvhe/Makefile | 7 + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 2 +- arch/arm64/kvm/hyp/nvhe/switch.c | 26 - arch/arm64/kvm/hyp/vhe/switch.c | 8 - arch/arm64/kvm/mmu.c | 9 +- arch/arm64/kvm/vgic/vgic-its.c | 5 +- arch/arm64/mm/fault.c | 4 + arch/arm64/mm/pageattr.c | 5 +- arch/loongarch/include/asm/processor.h | 2 +- arch/loongarch/include/asm/ptrace.h | 4 +- arch/loongarch/kernel/head.S | 3 +- arch/loongarch/kernel/process.c | 4 +- arch/loongarch/kernel/switch.S | 2 +- arch/loongarch/net/bpf_jit.c | 31 +- arch/mips/alchemy/common/gpiolib.c | 2 +- arch/mips/boot/compressed/decompress.c | 1 + arch/mips/include/asm/fw/fw.h | 2 +- arch/mips/kernel/jump_label.c | 2 +- arch/mips/kernel/relocate_kernel.S | 15 +- arch/mips/loongson64/reset.c | 10 + arch/mips/pic32/pic32mzda/early_console.c | 13 +- arch/mips/pic32/pic32mzda/init.c | 2 +- arch/parisc/include/asm/hardware.h | 12 +- arch/parisc/include/uapi/asm/pdc.h | 36 +- arch/parisc/kernel/drivers.c | 14 +- arch/powerpc/Kconfig | 3 +- arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 6 + arch/powerpc/include/asm/syscalls.h | 7 + arch/powerpc/kernel/exceptions-64e.S | 7 + arch/powerpc/kernel/exceptions-64s.S | 14 +- arch/powerpc/kernel/interrupt.c | 14 +- arch/powerpc/kernel/interrupt_64.S | 13 +- arch/powerpc/kernel/sys_ppc32.c | 13 +- arch/powerpc/kernel/syscalls/syscall.tbl | 7 +- arch/powerpc/kernel/vmlinux.lds.S | 2 +- arch/powerpc/kvm/Kconfig | 4 + arch/powerpc/lib/vmx-helper.c | 12 +- arch/powerpc/mm/book3s64/hash_native.c | 67 +- arch/powerpc/mm/book3s64/hash_pgtable.c | 8 +- arch/powerpc/mm/book3s64/hash_utils.c | 12 +- arch/powerpc/platforms/pseries/lparcfg.c | 11 + arch/powerpc/platforms/pseries/vas.c | 83 +- arch/powerpc/platforms/pseries/vas.h | 6 + arch/riscv/Kconfig | 17 +- arch/riscv/Makefile | 6 +- .../riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 38 + arch/riscv/include/asm/cacheflush.h | 8 - arch/riscv/include/asm/jump_label.h | 8 +- arch/riscv/include/asm/kvm_vcpu_timer.h | 1 + arch/riscv/include/asm/vdso/processor.h | 2 +- arch/riscv/kernel/cpu.c | 3 + arch/riscv/kernel/process.c | 2 + arch/riscv/kernel/setup.c | 1 + arch/riscv/kernel/vdso/Makefile | 5 +- arch/riscv/kernel/vdso/vdso.lds.S | 2 + arch/riscv/kvm/vcpu.c | 3 + arch/riscv/kvm/vcpu_timer.c | 17 +- arch/riscv/mm/cacheflush.c | 38 + arch/riscv/mm/dma-noncoherent.c | 41 - arch/riscv/mm/init.c | 1 - arch/riscv/mm/kasan_init.c | 7 +- arch/s390/Kconfig | 6 +- arch/s390/Makefile | 2 - arch/s390/boot/Makefile | 3 +- arch/s390/boot/startup.c | 3 +- arch/s390/boot/vmlinux.lds.S | 13 +- arch/s390/configs/btf.config | 1 + arch/s390/configs/debug_defconfig | 65 +- arch/s390/configs/defconfig | 67 +- arch/s390/configs/kasan.config | 3 + arch/s390/configs/zfcpdump_defconfig | 1 - arch/s390/include/asm/futex.h | 3 +- arch/s390/include/asm/processor.h | 11 +- arch/s390/kernel/perf_pai_ext.c | 1 + arch/s390/kvm/kvm-s390.c | 26 +- arch/s390/kvm/kvm-s390.h | 1 - arch/s390/kvm/pci.c | 2 +- arch/s390/lib/uaccess.c | 6 +- arch/s390/pci/pci_mmio.c | 8 +- arch/x86/Kconfig | 1 - arch/x86/coco/tdx/tdx.c | 25 +- arch/x86/crypto/polyval-clmulni_glue.c | 19 +- arch/x86/events/amd/core.c | 5 +- arch/x86/events/amd/ibs.c | 2 +- arch/x86/events/amd/uncore.c | 1 + arch/x86/events/intel/core.c | 1 + arch/x86/events/intel/ds.c | 18 +- arch/x86/events/intel/lbr.c | 2 +- arch/x86/events/intel/pt.c | 9 + arch/x86/events/rapl.c | 10 +- arch/x86/hyperv/hv_init.c | 19 +- arch/x86/include/asm/intel-family.h | 11 +- arch/x86/include/asm/iommu.h | 4 +- arch/x86/include/asm/kvm_host.h | 7 +- arch/x86/include/asm/msr-index.h | 8 +- arch/x86/include/asm/qspinlock_paravirt.h | 2 +- arch/x86/include/asm/spec-ctrl.h | 10 +- arch/x86/include/asm/string_64.h | 11 +- arch/x86/include/asm/syscall_wrapper.h | 2 +- arch/x86/include/asm/uaccess.h | 13 +- arch/x86/kernel/asm-offsets.c | 6 - arch/x86/kernel/cpu/amd.c | 6 +- arch/x86/kernel/cpu/bugs.c | 15 +- arch/x86/kernel/cpu/hygon.c | 4 +- arch/x86/kernel/cpu/microcode/amd.c | 16 +- arch/x86/kernel/cpu/resctrl/core.c | 8 +- arch/x86/kernel/cpu/sgx/ioctl.c | 3 + arch/x86/kernel/cpu/topology.c | 16 +- arch/x86/kernel/fpu/core.c | 2 +- arch/x86/kernel/fpu/init.c | 8 - arch/x86/kernel/fpu/xstate.c | 42 +- arch/x86/kernel/ftrace_64.S | 34 +- arch/x86/kernel/traps.c | 7 + arch/x86/kernel/unwind_orc.c | 2 +- arch/x86/kvm/.gitignore | 2 + arch/x86/kvm/Makefile | 12 + arch/x86/kvm/cpuid.c | 13 +- arch/x86/kvm/debugfs.c | 7 +- arch/x86/kvm/emulate.c | 108 +- arch/x86/kvm/kvm-asm-offsets.c | 29 + arch/x86/kvm/mmu/mmu.c | 4 +- arch/x86/kvm/pmu.c | 2 +- arch/x86/kvm/svm/pmu.c | 7 +- arch/x86/kvm/svm/sev.c | 6 +- arch/x86/kvm/svm/svm.c | 115 +- arch/x86/kvm/svm/svm.h | 11 +- arch/x86/kvm/svm/svm_ops.h | 5 - arch/x86/kvm/svm/vmenter.S | 260 +- arch/x86/kvm/vmx/capabilities.h | 19 +- arch/x86/kvm/vmx/pmu_intel.c | 4 +- arch/x86/kvm/vmx/vmenter.S | 2 +- arch/x86/kvm/vmx/vmx.c | 23 +- arch/x86/kvm/x86.c | 144 +- arch/x86/kvm/xen.c | 64 +- arch/x86/lib/usercopy.c | 3 + arch/x86/mm/hugetlbpage.c | 4 + arch/x86/mm/pat/set_memory.c | 4 + arch/x86/power/cpu.c | 1 + arch/x86/purgatory/Makefile | 1 + arch/x86/xen/enlighten_pv.c | 3 +- arch/x86/xen/pmu.c | 2 +- arch/x86/xen/setup.c | 26 +- block/bfq-cgroup.c | 4 + block/bfq-iosched.h | 4 - block/bio.c | 2 +- block/blk-cgroup.c | 2 +- block/blk-core.c | 1 - block/blk-mq.c | 19 +- block/blk-settings.c | 9 +- block/blk.h | 1 + block/genhd.c | 13 +- block/sed-opal.c | 32 +- drivers/accessibility/speakup/main.c | 2 +- drivers/accessibility/speakup/utils.h | 2 +- drivers/acpi/acpi_extlog.c | 33 +- drivers/acpi/acpi_pcc.c | 2 +- drivers/acpi/apei/ghes.c | 2 +- drivers/acpi/arm64/iort.c | 3 +- drivers/acpi/numa/srat.c | 1 + drivers/acpi/pci_root.c | 1 + drivers/acpi/resource.c | 56 +- drivers/acpi/scan.c | 8 +- drivers/acpi/video_detect.c | 37 +- drivers/acpi/x86/utils.c | 6 + drivers/android/binder_alloc.c | 7 + drivers/ata/ahci.h | 2 +- drivers/ata/ahci_brcm.c | 2 +- drivers/ata/ahci_imx.c | 4 +- drivers/ata/ahci_qoriq.c | 2 +- drivers/ata/ahci_st.c | 2 +- drivers/ata/ahci_xgene.c | 2 +- drivers/ata/libata-scsi.c | 13 + drivers/ata/libata-transport.c | 19 +- drivers/ata/pata_legacy.c | 5 +- drivers/ata/pata_palmld.c | 4 +- drivers/ata/sata_rcar.c | 2 +- drivers/base/power/domain.c | 4 + drivers/base/property.c | 4 +- drivers/block/Kconfig | 6 + drivers/block/drbd/drbd_main.c | 4 +- drivers/block/drbd/drbd_req.c | 14 +- drivers/block/rbd.c | 4 +- drivers/block/ublk_drv.c | 117 +- drivers/bluetooth/virtio_bt.c | 2 +- drivers/char/hw_random/bcm2835-rng.c | 2 +- drivers/char/random.c | 4 +- drivers/clk/clk-renesas-pcie.c | 65 +- drivers/clk/clk.c | 6 +- drivers/clk/mediatek/clk-mt8195-topckgen.c | 4 +- drivers/clk/qcom/gcc-sc7280.c | 1 + drivers/clk/qcom/gpucc-sc7280.c | 1 + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 13 +- drivers/clk/sifive/Kconfig | 4 +- drivers/clocksource/hyperv_timer.c | 29 +- drivers/counter/104-quad-8.c | 64 +- drivers/counter/microchip-tcb-capture.c | 18 +- drivers/counter/ti-ecap-capture.c | 7 +- drivers/cpufreq/cpufreq-dt.c | 6 +- drivers/cpufreq/imx6q-cpufreq.c | 4 +- drivers/cpufreq/intel_pstate.c | 133 +- drivers/cpufreq/qcom-cpufreq-nvmem.c | 25 +- drivers/cpufreq/sun50i-cpufreq-nvmem.c | 9 +- drivers/cpufreq/tegra194-cpufreq.c | 1 + drivers/cxl/core/mbox.c | 2 +- drivers/cxl/core/pmem.c | 2 + drivers/cxl/core/port.c | 11 +- drivers/cxl/core/region.c | 113 +- drivers/cxl/cxl.h | 4 +- drivers/cxl/pmem.c | 105 +- drivers/dma/apple-admac.c | 2 +- drivers/dma/at_hdmac.c | 153 +- drivers/dma/at_hdmac_regs.h | 10 +- drivers/dma/idxd/cdev.c | 18 + drivers/dma/idxd/device.c | 26 +- drivers/dma/idxd/idxd.h | 32 + drivers/dma/idxd/init.c | 4 +- drivers/dma/idxd/sysfs.c | 2 +- drivers/dma/mv_xor_v2.c | 1 + drivers/dma/pxa_dma.c | 4 +- drivers/dma/stm32-dma.c | 14 +- drivers/dma/stm32-mdma.c | 1 + drivers/dma/ti/k3-udma-glue.c | 3 + drivers/extcon/extcon-usbc-tusb320.c | 8 +- drivers/firmware/arm_scmi/bus.c | 11 + drivers/firmware/arm_scmi/common.h | 5 +- drivers/firmware/arm_scmi/driver.c | 41 +- drivers/firmware/arm_scmi/mailbox.c | 2 +- drivers/firmware/arm_scmi/optee.c | 2 +- drivers/firmware/arm_scmi/shmem.c | 31 +- drivers/firmware/arm_scmi/smc.c | 2 +- drivers/firmware/arm_scmi/virtio.c | 26 +- drivers/firmware/cirrus/Kconfig | 2 +- drivers/firmware/cirrus/Makefile | 2 +- drivers/firmware/cirrus/cs_dsp.c | 79 +- drivers/firmware/efi/Kconfig | 22 - drivers/firmware/efi/arm-runtime.c | 2 +- drivers/firmware/efi/efi.c | 4 +- drivers/firmware/efi/libstub/Makefile | 2 +- drivers/firmware/efi/libstub/Makefile.zboot | 29 +- drivers/firmware/efi/libstub/arm64-stub.c | 17 +- drivers/firmware/efi/libstub/efistub.h | 28 + drivers/firmware/efi/libstub/fdt.c | 8 +- drivers/firmware/efi/libstub/random.c | 7 +- drivers/firmware/efi/libstub/smbios.c | 48 + drivers/firmware/efi/libstub/x86-stub.c | 6 +- drivers/firmware/efi/libstub/zboot.lds | 3 +- drivers/firmware/efi/riscv-runtime.c | 2 +- drivers/firmware/efi/tpm.c | 2 +- drivers/firmware/efi/vars.c | 72 +- drivers/firmware/google/coreboot_table.c | 37 +- drivers/gpio/gpio-tegra.c | 60 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 30 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 89 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 25 +- drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 14 - drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 32 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 41 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 54 +- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 28 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 1 - drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 1 - drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 1 - drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 - drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 25 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 21 + drivers/gpu/drm/amd/amdgpu/soc21.c | 7 +- drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 764 +- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 6 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 34 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 106 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 42 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 - .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 10 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 30 + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 32 +- .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 11 +- drivers/gpu/drm/amd/display/dc/dc.h | 2 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 4 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 1 + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 24 +- .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 2 +- .../drm/amd/display/dc/dcn314/dcn314_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 14 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 1 + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- .../drm/amd/display/dc/dcn321/dcn321_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 1 + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 +- .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 22 +- .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 17 +- .../amd/display/dc/dml/dcn32/display_mode_vba_32.h | 5 + .../dc/dml/dcn32/display_mode_vba_util_32.c | 20 +- .../dc/dml/dcn32/display_mode_vba_util_32.h | 6 +- .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 4 +- .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 17 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 4 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 +- .../amd/display/dc/gpio/dcn32/hw_factory_dcn32.c | 14 + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 9 +- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 5 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 27 +- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 8 + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 111 +- .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h | 17 +- .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_ppsmc.h | 15 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 10 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 15 +- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 8 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 8 +- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 9 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 22 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 41 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 42 +- drivers/gpu/drm/bridge/parade-ps8640.c | 25 +- drivers/gpu/drm/display/drm_dp_dual_mode_helper.c | 51 +- drivers/gpu/drm/drm_connector.c | 2 +- drivers/gpu/drm/drm_drv.c | 2 +- drivers/gpu/drm/drm_format_helper.c | 66 +- drivers/gpu/drm/drm_internal.h | 3 +- drivers/gpu/drm/drm_mode_config.c | 3 - drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 + drivers/gpu/drm/i2c/tda998x_drv.c | 2 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_ddi.c | 68 +- drivers/gpu/drm/i915/display/intel_display_core.h | 8 + .../drm/i915/display/intel_display_power_well.c | 7 +- drivers/gpu/drm/i915/display/intel_dkl_phy.c | 109 + drivers/gpu/drm/i915/display/intel_dkl_phy.h | 24 + drivers/gpu/drm/i915/display/intel_dp.c | 4 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 59 +- drivers/gpu/drm/i915/display/intel_lvds.c | 3 +- drivers/gpu/drm/i915/display/intel_panel.c | 4 +- drivers/gpu/drm/i915/display/intel_panel.h | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 5 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 64 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 19 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 10 +- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 7 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +- drivers/gpu/drm/i915/i915_driver.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/i915_scatterlist.h | 34 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +- drivers/gpu/drm/imx/Kconfig | 1 - drivers/gpu/drm/imx/imx-tve.c | 5 +- drivers/gpu/drm/lima/lima_devfreq.c | 15 +- drivers/gpu/drm/msm/Kconfig | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 14 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 10 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 7 +- .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 13 +- drivers/gpu/drm/msm/dp/dp_display.c | 23 +- drivers/gpu/drm/msm/dp/dp_drm.c | 34 + drivers/gpu/drm/msm/dp/dp_parser.c | 6 +- drivers/gpu/drm/msm/dp/dp_parser.h | 5 +- drivers/gpu/drm/msm/dsi/dsi.c | 6 + drivers/gpu/drm/msm/hdmi/hdmi.c | 7 +- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 9 +- drivers/gpu/drm/msm/msm_gpu.c | 2 + drivers/gpu/drm/msm/msm_gpu.h | 4 + drivers/gpu/drm/msm/msm_ringbuffer.c | 3 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 1 + drivers/gpu/drm/panel/panel-simple.c | 2 + drivers/gpu/drm/panfrost/panfrost_dump.c | 36 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 11 +- drivers/gpu/drm/rcar-du/Kconfig | 13 +- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 26 +- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 5 +- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 10 +- drivers/gpu/drm/scheduler/sched_entity.c | 9 +- drivers/gpu/drm/tegra/drm.c | 4 + drivers/gpu/drm/tests/drm_format_helper_test.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.c | 8 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 72 +- drivers/gpu/drm/vc4/vc4_hdmi.h | 1 + drivers/gpu/drm/vc4/vc4_kms.c | 8 +- drivers/gpu/host1x/dev.c | 4 + drivers/hid/hid-asus.c | 4 +- drivers/hid/hid-hyperv.c | 2 +- drivers/hid/hid-ids.h | 2 + drivers/hid/hid-lenovo.c | 2 +- drivers/hid/hid-magicmouse.c | 2 +- drivers/hid/hid-playstation.c | 83 +- drivers/hid/hid-quirks.c | 1 + drivers/hid/hid-saitek.c | 2 + drivers/hid/wacom_wac.c | 11 +- drivers/hv/hv_balloon.c | 2 +- drivers/hwmon/coretemp.c | 56 +- drivers/hwmon/corsair-psu.c | 3 +- drivers/hwmon/pmbus/pmbus.h | 1 - drivers/hwmon/pwm-fan.c | 5 +- drivers/hwmon/scmi-hwmon.c | 116 +- drivers/hwspinlock/qcom_hwspinlock.c | 42 +- drivers/hwtracing/coresight/coresight-core.c | 7 +- drivers/hwtracing/coresight/coresight-cti-core.c | 10 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-i801.c | 1 + drivers/i2c/busses/i2c-mlxbf.c | 9 - drivers/i2c/busses/i2c-mlxcpld.c | 2 +- drivers/i2c/busses/i2c-piix4.c | 1 + drivers/i2c/busses/i2c-qcom-cci.c | 13 +- drivers/i2c/busses/i2c-sis630.c | 2 +- drivers/i2c/busses/i2c-tegra.c | 16 +- drivers/i2c/busses/i2c-xiic.c | 1 + drivers/i2c/i2c-core-base.c | 14 + drivers/iio/accel/adxl367.c | 23 +- drivers/iio/accel/adxl372.c | 23 +- drivers/iio/accel/bma400_core.c | 24 +- drivers/iio/accel/bmc150-accel-core.c | 23 +- drivers/iio/adc/at91-sama5d2_adc.c | 29 +- drivers/iio/adc/at91_adc.c | 4 +- drivers/iio/adc/mcp3911.c | 13 +- drivers/iio/adc/mp2629_adc.c | 5 +- drivers/iio/adc/stm32-adc.c | 11 +- drivers/iio/imu/bno055/bno055.c | 2 +- drivers/iio/light/tsl2583.c | 2 +- drivers/iio/pressure/ms5611.h | 12 +- drivers/iio/pressure/ms5611_core.c | 51 +- drivers/iio/pressure/ms5611_spi.c | 2 +- drivers/iio/temperature/ltc2983.c | 13 +- drivers/iio/trigger/iio-trig-sysfs.c | 6 +- drivers/infiniband/core/cma.c | 2 +- drivers/infiniband/core/device.c | 10 +- drivers/infiniband/core/nldev.c | 2 +- drivers/infiniband/hw/efa/efa_main.c | 4 +- drivers/infiniband/hw/hfi1/pio.c | 3 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 15 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 - drivers/infiniband/hw/qedr/main.c | 9 +- drivers/infiniband/sw/rxe/rxe_resp.c | 4 +- drivers/input/joystick/iforce/iforce-main.c | 8 +- drivers/input/misc/soc_button_array.c | 14 +- drivers/input/mouse/synaptics.c | 1 + drivers/input/serio/i8042-acpipnpio.h | 8 +- drivers/input/serio/i8042.c | 4 - drivers/input/touchscreen/goodix.c | 11 + drivers/iommu/amd/iommu.c | 7 +- drivers/iommu/apple-dart.c | 2 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- drivers/iommu/arm/arm-smmu/arm-smmu.c | 2 +- drivers/iommu/intel/iommu.c | 25 +- drivers/iommu/intel/pasid.c | 5 +- drivers/iommu/iommu.c | 7 +- drivers/iommu/mtk_iommu.c | 3 +- drivers/iommu/virtio-iommu.c | 9 +- drivers/isdn/hardware/mISDN/netjet.c | 2 +- drivers/isdn/mISDN/core.c | 7 +- drivers/isdn/mISDN/dsp_pipeline.c | 3 +- drivers/leds/simple/simatic-ipc-leds-gpio.c | 12 +- drivers/md/dm-bufio.c | 15 +- drivers/md/dm-cache-policy.h | 2 +- drivers/md/dm-clone-target.c | 2 +- drivers/md/dm-crypt.c | 1 + drivers/md/dm-integrity.c | 21 +- drivers/md/dm-ioctl.c | 82 +- drivers/md/dm-log-writes.c | 1 + drivers/md/dm-raid.c | 4 +- drivers/md/dm-rq.c | 4 +- drivers/md/dm-stats.c | 2 +- drivers/md/dm-table.c | 78 +- drivers/md/dm-verity-target.c | 18 +- drivers/md/dm.c | 9 +- drivers/media/Kconfig | 2 +- drivers/media/cec/core/cec-adap.c | 1 + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 4 + drivers/media/cec/platform/s5p/s5p_cec.c | 2 + drivers/media/dvb-frontends/drxk_hard.c | 2 +- drivers/media/i2c/ar0521.c | 11 +- drivers/media/i2c/ir-kbd-i2c.c | 47 + drivers/media/i2c/isl7998x.c | 2 +- drivers/media/i2c/mt9v111.c | 2 +- drivers/media/i2c/ov5640.c | 123 +- drivers/media/i2c/ov8865.c | 10 +- drivers/media/mc/mc-device.c | 13 +- drivers/media/mc/mc-entity.c | 648 +- drivers/media/pci/cx18/cx18-av-core.c | 4 +- drivers/media/pci/cx88/cx88-input.c | 2 +- drivers/media/pci/cx88/cx88-video.c | 1 + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 6 +- drivers/media/platform/amphion/vpu_v4l2.c | 11 +- drivers/media/platform/chips-media/coda-jpeg.c | 13 +- .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 2 +- .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 7 +- .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 3 +- .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 3 +- drivers/media/platform/nxp/dw100/dw100.c | 4 +- drivers/media/platform/qcom/camss/camss-video.c | 6 +- drivers/media/platform/qcom/venus/helpers.c | 13 +- drivers/media/platform/qcom/venus/hfi.c | 5 +- drivers/media/platform/qcom/venus/vdec.c | 2 + drivers/media/platform/qcom/venus/venc.c | 29 +- drivers/media/platform/qcom/venus/venc_ctrls.c | 38 +- .../media/platform/renesas/rcar-vin/rcar-core.c | 5 +- drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 18 +- drivers/media/platform/renesas/vsp1/vsp1_video.c | 6 +- .../platform/rockchip/rkisp1/rkisp1-capture.c | 21 +- .../media/platform/rockchip/rkisp1/rkisp1-common.h | 30 +- .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 144 +- .../media/platform/rockchip/rkisp1/rkisp1-params.c | 531 +- .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 47 +- .../platform/rockchip/rkisp1/rkisp1-resizer.c | 45 +- .../platform/samsung/exynos4-is/fimc-capture.c | 9 +- .../platform/samsung/exynos4-is/fimc-isp-video.c | 9 +- .../media/platform/samsung/exynos4-is/fimc-lite.c | 9 +- .../platform/samsung/s3c-camif/camif-capture.c | 6 +- drivers/media/platform/st/stm32/stm32-dcmi.c | 6 +- drivers/media/platform/sunxi/sun4i-csi/Kconfig | 2 +- drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 6 +- drivers/media/platform/sunxi/sun6i-csi/Kconfig | 12 +- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 592 +- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 64 +- .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 592 +- .../media/platform/sunxi/sun6i-csi/sun6i_video.h | 23 +- .../media/platform/sunxi/sun6i-mipi-csi2/Kconfig | 4 +- .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 20 +- .../platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig | 2 +- .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 23 +- drivers/media/platform/sunxi/sun8i-di/Kconfig | 2 +- drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 2 +- drivers/media/platform/ti/cal/cal-video.c | 6 +- drivers/media/platform/ti/cal/cal.h | 1 - drivers/media/platform/ti/omap3isp/isp.c | 4 +- drivers/media/platform/ti/omap3isp/ispvideo.c | 9 +- drivers/media/platform/ti/omap3isp/ispvideo.h | 11 +- drivers/media/platform/verisilicon/hantro_drv.c | 14 +- .../platform/verisilicon/hantro_g2_hevc_dec.c | 4 +- drivers/media/platform/verisilicon/hantro_hevc.c | 4 +- .../media/platform/verisilicon/hantro_postproc.c | 7 +- drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 27 + drivers/media/platform/xilinx/xilinx-dma.c | 11 +- drivers/media/platform/xilinx/xilinx-dma.h | 9 +- drivers/media/radio/radio-si476x.c | 5 +- drivers/media/radio/si4713/si4713.c | 2 +- drivers/media/rc/imon.c | 4 +- drivers/media/rc/mceusb.c | 2 +- drivers/media/test-drivers/vimc/vimc-capture.c | 7 +- drivers/media/test-drivers/vivid/vivid-core.c | 38 +- drivers/media/test-drivers/vivid/vivid-core.h | 2 + drivers/media/test-drivers/vivid/vivid-osd.c | 2 +- drivers/media/test-drivers/vivid/vivid-vid-cap.c | 35 +- drivers/media/tuners/xc4000.c | 4 +- drivers/media/usb/au0828/au0828-core.c | 8 +- drivers/media/usb/dvb-usb-v2/af9035.c | 2 +- drivers/media/usb/msi2500/msi2500.c | 2 +- drivers/media/v4l2-core/v4l2-ctrls-api.c | 8 +- drivers/media/v4l2-core/v4l2-ctrls-core.c | 19 +- drivers/media/v4l2-core/v4l2-dev.c | 72 + drivers/media/v4l2-core/v4l2-dv-timings.c | 14 + drivers/mfd/syscon.c | 8 + drivers/misc/sgi-gru/grumain.c | 6 +- drivers/misc/sgi-gru/grutables.h | 14 +- drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 + drivers/mmc/core/block.c | 44 +- drivers/mmc/core/core.c | 8 +- drivers/mmc/core/queue.c | 8 + drivers/mmc/core/sdio_bus.c | 3 +- drivers/mmc/host/Kconfig | 3 +- drivers/mmc/host/sdhci-brcmstb.c | 3 +- drivers/mmc/host/sdhci-cqhci.h | 24 + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +- drivers/mmc/host/sdhci-of-arasan.c | 3 +- drivers/mmc/host/sdhci-pci-core.c | 16 +- drivers/mmc/host/sdhci-pci-o2micro.c | 7 + drivers/mmc/host/sdhci-tegra.c | 3 +- drivers/mmc/host/sdhci_am654.c | 7 +- drivers/mtd/mtdcore.c | 2 +- drivers/mtd/nand/onenand/Kconfig | 1 + drivers/mtd/nand/raw/intel-nand-controller.c | 23 +- drivers/mtd/nand/raw/marvell_nand.c | 2 +- drivers/mtd/nand/raw/nand_base.c | 4 +- drivers/mtd/nand/raw/qcom_nandc.c | 12 +- drivers/mtd/nand/raw/tegra_nand.c | 4 +- drivers/mtd/parsers/bcm47xxpart.c | 4 +- drivers/mtd/spi-nor/core.c | 4 +- drivers/net/can/at91_can.c | 2 +- drivers/net/can/c_can/c_can_main.c | 2 +- drivers/net/can/can327.c | 2 +- drivers/net/can/cc770/cc770.c | 2 +- drivers/net/can/ctucanfd/ctucanfd_base.c | 2 +- drivers/net/can/dev/skb.c | 10 +- drivers/net/can/flexcan/flexcan-core.c | 2 +- drivers/net/can/grcan.c | 2 +- drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +- drivers/net/can/janz-ican3.c | 2 +- drivers/net/can/kvaser_pciefd.c | 2 +- drivers/net/can/m_can/m_can.c | 2 +- drivers/net/can/mscan/mpc5xxx_can.c | 8 +- drivers/net/can/mscan/mscan.c | 2 +- drivers/net/can/pch_can.c | 2 +- drivers/net/can/peak_canfd/peak_canfd.c | 2 +- drivers/net/can/rcar/rcar_can.c | 2 +- drivers/net/can/rcar/rcar_canfd.c | 39 +- drivers/net/can/sja1000/sja1000.c | 2 +- drivers/net/can/slcan/slcan-core.c | 2 +- drivers/net/can/softing/softing_main.c | 2 +- drivers/net/can/spi/hi311x.c | 2 +- drivers/net/can/spi/mcp251x.c | 7 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c | 2 +- drivers/net/can/sun4i_can.c | 2 +- drivers/net/can/ti_hecc.c | 2 +- drivers/net/can/usb/ems_usb.c | 2 +- drivers/net/can/usb/esd_usb.c | 2 +- drivers/net/can/usb/etas_es58x/es58x_core.c | 2 +- drivers/net/can/usb/gs_usb.c | 2 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 4 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 4 +- drivers/net/can/usb/mcba_usb.c | 2 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/can/usb/ucan.c | 2 +- drivers/net/can/usb/usb_8dev.c | 2 +- drivers/net/can/xilinx_can.c | 2 +- drivers/net/dsa/dsa_loop.c | 25 +- drivers/net/dsa/qca/qca8k-8xxx.c | 83 +- drivers/net/ethernet/adi/adin1110.c | 38 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 8 +- drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 5 + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 58 +- drivers/net/ethernet/amd/xgbe/xgbe.h | 26 + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 +- drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 98 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 + .../ethernet/aquantia/atlantic/macsec/macsec_api.c | 18 +- drivers/net/ethernet/atheros/ag71xx.c | 3 +- drivers/net/ethernet/broadcom/Kconfig | 2 +- drivers/net/ethernet/broadcom/bcm4908_enet.c | 12 +- drivers/net/ethernet/broadcom/bcmsysport.c | 3 + drivers/net/ethernet/broadcom/bgmac.c | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt.c | 64 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 11 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c | 3 +- drivers/net/ethernet/cadence/macb_main.c | 1 + drivers/net/ethernet/cavium/liquidio/lio_main.c | 34 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 1 + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +- .../net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc.c | 5 + drivers/net/ethernet/freescale/fec_main.c | 50 +- drivers/net/ethernet/freescale/fman/mac.c | 21 +- drivers/net/ethernet/freescale/fman/mac.h | 2 +- drivers/net/ethernet/hisilicon/hns/hnae.c | 4 +- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 - .../hisilicon/hns3/hns3_common/hclge_comm_rss.c | 20 - .../hisilicon/hns3/hns3_common/hclge_comm_rss.h | 2 - drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 167 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 1 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 19 +- drivers/net/ethernet/huawei/hinic/hinic_debugfs.c | 18 +- drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 2 +- drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 2 +- drivers/net/ethernet/huawei/hinic/hinic_main.c | 9 +- drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 1 - drivers/net/ethernet/ibm/ehea/ehea_main.c | 1 + drivers/net/ethernet/ibm/ibmveth.c | 3 +- drivers/net/ethernet/ibm/ibmveth.h | 1 + drivers/net/ethernet/ibm/ibmvnic.c | 16 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 103 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 16 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 +- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 - drivers/net/ethernet/intel/i40e/i40e_type.h | 4 + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 43 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 67 +- drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 +- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 + drivers/net/ethernet/intel/ice/ice_base.c | 2 +- drivers/net/ethernet/intel/ice/ice_lib.c | 25 + drivers/net/ethernet/intel/ice/ice_lib.h | 1 + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 5 +- drivers/net/ethernet/lantiq_etop.c | 1 - drivers/net/ethernet/marvell/mv643xx_eth.c | 1 + .../net/ethernet/marvell/octeon_ep/octep_main.c | 16 +- drivers/net/ethernet/marvell/octeontx2/Kconfig | 2 + .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 2 + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 1 + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 135 +- .../ethernet/marvell/octeontx2/nic/otx2_struct.h | 57 + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 32 +- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 1 + .../net/ethernet/marvell/prestera/prestera_rxtx.c | 7 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 17 +- drivers/net/ethernet/mediatek/mtk_ppe.c | 6 - drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 + drivers/net/ethernet/mediatek/mtk_wed.c | 15 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 21 +- drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 9 + .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 31 + .../ethernet/mellanox/mlx5/core/en/tc/act/act.c | 92 +- .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 30 +- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 +- .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 - .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 27 +- .../mellanox/mlx5/core/en_accel/macsec_fs.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 27 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 88 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 11 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 14 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 18 +- .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 14 +- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 20 +- drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c | 7 + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 3 +- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 + drivers/net/ethernet/micrel/ksz884x.c | 2 +- .../ethernet/microchip/lan966x/lan966x_ethtool.c | 13 +- .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 50 +- .../net/ethernet/microchip/lan966x/lan966x_main.c | 4 +- .../net/ethernet/microchip/lan966x/lan966x_main.h | 2 + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 15 + .../net/ethernet/microchip/lan966x/lan966x_vlan.c | 6 + .../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 3 + .../net/ethernet/microchip/sparx5/sparx5_main.c | 3 + drivers/net/ethernet/neterion/s2io.c | 29 +- drivers/net/ethernet/netronome/nfp/nfp_main.c | 38 +- .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 6 +- drivers/net/ethernet/ni/nixge.c | 1 + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 12 +- drivers/net/ethernet/pensando/ionic/ionic_main.c | 8 +- drivers/net/ethernet/sfc/ef10.c | 58 +- drivers/net/ethernet/sfc/efx.c | 8 +- drivers/net/ethernet/sfc/filter.h | 4 +- drivers/net/ethernet/sfc/rx_common.c | 10 +- drivers/net/ethernet/socionext/netsec.c | 2 + drivers/net/ethernet/socionext/sni_ave.c | 6 + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 11 +- .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 46 +- .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 8 +- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 + drivers/net/ethernet/sun/sunhme.c | 2 +- drivers/net/ethernet/sunplus/spl2sw_driver.c | 1 - drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpsw.c | 2 + drivers/net/ethernet/tundra/tsi108_eth.c | 5 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/hamradio/bpqether.c | 2 +- drivers/net/hyperv/rndis_filter.c | 6 +- drivers/net/ipa/data/ipa_data-v3.5.1.c | 4 +- drivers/net/ipa/ipa_main.c | 3 + drivers/net/ipa/reg/ipa_reg-v3.1.c | 96 +- drivers/net/macsec.c | 50 +- drivers/net/macvlan.c | 10 +- drivers/net/mctp/mctp-i2c.c | 47 +- drivers/net/mhi_net.c | 2 + drivers/net/netdevsim/bus.c | 9 +- drivers/net/netdevsim/dev.c | 32 +- drivers/net/phy/dp83822.c | 3 +- drivers/net/phy/dp83867.c | 15 + drivers/net/phy/marvell.c | 16 +- drivers/net/phy/mdio_bus.c | 2 +- drivers/net/phy/mscc/mscc_macsec.c | 1 + drivers/net/phy/phylink.c | 3 + drivers/net/thunderbolt.c | 19 +- drivers/net/tun.c | 21 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/smsc95xx.c | 46 +- drivers/net/wan/lapbether.c | 3 +- drivers/net/wireless/ath/ath11k/qmi.h | 2 +- drivers/net/wireless/ath/ath11k/reg.c | 6 +- .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 4 + drivers/net/wireless/cisco/airo.c | 18 +- drivers/net/wireless/mac80211_hwsim.c | 5 + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 8 +- drivers/net/wireless/ralink/rt2x00/rt2400pci.h | 2 +- drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 8 +- drivers/net/wireless/ralink/rt2x00/rt2500pci.h | 2 +- drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 8 +- drivers/net/wireless/ralink/rt2x00/rt2500usb.h | 2 +- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 60 +- drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 8 +- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 6 +- drivers/net/wireless/ralink/rt2x00/rt61pci.c | 4 +- drivers/net/wireless/ralink/rt2x00/rt61pci.h | 2 +- drivers/net/wireless/ralink/rt2x00/rt73usb.c | 4 +- drivers/net/wireless/ralink/rt2x00/rt73usb.h | 2 +- drivers/net/wwan/Kconfig | 2 +- drivers/net/wwan/iosm/iosm_ipc_coredump.c | 1 + drivers/net/wwan/iosm/iosm_ipc_devlink.c | 1 + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 8 + drivers/net/wwan/iosm/iosm_ipc_mux.h | 1 + drivers/net/wwan/iosm/iosm_ipc_pcie.c | 18 +- drivers/net/wwan/iosm/iosm_ipc_wwan.c | 43 +- drivers/net/wwan/mhi_wwan_mbim.c | 1 + drivers/net/wwan/wwan_hwsim.c | 2 +- drivers/nfc/fdp/fdp.c | 10 +- drivers/nfc/nfcmrvl/i2c.c | 7 +- drivers/nfc/nxp-nci/core.c | 7 +- drivers/nfc/s3fwrn5/core.c | 8 +- drivers/nfc/virtual_ncidev.c | 3 + drivers/nvme/host/apple.c | 2 + drivers/nvme/host/core.c | 11 +- drivers/nvme/host/hwmon.c | 32 +- drivers/nvme/host/multipath.c | 1 + drivers/nvme/host/pci.c | 16 +- drivers/nvme/host/tcp.c | 13 +- drivers/nvme/target/auth.c | 2 + drivers/nvme/target/configfs.c | 12 +- drivers/nvme/target/core.c | 2 +- drivers/nvmem/lan9662-otpc.c | 2 +- drivers/nvmem/u-boot-env.c | 2 +- drivers/parisc/iosapic.c | 1 + drivers/parisc/pdc_stable.c | 34 +- drivers/parport/parport_pc.c | 2 +- drivers/pci/controller/pci-hyperv.c | 22 +- drivers/pci/controller/pci-tegra.c | 11 +- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 2 +- drivers/phy/ralink/phy-mt7621-pci.c | 3 +- drivers/phy/st/phy-stm32-usbphyc.c | 2 + drivers/phy/sunplus/phy-sunplus-usb2.c | 4 +- drivers/phy/tegra/xusb.c | 20 +- drivers/pinctrl/devicetree.c | 2 + drivers/pinctrl/mediatek/mtk-eint.c | 34 +- drivers/pinctrl/mediatek/mtk-eint.h | 6 + drivers/pinctrl/mediatek/pinctrl-mt2701.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt2712.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt6765.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt6779.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt6795.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt7623.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt7629.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt7986.c | 2 + drivers/pinctrl/mediatek/pinctrl-mt8127.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8167.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8186.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8188.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8195.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt8516.c | 1 + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 3 + drivers/pinctrl/pinctrl-ingenic.c | 4 +- drivers/pinctrl/pinctrl-ocelot.c | 17 +- drivers/pinctrl/pinctrl-rockchip.c | 40 + drivers/pinctrl/pinctrl-zynqmp.c | 9 - drivers/pinctrl/qcom/pinctrl-msm.c | 21 + drivers/pinctrl/qcom/pinctrl-sc8280xp.c | 4 +- drivers/platform/loongarch/loongson-laptop.c | 24 +- .../platform/surface/aggregator/ssh_packet_layer.c | 24 +- .../platform/surface/surface_aggregator_registry.c | 37 + drivers/platform/x86/acer-wmi.c | 9 + drivers/platform/x86/amd/pmc.c | 10 +- drivers/platform/x86/asus-nb-wmi.c | 9 + drivers/platform/x86/asus-wmi.c | 2 + drivers/platform/x86/hp-wmi.c | 15 +- drivers/platform/x86/ideapad-laptop.c | 62 +- drivers/platform/x86/intel/hid.c | 3 + drivers/platform/x86/intel/pmc/core.c | 2 + drivers/platform/x86/intel/pmc/pltdrv.c | 9 + drivers/platform/x86/intel/pmt/class.c | 31 +- drivers/platform/x86/p2sb.c | 15 +- drivers/platform/x86/thinkpad_acpi.c | 12 +- drivers/platform/x86/touchscreen_dmi.c | 25 + drivers/rtc/rtc-cmos.c | 14 +- drivers/s390/block/dcssblk.c | 1 + drivers/s390/cio/css.c | 8 +- drivers/s390/crypto/vfio_ap_private.h | 2 +- drivers/s390/crypto/zcrypt_msgtype6.c | 21 +- drivers/s390/scsi/zfcp_fsf.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.c | 14 +- drivers/scsi/lpfc/lpfc_bsg.c | 4 +- drivers/scsi/lpfc/lpfc_ct.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 7 +- drivers/scsi/megaraid/megaraid_sas_base.c | 27 +- drivers/scsi/mpi3mr/Kconfig | 1 + drivers/scsi/mpi3mr/mpi3mr_os.c | 3 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 1 + drivers/scsi/qla2xxx/qla_attr.c | 30 +- drivers/scsi/scsi_debug.c | 13 +- drivers/scsi/scsi_sysfs.c | 8 + drivers/scsi/scsi_transport_iscsi.c | 31 +- drivers/scsi/scsi_transport_sas.c | 13 +- drivers/siox/siox-core.c | 2 + drivers/slimbus/Kconfig | 2 +- drivers/slimbus/stream.c | 8 +- drivers/soc/imx/imx93-pd.c | 17 +- drivers/soc/imx/soc-imx8m.c | 11 + drivers/soundwire/intel.c | 1 + drivers/soundwire/intel_init.c | 37 - drivers/soundwire/qcom.c | 9 + drivers/spi/spi-amd.c | 2 +- drivers/spi/spi-aspeed-smc.c | 6 +- drivers/spi/spi-gxp.c | 2 +- drivers/spi/spi-intel.c | 10 +- drivers/spi/spi-meson-spicc.c | 24 +- drivers/spi/spi-mpc52xx.c | 2 +- drivers/spi/spi-mt65xx.c | 23 +- drivers/spi/spi-qup.c | 2 + drivers/spi/spi-stm32.c | 3 +- drivers/spi/spi-tegra210-quad.c | 11 + drivers/staging/media/atomisp/Makefile | 1 - drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 19 +- drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 6 - .../staging/media/atomisp/include/linux/atomisp.h | 14 - .../atomisp/include/linux/atomisp_gmin_platform.h | 2 - .../media/atomisp/include/linux/atomisp_platform.h | 18 - drivers/staging/media/atomisp/notes.txt | 19 + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 715 +- drivers/staging/media/atomisp/pci/atomisp_cmd.h | 11 +- drivers/staging/media/atomisp/pci/atomisp_compat.h | 10 - .../media/atomisp/pci/atomisp_compat_css20.c | 100 +- drivers/staging/media/atomisp/pci/atomisp_file.c | 229 - drivers/staging/media/atomisp/pci/atomisp_file.h | 44 - drivers/staging/media/atomisp/pci/atomisp_fops.c | 274 +- .../media/atomisp/pci/atomisp_gmin_platform.c | 94 +- .../staging/media/atomisp/pci/atomisp_internal.h | 55 +- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 776 +- drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 14 +- drivers/staging/media/atomisp/pci/atomisp_subdev.c | 133 +- drivers/staging/media/atomisp/pci/atomisp_subdev.h | 71 +- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 164 +- drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 3 - drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 198 +- drivers/staging/media/atomisp/pci/sh_css_params.c | 4 +- drivers/staging/media/imx/imx-media-utils.c | 8 +- drivers/staging/media/imx/imx7-media-csi.c | 6 +- .../staging/media/ipu3/include/uapi/intel-ipu3.h | 7 +- drivers/staging/media/ipu3/ipu3-v4l2.c | 37 +- drivers/staging/media/meson/vdec/vdec.c | 2 + drivers/staging/media/omap4iss/iss.c | 4 +- drivers/staging/media/omap4iss/iss_video.c | 9 +- drivers/staging/media/omap4iss/iss_video.h | 11 +- drivers/staging/media/sunxi/cedrus/Kconfig | 1 + drivers/staging/media/tegra-video/tegra210.c | 6 +- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 9 +- drivers/target/loopback/tcm_loop.c | 3 +- drivers/target/target_core_device.c | 19 + drivers/target/target_core_iblock.c | 19 +- drivers/target/target_core_internal.h | 1 + drivers/target/target_core_pr.c | 33 +- drivers/target/target_core_transport.c | 3 +- drivers/thermal/intel/intel_powerclamp.c | 6 +- drivers/tty/n_gsm.c | 71 +- drivers/tty/serial/8250/8250_lpss.c | 17 +- drivers/tty/serial/8250/8250_omap.c | 52 +- .../tty/serial/8250/{8250_gsc.c => 8250_parisc.c} | 0 drivers/tty/serial/8250/8250_port.c | 7 +- drivers/tty/serial/8250/Kconfig | 4 +- drivers/tty/serial/8250/Makefile | 2 +- drivers/tty/serial/fsl_lpuart.c | 76 +- drivers/tty/serial/imx.c | 1 + drivers/ufs/core/ufshcd.c | 4 +- drivers/ufs/core/ufshpb.c | 6 +- drivers/ufs/host/ufs-qcom-ice.c | 1 - drivers/usb/cdns3/host.c | 56 +- drivers/usb/chipidea/otg_fsm.c | 2 + drivers/usb/core/quirks.c | 3 + drivers/usb/dwc3/core.c | 59 +- drivers/usb/dwc3/drd.c | 50 - drivers/usb/dwc3/dwc3-st.c | 2 +- drivers/usb/dwc3/gadget.c | 22 +- drivers/usb/dwc3/host.c | 10 - drivers/usb/gadget/function/uvc_queue.c | 8 +- drivers/usb/gadget/function/uvc_video.c | 25 +- drivers/usb/gadget/udc/aspeed-vhub/dev.c | 1 + drivers/usb/gadget/udc/bdc/bdc_udc.c | 1 + drivers/usb/host/bcma-hcd.c | 10 +- drivers/usb/host/xhci-mem.c | 20 +- drivers/usb/host/xhci-pci.c | 44 +- drivers/usb/host/xhci.c | 10 +- drivers/usb/host/xhci.h | 1 + drivers/usb/misc/sisusbvga/sisusb_struct.h | 2 +- drivers/usb/serial/option.c | 19 +- drivers/usb/typec/mux/intel_pmc_mux.c | 15 +- drivers/usb/typec/tipd/core.c | 6 +- drivers/usb/typec/ucsi/ucsi.c | 42 +- drivers/usb/typec/ucsi/ucsi_acpi.c | 10 + drivers/vfio/pci/vfio_pci_core.c | 10 +- drivers/vfio/vfio_main.c | 26 +- drivers/video/aperture.c | 5 +- drivers/video/fbdev/cyber2000fb.c | 2 + drivers/video/fbdev/da8xx-fb.c | 3 +- drivers/video/fbdev/gbefb.c | 4 +- drivers/video/fbdev/sis/sis_accel.c | 2 +- drivers/video/fbdev/sis/vstruct.h | 2 +- drivers/video/fbdev/sm501fb.c | 2 +- drivers/video/fbdev/smscufx.c | 55 +- drivers/video/fbdev/stifb.c | 3 +- drivers/video/fbdev/xilinxfb.c | 8 +- drivers/watchdog/exar_wdt.c | 4 +- drivers/watchdog/sp805_wdt.c | 2 +- drivers/watchdog/watchdog_core.c | 4 + drivers/watchdog/watchdog_dev.c | 12 +- drivers/xen/grant-dma-ops.c | 27 +- drivers/xen/pcpu.c | 2 +- drivers/xen/platform-pci.c | 10 +- drivers/xen/xen-pciback/conf_space_capability.c | 9 +- fs/binfmt_elf.c | 3 +- fs/btrfs/backref.c | 138 +- fs/btrfs/backref.h | 1 + fs/btrfs/block-group.c | 2 - fs/btrfs/compression.c | 14 +- fs/btrfs/ctree.c | 16 + fs/btrfs/ctree.h | 16 +- fs/btrfs/disk-io.c | 14 +- fs/btrfs/disk-io.h | 2 + fs/btrfs/export.c | 2 +- fs/btrfs/export.h | 2 +- fs/btrfs/extent-io-tree.c | 15 +- fs/btrfs/extent-tree.c | 25 +- fs/btrfs/file.c | 29 +- fs/btrfs/inode.c | 16 +- fs/btrfs/raid56.c | 18 +- fs/btrfs/scrub.c | 9 +- fs/btrfs/send.c | 29 +- fs/btrfs/send.h | 5 + fs/btrfs/super.c | 16 + fs/btrfs/tests/btrfs-tests.c | 2 +- fs/btrfs/tests/qgroup-tests.c | 36 +- fs/btrfs/volumes.c | 51 +- fs/btrfs/volumes.h | 4 +- fs/btrfs/zoned.c | 40 + fs/btrfs/zoned.h | 11 + fs/ceph/caps.c | 48 +- fs/ceph/inode.c | 2 +- fs/ceph/snap.c | 3 +- fs/cifs/cached_dir.c | 39 +- fs/cifs/cached_dir.h | 4 + fs/cifs/cifsfs.c | 33 +- fs/cifs/cifsfs.h | 4 +- fs/cifs/connect.c | 15 +- fs/cifs/dir.c | 6 +- fs/cifs/file.c | 24 +- fs/cifs/inode.c | 11 +- fs/cifs/ioctl.c | 4 +- fs/cifs/misc.c | 6 +- fs/cifs/sess.c | 1 + fs/cifs/smb2inode.c | 2 + fs/cifs/smb2misc.c | 81 +- fs/cifs/smb2ops.c | 37 +- fs/cifs/smb2pdu.c | 17 +- fs/cifs/smb2transport.c | 19 +- fs/crypto/keyring.c | 17 +- fs/efivarfs/vars.c | 16 - fs/erofs/fscache.c | 38 +- fs/erofs/internal.h | 6 +- fs/erofs/super.c | 39 +- fs/erofs/sysfs.c | 8 +- fs/erofs/zdata.c | 38 +- fs/erofs/zdata.h | 6 +- fs/erofs/zmap.c | 22 +- fs/exec.c | 6 +- fs/ext4/fast_commit.c | 5 +- fs/ext4/ioctl.c | 3 +- fs/ext4/migrate.c | 3 +- fs/ext4/namei.c | 10 +- fs/ext4/resize.c | 5 + fs/ext4/super.c | 6 +- fs/fuse/file.c | 4 + fs/fuse/readdir.c | 10 +- fs/hugetlbfs/inode.c | 13 +- fs/kernfs/dir.c | 14 +- fs/netfs/buffered_read.c | 20 +- fs/netfs/io.c | 3 + fs/nfs/client.c | 4 +- fs/nfs/delegation.c | 36 +- fs/nfs/dir.c | 5 +- fs/nfs/dns_resolve.c | 7 +- fs/nfs/dns_resolve.h | 2 +- fs/nfs/fs_context.c | 14 +- fs/nfs/internal.h | 14 +- fs/nfs/mount_clnt.c | 4 +- fs/nfs/namespace.c | 2 +- fs/nfs/nfs3client.c | 4 +- fs/nfs/nfs42proc.c | 3 + fs/nfs/nfs4_fs.h | 2 +- fs/nfs/nfs4client.c | 19 +- fs/nfs/nfs4namespace.c | 16 +- fs/nfs/nfs4proc.c | 10 +- fs/nfs/nfs4state.c | 2 + fs/nfs/pnfs_nfs.c | 6 +- fs/nfs/super.c | 5 +- fs/nfsd/filecache.c | 6 +- fs/nfsd/nfs4state.c | 1 + fs/nfsd/nfsctl.c | 4 +- fs/nfsd/nfsfh.c | 2 +- fs/nfsd/trace.h | 5 +- fs/nilfs2/segment.c | 15 +- fs/nilfs2/super.c | 2 - fs/nilfs2/the_nilfs.c | 2 - fs/ocfs2/namei.c | 23 +- fs/proc/task_mmu.c | 2 +- fs/squashfs/file.c | 23 +- fs/squashfs/page_actor.c | 3 + fs/squashfs/page_actor.h | 6 +- fs/super.c | 3 +- fs/udf/namei.c | 2 +- fs/userfaultfd.c | 3 + fs/xfs/libxfs/xfs_ag.h | 15 + fs/xfs/libxfs/xfs_alloc.c | 6 +- fs/xfs/libxfs/xfs_dir2_leaf.c | 9 +- fs/xfs/libxfs/xfs_format.h | 22 +- fs/xfs/libxfs/xfs_log_format.h | 60 +- fs/xfs/libxfs/xfs_refcount.c | 286 +- fs/xfs/libxfs/xfs_refcount.h | 40 +- fs/xfs/libxfs/xfs_refcount_btree.c | 15 +- fs/xfs/libxfs/xfs_rmap.c | 9 +- fs/xfs/libxfs/xfs_trans_resv.c | 4 +- fs/xfs/libxfs/xfs_types.h | 30 + fs/xfs/scrub/alloc.c | 4 +- fs/xfs/scrub/ialloc.c | 5 +- fs/xfs/scrub/refcount.c | 72 +- fs/xfs/xfs_attr_item.c | 67 +- fs/xfs/xfs_bmap_item.c | 54 +- fs/xfs/xfs_error.c | 9 +- fs/xfs/xfs_extfree_item.c | 94 +- fs/xfs/xfs_extfree_item.h | 16 + fs/xfs/xfs_file.c | 7 +- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_log_recover.c | 10 +- fs/xfs/xfs_ondisk.h | 23 +- fs/xfs/xfs_refcount_item.c | 57 +- fs/xfs/xfs_rmap_item.c | 70 +- fs/xfs/xfs_super.c | 12 +- fs/xfs/xfs_sysfs.h | 7 +- fs/xfs/xfs_trace.h | 48 +- fs/xfs/xfs_trans_ail.c | 3 +- fs/zonefs/super.c | 37 +- fs/zonefs/sysfs.c | 5 - include/acpi/ghes.h | 2 +- include/asm-generic/compat.h | 2 +- include/asm-generic/hyperv-tlfs.h | 9 + include/asm-generic/vmlinux.lds.h | 20 +- include/drm/gpu_scheduler.h | 9 + include/linux/blk-mq.h | 3 +- include/linux/blkdev.h | 16 +- include/linux/bpf.h | 50 +- include/linux/can/dev.h | 16 + include/linux/cgroup.h | 1 + include/linux/counter.h | 5 +- include/linux/dsa/tag_qca.h | 8 +- include/linux/efi.h | 6 +- include/linux/fb.h | 2 +- include/linux/fortify-string.h | 30 +- include/linux/fscrypt.h | 4 +- include/linux/i2c.h | 1 + include/linux/io_uring.h | 3 + include/linux/iommu.h | 2 +- include/linux/kmsan_string.h | 21 + include/linux/kvm_host.h | 26 +- include/linux/maple_tree.h | 7 + include/linux/mlx5/driver.h | 2 +- include/linux/net.h | 1 + include/linux/netdevice.h | 10 +- include/linux/overflow.h | 38 +- include/linux/perf_event.h | 19 +- include/linux/phylink.h | 2 + include/linux/ring_buffer.h | 2 +- include/linux/skmsg.h | 2 +- include/linux/slab.h | 23 - include/linux/soundwire/sdw_intel.h | 2 - include/linux/spi/spi-mem.h | 2 +- include/linux/trace.h | 4 +- include/linux/userfaultfd_k.h | 6 +- include/linux/utsname.h | 1 + include/linux/vfio.h | 1 + include/media/i2c/ir-kbd-i2c.h | 1 + include/media/media-device.h | 15 - include/media/media-entity.h | 169 +- include/media/v4l2-common.h | 3 +- include/media/v4l2-ctrls.h | 28 +- include/media/v4l2-dev.h | 102 + include/media/v4l2-fwnode.h | 4 - include/media/v4l2-subdev.h | 12 +- include/net/genetlink.h | 18 +- include/net/ip.h | 2 +- include/net/ipv6.h | 2 +- include/net/netlink.h | 48 +- include/net/sock.h | 11 +- include/net/sock_reuseport.h | 11 +- include/soc/at91/sama7-ddr.h | 5 +- ...chip_offset_byte.h => acp63_chip_offset_byte.h} | 216 +- include/sound/control.h | 1 + include/sound/hdaudio.h | 27 + include/sound/hdaudio_ext.h | 69 +- include/sound/hdmi-codec.h | 4 + include/sound/sdw.h | 49 + include/sound/simple_card_utils.h | 2 - include/sound/soc-dapm.h | 188 +- include/sound/soc-dpcm.h | 2 - include/sound/sof.h | 10 +- include/sound/sof/dai-amd.h | 1 + include/sound/sof/dai.h | 2 + include/sound/sof/ipc4/header.h | 4 + include/sound/tlv320aic3x.h | 65 - include/trace/events/watchdog.h | 66 + include/uapi/drm/amdgpu_drm.h | 2 + include/uapi/drm/panfrost_drm.h | 38 +- include/uapi/linux/audit.h | 2 +- include/uapi/linux/capability.h | 2 +- include/uapi/linux/cec-funcs.h | 14 + include/uapi/linux/cec.h | 2 + include/uapi/linux/idxd.h | 1 + include/uapi/linux/in.h | 1 + include/uapi/linux/io_uring.h | 2 +- include/uapi/linux/ip.h | 6 +- include/uapi/linux/ipv6.h | 6 +- include/uapi/linux/perf_event.h | 2 +- include/uapi/linux/rkisp1-config.h | 77 +- include/uapi/linux/videodev2.h | 3 +- include/uapi/sound/snd_ar_tokens.h | 27 + include/uapi/sound/sof/tokens.h | 14 + init/Kconfig | 2 +- io_uring/filetable.h | 16 +- io_uring/io-wq.c | 2 +- io_uring/io_uring.c | 47 +- io_uring/io_uring.h | 17 +- io_uring/kbuf.c | 2 + io_uring/msg_ring.c | 3 + io_uring/net.c | 27 +- io_uring/poll.c | 43 +- io_uring/rsrc.c | 7 +- io_uring/rsrc.h | 4 - io_uring/rw.c | 2 - ipc/msg.c | 4 +- kernel/bpf/btf.c | 5 + kernel/bpf/cgroup_iter.c | 2 +- kernel/bpf/dispatcher.c | 22 +- kernel/bpf/memalloc.c | 18 +- kernel/bpf/percpu_freelist.c | 23 +- kernel/bpf/verifier.c | 32 +- kernel/cgroup/cgroup.c | 99 +- kernel/events/core.c | 165 +- kernel/events/hw_breakpoint_test.c | 4 +- kernel/events/ring_buffer.c | 2 +- kernel/gcov/gcc_4_7.c | 18 +- kernel/kprobes.c | 13 +- kernel/power/hibernate.c | 2 +- kernel/rcu/tree.c | 10 +- kernel/rseq.c | 19 +- kernel/sched/core.c | 76 +- kernel/sched/deadline.c | 4 +- kernel/sched/rt.c | 4 +- kernel/sched/sched.h | 32 +- kernel/trace/blktrace.c | 82 +- kernel/trace/bpf_trace.c | 2 + kernel/trace/fprobe.c | 5 +- kernel/trace/ftrace.c | 21 +- kernel/trace/kprobe_event_gen_test.c | 66 +- kernel/trace/rethook.c | 4 +- kernel/trace/ring_buffer.c | 82 +- kernel/trace/synth_event_gen_test.c | 16 +- kernel/trace/trace.c | 12 +- kernel/trace/trace_eprobe.c | 8 +- kernel/trace/trace_events_synth.c | 5 +- kernel/trace/trace_syscalls.c | 2 - kernel/utsname_sysctl.c | 1 + lib/Kconfig.debug | 7 +- lib/Kconfig.kmsan | 1 + lib/Makefile | 1 + lib/kunit/string-stream.c | 4 +- lib/kunit/test.c | 2 +- lib/maple_tree.c | 62 +- lib/nlattr.c | 41 +- lib/overflow_kunit.c | 47 +- lib/test_maple_tree.c | 37926 +------------------ lib/test_rhashtable.c | 58 +- mm/damon/dbgfs.c | 7 + mm/huge_memory.c | 20 +- mm/hugetlb.c | 41 +- mm/hugetlb_vmemmap.c | 1 + mm/kmemleak.c | 61 +- mm/kmsan/instrumentation.c | 1 + mm/kmsan/kmsan.h | 2 + mm/kmsan/shadow.c | 1 + mm/maccess.c | 2 +- mm/madvise.c | 12 +- mm/memory-failure.c | 5 +- mm/memory-tiers.c | 8 +- mm/mempolicy.c | 17 +- mm/memremap.c | 1 + mm/migrate.c | 7 + mm/mmap.c | 27 +- mm/page_alloc.c | 21 +- mm/page_isolation.c | 2 +- mm/shmem.c | 17 + mm/slab_common.c | 24 +- mm/userfaultfd.c | 27 +- mm/zsmalloc.c | 3 + net/atm/mpoa_proc.c | 3 +- net/bluetooth/hci_conn.c | 18 +- net/bluetooth/iso.c | 14 +- net/bluetooth/l2cap_core.c | 86 +- net/bpf/test_run.c | 1 + net/bridge/br_netlink.c | 2 +- net/bridge/br_sysfs_br.c | 2 +- net/bridge/br_vlan.c | 17 +- net/caif/chnl_net.c | 3 - net/can/af_can.c | 3 +- net/can/isotp.c | 71 +- net/can/j1939/main.c | 3 + net/can/j1939/transport.c | 4 +- net/core/dev.c | 4 + net/core/neighbour.c | 2 +- net/core/net_namespace.c | 7 + net/core/skbuff.c | 38 +- net/core/skmsg.c | 15 +- net/core/sock_map.c | 7 +- net/core/sock_reuseport.c | 16 + net/dsa/dsa2.c | 23 +- net/dsa/dsa_priv.h | 1 + net/dsa/master.c | 3 +- net/dsa/port.c | 16 + net/dsa/slave.c | 2 +- net/ethtool/eeprom.c | 2 +- net/ethtool/pse-pd.c | 2 +- net/hsr/hsr_forward.c | 12 +- net/ieee802154/socket.c | 4 +- net/ipv4/Kconfig | 10 + net/ipv4/af_inet.c | 2 + net/ipv4/datagram.c | 2 +- net/ipv4/fib_frontend.c | 4 +- net/ipv4/fib_semantics.c | 2 +- net/ipv4/inet_hashtables.c | 10 +- net/ipv4/netfilter/ipt_rpfilter.c | 1 + net/ipv4/netfilter/nft_fib_ipv4.c | 1 + net/ipv4/nexthop.c | 2 +- net/ipv4/tcp.c | 3 +- net/ipv4/tcp_bpf.c | 12 +- net/ipv4/tcp_input.c | 3 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/tcp_ulp.c | 3 + net/ipv4/udp.c | 3 +- net/ipv4/udp_bpf.c | 4 +- net/ipv6/addrconf.c | 2 + net/ipv6/addrlabel.c | 1 + net/ipv6/datagram.c | 2 +- net/ipv6/ip6_gre.c | 12 +- net/ipv6/ip6_tunnel.c | 11 +- net/ipv6/netfilter/ip6t_rpfilter.c | 1 + net/ipv6/netfilter/nft_fib_ipv6.c | 2 + net/ipv6/route.c | 14 +- net/ipv6/sit.c | 8 +- net/ipv6/udp.c | 3 +- net/kcm/kcmsock.c | 83 +- net/l2tp/l2tp_core.c | 19 +- net/mac80211/main.c | 8 +- net/mac80211/mesh_pathtbl.c | 2 +- net/mac80211/s1g.c | 3 + net/mac80211/tx.c | 5 + net/mac802154/rx.c | 5 +- net/mctp/af_mctp.c | 4 +- net/mctp/route.c | 2 +- net/mptcp/protocol.c | 182 +- net/mptcp/protocol.h | 5 +- net/mptcp/subflow.c | 7 + net/netfilter/ipset/ip_set_hash_gen.h | 30 +- net/netfilter/ipvs/ip_vs_app.c | 10 +- net/netfilter/ipvs/ip_vs_conn.c | 30 +- net/netfilter/nf_nat_core.c | 11 +- net/netfilter/nf_tables_api.c | 16 +- net/netfilter/nfnetlink.c | 1 + net/netfilter/nft_payload.c | 6 +- net/netlink/genetlink.c | 25 + net/openvswitch/datapath.c | 4 +- net/rose/rose_link.c | 3 + net/sched/sch_api.c | 5 +- net/sched/sch_cake.c | 4 + net/sched/sch_fq_codel.c | 25 +- net/sched/sch_red.c | 4 +- net/sched/sch_sfb.c | 3 +- net/sctp/outqueue.c | 13 +- net/smc/af_smc.c | 6 +- net/smc/smc_core.c | 3 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/sysfs.c | 12 +- net/tipc/discover.c | 2 +- net/tipc/netlink_compat.c | 2 +- net/tipc/topsrv.c | 18 +- net/tls/tls_device_fallback.c | 5 +- net/tls/tls_strp.c | 32 +- net/unix/unix_bpf.c | 8 +- net/vmw_vsock/af_vsock.c | 7 +- net/wireless/reg.c | 12 +- net/wireless/scan.c | 4 +- net/wireless/util.c | 6 +- net/x25/x25_dev.c | 2 +- scripts/Makefile.modpost | 2 +- scripts/kconfig/menu.c | 23 +- scripts/min-tool-version.sh | 2 +- scripts/package/mkdebian | 2 +- security/commoncap.c | 6 +- security/selinux/ss/services.c | 5 +- security/selinux/ss/sidtab.c | 4 +- security/selinux/ss/sidtab.h | 2 +- sound/aoa/soundbus/i2sbus/core.c | 7 +- sound/arm/pxa2xx-ac97-lib.c | 4 +- sound/core/control.c | 23 + sound/core/memalloc.c | 15 +- sound/hda/ext/hdac_ext_controller.c | 116 +- sound/hda/ext/hdac_ext_stream.c | 203 +- sound/hda/hdac_stream.c | 158 + sound/hda/hdac_sysfs.c | 4 +- sound/pci/ac97/ac97_codec.c | 33 +- sound/pci/au88x0/au88x0.h | 6 +- sound/pci/au88x0/au88x0_core.c | 2 +- sound/pci/ca0106/ca0106_mixer.c | 2 +- sound/pci/emu10k1/emumixer.c | 2 +- sound/pci/hda/Kconfig | 2 +- sound/pci/hda/cs35l41_hda.c | 1 + sound/pci/hda/hda_cs_dsp_ctl.c | 1 + sound/pci/hda/hda_intel.c | 11 +- sound/pci/hda/patch_ca0132.c | 1 + sound/pci/hda/patch_realtek.c | 16 +- sound/pci/rme9652/hdsp.c | 26 +- sound/pci/rme9652/rme9652.c | 22 +- sound/soc/amd/Kconfig | 4 +- sound/soc/amd/acp-da7219-max98357a.c | 3 +- sound/soc/amd/acp/acp-i2s.c | 16 +- sound/soc/amd/acp/acp-mach-common.c | 62 +- sound/soc/amd/acp/acp-platform.c | 8 +- sound/soc/amd/ps/{acp62.h => acp63.h} | 25 +- sound/soc/amd/ps/pci-ps.c | 141 +- sound/soc/amd/ps/ps-mach.c | 30 +- sound/soc/amd/ps/ps-pdm-dma.c | 188 +- sound/soc/amd/yc/acp6x-mach.c | 7 + sound/soc/atmel/mchp-spdiftx.c | 165 +- sound/soc/codecs/Kconfig | 10 +- sound/soc/codecs/Makefile | 2 + sound/soc/codecs/adau1372.c | 32 +- sound/soc/codecs/adau1373.c | 1 - sound/soc/codecs/adau17x1.c | 1 - sound/soc/codecs/ak4458.c | 13 +- sound/soc/codecs/cs35l36.c | 4 +- sound/soc/codecs/cs42l83-i2c.c | 2 +- sound/soc/codecs/cs42xx8-i2c.c | 28 +- sound/soc/codecs/cs42xx8.c | 22 +- sound/soc/codecs/cs42xx8.h | 3 +- sound/soc/codecs/da7219-aad.c | 46 +- sound/soc/codecs/da7219-aad.h | 1 + sound/soc/codecs/da7219.c | 9 + sound/soc/codecs/es8326.c | 5 +- sound/soc/codecs/hda.c | 12 +- sound/soc/codecs/hdac_hda.c | 6 +- sound/soc/codecs/hdac_hdmi.c | 8 +- sound/soc/codecs/hdmi-codec.c | 30 +- sound/soc/codecs/jz4725b.c | 81 +- sound/soc/codecs/lpass-tx-macro.c | 149 +- sound/soc/codecs/lpass-wsa-macro.c | 6 +- sound/soc/codecs/max98373-sdw.c | 31 +- sound/soc/codecs/max98396.c | 6 +- sound/soc/codecs/max9867.c | 33 +- sound/soc/codecs/nau8315.c | 2 + sound/soc/codecs/nau8825.c | 135 +- sound/soc/codecs/nau8825.h | 23 + sound/soc/codecs/pcm512x.c | 8 +- sound/soc/codecs/rt1308-sdw.c | 72 +- sound/soc/codecs/rt1308-sdw.h | 2 + sound/soc/codecs/rt1316-sdw.c | 71 +- sound/soc/codecs/rt1316-sdw.h | 2 + sound/soc/codecs/rt1318-sdw.c | 884 + sound/soc/codecs/rt1318-sdw.h | 101 + sound/soc/codecs/rt298.c | 7 + sound/soc/codecs/rt5640.c | 8 + sound/soc/codecs/rt5682-sdw.c | 28 +- sound/soc/codecs/rt5682.c | 2 + sound/soc/codecs/rt5682.h | 2 +- sound/soc/codecs/rt5682s.c | 22 + sound/soc/codecs/rt5682s.h | 2 + sound/soc/codecs/rt700.c | 32 +- sound/soc/codecs/rt711-sdca.c | 27 +- sound/soc/codecs/rt711.c | 27 +- sound/soc/codecs/rt715-sdca.c | 25 +- sound/soc/codecs/rt715.c | 73 +- sound/soc/codecs/sdw-mockup.c | 28 +- sound/soc/codecs/simple-mux.c | 9 + sound/soc/codecs/src4xxx-i2c.c | 5 +- sound/soc/codecs/tas2780.c | 5 +- sound/soc/codecs/tlv320aic3x.c | 120 +- sound/soc/codecs/tlv320aic3x.h | 43 + sound/soc/codecs/twl4030.c | 6 +- sound/soc/codecs/wcd938x.c | 4 +- sound/soc/codecs/wm8961.c | 7 + sound/soc/codecs/wm8978.c | 2 +- sound/soc/codecs/wm_adsp.c | 39 +- sound/soc/codecs/wm_adsp.h | 1 + sound/soc/codecs/wsa883x.c | 28 +- sound/soc/fsl/fsl_micfil.c | 447 + sound/soc/fsl/fsl_micfil.h | 6 +- sound/soc/fsl/fsl_rpmsg.c | 6 +- sound/soc/fsl/fsl_sai.c | 23 +- sound/soc/fsl/fsl_sai.h | 1 + sound/soc/fsl/fsl_xcvr.c | 40 + sound/soc/fsl/fsl_xcvr.h | 21 + sound/soc/fsl/imx-audio-rpmsg.c | 3 +- sound/soc/fsl/imx-pcm-rpmsg.c | 10 +- sound/soc/fsl/imx-rpmsg.c | 6 +- .../generic/audio-graph-card2-custom-sample.dtsi | 10 +- sound/soc/generic/audio-graph-card2.c | 6 +- sound/soc/generic/simple-card-utils.c | 35 +- sound/soc/intel/Kconfig | 2 +- sound/soc/intel/avs/apl.c | 6 +- sound/soc/intel/avs/avs.h | 12 +- sound/soc/intel/avs/board_selection.c | 22 + sound/soc/intel/avs/boards/Kconfig | 10 + sound/soc/intel/avs/boards/Makefile | 2 + sound/soc/intel/avs/boards/da7219.c | 41 +- sound/soc/intel/avs/boards/hdaudio.c | 1 + sound/soc/intel/avs/boards/max98373.c | 2 +- sound/soc/intel/avs/boards/max98927.c | 236 + sound/soc/intel/avs/boards/nau8825.c | 35 +- sound/soc/intel/avs/boards/rt274.c | 30 +- sound/soc/intel/avs/boards/rt286.c | 37 +- sound/soc/intel/avs/boards/rt298.c | 61 +- sound/soc/intel/avs/boards/rt5682.c | 31 +- sound/soc/intel/avs/boards/ssm4567.c | 2 +- sound/soc/intel/avs/core.c | 116 +- sound/soc/intel/avs/ipc.c | 8 +- sound/soc/intel/avs/loader.c | 28 +- sound/soc/intel/avs/messages.c | 19 +- sound/soc/intel/avs/messages.h | 2 + sound/soc/intel/avs/pcm.c | 416 +- sound/soc/intel/avs/skl.c | 4 +- sound/soc/intel/avs/topology.c | 10 + sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/Makefile | 4 +- sound/soc/intel/boards/bdw-rt5650.c | 2 +- sound/soc/intel/boards/bdw-rt5677.c | 2 +- sound/soc/intel/boards/bdw_rt286.c | 55 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 3 +- sound/soc/intel/boards/bxt_rt298.c | 2 +- sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/bytcr_wm5102.c | 2 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 3 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 3 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- sound/soc/intel/boards/sof_cirrus_common.c | 2 +- sound/soc/intel/boards/sof_da7219_max98373.c | 4 +- sound/soc/intel/boards/sof_nau8825.c | 16 + sound/soc/intel/boards/sof_rt5682.c | 7 +- sound/soc/intel/boards/sof_sdw.c | 50 + sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h | 300 + sound/soc/intel/boards/sof_sdw_common.h | 10 + sound/soc/intel/boards/sof_sdw_rt1308.c | 120 + sound/soc/intel/boards/sof_sdw_rt1316.c | 119 + sound/soc/intel/boards/sof_sdw_rt1318.c | 120 + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 16 +- sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 59 + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 157 + sound/soc/intel/skylake/skl-messages.c | 6 +- sound/soc/intel/skylake/skl-pcm.c | 35 +- sound/soc/intel/skylake/skl.c | 11 +- sound/soc/jz4740/Kconfig | 1 + sound/soc/jz4740/jz4740-i2s.c | 485 +- sound/soc/jz4740/jz4740-i2s.h | 10 - sound/soc/kirkwood/kirkwood-i2s.c | 135 +- sound/soc/kirkwood/kirkwood.h | 2 + sound/soc/mediatek/common/mtk-btcvsd.c | 6 +- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 1 + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 1 + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 1 + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 20 +- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 4 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 1 + .../mt8186/mt8186-mt6366-da7219-max98357.c | 7 +- .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 105 +- .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 1 + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 1 + sound/soc/meson/axg-pdm.c | 2 +- sound/soc/pxa/mmp-pcm.c | 2 +- sound/soc/qcom/Kconfig | 16 +- sound/soc/qcom/common.c | 2 - sound/soc/qcom/common.h | 23 - sound/soc/qcom/lpass-sc7180.c | 23 + sound/soc/qcom/lpass-sc7280.c | 19 + sound/soc/qcom/qdsp6/audioreach.c | 310 +- sound/soc/qcom/qdsp6/audioreach.h | 47 +- sound/soc/qcom/qdsp6/q6apm.c | 84 +- sound/soc/qcom/qdsp6/q6apm.h | 6 +- sound/soc/qcom/qdsp6/q6prm.c | 2 +- sound/soc/qcom/qdsp6/topology.c | 243 +- sound/soc/rockchip/rk3399_gru_sound.c | 3 +- sound/soc/rockchip/rockchip_i2s_tdm.c | 19 +- sound/soc/sh/Kconfig | 2 +- sound/soc/sh/rcar/adg.c | 4 +- sound/soc/sh/rcar/core.c | 7 +- sound/soc/soc-core.c | 8 +- sound/soc/soc-dai.c | 11 +- sound/soc/soc-dapm.c | 189 +- sound/soc/soc-pcm.c | 12 +- sound/soc/sof/Kconfig | 20 +- sound/soc/sof/Makefile | 6 + sound/soc/sof/amd/Kconfig | 1 + sound/soc/sof/amd/acp-common.c | 109 + sound/soc/sof/amd/acp-ipc.c | 43 +- sound/soc/sof/amd/acp-loader.c | 6 +- sound/soc/sof/amd/acp.c | 12 +- sound/soc/sof/amd/acp.h | 18 + sound/soc/sof/amd/rembrandt.c | 16 + sound/soc/sof/amd/renoir.c | 16 + sound/soc/sof/intel/Kconfig | 2 +- sound/soc/sof/intel/Makefile | 2 +- sound/soc/sof/intel/apl.c | 4 + sound/soc/sof/intel/bdw.c | 6 +- sound/soc/sof/intel/byt.c | 12 +- sound/soc/sof/intel/cnl.c | 35 +- sound/soc/sof/intel/hda-bus.c | 23 +- sound/soc/sof/intel/hda-codec.c | 252 +- sound/soc/sof/intel/hda-common-ops.c | 6 +- sound/soc/sof/intel/hda-ctrl.c | 102 +- sound/soc/sof/intel/hda-dai.c | 95 +- sound/soc/sof/intel/hda-dsp.c | 83 +- sound/soc/sof/intel/hda-ipc.c | 27 +- sound/soc/sof/intel/hda-loader-skl.c | 37 +- sound/soc/sof/intel/hda-loader.c | 98 +- sound/soc/sof/intel/hda-mlink.c | 89 + sound/soc/sof/intel/hda-pcm.c | 3 +- sound/soc/sof/intel/hda-stream.c | 93 +- sound/soc/sof/intel/hda.c | 139 +- sound/soc/sof/intel/hda.h | 113 +- sound/soc/sof/intel/icl.c | 6 + sound/soc/sof/intel/mtl.c | 161 +- sound/soc/sof/intel/mtl.h | 2 + sound/soc/sof/intel/pci-apl.c | 6 + sound/soc/sof/intel/pci-cnl.c | 9 + sound/soc/sof/intel/pci-icl.c | 6 + sound/soc/sof/intel/pci-mtl.c | 3 + sound/soc/sof/intel/pci-tgl.c | 24 + sound/soc/sof/intel/pci-tng.c | 6 +- sound/soc/sof/intel/shim.h | 3 + sound/soc/sof/intel/tgl.c | 15 + sound/soc/sof/ipc.c | 14 + sound/soc/sof/ipc3-loader.c | 26 +- sound/soc/sof/ipc3-pcm.c | 2 + sound/soc/sof/ipc3-topology.c | 36 +- sound/soc/sof/ipc3.c | 4 +- sound/soc/sof/ipc4-loader.c | 244 +- sound/soc/sof/ipc4-pcm.c | 4 +- sound/soc/sof/ipc4-priv.h | 67 +- sound/soc/sof/ipc4-topology.c | 214 +- sound/soc/sof/ipc4.c | 45 +- sound/soc/sof/loader.c | 25 +- sound/soc/sof/mediatek/mt8186/mt8186.c | 7 + sound/soc/sof/ops.h | 51 +- sound/soc/sof/sof-audio.c | 5 + sound/soc/sof/sof-audio.h | 43 + sound/soc/sof/sof-client-probes-ipc3.c | 236 + sound/soc/sof/sof-client-probes-ipc4.c | 281 + sound/soc/sof/sof-client-probes.c | 278 +- sound/soc/sof/sof-client-probes.h | 34 + sound/soc/sof/sof-client.c | 34 + sound/soc/sof/sof-client.h | 6 + sound/soc/sof/sof-pci-dev.c | 26 + sound/soc/sof/sof-priv.h | 36 +- sound/soc/sof/topology.c | 187 +- sound/soc/sunxi/sun50i-dmic.c | 5 +- sound/soc/tegra/tegra210_mbdrc.c | 4 +- sound/soc/tegra/tegra210_mbdrc.h | 2 +- sound/soc/ti/davinci-mcasp.c | 7 +- sound/soc/uniphier/aio-core.c | 11 +- sound/synth/emux/emux.c | 7 +- sound/usb/card.c | 29 +- sound/usb/endpoint.c | 3 +- sound/usb/implicit.c | 2 + sound/usb/midi.c | 4 +- sound/usb/mixer.c | 2 +- sound/usb/quirks-table.h | 4 + sound/usb/quirks.c | 47 +- sound/usb/usbaudio.h | 3 + tools/arch/arm64/include/asm/cputype.h | 4 + tools/arch/x86/include/asm/cpufeatures.h | 2 +- tools/arch/x86/include/asm/msr-index.h | 8 +- tools/arch/x86/lib/memcpy_64.S | 2 +- tools/bpf/bpftool/common.c | 3 + tools/build/Makefile.feature | 1 + tools/build/feature/Makefile | 4 + .../feature/test-libbpf-bpf_program__set_insns.c | 8 + tools/iio/iio_generic_buffer.c | 4 +- tools/iio/iio_utils.c | 4 + tools/include/nolibc/string.h | 17 +- tools/include/uapi/linux/in.h | 23 +- tools/include/uapi/linux/kvm.h | 1 + tools/include/uapi/linux/perf_event.h | 27 +- tools/include/uapi/linux/stat.h | 4 +- tools/include/uapi/linux/stddef.h | 47 + tools/include/uapi/sound/asound.h | 16 - tools/kvm/kvm_stat/kvm_stat | 98 +- tools/perf/.gitignore | 1 + .../{perf-arm-coresight.txt => arm-coresight.txt} | 0 tools/perf/Makefile.config | 5 + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 16 +- tools/perf/builtin-record.c | 41 +- tools/perf/check-headers.sh | 2 +- .../arch/arm64/hisilicon/hip08/metrics.json | 6 +- .../arch/powerpc/power10/nest_metrics.json | 72 +- .../arch/s390/cf_z16/{pai.json => pai_crypto.json} | 0 tools/perf/tests/shell/test_brstack.sh | 5 +- tools/perf/tests/shell/test_intel_pt.sh | 6 + tools/perf/trace/beauty/statx.c | 1 + tools/perf/util/auxtrace.c | 10 +- tools/perf/util/bpf-event.c | 5 + tools/perf/util/bpf-loader.c | 18 + tools/perf/util/include/linux/linkage.h | 13 + tools/perf/util/parse-branch-options.c | 4 +- tools/perf/util/stat-display.c | 6 +- tools/power/pm-graph/README | 12 +- tools/power/pm-graph/sleepgraph.8 | 3 + tools/power/pm-graph/sleepgraph.py | 225 +- tools/testing/cxl/test/cxl.c | 301 +- tools/testing/radix-tree/.gitignore | 1 + tools/testing/radix-tree/Makefile | 19 +- tools/testing/radix-tree/generated/autoconf.h | 2 +- tools/testing/radix-tree/linux.c | 4 + tools/testing/radix-tree/maple.c | 35770 +++++++++++++++++ tools/testing/selftests/Makefile | 1 + tools/testing/selftests/bpf/prog_tests/btf.c | 13 + tools/testing/selftests/bpf/prog_tests/varlen.c | 7 + tools/testing/selftests/bpf/progs/test_varlen.c | 5 + .../selftests/bpf/progs/user_ringbuf_success.c | 4 +- tools/testing/selftests/bpf/test_progs.c | 2 +- tools/testing/selftests/bpf/test_verifier.c | 2 +- .../testing/selftests/bpf/verifier/ref_tracking.c | 36 + .../testing/selftests/drivers/net/bonding/Makefile | 4 +- .../drivers/net/bonding/dev_addr_lists.sh | 2 +- .../drivers/net/bonding/net_forwarding_lib.sh | 1 + .../drivers/net/dsa/test_bridge_fdb_stress.sh | 4 +- tools/testing/selftests/drivers/net/team/Makefile | 4 + .../selftests/drivers/net/team/dev_addr_lists.sh | 6 +- .../testing/selftests/drivers/net/team/lag_lib.sh | 1 + .../drivers/net/team/net_forwarding_lib.sh | 1 + .../ftrace/test.d/dynevent/test_duplicates.tc | 2 +- .../inter-event/trigger-synthetic-eprobe.tc | 2 +- tools/testing/selftests/futex/functional/Makefile | 6 +- tools/testing/selftests/intel_pstate/Makefile | 6 +- tools/testing/selftests/kexec/Makefile | 6 +- tools/testing/selftests/kvm/aarch64/vgic_init.c | 4 +- .../kvm/memslot_modification_stress_test.c | 2 +- .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 142 +- tools/testing/selftests/landlock/Makefile | 7 +- tools/testing/selftests/lib.mk | 4 +- .../selftests/memory-hotplug/mem-on-off-test.sh | 1 - tools/testing/selftests/net/Makefile | 1 + .../testing/selftests/net/io_uring_zerocopy_tx.sh | 2 +- tools/testing/selftests/net/openvswitch/Makefile | 13 + .../selftests/net/openvswitch/openvswitch.sh | 218 + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 351 + .../selftests/net/test_ingress_egress_chaining.sh | 79 + tools/testing/selftests/net/udpgro.sh | 4 +- tools/testing/selftests/net/udpgro_bench.sh | 2 +- tools/testing/selftests/net/udpgro_frglist.sh | 2 +- tools/testing/selftests/netfilter/rpath.sh | 14 +- .../selftests/perf_events/sigtrap_threads.c | 35 +- tools/testing/selftests/pidfd/Makefile | 2 +- tools/testing/selftests/pidfd/pidfd_test.c | 4 +- tools/testing/selftests/pidfd/pidfd_wait.c | 12 +- tools/verification/dot2/dot2c.py | 2 +- virt/kvm/kvm_main.c | 27 +- virt/kvm/pfncache.c | 62 +- 2044 files changed, 66165 insertions(+), 51895 deletions(-) delete mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml rename Documentation/devicetree/bindings/sound/{name-prefix.yaml => dai-common.yaml} (81%) create mode 100644 Documentation/devicetree/bindings/sound/dmic-codec.yaml delete mode 100644 Documentation/devicetree/bindings/sound/dmic.txt delete mode 100644 Documentation/devicetree/bindings/sound/max98357a.txt delete mode 100644 Documentation/devicetree/bindings/sound/max98504.txt create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98357a.yaml create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98504.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm-lpass-dais.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6prm.yaml create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8961.yaml mode change 100755 => 100644 arch/arm64/boot/dts/freescale/imx93-pinfunc.h create mode 100644 arch/s390/configs/btf.config create mode 100644 arch/s390/configs/kasan.config create mode 100644 arch/x86/kvm/.gitignore create mode 100644 arch/x86/kvm/kvm-asm-offsets.c create mode 100644 drivers/firmware/efi/libstub/smbios.c create mode 100644 drivers/gpu/drm/i915/display/intel_dkl_phy.c create mode 100644 drivers/gpu/drm/i915/display/intel_dkl_phy.h create mode 100644 drivers/mmc/host/sdhci-cqhci.h delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.c delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.h rename drivers/tty/serial/8250/{8250_gsc.c => 8250_parisc.c} (100%) create mode 100644 include/linux/kmsan_string.h rename include/sound/{acp62_chip_offset_byte.h => acp63_chip_offset_byte.h} (65%) create mode 100644 include/sound/sdw.h delete mode 100644 include/sound/tlv320aic3x.h create mode 100644 include/trace/events/watchdog.h rename sound/soc/amd/ps/{acp62.h => acp63.h} (79%) create mode 100644 sound/soc/codecs/rt1318-sdw.c create mode 100644 sound/soc/codecs/rt1318-sdw.h create mode 100644 sound/soc/intel/avs/boards/max98927.c create mode 100644 sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h create mode 100644 sound/soc/intel/boards/sof_sdw_rt1318.c delete mode 100644 sound/soc/jz4740/jz4740-i2s.h create mode 100644 sound/soc/sof/intel/hda-mlink.c create mode 100644 sound/soc/sof/sof-client-probes-ipc3.c create mode 100644 sound/soc/sof/sof-client-probes-ipc4.c create mode 100644 tools/build/feature/test-libbpf-bpf_program__set_insns.c create mode 100644 tools/include/uapi/linux/stddef.h rename tools/perf/Documentation/{perf-arm-coresight.txt => arm-coresight.txt} (100%) rename tools/perf/pmu-events/arch/s390/cf_z16/{pai.json => pai_crypto.json} (100%) create mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh create mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh create mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh create mode 100644 tools/testing/selftests/net/openvswitch/Makefile create mode 100755 tools/testing/selftests/net/openvswitch/openvswitch.sh create mode 100644 tools/testing/selftests/net/openvswitch/ovs-dpctl.py create mode 100644 tools/testing/selftests/net/test_ingress_egress_chaining.sh

2 1

[PATCH] ALSA: mts64: fix possible null-ptr-defer in snd_mts64_interrupt
by Gaosheng Cui 06 Dec '22

06 Dec '22

I got a null-ptr-defer error report when I do the following tests on the qemu platform: make defconfig and CONFIG_PARPORT=m, CONFIG_PARPORT_PC=m, CONFIG_SND_MTS64=m Then making test scripts: cat>test_mod1.sh<<EOF modprobe snd-mts64 modprobe snd-mts64 EOF Executing the script, perhaps several times, we will get a null-ptr-defer report, as follow: syzkaller:~# ./test_mod.sh snd_mts64: probe of snd_mts64.0 failed with error -5 modprobe: ERROR: could not insert 'snd_mts64': No such device BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor write access in kernel mode #PF: error_code(0x0002) - not-present page PGD 0 P4D 0 Oops: 0002 [#1] PREEMPT SMP PTI CPU: 0 PID: 205 Comm: modprobe Not tainted 6.1.0-rc8-00588-g76dcd734eca2 #6 Call Trace: <IRQ> snd_mts64_interrupt+0x24/0xa0 [snd_mts64] parport_irq_handler+0x37/0x50 [parport] __handle_irq_event_percpu+0x39/0x190 handle_irq_event_percpu+0xa/0x30 handle_irq_event+0x2f/0x50 handle_edge_irq+0x99/0x1b0 __common_interrupt+0x5d/0x100 common_interrupt+0xa0/0xc0 </IRQ> <TASK> asm_common_interrupt+0x22/0x40 RIP: 0010:_raw_write_unlock_irqrestore+0x11/0x30 parport_claim+0xbd/0x230 [parport] snd_mts64_probe+0x14a/0x465 [snd_mts64] platform_probe+0x3f/0xa0 really_probe+0x129/0x2c0 __driver_probe_device+0x6d/0xc0 driver_probe_device+0x1a/0xa0 __device_attach_driver+0x7a/0xb0 bus_for_each_drv+0x62/0xb0 __device_attach+0xe4/0x180 bus_probe_device+0x82/0xa0 device_add+0x550/0x920 platform_device_add+0x106/0x220 snd_mts64_attach+0x2e/0x80 [snd_mts64] port_check+0x14/0x20 [parport] bus_for_each_dev+0x6e/0xc0 __parport_register_driver+0x7c/0xb0 [parport] snd_mts64_module_init+0x31/0x1000 [snd_mts64] do_one_initcall+0x3c/0x1f0 do_init_module+0x46/0x1c6 load_module+0x1d8d/0x1e10 __do_sys_finit_module+0xa2/0xf0 do_syscall_64+0x37/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd </TASK> Kernel panic - not syncing: Fatal exception in interrupt Rebooting in 1 seconds.. The mts wa not initialized during interrupt, we add check for mts to fix this bug. Fixes: 68ab801e32bb ("[ALSA] Add snd-mts64 driver for ESI Miditerminal 4140") Signed-off-by: Gaosheng Cui <cuigaosheng1(a)huawei.com> --- sound/drivers/mts64.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index d3bc9e8c407d..f0d34cf70c3e 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c @@ -815,6 +815,9 @@ static void snd_mts64_interrupt(void *private) u8 status, data; struct snd_rawmidi_substream *substream; + if (!mts) + return; + spin_lock(&mts->lock); ret = mts64_read(mts->pardev->port); data = ret & 0x00ff; -- 2.25.1

2 1

[PATCH AUTOSEL 4.9 1/3] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
by Sasha Levin 06 Dec '22

06 Dec '22

From: Mark Brown <broonie(a)kernel.org> [ Upstream commit 97eea946b93961fffd29448dcda7398d0d51c4b2 ] The bounds checks in snd_soc_put_volsw_sx() are only being applied to the first channel, meaning it is possible to write out of bounds values to the second channel in stereo controls. Add appropriate checks. Signed-off-by: Mark Brown <broonie(a)kernel.org> Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 4fda8c24be29..7129bb685b63 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -465,6 +465,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, if (snd_soc_volsw_is_stereo(mc)) { val_mask = mask << rshift; val2 = (ucontrol->value.integer.value[1] + min) & mask; + + if (mc->platform_max && val2 > mc->platform_max) + return -EINVAL; + if (val2 > max) + return -EINVAL; + val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.35.1

1 0

[PATCH AUTOSEL 4.14 1/4] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
by Sasha Levin 06 Dec '22

06 Dec '22

From: Mark Brown <broonie(a)kernel.org> [ Upstream commit 97eea946b93961fffd29448dcda7398d0d51c4b2 ] The bounds checks in snd_soc_put_volsw_sx() are only being applied to the first channel, meaning it is possible to write out of bounds values to the second channel in stereo controls. Add appropriate checks. Signed-off-by: Mark Brown <broonie(a)kernel.org> Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 81c9ecfa7c7f..63c0e61b1754 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -465,6 +465,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, if (snd_soc_volsw_is_stereo(mc)) { val_mask = mask << rshift; val2 = (ucontrol->value.integer.value[1] + min) & mask; + + if (mc->platform_max && val2 > mc->platform_max) + return -EINVAL; + if (val2 > max) + return -EINVAL; + val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.35.1

1 0

[PATCH AUTOSEL 4.19 1/5] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
by Sasha Levin 06 Dec '22

06 Dec '22

From: Mark Brown <broonie(a)kernel.org> [ Upstream commit 97eea946b93961fffd29448dcda7398d0d51c4b2 ] The bounds checks in snd_soc_put_volsw_sx() are only being applied to the first channel, meaning it is possible to write out of bounds values to the second channel in stereo controls. Add appropriate checks. Signed-off-by: Mark Brown <broonie(a)kernel.org> Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 453b61b42dd9..00e6a6e46fe5 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -460,6 +460,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, if (snd_soc_volsw_is_stereo(mc)) { val_mask = mask << rshift; val2 = (ucontrol->value.integer.value[1] + min) & mask; + + if (mc->platform_max && val2 > mc->platform_max) + return -EINVAL; + if (val2 > max) + return -EINVAL; + val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.35.1

1 0

[PATCH AUTOSEL 5.4 1/5] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
by Sasha Levin 06 Dec '22

06 Dec '22

From: Mark Brown <broonie(a)kernel.org> [ Upstream commit 97eea946b93961fffd29448dcda7398d0d51c4b2 ] The bounds checks in snd_soc_put_volsw_sx() are only being applied to the first channel, meaning it is possible to write out of bounds values to the second channel in stereo controls. Add appropriate checks. Signed-off-by: Mark Brown <broonie(a)kernel.org> Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 453b61b42dd9..00e6a6e46fe5 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -460,6 +460,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, if (snd_soc_volsw_is_stereo(mc)) { val_mask = mask << rshift; val2 = (ucontrol->value.integer.value[1] + min) & mask; + + if (mc->platform_max && val2 > mc->platform_max) + return -EINVAL; + if (val2 > max) + return -EINVAL; + val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.35.1

1 0

[PATCH AUTOSEL 5.10 01/10] ASoC: fsl_micfil: explicitly clear software reset bit
by Sasha Levin 06 Dec '22

06 Dec '22

From: Shengjiu Wang <shengjiu.wang(a)nxp.com> [ Upstream commit 292709b9cf3ba470af94b62c9bb60284cc581b79 ] SRES is self-cleared bit, but REG_MICFIL_CTRL1 is defined as non volatile register, it still remain in regmap cache after set, then every update of REG_MICFIL_CTRL1, software reset happens. to avoid this, clear it explicitly. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Link: https://lore.kernel.org/r/1651925654-32060-1-git-send-email-shengjiu.wang@n… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/fsl/fsl_micfil.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index efc5daf53bba..ead4bfa13561 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -190,6 +190,17 @@ static int fsl_micfil_reset(struct device *dev) return ret; } + /* + * SRES is self-cleared bit, but REG_MICFIL_CTRL1 is defined + * as non-volatile register, so SRES still remain in regmap + * cache after set, that every update of REG_MICFIL_CTRL1, + * software reset happens. so clear it explicitly. + */ + ret = regmap_clear_bits(micfil->regmap, REG_MICFIL_CTRL1, + MICFIL_CTRL1_SRES); + if (ret) + return ret; + return 0; } -- 2.35.1

1 3

[PATCH AUTOSEL 5.15 01/12] ASoC: fsl_micfil: explicitly clear software reset bit
by Sasha Levin 06 Dec '22

06 Dec '22

From: Shengjiu Wang <shengjiu.wang(a)nxp.com> [ Upstream commit 292709b9cf3ba470af94b62c9bb60284cc581b79 ] SRES is self-cleared bit, but REG_MICFIL_CTRL1 is defined as non volatile register, it still remain in regmap cache after set, then every update of REG_MICFIL_CTRL1, software reset happens. to avoid this, clear it explicitly. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Link: https://lore.kernel.org/r/1651925654-32060-1-git-send-email-shengjiu.wang@n… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/fsl/fsl_micfil.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index 9f90989ac59a..cb84d95c3aac 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -191,6 +191,17 @@ static int fsl_micfil_reset(struct device *dev) return ret; } + /* + * SRES is self-cleared bit, but REG_MICFIL_CTRL1 is defined + * as non-volatile register, so SRES still remain in regmap + * cache after set, that every update of REG_MICFIL_CTRL1, + * software reset happens. so clear it explicitly. + */ + ret = regmap_clear_bits(micfil->regmap, REG_MICFIL_CTRL1, + MICFIL_CTRL1_SRES); + if (ret) + return ret; + return 0; } -- 2.35.1

1 3

[PATCH AUTOSEL 6.0 01/13] ASoC: fsl_micfil: explicitly clear software reset bit
by Sasha Levin 06 Dec '22

06 Dec '22

From: Shengjiu Wang <shengjiu.wang(a)nxp.com> [ Upstream commit 292709b9cf3ba470af94b62c9bb60284cc581b79 ] SRES is self-cleared bit, but REG_MICFIL_CTRL1 is defined as non volatile register, it still remain in regmap cache after set, then every update of REG_MICFIL_CTRL1, software reset happens. to avoid this, clear it explicitly. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Link: https://lore.kernel.org/r/1651925654-32060-1-git-send-email-shengjiu.wang@n… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/fsl/fsl_micfil.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index 79ef4e269bc9..8aa6871e0d42 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -194,6 +194,17 @@ static int fsl_micfil_reset(struct device *dev) if (ret) return ret; + /* + * SRES is self-cleared bit, but REG_MICFIL_CTRL1 is defined + * as non-volatile register, so SRES still remain in regmap + * cache after set, that every update of REG_MICFIL_CTRL1, + * software reset happens. so clear it explicitly. + */ + ret = regmap_clear_bits(micfil->regmap, REG_MICFIL_CTRL1, + MICFIL_CTRL1_SRES); + if (ret) + return ret; + return 0; } -- 2.35.1

1 3

Query about xrun on usb/pcm
by Carl Hetherington 06 Dec '22

06 Dec '22

Hi all, I wonder if anybody has any clues/suggestions about problem I'm seeing with an XMOS-based USB sound card. As far as I can see, the card has endpoint 0x82 set up for capture data, 0x2 for playback data, and 0x82 is also used as the sync endpoint for playback. I'm assuming that's a fairly common arrangement? I am testing it using simultaneous playback and capture, and simulating a high-CPU-load case by sleeping for long enough to cause a lot of xruns. After some random time, I see a failure case that I'm struggling to explain. It goes like this: There's an XRUN on the playback PCM, so __snd_pcm_xrun happens, then stop_endpoints() happens, and: it decides not to stop 0x82 because its running is > 1 it stops 0x2, so its state goes to EP_STATE_STOPPING Then the ALSA userspace code calls prepare on the playback PCM to get it going again. This ends up in wait_clear_urbs(), which does nothing with 0x82 as it is still running. At this point, the prepare thread is interrupted by an XRUN on the capture PCM. With this PCM, there is no sync endpoint, and 0x82 is the data endpoint. In the xrun handler: stop_urbs() sets 0x82 to EP_STATE_STOPPING. ... and the xrun handler finishes. Then we end up back in the prepare for the playback PCM. wait_clear_urbs() then sets 0x2 to STOPPED, and the prepare is finished. Now, snd_usb_endpoint_start() is called on 0x2 and that is fine. Next, snd_usb_endpoint_start() is called on 0x82 and that fails because its state is still STOPPING. At this point things seem broken. Does anyone have a hint about where in this sequence things are going wrong, and maybe even why? I'm more than happy to clarify anything I can, or provide more debugging information. Thanks in advance! Best, Carl

2 12

[PATCH v2 00/16] ASoC: Intel: avs: Data probing and fw logging
by Cezary Rojewski 05 Dec '22

05 Dec '22

The patchset focuses on debug functionality for the avs-driver. Two major blocks are covered here: data probing and AudioDSP firmware logging. Both are configured and controlled through debugfs. Data probing is a AudioDSP debug functionality which allows for gathering the actual data that is being routed to or from a module. Helps in debugging its processing capabilities - navigate to a specific module which may have caused a glitch within a pipeline (set of modules bound together). First few allow for assigning compress stream to a HDAudio stream, what is currently limited to pcm substreams only. These patches were already present on this list and reviewed in the past [1]. The next few tidy existing debug-related code up so it's ready for addition of new functionalities and make it clear which part of the avs is debug related and which is not. These also simplify the existing locking around the trace fifo. Afterward, debug-related IPCs are defined along with stub soc-component and compress DAI operations. Not much is done there as it's not a standard PCM streaming scenario. Most code found in compress operations is inherited from the HOST side of HDAudio streaming found in pcm.c file of the driver. Finally, a debugfs file operations are defined. These facilitate connecting to DSP modules from which the data shall be gathered as well as control and configuration of firmware logging. Additionally, entries are added to allow for dumping snapshots of key memory windows. Changes in v2: - reordered sign offs in patch 03 as reported by Takashi - fixed issue reported by ikp - unintilialized 'runtime' variable in patch 03 - added missing module_get_upon_open in component driver declaration [1]: https://lore.kernel.org/alsa-devel/20200124190413.18154-1-cezary.rojewski@i… Cezary Rojewski (16): ALSA: hda: Allow for compress stream to hdac_ext_stream assignment ALSA: hda: Prepare for compress stream support ALSA: hda: Interrupt servicing and BDL setup for compress streams ASoC: Intel: avs: Introduce avs_log_buffer_status_locked() ASoC: Intel: avs: Drop fifo_lock ASoC: Intel: avs: Introduce debug-context aware helpers ASoC: Intel: avs: Make enable_logs() dependent on DEBUG_FS ASoC: Intel: avs: Drop usage of debug members in non-debug code ASoC: Intel: avs: Add data probing requests ASoC: Intel: avs: Probe compress operations ASoC: Intel: avs: Data probing soc-component ASoC: Intel: avs: Add probe machine board ASoC: Intel: avs: Probing and firmware tracing over debugfs ASoC: Intel: avs: Gather remaining logs on strace_release() ASoC: Intel: avs: Allow for dumping FW_REGS area ASoC: Intel: avs: Allow for dumping debug window snapshot include/sound/hdaudio_ext.h | 2 + sound/hda/ext/hdac_ext_stream.c | 41 +++ sound/hda/hdac_controller.c | 4 +- sound/hda/hdac_stream.c | 51 +-- sound/soc/intel/Kconfig | 1 + sound/soc/intel/avs/Makefile | 4 + sound/soc/intel/avs/apl.c | 24 +- sound/soc/intel/avs/avs.h | 80 ++++- sound/soc/intel/avs/board_selection.c | 33 ++ sound/soc/intel/avs/boards/Kconfig | 8 + sound/soc/intel/avs/boards/Makefile | 2 + sound/soc/intel/avs/boards/probe.c | 64 ++++ sound/soc/intel/avs/core.c | 2 + sound/soc/intel/avs/debugfs.c | 436 ++++++++++++++++++++++++++ sound/soc/intel/avs/ipc.c | 2 +- sound/soc/intel/avs/messages.c | 104 +++++- sound/soc/intel/avs/messages.h | 53 ++++ sound/soc/intel/avs/pcm.c | 6 +- sound/soc/intel/avs/probes.c | 313 ++++++++++++++++++ sound/soc/intel/avs/registers.h | 3 +- sound/soc/intel/avs/skl.c | 17 +- sound/soc/intel/avs/utils.c | 22 -- 22 files changed, 1172 insertions(+), 100 deletions(-) create mode 100644 sound/soc/intel/avs/boards/probe.c create mode 100644 sound/soc/intel/avs/debugfs.c create mode 100644 sound/soc/intel/avs/probes.c -- 2.25.1

2 17

[PATCH] ASoC: sof_es8336: fix possible use-after-free in sof_es8336_remove()
by Yang Yingliang 05 Dec '22

05 Dec '22

sof_es8336_remove() calls cancel_delayed_work(). However, that function does not wait until the work function finishes. This means that the callback function may still be running after the driver's remove function has finished, which would result in a use-after-free. Fix by calling cancel_delayed_work_sync(), which ensures that the work is properly cancelled, no longer running, and unable to re-schedule itself. Fixes: 89cdb224f2ab ("ASoC: sof_es8336: reduce pop noise on speaker") Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/soc/intel/boards/sof_es8336.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index 70713e4b07dc..773e5d1d87d4 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -783,7 +783,7 @@ static int sof_es8336_remove(struct platform_device *pdev) struct snd_soc_card *card = platform_get_drvdata(pdev); struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); - cancel_delayed_work(&priv->pcm_pop_work); + cancel_delayed_work_sync(&priv->pcm_pop_work); gpiod_put(priv->gpio_speakers); device_remove_software_node(priv->codec_dev); put_device(priv->codec_dev); -- 2.25.1

3 2

[PATCH 0/2] Add SOF panic dump support for AMD platform.
by V sujith kumar Reddy 05 Dec '22

05 Dec '22

This patch series consists of >> Use poll function instead of simple read ACP_SHA_DSP_FW_QUALIFIER >> Add support for IPC and DSP dumps Ajye Huang (1): ASoC: SOF: amd: Use poll function instead to read ACP_SHA_DSP_FW_QUALIFIER V sujith kumar Reddy (1): ASoC : SOF: amd: Add support for IPC and DSP dumps sound/soc/sof/amd/Kconfig | 1 + sound/soc/sof/amd/acp-common.c | 108 +++++++++++++++++++++++++++++++++ sound/soc/sof/amd/acp-ipc.c | 13 ++++ sound/soc/sof/amd/acp.c | 8 ++- sound/soc/sof/amd/acp.h | 6 ++ 5 files changed, 133 insertions(+), 3 deletions(-) -- 2.25.1

2 3

[PATCH] ASoC: qcom: lpass-sc7280: Add maybe_unused tag for system PM ops
by Srinivasa Rao Mandadapu 05 Dec '22

05 Dec '22

Add __maybe_unused tag for system PM ops suspend and resume. This is required to fix allmodconfig compilation issue. Fixes: a3a96e93cc88 ("ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops") Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> --- sound/soc/qcom/lpass-sc7280.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/lpass-sc7280.c b/sound/soc/qcom/lpass-sc7280.c index 65a04d3..d43f480 100644 --- a/sound/soc/qcom/lpass-sc7280.c +++ b/sound/soc/qcom/lpass-sc7280.c @@ -235,14 +235,14 @@ static int sc7280_lpass_exit(struct platform_device *pdev) return 0; } -static int sc7280_lpass_dev_resume(struct device *dev) +static int __maybe_unused sc7280_lpass_dev_resume(struct device *dev) { struct lpass_data *drvdata = dev_get_drvdata(dev); return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); } -static int sc7280_lpass_dev_suspend(struct device *dev) +static int __maybe_unused sc7280_lpass_dev_suspend(struct device *dev) { struct lpass_data *drvdata = dev_get_drvdata(dev); @@ -253,6 +253,7 @@ static int sc7280_lpass_dev_suspend(struct device *dev) static const struct dev_pm_ops sc7280_lpass_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(sc7280_lpass_dev_suspend, sc7280_lpass_dev_resume) }; + static struct lpass_variant sc7280_data = { .i2sctrl_reg_base = 0x1000, .i2sctrl_reg_stride = 0x1000, -- 2.7.4

2 1

[PATCH] ASoC: dt-bindings: maxim,max98504: Convert to DT schema
by Krzysztof Kozlowski 05 Dec '22

05 Dec '22

Convert the Maxim Integrated MAX98504 amplifier bindings to DT schema. Few properties are made optional: 1. interrupts: current Linux driver implementation does not use them, 2. supplies: on some boards these might be wired to battery, for which no regulator is provided. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- .../devicetree/bindings/sound/max98504.txt | 44 ---------- .../bindings/sound/maxim,max98504.yaml | 86 +++++++++++++++++++ 2 files changed, 86 insertions(+), 44 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/max98504.txt create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98504.yaml diff --git a/Documentation/devicetree/bindings/sound/max98504.txt b/Documentation/devicetree/bindings/sound/max98504.txt deleted file mode 100644 index 583ed5fdfb28..000000000000 --- a/Documentation/devicetree/bindings/sound/max98504.txt +++ /dev/null @@ -1,44 +0,0 @@ -Maxim MAX98504 class D mono speaker amplifier - -This device supports I2C control interface and an IRQ output signal. It features -a PCM and PDM digital audio interface (DAI) and a differential analog input. - -Required properties: - - - compatible : "maxim,max98504" - - reg : should contain the I2C slave device address - - DVDD-supply, DIOVDD-supply, PVDD-supply: power supplies for the device, - as covered in ../regulator/regulator.txt - - interrupts : should specify the interrupt line the device is connected to, - as described in ../interrupt-controller/interrupts.txt - -Optional properties: - - - maxim,brownout-threshold - the PVDD brownout threshold, the value must be - from 0, 1...21 range, corresponding to 2.6V, 2.65V...3.65V voltage range - - maxim,brownout-attenuation - the brownout attenuation to the speaker gain - applied during the "attack hold" and "timed hold" phase, the value must be - from 0...6 (dB) range - - maxim,brownout-attack-hold-ms - the brownout attack hold phase time in ms, - 0...255 (VBATBROWN_ATTK_HOLD, register 0x0018) - - maxim,brownout-timed-hold-ms - the brownout timed hold phase time in ms, - 0...255 (VBATBROWN_TIME_HOLD, register 0x0019) - - maxim,brownout-release-rate-ms - the brownout release phase step time in ms, - 0...255 (VBATBROWN_RELEASE, register 0x001A) - -The default value when the above properties are not specified is 0, -the maxim,brownout-threshold property must be specified to actually enable -the PVDD brownout protection. - -Example: - - max98504@31 { - compatible = "maxim,max98504"; - reg = <0x31>; - interrupt-parent = <&gpio_bank_0>; - interrupts = <2 0>; - - DVDD-supply = <&regulator>; - DIOVDD-supply = <&regulator>; - PVDD-supply = <&regulator>; -}; diff --git a/Documentation/devicetree/bindings/sound/maxim,max98504.yaml b/Documentation/devicetree/bindings/sound/maxim,max98504.yaml new file mode 100644 index 000000000000..23f19a9d2c06 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/maxim,max98504.yaml @@ -0,0 +1,86 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/maxim,max98504.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Maxim Integrated MAX98504 class D mono speaker amplifier + +maintainers: + - Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> + +description: + Maxim Integrated MAX98504 speaker amplifier supports I2C control interface + with an IRQ output signal, PCM and PDM digital audio interface (DAI) and a + differential analog input. + +properties: + compatible: + const: maxim,max98504 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + DIOVDD-supply: true + DVDD-supply: true + PVDD-supply: true + + maxim,brownout-threshold: + $ref: /schemas/types.yaml#/definitions/uint32 + maximum: 21 + default: 0 + description: + PVDD brownout threshold, where values correspond to 2.6V, 2.65V...3.65V + voltage range. Property also enables the PVDD brownout protection. + + maxim,brownout-attenuation: + $ref: /schemas/types.yaml#/definitions/uint32 + maximum: 6 + default: 0 + description: + Brownout attenuation to the speaker gain applied during the "attack hold" + and "timed hold" phase, the value must be from 0...6 (dB) range. + + maxim,brownout-attack-hold-ms: + maximum: 255 + default: 0 + description: + Brownout attack hold phase time in ms, VBATBROWN_ATTK_HOLD, register 0x0018. + + maxim,brownout-timed-hold-ms: + maximum: 255 + default: 0 + description: + Brownout timed hold phase time in ms, VBATBROWN_TIME_HOLD, register 0x0019. + + maxim,brownout-release-rate-ms: + maximum: 255 + default: 0 + description: + Brownout release phase step time in ms, VBATBROWN_RELEASE, register 0x001A. + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + amplifier@31 { + compatible = "maxim,max98504"; + reg = <0x31>; + + DIOVDD-supply = <&ldo3_reg>; + DVDD-supply = <&ldo3_reg>; + }; + }; -- 2.34.1

2 1

[PATCH 1/2] dt-bindings: Drop Jee Heng Sia
by Krzysztof Kozlowski 05 Dec '22

05 Dec '22

Emails to Jee Heng Sia bounce ("550 #5.1.0 Address rejected."). Add Keembay platform maintainers as Keembay I2S maintainers. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 1 - Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml index 67aa7bb6d36a..ad107a4d3b33 100644 --- a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml +++ b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml @@ -8,7 +8,6 @@ title: Synopsys DesignWare AXI DMA Controller maintainers: - Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> - - Jee Heng Sia <jee.heng.sia(a)intel.com> description: Synopsys DesignWare AXI DMA Controller DT Binding diff --git a/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml b/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml index 2ac0a4b3cd18..33ab0be036a1 100644 --- a/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml @@ -8,7 +8,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Intel KeemBay I2S maintainers: - - Sia, Jee Heng <jee.heng.sia(a)intel.com> + - Daniele Alessandrelli <daniele.alessandrelli(a)intel.com> + - Paul J. Murphy <paul.j.murphy(a)intel.com description: | Intel KeemBay I2S -- 2.34.1

3 5

[PATCH][next] ASoC: rt715: Make read-only arrays capture_reg_H and capture_reg_L static const
by Colin Ian King 05 Dec '22

05 Dec '22

Don't populate the read-only arrays capture_reg_H and capture_reg_L on the stack but instead make them static const. Also makes the object code a little smaller. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/soc/codecs/rt715.c | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index 917a04092da2..1a2036ccfbac 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -204,12 +204,12 @@ static int rt715_set_main_switch_put(struct snd_kcontrol *kcontrol, struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); struct rt715_priv *rt715 = snd_soc_component_get_drvdata(component); - unsigned int capture_reg_H[] = {RT715_SET_GAIN_MIC_ADC_H, - RT715_SET_GAIN_LINE_ADC_H, RT715_SET_GAIN_MIX_ADC_H, - RT715_SET_GAIN_MIX_ADC2_H}; - unsigned int capture_reg_L[] = {RT715_SET_GAIN_MIC_ADC_L, - RT715_SET_GAIN_LINE_ADC_L, RT715_SET_GAIN_MIX_ADC_L, - RT715_SET_GAIN_MIX_ADC2_L}; + static const unsigned int capture_reg_H[] = { + RT715_SET_GAIN_MIC_ADC_H, RT715_SET_GAIN_LINE_ADC_H, + RT715_SET_GAIN_MIX_ADC_H, RT715_SET_GAIN_MIX_ADC2_H }; + static const unsigned int capture_reg_L[] = { + RT715_SET_GAIN_MIC_ADC_L, RT715_SET_GAIN_LINE_ADC_L, + RT715_SET_GAIN_MIX_ADC_L, RT715_SET_GAIN_MIX_ADC2_L }; unsigned int addr_h, addr_l, val_h = 0x0, val_ll, val_lr; unsigned int k_shift = RT715_DIR_IN_SFT, k_changed = 0; unsigned int read_ll, read_rl, i, j, loop_cnt = 4; @@ -284,12 +284,12 @@ static int rt715_set_main_switch_get(struct snd_kcontrol *kcontrol, { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct rt715_priv *rt715 = snd_soc_component_get_drvdata(component); - unsigned int capture_reg_H[] = {RT715_SET_GAIN_MIC_ADC_H, - RT715_SET_GAIN_LINE_ADC_H, RT715_SET_GAIN_MIX_ADC_H, - RT715_SET_GAIN_MIX_ADC2_H}; - unsigned int capture_reg_L[] = {RT715_SET_GAIN_MIC_ADC_L, - RT715_SET_GAIN_LINE_ADC_L, RT715_SET_GAIN_MIX_ADC_L, - RT715_SET_GAIN_MIX_ADC2_L}; + static const unsigned int capture_reg_H[] = { + RT715_SET_GAIN_MIC_ADC_H, RT715_SET_GAIN_LINE_ADC_H, + RT715_SET_GAIN_MIX_ADC_H, RT715_SET_GAIN_MIX_ADC2_H }; + static const unsigned int capture_reg_L[] = { + RT715_SET_GAIN_MIC_ADC_L, RT715_SET_GAIN_LINE_ADC_L, + RT715_SET_GAIN_MIX_ADC_L, RT715_SET_GAIN_MIX_ADC2_L }; unsigned int addr_h, addr_l, val_h = 0x0, i, loop_cnt = 4; unsigned int read_ll, read_rl; @@ -312,12 +312,12 @@ static int rt715_set_main_vol_put(struct snd_kcontrol *kcontrol, struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); struct rt715_priv *rt715 = snd_soc_component_get_drvdata(component); - unsigned int capture_reg_H[] = {RT715_SET_GAIN_MIC_ADC_H, - RT715_SET_GAIN_LINE_ADC_H, RT715_SET_GAIN_MIX_ADC_H, - RT715_SET_GAIN_MIX_ADC2_H}; - unsigned int capture_reg_L[] = {RT715_SET_GAIN_MIC_ADC_L, - RT715_SET_GAIN_LINE_ADC_L, RT715_SET_GAIN_MIX_ADC_L, - RT715_SET_GAIN_MIX_ADC2_L}; + static const unsigned int capture_reg_H[] = { + RT715_SET_GAIN_MIC_ADC_H, RT715_SET_GAIN_LINE_ADC_H, + RT715_SET_GAIN_MIX_ADC_H, RT715_SET_GAIN_MIX_ADC2_H }; + static const unsigned int capture_reg_L[] = { + RT715_SET_GAIN_MIC_ADC_L, RT715_SET_GAIN_LINE_ADC_L, + RT715_SET_GAIN_MIX_ADC_L, RT715_SET_GAIN_MIX_ADC2_L}; unsigned int addr_h, addr_l, val_h = 0x0, val_ll, val_lr; unsigned int read_ll, read_rl, i, j, loop_cnt = 4, k_changed = 0; unsigned int k_shift = RT715_DIR_IN_SFT, k_max = 0x3f; @@ -393,12 +393,12 @@ static int rt715_set_main_vol_get(struct snd_kcontrol *kcontrol, { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct rt715_priv *rt715 = snd_soc_component_get_drvdata(component); - unsigned int capture_reg_H[] = {RT715_SET_GAIN_MIC_ADC_H, - RT715_SET_GAIN_LINE_ADC_H, RT715_SET_GAIN_MIX_ADC_H, - RT715_SET_GAIN_MIX_ADC2_H}; - unsigned int capture_reg_L[] = {RT715_SET_GAIN_MIC_ADC_L, - RT715_SET_GAIN_LINE_ADC_L, RT715_SET_GAIN_MIX_ADC_L, - RT715_SET_GAIN_MIX_ADC2_L}; + static const unsigned int capture_reg_H[] = { + RT715_SET_GAIN_MIC_ADC_H, RT715_SET_GAIN_LINE_ADC_H, + RT715_SET_GAIN_MIX_ADC_H, RT715_SET_GAIN_MIX_ADC2_H }; + static const unsigned int capture_reg_L[] = { + RT715_SET_GAIN_MIC_ADC_L, RT715_SET_GAIN_LINE_ADC_L, + RT715_SET_GAIN_MIX_ADC_L, RT715_SET_GAIN_MIX_ADC2_L }; unsigned int addr_h, addr_l, val_h = 0x0, i, loop_cnt = 4; unsigned int read_ll, read_rl; -- 2.38.1

2 1

[PATCH][next] ASoC: wcd938x: Make read-only array minCode_param static const
by Colin Ian King 05 Dec '22

05 Dec '22

Don't populate the read-only array minCode_param on the stack but instead make it static const. Also makes the object code a little smaller. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/soc/codecs/wcd938x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index aca06a4026f3..fcac763b04d1 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -3128,8 +3128,8 @@ static inline void wcd938x_mbhc_get_result_params(struct wcd938x_priv *wcd938x, s16 c1; s32 x1, d1; int32_t denom; - int minCode_param[] = { - 3277, 1639, 820, 410, 205, 103, 52, 26 + static const int minCode_param[] = { + 3277, 1639, 820, 410, 205, 103, 52, 26 }; regmap_update_bits(wcd938x->regmap, WCD938X_ANA_MBHC_ZDET, 0x20, 0x20); -- 2.38.1

2 1

[PATCH][next] ASoC: uniphier: aio-core: Make some read-only arrays static const
by Colin Ian King 05 Dec '22

05 Dec '22

Don't populate the read-only arrays slotsel_2ch, slotsel_multi, v_pll and v_div on the stack but instead make them static const. Also makes the object code a little smaller. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/soc/uniphier/aio-core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/soc/uniphier/aio-core.c b/sound/soc/uniphier/aio-core.c index b8195778953e..0eba60758134 100644 --- a/sound/soc/uniphier/aio-core.c +++ b/sound/soc/uniphier/aio-core.c @@ -277,17 +277,18 @@ void aio_port_reset(struct uniphier_aio_sub *sub) static int aio_port_set_ch(struct uniphier_aio_sub *sub) { struct regmap *r = sub->aio->chip->regmap; - u32 slotsel_2ch[] = { + static const u32 slotsel_2ch[] = { 0, 0, 0, 0, 0, }; - u32 slotsel_multi[] = { + static const u32 slotsel_multi[] = { OPORTMXTYSLOTCTR_SLOTSEL_SLOT0, OPORTMXTYSLOTCTR_SLOTSEL_SLOT1, OPORTMXTYSLOTCTR_SLOTSEL_SLOT2, OPORTMXTYSLOTCTR_SLOTSEL_SLOT3, OPORTMXTYSLOTCTR_SLOTSEL_SLOT4, }; - u32 mode, *slotsel; + u32 mode; + const u32 *slotsel; int i; switch (params_channels(&sub->params)) { @@ -515,13 +516,13 @@ static int aio_port_set_clk(struct uniphier_aio_sub *sub) struct uniphier_aio_chip *chip = sub->aio->chip; struct device *dev = &sub->aio->chip->pdev->dev; struct regmap *r = sub->aio->chip->regmap; - u32 v_pll[] = { + static const u32 v_pll[] = { OPORTMXCTR2_ACLKSEL_A1, OPORTMXCTR2_ACLKSEL_F1, OPORTMXCTR2_ACLKSEL_A2, OPORTMXCTR2_ACLKSEL_F2, OPORTMXCTR2_ACLKSEL_A2PLL, OPORTMXCTR2_ACLKSEL_RX1, }; - u32 v_div[] = { + static const u32 v_div[] = { OPORTMXCTR2_DACCKSEL_1_2, OPORTMXCTR2_DACCKSEL_1_3, OPORTMXCTR2_DACCKSEL_1_1, OPORTMXCTR2_DACCKSEL_2_3, }; -- 2.38.1

2 1

[PATCH v2] ALSA: patch_realtek: Fix Dell Inspiron Plus 16
by Philipp Jungkamp 05 Dec '22

05 Dec '22

The Dell Inspiron Plus 16, in both laptop and 2in1 form factor, has top speakers connected on NID 0x17, which the codec reports as unconnected. These speakers should be connected to the DAC on NID 0x03. Signed-off-by: Philipp Jungkamp <p.jungkamp(a)gmx.net> --- This is a pretty late follow up to the v1 in september. Two people have tested this patch, one for each subsystem id. The popping sound on the headphone jack after audio playback stopped was gone after adding the suggested alc_fixup_no_shutup. Regards, Philipp Jungkamp v2: - add 'Signed-off-by' to commit - add subsystem of the 2-in-1 version of the laptop - add alc_fixup_no_shutup to stop headphone jack popping sound on audio suspend sound/pci/hda/patch_realtek.c | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index cf7c825078dc..5f51f8fc7fdc 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6903,6 +6903,34 @@ static void alc287_fixup_yoga9_14iap7_bass_spk_pin(struct hda_codec *codec, } } +static void alc295_fixup_dell_inspiron_top_speakers(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + static const struct hda_pintbl pincfgs[] = { + { 0x14, 0x90170151 }, + { 0x17, 0x90170150 }, + { } + }; + static const hda_nid_t conn[] = { 0x02, 0x03 }; + static const hda_nid_t preferred_pairs[] = { + 0x14, 0x02, + 0x17, 0x03, + 0x21, 0x02, + 0 + }; + struct alc_spec *spec = codec->spec; + + alc_fixup_no_shutup(codec, fix, action); + + switch (action) { + case HDA_FIXUP_ACT_PRE_PROBE: + snd_hda_apply_pincfgs(codec, pincfgs); + snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn); + spec->gen.preferred_dacs = preferred_pairs; + break; + } +} + enum { ALC269_FIXUP_GPIO2, ALC269_FIXUP_SONY_VAIO, @@ -7146,6 +7174,7 @@ enum { ALC287_FIXUP_LEGION_16ITHG6, ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK, ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN, + ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS, }; /* A special fixup for Lenovo C940 and Yoga Duet 7; @@ -9095,6 +9124,12 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK, }, + [ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc295_fixup_dell_inspiron_top_speakers, + .chained = true, + .chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -9195,6 +9230,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0a9e, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0b19, "Dell XPS 15 9520", ALC289_FIXUP_DUAL_SPK), SND_PCI_QUIRK(0x1028, 0x0b1a, "Dell Precision 5570", ALC289_FIXUP_DUAL_SPK), + SND_PCI_QUIRK(0x1028, 0x0b37, "Dell Inspiron 16 Plus 7620 2-in-1", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS), + SND_PCI_QUIRK(0x1028, 0x0b71, "Dell Inspiron 16 Plus 7620", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS), SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), -- 2.38.1

2 1

[PATCH] ALSA: hda/cirrus: Add extra 10 ms delay to allow PLL settle and lock.
by Vitaly Rodionov 05 Dec '22

05 Dec '22

New HW platforms with multiple CS42L42 parts, faster CPU and i2c requre some extra delay to allow PLL to settle and lock. Adding extra 10ms delay. Signed-off-by: Vitaly Rodionov <vitalyr(a)opensource.cirrus.com> --- sound/pci/hda/patch_cs8409.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index 754aa8ddd2e4..0ba1fbcbb21e 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -888,7 +888,7 @@ static void cs42l42_resume(struct sub_codec *cs42l42) /* Initialize CS42L42 companion codec */ cs8409_i2c_bulk_write(cs42l42, cs42l42->init_seq, cs42l42->init_seq_num); - usleep_range(20000, 25000); + usleep_range(30000, 35000); /* Clear interrupts, by reading interrupt status registers */ cs8409_i2c_bulk_read(cs42l42, irq_regs, ARRAY_SIZE(irq_regs)); -- 2.34.1

2 1

[PATCH 2/6] macio: Make remove callback of macio driver void returned
by Dawei Li 05 Dec '22

05 Dec '22

Commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller. This change is for macio bus based drivers. Signed-off-by: Dawei Li <set_pte_at(a)outlook.com> --- arch/powerpc/include/asm/macio.h | 12 ++++++------ drivers/ata/pata_macio.c | 4 +--- drivers/macintosh/rack-meter.c | 4 +--- drivers/net/ethernet/apple/bmac.c | 4 +--- drivers/net/ethernet/apple/mace.c | 4 +--- drivers/net/wireless/intersil/orinoco/airport.c | 4 +--- drivers/scsi/mac53c94.c | 5 +---- drivers/scsi/mesh.c | 5 +---- drivers/tty/serial/pmac_zilog.c | 7 ++----- sound/aoa/soundbus/i2sbus/core.c | 4 +--- 10 files changed, 16 insertions(+), 37 deletions(-) diff --git a/arch/powerpc/include/asm/macio.h b/arch/powerpc/include/asm/macio.h index ff5fd82d9ff0..f641c730c3b7 100644 --- a/arch/powerpc/include/asm/macio.h +++ b/arch/powerpc/include/asm/macio.h @@ -124,15 +124,15 @@ static inline struct pci_dev *macio_get_pci_dev(struct macio_dev *mdev) */ struct macio_driver { - int (*probe)(struct macio_dev* dev, const struct of_device_id *match); - int (*remove)(struct macio_dev* dev); + int (*probe)(struct macio_dev *dev, const struct of_device_id *match); + void (*remove)(struct macio_dev *dev); - int (*suspend)(struct macio_dev* dev, pm_message_t state); - int (*resume)(struct macio_dev* dev); - int (*shutdown)(struct macio_dev* dev); + int (*suspend)(struct macio_dev *dev, pm_message_t state); + int (*resume)(struct macio_dev *dev); + int (*shutdown)(struct macio_dev *dev); #ifdef CONFIG_PMAC_MEDIABAY - void (*mediabay_event)(struct macio_dev* dev, int mb_state); + void (*mediabay_event)(struct macio_dev *dev, int mb_state); #endif struct device_driver driver; }; diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index 9ccaac9e2bc3..653106716a4b 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c @@ -1187,7 +1187,7 @@ static int pata_macio_attach(struct macio_dev *mdev, return rc; } -static int pata_macio_detach(struct macio_dev *mdev) +static void pata_macio_detach(struct macio_dev *mdev) { struct ata_host *host = macio_get_drvdata(mdev); struct pata_macio_priv *priv = host->private_data; @@ -1202,8 +1202,6 @@ static int pata_macio_detach(struct macio_dev *mdev) ata_host_detach(host); unlock_media_bay(priv->mdev->media_bay); - - return 0; } #ifdef CONFIG_PM_SLEEP diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index c28893e41a8b..f2f83c4f3af5 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c @@ -523,7 +523,7 @@ static int rackmeter_probe(struct macio_dev* mdev, return rc; } -static int rackmeter_remove(struct macio_dev* mdev) +static void rackmeter_remove(struct macio_dev *mdev) { struct rackmeter *rm = dev_get_drvdata(&mdev->ofdev.dev); @@ -558,8 +558,6 @@ static int rackmeter_remove(struct macio_dev* mdev) /* Get rid of me */ kfree(rm); - - return 0; } static int rackmeter_shutdown(struct macio_dev* mdev) diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c index 334de0d93c89..8b37ac1cc3d1 100644 --- a/drivers/net/ethernet/apple/bmac.c +++ b/drivers/net/ethernet/apple/bmac.c @@ -1591,7 +1591,7 @@ bmac_proc_info(char *buffer, char **start, off_t offset, int length) } #endif -static int bmac_remove(struct macio_dev *mdev) +static void bmac_remove(struct macio_dev *mdev) { struct net_device *dev = macio_get_drvdata(mdev); struct bmac_data *bp = netdev_priv(dev); @@ -1609,8 +1609,6 @@ static int bmac_remove(struct macio_dev *mdev) macio_release_resources(mdev); free_netdev(dev); - - return 0; } static const struct of_device_id bmac_match[] = diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c index d0a771b65e88..b214524a5964 100644 --- a/drivers/net/ethernet/apple/mace.c +++ b/drivers/net/ethernet/apple/mace.c @@ -272,7 +272,7 @@ static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match) return rc; } -static int mace_remove(struct macio_dev *mdev) +static void mace_remove(struct macio_dev *mdev) { struct net_device *dev = macio_get_drvdata(mdev); struct mace_data *mp; @@ -296,8 +296,6 @@ static int mace_remove(struct macio_dev *mdev) free_netdev(dev); macio_release_resources(mdev); - - return 0; } static void dbdma_reset(volatile struct dbdma_regs __iomem *dma) diff --git a/drivers/net/wireless/intersil/orinoco/airport.c b/drivers/net/wireless/intersil/orinoco/airport.c index a890bfa0d5cc..276a06cdd1f5 100644 --- a/drivers/net/wireless/intersil/orinoco/airport.c +++ b/drivers/net/wireless/intersil/orinoco/airport.c @@ -85,7 +85,7 @@ airport_resume(struct macio_dev *mdev) return err; } -static int +static void airport_detach(struct macio_dev *mdev) { struct orinoco_private *priv = dev_get_drvdata(&mdev->ofdev.dev); @@ -111,8 +111,6 @@ airport_detach(struct macio_dev *mdev) macio_set_drvdata(mdev, NULL); free_orinocodev(priv); - - return 0; } static int airport_hard_reset(struct orinoco_private *priv) diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c index f75928f7773e..42648ca9b8ed 100644 --- a/drivers/scsi/mac53c94.c +++ b/drivers/scsi/mac53c94.c @@ -508,7 +508,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat return rc; } -static int mac53c94_remove(struct macio_dev *mdev) +static void mac53c94_remove(struct macio_dev *mdev) { struct fsc_state *fp = (struct fsc_state *)macio_get_drvdata(mdev); struct Scsi_Host *host = fp->host; @@ -526,11 +526,8 @@ static int mac53c94_remove(struct macio_dev *mdev) scsi_host_put(host); macio_release_resources(mdev); - - return 0; } - static struct of_device_id mac53c94_match[] = { { diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index 84b541a57b7b..cd2575b88c85 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c @@ -1986,7 +1986,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match) return -ENODEV; } -static int mesh_remove(struct macio_dev *mdev) +static void mesh_remove(struct macio_dev *mdev) { struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev); struct Scsi_Host *mesh_host = ms->host; @@ -2013,11 +2013,8 @@ static int mesh_remove(struct macio_dev *mdev) macio_release_resources(mdev); scsi_host_put(mesh_host); - - return 0; } - static struct of_device_id mesh_match[] = { { diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c index fe2e4ec423f7..b8e2279cf60c 100644 --- a/drivers/tty/serial/pmac_zilog.c +++ b/drivers/tty/serial/pmac_zilog.c @@ -1509,12 +1509,12 @@ static int pmz_attach(struct macio_dev *mdev, const struct of_device_id *match) * That one should not be called, macio isn't really a hotswap device, * we don't expect one of those serial ports to go away... */ -static int pmz_detach(struct macio_dev *mdev) +static void pmz_detach(struct macio_dev *mdev) { struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev); if (!uap) - return -ENODEV; + return; uart_remove_one_port(&pmz_uart_reg, &uap->port); @@ -1525,11 +1525,8 @@ static int pmz_detach(struct macio_dev *mdev) dev_set_drvdata(&mdev->ofdev.dev, NULL); uap->dev = NULL; uap->port.dev = NULL; - - return 0; } - static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state) { struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev); diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 51ed2f34b276..35f39727994d 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -364,15 +364,13 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match) return 0; } -static int i2sbus_remove(struct macio_dev* dev) +static void i2sbus_remove(struct macio_dev *dev) { struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev); struct i2sbus_dev *i2sdev, *tmp; list_for_each_entry_safe(i2sdev, tmp, &control->list, item) soundbus_remove_one(&i2sdev->sound); - - return 0; } #ifdef CONFIG_PM -- 2.25.1

2 1

[PATCH 6/6] soundbus: make remove callback of soundbus driver void returned
by Dawei Li 05 Dec '22

05 Dec '22

Since commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller. This change is for soundbus based drivers. Signed-off-by: Dawei Li <set_pte_at(a)outlook.com> --- sound/aoa/fabrics/layout.c | 3 +-- sound/aoa/soundbus/soundbus.h | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index ec4ef18555bc..850dc8c53e9b 100644 --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c @@ -1094,7 +1094,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) return -ENODEV; } -static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) +static void aoa_fabric_layout_remove(struct soundbus_dev *sdev) { struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); int i; @@ -1123,7 +1123,6 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) kfree(ldev); sdev->pcmid = -1; sdev->pcmname = NULL; - return 0; } #ifdef CONFIG_PM_SLEEP diff --git a/sound/aoa/soundbus/soundbus.h b/sound/aoa/soundbus/soundbus.h index 3a99c1f1a3ca..230dfa1ba270 100644 --- a/sound/aoa/soundbus/soundbus.h +++ b/sound/aoa/soundbus/soundbus.h @@ -184,10 +184,10 @@ struct soundbus_driver { /* we don't implement any matching at all */ - int (*probe)(struct soundbus_dev* dev); - int (*remove)(struct soundbus_dev* dev); + int (*probe)(struct soundbus_dev *dev); + void (*remove)(struct soundbus_dev *dev); - int (*shutdown)(struct soundbus_dev* dev); + int (*shutdown)(struct soundbus_dev *dev); struct device_driver driver; }; -- 2.25.1

2 1

[PATCH 5/6] ac97: make remove callback of ac97 driver void returned
by Dawei Li 05 Dec '22

05 Dec '22

Since commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller. This change is for ac97 bus based drivers. Signed-off-by: Dawei Li <set_pte_at(a)outlook.com> --- drivers/mfd/wm97xx-core.c | 4 +--- include/sound/ac97/codec.h | 6 +++--- sound/ac97/bus.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/mfd/wm97xx-core.c b/drivers/mfd/wm97xx-core.c index 9a2331eb1bfa..663acbb1854c 100644 --- a/drivers/mfd/wm97xx-core.c +++ b/drivers/mfd/wm97xx-core.c @@ -319,13 +319,11 @@ static int wm97xx_ac97_probe(struct ac97_codec_device *adev) return ret; } -static int wm97xx_ac97_remove(struct ac97_codec_device *adev) +static void wm97xx_ac97_remove(struct ac97_codec_device *adev) { struct wm97xx_priv *wm97xx = ac97_get_drvdata(adev); snd_ac97_compat_release(wm97xx->ac97); - - return 0; } static const struct ac97_id wm97xx_ac97_ids[] = { diff --git a/include/sound/ac97/codec.h b/include/sound/ac97/codec.h index 9792d25fa369..a26e9e0082f6 100644 --- a/include/sound/ac97/codec.h +++ b/include/sound/ac97/codec.h @@ -62,9 +62,9 @@ struct ac97_codec_device { */ struct ac97_codec_driver { struct device_driver driver; - int (*probe)(struct ac97_codec_device *); - int (*remove)(struct ac97_codec_device *); - void (*shutdown)(struct ac97_codec_device *); + int (*probe)(struct ac97_codec_device *dev); + void (*remove)(struct ac97_codec_device *dev); + void (*shutdown)(struct ac97_codec_device *dev); const struct ac97_id *id_table; }; diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c index 045330883a96..6067c04ce4c0 100644 --- a/sound/ac97/bus.c +++ b/sound/ac97/bus.c @@ -524,10 +524,9 @@ static void ac97_bus_remove(struct device *dev) if (ret < 0) return; - ret = adrv->remove(adev); + adrv->remove(adev); pm_runtime_put_noidle(dev); - if (ret == 0) - ac97_put_disable_clk(adev); + ac97_put_disable_clk(adev); pm_runtime_disable(dev); } -- 2.25.1

2 1

[PATCH 4/6] xen: make remove callback of xen driver void returned
by Dawei Li 05 Dec '22

05 Dec '22

Since commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller. This change is for xen bus based drivers. Signed-off-by: Dawei Li <set_pte_at(a)outlook.com> --- drivers/block/xen-blkback/xenbus.c | 4 +--- drivers/block/xen-blkfront.c | 3 +-- drivers/char/tpm/xen-tpmfront.c | 3 +-- drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- drivers/input/misc/xen-kbdfront.c | 5 ++--- drivers/net/xen-netback/xenbus.c | 3 +-- drivers/net/xen-netfront.c | 4 +--- drivers/pci/xen-pcifront.c | 4 +--- drivers/scsi/xen-scsifront.c | 4 +--- drivers/tty/hvc/hvc_xen.c | 4 ++-- drivers/usb/host/xen-hcd.c | 4 +--- drivers/video/fbdev/xen-fbfront.c | 6 ++---- drivers/xen/pvcalls-back.c | 3 +-- drivers/xen/pvcalls-front.c | 3 +-- drivers/xen/xen-pciback/xenbus.c | 4 +--- drivers/xen/xen-scsiback.c | 4 +--- include/xen/xenbus.h | 2 +- net/9p/trans_xen.c | 3 +-- sound/xen/xen_snd_front.c | 3 +-- 19 files changed, 22 insertions(+), 47 deletions(-) diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index c0227dfa4688..4807af1d5805 100644 --- a/drivers/block/xen-blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c @@ -524,7 +524,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, return 0; } -static int xen_blkbk_remove(struct xenbus_device *dev) +static void xen_blkbk_remove(struct xenbus_device *dev) { struct backend_info *be = dev_get_drvdata(&dev->dev); @@ -547,8 +547,6 @@ static int xen_blkbk_remove(struct xenbus_device *dev) /* Put the reference we set in xen_blkif_alloc(). */ xen_blkif_put(be->blkif); } - - return 0; } int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt, diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 35b9bcad9db9..e68576ded7cb 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -2468,7 +2468,7 @@ static void blkback_changed(struct xenbus_device *dev, } } -static int blkfront_remove(struct xenbus_device *xbdev) +static void blkfront_remove(struct xenbus_device *xbdev) { struct blkfront_info *info = dev_get_drvdata(&xbdev->dev); @@ -2489,7 +2489,6 @@ static int blkfront_remove(struct xenbus_device *xbdev) } kfree(info); - return 0; } static int blkfront_is_ready(struct xenbus_device *dev) diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c index 379291826261..80cca3b83b22 100644 --- a/drivers/char/tpm/xen-tpmfront.c +++ b/drivers/char/tpm/xen-tpmfront.c @@ -360,14 +360,13 @@ static int tpmfront_probe(struct xenbus_device *dev, return tpm_chip_register(priv->chip); } -static int tpmfront_remove(struct xenbus_device *dev) +static void tpmfront_remove(struct xenbus_device *dev) { struct tpm_chip *chip = dev_get_drvdata(&dev->dev); struct tpm_private *priv = dev_get_drvdata(&chip->dev); tpm_chip_unregister(chip); ring_free(priv); dev_set_drvdata(&chip->dev, NULL); - return 0; } static int tpmfront_resume(struct xenbus_device *dev) diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 0d8e6bd1ccbf..90996c108146 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -717,7 +717,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev, return xenbus_switch_state(xb_dev, XenbusStateInitialising); } -static int xen_drv_remove(struct xenbus_device *dev) +static void xen_drv_remove(struct xenbus_device *dev) { struct xen_drm_front_info *front_info = dev_get_drvdata(&dev->dev); int to = 100; @@ -751,7 +751,6 @@ static int xen_drv_remove(struct xenbus_device *dev) xen_drm_drv_fini(front_info); xenbus_frontend_closed(dev); - return 0; } static const struct xenbus_device_id xen_driver_ids[] = { diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c index 8d8ebdc2039b..67f1c7364c95 100644 --- a/drivers/input/misc/xen-kbdfront.c +++ b/drivers/input/misc/xen-kbdfront.c @@ -51,7 +51,7 @@ module_param_array(ptr_size, int, NULL, 0444); MODULE_PARM_DESC(ptr_size, "Pointing device width, height in pixels (default 800,600)"); -static int xenkbd_remove(struct xenbus_device *); +static void xenkbd_remove(struct xenbus_device *); static int xenkbd_connect_backend(struct xenbus_device *, struct xenkbd_info *); static void xenkbd_disconnect_backend(struct xenkbd_info *); @@ -404,7 +404,7 @@ static int xenkbd_resume(struct xenbus_device *dev) return xenkbd_connect_backend(dev, info); } -static int xenkbd_remove(struct xenbus_device *dev) +static void xenkbd_remove(struct xenbus_device *dev) { struct xenkbd_info *info = dev_get_drvdata(&dev->dev); @@ -417,7 +417,6 @@ static int xenkbd_remove(struct xenbus_device *dev) input_unregister_device(info->mtouch); free_page((unsigned long)info->page); kfree(info); - return 0; } static int xenkbd_connect_backend(struct xenbus_device *dev, diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index c1ba4294f364..001636901dda 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c @@ -977,7 +977,7 @@ static int read_xenbus_vif_flags(struct backend_info *be) return 0; } -static int netback_remove(struct xenbus_device *dev) +static void netback_remove(struct xenbus_device *dev) { struct backend_info *be = dev_get_drvdata(&dev->dev); @@ -992,7 +992,6 @@ static int netback_remove(struct xenbus_device *dev) kfree(be->hotplug_script); kfree(be); dev_set_drvdata(&dev->dev, NULL); - return 0; } /* diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 9af2b027c19c..bc17f5391b1a 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -2640,7 +2640,7 @@ static void xennet_bus_close(struct xenbus_device *dev) } while (!ret); } -static int xennet_remove(struct xenbus_device *dev) +static void xennet_remove(struct xenbus_device *dev) { struct netfront_info *info = dev_get_drvdata(&dev->dev); @@ -2656,8 +2656,6 @@ static int xennet_remove(struct xenbus_device *dev) rtnl_unlock(); } xennet_free_netdev(info->netdev); - - return 0; } static const struct xenbus_device_id netfront_ids[] = { diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 7378e2f3e525..fcd029ca2eb1 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -1055,14 +1055,12 @@ static int pcifront_xenbus_probe(struct xenbus_device *xdev, return err; } -static int pcifront_xenbus_remove(struct xenbus_device *xdev) +static void pcifront_xenbus_remove(struct xenbus_device *xdev) { struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev); if (pdev) free_pdev(pdev); - - return 0; } static const struct xenbus_device_id xenpci_ids[] = { diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c index 66b316d173b0..71a3bb83984c 100644 --- a/drivers/scsi/xen-scsifront.c +++ b/drivers/scsi/xen-scsifront.c @@ -995,7 +995,7 @@ static int scsifront_suspend(struct xenbus_device *dev) return err; } -static int scsifront_remove(struct xenbus_device *dev) +static void scsifront_remove(struct xenbus_device *dev) { struct vscsifrnt_info *info = dev_get_drvdata(&dev->dev); @@ -1011,8 +1011,6 @@ static int scsifront_remove(struct xenbus_device *dev) scsifront_free_ring(info); scsi_host_put(info->host); - - return 0; } static void scsifront_disconnect(struct vscsifrnt_info *info) diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index 7c23112dc923..c879f922c716 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c @@ -394,9 +394,9 @@ static int xen_console_remove(struct xencons_info *info) return 0; } -static int xencons_remove(struct xenbus_device *dev) +static void xencons_remove(struct xenbus_device *dev) { - return xen_console_remove(dev_get_drvdata(&dev->dev)); + xen_console_remove(dev_get_drvdata(&dev->dev)); } static int xencons_connect_backend(struct xenbus_device *dev, diff --git a/drivers/usb/host/xen-hcd.c b/drivers/usb/host/xen-hcd.c index de1b09158318..46fdab940092 100644 --- a/drivers/usb/host/xen-hcd.c +++ b/drivers/usb/host/xen-hcd.c @@ -1530,15 +1530,13 @@ static void xenhcd_backend_changed(struct xenbus_device *dev, } } -static int xenhcd_remove(struct xenbus_device *dev) +static void xenhcd_remove(struct xenbus_device *dev) { struct xenhcd_info *info = dev_get_drvdata(&dev->dev); struct usb_hcd *hcd = xenhcd_info_to_hcd(info); xenhcd_destroy_rings(info); usb_put_hcd(hcd); - - return 0; } static int xenhcd_probe(struct xenbus_device *dev, diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c index 4d2694d904aa..ae8a50ecdbd3 100644 --- a/drivers/video/fbdev/xen-fbfront.c +++ b/drivers/video/fbdev/xen-fbfront.c @@ -67,7 +67,7 @@ MODULE_PARM_DESC(video, "Video memory size in MB, width, height in pixels (default 2,800,600)"); static void xenfb_make_preferred_console(void); -static int xenfb_remove(struct xenbus_device *); +static void xenfb_remove(struct xenbus_device *); static void xenfb_init_shared_page(struct xenfb_info *, struct fb_info *); static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *); static void xenfb_disconnect_backend(struct xenfb_info *); @@ -527,7 +527,7 @@ static int xenfb_resume(struct xenbus_device *dev) return xenfb_connect_backend(dev, info); } -static int xenfb_remove(struct xenbus_device *dev) +static void xenfb_remove(struct xenbus_device *dev) { struct xenfb_info *info = dev_get_drvdata(&dev->dev); @@ -542,8 +542,6 @@ static int xenfb_remove(struct xenbus_device *dev) vfree(info->gfns); vfree(info->fb); kfree(info); - - return 0; } static unsigned long vmalloc_to_gfn(void *address) diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c index d6f945fd4147..ea52a2092bb8 100644 --- a/drivers/xen/pvcalls-back.c +++ b/drivers/xen/pvcalls-back.c @@ -1181,9 +1181,8 @@ static void pvcalls_back_changed(struct xenbus_device *dev, } } -static int pvcalls_back_remove(struct xenbus_device *dev) +static void pvcalls_back_remove(struct xenbus_device *dev) { - return 0; } static int pvcalls_back_uevent(struct xenbus_device *xdev, diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c index 1826e8e67125..5328f4d35f25 100644 --- a/drivers/xen/pvcalls-front.c +++ b/drivers/xen/pvcalls-front.c @@ -1085,7 +1085,7 @@ static const struct xenbus_device_id pvcalls_front_ids[] = { { "" } }; -static int pvcalls_front_remove(struct xenbus_device *dev) +static void pvcalls_front_remove(struct xenbus_device *dev) { struct pvcalls_bedata *bedata; struct sock_mapping *map = NULL, *n; @@ -1121,7 +1121,6 @@ static int pvcalls_front_remove(struct xenbus_device *dev) kfree(bedata->ring.sring); kfree(bedata); xenbus_switch_state(dev, XenbusStateClosed); - return 0; } static int pvcalls_front_probe(struct xenbus_device *dev, diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c index d171091eec12..b11e401f1b1e 100644 --- a/drivers/xen/xen-pciback/xenbus.c +++ b/drivers/xen/xen-pciback/xenbus.c @@ -716,14 +716,12 @@ static int xen_pcibk_xenbus_probe(struct xenbus_device *dev, return err; } -static int xen_pcibk_xenbus_remove(struct xenbus_device *dev) +static void xen_pcibk_xenbus_remove(struct xenbus_device *dev) { struct xen_pcibk_device *pdev = dev_get_drvdata(&dev->dev); if (pdev != NULL) free_pdev(pdev); - - return 0; } static const struct xenbus_device_id xen_pcibk_ids[] = { diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c index 6106ed93817d..954188b0b858 100644 --- a/drivers/xen/xen-scsiback.c +++ b/drivers/xen/xen-scsiback.c @@ -1249,7 +1249,7 @@ static void scsiback_release_translation_entry(struct vscsibk_info *info) spin_unlock_irqrestore(&info->v2p_lock, flags); } -static int scsiback_remove(struct xenbus_device *dev) +static void scsiback_remove(struct xenbus_device *dev) { struct vscsibk_info *info = dev_get_drvdata(&dev->dev); @@ -1261,8 +1261,6 @@ static int scsiback_remove(struct xenbus_device *dev) gnttab_page_cache_shrink(&info->free_pages, 0); dev_set_drvdata(&dev->dev, NULL); - - return 0; } static int scsiback_probe(struct xenbus_device *dev, diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index eaa932b99d8a..ad4fb4eab753 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h @@ -117,7 +117,7 @@ struct xenbus_driver { const struct xenbus_device_id *id); void (*otherend_changed)(struct xenbus_device *dev, enum xenbus_state backend_state); - int (*remove)(struct xenbus_device *dev); + void (*remove)(struct xenbus_device *dev); int (*suspend)(struct xenbus_device *dev); int (*resume)(struct xenbus_device *dev); int (*uevent)(struct xenbus_device *, struct kobj_uevent_env *); diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c index b15c64128c3e..4387990b9b41 100644 --- a/net/9p/trans_xen.c +++ b/net/9p/trans_xen.c @@ -294,13 +294,12 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv) kfree(priv); } -static int xen_9pfs_front_remove(struct xenbus_device *dev) +static void xen_9pfs_front_remove(struct xenbus_device *dev) { struct xen_9pfs_front_priv *priv = dev_get_drvdata(&dev->dev); dev_set_drvdata(&dev->dev, NULL); xen_9pfs_front_free(priv); - return 0; } static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev, diff --git a/sound/xen/xen_snd_front.c b/sound/xen/xen_snd_front.c index 4041748c12e5..b66e037710d0 100644 --- a/sound/xen/xen_snd_front.c +++ b/sound/xen/xen_snd_front.c @@ -311,7 +311,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev, return xenbus_switch_state(xb_dev, XenbusStateInitialising); } -static int xen_drv_remove(struct xenbus_device *dev) +static void xen_drv_remove(struct xenbus_device *dev) { struct xen_snd_front_info *front_info = dev_get_drvdata(&dev->dev); int to = 100; @@ -345,7 +345,6 @@ static int xen_drv_remove(struct xenbus_device *dev) xen_snd_drv_fini(front_info); xenbus_frontend_closed(dev); - return 0; } static const struct xenbus_device_id xen_drv_ids[] = { -- 2.25.1

3 2

[PATCH 3/6] apr: make remove callback of apr driver void returned
by Dawei Li 05 Dec '22

05 Dec '22

Since commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller. This change is for apr bus based drivers. Signed-off-by: Dawei Li <set_pte_at(a)outlook.com> --- include/linux/soc/qcom/apr.h | 2 +- sound/soc/qcom/qdsp6/q6core.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/soc/qcom/apr.h b/include/linux/soc/qcom/apr.h index 23c5b30f3511..be98aebcb3e1 100644 --- a/include/linux/soc/qcom/apr.h +++ b/include/linux/soc/qcom/apr.h @@ -153,7 +153,7 @@ typedef struct apr_device gpr_device_t; struct apr_driver { int (*probe)(struct apr_device *sl); - int (*remove)(struct apr_device *sl); + void (*remove)(struct apr_device *sl); int (*callback)(struct apr_device *a, struct apr_resp_pkt *d); int (*gpr_callback)(struct gpr_resp_pkt *d, void *data, int op); diff --git a/sound/soc/qcom/qdsp6/q6core.c b/sound/soc/qcom/qdsp6/q6core.c index 5358fefd4210..49cfb32cd209 100644 --- a/sound/soc/qcom/qdsp6/q6core.c +++ b/sound/soc/qcom/qdsp6/q6core.c @@ -339,7 +339,7 @@ static int q6core_probe(struct apr_device *adev) return 0; } -static int q6core_exit(struct apr_device *adev) +static void q6core_exit(struct apr_device *adev) { struct q6core *core = dev_get_drvdata(&adev->dev); @@ -350,8 +350,6 @@ static int q6core_exit(struct apr_device *adev) g_core = NULL; kfree(core); - - return 0; } #ifdef CONFIG_OF -- 2.25.1

1 0

[PATCH] ASoC: soc-compress: Reposition and add pcm_mutex
by 강신형 05 Dec '22

05 Dec '22

>From 3f8fd1efedd77331d948b16a8e44ffa6cf0e811f Mon Sep 17 00:00:00 2001 From: "s47.kang" <s47.kang(a)samsung.com> Date: Fri, 2 Dec 2022 18:32:35 +0900 Subject: [PATCH] [COMMON] ASoC: soc-compress.c: Reposition and add pcm_mutex. If panic_on_warn is set and compress stream(DPCM) is started, then kernel panic will occurs because card->pcm_mutex isn't held appropriately in soc_compr_set_params_fe, soc_compr_open_fe and soc_compr_free_fe. So, I reposition and add pcm_mutex to resolve lockdep error. Change-Id: I15981b4f09b0bff37e7e98e6ee1f809339b2bcc4 --- sound/soc/soc-compress.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 870f13e1d389..7bce5088b455 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -149,6 +149,8 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) if (ret < 0) goto be_err; + mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); + /* calculate valid and active FE <-> BE dpcms */ dpcm_process_paths(fe, stream, &list, 1); fe->dpcm[stream].runtime = fe_substream->runtime; @@ -184,7 +186,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) fe->dpcm[stream].state = SND_SOC_DPCM_STATE_OPEN; fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO; - mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); snd_soc_runtime_activate(fe, stream); mutex_unlock(&fe->card->pcm_mutex); @@ -215,7 +216,6 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); snd_soc_runtime_deactivate(fe, stream); - mutex_unlock(&fe->card->pcm_mutex); fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE; @@ -234,6 +234,8 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) dpcm_be_disconnect(fe, stream); + mutex_unlock(&fe->card->pcm_mutex); + fe->dpcm[stream].runtime = NULL; snd_soc_link_compr_shutdown(cstream, 0); @@ -409,8 +411,9 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, ret = snd_soc_link_compr_set_params(cstream); if (ret < 0) goto out; - + mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START); + mutex_unlock(&fe->card->pcm_mutex); fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PREPARE; out: -- 2.21.0

2 1

[PATCH 0/3] ALSA: Fix XRUN handling of USB-audio implicit fb
by Takashi Iwai 05 Dec '22

05 Dec '22

Hi, this is a patch set to cover a corner-case bug that happens with the USB-audio implicit feedback mode. When XRUN happens in the implicit fb full-duplex streams, the driver may get EPIPE error at prepare but re-issuing fails again. The essential fix is the 3rd patch but the former two are covering other corner cases I spotted (only theoretical). Takashi === Takashi Iwai (3): ALSA: pcm: Set missing stop_operating flag at undoing trigger start ALSA: pcm: Handle XRUN at trigger START ALSA: usb-audio: Workaround for XRUN at prepare sound/core/pcm_native.c | 12 ++++++++++-- sound/usb/pcm.c | 13 +++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) -- 2.35.3

1 3

[PATCH v8 0/3] ASoC: SOF: Fix deadlock when shutdown a frozen userspace
by Ricardo Ribalda 05 Dec '22

05 Dec '22

Since: 83bfc7e793b5 ("ASoC: SOF: core: unregister clients and machine drivers in .shutdown") we wait for all the workloads to be completed during shutdown. This was done to avoid a stall once the device is started again. Unfortunately this has the side effect of stalling kexec(), if the userspace is frozen. Let's handle that case. To: Joel Fernandes <joel(a)joelfernandes.org> To: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> To: Liam Girdwood <lgirdwood(a)gmail.com> To: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> To: Bard Liao <yung-chuan.liao(a)linux.intel.com> To: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> To: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> To: Daniel Baluta <daniel.baluta(a)nxp.com> To: Mark Brown <broonie(a)kernel.org> To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> To: Eric Biederman <ebiederm(a)xmission.com> To: Chromeos Kdump <chromeos-kdump(a)google.com> To: Steven Rostedt <rostedt(a)goodmis.org> To: Michael Ellerman <mpe(a)ellerman.id.au> To: Nicholas Piggin <npiggin(a)gmail.com> To: Christophe Leroy <christophe.leroy(a)csgroup.eu> To: "K. Y. Srinivasan" <kys(a)microsoft.com> To: Haiyang Zhang <haiyangz(a)microsoft.com> To: Wei Liu <wei.liu(a)kernel.org> To: Dexuan Cui <decui(a)microsoft.com> To: Thomas Gleixner <tglx(a)linutronix.de> To: Ingo Molnar <mingo(a)redhat.com> To: Borislav Petkov <bp(a)alien8.de> To: Dave Hansen <dave.hansen(a)linux.intel.com> To: x86(a)kernel.org To: "H. Peter Anvin" <hpa(a)zytor.com> To: Juergen Gross <jgross(a)suse.com> To: Boris Ostrovsky <boris.ostrovsky(a)oracle.com> To: Ard Biesheuvel <ardb(a)kernel.org> To: Bjorn Helgaas <bhelgaas(a)google.com> To: "Rafael J. Wysocki" <rafael(a)kernel.org> To: Pavel Machek <pavel(a)ucw.cz> To: Len Brown <len.brown(a)intel.com> Cc: stable(a)vger.kernel.org Cc: sound-open-firmware(a)alsa-project.org Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: kexec(a)lists.infradead.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: linux-hyperv(a)vger.kernel.org Cc: xen-devel(a)lists.xenproject.org Cc: linux-efi(a)vger.kernel.org Cc: linux-pci(a)vger.kernel.org Cc: linux-pm(a)vger.kernel.org Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- Changes in v8: - Wrap pm_freezing and kexec_inprogress in functions. - Do not run snd_sof_machine_unregister(sdev, pdata) during kexec (Thanks Kai). - Link to v7: https://lore.kernel.org/r/20221127-snd-freeze-v7-0-127c582f1ca4@chromium.org Changes in v7: - Fix commit message (Thanks Pierre-Louis). - Link to v6: https://lore.kernel.org/r/20221127-snd-freeze-v6-0-3e90553f64a5@chromium.org Changes in v6: - Check if we are in kexec with the userspace frozen. - Link to v5: https://lore.kernel.org/r/20221127-snd-freeze-v5-0-4ededeb08ba0@chromium.org Changes in v5: - Edit subject prefix. - Link to v4: https://lore.kernel.org/r/20221127-snd-freeze-v4-0-51ca64b7f2ab@chromium.org Changes in v4: - Do not call snd_sof_machine_unregister from shutdown. - Link to v3: https://lore.kernel.org/r/20221127-snd-freeze-v3-0-a2eda731ca14@chromium.org Changes in v3: - Wrap pm_freezing in a function. - Link to v2: https://lore.kernel.org/r/20221127-snd-freeze-v2-0-d8a425ea9663@chromium.org Changes in v2: - Only use pm_freezing if CONFIG_FREEZER . - Link to v1: https://lore.kernel.org/r/20221127-snd-freeze-v1-0-57461a366ec2@chromium.org --- Ricardo Ribalda (3): kexec: Refactor kexec_in_progress into a function freezer: refactor pm_freezing into a function. ASoC: SOF: Fix deadlock when shutdown a frozen userspace arch/powerpc/platforms/pseries/vio.c | 2 +- arch/x86/kernel/cpu/mshyperv.c | 6 +++--- arch/x86/xen/enlighten_hvm.c | 2 +- drivers/firmware/efi/efi.c | 2 +- drivers/pci/pci-driver.c | 2 +- include/linux/freezer.h | 3 ++- include/linux/kexec.h | 5 ++--- kernel/freezer.c | 3 +-- kernel/kexec_core.c | 12 ++++++++++-- kernel/power/process.c | 24 ++++++++++++++++++++---- sound/soc/sof/core.c | 9 ++++++--- 11 files changed, 48 insertions(+), 22 deletions(-) --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-snd-freeze-1ee143228326 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

4 10

clangd friendly headers
by GitHub pull_request - opened 05 Dec '22

05 Dec '22

alsa-project/alsa-lib pull request #286 was opened from timblechmann: quality of life improvements when working with clangd enabled IDEs. these two patches fix issues when clangd parses the headers in isolation in a c++ compile context --- * make headers self-contained * avoid c++ keyword Request URL : https://github.com/alsa-project/alsa-lib/pull/286 Patch URL : https://github.com/alsa-project/alsa-lib/pull/286.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH] ASoC: soc-compress: Reposition and add pcm_mutex
by 강신형 05 Dec '22

05 Dec '22

>From a385cc2614c17ba3002b263c0ca47dfbf6395c78 Mon Sep 17 00:00:00 2001 From: "s47.kang" <s47.kang(a)samsung.com> Date: Fri, 2 Dec 2022 15:45:16 +0900 Subject: [PATCH] ASoC: soc-compress.c: Reposition and add pcm_mutex. If panic_on_warn is set and compress stream(DPCM) is started, then kernel panic will occurs because card->pcm_mutex isn't held appropriately in soc_compr_set_params_fe, soc_compr_open_fe and soc_compr_free_fe. So, I reposition and add pcm_mutex to resolve lockdep error. Signed-off-by: Shinhyung Kang <s47.kang(a)samsung.com> --- sound/soc/soc-compress.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 870f13e1d389..7bce5088b455 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -149,6 +149,8 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) if (ret < 0) goto be_err; + mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); + /* calculate valid and active FE <-> BE dpcms */ dpcm_process_paths(fe, stream, &list, 1); fe->dpcm[stream].runtime = fe_substream->runtime; @@ -184,7 +186,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) fe->dpcm[stream].state = SND_SOC_DPCM_STATE_OPEN; fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO; - mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); snd_soc_runtime_activate(fe, stream); mutex_unlock(&fe->card->pcm_mutex); @@ -215,7 +216,6 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); snd_soc_runtime_deactivate(fe, stream); - mutex_unlock(&fe->card->pcm_mutex); fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE; @@ -234,6 +234,8 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) dpcm_be_disconnect(fe, stream); + mutex_unlock(&fe->card->pcm_mutex); + fe->dpcm[stream].runtime = NULL; snd_soc_link_compr_shutdown(cstream, 0); @@ -409,8 +411,9 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, ret = snd_soc_link_compr_set_params(cstream); if (ret < 0) goto out; - + mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START); + mutex_unlock(&fe->card->pcm_mutex); fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PREPARE; out: -- 2.21.0

2 1

[PATCH v1 0/2] ASoC/tda998x: Fix reporting of nonexistent capture streams
by Mark Brown 04 Dec '22

04 Dec '22

The recently added pcm-test selftest has pointed out that systems with the tda998x driver end up advertising that they support capture when in reality as far as I can see the tda998x devices are transmit only. The DAIs registered through hdmi-codec are bidirectional, meaning that for I2S systems when combined with a typical bidrectional CPU DAI the overall capability of the PCM is bidirectional. In most cases the I2S links will clock OK but no useful audio will be returned which isn't so bad but we should still not advertise the useless capability, and some systems may notice problems for example due to pinmux management. This is happening due to the hdmi-codec helpers not providing any mechanism for indicating unidirectional audio so add one and use it in the tda998x driver. It is likely other hdmi-codec users are also affected but I don't have those systems to hand. Mark Brown (2): ASoC: hdmi-codec: Allow playback and capture to be disabled drm: tda99x: Don't advertise non-existent capture support drivers/gpu/drm/i2c/tda998x_drv.c | 2 ++ include/sound/hdmi-codec.h | 4 ++++ sound/soc/codecs/hdmi-codec.c | 30 +++++++++++++++++++++++++----- 3 files changed, 31 insertions(+), 5 deletions(-) base-commit: f0c4d9fc9cc9462659728d168387191387e903cc -- 2.30.2

2 4

[PATCH v2 2/2] ASoC: tas5805m: add missing page switch.
by Daniel Beer 04 Dec '22

04 Dec '22

In tas5805m_refresh, we switch pages to update the DSP volume control, but we need to switch back to page 0 before trying to alter the soft-mute control. This latter page-switch was missing. Fixes: ec45268467f4 ("ASoC: add support for TAS5805M digital amplifier") Signed-off-by: Daniel Beer <daniel.beer(a)igorinstitute.com> --- sound/soc/codecs/tas5805m.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c index 6e2edf045446..4e38eb7acea1 100644 --- a/sound/soc/codecs/tas5805m.c +++ b/sound/soc/codecs/tas5805m.c @@ -203,6 +203,9 @@ static void tas5805m_refresh(struct tas5805m_priv *tas5805m) set_dsp_scale(rm, 0x24, tas5805m->vol[0]); set_dsp_scale(rm, 0x28, tas5805m->vol[1]); + regmap_write(rm, REG_PAGE, 0x00); + regmap_write(rm, REG_BOOK, 0x00); + /* Set/clear digital soft-mute */ regmap_write(rm, REG_DEVICE_CTRL_2, (tas5805m->is_muted ? DCTRL2_MUTE : 0) | -- 2.38.1

1 0

[PATCH v2 1/2] ASoC: tas5805m: rework to avoid scheduling while atomic.
by Daniel Beer 04 Dec '22

04 Dec '22

There's some setup we need to do in order to get the DSP initialized, and this can't be done until a bit-clock is ready. In an earlier version of this driver, this work was done in a DAPM callback. The DAPM callback doesn't guarantee that the bit-clock is running, so the work was moved instead to the trigger callback. Unfortunately this callback runs in atomic context, and the setup code needs to do I2C transactions. Here we use a work_struct to kick off the setup in a thread instead. Fixes: ec45268467f4 ("ASoC: add support for TAS5805M digital amplifier") Signed-off-by: Daniel Beer <daniel.beer(a)igorinstitute.com> --- sound/soc/codecs/tas5805m.c | 128 ++++++++++++++++++++++++------------ 1 file changed, 87 insertions(+), 41 deletions(-) diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c index beb4ec629a03..6e2edf045446 100644 --- a/sound/soc/codecs/tas5805m.c +++ b/sound/soc/codecs/tas5805m.c @@ -154,6 +154,7 @@ static const uint32_t tas5805m_volume[] = { #define TAS5805M_VOLUME_MIN 0 struct tas5805m_priv { + struct i2c_client *i2c; struct regulator *pvdd; struct gpio_desc *gpio_pdn_n; @@ -165,6 +166,9 @@ struct tas5805m_priv { int vol[2]; bool is_powered; bool is_muted; + + struct work_struct work; + struct mutex lock; }; static void set_dsp_scale(struct regmap *rm, int offset, int vol) @@ -181,13 +185,11 @@ static void set_dsp_scale(struct regmap *rm, int offset, int vol) regmap_bulk_write(rm, offset, v, ARRAY_SIZE(v)); } -static void tas5805m_refresh(struct snd_soc_component *component) +static void tas5805m_refresh(struct tas5805m_priv *tas5805m) { - struct tas5805m_priv *tas5805m = - snd_soc_component_get_drvdata(component); struct regmap *rm = tas5805m->regmap; - dev_dbg(component->dev, "refresh: is_muted=%d, vol=%d/%d\n", + dev_dbg(&tas5805m->i2c->dev, "refresh: is_muted=%d, vol=%d/%d\n", tas5805m->is_muted, tas5805m->vol[0], tas5805m->vol[1]); regmap_write(rm, REG_PAGE, 0x00); @@ -226,8 +228,11 @@ static int tas5805m_vol_get(struct snd_kcontrol *kcontrol, struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); + mutex_lock(&tas5805m->lock); ucontrol->value.integer.value[0] = tas5805m->vol[0]; ucontrol->value.integer.value[1] = tas5805m->vol[1]; + mutex_unlock(&tas5805m->lock); + return 0; } @@ -243,11 +248,13 @@ static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, snd_soc_kcontrol_component(kcontrol); struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); + int ret = 0; if (!(volume_is_valid(ucontrol->value.integer.value[0]) && volume_is_valid(ucontrol->value.integer.value[1]))) return -EINVAL; + mutex_lock(&tas5805m->lock); if (tas5805m->vol[0] != ucontrol->value.integer.value[0] || tas5805m->vol[1] != ucontrol->value.integer.value[1]) { tas5805m->vol[0] = ucontrol->value.integer.value[0]; @@ -256,11 +263,12 @@ static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, tas5805m->vol[0], tas5805m->vol[1], tas5805m->is_powered); if (tas5805m->is_powered) - tas5805m_refresh(component); - return 1; + tas5805m_refresh(tas5805m); + ret = 1; } + mutex_unlock(&tas5805m->lock); - return 0; + return ret; } static const struct snd_kcontrol_new tas5805m_snd_controls[] = { @@ -294,54 +302,83 @@ static int tas5805m_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_component *component = dai->component; struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); - struct regmap *rm = tas5805m->regmap; - unsigned int chan, global1, global2; switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - dev_dbg(component->dev, "DSP startup\n"); - - /* We mustn't issue any I2C transactions until the I2S - * clock is stable. Furthermore, we must allow a 5ms - * delay after the first set of register writes to - * allow the DSP to boot before configuring it. - */ - usleep_range(5000, 10000); - send_cfg(rm, dsp_cfg_preboot, - ARRAY_SIZE(dsp_cfg_preboot)); - usleep_range(5000, 15000); - send_cfg(rm, tas5805m->dsp_cfg_data, - tas5805m->dsp_cfg_len); - - tas5805m->is_powered = true; - tas5805m_refresh(component); + dev_dbg(component->dev, "clock start\n"); + schedule_work(&tas5805m->work); break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - dev_dbg(component->dev, "DSP shutdown\n"); + break; - tas5805m->is_powered = false; + default: + return -EINVAL; + } - regmap_write(rm, REG_PAGE, 0x00); - regmap_write(rm, REG_BOOK, 0x00); + return 0; +} - regmap_read(rm, REG_CHAN_FAULT, &chan); - regmap_read(rm, REG_GLOBAL_FAULT1, &global1); - regmap_read(rm, REG_GLOBAL_FAULT2, &global2); +static void do_work(struct work_struct *work) +{ + struct tas5805m_priv *tas5805m = + container_of(work, struct tas5805m_priv, work); + struct regmap *rm = tas5805m->regmap; - dev_dbg(component->dev, - "fault regs: CHAN=%02x, GLOBAL1=%02x, GLOBAL2=%02x\n", - chan, global1, global2); + dev_dbg(&tas5805m->i2c->dev, "DSP startup\n"); - regmap_write(rm, REG_DEVICE_CTRL_2, DCTRL2_MODE_HIZ); - break; + mutex_lock(&tas5805m->lock); + /* We mustn't issue any I2C transactions until the I2S + * clock is stable. Furthermore, we must allow a 5ms + * delay after the first set of register writes to + * allow the DSP to boot before configuring it. + */ + usleep_range(5000, 10000); + send_cfg(rm, dsp_cfg_preboot, ARRAY_SIZE(dsp_cfg_preboot)); + usleep_range(5000, 15000); + send_cfg(rm, tas5805m->dsp_cfg_data, tas5805m->dsp_cfg_len); + + tas5805m->is_powered = true; + tas5805m_refresh(tas5805m); + mutex_unlock(&tas5805m->lock); +} - default: - return -EINVAL; +static int tas5805m_dac_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + struct regmap *rm = tas5805m->regmap; + + if (event & SND_SOC_DAPM_PRE_PMD) { + unsigned int chan, global1, global2; + + dev_dbg(component->dev, "DSP shutdown\n"); + cancel_work_sync(&tas5805m->work); + + mutex_lock(&tas5805m->lock); + if (tas5805m->is_powered) { + tas5805m->is_powered = false; + + regmap_write(rm, REG_PAGE, 0x00); + regmap_write(rm, REG_BOOK, 0x00); + + regmap_read(rm, REG_CHAN_FAULT, &chan); + regmap_read(rm, REG_GLOBAL_FAULT1, &global1); + regmap_read(rm, REG_GLOBAL_FAULT2, &global2); + + dev_dbg(component->dev, "fault regs: CHAN=%02x, " + "GLOBAL1=%02x, GLOBAL2=%02x\n", + chan, global1, global2); + + regmap_write(rm, REG_DEVICE_CTRL_2, DCTRL2_MODE_HIZ); + } + mutex_unlock(&tas5805m->lock); } return 0; @@ -354,7 +391,8 @@ static const struct snd_soc_dapm_route tas5805m_audio_map[] = { static const struct snd_soc_dapm_widget tas5805m_dapm_widgets[] = { SND_SOC_DAPM_AIF_IN("DAC IN", "Playback", 0, SND_SOC_NOPM, 0, 0), - SND_SOC_DAPM_DAC("DAC", NULL, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_DAC_E("DAC", NULL, SND_SOC_NOPM, 0, 0, + tas5805m_dac_event, SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_OUTPUT("OUT") }; @@ -375,11 +413,14 @@ static int tas5805m_mute(struct snd_soc_dai *dai, int mute, int direction) struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); + mutex_lock(&tas5805m->lock); dev_dbg(component->dev, "set mute=%d (is_powered=%d)\n", mute, tas5805m->is_powered); + tas5805m->is_muted = mute; if (tas5805m->is_powered) - tas5805m_refresh(component); + tas5805m_refresh(tas5805m); + mutex_unlock(&tas5805m->lock); return 0; } @@ -434,6 +475,7 @@ static int tas5805m_i2c_probe(struct i2c_client *i2c) if (!tas5805m) return -ENOMEM; + tas5805m->i2c = i2c; tas5805m->pvdd = devm_regulator_get(dev, "pvdd"); if (IS_ERR(tas5805m->pvdd)) { dev_err(dev, "failed to get pvdd supply: %ld\n", @@ -507,6 +549,9 @@ static int tas5805m_i2c_probe(struct i2c_client *i2c) gpiod_set_value(tas5805m->gpio_pdn_n, 1); usleep_range(10000, 15000); + INIT_WORK(&tas5805m->work, do_work); + mutex_init(&tas5805m->lock); + /* Don't register through devm. We need to be able to unregister * the component prior to deasserting PDN# */ @@ -527,6 +572,7 @@ static void tas5805m_i2c_remove(struct i2c_client *i2c) struct device *dev = &i2c->dev; struct tas5805m_priv *tas5805m = dev_get_drvdata(dev); + cancel_work_sync(&tas5805m->work); snd_soc_unregister_component(dev); gpiod_set_value(tas5805m->gpio_pdn_n, 0); usleep_range(10000, 15000); -- 2.38.1

1 0

[PATCH 0/2] soundwire: Remove redundant zeroing of page registers
by Richard Fitzgerald 02 Dec '22

02 Dec '22

Writing zero to the page registers after each message transaction can add up to a lot of overhead for codecs that need to transfer large amount of data - for example a firmware download. There's no spec reason I can see for this zeroing. The page registers are only used for a paged address. The bus code uses a non-paged address for registers in page 0. It always writes the page registers at the start of a paged transaction. If this zeroing was a workaround for anything, let me know and I will re-implement the zeroing as a quirk that can be enabled only when it is necessary. Richard Fitzgerald (2): soundwire: bus: Don't zero page registers after every transaction soundwire: bus: Remove unused reset_page_addr() callback drivers/soundwire/bus.c | 23 ----------------------- drivers/soundwire/cadence_master.c | 14 -------------- drivers/soundwire/cadence_master.h | 3 --- drivers/soundwire/intel_auxdevice.c | 1 - include/linux/soundwire/sdw.h | 3 --- 5 files changed, 44 deletions(-) -- 2.30.2

2 5

[PATCH 0/5] ASoC: Intel: Skylake: Topology and shutdown fixes
by Cezary Rojewski 02 Dec '22

02 Dec '22

Even though skylake-driver is going to be replaced by the avs-driver, the goal is to keep it functional on all the configurations it supports until its EOL. When comparing chrome trees against upstream skylake-driver, couple fixes pop up that are not part of upstream repository. These fixes are backed up by real bugs (issue trackers), address real problems. There is no reason for them to stay in the internal tree. Except for the last patch, all changes combined together address issue when the driver updates the presumably static audio format descriptions coming from the topology files through its "fixup" functions. As long as given audio format is used by a single path, nothing collides and any updates are harmless. However, when multiple paths e.g.: DMIC and HDMI1 utilize the same audio format descriptor, any updates caused by the opening of the first path, may cause the second to fail. The last change from the set fixes driver hang sporadically occurring during shutdown procedure. Once HDAudio links are powered down along with the AudioDSP, the hang stops reproducing. Cezary Rojewski (5): ASoC: Intel: Skylake: Update pipe_config_idx before filling BE params ASoC: Intel: Skylake: Remove skl_tplg_is_multi_fmt() ASoC: Intel: Skylake: Drop pipe_config_idx ASoC: Intel: Skylake: Introduce single place for pipe-config selection ASoC: Intel: Skylake: Fix driver hang during shutdown sound/soc/intel/skylake/skl-topology.c | 73 +++++++++----------------- sound/soc/intel/skylake/skl-topology.h | 1 - sound/soc/intel/skylake/skl.c | 5 +- 3 files changed, 28 insertions(+), 51 deletions(-) -- 2.25.1

1 5

[PATCH v1 0/6] kselftest/alsa: pcm-test improvements
by Mark Brown 02 Dec '22

02 Dec '22

This series provides a bunch of quick updates which should make the coverage from pcm-test a bit more useful, it adds some support for skipping tests when the hardware/driver is unable to support the requested configuration and then expands the set of cases we cover to include more sample rates and channel counts. This should exercise switching between 8kHz and 44.1kHz based rates and ensure that clocking doesn't get confused by non-stereo channel counts, both of which are I expect common real world errors, at least for embedded cards. Mark Brown (6): kselftest/alsa: Refactor pcm-test to list the tests to run in a struct kselftest/alsa: Report failures to set the requested sample rate as skips kselftest/alsa: Report failures to set the requested channels as skips kselftest/alsa: Don't any configuration in the sample config kselftest/alsa: Provide more meaningful names for tests kselftest/alsa: Add more coverage of sample rates and channel counts .../alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf | 35 ++++---- tools/testing/selftests/alsa/pcm-test.c | 88 +++++++++++++------ 2 files changed, 81 insertions(+), 42 deletions(-) base-commit: 1d8025ec722d5e011f9299c46274eb21fb54a428 -- 2.30.2

3 16

[PATCH -next] The USB audio driver does not contain the VID and PID of this sound card, so the driver is not loaded.
by Dicheng Wang 02 Dec '22

02 Dec '22

From: wangdicheng <wangdicheng(a)kylinos.cn> Add relevant information to the quirks-table.h file. The test passes and the sound source file plays normally. Cc: stable(a)vger.kernel.org Signed-off-by: wangdicheng <wangdicheng(a)kylinos.cn> --- sound/usb/quirks-table.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 874fcf245747..1fb183895da0 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2802,6 +2802,13 @@ YAMAHA_DEVICE(0x7010, "UB99"), .idProduct = 0x1020, }, +/* Ktmicro Usb_audio device */ +{ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE, + .idVendor = 0x31b2, + .idProduct = 0x0011, +}, + /* QinHeng devices */ { USB_DEVICE(0x1a86, 0x752d), -- 2.25.1

2 1

[PATCH] ASoC: tas27{64,70}: fix PM ops ordering
by James Calligeros 02 Dec '22

02 Dec '22

On both tas2764 and tas2770, a write to PWR_CTRL is attempted on resume before syncing the regcache to the chip, potentially leaving it in an undefined state that causes resume to fail. The codec is then unavailable until the next system reset. On tas2770 specifically, both suspend and resume ops attempt useless register writes on unrestored registers. This causes its state to be desynchronised from what ASoC expects it to be in. These two codecs are almost identical, so unify their behaviour and reorder the ops so that the codec is always suspended and resumed in a known/expected state. Suggested-by: Martin Povišer <povik+lin(a)cutebit.org> Signed-off-by: James Calligeros <jcalligeros99(a)gmail.com> --- sound/soc/codecs/tas2764.c | 11 +++++++---- sound/soc/codecs/tas2770.c | 40 ++++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c index 2e0ed3e68fa5..51c6b3a940c4 100644 --- a/sound/soc/codecs/tas2764.c +++ b/sound/soc/codecs/tas2764.c @@ -32,7 +32,7 @@ struct tas2764_priv { struct regmap *regmap; struct device *dev; int irq; - + int v_sense_slot; int i_sense_slot; @@ -157,14 +157,17 @@ static int tas2764_codec_resume(struct snd_soc_component *component) usleep_range(1000, 2000); } - ret = tas2764_update_pwr_ctrl(tas2764); + regcache_cache_only(tas2764->regmap, false); + ret = regcache_sync(tas2764->regmap); if (ret < 0) return ret; - regcache_cache_only(tas2764->regmap, false); + ret = tas2764_update_pwr_ctrl(tas2764); + if (ret < 0) + return ret; - return regcache_sync(tas2764->regmap); + return 0; } #else #define tas2764_codec_suspend NULL diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c index 8557759acb1f..5c9e8419b387 100644 --- a/sound/soc/codecs/tas2770.c +++ b/sound/soc/codecs/tas2770.c @@ -72,25 +72,21 @@ static int tas2770_codec_suspend(struct snd_soc_component *component) struct tas2770_priv *tas2770 = snd_soc_component_get_drvdata(component); int ret = 0; + ret = snd_soc_component_update_bits(component, TAS2770_PWR_CTRL, + TAS2770_PWR_CTRL_MASK, + TAS2770_PWR_CTRL_SHUTDOWN); + + if (ret < 0) + return ret; + regcache_cache_only(tas2770->regmap, true); - regcache_mark_dirty(tas2770->regmap); + regcache_sync(tas2770->regmap); - if (tas2770->sdz_gpio) { + if (tas2770->sdz_gpio) gpiod_set_value_cansleep(tas2770->sdz_gpio, 0); - } else { - ret = snd_soc_component_update_bits(component, TAS2770_PWR_CTRL, - TAS2770_PWR_CTRL_MASK, - TAS2770_PWR_CTRL_SHUTDOWN); - if (ret < 0) { - regcache_cache_only(tas2770->regmap, false); - regcache_sync(tas2770->regmap); - return ret; - } - ret = 0; - } - return ret; + return 0; } static int tas2770_codec_resume(struct snd_soc_component *component) @@ -98,18 +94,24 @@ static int tas2770_codec_resume(struct snd_soc_component *component) struct tas2770_priv *tas2770 = snd_soc_component_get_drvdata(component); int ret; + if (tas2770->sdz_gpio) { gpiod_set_value_cansleep(tas2770->sdz_gpio, 1); usleep_range(1000, 2000); - } else { - ret = tas2770_update_pwr_ctrl(tas2770); - if (ret < 0) - return ret; } regcache_cache_only(tas2770->regmap, false); - return regcache_sync(tas2770->regmap); + ret = regcache_sync(tas2770->regmap); + if (ret < 0) + return ret; + + ret = tas2770_update_pwr_ctrl(tas2770); + if (ret < 0) + return ret; + + + return 0; } #else #define tas2770_codec_suspend NULL -- 2.38.1

2 1

[PATCH] ASoC: soc-compress: Reposition and add pcm_mutex
by 강신형 02 Dec '22

02 Dec '22

commit a385cc2614c17ba3002b263c0ca47dfbf6395c78 (HEAD -> fix_compr, master) Author: s47.kang <[1]s47.kang(a)samsung.com> Date: Fri Dec 2 15:45:16 2022 +0900 ASoC: soc-compress.c: Reposition and add pcm_mutex. If panic_on_warn is set and compress stream(DPCM) is started, then kernel panic will occurs because card->pcm_mutex isn't held appropriately in soc_compr_set_params_fe, soc_compr_open_fe and soc_compr_free_fe. So, I reposition and add pcm_mutex to resolve lockdep error. Signed-off-by: Shinhyung Kang <[2]s47.kang(a)samsung.com> diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 870f13e1d389..7bce5088b455 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -149,6 +149,8 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) if (ret < 0) goto be_err; + mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); + /* calculate valid and active FE <-> BE dpcms */ dpcm_process_paths(fe, stream, &list, 1); fe->dpcm[stream].runtime = fe_substream->runtime; @@ -184,7 +186,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) fe->dpcm[stream].state = SND_SOC_DPCM_STATE_OPEN; fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO; - mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); snd_soc_runtime_activate(fe, stream); mutex_unlock(&fe->card->pcm_mutex); @@ -215,7 +216,6 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); snd_soc_runtime_deactivate(fe, stream); - mutex_unlock(&fe->card->pcm_mutex); fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE; @@ -234,6 +234,8 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) dpcm_be_disconnect(fe, stream); + mutex_unlock(&fe->card->pcm_mutex); + fe->dpcm[stream].runtime = NULL; snd_soc_link_compr_shutdown(cstream, 0); @@ -409,8 +411,9 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, ret = snd_soc_link_compr_set_params(cstream); if (ret < 0) goto out; - + mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START); + mutex_unlock(&fe->card->pcm_mutex); fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PREPARE; out: [cid:cafe_image_0@s-core.co.kr] [update?userid=s47.kang&do=bWFpbElEPTIwMjIxMjAyMDgwMDMyZXBjbXMycDY4ZjU2 YTZiNDNkN2Q2YTRmMGQyZGU5Mjk1YzBlNGFiNCZyZWNpcGllbnRBZGRyZXNzPWFsc2EtZGV 2ZWxAYWxzYS1wcm9qZWN0Lm9yZw__] References 1. mailto:s47.kang@samsung.com 2. mailto:s47.kang@samsung.com

2 1

[PATCH 0/3] soundwire: cadence: Fix oversized FIFO size define
by Richard Fitzgerald 02 Dec '22

02 Dec '22

As determined by experimentation and asking a hardware person, the FIFO in the Cadence IP is actually only 8 entries long, not 32. This is fixed in patch #1. As a bonus, patches #2 and #3 fix two other things I noticed while debugging this. Richard Fitzgerald (3): soundwire: cadence: Don't overflow the command FIFOs soundwire: cadence: Remove wasted space in response_buf soundwire: cadence: Drain the RX FIFO after an IO timeout drivers/soundwire/cadence_master.c | 45 +++++++++++++++++++----------- drivers/soundwire/cadence_master.h | 2 +- 2 files changed, 29 insertions(+), 18 deletions(-) -- 2.30.2

2 7