sync latest MEI driver up to v6.7

[zhoufuro]

All the patches picked from kernel.org.

Summary by Sourcery

Sync MEI driver up to v6.7 by merging upstream patches: add timeout-capable MEI APIs, improve PXP driver error handling, extend GSC firmware reset support, and integrate new Intel Visual Sensing Controller transport and interface drivers.

New Features:

• Add timeout variants for MEI client send/receive and vtag APIs
• Implement PXP send/receive with configurable timeout and automatic channel reset logic
• Track firmware resets and PXP mode transitions for Graphics System Controller (GSC) devices
• Introduce Intel Visual Sensing Controller transport (vsc-tp) and firmware loader drivers with SPI/ACPI integration
• Add platform driver for Intel Visual Sensing Controller interface (intel_vsc)

Enhancements:

• Update spelling and comments across MEI core and drivers
• Rename HBM and DMA control structures for consistency
• Extend MEI HBM and interrupt structures with VSC support

Build:

• Add mei-vsc and VSC firmware loader modules to the build Makefile

[deepin-ci-robot]

Hi @zhoufuro. Thanks for your PR.

I'm waiting for a deepin-community member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[deepin-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign utsweetyfish for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• https:/raw.githubusercontent.com/deepin-community/template-repository/master/debian/deepin/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[matrix-wsk]

Hi, zhoufuro
Thanks for the pr.
It will be better if pr title follow the style as [Intel-SIG][SUBSYSTEM]

[Avenger-285714]

@sourcery-ai review

[Copilot]

Pull Request Overview

This PR synchronizes the MEI (Management Engine Interface) driver with upstream kernel version 6.7, bringing multiple enhancements and fixes to the MEI subsystem.

• Adds timeout-based send/receive operations for MEI client devices
• Introduces Visual Sensing Controller (VSC) transport and platform drivers
• Updates PXP interface to support timeout parameters
• Fixes various spelling errors and documentation issues throughout the codebase

Reviewed Changes

Copilot reviewed 25 out of 25 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
include/linux/mei_cl_bus.h	Adds timeout-based function declarations and fixes documentation typos
include/drm/i915_pxp_tee_interface.h	Updates PXP interface to include timeout parameters
drivers/misc/mei/vsc-tp.h	New VSC transport layer header with API definitions
drivers/misc/mei/vsc-tp.c	New VSC transport layer implementation
drivers/misc/mei/vsc-fw-loader.c	New VSC firmware loader implementation
drivers/misc/mei/pxp/mei_pxp.c	Updates PXP driver to use timeout-based operations
drivers/misc/mei/pxp/Kconfig	Changes dependency from select to depends on
drivers/misc/mei/platform-vsc.c	New VSC platform driver implementation
drivers/misc/mei/mei_dev.h	Adds new enums and helper functions for GSC devices
drivers/misc/mei/main.c	Minor documentation formatting fixes
drivers/misc/mei/interrupt.c	Spelling corrections and documentation improvements
drivers/misc/mei/init.c	Adds firmware status saving for GSC devices
drivers/misc/mei/hw.h	Documentation formatting fixes
drivers/misc/mei/hw-me.h	Adds new configuration constants
drivers/misc/mei/hw-me.c	Adds GSC reset handling and documentation improvements
drivers/misc/mei/hw-me-regs.h	Adds power management event constants
drivers/misc/mei/hdcp/Kconfig	Changes dependency from select to depends on
drivers/misc/mei/hbm.c	Documentation improvements and spelling fixes
drivers/misc/mei/gsc_proxy/Kconfig	Changes dependency from select to depends on
drivers/misc/mei/dma-ring.c	Documentation improvements and spelling fixes
drivers/misc/mei/client.c	Documentation formatting improvements
drivers/misc/mei/bus.c	Adds timeout-based send/receive functions and spelling fixes
drivers/misc/mei/Makefile	Adds build configuration for new VSC drivers
drivers/misc/mei/Kconfig	Restructures configuration and adds VSC driver options
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c	Updates to use timeout-based PXP operations

[Copilot]

The word 'fist' should be 'first'.

Suggested change

	/* check kind for NULL because it may be not set, like at the fist call to hw_start */
	/* check kind for NULL because it may be not set, like at the first call to hw_start */

[Copilot]

The word 'fist' should be 'first'.

Suggested change

	/* check kind for NULL because it may be not set, like at the fist call to hw_start */
	/* check kind for NULL because it may be not set, like at the first call to hw_start */

[sourcery-ai]

Reviewer's Guide

This PR synchronizes the MEI driver up to v6.7 by introducing timeout variants for client send/receive operations, strengthening PXP and GSC error handling and reset logic, integrating Intel Visual Sensing Controller support with new transport and loader components, and updating build configurations and documentation.

Sequence diagram for PXP send/receive with timeout and error handling

