July 2023 - Sound-open-firmware - mailman.alsa-project.org

Re: [v2 PATCH 1/2] ALSA: hda/intel: Fix error handling in azx_probe()
by Takashi Iwai 18 Jul '23

18 Jul '23

On Tue, 18 Jul 2023 13:57:33 +0200, Maarten Lankhorst wrote: > > > Make sure azx is freed after azx_create() succeeded and an error was > encountered. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> > --- > sound/pci/hda/hda_intel.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index 5af1138e745bc..196ca76ac43ad 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -2150,7 +2150,7 @@ static int azx_probe(struct pci_dev *pci, > err = register_vga_switcheroo(chip); > if (err < 0) { > dev_err(card->dev, "Error registering vga_switcheroo client\n"); > - goto out_free; > + goto out_azx_free; > } > > if (check_hdmi_disabled(pci)) { > @@ -2169,7 +2169,7 @@ static int azx_probe(struct pci_dev *pci, > &pci->dev, GFP_KERNEL, card, > azx_firmware_cb); > if (err < 0) > - goto out_free; > + goto out_azx_free; > schedule_probe = false; /* continued in azx_firmware_cb() */ > } > #endif /* CONFIG_SND_HDA_PATCH_LOADER */ > @@ -2187,6 +2187,9 @@ static int azx_probe(struct pci_dev *pci, > complete_all(&hda->probe_wait); > return 0; > > +out_azx_free: > + azx_free(chip); This is superfluous. Once when azx_create() succeeds, azx_free() is called from snd_card_free(). That is... > + pci_set_drvdata(pci, NULL); ... only this call was missing. And this can be put under out_free label, as this is safe to call at any exit path. So, it'll be a oneliner patch. thanks, Takashi > out_free: > snd_card_free(card); > return err; > -- > 2.39.2 >

1 0

Re: [PATCH 5/7] ALSA: hda/intel: Move snd_hdac_i915_init to before probe_work.
by Takashi Iwai 18 Jul '23

18 Jul '23

On Tue, 18 Jul 2023 10:45:20 +0200, Maarten Lankhorst wrote: > > Now that we can use -EPROBE_DEFER, it's no longer required to spin off > the snd_hdac_i915_init into a workqueue. > > Use the -EPROBE_DEFER mechanism instead, which must be returned in the > probe function. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> > --- > sound/pci/hda/hda_intel.c | 58 +++++++++++++++++++++------------------ > 1 file changed, 31 insertions(+), 27 deletions(-) > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index 5af1138e745bc..d40345a0088d8 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -213,6 +213,7 @@ MODULE_DESCRIPTION("Intel HDA driver"); > #endif > #endif > > +static DECLARE_BITMAP(probed_devs, SNDRV_CARDS); > > /* > */ > @@ -2094,8 +2095,6 @@ static const struct hda_controller_ops pci_hda_ops = { > .position_check = azx_position_check, > }; > > -static DECLARE_BITMAP(probed_devs, SNDRV_CARDS); > - > static int azx_probe(struct pci_dev *pci, > const struct pci_device_id *pci_id) > { Any specific reason to move the definition? Otherwise let's concentrate on the needed change. > @@ -2174,7 +2173,36 @@ static int azx_probe(struct pci_dev *pci, > } > #endif /* CONFIG_SND_HDA_PATCH_LOADER */ > > -#ifndef CONFIG_SND_HDA_I915 > +#ifdef CONFIG_SND_HDA_I915 > + /* bind with i915 if needed */ > + if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) { > + err = snd_hdac_i915_init(azx_bus(chip), false); > + if (err < 0) { > + /* if the controller is bound only with HDMI/DP > + * (for HSW and BDW), we need to abort the probe; > + * for other chips, still continue probing as other > + * codecs can be on the same link. > + */ > + if (CONTROLLER_IN_GPU(pci)) { > + if (err != -EPROBE_DEFER) > + dev_err(card->dev, > + "HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n"); > + > + clear_bit(chip->dev_index, probed_devs); > + pci_set_drvdata(pci, NULL); > + snd_device_free(card, chip); > + return err; This may leak resources, I'm afraid. Here you just need to "goto out_free;" instead of manual resource releases, which eventually calls snd_card_free(), and that's all. (Though, pci_set_drvdata(pci, NULL) might be still missing; but it's not only for this change, and we'll need to address it in another patch.) thanks, Takashi

1 0

Re: [PATCH 0/7] sound: Use -EPROBE_DEFER instead of i915 module loading.
by Takashi Iwai 18 Jul '23

18 Jul '23

On Tue, 18 Jul 2023 10:45:15 +0200, Maarten Lankhorst wrote: > > Explicitly loading i915 becomes a problem when upstreaming the new intel driver > for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for > driver load of xe, and will fail completely before it loads. > > -EPROBE_DEFER has to be returned before any device is created in probe(), > otherwise the removal of the device will cause EPROBE_DEFER to try again > in an infinite loop. > > The conversion is done in gradual steps. First I add an argument to > snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver > separately. Then I convert each driver to move snd_hdac_i915_init out of the > workqueue. Finally I drop the ability to choose modprobe behavior after the > last user is converted. > > I suspect the avs and skylake drivers used snd_hdac_i915_init purely for the > modprobe, but I don't have the hardware to test if it can be safely removed. > It can still be done easily in a followup patch to simplify probing. Thanks for the patches. I naively thought that issuing the component binding at the early stage could be problematic, but in this case, this doesn't look OK, since the all i915 stuff is bound always at the HD-audio controller level, not at the codec level like others. So, it's definitely worth to try. Takashi > Maarten Lankhorst (7): > ALSA: hda/i915: Add an allow_modprobe argument to snd_hdac_i915_init > ALSA: hda/i915: Allow xe as match for i915_component_master_match > ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work. > ASoC: Intel: Skylake: Move snd_hdac_i915_init to before probe_work. > ALSA: hda/intel: Move snd_hdac_i915_init to before probe_work. > ASoC: SOF: Intel: Remove deferred probe for SOF > ALSA: hda/i915: Remove extra argument from snd_hdac_i915_init > > Cc: Jaroslav Kysela <perex(a)perex.cz> > Cc: Takashi Iwai <tiwai(a)suse.com> > Cc: Cezary Rojewski <cezary.rojewski(a)intel.com> > Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> > Cc: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> > Cc: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> > Cc: Bard Liao <yung-chuan.liao(a)linux.intel.com> > Cc: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> > Cc: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> > Cc: Mark Brown <broonie(a)kernel.org> > Cc: Daniel Baluta <daniel.baluta(a)nxp.com> > Cc: alsa-devel(a)alsa-project.org > Cc: linux-kernel(a)vger.kernel.org > Cc: sound-open-firmware(a)alsa-project.org > > sound/hda/hdac_i915.c | 15 +++------ > sound/pci/hda/hda_intel.c | 58 +++++++++++++++++++---------------- > sound/soc/intel/avs/core.c | 13 +++++--- > sound/soc/intel/skylake/skl.c | 31 ++++++------------- > sound/soc/sof/Kconfig | 19 ------------ > sound/soc/sof/core.c | 38 ++--------------------- > sound/soc/sof/intel/Kconfig | 1 - > sound/soc/sof/intel/hda.c | 32 +++++++++++-------- > sound/soc/sof/sof-pci-dev.c | 3 +- > sound/soc/sof/sof-priv.h | 5 --- > 10 files changed, 75 insertions(+), 140 deletions(-) > > -- > 2.39.2 >

1 0

Re: [PATCH] ASoC: SOF: ipc3-dtrace: uninitialized data in dfsentry_trace_filter_write()
by Mark Brown 17 Jul '23

17 Jul '23

On Fri, 07 Jul 2023 14:25:23 +0300, Dan Carpenter wrote: > This doesn't check how many bytes the simple_write_to_buffer() writes to > the buffer. The only thing that we know is that the first byte is > initialized and the last byte of the buffer is set to NUL. However > the middle bytes could be uninitialized. > > There is no need to use simple_write_to_buffer(). This code does not > support partial writes but instead passes "pos = 0" as the starting > offset regardless of what the user passed as "*ppos". Just use the > copy_from_user() function and initialize the whole buffer. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: ipc3-dtrace: uninitialized data in dfsentry_trace_filter_write() commit: 469e2f28c2cbee2430058c1c9bb6d1675d7195fb 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: (subset) [PATCH 1/2] ASoC: SOF: amd: add revision check for sending sha dma completion command
by Mark Brown 12 Jul '23

12 Jul '23

On Fri, 30 Jun 2023 12:35:42 +0530, Mastan Katragadda wrote: > ACP driver should send SHA DMA completion command to PSP module for RN > platform only. > Add a revision check for RN platform. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [2/2] ASoC: SOF: amd: refactor PSP smn_read commit: 2b48d170fb9965dda9d41edcb0bbfc9ee4c6584f 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 2/2] ASoC: SOF: amd: refactor PSP smn_read
by Mastan Katragadda 12 Jul '23

