mei: hdcp: use own Kconfig file
Subsystems (2)
PATCH 1/2 mei: hdcp: use own Kconfig file
The mei/hdcp module have its own Makefile
so naturally it should have associated Kconfig
in the same directory.
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/Kconfig | 10 +--------- drivers/misc/mei/hdcp/Kconfig | 13 +++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 drivers/misc/mei/hdcp/Kconfig
drivers/misc/mei/Kconfig +1 -9
@@ -46,12 +46,4 @@ config INTEL_MEI_TXE Supported SoCs: Intel Bay Trail -config INTEL_MEI_HDCP - tristate "Intel HDCP2.2 services of ME Interface" - select INTEL_MEI_ME - depends on DRM_I915 - help - MEI Support for HDCP2.2 Services on Intel platforms. - - Enables the ME FW services required for HDCP2.2 support through - I915 display driver of Intel. +source "drivers/misc/mei/hdcp/Kconfig"
drivers/misc/mei/hdcp/Kconfig new file +13 -0
@@ -0,0 +1,13 @@ + +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019, Intel Corporation. All rights reserved. +# +config INTEL_MEI_HDCP + tristate "Intel HDCP2.2 services of ME Interface" + select INTEL_MEI_ME + depends on DRM_I915 + help + MEI Support for HDCP2.2 Services on Intel platforms. + + Enables the ME FW services required for HDCP2.2 support through + I915 display driver of Intel.
Signature · 1 line
2.20.1
PATCH 2/2 mei: expose device state in sysfs
From: Alexander Usyskin <[email protected]>
Expose mei device state to user-space through sysfs. This gives indication to applications that driver is in transition, usefully mostly to detect link reset state.
Signed-off-by Alexander Usyskin <[email protected]>
Signed-off-by Tomas Winkler <[email protected]>
--- Documentation/ABI/testing/sysfs-class-mei | 15 ++++++ drivers/misc/mei/client.c | 2 +- drivers/misc/mei/init.c | 20 +++---- drivers/misc/mei/main.c | 65 ++++++++++++++++++++--- drivers/misc/mei/mei_dev.h | 3 +- 5 files changed, 87 insertions(+), 18 deletions(-)
Documentation/ABI/testing/sysfs-class-mei +15 -0
@@ -65,3 +65,18 @@ Description: Display the ME firmware version. <platform>:<major>.<minor>.<milestone>.<build_no>. There can be up to three such blocks for different FW components. + +What: /sys/class/mei/meiN/dev_state +Date: Mar 2019 +KernelVersion: 5.1 +Contact: Tomas Winkler <[email protected]> +Description: Display the ME device state. + + The device state can have following values: + INITIALIZING + INIT_CLIENTS + ENABLED + RESETTING + DISABLED + POWER_DOWN + POWER_UP
drivers/misc/mei/client.c +1 -1
@@ -669,7 +669,7 @@ int mei_cl_unlink(struct mei_cl *cl)void mei_host_client_init (struct mei_device *dev) { - dev->dev_state =MEI_DEV_ENABLED ; +mei_set_devstate (dev,MEI_DEV_ENABLED ); dev->reset_count =0 ;schedule_work (&dev->bus_rescan_work);
drivers/misc/mei/init.c +10 -10
@@ -123,12 +123,12 @@ int mei_reset(struct mei_device *dev)/* enter reset flow */ interrupts_enabled = state !=MEI_DEV_POWER_DOWN ; - dev->dev_state =MEI_DEV_RESETTING ; +mei_set_devstate (dev,MEI_DEV_RESETTING ); dev->reset_count++;if (dev->reset_count >MEI_MAX_CONSEC_RESET ) {dev_err (dev->dev,"reset: reached maximal consecutive resets: disabling the device\n" ); - dev->dev_state =MEI_DEV_DISABLED ; +mei_set_devstate (dev,MEI_DEV_DISABLED );return -ENODEV ; }
@@ -150,7 +150,7 @@ int mei_reset(struct mei_device *dev)if (state ==MEI_DEV_POWER_DOWN ) {dev_dbg (dev->dev,"powering down: end of reset\n" ); - dev->dev_state =MEI_DEV_DISABLED ; +mei_set_devstate (dev,MEI_DEV_DISABLED );return 0 ; }
@@ -162,11 +162,11 @@ int mei_reset(struct mei_device *dev)dev_dbg (dev->dev,"link is established start sending messages.\n" ); - dev->dev_state =MEI_DEV_INIT_CLIENTS ; +mei_set_devstate (dev,MEI_DEV_INIT_CLIENTS ); ret =mei_hbm_start_req (dev);if (ret) {dev_err (dev->dev,"hbm_start failed ret = %d\n" , ret); - dev->dev_state =MEI_DEV_RESETTING ; +mei_set_devstate (dev,MEI_DEV_RESETTING );return ret; }
@@ -196,7 +196,7 @@ int mei_start(struct mei_device *dev) dev->reset_count =0 ; do { - dev->dev_state = MEI_DEV_INITIALIZING; + mei_set_devstate(dev, MEI_DEV_INITIALIZING); ret = mei_reset(dev); if (ret == -ENODEV || dev->dev_state == MEI_DEV_DISABLED) {
@@ -231,7 +231,7 @@ int mei_start(struct mei_device *dev)return 0 ; err:dev_err (dev->dev,"link layer initialization failed.\n" ); - dev->dev_state =MEI_DEV_DISABLED ; +mei_set_devstate (dev,MEI_DEV_DISABLED );mutex_unlock (&dev->device_lock);return -ENODEV ; }
@@ -250,7 +250,7 @@ int mei_restart(struct mei_device *dev)mutex_lock (&dev->device_lock); - dev->dev_state =MEI_DEV_POWER_UP ; +mei_set_devstate (dev,MEI_DEV_POWER_UP ); dev->reset_count =0 ; err =mei_reset (dev);
@@ -301,7 +301,7 @@ void mei_stop(struct mei_device *dev)dev_dbg (dev->dev,"stopping the device.\n" );mutex_lock (&dev->device_lock); - dev->dev_state =MEI_DEV_POWER_DOWN ; +mei_set_devstate (dev,MEI_DEV_POWER_DOWN );mutex_unlock (&dev->device_lock);mei_cl_bus_remove_devices (dev);
@@ -314,7 +314,7 @@ void mei_stop(struct mei_device *dev)mei_reset (dev);/* move device to disabled state unconditionally */ - dev->dev_state =MEI_DEV_DISABLED ; +mei_set_devstate (dev,MEI_DEV_DISABLED );mutex_unlock (&dev->device_lock); }
drivers/misc/mei/main.c +59 -6
89 lines not on this page · raw message
drivers/misc/mei/mei_dev.h +2 -1
@@ -525,7 +525,6 @@ struct mei_device {struct dentry *dbgfs_dir;#endif /* CONFIG_DEBUG_FS */ -const struct mei_hw_ops *ops;char hw[0 ]__aligned(sizeof(void *)) ; };
@@ -584,6 +583,8 @@ int mei_restart(struct mei_device *dev);void mei_stop (struct mei_device *dev);void mei_cancel_work (struct mei_device *dev); +void mei_set_devstate (struct mei_device *dev,enum mei_dev_state state); +int mei_dmam_ring_alloc (struct mei_device *dev);void mei_dmam_ring_free (struct mei_device *dev);bool mei_dma_ring_is_allocated (struct mei_device *dev);
Signature · 1 line
2.20.1