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

[PATCH AUTOSEL 6.9 06/11] ASoC: SOF: Intel: hda-pcm: Limit the maximum number of periods by MAX_BDL_ENTRIES
by Sasha Levin 16 Jul '24

16 Jul '24

From: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> [ Upstream commit 82bb8db96610b558920b8c57cd250ec90567d79b ] The HDaudio specification Section 3.6.2 limits the number of BDL entries to 256. Make sure we don't allow more periods than this normative value. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://patch.msgid.link/20240704090106.371497-1-pierre-louis.bossart@linux… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda-pcm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/sof/intel/hda-pcm.c b/sound/soc/sof/intel/hda-pcm.c index d7b446f3f973e..8b5fbbc777bd4 100644 --- a/sound/soc/sof/intel/hda-pcm.c +++ b/sound/soc/sof/intel/hda-pcm.c @@ -254,6 +254,12 @@ int hda_dsp_pcm_open(struct snd_sof_dev *sdev, snd_pcm_hw_constraint_integer(substream->runtime, SNDRV_PCM_HW_PARAM_PERIODS); + /* Limit the maximum number of periods to not exceed the BDL entries count */ + if (runtime->hw.periods_max > HDA_DSP_MAX_BDL_ENTRIES) + snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIODS, + runtime->hw.periods_min, + HDA_DSP_MAX_BDL_ENTRIES); + /* Only S16 and S32 supported by HDA hardware when used without DSP */ if (sdev->dspless_mode_selected) snd_pcm_hw_constraint_mask64(substream->runtime, SNDRV_PCM_HW_PARAM_FORMAT, -- 2.43.0

1 0

[PATCH AUTOSEL 6.1 10/27] ASoC: SOF: sof-audio: Skip unprepare for in-use widgets on error rollback
by Sasha Levin 09 Jul '24

09 Jul '24

From: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> [ Upstream commit 6f2a43e3d14f6e31a3b041a1043195d02c54d615 ] If the ipc_prepare() callback fails for a module instance, on error rewind we must skip the ipc_unprepare() call for ones that has positive use count. The positive use count means that the module instance is in active use, it cannot be unprepared. The issue affects capture direction paths with branches (single dai with multiple PCMs), the affected widgets are in the shared part of the paths. 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: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Link: https://lore.kernel.org/r/20240612121203.15468-1-peter.ujfalusi@linux.intel… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/sof-audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index 061ab7289a6c3..b1141f4478168 100644 --- a/sound/soc/sof/sof-audio.c +++ b/sound/soc/sof/sof-audio.c @@ -328,7 +328,7 @@ sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget if (ret < 0) { /* unprepare the source widget */ if (widget_ops[widget->id].ipc_unprepare && - swidget && swidget->prepared) { + swidget && swidget->prepared && swidget->use_count == 0) { widget_ops[widget->id].ipc_unprepare(swidget); swidget->prepared = false; } -- 2.43.0

1 0

[PATCH AUTOSEL 6.6 12/33] ASoC: SOF: sof-audio: Skip unprepare for in-use widgets on error rollback
by Sasha Levin 09 Jul '24

09 Jul '24

From: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> [ Upstream commit 6f2a43e3d14f6e31a3b041a1043195d02c54d615 ] If the ipc_prepare() callback fails for a module instance, on error rewind we must skip the ipc_unprepare() call for ones that has positive use count. The positive use count means that the module instance is in active use, it cannot be unprepared. The issue affects capture direction paths with branches (single dai with multiple PCMs), the affected widgets are in the shared part of the paths. 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: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Link: https://lore.kernel.org/r/20240612121203.15468-1-peter.ujfalusi@linux.intel… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/sof-audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index 77cc64ac71131..5162625834725 100644 --- a/sound/soc/sof/sof-audio.c +++ b/sound/soc/sof/sof-audio.c @@ -488,7 +488,7 @@ sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget if (ret < 0) { /* unprepare the source widget */ if (widget_ops[widget->id].ipc_unprepare && - swidget && swidget->prepared) { + swidget && swidget->prepared && swidget->use_count == 0) { widget_ops[widget->id].ipc_unprepare(swidget); swidget->prepared = false; } -- 2.43.0

1 0

[PATCH AUTOSEL 6.9 15/40] ASoC: SOF: sof-audio: Skip unprepare for in-use widgets on error rollback
by Sasha Levin 09 Jul '24

09 Jul '24