12 Jul '23

On 30/06/23 12:35, Mastan Katragadda wrote: > Use the read_poll_timeout marco for PSP smn_read calls. This patch has not been merged. > > Signed-off-by: Mastan Katragadda <Mastan.Katragadda(a)amd.com> > --- > sound/soc/sof/amd/acp.c | 34 +++++++++++++++------------------- > sound/soc/sof/amd/acp.h | 4 ++-- > 2 files changed, 17 insertions(+), 21 deletions(-) > > diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c > index afb505461ea1..c450931ae77e 100644 > --- a/sound/soc/sof/amd/acp.c > +++ b/sound/soc/sof/amd/acp.c > @@ -28,12 +28,14 @@ static int smn_write(struct pci_dev *dev, u32 smn_addr, u32 data) > return 0; > } > > -static int smn_read(struct pci_dev *dev, u32 smn_addr, u32 *data) > +static int smn_read(struct pci_dev *dev, u32 smn_addr) > { > + u32 data = 0; > + > pci_write_config_dword(dev, 0x60, smn_addr); > - pci_read_config_dword(dev, 0x64, data); > + pci_read_config_dword(dev, 0x64, &data); > > - return 0; > + return data; > } > > static void init_dma_descriptor(struct acp_dev_data *adata) > @@ -150,15 +152,13 @@ int configure_and_run_dma(struct acp_dev_data *adata, unsigned int src_addr, > static int psp_mbox_ready(struct acp_dev_data *adata, bool ack) > { > struct snd_sof_dev *sdev = adata->dev; > - int timeout; > + int ret; > u32 data; > > - for (timeout = ACP_PSP_TIMEOUT_COUNTER; timeout > 0; timeout--) { > - msleep(20); > - smn_read(adata->smn_dev, MP0_C2PMSG_114_REG, &data); > - if (data & MBOX_READY_MASK) > - return 0; > - } > + ret = read_poll_timeout(smn_read, data, data & MBOX_READY_MASK, MBOX_DELAY_US, > + ACP_PSP_TIMEOUT_US, false, adata->smn_dev, MP0_C2PMSG_114_REG); > + if (!ret) > + return 0; > > dev_err(sdev->dev, "PSP error status %x\n", data & MBOX_STATUS_MASK); > > @@ -177,23 +177,19 @@ static int psp_mbox_ready(struct acp_dev_data *adata, bool ack) > static int psp_send_cmd(struct acp_dev_data *adata, int cmd) > { > struct snd_sof_dev *sdev = adata->dev; > - int ret, timeout; > + int ret; > u32 data; > > if (!cmd) > return -EINVAL; > > /* Get a non-zero Doorbell value from PSP */ > - for (timeout = ACP_PSP_TIMEOUT_COUNTER; timeout > 0; timeout--) { > - msleep(MBOX_DELAY); > - smn_read(adata->smn_dev, MP0_C2PMSG_73_REG, &data); > - if (data) > - break; > - } > + ret = read_poll_timeout(smn_read, data, data, MBOX_DELAY_US, ACP_PSP_TIMEOUT_US, false, > + adata->smn_dev, MP0_C2PMSG_73_REG); > > - if (!timeout) { > + if (ret) { > dev_err(sdev->dev, "Failed to get Doorbell from MBOX %x\n", MP0_C2PMSG_73_REG); > - return -EINVAL; > + return ret; > } > > /* Check if PSP is ready for new command */ > diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h > index dc624f727aa3..c3659dbc3745 100644 > --- a/sound/soc/sof/amd/acp.h > +++ b/sound/soc/sof/amd/acp.h > @@ -61,12 +61,12 @@ > #define HOST_BRIDGE_CZN 0x1630 > #define HOST_BRIDGE_RMB 0x14B5 > #define ACP_SHA_STAT 0x8000 > -#define ACP_PSP_TIMEOUT_COUNTER 5 > +#define ACP_PSP_TIMEOUT_US 1000000 > #define ACP_EXT_INTR_ERROR_STAT 0x20000000 > #define MP0_C2PMSG_114_REG 0x3810AC8 > #define MP0_C2PMSG_73_REG 0x3810A24 > #define MBOX_ACP_SHA_DMA_COMMAND 0x70000 > -#define MBOX_DELAY 1000 > +#define MBOX_DELAY_US 1000 > #define MBOX_READY_MASK 0x80000000 > #define MBOX_STATUS_MASK 0xFFFF >

1 0

Re: (subset) [PATCH 1/2] ASoC: SOF: amd: add revision check for sending sha dma completion command
by Mastan Katragadda 12 Jul '23

12 Jul '23

On 03/07/23 21:40, Mark Brown wrote: > On Mon, Jul 03, 2023 at 08:58:17PM +0530, Mukunda,Vijendar wrote: >> On 30/06/23 22:37, Mark Brown wrote: >>> Thanks! >>> >>> [1/2] ASoC: SOF: amd: add revision check for sending sha dma completion command >>> commit: b1db244c716fe300e36428aeb0874913d2e0a91d >> It looks like second patch didn't get merged in this series. >> Do we need to resend the second patch? > I don't know off hand what that second patch was. If it wasn't a bug > fix it'll just be waiting till after the merge window. Do I need to resend the second patch?

1 0