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

ASoC: Intel: Remove unused DSP operations 



sound/soc/intel/common/ declares several helper functions for /intel/
solutions. In practice, differences between these - /haswell/ and
/skylake/ especially - led to many of the helpers being used only by a
single solution. As /skylake/ makes no use of these and /haswell/ and
/baytail/ are no more, remove the unused functions.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@intel.com>
Link: https://lore.kernel.org/r/20201006064907.16277-9-cezary.rojewski@intel.com


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

sound/soc/intel/common/sst-dsp-priv.h

+0 −13
Original line number Diff line number Diff line
@@ -146,19 +146,6 @@ struct sst_dsp { 
	struct snd_dma_buffer dmab;

};



/* Size optimised DRAM/IRAM memcpy */

static inline void sst_dsp_write(struct sst_dsp *sst, void *src,

	u32 dest_offset, size_t bytes)

{

	sst->ops->ram_write(sst, sst->addr.lpe + dest_offset, src, bytes);

}



static inline void sst_dsp_read(struct sst_dsp *sst, void *dest,

	u32 src_offset, size_t bytes)

{

	sst->ops->ram_read(sst, dest, sst->addr.lpe + src_offset, bytes);

}



static inline void *sst_dsp_get_thread_context(struct sst_dsp *sst)

{

	return sst->thread_context;

sound/soc/intel/common/sst-dsp.c

+0 −162
Original line number Diff line number Diff line
@@ -44,38 +44,6 @@ u64 sst_shim32_read64(void __iomem *addr, u32 offset) 
}

EXPORT_SYMBOL_GPL(sst_shim32_read64);



static inline void _sst_memcpy_toio_32(volatile u32 __iomem *dest,

	u32 *src, size_t bytes)

{

	int i, words = bytes >> 2;



	for (i = 0; i < words; i++)

		writel(src[i], dest + i);

}



static inline void _sst_memcpy_fromio_32(u32 *dest,

	const volatile __iomem u32 *src, size_t bytes)

{

	int i, words = bytes >> 2;



	for (i = 0; i < words; i++)

		dest[i] = readl(src + i);

}



void sst_memcpy_toio_32(struct sst_dsp *sst,

	void __iomem *dest, void *src, size_t bytes)

{

	_sst_memcpy_toio_32(dest, src, bytes);

}

EXPORT_SYMBOL_GPL(sst_memcpy_toio_32);



void sst_memcpy_fromio_32(struct sst_dsp *sst, void *dest,

	void __iomem *src, size_t bytes)

{

	_sst_memcpy_fromio_32(dest, src, bytes);

}

EXPORT_SYMBOL_GPL(sst_memcpy_fromio_32);



/* Public API */

void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value)

{
@@ -100,29 +68,6 @@ u32 sst_dsp_shim_read(struct sst_dsp *sst, u32 offset) 
}

EXPORT_SYMBOL_GPL(sst_dsp_shim_read);



void sst_dsp_shim_write64(struct sst_dsp *sst, u32 offset, u64 value)

{

	unsigned long flags;



	spin_lock_irqsave(&sst->spinlock, flags);

	sst->ops->write64(sst->addr.shim, offset, value);

	spin_unlock_irqrestore(&sst->spinlock, flags);

}

EXPORT_SYMBOL_GPL(sst_dsp_shim_write64);



u64 sst_dsp_shim_read64(struct sst_dsp *sst, u32 offset)

{

	unsigned long flags;

	u64 val;



	spin_lock_irqsave(&sst->spinlock, flags);

	val = sst->ops->read64(sst->addr.shim, offset);

	spin_unlock_irqrestore(&sst->spinlock, flags);



	return val;

}

EXPORT_SYMBOL_GPL(sst_dsp_shim_read64);



void sst_dsp_shim_write_unlocked(struct sst_dsp *sst, u32 offset, u32 value)

{

	sst->ops->write(sst->addr.shim, offset, value);
@@ -135,18 +80,6 @@ u32 sst_dsp_shim_read_unlocked(struct sst_dsp *sst, u32 offset) 
}

EXPORT_SYMBOL_GPL(sst_dsp_shim_read_unlocked);



void sst_dsp_shim_write64_unlocked(struct sst_dsp *sst, u32 offset, u64 value)

{

	sst->ops->write64(sst->addr.shim, offset, value);

}

EXPORT_SYMBOL_GPL(sst_dsp_shim_write64_unlocked);



u64 sst_dsp_shim_read64_unlocked(struct sst_dsp *sst, u32 offset)

{

	return sst->ops->read64(sst->addr.shim, offset);

}

EXPORT_SYMBOL_GPL(sst_dsp_shim_read64_unlocked);



