Message ID | 1550263881-16082-21-git-send-email-ramalingam.c@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915: Implement HDCP2.2 | expand |
Hi Ramalingam, Thank you for the patch! Yet something to improve: [auto build test ERROR on drm-intel/for-linux-next] [cannot apply to v5.0-rc4 next-20190215] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Ramalingam-C/drm-i915-Implement-HDCP2-2/20190216-090245 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-defconfig (attached as .config) compiler: gcc-8 (Debian 8.2.0-20) 8.2.0 reproduce: # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): >> drivers/misc/mei/hdcp/mei_hdcp.c:28:10: fatal error: drm/i915_mei_hdcp_interface.h: No such file or directory #include <drm/i915_mei_hdcp_interface.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. -- In file included from drivers/gpu/drm/i915/i915_drv.c:50: >> drivers/gpu/drm/i915/i915_drv.h:58:10: fatal error: drm/i915_mei_hdcp_interface.h: No such file or directory #include <drm/i915_mei_hdcp_interface.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. -- In file included from include/drm/i915_component.h:27, from drivers/gpu/drm/i915/intel_hdcp.c:10: include/drm/drm_audio_component.h:22:27: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration void (*get_power)(struct device *); ^~~~~~ include/drm/drm_audio_component.h:28:27: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration void (*put_power)(struct device *); ^~~~~~ include/drm/drm_audio_component.h:32:37: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration void (*codec_wake_override)(struct device *, bool enable); ^~~~~~ include/drm/drm_audio_component.h:36:31: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration int (*get_cdclk_freq)(struct device *); ^~~~~~ include/drm/drm_audio_component.h:43:32: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration int (*sync_audio_rate)(struct device *, int port, int pipe, int rate); ^~~~~~ include/drm/drm_audio_component.h:56:24: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration int (*get_eld)(struct device *, int port, int pipe, bool *enabled, ^~~~~~ include/drm/drm_audio_component.h:90:28: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration int (*master_bind)(struct device *dev, struct drm_audio_component *); ^~~~~~ include/drm/drm_audio_component.h:97:31: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration void (*master_unbind)(struct device *dev, struct drm_audio_component *); ^~~~~~ In file included from drivers/gpu/drm/i915/intel_drv.h:34, from drivers/gpu/drm/i915/intel_hdcp.c:15: >> drivers/gpu/drm/i915/i915_drv.h:58:10: fatal error: drm/i915_mei_hdcp_interface.h: No such file or directory #include <drm/i915_mei_hdcp_interface.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. vim +28 drivers/misc/mei/hdcp/mei_hdcp.c > 28 #include <drm/i915_mei_hdcp_interface.h> 29 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index 8df069c1b0cc..952bae79dd02 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -23,6 +23,100 @@ #include <linux/slab.h> #include <linux/uuid.h> #include <linux/mei_cl_bus.h> +#include <drm/drm_connector.h> +#include <drm/i915_component.h> +#include <drm/i915_mei_hdcp_interface.h> + +#include "mei_hdcp.h" + +static inline u8 mei_get_ddi_index(enum port port) +{ + switch (port) { + case PORT_A: + return MEI_DDI_A; + case PORT_B ... PORT_F: + return (u8)port; + default: + return MEI_DDI_INVALID_PORT; + } +} + +/** + * mei_hdcp_initiate_session() - Initiate a Wired HDCP2.2 Tx Session in ME FW + * @dev: device corresponding to the mei_cl_device + * @data: Intel HW specific hdcp data + * @ake_data: AKE_Init msg output. + * + * Return: 0 on Success, <0 on Failure. + */ +static int +mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data, + struct hdcp2_ake_init *ake_data) +{ + struct wired_cmd_initiate_hdcp2_session_in session_init_in = { { 0 } }; + struct wired_cmd_initiate_hdcp2_session_out + session_init_out = { { 0 } }; + struct mei_cl_device *cldev; + ssize_t byte; + + if (!dev || !data || !ake_data) + return -EINVAL; + + cldev = to_mei_cl_device(dev); + + session_init_in.header.api_version = HDCP_API_VERSION; + session_init_in.header.command_id = WIRED_INITIATE_HDCP2_SESSION; + session_init_in.header.status = ME_HDCP_STATUS_SUCCESS; + session_init_in.header.buffer_len = + WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN; + + session_init_in.port.integrated_port_type = data->port_type; + session_init_in.port.physical_port = mei_get_ddi_index(data->port); + session_init_in.protocol = data->protocol; + + byte = mei_cldev_send(cldev, (u8 *)&session_init_in, + sizeof(session_init_in)); + if (byte < 0) { + dev_dbg(dev, "mei_cldev_send failed. %zd\n", byte); + return byte; + } + + byte = mei_cldev_recv(cldev, (u8 *)&session_init_out, + sizeof(session_init_out)); + if (byte < 0) { + dev_dbg(dev, "mei_cldev_recv failed. %zd\n", byte); + return byte; + } + + if (session_init_out.header.status != ME_HDCP_STATUS_SUCCESS) { + dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n", + WIRED_INITIATE_HDCP2_SESSION, + session_init_out.header.status); + return -EIO; + } + + ake_data->msg_id = HDCP_2_2_AKE_INIT; + ake_data->tx_caps = session_init_out.tx_caps; + memcpy(ake_data->r_tx, session_init_out.r_tx, HDCP_2_2_RTX_LEN); + + return 0; +} + +static __attribute__((unused)) +struct i915_hdcp_component_ops mei_hdcp_ops = { + .owner = THIS_MODULE, + .initiate_hdcp2_session = mei_hdcp_initiate_session, + .verify_receiver_cert_prepare_km = NULL, + .verify_hprime = NULL, + .store_pairing_info = NULL, + .initiate_locality_check = NULL, + .verify_lprime = NULL, + .get_session_key = NULL, + .repeater_check_flow_prepare_ack = NULL, + .verify_mprime = NULL, + .enable_hdcp_authentication = NULL, + .close_hdcp_session = NULL, +}; static int mei_hdcp_probe(struct mei_cl_device *cldev, const struct mei_cl_device_id *id) diff --git a/drivers/misc/mei/hdcp/mei_hdcp.h b/drivers/misc/mei/hdcp/mei_hdcp.h index 582a7e27ae29..1eca72a9c1c2 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.h +++ b/drivers/misc/mei/hdcp/mei_hdcp.h @@ -363,4 +363,15 @@ struct wired_cmd_repeater_auth_stream_req_out { struct hdcp_port_id port; } __packed; +enum mei_fw_ddi { + MEI_DDI_INVALID_PORT = 0x0, + + MEI_DDI_B = 1, + MEI_DDI_C, + MEI_DDI_D, + MEI_DDI_E, + MEI_DDI_F, + MEI_DDI_A = 7, + MEI_DDI_RANGE_END = MEI_DDI_A, +}; #endif /* __MEI_HDCP_H__ */