>-----Original Message-----
>From: C, Ramalingam
>Sent: Saturday, July 14, 2018 8:45 AM
>To: intel-...@lists.freedesktop.org; dri-devel@lists.freedesktop.org;
>dan...@ffwll.ch; seanp...@chromium.org; Winkler, Tomas
><tomas.wink...@intel.com>; Usyskin, Alexander <alexander.usys...@intel.com>;
>Shankar, Uma <uma.shan...@intel.com>
>Cc: Sharma, Shashank <shashank.sha...@intel.com>; C, Ramalingam
><ramalinga...@intel.com>
>Subject: [PATCH v6 18/35] drm/i915: Implement the HDCP2.2 support for DP
>
>Implements the DP adaptation specific HDCP2.2 functions.
>
>These functions perform the DPCD read and write for communicating the
>HDCP2.2 auth message back and forth.
>
>Note: Chris Wilson suggested alternate method for waiting for CP_IRQ, than
>completions concept. WIP to understand and implement that, if needed. Just to
>unblock the review of other changes, v2 still continues with completions.
This looks stale, update the comment.
>
>v2:
> wait for cp_irq is merged with this patch. Rebased.
>v3:
> wait_queue is used for wait for cp_irq [Chris Wilson]
>v4:
> Style fixed.
> %s/PARING/PAIRING
> Few style fixes [Uma]
>v5:
> Lookup table for DP HDCP2.2 msg details [Daniel].
> Extra lines are removed.
>v6:
> Rebased.
>
>Signed-off-by: Ramalingam C <ramalinga...@intel.com>
>---
> drivers/gpu/drm/i915/intel_dp.c | 333
>++++++++++++++++++++++++++++++++++++++
> drivers/gpu/drm/i915/intel_drv.h | 7 +
> drivers/gpu/drm/i915/intel_hdcp.c | 5 +
> 3 files changed, 345 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 6dcb09430fb5..a00c4ca195bd 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -31,6 +31,7 @@
> #include <linux/types.h>
> #include <linux/notifier.h>
> #include <linux/reboot.h>
>+#include <linux/mei_hdcp.h>
> #include <asm/byteorder.h>
> #include <drm/drmP.h>
> #include <drm/drm_atomic_helper.h>
>@@ -5088,6 +5089,27 @@ void intel_dp_encoder_suspend(struct intel_encoder
>*intel_encoder)
> pps_unlock(intel_dp);
> }
>
>+static int intel_dp_hdcp_wait_for_cp_irq(struct intel_hdcp *hdcp,
>+ int timeout)
>+{
>+ long ret;
>+
>+ /* Reinit */
>+ atomic_set(&hdcp->cp_irq_recved, 0);
>+
>+#define C (atomic_read(&hdcp->cp_irq_recved) > 0)
>+ ret = wait_event_interruptible_timeout(hdcp->cp_irq_queue, C,
>+ msecs_to_jiffies(timeout));
>+
>+ if (ret > 0) {
>+ atomic_set(&hdcp->cp_irq_recved, 0);
>+ return 0;
>+ } else if (!ret) {
>+ return -ETIMEDOUT;
>+ }
>+ return (int)ret;
>+}
>+
> static
> int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,
> u8 *an)
>@@ -5306,6 +5328,311 @@ int intel_dp_hdcp_capable(struct intel_digital_port
>*intel_dig_port,
> return 0;
> }
>
>+static struct hdcp2_dp_msg_data {
>+ uint8_t msg_id;
>+ uint32_t offset;
>+ bool msg_detectable;
>+ uint32_t timeout;
>+ uint32_t timeout2; /* Added for non_paired situation */
>+ } hdcp2_msg_data[] = {
>+ {HDCP_2_2_AKE_INIT, DP_HDCP_2_2_AKE_INIT_OFFSET, false,
>0, 0},
>+ {HDCP_2_2_AKE_SEND_CERT,
>DP_HDCP_2_2_AKE_SEND_CERT_OFFSET,
>+ false, HDCP_2_2_CERT_TIMEOUT_MS, 0},
>+ {HDCP_2_2_AKE_NO_STORED_KM,
>DP_HDCP_2_2_AKE_NO_STORED_KM_OFFSET,
>+ false, 0, 0},
>+ {HDCP_2_2_AKE_STORED_KM,
>DP_HDCP_2_2_AKE_STORED_KM_OFFSET,
>+ false, 0, 0},
>+ {HDCP_2_2_AKE_SEND_HPRIME,
>DP_HDCP_2_2_AKE_SEND_HPRIME_OFFSET,
>+ true,
>HDCP_2_2_HPRIME_PAIRED_TIMEOUT_MS,
>+
> HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS},
>+ {HDCP_2_2_AKE_SEND_PAIRING_INFO,
>+
> DP_HDCP_2_2_AKE_SEND_PAIRING_INFO_OFFSET, true,
>+ HDCP_2_2_PAIRING_TIMEOUT_MS, 0},
>+ {HDCP_2_2_LC_INIT, DP_HDCP_2_2_LC_INIT_OFFSET, false, 0,
>0},
>+ {HDCP_2_2_LC_SEND_LPRIME,
>DP_HDCP_2_2_LC_SEND_LPRIME_OFFSET,
>+ false, HDCP_2_2_DP_LPRIME_TIMEOUT_MS, 0},
>+ {HDCP_2_2_SKE_SEND_EKS,
>DP_HDCP_2_2_SKE_SEND_EKS_OFFSET, false,
>+ 0, 0},
>+ {HDCP_2_2_REP_SEND_RECVID_LIST,
>+
> DP_HDCP_2_2_REP_SEND_RECVID_LIST_OFFSET, true,
>+ HDCP_2_2_RECVID_LIST_TIMEOUT_MS, 0},
>+ {HDCP_2_2_REP_SEND_ACK,
>DP_HDCP_2_2_REP_SEND_ACK_OFFSET, false,
>+ 0, 0},
>+ {HDCP_2_2_REP_STREAM_MANAGE,
>+
> DP_HDCP_2_2_REP_STREAM_MANAGE_OFFSET, false,
>+ 0, 0},
>+ {HDCP_2_2_REP_STREAM_READY,
>DP_HDCP_2_2_REP_STREAM_READY_OFFSET,
>+ false,
>HDCP_2_2_STREAM_READY_TIMEOUT_MS, 0},
>+ {HDCP_2_2_ERRATA_DP_STREAM_TYPE,
>+ DP_HDCP_2_2_REG_STREAM_TYPE_OFFSET,
>false,
>+ 0, 0},
>+ };
>+
>+static inline
>+int intel_dp_hdcp2_read_rx_status(struct intel_digital_port *intel_dig_port,
>+ uint8_t *rx_status)
>+{
>+ ssize_t ret;
>+
>+ ret = drm_dp_dpcd_read(&intel_dig_port->dp.aux,
>+ DP_HDCP_2_2_REG_RXSTATUS_OFFSET, rx_status,
>+ HDCP_2_2_DP_RXSTATUS_LEN);
>+ if (ret != HDCP_2_2_DP_RXSTATUS_LEN) {
>+ DRM_ERROR("Read bstatus from DP/AUX failed (%zd)\n", ret);
>+ return ret >= 0 ? -EIO : ret;
>+ }
>+
>+ return 0;
>+}
>+
>+static
>+int hdcp2_detect_msg_availability(struct intel_digital_port *intel_dig_port,
>+ uint8_t msg_id, bool *msg_ready)
>+{
>+ uint8_t rx_status;
>+ int ret;
>+
>+ *msg_ready = false;
>+ ret = intel_dp_hdcp2_read_rx_status(intel_dig_port, &rx_status);
>+ if (ret < 0)
>+ return ret;
>+
>+ switch (msg_id) {
>+ case HDCP_2_2_AKE_SEND_HPRIME:
>+ if (HDCP_2_2_DP_RXSTATUS_H_PRIME(rx_status))
>+ *msg_ready = true;
>+ break;
>+ case HDCP_2_2_AKE_SEND_PAIRING_INFO:
>+ if (HDCP_2_2_DP_RXSTATUS_PAIRING(rx_status))
>+ *msg_ready = true;
>+ break;
>+ case HDCP_2_2_REP_SEND_RECVID_LIST:
>+ if (HDCP_2_2_DP_RXSTATUS_READY(rx_status))
>+ *msg_ready = true;
>+ break;
>+ default:
>+ DRM_DEBUG_KMS("Unidentified msg_id: %d\n", msg_id);
>+ return -EINVAL;
>+ }
>+
>+ return 0;
>+}
>+
>+static ssize_t
>+intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port,
>+ struct hdcp2_dp_msg_data *hdcp2_msg_data) {
>+ struct intel_dp *dp = &intel_dig_port->dp;
>+ struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;
>+ int ret, timeout;
>+ bool msg_ready = false;
>+
>+ if (hdcp2_msg_data->msg_id == HDCP_2_2_AKE_SEND_HPRIME &&
>+ !hdcp->is_paired)
>+ timeout = hdcp2_msg_data->timeout2;
>+ else
>+ timeout = hdcp2_msg_data->timeout;
>+
>+ /*
>+ * There is no way to detect the CERT, LPRIME and STREAM_READY
>+ * availability. So Wait for timeout and read the msg.
>+ */
>+ if (!hdcp2_msg_data->msg_detectable) {
>+ mdelay(timeout);
>+ ret = 0;
>+ } else {
>+ intel_dp_hdcp_wait_for_cp_irq(hdcp, timeout);
>+ ret = hdcp2_detect_msg_availability(intel_dig_port,
>+ hdcp2_msg_data->msg_id,
>+ &msg_ready);
>+ if (!msg_ready)
>+ ret = -ETIMEDOUT;
>+ }
>+
>+ if (ret)
>+ DRM_ERROR("msg_id %d, ret %d, timeout(mSec): %d\n",
>+ hdcp2_msg_data->msg_id, ret, timeout);
>+
>+ return ret;
>+}
>+
>+static struct hdcp2_dp_msg_data *get_hdcp2_dp_msg_data(uint8_t msg_id)
>+{
>+ int i;
>+
>+ for (i = 0; i < sizeof(hdcp2_msg_data); i++)
>+ if (hdcp2_msg_data[i].msg_id == msg_id)
>+ return &hdcp2_msg_data[i];
>+
>+ return NULL;
>+}
>+
>+static
>+int intel_dp_hdcp2_write_msg(struct intel_digital_port *intel_dig_port,
>+ void *buf, size_t size)
>+{
>+ unsigned int offset;
>+ uint8_t *byte = buf;
>+ ssize_t ret, bytes_to_write, len;
>+ struct hdcp2_dp_msg_data *hdcp2_msg_data;
>+
>+ hdcp2_msg_data = get_hdcp2_dp_msg_data(*byte);
>+ if (!hdcp2_msg_data)
>+ return -EINVAL;
>+
>+ /* No msg_id in DP HDCP2.2 msgs */
>+ bytes_to_write = size - 1;
>+ byte++;
>+
>+ while (bytes_to_write) {
>+ len = bytes_to_write > DP_AUX_MAX_PAYLOAD_BYTES ?
>+ DP_AUX_MAX_PAYLOAD_BYTES :
>bytes_to_write;
>+
>+ ret = drm_dp_dpcd_write(&intel_dig_port->dp.aux,
>+ hdcp2_msg_data->offset,
>+ (void *)byte, len);
>+ if (ret < 0)
>+ return ret;
>+
>+ bytes_to_write -= ret;
>+ byte += ret;
>+ offset += ret;
>+ }
>+
>+ return size;
>+}
>+
>+static
>+ssize_t get_receiver_id_list_size(struct intel_digital_port
>+*intel_dig_port) {
>+ uint8_t rx_info[HDCP_2_2_RXINFO_LEN];
>+ uint32_t dev_cnt;
>+ ssize_t ret;
>+
>+ ret = drm_dp_dpcd_read(&intel_dig_port->dp.aux,
>+ DP_HDCP_2_2_REG_RXINFO_OFFSET,
>+ (void *)rx_info, HDCP_2_2_RXINFO_LEN);
>+ if (ret != HDCP_2_2_RXINFO_LEN)
>+ return ret >= 0 ? -EIO : ret;
>+
>+ dev_cnt = (HDCP_2_2_DEV_COUNT_HI(rx_info[0]) << 4 |
>+ HDCP_2_2_DEV_COUNT_LO(rx_info[1]));
>+
>+ if (dev_cnt > HDCP_2_2_MAX_DEVICE_COUNT)
>+ dev_cnt = HDCP_2_2_MAX_DEVICE_COUNT;
>+
>+ ret = sizeof(struct hdcp2_rep_send_receiverid_list) -
>+ HDCP_2_2_RECEIVER_IDS_MAX_LEN +
>+ (dev_cnt * HDCP_2_2_RECEIVER_ID_LEN);
>+
>+ return ret;
>+}
>+
>+static
>+int intel_dp_hdcp2_read_msg(struct intel_digital_port *intel_dig_port,
>+ uint8_t msg_id, void *buf, size_t size) {
>+ unsigned int offset;
>+ uint8_t *byte = buf;
>+ ssize_t ret, bytes_to_recv, len;
>+ struct hdcp2_dp_msg_data *hdcp2_msg_data;
>+
>+ hdcp2_msg_data = get_hdcp2_dp_msg_data(*byte);
>+ if (!hdcp2_msg_data)
>+ return -EINVAL;
>+ offset = hdcp2_msg_data->offset;
>+
>+ ret = intel_dp_hdcp2_wait_for_msg(intel_dig_port, hdcp2_msg_data);
>+ if (ret < 0)
>+ return ret;
>+
>+ if (msg_id == HDCP_2_2_REP_SEND_RECVID_LIST) {
>+ ret = get_receiver_id_list_size(intel_dig_port);
>+ if (ret < 0)
>+ return ret;
>+
>+ size = ret;
>+ }
>+ bytes_to_recv = size - 1;
>+
>+ /* DP adaptation msgs has no msg_id */
>+ byte++;
>+
>+ while (bytes_to_recv) {
>+ len = bytes_to_recv > DP_AUX_MAX_PAYLOAD_BYTES ?
>+ DP_AUX_MAX_PAYLOAD_BYTES : bytes_to_recv;
>+
>+ ret = drm_dp_dpcd_read(&intel_dig_port->dp.aux, offset,
>+ (void *)byte, len);
>+ if (ret < 0) {
>+ DRM_DEBUG_KMS("msg_id %d, ret %zd\n", msg_id, ret);
>+ return ret;
>+ }
>+
>+ bytes_to_recv -= ret;
>+ byte += ret;
>+ offset += ret;
>+ }
>+ byte = buf;
>+ *byte = msg_id;
>+
>+ return size;
>+}
>+
>+static
>+int intel_dp_hdcp2_config_stream_type(struct intel_digital_port
>*intel_dig_port,
>+ void *buf, size_t size)
>+{
>+ return intel_dp_hdcp2_write_msg(intel_dig_port, buf, size); }
>+
>+static
>+int intel_dp_hdcp2_check_link(struct intel_digital_port
>+*intel_dig_port) {
>+ uint8_t rx_status;
>+ int ret;
>+
>+ ret = intel_dp_hdcp2_read_rx_status(intel_dig_port, &rx_status);
>+ if (ret)
>+ return ret;
>+
>+ if (HDCP_2_2_DP_RXSTATUS_REAUTH_REQ(rx_status))
>+ ret = DRM_HDCP_REAUTH_REQUEST;
>+ else if (HDCP_2_2_DP_RXSTATUS_LINK_FAILED(rx_status))
>+ ret = DRM_HDCP_LINK_INTEGRITY_FAILURE;
>+ else if (HDCP_2_2_DP_RXSTATUS_READY(rx_status))
>+ ret = DRM_HDCP_TOPOLOGY_CHANGE;
>+
>+ return ret;
>+}
>+
>+static
>+int intel_dp_hdcp2_capable(struct intel_digital_port *intel_dig_port,
>+ bool *capable)
>+{
>+ uint8_t rx_caps[3];
>+ int ret;
>+
>+ *capable = false;
>+ ret = drm_dp_dpcd_read(&intel_dig_port->dp.aux,
>+ DP_HDCP_2_2_REG_RX_CAPS_OFFSET,
>+ rx_caps, HDCP_2_2_RXCAPS_LEN);
>+ if (ret != HDCP_2_2_RXCAPS_LEN)
>+ return ret >= 0 ? -EIO : ret;
>+
>+ if (rx_caps[0] == HDCP_2_2_RXCAPS_VERSION_VAL &&
>+ HDCP_2_2_DP_HDCP_CAPABLE(rx_caps[2]))
>+ *capable = true;
>+
>+ return 0;
>+}
>+
>+static
This can be made inline.
Rest of the changes look ok to me.
With the above comments fixed.
Reviewed-by: Uma Shankar <uma.shan...@intel.com>
>+enum hdcp_protocol intel_dp_hdcp2_protocol(void) {
>+ return HDCP_PROTOCOL_DP;
>+}
>+
> static const struct intel_hdcp_shim intel_dp_hdcp_shim = {
> .write_an_aksv = intel_dp_hdcp_write_an_aksv,
> .read_bksv = intel_dp_hdcp_read_bksv,
>@@ -5318,6 +5645,12 @@ static const struct intel_hdcp_shim
>intel_dp_hdcp_shim = {
> .toggle_signalling = intel_dp_hdcp_toggle_signalling,
> .check_link = intel_dp_hdcp_check_link,
> .hdcp_capable = intel_dp_hdcp_capable,
>+ .write_2_2_msg = intel_dp_hdcp2_write_msg,
>+ .read_2_2_msg = intel_dp_hdcp2_read_msg,
>+ .config_stream_type = intel_dp_hdcp2_config_stream_type,
>+ .check_2_2_link = intel_dp_hdcp2_check_link,
>+ .hdcp_2_2_capable = intel_dp_hdcp2_capable,
>+ .hdcp_protocol = intel_dp_hdcp2_protocol,
> };
>
> static void intel_edp_panel_vdd_sanitize(struct intel_dp *intel_dp) diff --git
>a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index 82cda9a5aae3..7ae35d71b9c6 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -447,6 +447,13 @@ struct intel_hdcp {
> uint32_t seq_num_m;
>
> struct delayed_work hdcp2_check_work;
>+
>+ /*
>+ * Work queue to signal the CP_IRQ. Used for the waiters to read the
>+ * available information from HDCP DP sink.
>+ */
>+ wait_queue_head_t cp_irq_queue;
>+ atomic_t cp_irq_recved;
> };
>
> struct intel_connector {
>diff --git a/drivers/gpu/drm/i915/intel_hdcp.c
>b/drivers/gpu/drm/i915/intel_hdcp.c
>index 66d47240336f..0b604383d556 100644
>--- a/drivers/gpu/drm/i915/intel_hdcp.c
>+++ b/drivers/gpu/drm/i915/intel_hdcp.c
>@@ -851,6 +851,8 @@ int intel_hdcp_init(struct intel_connector *connector,
> if (hdcp2_supported)
> intel_hdcp2_init(connector);
>
>+ init_waitqueue_head(&hdcp->cp_irq_queue);
>+ atomic_set(&hdcp->cp_irq_recved, 0);
> return 0;
> }
>
>@@ -1849,4 +1851,7 @@ void intel_hdcp_handle_cp_irq(struct intel_connector
>*connector)
> intel_hdcp_check_link(connector);
> else if (intel_hdcp2_in_use(connector))
> intel_hdcp2_check_link(connector);
>+
>+ atomic_set(&connector->hdcp.cp_irq_recved, 1);
>+ wake_up_all(&connector->hdcp.cp_irq_queue);
> }
>--
>2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