int sst_dsp_shim_update_bits_unlocked(struct sst_dsp *sst, u32 offset,

				u32 mask, u32 value)

{
@@ -167,24 +100,6 @@ int sst_dsp_shim_update_bits_unlocked(struct sst_dsp *sst, u32 offset, 
}

EXPORT_SYMBOL_GPL(sst_dsp_shim_update_bits_unlocked);



int sst_dsp_shim_update_bits64_unlocked(struct sst_dsp *sst, u32 offset,

				u64 mask, u64 value)

{

	bool change;

	u64 old, new;



	old = sst_dsp_shim_read64_unlocked(sst, offset);



	new = (old & (~mask)) | (value & mask);



	change = (old != new);

	if (change)

		sst_dsp_shim_write64_unlocked(sst, offset, new);



	return change;

}

EXPORT_SYMBOL_GPL(sst_dsp_shim_update_bits64_unlocked);



/* This is for registers bits with attribute RWC */

void sst_dsp_shim_update_bits_forced_unlocked(struct sst_dsp *sst, u32 offset,

				u32 mask, u32 value)
@@ -214,19 +129,6 @@ int sst_dsp_shim_update_bits(struct sst_dsp *sst, u32 offset, 
}

EXPORT_SYMBOL_GPL(sst_dsp_shim_update_bits);



int sst_dsp_shim_update_bits64(struct sst_dsp *sst, u32 offset,

				u64 mask, u64 value)

{

	unsigned long flags;

	bool change;



	spin_lock_irqsave(&sst->spinlock, flags);

	change = sst_dsp_shim_update_bits64_unlocked(sst, offset, mask, value);

	spin_unlock_irqrestore(&sst->spinlock, flags);

	return change;

}

EXPORT_SYMBOL_GPL(sst_dsp_shim_update_bits64);



/* This is for registers bits with attribute RWC */

void sst_dsp_shim_update_bits_forced(struct sst_dsp *sst, u32 offset,

				u32 mask, u32 value)
@@ -279,70 +181,6 @@ int sst_dsp_register_poll(struct sst_dsp *ctx, u32 offset, u32 mask, 
}

EXPORT_SYMBOL_GPL(sst_dsp_register_poll);



void sst_dsp_dump(struct sst_dsp *sst)

{

	if (sst->ops->dump)

		sst->ops->dump(sst);

}

EXPORT_SYMBOL_GPL(sst_dsp_dump);



void sst_dsp_reset(struct sst_dsp *sst)

{

	if (sst->ops->reset)

		sst->ops->reset(sst);

}

EXPORT_SYMBOL_GPL(sst_dsp_reset);



int sst_dsp_boot(struct sst_dsp *sst)

{

	if (sst->ops->boot)

		sst->ops->boot(sst);



	return 0;

}

EXPORT_SYMBOL_GPL(sst_dsp_boot);



int sst_dsp_wake(struct sst_dsp *sst)

{

	if (sst->ops->wake)

		return sst->ops->wake(sst);



	return 0;

}

EXPORT_SYMBOL_GPL(sst_dsp_wake);



void sst_dsp_sleep(struct sst_dsp *sst)

{

	if (sst->ops->sleep)

		sst->ops->sleep(sst);

}

EXPORT_SYMBOL_GPL(sst_dsp_sleep);



void sst_dsp_stall(struct sst_dsp *sst)

{

	if (sst->ops->stall)

		sst->ops->stall(sst);

}

EXPORT_SYMBOL_GPL(sst_dsp_stall);



void sst_dsp_ipc_msg_tx(struct sst_dsp *dsp, u32 msg)

{

	sst_dsp_shim_write_unlocked(dsp, SST_IPCX, msg | SST_IPCX_BUSY);

	trace_sst_ipc_msg_tx(msg);

}

EXPORT_SYMBOL_GPL(sst_dsp_ipc_msg_tx);



u32 sst_dsp_ipc_msg_rx(struct sst_dsp *dsp)

{

	u32 msg;



	msg = sst_dsp_shim_read_unlocked(dsp, SST_IPCX);

	trace_sst_ipc_msg_rx(msg);



	return msg;

}

EXPORT_SYMBOL_GPL(sst_dsp_ipc_msg_rx);



int sst_dsp_mailbox_init(struct sst_dsp *sst, u32 inbox_offset, size_t inbox_size,

	u32 outbox_offset, size_t outbox_size)

{

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

+0 −26
Original line number Diff line number Diff line
@@ -212,10 +212,6 @@ void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value); 
u32 sst_dsp_shim_read(struct sst_dsp *sst, u32 offset);

int sst_dsp_shim_update_bits(struct sst_dsp *sst, u32 offset,

				u32 mask, u32 value);

void sst_dsp_shim_write64(struct sst_dsp *sst, u32 offset, u64 value);

u64 sst_dsp_shim_read64(struct sst_dsp *sst, u32 offset);

int sst_dsp_shim_update_bits64(struct sst_dsp *sst, u32 offset,

				u64 mask, u64 value);

void sst_dsp_shim_update_bits_forced(struct sst_dsp *sst, u32 offset,

				u32 mask, u32 value);
@@ -224,10 +220,6 @@ void sst_dsp_shim_write_unlocked(struct sst_dsp *sst, u32 offset, u32 value); 
u32 sst_dsp_shim_read_unlocked(struct sst_dsp *sst, u32 offset);

int sst_dsp_shim_update_bits_unlocked(struct sst_dsp *sst, u32 offset,

				u32 mask, u32 value);

void sst_dsp_shim_write64_unlocked(struct sst_dsp *sst, u32 offset, u64 value);

u64 sst_dsp_shim_read64_unlocked(struct sst_dsp *sst, u32 offset);

int sst_dsp_shim_update_bits64_unlocked(struct sst_dsp *sst, u32 offset,

					u64 mask, u64 value);

void sst_dsp_shim_update_bits_forced_unlocked(struct sst_dsp *sst, u32 offset,

				u32 mask, u32 value);
@@ -236,21 +228,6 @@ void sst_shim32_write(void __iomem *addr, u32 offset, u32 value); 
u32 sst_shim32_read(void __iomem *addr, u32 offset);

void sst_shim32_write64(void __iomem *addr, u32 offset, u64 value);

u64 sst_shim32_read64(void __iomem *addr, u32 offset);

void sst_memcpy_toio_32(struct sst_dsp *sst,

			void __iomem *dest, void *src, size_t bytes);

void sst_memcpy_fromio_32(struct sst_dsp *sst,

			  void *dest, void __iomem *src, size_t bytes);



/* DSP reset & boot */

void sst_dsp_reset(struct sst_dsp *sst);

int sst_dsp_boot(struct sst_dsp *sst);

int sst_dsp_wake(struct sst_dsp *sst);

void sst_dsp_sleep(struct sst_dsp *sst);

void sst_dsp_stall(struct sst_dsp *sst);



/* Msg IO */

void sst_dsp_ipc_msg_tx(struct sst_dsp *dsp, u32 msg);

u32 sst_dsp_ipc_msg_rx(struct sst_dsp *dsp);



/* Mailbox management */

int sst_dsp_mailbox_init(struct sst_dsp *sst, u32 inbox_offset,
@@ -262,7 +239,4 @@ void sst_dsp_outbox_read(struct sst_dsp *sst, void *message, size_t bytes); 
int sst_dsp_register_poll(struct sst_dsp  *ctx, u32 offset, u32 mask,

		 u32 target, u32 time, char *operation);



/* Debug */

void sst_dsp_dump(struct sst_dsp *sst);



#endif

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

+0 −27
Original line number Diff line number Diff line
@@ -254,33 +254,6 @@ void sst_ipc_tx_msg_reply_complete(struct sst_generic_ipc *ipc, 
}

EXPORT_SYMBOL_GPL(sst_ipc_tx_msg_reply_complete);



void sst_ipc_drop_all(struct sst_generic_ipc *ipc)

{

	struct ipc_message *msg, *tmp;

	unsigned long flags;

	int tx_drop_cnt = 0, rx_drop_cnt = 0;



	/* drop all TX and Rx messages before we stall + reset DSP */

	spin_lock_irqsave(&ipc->dsp->spinlock, flags);



	list_for_each_entry_safe(msg, tmp, &ipc->tx_list, list) {

		list_move(&msg->list, &ipc->empty_list);

		tx_drop_cnt++;

	}



	list_for_each_entry_safe(msg, tmp, &ipc->rx_list, list) {

		list_move(&msg->list, &ipc->empty_list);

		rx_drop_cnt++;

	}



	spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);



	if (tx_drop_cnt || rx_drop_cnt)

		dev_err(ipc->dev, "dropped IPC msg RX=%d, TX=%d\n",

			tx_drop_cnt, rx_drop_cnt);

}

EXPORT_SYMBOL_GPL(sst_ipc_drop_all);



int sst_ipc_init(struct sst_generic_ipc *ipc)

{

	int ret;

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

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ struct ipc_message *sst_ipc_reply_find_msg(struct sst_generic_ipc *ipc, 
void sst_ipc_tx_msg_reply_complete(struct sst_generic_ipc *ipc,

	struct ipc_message *msg);



void sst_ipc_drop_all(struct sst_generic_ipc *ipc);

int sst_ipc_init(struct sst_generic_ipc *ipc);

void sst_ipc_fini(struct sst_generic_ipc *ipc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE