Skip to contentSkip to conversation

ASoC: Intel: avs: Fix debug window description

PATCH In review Cezary Rojewski 2 participants 2 messages Apr 8, 2024 – Apr 9, 2024

Subsystems (3)
lore
Share & tools
lore

Cezary Rojewski

author maintainer
#0 lore raw

PATCH 1/1 ASoC: Intel: avs: Fix debug window description

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.

Fixes 275b583d047a ("ASoC: Intel: avs: ICL-based platforms support")

---

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/[email protected]/
[2]: https://lore.kernel.org/alsa-devel/[email protected]/
[3]: https://lore.kernel.org/alsa-devel/[email protected]/

 sound/soc/intel/avs/icl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/avs/icl.c +1 -1
index e8b4983e03e9..7a1ecf241856 100644
@@ -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

Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 5 lines · 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.

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