soundwire: intel: support clock_stop mode without quirks

In this mode, on restart the bus restarts immediately, the Slaves
remain synchronized and all context is kept intact.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20200817152923.3259-12-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 95b14c034ea73dcf6199fcbe363e0c6583e71fb9..2899445e2649eafeda5910ac0e0c543ff104f4ce 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -1595,7 +1595,8 @@ static int intel_suspend_runtime(struct device *dev)
 
                intel_shim_wake(sdw, false);
 
-       } else if (clock_stop_quirks & SDW_INTEL_CLK_STOP_BUS_RESET) {
+       } else if (clock_stop_quirks & SDW_INTEL_CLK_STOP_BUS_RESET ||
+                  !clock_stop_quirks) {
                ret = sdw_cdns_clock_stop(cdns, true);
                if (ret < 0) {
                        dev_err(dev, "cannot enable clock stop on suspend\n");
@@ -1755,6 +1756,24 @@ static int intel_resume_runtime(struct device *dev)
                        dev_err(dev, "unable to restart clock during resume\n");
                        return ret;
                }
+       } else if (!clock_stop_quirks) {
+               ret = intel_init(sdw);
+               if (ret) {
+                       dev_err(dev, "%s failed: %d", __func__, ret);
+                       return ret;
+               }
+
+               ret = sdw_cdns_enable_interrupt(cdns, true);
+               if (ret < 0) {
+                       dev_err(dev, "cannot enable interrupts during resume\n");
+                       return ret;
+               }
+
+               ret = sdw_cdns_clock_restart(cdns, false);
+               if (ret < 0) {
+                       dev_err(dev, "unable to resume master during resume\n");
+                       return ret;
+               }
        } else {
                dev_err(dev, "%s clock_stop_quirks %x unsupported\n",
                        __func__, clock_stop_quirks);