From: Daniel Vetter <daniel@ffwll.ch>
To: Ramalingam C <ramalingam.c@intel.com>
Cc: daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, uma.shankar@intel.com,
seanpaul@chromium.org, tomas.winkler@intel.com
Subject: Re: [PATCH v9 12/39] drm/i915: Implement HDCP2.2 repeater authentication
Date: Wed, 19 Dec 2018 15:48:01 +0100 [thread overview]
Message-ID: <20181219144801.GH21184@phenom.ffwll.local> (raw)
In-Reply-To: <1544673701-6353-13-git-send-email-ramalingam.c@intel.com>
On Thu, Dec 13, 2018 at 09:31:14AM +0530, Ramalingam C wrote:
> 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]
>
> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> ---
> drivers/gpu/drm/i915/intel_hdcp.c | 123 +++++++++++++++++++++++++++++++++++++-
> 1 file changed, 121 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
> index f1f0ef294e20..b52da5c3159d 100644
> --- a/drivers/gpu/drm/i915/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/intel_hdcp.c
> @@ -978,7 +978,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,
> @@ -999,7 +999,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)
> {
> @@ -1182,6 +1182,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 = __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->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;
There's a 2s timeout here that we're not checking, but again probably
follow-up patch.
> +
> + 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 */
> + drm_hdcp2_seq_num_to_u32(&seq_num_v, 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;
Spec talks about type0 vs type1 here, but for now we can ignore that.
> +
> + 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);
> @@ -1223,6 +1336,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;
> + }
> }
Spec for receiver auth is a bit more confusing than usual, but I think
this matches.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> hdcp->port_data.streams[0].stream_type = hdcp->content_type;
> --
> 2.7.4
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-12-19 14:48 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 4:01 [PATCH v9 00/39] drm/i915: Implement HDCP2.2 Ramalingam C
2018-12-13 4:01 ` [PATCH v9 01/39] drm/i915: Gathering the HDCP1.4 routines together Ramalingam C
2018-12-13 8:17 ` Winkler, Tomas
2018-12-13 11:21 ` C, Ramalingam
2018-12-19 13:35 ` Daniel Vetter
2018-12-13 4:01 ` [PATCH v9 02/39] drm: header for i915 - MEI_HDCP interface Ramalingam C
2018-12-17 11:28 ` Winkler, Tomas
2018-12-17 13:27 ` Daniel Vetter
2018-12-17 13:42 ` Winkler, Tomas
2018-12-17 13:59 ` Daniel Vetter
2018-12-19 13:37 ` Daniel Vetter
2018-12-13 4:01 ` [PATCH v9 03/39] drivers/base: use a worker for sysfs unbind Ramalingam C
2018-12-19 13:38 ` Daniel Vetter
2018-12-13 4:01 ` [PATCH v9 04/39] component: alloc component_match without any comp to match Ramalingam C
2018-12-19 13:42 ` Daniel Vetter
2018-12-19 15:04 ` Greg Kroah-Hartman
2018-12-13 4:01 ` [PATCH v9 05/39] drm/i915: component master at i915 driver load Ramalingam C
2018-12-19 13:45 ` Daniel Vetter
2018-12-13 4:01 ` [PATCH v9 06/39] drm/i915: Initialize HDCP2.2 Ramalingam C
2018-12-19 13:45 ` Daniel Vetter
2018-12-13 4:01 ` [PATCH v9 07/39] drm/i915: MEI interface definition Ramalingam C
2018-12-19 14:00 ` Daniel Vetter
2018-12-19 15:15 ` C, Ramalingam
2018-12-19 15:21 ` Daniel Vetter
2018-12-20 13:18 ` C, Ramalingam
2018-12-20 14:47 ` Daniel Vetter
2018-12-13 4:01 ` [PATCH v9 08/39] drm/i915: hdcp1.4 CP_IRQ handling and SW encryption tracking Ramalingam C
2018-12-19 15:48 ` Daniel Vetter
2018-12-20 11:29 ` C, Ramalingam
2018-12-20 14:53 ` Daniel Vetter
2018-12-13 4:01 ` [PATCH v9 09/39] drm/i915: Enable and Disable of HDCP2.2 Ramalingam C
2018-12-19 15:54 ` Daniel Vetter
2018-12-13 4:01 ` [PATCH v9 10/39] drm/i915: Implement HDCP2.2 receiver authentication Ramalingam C
2018-12-19 14:35 ` Daniel Vetter
2018-12-19 15:05 ` C, Ramalingam
2018-12-19 15:35 ` Daniel Vetter
2018-12-19 15:48 ` C, Ramalingam
2018-12-19 18:40 ` Jani Nikula
2018-12-19 21:36 ` Winkler, Tomas
2018-12-20 7:42 ` Jani Nikula
2018-12-20 14:28 ` Winkler, Tomas
2018-12-20 14:55 ` Daniel Vetter
2018-12-21 18:06 ` Ville Syrjälä
2018-12-13 4:01 ` [PATCH v9 11/39] drm: helper functions for hdcp2 seq_num to from u32 Ramalingam C
2018-12-19 14:38 ` Daniel Vetter
2018-12-13 4:01 ` [PATCH v9 12/39] drm/i915: Implement HDCP2.2 repeater authentication Ramalingam C
2018-12-13 8:22 ` Winkler, Tomas
2018-12-13 11:18 ` C, Ramalingam
2018-12-19 14:48 ` Daniel Vetter [this message]
2018-12-19 15:35 ` C, Ramalingam
2018-12-13 4:01 ` [PATCH v9 13/39] drm: HDCP2.2 link check related constants Ramalingam C
2018-12-19 15:16 ` Daniel Vetter
2018-12-19 15:39 ` C, Ramalingam
2018-12-19 15:58 ` Daniel Vetter
2018-12-19 16:22 ` C, Ramalingam
2018-12-19 16:35 ` Daniel Vetter
2018-12-19 17:01 ` C, Ramalingam
2018-12-13 4:01 ` [PATCH v9 14/39] drm/i915: Implement HDCP2.2 link integrity check Ramalingam C
2018-12-13 4:01 ` [PATCH v9 15/39] drm/i915: Handle HDCP2.2 downstream topology change Ramalingam C
2018-12-13 4:01 ` [PATCH v9 16/39] drm/i915: Implement the HDCP2.2 support for DP Ramalingam C
2018-12-13 4:01 ` [PATCH v9 17/39] drm/i915: Implement the HDCP2.2 support for HDMI Ramalingam C
2018-12-13 4:01 ` [PATCH v9 18/39] drm/i915: Add HDCP2.2 support for DP connectors Ramalingam C
2018-12-13 4:01 ` [PATCH v9 19/39] drm/i915: Add HDCP2.2 support for HDMI connectors Ramalingam C
2018-12-13 4:01 ` [PATCH v9 20/39] mei: bus: whitelist hdcp client Ramalingam C
2018-12-13 4:01 ` [PATCH v9 21/39] mei: bus: export to_mei_cl_device for mei client device drivers Ramalingam C
2018-12-13 4:01 ` [PATCH v9 22/39] misc/mei/hdcp: Client driver for HDCP application Ramalingam C
2018-12-13 4:01 ` [PATCH v9 23/39] misc/mei/hdcp: Define ME FW interface for HDCP2.2 Ramalingam C
2018-12-13 4:01 ` [PATCH v9 24/39] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session Ramalingam C
2018-12-13 4:01 ` [PATCH v9 25/39] misc/mei/hdcp: Verify Receiver Cert and prepare km Ramalingam C
2018-12-13 4:01 ` [PATCH v9 26/39] misc/mei/hdcp: Verify H_prime Ramalingam C
2018-12-13 4:01 ` [PATCH v9 27/39] misc/mei/hdcp: Store the HDCP Pairing info Ramalingam C
2018-12-13 4:01 ` [PATCH v9 28/39] misc/mei/hdcp: Initiate Locality check Ramalingam C
2018-12-13 4:01 ` [PATCH v9 29/39] misc/mei/hdcp: Verify L_prime Ramalingam C
2018-12-13 4:01 ` [PATCH v9 30/39] misc/mei/hdcp: Prepare Session Key Ramalingam C
2018-12-13 4:01 ` [PATCH v9 31/39] misc/mei/hdcp: Repeater topology verification and ack Ramalingam C
2018-12-13 4:01 ` [PATCH v9 32/39] misc/mei/hdcp: Verify M_prime Ramalingam C
2018-12-13 4:01 ` [PATCH v9 33/39] misc/mei/hdcp: Enabling the HDCP authentication Ramalingam C
2018-12-13 4:01 ` [PATCH v9 34/39] misc/mei/hdcp: Closing wired HDCP2.2 Tx Session Ramalingam C
2018-12-13 4:01 ` [PATCH v9 35/39] misc/mei/hdcp: Component framework for I915 Interface Ramalingam C
2018-12-13 12:36 ` C, Ramalingam
2018-12-13 16:11 ` Daniel Vetter
2018-12-13 16:27 ` Winkler, Tomas
2018-12-13 17:35 ` Daniel Vetter
2018-12-15 21:20 ` Winkler, Tomas
2018-12-17 9:39 ` Daniel Vetter
2018-12-17 9:59 ` Daniel Vetter
2018-12-17 10:57 ` Winkler, Tomas
2018-12-17 13:46 ` Daniel Vetter
2018-12-19 6:45 ` C, Ramalingam
2018-12-20 15:59 ` C, Ramalingam
2018-12-20 16:06 ` Winkler, Tomas
2018-12-20 16:47 ` C, Ramalingam
2018-12-13 4:01 ` [PATCH v9 36/39] drm/i915: Commit CP without modeset Ramalingam C
2018-12-13 4:01 ` [PATCH v9 37/39] drm/i915: Fix KBL HDCP2.2 encrypt status signalling Ramalingam C
2018-12-19 15:40 ` Daniel Vetter
2018-12-19 16:16 ` C, Ramalingam
2018-12-13 4:01 ` [PATCH v9 38/39] FOR_TEST: i915/Kconfig: Select mei_hdcp by I915 Ramalingam C
2018-12-13 4:01 ` [PATCH v9 39/39] FOR_TESTING_ONLY: debugfs: Excluding the LSPCon for HDCP1.4 Ramalingam C
2018-12-13 4:17 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Implement HDCP2.2 (rev11) Patchwork
2018-12-13 4:27 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-12-13 4:44 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-12-20 16:58 ` ✗ Fi.CI.BAT: failure for drm/i915: Implement HDCP2.2 (rev12) 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=20181219144801.GH21184@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ramalingam.c@intel.com \
--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