korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

soundwire: intel: report slave_ids for each link to SOF driver

Browse Source 
The existing link_mask flag is no longer sufficient to detect the
hardware and identify which topology file and a machine driver to load.

By reporting the slave_ids exposed in ACPI tables, the parent SOF
driver will be able to compare against a set of static configurations.

This patch only adds the interface change, the functionality is added
in future patches.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200110220016.30887-1-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Bard Liao 2020-01-10 16:00:16 -06:00 committed by Vinod Koul
parent 09f6a72d01
commit 92f622bc27
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@
#define __SDW_INTEL_H #define __SDW_INTEL_H
#include <linux/irqreturn.h> #include <linux/irqreturn.h>
#include <linux/soundwire/sdw.h>
/** /**
* struct sdw_intel_stream_params_data: configuration passed during * struct sdw_intel_stream_params_data: configuration passed during
@ -93,6 +94,11 @@ struct sdw_intel_link_res;
*/ */
#define SDW_INTEL_CLK_STOP_BUS_RESET BIT(3) #define SDW_INTEL_CLK_STOP_BUS_RESET BIT(3)
struct sdw_intel_slave_id {
int link_id;
struct sdw_slave_id id;
};
/** /**
* struct sdw_intel_ctx - context allocated by the controller * struct sdw_intel_ctx - context allocated by the controller
* driver probe * driver probe
@ -101,9 +107,12 @@ struct sdw_intel_link_res;
* hardware capabilities after all power dependencies are settled. * hardware capabilities after all power dependencies are settled.
* @link_mask: bit-wise mask listing SoundWire links reported by the * @link_mask: bit-wise mask listing SoundWire links reported by the
* Controller * Controller
* @num_slaves: total number of devices exposed across all enabled links
* @handle: ACPI parent handle * @handle: ACPI parent handle
* @links: information for each link (controller-specific and kept * @links: information for each link (controller-specific and kept
* opaque here) * opaque here)
* @ids: array of slave_id, representing Slaves exposed across all enabled
* links
* @link_list: list to handle interrupts across all links * @link_list: list to handle interrupts across all links
* @shim_lock: mutex to handle concurrent rmw access to shared SHIM registers. * @shim_lock: mutex to handle concurrent rmw access to shared SHIM registers.
*/ */
@ -111,8 +120,10 @@ struct sdw_intel_ctx {
int count; int count;
void __iomem *mmio_base; void __iomem *mmio_base;
u32 link_mask; u32 link_mask;
int num_slaves;
acpi_handle handle; acpi_handle handle;
struct sdw_intel_link_res *links; struct sdw_intel_link_res *links;
struct sdw_intel_slave_id *ids;
struct list_head link_list; struct list_head link_list;
struct mutex shim_lock; /* lock for access to shared SHIM registers */ struct mutex shim_lock; /* lock for access to shared SHIM registers */
}; };