From: Ramalingam C <ramalingam.c@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
daniel@ffwll.ch, seanpaul@chromium.org, tomas.winkler@intel.com,
alexander.usyskin@intel.com, uma.shankar@intel.com
Subject: [PATCH v6 13/35] drm/i915: Implement HDCP2.2 repeater authentication
Date: Sat, 14 Jul 2018 08:44:55 +0530 [thread overview]
Message-ID: <1531538117-1606-14-git-send-email-ramalingam.c@intel.com> (raw)
In-Reply-To: <1531538117-1606-1-git-send-email-ramalingam.c@intel.com>
Implements the HDCP2.2 repeaters authentication steps such as verifying
the downstream topology and sending stream management information.
v2:
Rebased.
v3:
No Changes.
v4:
-EINVAL is returned for topology error and rollover scenario.
Endianness conversion func from drm_hdcp.h is used [Uma]
v5:
Rebased as part of patches reordering.
Defined the mei service functions [Daniel]
v6:
Redefined the mei service functions as per comp redesign.
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
drivers/gpu/drm/i915/intel_hdcp.c | 171 ++++++++++++++++++++++++++++++++++++++
include/drm/drm_hdcp.h | 15 ++++
2 files changed, 186 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index ee1e06bac175..a08d80c710d7 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -1144,6 +1144,56 @@ static int hdcp2_prepare_skey(struct intel_connector *connector,
return ret;
}
+static int
+hdcp2_verify_rep_topology_prepare_ack(
+ struct intel_connector *connector,
+ struct hdcp2_rep_send_receiverid_list *rep_topology,
+ struct hdcp2_rep_send_ack *rep_send_ack)
+{
+ struct mei_hdcp_data *data = &connector->hdcp.mei_data;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+ struct i915_component_master *comp = dev_priv->comp_master;
+ int ret;
+
+ if (!comp)
+ return -EINVAL;
+
+ if (!comp->hdcp_ops || !comp->mei_cldev || data->port == INVALID_PORT)
+ return -EINVAL;
+
+ ret = comp->hdcp_ops->repeater_check_flow_prepare_ack(comp->mei_cldev,
+ data,
+ rep_topology,
+ rep_send_ack);
+ if (ret < 0)
+ comp->hdcp_ops->close_hdcp_session(comp->mei_cldev, data);
+
+ return ret;
+}
+
+static int
+hdcp2_verify_mprime(struct intel_connector *connector,
+ struct hdcp2_rep_stream_ready *stream_ready)
+{
+ struct mei_hdcp_data *data = &connector->hdcp.mei_data;
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+ struct i915_component_master *comp = dev_priv->comp_master;
+ int ret;
+
+ if (!comp)
+ return -EINVAL;
+
+ if (!comp->hdcp_ops || !comp->mei_cldev || data->port == INVALID_PORT)
+ return -EINVAL;
+
+ ret = comp->hdcp_ops->verify_mprime(comp->mei_cldev, data,
+ stream_ready);
+ if (ret < 0)
+ comp->hdcp_ops->close_hdcp_session(comp->mei_cldev, data);
+
+ return ret;
+}
+
static int hdcp2_authenticate_port(struct intel_connector *connector)
{
struct mei_hdcp_data *data = &connector->hdcp.mei_data;
@@ -1319,6 +1369,121 @@ static int hdcp2_session_key_exchange(struct intel_connector *connector)
return 0;
}
+static
+int hdcp2_propagate_stream_management_info(struct intel_connector *connector)
+{
+ struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
+ struct intel_hdcp *hdcp = &connector->hdcp;
+ union {
+ struct hdcp2_rep_stream_manage stream_manage;
+ struct hdcp2_rep_stream_ready stream_ready;
+ } msgs;
+ const struct intel_hdcp_shim *shim = hdcp->shim;
+ int ret;
+
+ /* Prepare RepeaterAuth_Stream_Manage msg */
+ msgs.stream_manage.msg_id = HDCP_2_2_REP_STREAM_MANAGE;
+ reverse_endianness(msgs.stream_manage.seq_num_m, HDCP_2_2_SEQ_NUM_LEN,
+ (u8 *)&hdcp->seq_num_m);
+
+ /* K no of streams is fixed as 1. Stored as big-endian. */
+ msgs.stream_manage.k = __swab16(1);
+
+ /* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */
+ msgs.stream_manage.streams[0].stream_id = 0;
+ msgs.stream_manage.streams[0].stream_type = hdcp->content_type;
+
+ /* Send it to Repeater */
+ ret = shim->write_2_2_msg(intel_dig_port, &msgs.stream_manage,
+ sizeof(msgs.stream_manage));
+ if (ret < 0)
+ return ret;
+
+ ret = shim->read_2_2_msg(intel_dig_port, HDCP_2_2_REP_STREAM_READY,
+ &msgs.stream_ready, sizeof(msgs.stream_ready));
+ if (ret < 0)
+ return ret;
+
+ hdcp->mei_data.seq_num_m = hdcp->seq_num_m;
+ hdcp->mei_data.streams[0].stream_type = hdcp->content_type;
+
+ ret = hdcp2_verify_mprime(connector, &msgs.stream_ready);
+ if (ret < 0)
+ return ret;
+
+ hdcp->seq_num_m++;
+
+ if (hdcp->seq_num_m > HDCP_2_2_SEQ_NUM_MAX) {
+ DRM_DEBUG_KMS("seq_num_m roll over.\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+static
+int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
+{
+ struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
+ struct intel_hdcp *hdcp = &connector->hdcp;
+ union {
+ struct hdcp2_rep_send_receiverid_list recvid_list;
+ struct hdcp2_rep_send_ack rep_ack;
+ } msgs;
+ const struct intel_hdcp_shim *shim = hdcp->shim;
+ uint8_t *rx_info;
+ uint32_t seq_num_v;
+ int ret;
+
+ ret = shim->read_2_2_msg(intel_dig_port, HDCP_2_2_REP_SEND_RECVID_LIST,
+ &msgs.recvid_list, sizeof(msgs.recvid_list));
+ if (ret < 0)
+ return ret;
+
+ rx_info = msgs.recvid_list.rx_info;
+
+ if (HDCP_2_2_MAX_CASCADE_EXCEEDED(rx_info[1]) ||
+ HDCP_2_2_MAX_DEVS_EXCEEDED(rx_info[1])) {
+ DRM_DEBUG_KMS("Topology Max Size Exceeded\n");
+ return -EINVAL;
+ }
+
+ /* Converting and Storing the seq_num_v to local variable as DWORD */
+ reverse_endianness((u8 *)&seq_num_v, HDCP_2_2_SEQ_NUM_LEN,
+ msgs.recvid_list.seq_num_v);
+
+ if (seq_num_v < hdcp->seq_num_v) {
+ /* Roll over of the seq_num_v from repeater. Reauthenticate. */
+ DRM_DEBUG_KMS("Seq_num_v roll over.\n");
+ return -EINVAL;
+ }
+
+ ret = hdcp2_verify_rep_topology_prepare_ack(connector,
+ &msgs.recvid_list,
+ &msgs.rep_ack);
+ if (ret < 0)
+ return ret;
+
+ hdcp->seq_num_v = seq_num_v;
+ ret = shim->write_2_2_msg(intel_dig_port, &msgs.rep_ack,
+ sizeof(msgs.rep_ack));
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static int hdcp2_authenticate_repeater(struct intel_connector *connector)
+{
+ int ret;
+
+ ret = hdcp2_authenticate_repeater_topology(connector);
+ if (ret < 0)
+ return ret;
+
+ return hdcp2_propagate_stream_management_info(connector);
+}
+
static int hdcp2_authenticate_sink(struct intel_connector *connector)
{
struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
@@ -1360,6 +1525,12 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector)
sizeof(stream_type_msg));
if (ret < 0)
return ret;
+ } else if (hdcp->is_repeater) {
+ ret = hdcp2_authenticate_repeater(connector);
+ if (ret < 0) {
+ DRM_DEBUG_KMS("Repeater Auth Failed. Err: %d\n", ret);
+ return ret;
+ }
}
hdcp->mei_data.streams[0].stream_type = hdcp->content_type;
diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
index 2b4cfb0b7324..c01cdb1d848d 100644
--- a/include/drm/drm_hdcp.h
+++ b/include/drm/drm_hdcp.h
@@ -252,4 +252,19 @@ struct hdcp2_dp_errata_stream_type {
#define HDCP_2_2_HDMI_RXSTATUS_READY(x) ((x) & BIT(2))
#define HDCP_2_2_HDMI_RXSTATUS_REAUTH_REQ(x) ((x) & BIT(3))
+/*
+ * Library functions for endianness are aligned for 16/32/64 bits.
+ * But hdcp sequence numbers are 24bits. So for their Byte swapping,
+ * a conversion function is developed.
+ */
+static inline void reverse_endianness(u8 *dest, size_t sz, u8 *src)
+{
+ u32 index;
+
+ if (!sz || sz > sizeof(u32))
+ return;
+ for (index = 0; index < sz; index++)
+ dest[sz - index - 1] = src[index];
+}
+
#endif
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-07-14 3:14 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-14 3:14 [PATCH v6 00/35] drm/i915: Implement HDCP2.2 Ramalingam C
2018-07-14 3:14 ` [PATCH v6 01/35] drm: hdcp2.2 authentication msg definitions Ramalingam C
2018-07-31 6:21 ` Shankar, Uma
2018-08-01 11:14 ` Ramalingam C
2018-07-14 3:14 ` [PATCH v6 02/35] drm: HDMI and DP specific HDCP2.2 defines Ramalingam C
2018-07-31 8:25 ` Shankar, Uma
2018-08-01 11:34 ` Ramalingam C
2018-07-14 3:14 ` [PATCH v6 03/35] mei: bus: whitelist hdcp client Ramalingam C
2018-07-14 3:14 ` [PATCH v6 04/35] linux/mei: Header for mei_hdcp driver interface Ramalingam C
2018-07-31 8:39 ` Shankar, Uma
2018-07-14 3:14 ` [PATCH v6 05/35] drm/i915: wrapping all hdcp var into intel_hdcp Ramalingam C
2018-07-31 8:53 ` Shankar, Uma
2018-07-14 3:14 ` [PATCH v6 06/35] drm/i915: Define Intel HDCP2.2 registers Ramalingam C
2018-07-31 8:59 ` Shankar, Uma
2018-07-14 3:14 ` [PATCH v6 07/35] component: alloc component_match without any comp to match Ramalingam C
2018-07-14 3:14 ` [PATCH v6 08/35] drm/i915: component master at i915 driver load Ramalingam C
2018-07-14 3:14 ` [PATCH v6 09/35] drm/i915: Initialize HDCP2.2 and its MEI interface Ramalingam C
2018-07-17 1:29 ` kbuild test robot
2018-07-31 19:41 ` Shankar, Uma
2018-08-01 11:42 ` Ramalingam C
2018-07-14 3:14 ` [PATCH v6 10/35] drm/i915: Pullout the bksv read and validation Ramalingam C
2018-07-14 3:14 ` [PATCH v6 11/35] drm/i915: Enable and Disable of HDCP2.2 Ramalingam C
2018-07-31 20:49 ` Shankar, Uma
2018-07-14 3:14 ` [PATCH v6 12/35] drm/i915: Implement HDCP2.2 receiver authentication Ramalingam C
2018-08-01 9:41 ` Shankar, Uma
2018-08-30 6:34 ` Ramalingam C
2018-07-14 3:14 ` Ramalingam C [this message]
2018-08-01 10:30 ` [PATCH v6 13/35] drm/i915: Implement HDCP2.2 repeater authentication Shankar, Uma
2018-08-30 6:49 ` Ramalingam C
2018-07-14 3:14 ` [PATCH v6 14/35] drm/i915: Implement HDCP2.2 link integrity check Ramalingam C
2018-08-01 10:45 ` Shankar, Uma
2018-08-30 6:57 ` Ramalingam C
2018-07-14 3:14 ` [PATCH v6 15/35] drm/i915: Handle HDCP2.2 downstream topology change Ramalingam C
2018-07-14 3:14 ` [PATCH v6 16/35] drm/i915: hdcp_check_link only on CP_IRQ Ramalingam C
2018-07-14 3:14 ` [PATCH v6 17/35] drm/i915: Check HDCP 1.4 and 2.2 link " Ramalingam C
2018-08-01 11:02 ` Shankar, Uma
2018-08-30 7:24 ` Ramalingam C
2018-07-14 3:15 ` [PATCH v6 18/35] drm/i915: Implement the HDCP2.2 support for DP Ramalingam C
2018-08-01 11:31 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 19/35] drm/i915: Implement the HDCP2.2 support for HDMI Ramalingam C
2018-08-01 11:38 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 20/35] drm/i915: Add HDCP2.2 support for DP connectors Ramalingam C
2018-07-14 3:15 ` [PATCH v6 21/35] drm/i915: Add HDCP2.2 support for HDMI connectors Ramalingam C
2018-07-14 3:15 ` [PATCH v6 22/35] misc/mei/hdcp: Client driver for HDCP application Ramalingam C
2018-07-14 3:15 ` [PATCH v6 23/35] misc/mei/hdcp: Component framework for I915 Interface Ramalingam C
2018-08-01 13:06 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 24/35] misc/mei/hdcp: Define ME FW interface for HDCP2.2 Ramalingam C
2018-07-14 3:15 ` [PATCH v6 25/35] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session Ramalingam C
2018-08-01 13:13 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 26/35] misc/mei/hdcp: Verify Receiver Cert and prepare km Ramalingam C
2018-08-01 13:18 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 27/35] misc/mei/hdcp: Verify H_prime Ramalingam C
2018-08-01 13:21 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 28/35] misc/mei/hdcp: Store the HDCP Pairing info Ramalingam C
2018-08-01 13:23 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 29/35] misc/mei/hdcp: Initiate Locality check Ramalingam C
2018-08-01 13:24 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 30/35] misc/mei/hdcp: Verify L_prime Ramalingam C
2018-08-01 13:26 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 31/35] misc/mei/hdcp: Prepare Session Key Ramalingam C
2018-08-01 13:29 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 32/35] misc/mei/hdcp: Repeater topology verification and ack Ramalingam C
2018-08-01 13:31 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 33/35] misc/mei/hdcp: Verify M_prime Ramalingam C
2018-08-01 13:33 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 34/35] misc/mei/hdcp: Enabling the HDCP authentication Ramalingam C
2018-08-01 13:36 ` Shankar, Uma
2018-07-14 3:15 ` [PATCH v6 35/35] misc/mei/hdcp: Closing wired HDCP2.2 Tx Session Ramalingam C
2018-08-01 13:38 ` Shankar, Uma
2018-07-30 9:09 ` [PATCH v6 00/35] drm/i915: Implement HDCP2.2 Shankar, Uma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1531538117-1606-14-git-send-email-ramalingam.c@intel.com \
--to=ramalingam.c@intel.com \
--cc=alexander.usyskin@intel.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=seanpaul@chromium.org \
--cc=tomas.winkler@intel.com \
--cc=uma.shankar@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).