From: Ramalingam C via dri-devel <dri-devel@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
daniel.vetter@ffwll.ch, tomas.winkler@intel.com,
uma.shankar@intel.com
Subject: [PATCH v14 08/33] drm/i915: Implement HDCP2.2 repeater authentication
Date: Sat, 16 Feb 2019 23:06:55 +0530 [thread overview]
Message-ID: <1550338640-17470-9-git-send-email-ramalingam.c@intel.com> (raw)
In-Reply-To: <1550338640-17470-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:
-EINVAL is returned for topology error and rollover scenario.
Endianness conversion func from drm_hdcp.h is used [Uma]
v4:
Rebased as part of patches reordering.
Defined the mei service functions [Daniel]
v5:
Redefined the mei service functions as per comp redesign.
v6:
%s/uintxx_t/uxx
Check for comp_master is removed.
v7:
Adjust to the new mei interface.
style issue fixed.
v8:
drm_hdcp.h change is moved into separate patch [Daniel]
v9:
%s/__swab16/cpu_to_be16. [Tomas]
Reviewed-by Uma.
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/intel_hdcp.c | 125 +++++++++++++++++++++++++++++++++++++-
1 file changed, 123 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index d63f620581ad..24051120d3bb 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -1041,7 +1041,7 @@ static int hdcp2_prepare_skey(struct intel_connector *connector,
return ret;
}
-static __attribute__((unused)) int
+static int
hdcp2_verify_rep_topology_prepare_ack(struct intel_connector *connector,
struct hdcp2_rep_send_receiverid_list
*rep_topology,
@@ -1070,7 +1070,7 @@ hdcp2_verify_rep_topology_prepare_ack(struct intel_connector *connector,
return ret;
}
-static __attribute__((unused)) int
+static int
hdcp2_verify_mprime(struct intel_connector *connector,
struct hdcp2_rep_stream_ready *stream_ready)
{
@@ -1279,6 +1279,119 @@ 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;
+ drm_hdcp2_u32_to_seq_num(msgs.stream_manage.seq_num_m, hdcp->seq_num_m);
+
+ /* K no of streams is fixed as 1. Stored as big-endian. */
+ msgs.stream_manage.k = cpu_to_be16(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->port_data.seq_num_m = hdcp->seq_num_m;
+ hdcp->port_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;
+ u8 *rx_info;
+ u32 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 */
+ seq_num_v = drm_hdcp2_seq_num_to_u32(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);
@@ -1312,6 +1425,14 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector)
return ret;
}
+ 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->port_data.streams[0].stream_type = hdcp->content_type;
ret = hdcp2_authenticate_port(connector);
if (ret < 0)
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-02-16 17:36 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-16 17:36 [PATCH v14 00/33] drm/i915: Implement HDCP2.2 Ramalingam C
2019-02-16 17:36 ` [PATCH v14 01/33] drm/i915: Gathering the HDCP1.4 routines together Ramalingam C
2019-02-16 17:36 ` [PATCH v14 02/33] drm/audio: declaration of struct device Ramalingam C
2019-02-16 17:36 ` [PATCH v14 03/33] drm/i915: Initialize HDCP2.2 Ramalingam C via dri-devel
2019-02-16 17:36 ` [PATCH v14 04/33] drm/i915: MEI interface implementation Ramalingam C via dri-devel
2019-02-20 19:39 ` Daniel Vetter
2019-02-21 4:07 ` C, Ramalingam
2019-02-16 17:36 ` [PATCH v14 05/33] drm/i915: hdcp1.4 CP_IRQ handling and SW encryption tracking Ramalingam C
2019-02-16 17:36 ` [PATCH v14 06/33] drm/i915: Enable and Disable of HDCP2.2 Ramalingam C
2019-02-16 17:36 ` [PATCH v14 07/33] drm/i915: Implement HDCP2.2 receiver authentication Ramalingam C
2019-02-16 17:36 ` Ramalingam C via dri-devel [this message]
2019-02-16 17:36 ` [PATCH v14 09/33] drm: HDCP2.2 link check period Ramalingam C
2019-02-16 17:36 ` [PATCH v14 10/33] drm/i915: Implement HDCP2.2 link integrity check Ramalingam C
2019-02-16 17:36 ` [PATCH v14 11/33] drm/i915: Handle HDCP2.2 downstream topology change Ramalingam C via dri-devel
2019-02-16 17:36 ` [PATCH v14 12/33] drm: removing the DP Errata msg and its msg id Ramalingam C
2019-02-16 17:37 ` [PATCH v14 13/33] drm/i915: Implement the HDCP2.2 support for DP Ramalingam C
2019-08-15 8:43 ` Jani Nikula
2019-08-19 15:06 ` Ramalingam C
2019-02-16 17:37 ` [PATCH v14 14/33] drm/i915: Implement the HDCP2.2 support for HDMI Ramalingam C
2019-02-16 17:37 ` [PATCH v14 15/33] drm/i915: CP_IRQ handling for DP HDCP2.2 msgs Ramalingam C via dri-devel
2019-02-16 17:37 ` [PATCH v14 16/33] drm/i915: Fix KBL HDCP2.2 encrypt status signalling Ramalingam C
2019-02-20 19:49 ` Daniel Vetter
2019-02-16 17:37 ` [PATCH v14 17/33] mei: bus: whitelist hdcp client Ramalingam C
2019-02-16 17:37 ` [PATCH v14 18/33] mei: bus: export to_mei_cl_device for mei client device drivers Ramalingam C
2019-02-16 17:37 ` [PATCH v14 19/33] misc/mei/hdcp: Client driver for HDCP application Ramalingam C
2019-02-21 13:55 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 20/33] misc/mei/hdcp: Define ME FW interface for HDCP2.2 Ramalingam C via dri-devel
2019-02-21 12:42 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 21/33] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session Ramalingam C
2019-02-21 13:30 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 22/33] misc/mei/hdcp: Verify Receiver Cert and prepare km Ramalingam C
2019-02-21 13:39 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 23/33] misc/mei/hdcp: Verify H_prime Ramalingam C
2019-02-21 13:32 ` Winkler, Tomas
2019-02-21 13:33 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 24/33] misc/mei/hdcp: Store the HDCP Pairing info Ramalingam C
2019-02-21 13:46 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 25/33] misc/mei/hdcp: Initiate Locality check Ramalingam C
2019-02-21 13:40 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 26/33] misc/mei/hdcp: Verify L_prime Ramalingam C
2019-02-21 13:42 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 27/33] misc/mei/hdcp: Prepare Session Key Ramalingam C
2019-02-21 14:24 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 28/33] misc/mei/hdcp: Repeater topology verification and ack Ramalingam C via dri-devel
2019-02-21 14:16 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 29/33] misc/mei/hdcp: Verify M_prime Ramalingam C via dri-devel
2019-02-21 13:44 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 30/33] misc/mei/hdcp: Enabling the HDCP authentication Ramalingam C
2019-02-21 14:25 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 31/33] misc/mei/hdcp: Closing wired HDCP2.2 Tx Session Ramalingam C
2019-02-21 14:25 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 32/33] misc/mei/hdcp: Component framework for I915 Interface Ramalingam C
2019-02-21 12:15 ` Winkler, Tomas
2019-02-16 17:37 ` [PATCH v14 33/33] FOR_TEST_ONLY: i915/Kconfig: Select mei_hdcp by I915 Ramalingam C via dri-devel
2019-02-16 18:18 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Implement HDCP2.2 Patchwork
2019-02-16 18:28 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-02-16 18:45 ` ✓ Fi.CI.BAT: success " Patchwork
2019-02-16 20:49 ` ✓ Fi.CI.IGT: " Patchwork
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=1550338640-17470-9-git-send-email-ramalingam.c@intel.com \
--to=dri-devel@lists.freedesktop.org \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ramalingam.c@intel.com \
--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