[PATCH] ASoC: Intel: avs: Fix debug window description

[PATCH] ASoC: Intel: avs: Fix debug window description

[Cezary Rojewski]

Recent changes addressed PAGE_SIZE ambiguity in 2/3 locations for struct
avs_icl_memwnd2. The unaddressed one causes build errors when
PAGE_SIZE != SZ_4K.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202404070100.i3t3Jf7d-lkp@intel.com/
Fixes: 275b583d047a ("ASoC: Intel: avs: ICL-based platforms support")
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---

Follow up to the recent series for the avs-driver [1]. With
static_asserts() added [2], build problems occur when
PAGE_SIZE != SZ_4K. Patch fixing memory window description [3] fixed
only 2/3 offending spots.

[1]: https://lore.kernel.org/alsa-devel/20240405090929.1184068-1-cezary.rojewski@intel.com/
[2]: https://lore.kernel.org/alsa-devel/20240405090929.1184068-13-cezary.rojewski@intel.com/
[3]: https://lore.kernel.org/alsa-devel/20240405090929.1184068-3-cezary.rojewski@intel.com/

 sound/soc/intel/avs/icl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/avs/icl.c b/sound/soc/intel/avs/icl.c
index e8b4983e03e9..7a1ecf241856 100644
--- a/sound/soc/intel/avs/icl.c
+++ b/sound/soc/intel/avs/icl.c
@@ -66,7 +66,7 @@ static_assert(sizeof(struct avs_icl_memwnd2_desc) == 12);
 struct avs_icl_memwnd2 {
 	union {
 		struct avs_icl_memwnd2_desc slot_desc[AVS_ICL_MEMWND2_SLOTS_COUNT];
-		u8 rsvd[PAGE_SIZE];
+		u8 rsvd[SZ_4K];
 	};
 	u8 slot_array[AVS_ICL_MEMWND2_SLOTS_COUNT][SZ_4K];
 } __packed;

base-commit: 1f58d8580e5da64669d923ced99cb3e29832273b
-- 
2.25.1

Re: [PATCH] ASoC: Intel: avs: Fix debug window description

[Mark Brown]

On Mon, 08 Apr 2024 10:18:40 +0200, Cezary Rojewski wrote:
> Recent changes addressed PAGE_SIZE ambiguity in 2/3 locations for struct
> avs_icl_memwnd2. The unaddressed one causes build errors when
> PAGE_SIZE != SZ_4K.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: Intel: avs: Fix debug window description
      commit: 7a1625c1711b526a77cb9c3acc15dbba71896a40

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark