backport: Enable mei drivers backport support - #446
Open
knayana-gse wants to merge 10 commits into
Open
Conversation
smuqthya
approved these changes
Jun 30, 2026
| include/linux/mei_aux.h | ||
| include/linux/mei_cl_bus.h | ||
| include/uapi/linux/mei.h | ||
| include/drm/intel/i915_hdcp_interface.h |
Contributor
There was a problem hiding this comment.
should be part of previous commit
Enable mei drivers backport support against 6.6 kernel based on 7.0 kernel. Signed-off-by: Kanaka Raju Nayana <kanaka.raju.nayana@intel.com>
Add i915_hdcp_interface.h and i915_pxp_tee_interface.h files in copy-list to resolve below errors: Error: ------------------------------------------------------------------------------- drm/intel/i915_hdcp_interface.h: No such file or directory drm/intel/i915_pxp_tee_interface.h: No such file or directory ------------------------------------------------------------------------------- Signed-off-by: Kanaka Raju Nayana <kanaka.raju.nayana@intel.com>
knayana-gse
force-pushed
the
mei-bp-7.0-jun25
branch
from
July 6, 2026 11:58
8159d5d to
d33c259
Compare
When compiling mei bus driver for kernel 6.6, the mei_cl_device_match()
function signature is incompatible with newer kernels (6.11+) where
struct bus_type.match requires const struct device_driver *.
This causes a compilation error on kernel 6.11+.
Add conditional compilation to support both older kernels (6.6-6.10)
with non-const parameter and newer kernels (6.11+) with const parameter.
Error:
-------------------------------------------------------------------------------
initialization of ‘int (*)(struct device *, struct device_driver *)’ from
incompatible pointer type ‘int (*)(struct device *, const struct
device_driver *)’ [-Werror=incompatible-pointer-types]
.match = mei_cl_device_match
-------------------------------------------------------------------------------
Reference:
d69d80484598
driver core: have match() callback in struct bus_type take a const *
Signed-off-by: Kanaka Raju Nayana <kanaka.raju.nayana@intel.com>
After changing assign_str to one argument in KV6.10, backporting to
older version need to change parameters with in trace definition.
Go back to old handling.
Error:
-------------------------------------------------------------------------------
mei-trace.h: macro "__assign_str" requires 2 arguments, but only 1 given
-------------------------------------------------------------------------------
Reference:
2c92ca849fcc
tracing/treewide: Remove second parameter of __assign_str()
Signed-off-by: Kanaka Raju Nayana <kanaka.raju.nayana@intel.com>
Kernel 6.12 moved unaligned.h from asm/ to linux/. Add backport header
to conditionally include the correct location based on kernel version.
Error:
-------------------------------------------------------------------------------
fatal error: linux/unaligned.h: No such file or directory
-------------------------------------------------------------------------------
Reference:
5f60d5f6bbc1 move asm/unaligned.h to linux/unaligned.h
Signed-off-by: Kanaka Raju Nayana <kanaka.raju.nayana@intel.com>
Kernel 6.11 changed platform_driver::remove() from int to void.
This breaks builds on older kernels if the remove callback
signature is not matched to the target kernel.
Add a compatibility check and switch mei_vsc_remove() to the
appropriate signature so the driver builds on both 6.6 and
newer kernels.
Error:
-------------------------------------------------------------------------------
initialization of ‘int (*)(struct platform_device *)’ from incompatible
pointer type ‘void (*)(struct platform_device *)’
[-Werror=incompatible-pointer-types]
445 | .remove = mei_vsc_remove,
-------------------------------------------------------------------------------
Reference:
0edb555a65d1
platform: Make platform_driver::remove() return void
Signed-off-by: Kanaka Raju Nayana <kanaka.raju.nayana@intel.com>
Fix modpost namespace import errors for mei-vsc. Error: ------------------------------------------------------------------------------- module mei-vsc uses symbol vsc_tp_reset from namespace VSC_TP, but does not import it. ------------------------------------------------------------------------------- Signed-off-by: Kanaka Raju Nayana <kanaka.raju.nayana@intel.com>
Add mei drivers oot module to dkms deb package list. Signed-off-by: Kanaka Raju Nayana <kanaka.raju.nayana@intel.com>
Add 7.1 kernel mei changes for now and once moved to 7.1 base remove from here. Signed-off-by: Kanaka Raju Nayana <kanaka.raju.nayana@intel.com>
Add mei drivers oot module to dkms rpm package list. Signed-off-by: Kanaka Raju Nayana <kanaka.raju.nayana@intel.com>
knayana-gse
force-pushed
the
mei-bp-7.0-jun25
branch
from
July 6, 2026 13:49
d33c259 to
9c58b64
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Enable mei drivers backport support against 6.6 kernel
based on 7.0 kernel.
Signed-off-by: Kanaka Raju Nayana kanaka.raju.nayana@intel.com