sequenceDiagram
    participant PXP as PXP Driver
    participant MEI as MEI Core
    participant FW as ME Firmware
    PXP->>MEI: mei_cldev_send_timeout(..., timeout)
    alt send fails (ENOMEM, ENODEV, ETIME)
        PXP->>MEI: mei_cldev_disable()
        PXP->>MEI: mei_cldev_enable()
    end
    MEI->>FW: Send message
    FW-->>MEI: Response
    MEI-->>PXP: Return status
    PXP->>MEI: mei_cldev_recv_timeout(..., timeout)
    alt recv fails (ENOMEM, ENODEV, ETIME)
        PXP->>MEI: mei_cldev_disable()
        PXP->>MEI: mei_cldev_enable()
    end
    MEI->>FW: Receive message
    FW-->>MEI: Response
    MEI-->>PXP: Return data

Loading

Class diagram for new and updated MEI client send/receive timeout APIs

classDiagram
    class mei_cl_device {
        +ssize_t mei_cldev_send(const u8 *buf, size_t length)
        +ssize_t mei_cldev_send_timeout(const u8 *buf, size_t length, unsigned long timeout)
        +ssize_t mei_cldev_send_vtag(const u8 *buf, size_t length, u8 vtag)
        +ssize_t mei_cldev_send_vtag_timeout(const u8 *buf, size_t length, u8 vtag, unsigned long timeout)
        +ssize_t mei_cldev_recv(u8 *buf, size_t length)
        +ssize_t mei_cldev_recv_timeout(u8 *buf, size_t length, unsigned long timeout)
        +ssize_t mei_cldev_recv_vtag(u8 *buf, size_t length, u8 *vtag)
        +ssize_t mei_cldev_recv_vtag_timeout(u8 *buf, size_t length, u8 *vtag, unsigned long timeout)
    }

Loading

Class diagram for new Intel Visual Sensing Controller (VSC) support

classDiagram
    class vsc_tp {
        +int vsc_tp_xfer(u8 cmd, const void *obuf, size_t olen, void *ibuf, size_t ilen)
        +int vsc_tp_rom_xfer(const void *obuf, void *ibuf, size_t len)
        +int vsc_tp_register_event_cb(vsc_tp_event_cb_t event_cb, void *context)
        +void vsc_tp_intr_enable()
        +void vsc_tp_intr_disable()
        +void vsc_tp_intr_synchronize()
        +void vsc_tp_reset()
        +bool vsc_tp_need_read()
        +int vsc_tp_init(struct device *dev)
    }
    class vsc_fw_loader {
        -struct device *dev
        -struct vsc_tp *tp
        -const struct firmware *csi
        -const struct firmware *ace
        -const struct firmware *cfg
        -void *tx_buf
        -void *rx_buf
        -u16 option
        -u16 count
        -char sensor_name[16]
        -struct vsc_img_frag frags[8]
    }
    vsc_fw_loader --> vsc_tp : uses

Loading

Class diagram for updated mei_device structure (GSC/PXP error handling)

classDiagram
    class mei_device {
        +struct mei_fw_status saved_fw_status
        +enum mei_dev_state saved_dev_state
        +bool saved_fw_status_flag
        +enum mei_dev_reset_to_pxp gsc_reset_to_pxp
        +const struct mei_hw_ops *ops
        +char *kind
        ...
    }
    class mei_dev_reset_to_pxp {
        <<enum>>
        MEI_DEV_RESET_TO_PXP_DEFAULT
        MEI_DEV_RESET_TO_PXP_PERFORMED
        MEI_DEV_RESET_TO_PXP_DONE
    }
    mei_device --> mei_dev_reset_to_pxp : uses

Loading

Class diagram for i915_pxp_component_ops interface update

classDiagram
    class i915_pxp_component_ops {
        +int send(struct device *dev, const void *message, size_t size, unsigned long timeout_ms)
        +int recv(struct device *dev, void *buffer, size_t size, unsigned long timeout_ms)
        +ssize_t gsc_command(...)
        +struct module *owner
    }

Loading

File-Level Changes