From: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> [ Upstream commit 6f2a43e3d14f6e31a3b041a1043195d02c54d615 ] If the ipc_prepare() callback fails for a module instance, on error rewind we must skip the ipc_unprepare() call for ones that has positive use count. The positive use count means that the module instance is in active use, it cannot be unprepared. The issue affects capture direction paths with branches (single dai with multiple PCMs), the affected widgets are in the shared part of the paths. 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: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Link: https://lore.kernel.org/r/20240612121203.15468-1-peter.ujfalusi@linux.intel… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/sof-audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index e693dcb475e4d..d1a7d867f6a3a 100644 --- a/sound/soc/sof/sof-audio.c +++ b/sound/soc/sof/sof-audio.c @@ -485,7 +485,7 @@ sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget if (ret < 0) { /* unprepare the source widget */ if (widget_ops[widget->id].ipc_unprepare && - swidget && swidget->prepared) { + swidget && swidget->prepared && swidget->use_count == 0) { widget_ops[widget->id].ipc_unprepare(swidget); swidget->prepared = false; } -- 2.43.0

1 0

Re: [Regression] Lenovo Thinkpad X1 Carbon Gen 10 first S2idle fails, S0ix fails in all further suspends
by Pierre-Louis Bossart 19 Jun '24

19 Jun '24

On 6/18/24 12:22, Thorsten Leemhuis wrote: > Hi, Thorsten here, the Linux kernel's regression tracker. > > Pierre-Louis Bossart, I noticed a report about a regression in > bugzilla.kernel.org that appears to be caused by the following change of > yours: d5263dbbd8af02 ("ASoC: SOF: Intel: don't ignore IOC interrupts > for non-audio transfers") [v6.10-rc1] > > As many (most?) kernel developers don't keep an eye on the bug tracker, > I decided to write this mail. To quote from > https://bugzilla.kernel.org/show_bug.cgi?id=218961 : Thanks for the heads-up. SOF driver bugs are tracked on https://github.com/thesofproject/linux, I filed an issue https://github.com/thesofproject/linux/issues/5072 with the information copied. >> We have a Lenovo Thinkpad X1 Carbon Gen 10 in our lab and ever since >> 6.10.0-rc1 it has failed its first S2idle suspend, and has stopped >> getting S0iX on subsequent successful S2idle suspends. The issue in the >> first suspend fail is here in the audio driver (dmesg section shown): >> >> sof-audio-pci-intel-tgl 0000:00:1f.3: Code loader DMA did not complete The only thing the commit below added is a 500ms timeout, but the log below shows the DSP boot failed already? >> sof-audio-pci-intel-tgl 0000:00:1f.3: ------------[ DSP dump start ]------------ >> sof-audio-pci-intel-tgl 0000:00:1f.3: Firmware download failed >> sof-audio-pci-intel-tgl 0000:00:1f.3: fw_state: SOF_FW_BOOT_READY_OK (6) >> sof-audio-pci-intel-tgl 0000:00:1f.3: 0x00000005: module: ROM, state: FW_ENTERED, running >> sof-audio-pci-intel-tgl 0000:00:1f.3: extended rom status: 0x5 0x0 0x4000 0x0 0x0 0x0 0x2560521 0x0 >> sof-audio-pci-intel-tgl 0000:00:1f.3: ------------[ DSP dump end ]------------ >> sof-audio-pci-intel-tgl 0000:00:1f.3: Failed to start DSP >> sof-audio-pci-intel-tgl 0000:00:1f.3: error: failed to boot DSP firmware after resume -110 >> sof-audio-pci-intel-tgl 0000:00:1f.3: error: hda_dsp_core_reset_enter: timeout on HDA_DSP_REG_ADSPCS read >> sof-audio-pci-intel-tgl 0000:00:1f.3: error: dsp core reset failed: core_mask 1 >> sof-audio-pci-intel-tgl 0000:00:1f.3: failed to power down DSP during suspend >> sof-audio-pci-intel-tgl 0000:00:1f.3: error: suspending dsp >> sof-audio-pci-intel-tgl 0000:00:1f.3: error: failed to power down DSP during suspend -110 >> sof-audio-pci-intel-tgl 0000:00:1f.3: PM: pci_pm_suspend(): snd_sof_suspend [snd_sof] returns -110 >> sof-audio-pci-intel-tgl 0000:00:1f.3: PM: dpm_run_callback(): pci_pm_suspend returns -110 >> sof-audio-pci-intel-tgl 0000:00:1f.3: PM: failed to suspend async: error -110 >> >> This is the commit: >> >> commit d5263dbbd8af026159b16a08a94bedfe51b5f67b >> Author: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> >> Date: Thu Apr 4 13:54:47 2024 -0500 >> >> ASoC: SOF: Intel: don't ignore IOC interrupts for non-audio transfers >> >> Reverting the commit thusly fixes things in everything up to 6.10.0-rc3. >> >> %> git diff 6cbf086143cf9674c7f029e1cf435c65a537066a d5263dbbd8af026159b16a08a94bedfe51b5f67b > ../revert.patch >> %> cat ../revert.patch | patch -1 -R >> >> I've attached the sleepgraph timeline of the fail. The dmesg log is >> accesible by clicking the "dmesg" button in the upper right hand corner. >> They "log" button shows all the system details. > > See the ticket for more details. > > Ciao, Thorsten (wearing his 'the Linux kernel's regression tracker' hat) > -- > Everything you wanna know about Linux kernel regression tracking: > https://linux-regtracking.leemhuis.info/about/#tldr > If I did something stupid, please tell me, as explained on that page. > > P.S.: let me use this mail to also add the report to the list of tracked > regressions to ensure it's doesn't fall through the cracks: > > #regzbot introduced: d5263dbbd8af02 > #regzbot title: ASoC: SOF: Intel: > #regzbot from: Todd Brandt > #regzbot duplicate: https://bugzilla.kernel.org/show_bug.cgi?id=218961 > #regzbot ignore-activity

1 0

Re: [PATCH] ASoC: SOF: mediatek: Constify struct mtk_adsp_ipc_ops
by Mark Brown 17 Jun '24

17 Jun '24

On Thu, 13 Jun 2024 22:59:09 +0200, Christophe JAILLET wrote: > 'struct mtk_adsp_ipc_ops' is not modified in these drivers. > > Constifying this structure moves some data to a read-only section, so > increase overall security. > > In order to do it, "struct mtk_adsp_ipc" also needs to be adjusted to this > new const qualifier. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: mediatek: Constify struct mtk_adsp_ipc_ops commit: 1c75adb22d49ca9389333ca5e6939052a7203111 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 1/6] auxbus: make to_auxiliary_drv accept and return a constant pointer
by Greg Kroah-Hartman 12 Jun '24

12 Jun '24

On Tue, Jun 11, 2024 at 03:50:47PM +0200, Przemek Kitszel wrote: > On 6/11/24 15:01, Greg Kroah-Hartman wrote: > > In the quest to make struct device constant, start by making > > just curious, how far it will go? eg. do you plan to convert > get/put_device() to accept const? Ugh, that should have said "in the quest to make struct device_driver const", not device. devices obviously can't be constant everywhere as they are dynamically created. > or convert devlink API to accept > consts? Again, sorry, no, typo on my part. > > > to_auziliary_drv() return a constant pointer so that drivers that call > > typo: s/auz/aux/ I'll fix this typo up, and the one above, when I commit it. > > > this can be fixed up before the driver core changes. > > > > As the return type previously was not constant, also fix up all callers > > that were assuming that the pointer was not going to be a constant one > > in order to not break the build. > > > > Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> > > > [...] > > > diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c > > index 0f17fc1181d2..7341e7c4ef24 100644 > > --- a/drivers/net/ethernet/intel/ice/ice_ptp.c > > +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c > > @@ -2784,7 +2784,7 @@ static struct ice_pf * > > ice_ptp_aux_dev_to_owner_pf(struct auxiliary_device *aux_dev) > > { > > struct ice_ptp_port_owner *ports_owner; > > - struct auxiliary_driver *aux_drv; > > + const struct auxiliary_driver *aux_drv; > > struct ice_ptp *owner_ptp; > > if (!aux_dev->dev.driver) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/dev.c > > index 47e7c2639774..9a79674d27f1 100644 > > --- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c > > +++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c > > @@ -349,7 +349,7 @@ int mlx5_attach_device(struct mlx5_core_dev *dev) > > { > > struct mlx5_priv *priv = &dev->priv; > > struct auxiliary_device *adev; > > - struct auxiliary_driver *adrv; > > + const struct auxiliary_driver *adrv; > > nit: in netdev we do maintain RCT order of initialization what does that mean? Nothing is being initialized here. thanks, greg k-h

1 0

Re: [PATCH 1/6] auxbus: make to_auxiliary_drv accept and return a constant pointer
by Greg Kroah-Hartman 11 Jun '24

11 Jun '24

On Tue, Jun 11, 2024 at 02:22:37PM +0100, Mark Brown wrote: > On Tue, Jun 11, 2024 at 03:01:04PM +0200, Greg Kroah-Hartman wrote: > > In the quest to make struct device constant, start by making > > to_auziliary_drv() return a constant pointer so that drivers that call > > this can be fixed up before the driver core changes. > > Acked-by: Mark Brown <broonie(a)kernel.org> thanks for the review.

1 0

Re: [PATCH 1/6] auxbus: make to_auxiliary_drv accept and return a constant pointer
by Greg Kroah-Hartman 11 Jun '24

11 Jun '24

On Tue, Jun 11, 2024 at 01:44:07PM +0000, Sakari Ailus wrote: > Hi Greg, > > On Tue, Jun 11, 2024 at 03:01:04PM +0200, Greg Kroah-Hartman wrote: > > In the quest to make struct device constant, start by making > > to_auziliary_drv() return a constant pointer so that drivers that call > > s/z/s/ Ah, good catch, I'll fix that up when applying it! > Acked-by: Sakari Ailus <sakari.ailus(a)linux.intel.com> # drivers/media/pci/intel/ipu6 thanks for the review. greg k-h

1 0

[PATCH 1/6] auxbus: make to_auxiliary_drv accept and return a constant pointer
by Greg Kroah-Hartman 11 Jun '24

11 Jun '24

In the quest to make struct device constant, start by making to_auziliary_drv() return a constant pointer so that drivers that call this can be fixed up before the driver core changes. As the return type previously was not constant, also fix up all callers that were assuming that the pointer was not going to be a constant one in order to not break the build. Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Dave Ertman <david.m.ertman(a)intel.com> Cc: Ira Weiny <ira.weiny(a)intel.com> Cc: "Rafael J. Wysocki" <rafael(a)kernel.org> Cc: Sakari Ailus <sakari.ailus(a)linux.intel.com> Cc: Bingbu Cao <bingbu.cao(a)intel.com> Cc: Tianshu Qiu <tian.shu.qiu(a)intel.com> Cc: Mauro Carvalho Chehab <mchehab(a)kernel.org> Cc: Michael Chan <michael.chan(a)broadcom.com> Cc: "David S. Miller" <davem(a)davemloft.net> Cc: Eric Dumazet <edumazet(a)google.com> Cc: Jakub Kicinski <kuba(a)kernel.org> Cc: Paolo Abeni <pabeni(a)redhat.com> Cc: Jesse Brandeburg <jesse.brandeburg(a)intel.com> Cc: Tony Nguyen <anthony.l.nguyen(a)intel.com> Cc: Saeed Mahameed <saeedm(a)nvidia.com> Cc: Leon Romanovsky <leon(a)kernel.org> Cc: Tariq Toukan <tariqt(a)nvidia.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Liam Girdwood <lgirdwood(a)gmail.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: Daniel Baluta <daniel.baluta(a)nxp.com> Cc: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Richard Cochran <richardcochran(a)gmail.com> Cc: linux-media(a)vger.kernel.org Cc: netdev(a)vger.kernel.org Cc: intel-wired-lan(a)lists.osuosl.org Cc: linux-rdma(a)vger.kernel.org Cc: sound-open-firmware(a)alsa-project.org Cc: linux-sound(a)vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/base/auxiliary.c | 8 ++++---- drivers/media/pci/intel/ipu6/ipu6-bus.h | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 4 ++-- drivers/net/ethernet/intel/ice/ice_ptp.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 4 ++-- include/linux/auxiliary_bus.h | 2 +- sound/soc/sof/sof-client.c | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c index d3a2c40c2f12..5832e31bb77b 100644 --- a/drivers/base/auxiliary.c +++ b/drivers/base/auxiliary.c @@ -180,7 +180,7 @@ static const struct auxiliary_device_id *auxiliary_match_id(const struct auxilia static int auxiliary_match(struct device *dev, struct device_driver *drv) { struct auxiliary_device *auxdev = to_auxiliary_dev(dev); - struct auxiliary_driver *auxdrv = to_auxiliary_drv(drv); + const struct auxiliary_driver *auxdrv = to_auxiliary_drv(drv); return !!auxiliary_match_id(auxdrv->id_table, auxdev); } @@ -203,7 +203,7 @@ static const struct dev_pm_ops auxiliary_dev_pm_ops = { static int auxiliary_bus_probe(struct device *dev) { - struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver); + const struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver); struct auxiliary_device *auxdev = to_auxiliary_dev(dev); int ret; @@ -222,7 +222,7 @@ static int auxiliary_bus_probe(struct device *dev) static void auxiliary_bus_remove(struct device *dev) { - struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver); + const struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver); struct auxiliary_device *auxdev = to_auxiliary_dev(dev); if (auxdrv->remove) @@ -232,7 +232,7 @@ static void auxiliary_bus_remove(struct device *dev) static void auxiliary_bus_shutdown(struct device *dev) { - struct auxiliary_driver *auxdrv = NULL; + const struct auxiliary_driver *auxdrv = NULL; struct auxiliary_device *auxdev; if (dev->driver) { diff --git a/drivers/media/pci/intel/ipu6/ipu6-bus.h b/drivers/media/pci/intel/ipu6/ipu6-bus.h index b26c6aee1621..bb4926dfdf08 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-bus.h +++ b/drivers/media/pci/intel/ipu6/ipu6-bus.h @@ -21,7 +21,7 @@ struct ipu6_buttress_ctrl; struct ipu6_bus_device { struct auxiliary_device auxdev; - struct auxiliary_driver *auxdrv; + const struct auxiliary_driver *auxdrv; const struct ipu6_auxdrv_data *auxdrv_data; struct list_head list; void *pdata; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c index ba3fa1c2e5d9..b9e7d3e7b15d 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c @@ -239,7 +239,7 @@ void bnxt_ulp_stop(struct bnxt *bp) adev = &aux_priv->aux_dev; if (adev->dev.driver) { - struct auxiliary_driver *adrv; + const struct auxiliary_driver *adrv; pm_message_t pm = {}; adrv = to_auxiliary_drv(adev->dev.driver); @@ -277,7 +277,7 @@ void bnxt_ulp_start(struct bnxt *bp, int err) adev = &aux_priv->aux_dev; if (adev->dev.driver) { - struct auxiliary_driver *adrv; + const struct auxiliary_driver *adrv; adrv = to_auxiliary_drv(adev->dev.driver); edev->en_state = bp->state; diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c index 0f17fc1181d2..7341e7c4ef24 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp.c +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c @@ -2784,7 +2784,7 @@ static struct ice_pf * ice_ptp_aux_dev_to_owner_pf(struct auxiliary_device *aux_dev) { struct ice_ptp_port_owner *ports_owner; - struct auxiliary_driver *aux_drv; + const struct auxiliary_driver *aux_drv; struct ice_ptp *owner_ptp; if (!aux_dev->dev.driver) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/dev.c index 47e7c2639774..9a79674d27f1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c @@ -349,7 +349,7 @@ int mlx5_attach_device(struct mlx5_core_dev *dev) { struct mlx5_priv *priv = &dev->priv; struct auxiliary_device *adev; - struct auxiliary_driver *adrv; + const struct auxiliary_driver *adrv; int ret = 0, i; devl_assert_locked(priv_to_devlink(dev)); @@ -406,7 +406,7 @@ void mlx5_detach_device(struct mlx5_core_dev *dev, bool suspend) { struct mlx5_priv *priv = &dev->priv; struct auxiliary_device *adev; - struct auxiliary_driver *adrv; + const struct auxiliary_driver *adrv; pm_message_t pm = {}; int i; diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h index de21d9d24a95..bdff7b85f2ae 100644 --- a/include/linux/auxiliary_bus.h +++ b/include/linux/auxiliary_bus.h @@ -203,7 +203,7 @@ static inline struct auxiliary_device *to_auxiliary_dev(struct device *dev) return container_of(dev, struct auxiliary_device, dev); } -static inline struct auxiliary_driver *to_auxiliary_drv(struct device_driver *drv) +static inline const struct auxiliary_driver *to_auxiliary_drv(const struct device_driver *drv) { return container_of(drv, struct auxiliary_driver, driver); } diff --git a/sound/soc/sof/sof-client.c b/sound/soc/sof/sof-client.c index 99f74def4ab6..5d6005a88e79 100644 --- a/sound/soc/sof/sof-client.c +++ b/sound/soc/sof/sof-client.c @@ -357,7 +357,7 @@ EXPORT_SYMBOL_NS_GPL(sof_client_ipc4_find_module, SND_SOC_SOF_CLIENT); int sof_suspend_clients(struct snd_sof_dev *sdev, pm_message_t state) { - struct auxiliary_driver *adrv; + const struct auxiliary_driver *adrv; struct sof_client_dev *cdev; mutex_lock(&sdev->ipc_client_mutex); @@ -380,7 +380,7 @@ EXPORT_SYMBOL_NS_GPL(sof_suspend_clients, SND_SOC_SOF_CLIENT); int sof_resume_clients(struct snd_sof_dev *sdev) { - struct auxiliary_driver *adrv; + const struct auxiliary_driver *adrv; struct sof_client_dev *cdev; mutex_lock(&sdev->ipc_client_mutex); -- 2.45.2

1 0