diff mbox

[v4,24/41] drm/i915: Implement HDCP2.2 repeater authentication

Message ID 1526907240-17639-25-git-send-email-ramalingam.c@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ramalingam C May 21, 2018, 12:53 p.m. UTC
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]

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
 drivers/gpu/drm/i915/intel_hdcp.c | 120 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)

Comments

kernel test robot May 23, 2018, 6:35 p.m. UTC | #1
Hi Ramalingam,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on v4.17-rc6 next-20180517]
[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/20180523-031938
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
reproduce:
        # apt-get install sparse
        make ARCH=x86_64 allmodconfig
        make C=1 CF=-D__CHECK_ENDIAN__


sparse warnings: (new ones prefixed by >>)

   drivers/gpu/drm/i915/i915_drv.h:3663:16: sparse: expression using sizeof(void)
>> drivers/gpu/drm/i915/intel_hdcp.c:1247:30: sparse: incorrect type in assignment (different base types) @@    expected restricted __be16 [assigned] [usertype] k @@    got e] k @@
   drivers/gpu/drm/i915/intel_hdcp.c:1247:30:    expected restricted __be16 [assigned] [usertype] k
   drivers/gpu/drm/i915/intel_hdcp.c:1247:30:    got int
   drivers/gpu/drm/i915/intel_hdcp.c:1343:12: warning: 'hdcp2_authenticate_sink' defined but not used [-Wunused-function]
    static int hdcp2_authenticate_sink(struct intel_connector *connector)
               ^~~~~~~~~~~~~~~~~~~~~~~

vim +1247 drivers/gpu/drm/i915/intel_hdcp.c

  1228	
  1229	static
  1230	int hdcp2_propagate_stream_management_info(struct intel_connector *connector)
  1231	{
  1232		struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
  1233		struct intel_hdcp *hdcp = &connector->hdcp;
  1234		union {
  1235			struct hdcp2_rep_stream_manage stream_manage;
  1236			struct hdcp2_rep_stream_ready stream_ready;
  1237		} msgs;
  1238		const struct intel_hdcp_shim *shim = hdcp->hdcp_shim;
  1239		int ret;
  1240	
  1241		/* Prepare RepeaterAuth_Stream_Manage msg */
  1242		msgs.stream_manage.msg_id = HDCP_2_2_REP_STREAM_MANAGE;
  1243		reverse_endianness(msgs.stream_manage.seq_num_m, HDCP_2_2_SEQ_NUM_LEN,
  1244				   (u8 *)&hdcp->seq_num_m);
  1245	
  1246		/* K no of streams is fixed as 1. Stored as big-endian. */
> 1247		msgs.stream_manage.k = __swab16(1);
  1248	
  1249		/* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */
  1250		msgs.stream_manage.streams[0].stream_id = 0;
  1251		msgs.stream_manage.streams[0].stream_type = hdcp->content_type;
  1252	
  1253		/* Send it to Repeater */
  1254		ret = shim->write_2_2_msg(intel_dig_port, &msgs.stream_manage,
  1255					  sizeof(msgs.stream_manage));
  1256		if (ret < 0)
  1257			return ret;
  1258	
  1259		ret = shim->read_2_2_msg(intel_dig_port, HDCP_2_2_REP_STREAM_READY,
  1260					 &msgs.stream_ready, sizeof(msgs.stream_ready));
  1261		if (ret < 0)
  1262			return ret;
  1263	
  1264		hdcp->mei_data.seq_num_m = hdcp->seq_num_m;
  1265		hdcp->mei_data.streams[0].stream_type = hdcp->content_type;
  1266	
  1267		ret = hdcp2_verify_mprime(hdcp,	&msgs.stream_ready);
  1268		if (ret < 0)
  1269			return ret;
  1270	
  1271		hdcp->seq_num_m++;
  1272	
  1273		if (hdcp->seq_num_m > HDCP_2_2_SEQ_NUM_MAX) {
  1274			DRM_DEBUG_KMS("seq_num_m roll over.\n");
  1275			return -1;
  1276		}
  1277	
  1278		return 0;
  1279	}
  1280	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index fa5cbad8afc6..bd0bfcfd5b8f 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -1226,6 +1226,120 @@  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->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(hdcp,	&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->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(hdcp, &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);
@@ -1268,6 +1382,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;