alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Cezary Rojewski <cezary.rojewski@intel.com>
To: broonie@kernel.org
Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org,
	tiwai@suse.com, perex@perex.cz,
	amadeuszx.slawinski@linux.intel.com, hdegoede@redhat.com,
	Cezary Rojewski <cezary.rojewski@intel.com>
Subject: [PATCH 02/13] ASoC: Intel: avs: Fix debug-slot offset calculation
Date: Fri,  5 Apr 2024 11:09:18 +0200	[thread overview]
Message-ID: <20240405090929.1184068-3-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20240405090929.1184068-1-cezary.rojewski@intel.com>

For resources with ID other than 0 the current calculus is incorrect.

Fixes: 275b583d047a ("ASoC: Intel: avs: ICL-based platforms support")
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/intel/avs/icl.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/avs/icl.c b/sound/soc/intel/avs/icl.c
index 9d9921e1cd4d..3e0716160f5a 100644
--- a/sound/soc/intel/avs/icl.c
+++ b/sound/soc/intel/avs/icl.c
@@ -66,7 +66,7 @@ struct avs_icl_memwnd2 {
 		struct avs_icl_memwnd2_desc slot_desc[AVS_ICL_MEMWND2_SLOTS_COUNT];
 		u8 rsvd[PAGE_SIZE];
 	};
-	u8 slot_array[AVS_ICL_MEMWND2_SLOTS_COUNT][PAGE_SIZE];
+	u8 slot_array[AVS_ICL_MEMWND2_SLOTS_COUNT][SZ_4K];
 } __packed;
 
 #define AVS_ICL_SLOT_UNUSED \
@@ -89,8 +89,7 @@ static int avs_icl_slot_offset(struct avs_dev *adev, union avs_icl_memwnd2_slot_
 
 	for (i = 0; i < AVS_ICL_MEMWND2_SLOTS_COUNT; i++)
 		if (desc[i].slot_id.val == slot_type.val)
-			return offsetof(struct avs_icl_memwnd2, slot_array) +
-			       avs_skl_log_buffer_offset(adev, i);
+			return offsetof(struct avs_icl_memwnd2, slot_array) + i * SZ_4K;
 	return -ENXIO;
 }
 
-- 
2.25.1


  parent reply	other threads:[~2024-04-05  9:11 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-05  9:09 [PATCH 00/13] ASoC: Intel: avs: Fixes and cleanups for 6.10 Cezary Rojewski
2024-04-05  9:09 ` [PATCH 01/13] ASoC: Intel: avs: Restore stream decoupling on prepare Cezary Rojewski
2024-04-05  9:09 ` Cezary Rojewski [this message]
2024-04-05  9:09 ` [PATCH 03/13] ASoC: Intel: avs: Silence false-positive memcpy() warnings Cezary Rojewski
2024-04-05  9:09 ` [PATCH 04/13] ASoC: Intel: avs: Fix config_length for config-less copiers Cezary Rojewski
2024-04-05  9:09 ` [PATCH 05/13] ASoC: Intel: avs: Fix ASRC module initialization Cezary Rojewski
2024-04-05  9:09 ` [PATCH 06/13] ASoC: Intel: avs: Replace risky functions with safer variants Cezary Rojewski
2024-04-05  9:09 ` [PATCH 07/13] ASoC: Intel: avs: Fix potential integer overflow Cezary Rojewski
2024-04-05  9:09 ` [PATCH 08/13] ASoC: Intel: avs: Test result of avs_get_module_entry() Cezary Rojewski
2024-04-05  9:09 ` [PATCH 09/13] ASoC: Intel: avs: Remove dead code Cezary Rojewski
2024-04-05  9:09 ` [PATCH 10/13] ASoC: Intel: avs: Wake from D0ix when starting streaming Cezary Rojewski
2024-04-05  9:09 ` [PATCH 11/13] ASoC: Intel: avs: Init debugfs before booting firmware Cezary Rojewski
2024-04-05  9:09 ` [PATCH 12/13] ASoC: Intel: avs: Add assert_static to guarantee ABI sizes Cezary Rojewski
2024-04-05  9:09 ` [PATCH 13/13] ASoC: Intel: avs: Rule invalid buffer and period sizes out Cezary Rojewski
2024-04-05 23:20 ` [PATCH 00/13] ASoC: Intel: avs: Fixes and cleanups for 6.10 Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240405090929.1184068-3-cezary.rojewski@intel.com \
    --to=cezary.rojewski@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=amadeuszx.slawinski@linux.intel.com \
    --cc=broonie@kernel.org \
    --cc=hdegoede@redhat.com \
    --cc=linux-sound@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).