From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Andrzej Kacprowski <Andrzej.Kacprowski@intel.com>,
Tomasz Rusinowicz <tomasz.rusinowicz@intel.com>,
Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 6.6.y 2/5] accel/ivpu: Update VPU FW API headers
Date: Wed, 16 Sep 2026 14:55:38 -0400 [thread overview]
Message-ID: <20260916185541.1885084-2-sashal@kernel.org> (raw)
In-Reply-To: <20260916185541.1885084-1-sashal@kernel.org>
From: Andrzej Kacprowski <Andrzej.Kacprowski@intel.com>
[ Upstream commit a4293cc75348409f998c991c48cbe5532c438114 ]
This commit bumps:
- Boot API from 3.24.0 to 3.26.3
- JSM API from 3.16.0 to 3.25.0
Signed-off-by: Andrzej Kacprowski <Andrzej.Kacprowski@intel.com>
Co-developed-by: Tomasz Rusinowicz <tomasz.rusinowicz@intel.com>
Signed-off-by: Tomasz Rusinowicz <tomasz.rusinowicz@intel.com>
Reviewed-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240930195322.461209-2-jacek.lawrynowicz@linux.intel.com
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Backport to 6.6: retain only the tracing-header read_wrap_count member
needed by the firmware log printing changes preceding 0724afc55c77.
Replace one reserved u32 so the tracing header size and subsequent field
offsets stay unchanged.
Drop the unrelated Boot/JSM version bumps, scheduling, native-fence and
power-management updates, together with the job queue conversion and
message-name changes. This tree has older API definitions and lacks
ivpu_jsm_msg_type_to_str(); importing those changes is unnecessary for
firmware log metadata validation. No functions are added.
The separate firmware logging refactors and BO accessor changes are still
required before the unmodified upstream target can apply to this tree.
[ sashal: Reduced backport -- upstream a4293cc753484 touches 4 file(s), this
backport carries 1. Not backported here:
drivers/accel/ivpu/ivpu_job.c
drivers/accel/ivpu/ivpu_jsm_msg.c
drivers/accel/ivpu/vpu_jsm_api.h
This note is generated from the file lists only; see the resolution record
for the reasoning. ]
Stable-dep-of: 0724afc55c77 ("accel/ivpu: Validate firmware log buffer metadata")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/accel/ivpu/vpu_boot_api.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/accel/ivpu/vpu_boot_api.h b/drivers/accel/ivpu/vpu_boot_api.h
index 88345070a9965..7d302693f4562 100644
--- a/drivers/accel/ivpu/vpu_boot_api.h
+++ b/drivers/accel/ivpu/vpu_boot_api.h
@@ -301,7 +301,9 @@ struct vpu_tracing_buffer_header {
u32 host_canary_start;
/* offset from start of buffer for trace entries */
u32 read_index;
- u32 pad_to_cache_line_size_0[14];
+ /* keeps track of wrapping on the reader side */
+ u32 read_wrap_count;
+ u32 pad_to_cache_line_size_0[13];
/* End of first cache line */
/**
--
2.53.0
next prev parent reply other threads:[~2026-09-16 18:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-16 15:13 FAILED: patch "[PATCH] accel/ivpu: Validate firmware log buffer metadata" failed to apply to 6.6-stable tree gregkh
2026-09-16 18:55 ` [PATCH 6.6.y 1/5] accel/ivpu: Fix a typo Sasha Levin
2026-09-16 18:55 ` Sasha Levin [this message]
2026-09-16 18:55 ` [PATCH 6.6.y 3/5] accel/ivpu: Reset fw log on cold boot Sasha Levin
2026-09-16 18:55 ` [PATCH 6.6.y 4/5] accel/ivpu: Refactor functions in ivpu_fw_log.c Sasha Levin
2026-09-16 18:55 ` [PATCH 6.6.y 5/5] accel/ivpu: Validate firmware log buffer metadata Sasha Levin
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=20260916185541.1885084-2-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Andrzej.Kacprowski@intel.com \
--cc=jacek.lawrynowicz@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=tomasz.rusinowicz@intel.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