Change	Details	Files
Add timed send/receive APIs to MEI client interface	Implement mei_cldev_send_vtag_timeout, mei_cldev_recv_timeout, mei_cldev_recv_vtag_timeout and mei_cldev_send_timeout Update function prototypes in mei_cl_bus.h Export new timeout-based symbols	drivers/misc/mei/bus.c include/linux/mei_cl_bus.h
Bolster PXP driver with timeout-based operations and recovery	Switch PXP send/receive to use timeout variants Introduce retry and channel re-enable logic on ENODEV, ENOMEM and ETIME errors Add msleep-based retry in receive path and include <linux/delay.h>	drivers/misc/mei/pxp/mei_pxp.c
Enhance GSC firmware reset detection and error logging	Add saved_fw_status, saved_dev_state flag and gsc_reset_to_pxp enum in mei_dev.h Implement mei_save_fw_status, kind_is_gsc/GSCFI helpers and mei_me_check_fw_reset Invoke new checks in mei_me_hw_start, mei_reset and IRQ handler	drivers/misc/mei/mei_dev.h drivers/misc/mei/hw-me.c drivers/misc/mei/init.c
Onboard Intel Visual Sensing Controller (VSC) support	Add vsc-tp transport driver and header Implement VSC firmware loader vsc-fw-loader.c Create platform-vsc interface driver and integrate with MEI hw_ops Register event callbacks and hook into build	drivers/misc/mei/vsc-tp.c drivers/misc/mei/vsc-fw-loader.c drivers/misc/mei/platform-vsc.c drivers/misc/mei/vsc-tp.h
Update build configuration for new modules	Extend Makefile with VSC transport and interface targets Add Kconfig entries for VSC modules	drivers/misc/mei/Makefile
Miscellaneous documentation and code cleanups	Fix typos and formatting in comments across multiple files Rename struct identifiers in hw.h and DRM interface Re-align lock annotations in client.c and correct return descriptions Annotate function arguments and tidy header includes	drivers/misc/mei/bus.c drivers/misc/mei/client.c drivers/misc/mei/hw.h drivers/misc/mei/hbm.c drivers/misc/mei/interrupt.c drivers/misc/mei/dma-ring.c include/drm/i915_pxp_tee_interface.h

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

Hey @zhoufuro - I've reviewed your changes and they look great!

Prompt for AI Agents

Please address the comments from this code review:
## Individual Comments

### Comment 1
<location> `drivers/misc/mei/vsc-fw-loader.c:423` </location>
<code_context>
+			goto err_release_image;
+		}
+
+		if (!le32_to_cpu(img->image_location[i])) {
+			ret = -EINVAL;
+			goto err_release_image;
</code_context>

<issue_to_address>
Zero image location is treated as an error, but later code allows zero and calculates location.

Please align the handling of zero image locations between vsc_identify_csi_image and vsc_identify_ace_image, or document the reason for the differing behavior.
</issue_to_address>

### Comment 2
<location> `drivers/misc/mei/vsc-fw-loader.c:432` </location>
<code_context>
+
+		frag->data = sign->image;
+		frag->size = le32_to_cpu(sign->image_size);
+		frag->location = le32_to_cpu(img->image_location[i]);
+		frag->type = csi_image_map[i].image_type;
+
</code_context>

<issue_to_address>
No check for overlapping image fragments.

If non-overlapping regions are required, add a check to prevent fragments from sharing memory.

Suggested implementation:

```c

		frag = &fw_loader->frags[csi_image_map[i].frag_index];

		{
			u32 new_start = le32_to_cpu(img->image_location[i]);
			u32 new_size = le32_to_cpu(sign->image_size);
			u32 new_end = new_start + new_size;
			int j;
			for (j = 0; j < i; j++) {
				u32 prev_start = le32_to_cpu(img->image_location[j]);
				u32 prev_size = le32_to_cpu(sign->image_size); /* Assuming same size field for all */
				u32 prev_end = prev_start + prev_size;
				if ((new_start < prev_end) && (prev_start < new_end)) {
					ret = -EINVAL;
					goto err_release_image;
				}
			}
		}

		frag->data = sign->image;
		frag->size = le32_to_cpu(sign->image_size);

```

- If `sign->image_size` is not the correct size field for all fragments, you may need to use a per-fragment size array or field.
- If fragments can come from different images or have different size fields, adjust the overlap check accordingly.
- This check assumes that all fragments are in the same address space and that `img->image_location` and `sign->image_size` are valid for all indices.
</issue_to_address>

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[sourcery-ai]

question: Zero image location is treated as an error, but later code allows zero and calculates location.

Please align the handling of zero image locations between vsc_identify_csi_image and vsc_identify_ace_image, or document the reason for the differing behavior.

[sourcery-ai]

suggestion (bug_risk): No check for overlapping image fragments.

If non-overlapping regions are required, add a check to prevent fragments from sharing memory.

Suggested implementation:

		frag = &fw_loader->frags[csi_image_map[i].frag_index];

		{
			u32 new_start = le32_to_cpu(img->image_location[i]);
			u32 new_size = le32_to_cpu(sign->image_size);
			u32 new_end = new_start + new_size;
			int j;
			for (j = 0; j < i; j++) {
				u32 prev_start = le32_to_cpu(img->image_location[j]);
				u32 prev_size = le32_to_cpu(sign->image_size); /* Assuming same size field for all */
				u32 prev_end = prev_start + prev_size;
				if ((new_start < prev_end) && (prev_start < new_end)) {
					ret = -EINVAL;
					goto err_release_image;
				}
			}
		}

		frag->data = sign->image;
		frag->size = le32_to_cpu(sign->image_size);

• If sign->image_size is not the correct size field for all fragments, you may need to use a per-fragment size array or field.
• If fragments can come from different images or have different size fields, adjust the overlap check accordingly.
• This check assumes that all fragments are in the same address space and that img->image_location and sign->image_size are valid for all indices.

[Avenger-285714]

@sourcery-ai review

[sourcery-ai]

Hey @zhoufuro - I've reviewed your changes and they look great!

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}