Unverified Commit 657774ac authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Make sof_suspend/resume IPC agnostic 



Add a new set of IPC ops for PM with the ctx_save and ctx_restore ops
for suspend/resume and implement the ops for IPC3.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220317175044.1752400-4-ranjani.sridharan@linux.intel.com


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

sound/soc/sof/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\

		control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o\

		ipc3-topology.o

		ipc3-topology.o ipc3.o

ifneq ($(CONFIG_SND_SOC_SOF_CLIENT),)

snd-sof-objs += sof-client.o

endif

sound/soc/sof/ipc.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "sof-priv.h"

#include "sof-audio.h"

#include "ops.h"

#include "ipc3-ops.h"



typedef void (*ipc_rx_callback)(struct snd_sof_dev *sdev, void *msg_buf);

sound/soc/sof/ipc3-ops.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */

/*

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * Copyright(c) 2021 Intel Corporation. All rights reserved.

 *

 * Author: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

 */



#ifndef __SOUND_SOC_SOF_IPC3_OPS_H

#define __SOUND_SOC_SOF_IPC3_OPS_H



#include "sof-priv.h"



extern const struct sof_ipc_tplg_ops ipc3_tplg_ops;

extern const struct sof_ipc_ops ipc3_ops;



#endif

sound/soc/sof/ipc3-topology.c

+2 −5
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <sound/pcm_params.h>

#include "sof-priv.h"

#include "sof-audio.h"

#include "ipc3-ops.h"

#include "ops.h"



/* Full volume for default values */
@@ -2152,7 +2153,7 @@ static const struct sof_ipc_tplg_widget_ops tplg_ipc3_widget_ops[SND_SOC_DAPM_TY 
				 sof_ipc3_widget_bind_event},

};



static const struct sof_ipc_tplg_ops ipc3_tplg_ops = {

const struct sof_ipc_tplg_ops ipc3_tplg_ops = {

	.widget = tplg_ipc3_widget_ops,

	.route_setup = sof_ipc3_route_setup,

	.control_setup = sof_ipc3_control_setup,
@@ -2163,7 +2164,3 @@ static const struct sof_ipc_tplg_ops ipc3_tplg_ops = { 
	.widget_setup = sof_ipc3_widget_setup,

	.dai_config = sof_ipc3_dai_config,

};
 


const struct sof_ipc_ops ipc3_ops = {

	.tplg = &ipc3_tplg_ops,

};

sound/soc/sof/ipc3.c

0 → 100644
+44 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)

//

// This file is provided under a dual BSD/GPLv2 license.  When using or

// redistributing this file, you may do so under either license.

//

// Copyright(c) 2021 Intel Corporation. All rights reserved.

//

//



#include "sof-priv.h"

#include "ipc3-ops.h"



static int sof_ipc3_ctx_ipc(struct snd_sof_dev *sdev, int cmd)

{

	struct sof_ipc_pm_ctx pm_ctx = {

		.hdr.size = sizeof(pm_ctx),

		.hdr.cmd = SOF_IPC_GLB_PM_MSG | cmd,

	};

	struct sof_ipc_reply reply;



	/* send ctx save ipc to dsp */

	return sof_ipc_tx_message(sdev->ipc, pm_ctx.hdr.cmd, &pm_ctx,

				  sizeof(pm_ctx), &reply, sizeof(reply));

}



static int sof_ipc3_ctx_save(struct snd_sof_dev *sdev)

{

	return sof_ipc3_ctx_ipc(sdev, SOF_IPC_PM_CTX_SAVE);

}



static int sof_ipc3_ctx_restore(struct snd_sof_dev *sdev)

{

	return sof_ipc3_ctx_ipc(sdev, SOF_IPC_PM_CTX_RESTORE);

}



static const struct sof_ipc_pm_ops ipc3_pm_ops = {

	.ctx_save = sof_ipc3_ctx_save,

	.ctx_restore = sof_ipc3_ctx_restore,

};



const struct sof_ipc_ops ipc3_ops = {

	.tplg = &ipc3_tplg_ops,

	.pm = &ipc3_pm_ops,

};