Unverified Commit 7eb878e7 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

ASoC: Intel: avs: Use generic size defines 



Instead of using PAGE_SIZE as base of definitions in headers, use
generic size defines. While x86 platforms use 4096 as page size, there
are platforms which use different page sizes. Two of changed defines are
for memory windows on DSP side, which have fixed size independent of
host side page size. Another one is for CLDMA buffer which also doesn't
need to change with page size.

Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230929112436.787058-3-amadeuszx.slawinski@linux.intel.com


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

sound/soc/intel/avs/cldma.h

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ 
#ifndef __SOUND_SOC_INTEL_AVS_CLDMA_H

#define __SOUND_SOC_INTEL_AVS_CLDMA_H



#define AVS_CL_DEFAULT_BUFFER_SIZE	(32 * PAGE_SIZE)

#include <linux/sizes.h>



#define AVS_CL_DEFAULT_BUFFER_SIZE	SZ_128K



struct hda_cldma;

extern struct hda_cldma code_loader;

sound/soc/intel/avs/messages.h

+3 −1
Original line number Diff line number Diff line
@@ -9,9 +9,11 @@ 
#ifndef __SOUND_SOC_INTEL_AVS_MSGS_H

#define __SOUND_SOC_INTEL_AVS_MSGS_H



#include <linux/sizes.h>



struct avs_dev;



#define AVS_MAILBOX_SIZE 4096

#define AVS_MAILBOX_SIZE SZ_4K



enum avs_msg_target {

	AVS_FW_GEN_MSG = 0,

sound/soc/intel/avs/registers.h

+3 −1
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#ifndef __SOUND_SOC_INTEL_AVS_REGS_H

#define __SOUND_SOC_INTEL_AVS_REGS_H



#include <linux/sizes.h>



#define AZX_PCIREG_PGCTL		0x44

#define AZX_PCIREG_CGCTL		0x48

#define AZX_PGCTL_LSRMD_MASK		BIT(4)
@@ -59,7 +61,7 @@ 
#define AVS_FW_REG_STATUS(adev)		(AVS_FW_REG_BASE(adev) + 0x0)

#define AVS_FW_REG_ERROR_CODE(adev)	(AVS_FW_REG_BASE(adev) + 0x4)



#define AVS_WINDOW_CHUNK_SIZE		PAGE_SIZE

#define AVS_WINDOW_CHUNK_SIZE		SZ_4K

#define AVS_FW_REGS_SIZE		AVS_WINDOW_CHUNK_SIZE

#define AVS_FW_REGS_WINDOW		0

/* DSP -> HOST communication window */