ASoC: SOF: fix HDA direct MMIO access

The recent change to remove the bus->io_ops callbacks used an older
version of the SOF code base, and when merged into Mark's for-next it
invalidated changes, resulting in broken compilation identified by
kbuild and reproduced during the weekly SOF rebase.

Restore SOF code overridden by git merge and apply Takashi's intended
change in the 'right' location.

Fixes: c2f16a94a8049 ("Merge branch 'topic/hda-bus-ops-cleanup'")
Reported-by: kbuild test robot <lkp@intel.com>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190812190502.30729-1-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-ctrl.c b/sound/soc/sof/intel/hda-ctrl.c
index a7fee40..bc41028 100644 (file)
--- a/sound/soc/sof/intel/hda-ctrl.c
+++ b/sound/soc/sof/intel/hda-ctrl.c
@@ -254,7 +254,7 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset)
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
        /* Reset stream-to-link mapping */
        list_for_each_entry(hlink, &bus->hlink_list, list)
-               bus->io_ops->reg_writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV);
+               writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV);
 #endif
 
        bus->chip_init = true;

diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c
index 097727c..fb55a3c 100644 (file)
--- a/sound/soc/sof/intel/hda-dsp.c
+++ b/sound/soc/sof/intel/hda-dsp.c
@@ -354,45 +354,6 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume)
                return ret;
        }
 
-       hda_dsp_ctrl_misc_clock_gating(sdev, false);
-
-       /* Reset stream-to-link mapping */
-       list_for_each_entry(hlink, &bus->hlink_list, list)
-               writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV);
-
-       hda_dsp_ctrl_misc_clock_gating(sdev, true);
-#else
-
-       hda_dsp_ctrl_misc_clock_gating(sdev, false);
-
-       /* reset controller */
-       ret = hda_dsp_ctrl_link_reset(sdev, true);
-       if (ret < 0) {
-               dev_err(sdev->dev,
-                       "error: failed to reset controller during resume\n");
-               return ret;
-       }
-
-       /* take controller out of reset */
-       ret = hda_dsp_ctrl_link_reset(sdev, false);
-       if (ret < 0) {
-               dev_err(sdev->dev,
-                       "error: failed to ready controller during resume\n");
-               return ret;
-       }
-
-       /* enable hda bus irq */
-       snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL,
-                               SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN,
-                               SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN);
-
-       hda_dsp_ctrl_misc_clock_gating(sdev, true);
-#endif
-
-       /* enable ppcap interrupt */
-       hda_dsp_ctrl_ppcap_enable(sdev, true);
-       hda_dsp_ctrl_ppcap_int_enable(sdev, true);
-
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
        /* check jack status */
        if (runtime_resume)