superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soundwire: intel: add in-band wake callbacks in hw_ops 

No functionality change, only add indirection for in-band wake
management helpers.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20221111013135.38289-7-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
pull/520/merge
Pierre-Louis Bossart 2022-11-11 09:31:33 +08:00 committed by Vinod Koul
parent 49c9ff4599
commit 36e3b385f3
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/soundwire/intel.c
View File

@ -1437,6 +1437,9 @@ const struct sdw_intel_hw_ops sdw_intel_cnl_hw_ops = {
.link_power_up = intel_link_power_up, .link_power_up = intel_link_power_up,
.link_power_down = intel_link_power_down, .link_power_down = intel_link_power_down,
.shim_check_wake = intel_shim_check_wake,
.shim_wake = intel_shim_wake,
.pre_bank_switch = intel_pre_bank_switch, .pre_bank_switch = intel_pre_bank_switch,
.post_bank_switch = intel_post_bank_switch, .post_bank_switch = intel_post_bank_switch,
}; };
@ -1720,11 +1723,11 @@ int intel_link_process_wakeen_event(struct auxiliary_device *auxdev)
return 0; return 0;
} }
if (!intel_shim_check_wake(sdw)) if (!sdw_intel_shim_check_wake(sdw))
return 0; return 0;
/* disable WAKEEN interrupt ASAP to prevent interrupt flood */ /* disable WAKEEN interrupt ASAP to prevent interrupt flood */
intel_shim_wake(sdw, false); sdw_intel_shim_wake(sdw, false);
/* /*
* resume the Master, which will generate a bus reset and result in * resume the Master, which will generate a bus reset and result in
@ -1852,7 +1855,7 @@ static int __maybe_unused intel_suspend(struct device *dev)
*/ */
dev_err(dev, "%s: invalid config: parent is suspended\n", __func__); dev_err(dev, "%s: invalid config: parent is suspended\n", __func__);
} else { } else {
intel_shim_wake(sdw, false); sdw_intel_shim_wake(sdw, false);
} }
} }
@ -1987,7 +1990,7 @@ static int __maybe_unused intel_resume_runtime(struct device *dev)
} }
/* unconditionally disable WAKEEN interrupt */ /* unconditionally disable WAKEEN interrupt */
intel_shim_wake(sdw, false); sdw_intel_shim_wake(sdw, false);
clock_stop_quirks = sdw->link_res->clock_stop_quirks; clock_stop_quirks = sdw->link_res->clock_stop_quirks;

13
drivers/soundwire/intel.h
View File

@ -132,4 +132,17 @@ static inline int sdw_intel_link_power_down(struct sdw_intel *sdw)
return -ENOTSUPP; return -ENOTSUPP;
} }
static inline int sdw_intel_shim_check_wake(struct sdw_intel *sdw)
{
if (SDW_INTEL_CHECK_OPS(sdw, shim_check_wake))
return SDW_INTEL_OPS(sdw, shim_check_wake)(sdw);
return -ENOTSUPP;
}
static inline void sdw_intel_shim_wake(struct sdw_intel *sdw, bool wake_enable)
{
if (SDW_INTEL_CHECK_OPS(sdw, shim_wake))
SDW_INTEL_OPS(sdw, shim_wake)(sdw, wake_enable);
}
#endif /* __SDW_INTEL_LOCAL_H */ #endif /* __SDW_INTEL_LOCAL_H */

5
include/linux/soundwire/sdw_intel.h
View File

@ -307,6 +307,8 @@ struct sdw_intel;
* @stop_bus: stop all bus * @stop_bus: stop all bus
* @link_power_up: power-up using chip-specific helpers * @link_power_up: power-up using chip-specific helpers
* @link_power_down: power-down with chip-specific helpers * @link_power_down: power-down with chip-specific helpers
* @shim_check_wake: check if a wake was received
* @shim_wake: enable/disable in-band wake management
* @pre_bank_switch: helper for bus management * @pre_bank_switch: helper for bus management
* @post_bank_switch: helper for bus management * @post_bank_switch: helper for bus management
*/ */
@ -325,6 +327,9 @@ struct sdw_intel_hw_ops {
int (*link_power_up)(struct sdw_intel *sdw); int (*link_power_up)(struct sdw_intel *sdw);
int (*link_power_down)(struct sdw_intel *sdw); int (*link_power_down)(struct sdw_intel *sdw);
int (*shim_check_wake)(struct sdw_intel *sdw);
void (*shim_wake)(struct sdw_intel *sdw, bool wake_enable);
int (*pre_bank_switch)(struct sdw_intel *sdw); int (*pre_bank_switch)(struct sdw_intel *sdw);
int (*post_bank_switch)(struct sdw_intel *sdw); int (*post_bank_switch)(struct sdw_intel *sdw);
}; };