Unverified Commit bcc2a2dc authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct 



Skylake driver is divided into two modules:
- snd_soc_skl
- snd_soc_skl_ipc

and nothing would be wrong if not for the fact that both cannot exist
without one another. IPC module is not some kind of extension, as it is
the case for snd_hda_ext_core which is separated from snd_hda_core -
legacy hda interface. It's as much core Skylake module as snd_soc_skl
is.

Statement backed up by existence of circular dependency between this
two. To eliminate said problem, struct skl_sst has been created. From
that very momment, Skylake has been plagued by header errors (incomplete
structs, unknown references etc.) whenever something new is to be added
or code is cleaned up.

As this design is being corrected, struct skl_sst is no longer needed,
so combine it with struct skl. To avoid ambiguity when searching for skl
stuff (struct skl *skl) it has also been renamed to skl_dev.

No functional changes.

Signed-off-by: default avatarPiotr Maziarz <piotrx.maziarz@intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20190723145854.8527-2-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e8758a5e

sound/soc/intel/common/sst-ipc.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ struct ipc_message { 
};



struct sst_generic_ipc;

struct sst_dsp;



struct sst_plat_ipc_ops {

	void (*tx_msg)(struct sst_generic_ipc *, struct ipc_message *);

sound/soc/intel/skylake/bxt-sst.c

+25 −25
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include "../common/sst-dsp.h"

#include "../common/sst-dsp-priv.h"

#include "skl-sst-ipc.h"

#include "skl.h"



#define BXT_BASEFW_TIMEOUT	3000

#define BXT_INIT_TIMEOUT	300
@@ -49,7 +49,7 @@ static int 
bxt_load_library(struct sst_dsp *ctx, struct skl_lib_info *linfo, int lib_count)

{

	struct snd_dma_buffer dmab;

	struct skl_sst *skl = ctx->thread_context;

	struct skl_dev *skl = ctx->thread_context;

	struct firmware stripped_fw;

	int ret = 0, i, dma_id, stream_tag;
@@ -184,7 +184,7 @@ static int sst_transfer_fw_host_dma(struct sst_dsp *ctx) 
static int bxt_load_base_firmware(struct sst_dsp *ctx)

{

	struct firmware stripped_fw;

	struct skl_sst *skl = ctx->thread_context;

	struct skl_dev *skl = ctx->thread_context;

	int ret, i;



	if (ctx->fw == NULL) {
@@ -268,7 +268,7 @@ sst_load_base_firmware_failed: 
 */

static int bxt_d0i3_target_state(struct sst_dsp *ctx)

{

	struct skl_sst *skl = ctx->thread_context;

	struct skl_dev *skl = ctx->thread_context;

	struct skl_d0i3_data *d0i3 = &skl->d0i3;



	if (skl->cores.state[SKL_DSP_CORE0_ID] != SKL_DSP_RUNNING)
@@ -288,8 +288,8 @@ static void bxt_set_dsp_D0i3(struct work_struct *work) 
{

	int ret;

	struct skl_ipc_d0ix_msg msg;

	struct skl_sst *skl = container_of(work,

			struct skl_sst, d0i3.work.work);

	struct skl_dev *skl = container_of(work,

			struct skl_dev, d0i3.work.work);

	struct sst_dsp *ctx = skl->dsp;

	struct skl_d0i3_data *d0i3 = &skl->d0i3;

	int target_state;
@@ -331,7 +331,7 @@ static void bxt_set_dsp_D0i3(struct work_struct *work) 


static int bxt_schedule_dsp_D0i3(struct sst_dsp *ctx)

{

	struct skl_sst *skl = ctx->thread_context;

	struct skl_dev *skl = ctx->thread_context;

	struct skl_d0i3_data *d0i3 = &skl->d0i3;



	/* Schedule D0i3 only if the usecase ref counts are appropriate */
@@ -350,7 +350,7 @@ static int bxt_set_dsp_D0i0(struct sst_dsp *ctx) 
{

	int ret;

	struct skl_ipc_d0ix_msg msg;

	struct skl_sst *skl = ctx->thread_context;

	struct skl_dev *skl = ctx->thread_context;



	dev_dbg(ctx->dev, "In %s:\n", __func__);
@@ -389,7 +389,7 @@ static int bxt_set_dsp_D0i0(struct sst_dsp *ctx) 


static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id)

{

	struct skl_sst *skl = ctx->thread_context;

	struct skl_dev *skl = ctx->thread_context;

	int ret;

	struct skl_ipc_dxstate_info dx;

	unsigned int core_mask = SKL_DSP_CORE_MASK(core_id);
@@ -486,7 +486,7 @@ static int bxt_set_dsp_D3(struct sst_dsp *ctx, unsigned int core_id) 
{

	int ret;

	struct skl_ipc_dxstate_info dx;

	struct skl_sst *skl = ctx->thread_context;

	struct skl_dev *skl = ctx->thread_context;

	unsigned int core_mask = SKL_DSP_CORE_MASK(core_id);



	dx.core_mask = core_mask;
@@ -548,9 +548,9 @@ static struct sst_dsp_device skl_dev = { 


int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,

			const char *fw_name, struct skl_dsp_loader_ops dsp_ops,

			struct skl_sst **dsp)

			struct skl_dev **dsp)

{

	struct skl_sst *skl;

	struct skl_dev *skl;

	struct sst_dsp *sst;

	int ret;
@@ -591,10 +591,10 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, 
}

EXPORT_SYMBOL_GPL(bxt_sst_dsp_init);



int bxt_sst_init_fw(struct device *dev, struct skl_sst *ctx)

int bxt_sst_init_fw(struct device *dev, struct skl_dev *skl)

{

	int ret;

	struct sst_dsp *sst = ctx->dsp;

	struct sst_dsp *sst = skl->dsp;



	ret = sst->fw_ops.load_fw(sst);

	if (ret < 0) {
@@ -604,29 +604,29 @@ int bxt_sst_init_fw(struct device *dev, struct skl_sst *ctx) 


	skl_dsp_init_core_state(sst);



	if (ctx->lib_count > 1) {

		ret = sst->fw_ops.load_library(sst, ctx->lib_info,

						ctx->lib_count);

	if (skl->lib_count > 1) {

		ret = sst->fw_ops.load_library(sst, skl->lib_info,

						skl->lib_count);

		if (ret < 0) {

			dev_err(dev, "Load Library failed : %x\n", ret);

			return ret;

		}

	}

	ctx->is_first_boot = false;

	skl->is_first_boot = false;



	return 0;

}

EXPORT_SYMBOL_GPL(bxt_sst_init_fw);



void bxt_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx)

void bxt_sst_dsp_cleanup(struct device *dev, struct skl_dev *skl)

{



	skl_release_library(ctx->lib_info, ctx->lib_count);

	if (ctx->dsp->fw)

		release_firmware(ctx->dsp->fw);

	skl_freeup_uuid_list(ctx);

	skl_ipc_free(&ctx->ipc);

	ctx->dsp->ops->free(ctx->dsp);

	skl_release_library(skl->lib_info, skl->lib_count);

	if (skl->dsp->fw)

		release_firmware(skl->dsp->fw);

	skl_freeup_uuid_list(skl);

	skl_ipc_free(&skl->ipc);

	skl->dsp->ops->free(skl->dsp);

}

EXPORT_SYMBOL_GPL(bxt_sst_dsp_cleanup);

sound/soc/intel/skylake/cnl-sst-dsp.h

+3 −4
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#define __CNL_SST_DSP_H__



struct sst_dsp;

struct skl_sst;

struct sst_dsp_device;

struct sst_generic_ipc;
@@ -97,8 +96,8 @@ void cnl_ipc_free(struct sst_generic_ipc *ipc); 


int cnl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,

		     const char *fw_name, struct skl_dsp_loader_ops dsp_ops,

		     struct skl_sst **dsp);

int cnl_sst_init_fw(struct device *dev, struct skl_sst *ctx);

void cnl_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx);

		     struct skl_dev **dsp);

int cnl_sst_init_fw(struct device *dev, struct skl_dev *skl);

void cnl_sst_dsp_cleanup(struct device *dev, struct skl_dev *skl);



#endif /*__CNL_SST_DSP_H__*/

sound/soc/intel/skylake/cnl-sst.c

+18 −19
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ 
#include "../common/sst-dsp-priv.h"

#include "../common/sst-ipc.h"

#include "cnl-sst-dsp.h"

#include "skl-sst-dsp.h"

#include "skl-sst-ipc.h"

#include "skl.h"



#define CNL_FW_ROM_INIT		0x1

#define CNL_FW_INIT		0x5
@@ -109,7 +108,7 @@ static int sst_transfer_fw_host_dma(struct sst_dsp *ctx) 
static int cnl_load_base_firmware(struct sst_dsp *ctx)

{

	struct firmware stripped_fw;

	struct skl_sst *cnl = ctx->thread_context;

	struct skl_dev *cnl = ctx->thread_context;

	int ret;



	if (!ctx->fw) {
@@ -167,7 +166,7 @@ cnl_load_base_firmware_failed: 


static int cnl_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id)

{

	struct skl_sst *cnl = ctx->thread_context;

	struct skl_dev *cnl = ctx->thread_context;

	unsigned int core_mask = SKL_DSP_CORE_MASK(core_id);

	struct skl_ipc_dxstate_info dx;

	int ret;
@@ -229,7 +228,7 @@ err: 


static int cnl_set_dsp_D3(struct sst_dsp *ctx, unsigned int core_id)

{

	struct skl_sst *cnl = ctx->thread_context;

	struct skl_dev *cnl = ctx->thread_context;

	unsigned int core_mask = SKL_DSP_CORE_MASK(core_id);

	struct skl_ipc_dxstate_info dx;

	int ret;
@@ -293,7 +292,7 @@ static struct sst_ops cnl_ops = { 
static irqreturn_t cnl_dsp_irq_thread_handler(int irq, void *context)

{

	struct sst_dsp *dsp = context;

	struct skl_sst *cnl = sst_dsp_get_thread_context(dsp);

	struct skl_dev *cnl = sst_dsp_get_thread_context(dsp);

	struct sst_generic_ipc *ipc = &cnl->ipc;

	struct skl_ipc_header header = {0};

	u32 hipcida, hipctdr, hipctdd;
@@ -386,7 +385,7 @@ static bool cnl_ipc_is_dsp_busy(struct sst_dsp *dsp) 
	return (hipcidr & CNL_ADSP_REG_HIPCIDR_BUSY);

}



static int cnl_ipc_init(struct device *dev, struct skl_sst *cnl)

static int cnl_ipc_init(struct device *dev, struct skl_dev *cnl)

{

	struct sst_generic_ipc *ipc;

	int err;
@@ -415,9 +414,9 @@ static int cnl_ipc_init(struct device *dev, struct skl_sst *cnl) 


int cnl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,

		     const char *fw_name, struct skl_dsp_loader_ops dsp_ops,

		     struct skl_sst **dsp)

		     struct skl_dev **dsp)

{

	struct skl_sst *cnl;

	struct skl_dev *cnl;

	struct sst_dsp *sst;

	int ret;
@@ -454,12 +453,12 @@ int cnl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, 
}

EXPORT_SYMBOL_GPL(cnl_sst_dsp_init);



int cnl_sst_init_fw(struct device *dev, struct skl_sst *ctx)

int cnl_sst_init_fw(struct device *dev, struct skl_dev *skl)

{

	int ret;

	struct sst_dsp *sst = ctx->dsp;

	struct sst_dsp *sst = skl->dsp;



	ret = ctx->dsp->fw_ops.load_fw(sst);

	ret = skl->dsp->fw_ops.load_fw(sst);

	if (ret < 0) {

		dev_err(dev, "load base fw failed: %d", ret);

		return ret;
@@ -467,21 +466,21 @@ int cnl_sst_init_fw(struct device *dev, struct skl_sst *ctx) 


	skl_dsp_init_core_state(sst);



	ctx->is_first_boot = false;

	skl->is_first_boot = false;



	return 0;

}

EXPORT_SYMBOL_GPL(cnl_sst_init_fw);



void cnl_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx)

void cnl_sst_dsp_cleanup(struct device *dev, struct skl_dev *skl)

{

	if (ctx->dsp->fw)

		release_firmware(ctx->dsp->fw);

	if (skl->dsp->fw)

		release_firmware(skl->dsp->fw);



	skl_freeup_uuid_list(ctx);

	cnl_ipc_free(&ctx->ipc);

	skl_freeup_uuid_list(skl);

	cnl_ipc_free(&skl->ipc);



	ctx->dsp->ops->free(ctx->dsp);

	skl->dsp->ops->free(skl->dsp);

}

EXPORT_SYMBOL_GPL(cnl_sst_dsp_cleanup);

sound/soc/intel/skylake/skl-debug.c

+4 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#define FW_REG_SIZE	0x60



struct skl_debug {

	struct skl *skl;

	struct skl_dev *skl;

	struct device *dev;



	struct dentry *fs;
@@ -172,7 +172,7 @@ static ssize_t fw_softreg_read(struct file *file, char __user *user_buf, 
			       size_t count, loff_t *ppos)

{

	struct skl_debug *d = file->private_data;

	struct sst_dsp *sst = d->skl->skl_sst->dsp;

	struct sst_dsp *sst = d->skl->dsp;

	size_t w0_stat_sz = sst->addr.w0_stat_sz;

	void __iomem *in_base = sst->mailbox.in_base;

	void __iomem *fw_reg_addr;
@@ -213,7 +213,7 @@ static const struct file_operations soft_regs_ctrl_fops = { 
	.llseek = default_llseek,

};



struct skl_debug *skl_debugfs_init(struct skl *skl)

struct skl_debug *skl_debugfs_init(struct skl_dev *skl)

{

	struct skl_debug *d;
@@ -252,7 +252,7 @@ err: 
	return NULL;

}



void skl_debugfs_exit(struct skl *skl)

void skl_debugfs_exit(struct skl_dev *skl)

{

	struct skl_debug *d = skl->debugfs;

CRA Git | Maintained and supported by SUSTech CRA and CCSE