* [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS
@ 2023-01-10 10:57 Suraj Kandpal
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 1/6] drm/i915/gsc: Create GSC request submission mechanism Suraj Kandpal
` (8 more replies)
0 siblings, 9 replies; 15+ messages in thread
From: Suraj Kandpal @ 2023-01-10 10:57 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
These patches enable HDCP2.x on machines MTL and above.
From MTL onwards CSME is spilt into GSC and CSC and now
we use GSC CS instead of MEI to talk to firmware to start
HDCP authentication
--v2
-Fixing some checkpatch changes which I forgot before sending
out the series
--v3
-Drop cp and fw to make naming more agnostic[Jani]
-Sort header[Jani]
-remove static inline function from i915_hdcp_interface[Jani]
-abstract DISPLAY_VER check[Jani]
--v4
-Remove stale comment P2 [Jani]
-Fix part where file rename looks like its removed in P2 and
added in P3 [Jani]
-Add bitmask definition for host session id[Alan]
-Seprating gsc load and heci cmd submission into different funcs[Alan]
-Create comman function to fill gsc_mtl_header[Alan]
--v5
-No need to make hdcp_message field null as we use kzalloc [Alan]
-use i915->drm instead of gt->i915->drm [Alan]
--v6
-Make each patch build individually [Jani]
-drop cp_fw stale commit subject [Jani]
-fix the date on license [Jani]
-revert back to orginal design where mei and gsc fill their own header
--v7
-remove RB by Ankit
Anshuman Gupta (1):
drm/i915/hdcp: Keep hdcp agonstic naming convention
Suraj Kandpal (5):
drm/i915/gsc: Create GSC request submission mechanism
i915/hdcp: HDCP2.x Refactoring to agnostic hdcp
drm/i915/hdcp: Refactor HDCP API structures
drm/i915/mtl: Add function to send command to GSC CS
drm/i915/mtl: Add HDCP GSC interface
drivers/gpu/drm/i915/Makefile | 2 +
.../gpu/drm/i915/display/intel_display_core.h | 3 +-
.../drm/i915/display/intel_display_types.h | 2 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 109 ++-
drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 831 ++++++++++++++++++
drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 21 +
drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 2 +
drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h | 1 +
.../i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 109 +++
.../i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h | 51 ++
drivers/misc/mei/hdcp/mei_hdcp.c | 102 +--
drivers/misc/mei/hdcp/mei_hdcp.h | 354 --------
include/drm/i915_hdcp_interface.h | 539 ++++++++++++
include/drm/i915_mei_hdcp_interface.h | 184 ----
14 files changed, 1673 insertions(+), 637 deletions(-)
create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
create mode 100644 include/drm/i915_hdcp_interface.h
delete mode 100644 include/drm/i915_mei_hdcp_interface.h
--
2.25.1
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Intel-gfx] [PATCH v7 1/6] drm/i915/gsc: Create GSC request submission mechanism
2023-01-10 10:57 [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS Suraj Kandpal
@ 2023-01-10 10:57 ` Suraj Kandpal
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention Suraj Kandpal
` (7 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Suraj Kandpal @ 2023-01-10 10:57 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Alan Previn
HDCP and PXP will require a common function to allow it to
submit commands to the gsc cs. Also adding the gsc mtl header
that needs to be added on to the existing payloads of HDCP
and PXP.
--v4
-Seprate gsc load and heci cmd submission into different
functions in different files for better scalability [Alan]
-Rename gsc address field [Alan]
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Signed-off-by: Suraj Kandpal<suraj.kandpal@intel.com>
Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com>
---
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 2 +
drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h | 1 +
.../i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 94 +++++++++++++++++++
.../i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h | 45 +++++++++
5 files changed, 143 insertions(+)
create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index f47f00b162a4..461d6b40656d 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -194,6 +194,7 @@ i915-y += \
i915-y += \
gt/uc/intel_gsc_fw.o \
gt/uc/intel_gsc_uc.o \
+ gt/uc/intel_gsc_uc_heci_cmd_submit.o\
gt/uc/intel_guc.o \
gt/uc/intel_guc_ads.o \
gt/uc/intel_guc_capture.o \
diff --git a/drivers/gpu/drm/i915/gt/intel_gpu_commands.h b/drivers/gpu/drm/i915/gt/intel_gpu_commands.h
index 2af1ae3831df..454179884801 100644
--- a/drivers/gpu/drm/i915/gt/intel_gpu_commands.h
+++ b/drivers/gpu/drm/i915/gt/intel_gpu_commands.h
@@ -439,6 +439,8 @@
#define GSC_FW_LOAD GSC_INSTR(1, 0, 2)
#define HECI1_FW_LIMIT_VALID (1 << 31)
+#define GSC_HECI_CMD_PKT GSC_INSTR(0, 0, 6)
+
/*
* Used to convert any address to canonical form.
* Starting from gen8, some commands (e.g. STATE_BASE_ADDRESS,
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h
index 4b5dbb44afb4..146ac0128f69 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h
@@ -12,4 +12,5 @@ struct intel_gsc_uc;
int intel_gsc_uc_fw_upload(struct intel_gsc_uc *gsc);
bool intel_gsc_uc_fw_init_done(struct intel_gsc_uc *gsc);
+
#endif
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
new file mode 100644
index 000000000000..be2424af521d
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#include "gt/intel_engine_pm.h"
+#include "gt/intel_gpu_commands.h"
+#include "gt/intel_gt.h"
+#include "gt/intel_ring.h"
+#include "intel_gsc_uc_heci_cmd_submit.h"
+
+struct gsc_heci_pkt {
+ u64 addr_in;
+ u32 size_in;
+ u64 addr_out;
+ u32 size_out;
+};
+
+static int emit_gsc_heci_pkt(struct i915_request *rq, struct gsc_heci_pkt *pkt)
+{
+ u32 *cs;
+
+ cs = intel_ring_begin(rq, 8);
+ if (IS_ERR(cs))
+ return PTR_ERR(cs);
+
+ *cs++ = GSC_HECI_CMD_PKT;
+ *cs++ = lower_32_bits(pkt->addr_in);
+ *cs++ = upper_32_bits(pkt->addr_in);
+ *cs++ = pkt->size_in;
+ *cs++ = lower_32_bits(pkt->addr_out);
+ *cs++ = upper_32_bits(pkt->addr_out);
+ *cs++ = pkt->size_out;
+ *cs++ = 0;
+
+ intel_ring_advance(rq, cs);
+
+ return 0;
+}
+
+int intel_gsc_uc_heci_cmd_submit_packet(struct intel_gsc_uc *gsc, u64 addr_in,
+ u32 size_in, u64 addr_out,
+ u32 size_out)
+{
+ struct intel_context *ce = gsc->ce;
+ struct i915_request *rq;
+ struct gsc_heci_pkt pkt = {
+ .addr_in = addr_in,
+ .size_in = size_in,
+ .addr_out = addr_out,
+ .size_out = size_out
+ };
+ int err;
+
+ if (!ce)
+ return -ENODEV;
+
+ rq = i915_request_create(ce);
+ if (IS_ERR(rq))
+ return PTR_ERR(rq);
+
+ if (ce->engine->emit_init_breadcrumb) {
+ err = ce->engine->emit_init_breadcrumb(rq);
+ if (err)
+ goto out_rq;
+ }
+
+ err = emit_gsc_heci_pkt(rq, &pkt);
+
+ if (err)
+ goto out_rq;
+
+ err = ce->engine->emit_flush(rq, 0);
+
+out_rq:
+ i915_request_get(rq);
+
+ if (unlikely(err))
+ i915_request_set_error_once(rq, err);
+
+ i915_request_add(rq);
+
+ if (!err && i915_request_wait(rq, 0, msecs_to_jiffies(500)) < 0)
+ err = -ETIME;
+
+ i915_request_put(rq);
+
+ if (err)
+ drm_err(&gsc_uc_to_gt(gsc)->i915->drm,
+ "Request submission for GSC heci cmd failed (%d)\n",
+ err);
+
+ return err;
+}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
new file mode 100644
index 000000000000..cf610dfca7a5
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
@@ -0,0 +1,45 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef _INTEL_GSC_UC_HECI_CMD_SUBMIT_H_
+#define _INTEL_GSC_UC_HECI_CMD_SUBMIT_H_
+
+#include <linux/types.h>
+
+struct intel_gsc_uc;
+struct intel_gsc_mtl_header {
+ u32 validity_marker;
+#define GSC_HECI_VALIDITY_MARKER 0xA578875A
+
+ u8 heci_client_id;
+#define HECI_MEADDRESS_PXP 17
+#define HECI_MEADDRESS_HDCP 18
+
+ u8 reserved1;
+
+ u16 header_version;
+#define MTL_GSC_HEADER_VERSION 1
+
+ u64 host_session_handle;
+ u64 gsc_message_handle;
+
+ u32 message_size; /* lower 20 bits only, upper 12 are reserved */
+
+ /*
+ * Flags mask:
+ * Bit 0: Pending
+ * Bit 1: Session Cleanup;
+ * Bits 2-15: Flags
+ * Bits 16-31: Extension Size
+ */
+ u32 flags;
+
+ u32 status;
+} __packed;
+
+int intel_gsc_uc_heci_cmd_submit_packet(struct intel_gsc_uc *gsc,
+ u64 addr_in, u32 size_in,
+ u64 addr_out, u32 size_out);
+#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Intel-gfx] [PATCH v7 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention
2023-01-10 10:57 [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS Suraj Kandpal
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 1/6] drm/i915/gsc: Create GSC request submission mechanism Suraj Kandpal
@ 2023-01-10 10:57 ` Suraj Kandpal
2023-01-20 10:52 ` Nautiyal, Ankit K
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 3/6] i915/hdcp: HDCP2.x Refactoring to agnostic hdcp Suraj Kandpal
` (6 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Suraj Kandpal @ 2023-01-10 10:57 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Rodrigo Vivi, Tomas Winkler
From: Anshuman Gupta <anshuman.gupta@intel.com>
Change the include/drm/i915_mei_hdcp_interface.h to
include/drm/i915_hdcp_interface.h
--v6
-make each patch build individually [Jani]
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
---
.../gpu/drm/i915/display/intel_display_core.h | 2 +-
.../drm/i915/display/intel_display_types.h | 2 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 81 ++++++++---------
drivers/misc/mei/hdcp/mei_hdcp.c | 58 ++++++-------
...hdcp_interface.h => i915_hdcp_interface.h} | 86 +++++++++----------
5 files changed, 115 insertions(+), 114 deletions(-)
rename include/drm/{i915_mei_hdcp_interface.h => i915_hdcp_interface.h} (75%)
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 57ddce3ba02b..de71ff6ad80a 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -368,7 +368,7 @@ struct intel_display {
} gmbus;
struct {
- struct i915_hdcp_comp_master *master;
+ struct i915_hdcp_master *master;
bool comp_added;
/* Mutex to protect the above hdcp component related values. */
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 32e8b2fc3cc6..81d195ef5e57 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -43,7 +43,7 @@
#include <drm/drm_rect.h>
#include <drm/drm_vblank.h>
#include <drm/drm_vblank_work.h>
-#include <drm/i915_mei_hdcp_interface.h>
+#include <drm/i915_hdcp_interface.h>
#include <media/cec-notifier.h>
#include "i915_vma.h"
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 6406fd487ee5..262c76f21801 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1143,7 +1143,7 @@ hdcp2_prepare_ake_init(struct intel_connector *connector,
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1154,7 +1154,7 @@ hdcp2_prepare_ake_init(struct intel_connector *connector,
return -EINVAL;
}
- ret = comp->ops->initiate_hdcp2_session(comp->mei_dev, data, ake_data);
+ ret = comp->ops->initiate_hdcp2_session(comp->hdcp_dev, data, ake_data);
if (ret)
drm_dbg_kms(&dev_priv->drm, "Prepare_ake_init failed. %d\n",
ret);
@@ -1173,7 +1173,7 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector *connector,
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1184,7 +1184,7 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector *connector,
return -EINVAL;
}
- ret = comp->ops->verify_receiver_cert_prepare_km(comp->mei_dev, data,
+ ret = comp->ops->verify_receiver_cert_prepare_km(comp->hdcp_dev, data,
rx_cert, paired,
ek_pub_km, msg_sz);
if (ret < 0)
@@ -1201,7 +1201,7 @@ static int hdcp2_verify_hprime(struct intel_connector *connector,
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1212,7 +1212,7 @@ static int hdcp2_verify_hprime(struct intel_connector *connector,
return -EINVAL;
}
- ret = comp->ops->verify_hprime(comp->mei_dev, data, rx_hprime);
+ ret = comp->ops->verify_hprime(comp->hdcp_dev, data, rx_hprime);
if (ret < 0)
drm_dbg_kms(&dev_priv->drm, "Verify hprime failed. %d\n", ret);
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
@@ -1227,7 +1227,7 @@ hdcp2_store_pairing_info(struct intel_connector *connector,
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1238,7 +1238,7 @@ hdcp2_store_pairing_info(struct intel_connector *connector,
return -EINVAL;
}
- ret = comp->ops->store_pairing_info(comp->mei_dev, data, pairing_info);
+ ret = comp->ops->store_pairing_info(comp->hdcp_dev, data, pairing_info);
if (ret < 0)
drm_dbg_kms(&dev_priv->drm, "Store pairing info failed. %d\n",
ret);
@@ -1254,7 +1254,7 @@ hdcp2_prepare_lc_init(struct intel_connector *connector,
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1265,7 +1265,7 @@ hdcp2_prepare_lc_init(struct intel_connector *connector,
return -EINVAL;
}
- ret = comp->ops->initiate_locality_check(comp->mei_dev, data, lc_init);
+ ret = comp->ops->initiate_locality_check(comp->hdcp_dev, data, lc_init);
if (ret < 0)
drm_dbg_kms(&dev_priv->drm, "Prepare lc_init failed. %d\n",
ret);
@@ -1281,7 +1281,7 @@ hdcp2_verify_lprime(struct intel_connector *connector,
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1292,7 +1292,7 @@ hdcp2_verify_lprime(struct intel_connector *connector,
return -EINVAL;
}
- ret = comp->ops->verify_lprime(comp->mei_dev, data, rx_lprime);
+ ret = comp->ops->verify_lprime(comp->hdcp_dev, data, rx_lprime);
if (ret < 0)
drm_dbg_kms(&dev_priv->drm, "Verify L_Prime failed. %d\n",
ret);
@@ -1307,7 +1307,7 @@ static int hdcp2_prepare_skey(struct intel_connector *connector,
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1318,7 +1318,7 @@ static int hdcp2_prepare_skey(struct intel_connector *connector,
return -EINVAL;
}
- ret = comp->ops->get_session_key(comp->mei_dev, data, ske_data);
+ ret = comp->ops->get_session_key(comp->hdcp_dev, data, ske_data);
if (ret < 0)
drm_dbg_kms(&dev_priv->drm, "Get session key failed. %d\n",
ret);
@@ -1336,7 +1336,7 @@ hdcp2_verify_rep_topology_prepare_ack(struct intel_connector *connector,
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1347,7 +1347,7 @@ hdcp2_verify_rep_topology_prepare_ack(struct intel_connector *connector,
return -EINVAL;
}
- ret = comp->ops->repeater_check_flow_prepare_ack(comp->mei_dev, data,
+ ret = comp->ops->repeater_check_flow_prepare_ack(comp->hdcp_dev, data,
rep_topology,
rep_send_ack);
if (ret < 0)
@@ -1365,7 +1365,7 @@ hdcp2_verify_mprime(struct intel_connector *connector,
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1376,7 +1376,7 @@ hdcp2_verify_mprime(struct intel_connector *connector,
return -EINVAL;
}
- ret = comp->ops->verify_mprime(comp->mei_dev, data, stream_ready);
+ ret = comp->ops->verify_mprime(comp->hdcp_dev, data, stream_ready);
if (ret < 0)
drm_dbg_kms(&dev_priv->drm, "Verify mprime failed. %d\n", ret);
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
@@ -1389,7 +1389,7 @@ static int hdcp2_authenticate_port(struct intel_connector *connector)
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1400,7 +1400,7 @@ static int hdcp2_authenticate_port(struct intel_connector *connector)
return -EINVAL;
}
- ret = comp->ops->enable_hdcp_authentication(comp->mei_dev, data);
+ ret = comp->ops->enable_hdcp_authentication(comp->hdcp_dev, data);
if (ret < 0)
drm_dbg_kms(&dev_priv->drm, "Enable hdcp auth failed. %d\n",
ret);
@@ -1413,7 +1413,7 @@ static int hdcp2_close_mei_session(struct intel_connector *connector)
{
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- struct i915_hdcp_comp_master *comp;
+ struct i915_hdcp_master *comp;
int ret;
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
@@ -1424,7 +1424,7 @@ static int hdcp2_close_mei_session(struct intel_connector *connector)
return -EINVAL;
}
- ret = comp->ops->close_hdcp_session(comp->mei_dev,
+ ret = comp->ops->close_hdcp_session(comp->hdcp_dev,
&dig_port->hdcp_port_data);
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
@@ -2145,8 +2145,8 @@ static int i915_hdcp_component_bind(struct device *i915_kdev,
drm_dbg(&dev_priv->drm, "I915 HDCP comp bind\n");
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
- dev_priv->display.hdcp.master = (struct i915_hdcp_comp_master *)data;
- dev_priv->display.hdcp.master->mei_dev = mei_kdev;
+ dev_priv->display.hdcp.master = (struct i915_hdcp_master *)data;
+ dev_priv->display.hdcp.master->hdcp_dev = mei_kdev;
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
return 0;
@@ -2163,30 +2163,30 @@ static void i915_hdcp_component_unbind(struct device *i915_kdev,
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
}
-static const struct component_ops i915_hdcp_component_ops = {
+static const struct component_ops i915_hdcp_ops = {
.bind = i915_hdcp_component_bind,
.unbind = i915_hdcp_component_unbind,
};
-static enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port)
+static enum hdcp_ddi intel_get_hdcp_ddi_index(enum port port)
{
switch (port) {
case PORT_A:
- return MEI_DDI_A;
+ return HDCP_DDI_A;
case PORT_B ... PORT_F:
- return (enum mei_fw_ddi)port;
+ return (enum hdcp_ddi)port;
default:
- return MEI_DDI_INVALID_PORT;
+ return HDCP_DDI_INVALID_PORT;
}
}
-static enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder)
+static enum hdcp_transcoder intel_get_hdcp_transcoder(enum transcoder cpu_transcoder)
{
switch (cpu_transcoder) {
case TRANSCODER_A ... TRANSCODER_D:
- return (enum mei_fw_tc)(cpu_transcoder | 0x10);
+ return (enum hdcp_transcoder)(cpu_transcoder | 0x10);
default: /* eDP, DSI TRANSCODERS are non HDCP capable */
- return MEI_INVALID_TRANSCODER;
+ return HDCP_INVALID_TRANSCODER;
}
}
@@ -2200,20 +2200,20 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,
enum port port = dig_port->base.port;
if (DISPLAY_VER(dev_priv) < 12)
- data->fw_ddi = intel_get_mei_fw_ddi_index(port);
+ data->hdcp_ddi = intel_get_hdcp_ddi_index(port);
else
/*
- * As per ME FW API expectation, for GEN 12+, fw_ddi is filled
+ * As per ME FW API expectation, for GEN 12+, hdcp_ddi is filled
* with zero(INVALID PORT index).
*/
- data->fw_ddi = MEI_DDI_INVALID_PORT;
+ data->hdcp_ddi = HDCP_DDI_INVALID_PORT;
/*
- * As associated transcoder is set and modified at modeset, here fw_tc
+ * As associated transcoder is set and modified at modeset, here hdcp_transcoder
* is initialized to zero (invalid transcoder index). This will be
* retained for <Gen12 forever.
*/
- data->fw_tc = MEI_INVALID_TRANSCODER;
+ data->hdcp_transcoder = HDCP_INVALID_TRANSCODER;
data->port_type = (u8)HDCP_PORT_TYPE_INTEGRATED;
data->protocol = (u8)shim->protocol;
@@ -2256,7 +2256,7 @@ void intel_hdcp_component_init(struct drm_i915_private *dev_priv)
dev_priv->display.hdcp.comp_added = true;
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
- ret = component_add_typed(dev_priv->drm.dev, &i915_hdcp_component_ops,
+ ret = component_add_typed(dev_priv->drm.dev, &i915_hdcp_ops,
I915_COMPONENT_HDCP);
if (ret < 0) {
drm_dbg_kms(&dev_priv->drm, "Failed at component add(%d)\n",
@@ -2350,7 +2350,8 @@ int intel_hdcp_enable(struct intel_connector *connector,
}
if (DISPLAY_VER(dev_priv) >= 12)
- dig_port->hdcp_port_data.fw_tc = intel_get_mei_fw_tc(hdcp->cpu_transcoder);
+ dig_port->hdcp_port_data.hdcp_transcoder =
+ intel_get_hdcp_transcoder(hdcp->cpu_transcoder);
/*
* Considering that HDCP2.2 is more secure than HDCP1.4, If the setup
@@ -2485,7 +2486,7 @@ void intel_hdcp_component_fini(struct drm_i915_private *dev_priv)
dev_priv->display.hdcp.comp_added = false;
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
- component_del(dev_priv->drm.dev, &i915_hdcp_component_ops);
+ component_del(dev_priv->drm.dev, &i915_hdcp_ops);
}
void intel_hdcp_cleanup(struct intel_connector *connector)
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index e889a8bd7ac8..0ff0bd07e385 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -23,7 +23,7 @@
#include <linux/component.h>
#include <drm/drm_connector.h>
#include <drm/i915_component.h>
-#include <drm/i915_mei_hdcp_interface.h>
+#include <drm/i915_hdcp_interface.h>
#include "mei_hdcp.h"
@@ -57,8 +57,8 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN;
session_init_in.port.integrated_port_type = data->port_type;
- session_init_in.port.physical_port = (u8)data->fw_ddi;
- session_init_in.port.attached_transcoder = (u8)data->fw_tc;
+ session_init_in.port.physical_port = (u8)data->hdcp_ddi;
+ session_init_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
session_init_in.protocol = data->protocol;
byte = mei_cldev_send(cldev, (u8 *)&session_init_in,
@@ -127,8 +127,8 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN;
verify_rxcert_in.port.integrated_port_type = data->port_type;
- verify_rxcert_in.port.physical_port = (u8)data->fw_ddi;
- verify_rxcert_in.port.attached_transcoder = (u8)data->fw_tc;
+ verify_rxcert_in.port.physical_port = (u8)data->hdcp_ddi;
+ verify_rxcert_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
verify_rxcert_in.cert_rx = rx_cert->cert_rx;
memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN);
@@ -198,8 +198,8 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
send_hprime_in.header.buffer_len = WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN;
send_hprime_in.port.integrated_port_type = data->port_type;
- send_hprime_in.port.physical_port = (u8)data->fw_ddi;
- send_hprime_in.port.attached_transcoder = (u8)data->fw_tc;
+ send_hprime_in.port.physical_port = (u8)data->hdcp_ddi;
+ send_hprime_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,
HDCP_2_2_H_PRIME_LEN);
@@ -256,8 +256,8 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN;
pairing_info_in.port.integrated_port_type = data->port_type;
- pairing_info_in.port.physical_port = (u8)data->fw_ddi;
- pairing_info_in.port.attached_transcoder = (u8)data->fw_tc;
+ pairing_info_in.port.physical_port = (u8)data->hdcp_ddi;
+ pairing_info_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
HDCP_2_2_E_KH_KM_LEN);
@@ -315,8 +315,8 @@ mei_hdcp_initiate_locality_check(struct device *dev,
lc_init_in.header.buffer_len = WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN;
lc_init_in.port.integrated_port_type = data->port_type;
- lc_init_in.port.physical_port = (u8)data->fw_ddi;
- lc_init_in.port.attached_transcoder = (u8)data->fw_tc;
+ lc_init_in.port.physical_port = (u8)data->hdcp_ddi;
+ lc_init_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
byte = mei_cldev_send(cldev, (u8 *)&lc_init_in, sizeof(lc_init_in));
if (byte < 0) {
@@ -371,8 +371,8 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN;
verify_lprime_in.port.integrated_port_type = data->port_type;
- verify_lprime_in.port.physical_port = (u8)data->fw_ddi;
- verify_lprime_in.port.attached_transcoder = (u8)data->fw_tc;
+ verify_lprime_in.port.physical_port = (u8)data->hdcp_ddi;
+ verify_lprime_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,
HDCP_2_2_L_PRIME_LEN);
@@ -429,8 +429,8 @@ static int mei_hdcp_get_session_key(struct device *dev,
get_skey_in.header.buffer_len = WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN;
get_skey_in.port.integrated_port_type = data->port_type;
- get_skey_in.port.physical_port = (u8)data->fw_ddi;
- get_skey_in.port.attached_transcoder = (u8)data->fw_tc;
+ get_skey_in.port.physical_port = (u8)data->hdcp_ddi;
+ get_skey_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
byte = mei_cldev_send(cldev, (u8 *)&get_skey_in, sizeof(get_skey_in));
if (byte < 0) {
@@ -494,8 +494,8 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN;
verify_repeater_in.port.integrated_port_type = data->port_type;
- verify_repeater_in.port.physical_port = (u8)data->fw_ddi;
- verify_repeater_in.port.attached_transcoder = (u8)data->fw_tc;
+ verify_repeater_in.port.physical_port = (u8)data->hdcp_ddi;
+ verify_repeater_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,
HDCP_2_2_RXINFO_LEN);
@@ -572,8 +572,8 @@ static int mei_hdcp_verify_mprime(struct device *dev,
verify_mprime_in->header.buffer_len = cmd_size - sizeof(verify_mprime_in->header);
verify_mprime_in->port.integrated_port_type = data->port_type;
- verify_mprime_in->port.physical_port = (u8)data->fw_ddi;
- verify_mprime_in->port.attached_transcoder = (u8)data->fw_tc;
+ verify_mprime_in->port.physical_port = (u8)data->hdcp_ddi;
+ verify_mprime_in->port.attached_transcoder = (u8)data->hdcp_transcoder;
memcpy(verify_mprime_in->m_prime, stream_ready->m_prime, HDCP_2_2_MPRIME_LEN);
drm_hdcp_cpu_to_be24(verify_mprime_in->seq_num_m, data->seq_num_m);
@@ -634,8 +634,8 @@ static int mei_hdcp_enable_authentication(struct device *dev,
enable_auth_in.header.buffer_len = WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN;
enable_auth_in.port.integrated_port_type = data->port_type;
- enable_auth_in.port.physical_port = (u8)data->fw_ddi;
- enable_auth_in.port.attached_transcoder = (u8)data->fw_tc;
+ enable_auth_in.port.physical_port = (u8)data->hdcp_ddi;
+ enable_auth_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
enable_auth_in.stream_type = data->streams[0].stream_type;
byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in,
@@ -689,8 +689,8 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN;
session_close_in.port.integrated_port_type = data->port_type;
- session_close_in.port.physical_port = (u8)data->fw_ddi;
- session_close_in.port.attached_transcoder = (u8)data->fw_tc;
+ session_close_in.port.physical_port = (u8)data->hdcp_ddi;
+ session_close_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
byte = mei_cldev_send(cldev, (u8 *)&session_close_in,
sizeof(session_close_in));
@@ -715,7 +715,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
return 0;
}
-static const struct i915_hdcp_component_ops mei_hdcp_ops = {
+static const struct i915_hdcp_ops mei_hdcp_ops = {
.owner = THIS_MODULE,
.initiate_hdcp2_session = mei_hdcp_initiate_session,
.verify_receiver_cert_prepare_km =
@@ -735,13 +735,13 @@ static const struct i915_hdcp_component_ops mei_hdcp_ops = {
static int mei_component_master_bind(struct device *dev)
{
struct mei_cl_device *cldev = to_mei_cl_device(dev);
- struct i915_hdcp_comp_master *comp_master =
+ struct i915_hdcp_master *comp_master =
mei_cldev_get_drvdata(cldev);
int ret;
dev_dbg(dev, "%s\n", __func__);
comp_master->ops = &mei_hdcp_ops;
- comp_master->mei_dev = dev;
+ comp_master->hdcp_dev = dev;
ret = component_bind_all(dev, comp_master);
if (ret < 0)
return ret;
@@ -752,7 +752,7 @@ static int mei_component_master_bind(struct device *dev)
static void mei_component_master_unbind(struct device *dev)
{
struct mei_cl_device *cldev = to_mei_cl_device(dev);
- struct i915_hdcp_comp_master *comp_master =
+ struct i915_hdcp_master *comp_master =
mei_cldev_get_drvdata(cldev);
dev_dbg(dev, "%s\n", __func__);
@@ -801,7 +801,7 @@ static int mei_hdcp_component_match(struct device *dev, int subcomponent,
static int mei_hdcp_probe(struct mei_cl_device *cldev,
const struct mei_cl_device_id *id)
{
- struct i915_hdcp_comp_master *comp_master;
+ struct i915_hdcp_master *comp_master;
struct component_match *master_match;
int ret;
@@ -846,7 +846,7 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev,
static void mei_hdcp_remove(struct mei_cl_device *cldev)
{
- struct i915_hdcp_comp_master *comp_master =
+ struct i915_hdcp_master *comp_master =
mei_cldev_get_drvdata(cldev);
int ret;
diff --git a/include/drm/i915_mei_hdcp_interface.h b/include/drm/i915_hdcp_interface.h
similarity index 75%
rename from include/drm/i915_mei_hdcp_interface.h
rename to include/drm/i915_hdcp_interface.h
index f441cbcd95a4..d24f6726e50c 100644
--- a/include/drm/i915_mei_hdcp_interface.h
+++ b/include/drm/i915_hdcp_interface.h
@@ -6,8 +6,8 @@
* Ramalingam C <ramalingam.c@intel.com>
*/
-#ifndef _I915_MEI_HDCP_INTERFACE_H_
-#define _I915_MEI_HDCP_INTERFACE_H_
+#ifndef _I915_HDCP_INTERFACE_H_
+#define _I915_HDCP_INTERFACE_H_
#include <linux/mutex.h>
#include <linux/device.h>
@@ -41,44 +41,44 @@ enum hdcp_wired_protocol {
HDCP_PROTOCOL_DP
};
-enum mei_fw_ddi {
- MEI_DDI_INVALID_PORT = 0x0,
+enum hdcp_ddi {
+ HDCP_DDI_INVALID_PORT = 0x0,
- MEI_DDI_B = 1,
- MEI_DDI_C,
- MEI_DDI_D,
- MEI_DDI_E,
- MEI_DDI_F,
- MEI_DDI_A = 7,
- MEI_DDI_RANGE_END = MEI_DDI_A,
+ HDCP_DDI_B = 1,
+ HDCP_DDI_C,
+ HDCP_DDI_D,
+ HDCP_DDI_E,
+ HDCP_DDI_F,
+ HDCP_DDI_A = 7,
+ HDCP_DDI_RANGE_END = HDCP_DDI_A,
};
/**
- * enum mei_fw_tc - ME Firmware defined index for transcoders
- * @MEI_INVALID_TRANSCODER: Index for Invalid transcoder
- * @MEI_TRANSCODER_EDP: Index for EDP Transcoder
- * @MEI_TRANSCODER_DSI0: Index for DSI0 Transcoder
- * @MEI_TRANSCODER_DSI1: Index for DSI1 Transcoder
- * @MEI_TRANSCODER_A: Index for Transcoder A
- * @MEI_TRANSCODER_B: Index for Transcoder B
- * @MEI_TRANSCODER_C: Index for Transcoder C
- * @MEI_TRANSCODER_D: Index for Transcoder D
+ * enum hdcp_tc - ME Firmware defined index for transcoders
+ * @HDCP_INVALID_TRANSCODER: Index for Invalid transcoder
+ * @HDCP_TRANSCODER_EDP: Index for EDP Transcoder
+ * @HDCP_TRANSCODER_DSI0: Index for DSI0 Transcoder
+ * @HDCP_TRANSCODER_DSI1: Index for DSI1 Transcoder
+ * @HDCP_TRANSCODER_A: Index for Transcoder A
+ * @HDCP_TRANSCODER_B: Index for Transcoder B
+ * @HDCP_TRANSCODER_C: Index for Transcoder C
+ * @HDCP_TRANSCODER_D: Index for Transcoder D
*/
-enum mei_fw_tc {
- MEI_INVALID_TRANSCODER = 0x00,
- MEI_TRANSCODER_EDP,
- MEI_TRANSCODER_DSI0,
- MEI_TRANSCODER_DSI1,
- MEI_TRANSCODER_A = 0x10,
- MEI_TRANSCODER_B,
- MEI_TRANSCODER_C,
- MEI_TRANSCODER_D
+enum hdcp_transcoder {
+ HDCP_INVALID_TRANSCODER = 0x00,
+ HDCP_TRANSCODER_EDP,
+ HDCP_TRANSCODER_DSI0,
+ HDCP_TRANSCODER_DSI1,
+ HDCP_TRANSCODER_A = 0x10,
+ HDCP_TRANSCODER_B,
+ HDCP_TRANSCODER_C,
+ HDCP_TRANSCODER_D
};
/**
* struct hdcp_port_data - intel specific HDCP port data
- * @fw_ddi: ddi index as per ME FW
- * @fw_tc: transcoder index as per ME FW
+ * @hdcp_ddi: ddi index as per ME FW
+ * @hdcp_transcoder: transcoder index as per ME FW
* @port_type: HDCP port type as per ME FW classification
* @protocol: HDCP adaptation as per ME FW
* @k: No of streams transmitted on a port. Only on DP MST this is != 1
@@ -90,8 +90,8 @@ enum mei_fw_tc {
* streams
*/
struct hdcp_port_data {
- enum mei_fw_ddi fw_ddi;
- enum mei_fw_tc fw_tc;
+ enum hdcp_ddi hdcp_ddi;
+ enum hdcp_transcoder hdcp_transcoder;
u8 port_type;
u8 protocol;
u16 k;
@@ -100,7 +100,7 @@ struct hdcp_port_data {
};
/**
- * struct i915_hdcp_component_ops- ops for HDCP2.2 services.
+ * struct i915_hdcp_ops- ops for HDCP2.2 services.
* @owner: Module providing the ops
* @initiate_hdcp2_session: Initiate a Wired HDCP2.2 Tx Session.
* And Prepare AKE_Init.
@@ -119,9 +119,9 @@ struct hdcp_port_data {
* @close_hdcp_session: Close the Wired HDCP Tx session per port.
* This also disables the authenticated state of the port.
*/
-struct i915_hdcp_component_ops {
+struct i915_hdcp_ops {
/**
- * @owner: mei_hdcp module
+ * @owner: hdcp module
*/
struct module *owner;
@@ -169,16 +169,16 @@ struct i915_hdcp_component_ops {
/**
* struct i915_hdcp_component_master - Used for communication between i915
- * and mei_hdcp drivers for the HDCP2.2 services
- * @mei_dev: device that provide the HDCP2.2 service from MEI Bus.
- * @hdcp_ops: Ops implemented by mei_hdcp driver, used by i915 driver.
+ * and hdcp drivers for the HDCP2.2 services
+ * @hdcp_dev: device that provide the HDCP2.2 service from MEI Bus.
+ * @hdcp_ops: Ops implemented by hdcp driver or intel_hdcp_gsc , used by i915 driver.
*/
-struct i915_hdcp_comp_master {
- struct device *mei_dev;
- const struct i915_hdcp_component_ops *ops;
+struct i915_hdcp_master {
+ struct device *hdcp_dev;
+ const struct i915_hdcp_ops *ops;
/* To protect the above members. */
struct mutex mutex;
};
-#endif /* _I915_MEI_HDCP_INTERFACE_H_ */
+#endif /* _I915_HDCP_INTERFACE_H_ */
--
2.25.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Intel-gfx] [PATCH v7 3/6] i915/hdcp: HDCP2.x Refactoring to agnostic hdcp
2023-01-10 10:57 [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS Suraj Kandpal
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 1/6] drm/i915/gsc: Create GSC request submission mechanism Suraj Kandpal
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention Suraj Kandpal
@ 2023-01-10 10:57 ` Suraj Kandpal
2023-01-24 4:19 ` Nautiyal, Ankit K
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 4/6] drm/i915/hdcp: Refactor HDCP API structures Suraj Kandpal
` (5 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Suraj Kandpal @ 2023-01-10 10:57 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Rodrigo Vivi, Tomas Winkler
As now we have more then one type of content protection
secrity firmware. Let change the i915_cp_fw_hdcp_interface.h
header naming convention to suit generic f/w type.
%s/MEI_/HDCP_
%s/mei_dev/hdcp_dev
As interface to CP FW can be either a non i915 component or
i915 intergral component, change structure name Accordingly.
%s/i915_hdcp_comp_master/i915_hdcp_master
%s/i915_hdcp_component_ops/i915_hdcp_ops
--v3
-Changing names to drop cp_fw to make naming more agnostic[Jani]
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_core.h | 1 +
drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index de71ff6ad80a..132e9134ba05 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -15,6 +15,7 @@
#include <drm/drm_connector.h>
#include <drm/drm_modeset_lock.h>
+#include <drm/i915_hdcp_interface.h>
#include "intel_cdclk.h"
#include "intel_display.h"
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 262c76f21801..0d6aed1eb171 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1409,7 +1409,7 @@ static int hdcp2_authenticate_port(struct intel_connector *connector)
return ret;
}
-static int hdcp2_close_mei_session(struct intel_connector *connector)
+static int hdcp2_close_session(struct intel_connector *connector)
{
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
@@ -1433,7 +1433,7 @@ static int hdcp2_close_mei_session(struct intel_connector *connector)
static int hdcp2_deauthenticate_port(struct intel_connector *connector)
{
- return hdcp2_close_mei_session(connector);
+ return hdcp2_close_session(connector);
}
/* Authentication flow starts from here */
--
2.25.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Intel-gfx] [PATCH v7 4/6] drm/i915/hdcp: Refactor HDCP API structures
2023-01-10 10:57 [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS Suraj Kandpal
` (2 preceding siblings ...)
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 3/6] i915/hdcp: HDCP2.x Refactoring to agnostic hdcp Suraj Kandpal
@ 2023-01-10 10:57 ` Suraj Kandpal
2023-01-24 4:37 ` Nautiyal, Ankit K
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 5/6] drm/i915/mtl: Add function to send command to GSC CS Suraj Kandpal
` (4 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Suraj Kandpal @ 2023-01-10 10:57 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Rodrigo Vivi, Tomas Winkler
It requires to move intel specific HDCP API structures to
i915_cp_fw_hdcp_interface.h from driver/misc/mei/hdcp/mei_hdcp.h
so that any content protection fw interfaces can use these
structures.
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
drivers/misc/mei/hdcp/mei_hdcp.c | 44 ++--
drivers/misc/mei/hdcp/mei_hdcp.h | 354 -----------------------------
include/drm/i915_hdcp_interface.h | 355 ++++++++++++++++++++++++++++++
3 files changed, 377 insertions(+), 376 deletions(-)
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index 0ff0bd07e385..d4faecbbbe76 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -52,7 +52,7 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
session_init_in.header.api_version = HDCP_API_VERSION;
session_init_in.header.command_id = WIRED_INITIATE_HDCP2_SESSION;
- session_init_in.header.status = ME_HDCP_STATUS_SUCCESS;
+ session_init_in.header.status = FW_HDCP_STATUS_SUCCESS;
session_init_in.header.buffer_len =
WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN;
@@ -75,7 +75,7 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
return byte;
}
- if (session_init_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (session_init_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
WIRED_INITIATE_HDCP2_SESSION,
session_init_out.header.status);
@@ -122,7 +122,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
verify_rxcert_in.header.api_version = HDCP_API_VERSION;
verify_rxcert_in.header.command_id = WIRED_VERIFY_RECEIVER_CERT;
- verify_rxcert_in.header.status = ME_HDCP_STATUS_SUCCESS;
+ verify_rxcert_in.header.status = FW_HDCP_STATUS_SUCCESS;
verify_rxcert_in.header.buffer_len =
WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN;
@@ -148,7 +148,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
return byte;
}
- if (verify_rxcert_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (verify_rxcert_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
WIRED_VERIFY_RECEIVER_CERT,
verify_rxcert_out.header.status);
@@ -194,7 +194,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
send_hprime_in.header.api_version = HDCP_API_VERSION;
send_hprime_in.header.command_id = WIRED_AKE_SEND_HPRIME;
- send_hprime_in.header.status = ME_HDCP_STATUS_SUCCESS;
+ send_hprime_in.header.status = FW_HDCP_STATUS_SUCCESS;
send_hprime_in.header.buffer_len = WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN;
send_hprime_in.port.integrated_port_type = data->port_type;
@@ -218,7 +218,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
return byte;
}
- if (send_hprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (send_hprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
WIRED_AKE_SEND_HPRIME, send_hprime_out.header.status);
return -EIO;
@@ -251,7 +251,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
pairing_info_in.header.api_version = HDCP_API_VERSION;
pairing_info_in.header.command_id = WIRED_AKE_SEND_PAIRING_INFO;
- pairing_info_in.header.status = ME_HDCP_STATUS_SUCCESS;
+ pairing_info_in.header.status = FW_HDCP_STATUS_SUCCESS;
pairing_info_in.header.buffer_len =
WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN;
@@ -276,7 +276,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
return byte;
}
- if (pairing_info_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (pairing_info_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X failed. Status: 0x%X\n",
WIRED_AKE_SEND_PAIRING_INFO,
pairing_info_out.header.status);
@@ -311,7 +311,7 @@ mei_hdcp_initiate_locality_check(struct device *dev,
lc_init_in.header.api_version = HDCP_API_VERSION;
lc_init_in.header.command_id = WIRED_INIT_LOCALITY_CHECK;
- lc_init_in.header.status = ME_HDCP_STATUS_SUCCESS;
+ lc_init_in.header.status = FW_HDCP_STATUS_SUCCESS;
lc_init_in.header.buffer_len = WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN;
lc_init_in.port.integrated_port_type = data->port_type;
@@ -330,7 +330,7 @@ mei_hdcp_initiate_locality_check(struct device *dev,
return byte;
}
- if (lc_init_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (lc_init_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X Failed. status: 0x%X\n",
WIRED_INIT_LOCALITY_CHECK, lc_init_out.header.status);
return -EIO;
@@ -366,7 +366,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
verify_lprime_in.header.api_version = HDCP_API_VERSION;
verify_lprime_in.header.command_id = WIRED_VALIDATE_LOCALITY;
- verify_lprime_in.header.status = ME_HDCP_STATUS_SUCCESS;
+ verify_lprime_in.header.status = FW_HDCP_STATUS_SUCCESS;
verify_lprime_in.header.buffer_len =
WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN;
@@ -391,7 +391,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
return byte;
}
- if (verify_lprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (verify_lprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
WIRED_VALIDATE_LOCALITY,
verify_lprime_out.header.status);
@@ -425,7 +425,7 @@ static int mei_hdcp_get_session_key(struct device *dev,
get_skey_in.header.api_version = HDCP_API_VERSION;
get_skey_in.header.command_id = WIRED_GET_SESSION_KEY;
- get_skey_in.header.status = ME_HDCP_STATUS_SUCCESS;
+ get_skey_in.header.status = FW_HDCP_STATUS_SUCCESS;
get_skey_in.header.buffer_len = WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN;
get_skey_in.port.integrated_port_type = data->port_type;
@@ -445,7 +445,7 @@ static int mei_hdcp_get_session_key(struct device *dev,
return byte;
}
- if (get_skey_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (get_skey_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
WIRED_GET_SESSION_KEY, get_skey_out.header.status);
return -EIO;
@@ -489,7 +489,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
verify_repeater_in.header.api_version = HDCP_API_VERSION;
verify_repeater_in.header.command_id = WIRED_VERIFY_REPEATER;
- verify_repeater_in.header.status = ME_HDCP_STATUS_SUCCESS;
+ verify_repeater_in.header.status = FW_HDCP_STATUS_SUCCESS;
verify_repeater_in.header.buffer_len =
WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN;
@@ -520,7 +520,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
return byte;
}
- if (verify_repeater_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (verify_repeater_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
WIRED_VERIFY_REPEATER,
verify_repeater_out.header.status);
@@ -568,7 +568,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,
verify_mprime_in->header.api_version = HDCP_API_VERSION;
verify_mprime_in->header.command_id = WIRED_REPEATER_AUTH_STREAM_REQ;
- verify_mprime_in->header.status = ME_HDCP_STATUS_SUCCESS;
+ verify_mprime_in->header.status = FW_HDCP_STATUS_SUCCESS;
verify_mprime_in->header.buffer_len = cmd_size - sizeof(verify_mprime_in->header);
verify_mprime_in->port.integrated_port_type = data->port_type;
@@ -597,7 +597,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,
return byte;
}
- if (verify_mprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (verify_mprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
WIRED_REPEATER_AUTH_STREAM_REQ,
verify_mprime_out.header.status);
@@ -630,7 +630,7 @@ static int mei_hdcp_enable_authentication(struct device *dev,
enable_auth_in.header.api_version = HDCP_API_VERSION;
enable_auth_in.header.command_id = WIRED_ENABLE_AUTH;
- enable_auth_in.header.status = ME_HDCP_STATUS_SUCCESS;
+ enable_auth_in.header.status = FW_HDCP_STATUS_SUCCESS;
enable_auth_in.header.buffer_len = WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN;
enable_auth_in.port.integrated_port_type = data->port_type;
@@ -652,7 +652,7 @@ static int mei_hdcp_enable_authentication(struct device *dev,
return byte;
}
- if (enable_auth_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (enable_auth_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
WIRED_ENABLE_AUTH, enable_auth_out.header.status);
return -EIO;
@@ -684,7 +684,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
session_close_in.header.api_version = HDCP_API_VERSION;
session_close_in.header.command_id = WIRED_CLOSE_SESSION;
- session_close_in.header.status = ME_HDCP_STATUS_SUCCESS;
+ session_close_in.header.status = FW_HDCP_STATUS_SUCCESS;
session_close_in.header.buffer_len =
WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN;
@@ -706,7 +706,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
return byte;
}
- if (session_close_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+ if (session_close_out.header.status != FW_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "Session Close Failed. status: 0x%X\n",
session_close_out.header.status);
return -EIO;
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.h b/drivers/misc/mei/hdcp/mei_hdcp.h
index ca09c8f83d6b..0683d83ec17a 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.h
+++ b/drivers/misc/mei/hdcp/mei_hdcp.h
@@ -11,358 +11,4 @@
#include <drm/display/drm_hdcp.h>
-/* me_hdcp_status: Enumeration of all HDCP Status Codes */
-enum me_hdcp_status {
- ME_HDCP_STATUS_SUCCESS = 0x0000,
-
- /* WiDi Generic Status Codes */
- ME_HDCP_STATUS_INTERNAL_ERROR = 0x1000,
- ME_HDCP_STATUS_UNKNOWN_ERROR = 0x1001,
- ME_HDCP_STATUS_INCORRECT_API_VERSION = 0x1002,
- ME_HDCP_STATUS_INVALID_FUNCTION = 0x1003,
- ME_HDCP_STATUS_INVALID_BUFFER_LENGTH = 0x1004,
- ME_HDCP_STATUS_INVALID_PARAMS = 0x1005,
- ME_HDCP_STATUS_AUTHENTICATION_FAILED = 0x1006,
-
- /* WiDi Status Codes */
- ME_HDCP_INVALID_SESSION_STATE = 0x6000,
- ME_HDCP_SRM_FRAGMENT_UNEXPECTED = 0x6001,
- ME_HDCP_SRM_INVALID_LENGTH = 0x6002,
- ME_HDCP_SRM_FRAGMENT_OFFSET_INVALID = 0x6003,
- ME_HDCP_SRM_VERIFICATION_FAILED = 0x6004,
- ME_HDCP_SRM_VERSION_TOO_OLD = 0x6005,
- ME_HDCP_RX_CERT_VERIFICATION_FAILED = 0x6006,
- ME_HDCP_RX_REVOKED = 0x6007,
- ME_HDCP_H_VERIFICATION_FAILED = 0x6008,
- ME_HDCP_REPEATER_CHECK_UNEXPECTED = 0x6009,
- ME_HDCP_TOPOLOGY_MAX_EXCEEDED = 0x600A,
- ME_HDCP_V_VERIFICATION_FAILED = 0x600B,
- ME_HDCP_L_VERIFICATION_FAILED = 0x600C,
- ME_HDCP_STREAM_KEY_ALLOC_FAILED = 0x600D,
- ME_HDCP_BASE_KEY_RESET_FAILED = 0x600E,
- ME_HDCP_NONCE_GENERATION_FAILED = 0x600F,
- ME_HDCP_STATUS_INVALID_E_KEY_STATE = 0x6010,
- ME_HDCP_STATUS_INVALID_CS_ICV = 0x6011,
- ME_HDCP_STATUS_INVALID_KB_KEY_STATE = 0x6012,
- ME_HDCP_STATUS_INVALID_PAVP_MODE_ICV = 0x6013,
- ME_HDCP_STATUS_INVALID_PAVP_MODE = 0x6014,
- ME_HDCP_STATUS_LC_MAX_ATTEMPTS = 0x6015,
-
- /* New status for HDCP 2.1 */
- ME_HDCP_STATUS_MISMATCH_IN_M = 0x6016,
-
- /* New status code for HDCP 2.2 Rx */
- ME_HDCP_STATUS_RX_PROV_NOT_ALLOWED = 0x6017,
- ME_HDCP_STATUS_RX_PROV_WRONG_SUBJECT = 0x6018,
- ME_HDCP_RX_NEEDS_PROVISIONING = 0x6019,
- ME_HDCP_BKSV_ICV_AUTH_FAILED = 0x6020,
- ME_HDCP_STATUS_INVALID_STREAM_ID = 0x6021,
- ME_HDCP_STATUS_CHAIN_NOT_INITIALIZED = 0x6022,
- ME_HDCP_FAIL_NOT_EXPECTED = 0x6023,
- ME_HDCP_FAIL_HDCP_OFF = 0x6024,
- ME_HDCP_FAIL_INVALID_PAVP_MEMORY_MODE = 0x6025,
- ME_HDCP_FAIL_AES_ECB_FAILURE = 0x6026,
- ME_HDCP_FEATURE_NOT_SUPPORTED = 0x6027,
- ME_HDCP_DMA_READ_ERROR = 0x6028,
- ME_HDCP_DMA_WRITE_ERROR = 0x6029,
- ME_HDCP_FAIL_INVALID_PACKET_SIZE = 0x6030,
- ME_HDCP_H264_PARSING_ERROR = 0x6031,
- ME_HDCP_HDCP2_ERRATA_VIDEO_VIOLATION = 0x6032,
- ME_HDCP_HDCP2_ERRATA_AUDIO_VIOLATION = 0x6033,
- ME_HDCP_TX_ACTIVE_ERROR = 0x6034,
- ME_HDCP_MODE_CHANGE_ERROR = 0x6035,
- ME_HDCP_STREAM_TYPE_ERROR = 0x6036,
- ME_HDCP_STREAM_MANAGE_NOT_POSSIBLE = 0x6037,
-
- ME_HDCP_STATUS_PORT_INVALID_COMMAND = 0x6038,
- ME_HDCP_STATUS_UNSUPPORTED_PROTOCOL = 0x6039,
- ME_HDCP_STATUS_INVALID_PORT_INDEX = 0x603a,
- ME_HDCP_STATUS_TX_AUTH_NEEDED = 0x603b,
- ME_HDCP_STATUS_NOT_INTEGRATED_PORT = 0x603c,
- ME_HDCP_STATUS_SESSION_MAX_REACHED = 0x603d,
-
- /* hdcp capable bit is not set in rx_caps(error is unique to DP) */
- ME_HDCP_STATUS_NOT_HDCP_CAPABLE = 0x6041,
-
- ME_HDCP_STATUS_INVALID_STREAM_COUNT = 0x6042,
-};
-
-#define HDCP_API_VERSION 0x00010000
-
-#define HDCP_M_LEN 16
-#define HDCP_KH_LEN 16
-
-/* Payload Buffer size(Excluding Header) for CMDs and corresponding response */
-/* Wired_Tx_AKE */
-#define WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN (4 + 1)
-#define WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_OUT (4 + 8 + 3)
-
-#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN (4 + 522 + 8 + 3)
-#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_MIN_OUT (4 + 1 + 3 + 16 + 16)
-#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_MAX_OUT (4 + 1 + 3 + 128)
-
-#define WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN (4 + 32)
-#define WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_OUT (4)
-
-#define WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN (4 + 16)
-#define WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_OUT (4)
-
-#define WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN (4)
-#define WIRED_CMD_BUF_LEN_CLOSE_SESSION_OUT (4)
-
-/* Wired_Tx_LC */
-#define WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN (4)
-#define WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_OUT (4 + 8)
-
-#define WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN (4 + 32)
-#define WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_OUT (4)
-
-/* Wired_Tx_SKE */
-#define WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN (4)
-#define WIRED_CMD_BUF_LEN_GET_SESSION_KEY_OUT (4 + 16 + 8)
-
-/* Wired_Tx_SKE */
-#define WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN (4 + 1)
-#define WIRED_CMD_BUF_LEN_ENABLE_AUTH_OUT (4)
-
-/* Wired_Tx_Repeater */
-#define WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN (4 + 2 + 3 + 16 + 155)
-#define WIRED_CMD_BUF_LEN_VERIFY_REPEATER_OUT (4 + 1 + 16)
-
-#define WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_MIN_IN (4 + 3 + \
- 32 + 2 + 2)
-
-#define WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_OUT (4)
-
-/* hdcp_command_id: Enumeration of all WIRED HDCP Command IDs */
-enum hdcp_command_id {
- _WIDI_COMMAND_BASE = 0x00030000,
- WIDI_INITIATE_HDCP2_SESSION = _WIDI_COMMAND_BASE,
- HDCP_GET_SRM_STATUS,
- HDCP_SEND_SRM_FRAGMENT,
-
- /* The wired HDCP Tx commands */
- _WIRED_COMMAND_BASE = 0x00031000,
- WIRED_INITIATE_HDCP2_SESSION = _WIRED_COMMAND_BASE,
- WIRED_VERIFY_RECEIVER_CERT,
- WIRED_AKE_SEND_HPRIME,
- WIRED_AKE_SEND_PAIRING_INFO,
- WIRED_INIT_LOCALITY_CHECK,
- WIRED_VALIDATE_LOCALITY,
- WIRED_GET_SESSION_KEY,
- WIRED_ENABLE_AUTH,
- WIRED_VERIFY_REPEATER,
- WIRED_REPEATER_AUTH_STREAM_REQ,
- WIRED_CLOSE_SESSION,
-
- _WIRED_COMMANDS_COUNT,
-};
-
-union encrypted_buff {
- u8 e_kpub_km[HDCP_2_2_E_KPUB_KM_LEN];
- u8 e_kh_km_m[HDCP_2_2_E_KH_KM_M_LEN];
- struct {
- u8 e_kh_km[HDCP_KH_LEN];
- u8 m[HDCP_M_LEN];
- } __packed;
-};
-
-/* HDCP HECI message header. All header values are little endian. */
-struct hdcp_cmd_header {
- u32 api_version;
- u32 command_id;
- enum me_hdcp_status status;
- /* Length of the HECI message (excluding the header) */
- u32 buffer_len;
-} __packed;
-
-/* Empty command request or response. No data follows the header. */
-struct hdcp_cmd_no_data {
- struct hdcp_cmd_header header;
-} __packed;
-
-/* Uniquely identifies the hdcp port being addressed for a given command. */
-struct hdcp_port_id {
- u8 integrated_port_type;
- /* physical_port is used until Gen11.5. Must be zero for Gen11.5+ */
- u8 physical_port;
- /* attached_transcoder is for Gen11.5+. Set to zero for <Gen11.5 */
- u8 attached_transcoder;
- u8 reserved;
-} __packed;
-
-/*
- * Data structures for integrated wired HDCP2 Tx in
- * support of the AKE protocol
- */
-/* HECI struct for integrated wired HDCP Tx session initiation. */
-struct wired_cmd_initiate_hdcp2_session_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 protocol; /* for HDMI vs DP */
-} __packed;
-
-struct wired_cmd_initiate_hdcp2_session_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 r_tx[HDCP_2_2_RTX_LEN];
- struct hdcp2_tx_caps tx_caps;
-} __packed;
-
-/* HECI struct for ending an integrated wired HDCP Tx session. */
-struct wired_cmd_close_session_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
-} __packed;
-
-struct wired_cmd_close_session_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
-} __packed;
-
-/* HECI struct for integrated wired HDCP Tx Rx Cert verification. */
-struct wired_cmd_verify_receiver_cert_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- struct hdcp2_cert_rx cert_rx;
- u8 r_rx[HDCP_2_2_RRX_LEN];
- u8 rx_caps[HDCP_2_2_RXCAPS_LEN];
-} __packed;
-
-struct wired_cmd_verify_receiver_cert_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 km_stored;
- u8 reserved[3];
- union encrypted_buff ekm_buff;
-} __packed;
-
-/* HECI struct for verification of Rx's Hprime in a HDCP Tx session */
-struct wired_cmd_ake_send_hprime_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 h_prime[HDCP_2_2_H_PRIME_LEN];
-} __packed;
-
-struct wired_cmd_ake_send_hprime_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
-} __packed;
-
-/*
- * HECI struct for sending in AKE pairing data generated by the Rx in an
- * integrated wired HDCP Tx session.
- */
-struct wired_cmd_ake_send_pairing_info_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 e_kh_km[HDCP_2_2_E_KH_KM_LEN];
-} __packed;
-
-struct wired_cmd_ake_send_pairing_info_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
-} __packed;
-
-/* Data structures for integrated wired HDCP2 Tx in support of the LC protocol*/
-/*
- * HECI struct for initiating locality check with an
- * integrated wired HDCP Tx session.
- */
-struct wired_cmd_init_locality_check_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
-} __packed;
-
-struct wired_cmd_init_locality_check_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 r_n[HDCP_2_2_RN_LEN];
-} __packed;
-
-/*
- * HECI struct for validating an Rx's LPrime value in an
- * integrated wired HDCP Tx session.
- */
-struct wired_cmd_validate_locality_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 l_prime[HDCP_2_2_L_PRIME_LEN];
-} __packed;
-
-struct wired_cmd_validate_locality_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
-} __packed;
-
-/*
- * Data structures for integrated wired HDCP2 Tx in support of the
- * SKE protocol
- */
-/* HECI struct for creating session key */
-struct wired_cmd_get_session_key_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
-} __packed;
-
-struct wired_cmd_get_session_key_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 e_dkey_ks[HDCP_2_2_E_DKEY_KS_LEN];
- u8 r_iv[HDCP_2_2_RIV_LEN];
-} __packed;
-
-/* HECI struct for the Tx enable authentication command */
-struct wired_cmd_enable_auth_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 stream_type;
-} __packed;
-
-struct wired_cmd_enable_auth_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
-} __packed;
-
-/*
- * Data structures for integrated wired HDCP2 Tx in support of
- * the repeater protocols
- */
-/*
- * HECI struct for verifying the downstream repeater's HDCP topology in an
- * integrated wired HDCP Tx session.
- */
-struct wired_cmd_verify_repeater_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 rx_info[HDCP_2_2_RXINFO_LEN];
- u8 seq_num_v[HDCP_2_2_SEQ_NUM_LEN];
- u8 v_prime[HDCP_2_2_V_PRIME_HALF_LEN];
- u8 receiver_ids[HDCP_2_2_RECEIVER_IDS_MAX_LEN];
-} __packed;
-
-struct wired_cmd_verify_repeater_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 content_type_supported;
- u8 v[HDCP_2_2_V_PRIME_HALF_LEN];
-} __packed;
-
-/*
- * HECI struct in support of stream management in an
- * integrated wired HDCP Tx session.
- */
-struct wired_cmd_repeater_auth_stream_req_in {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
- u8 seq_num_m[HDCP_2_2_SEQ_NUM_LEN];
- u8 m_prime[HDCP_2_2_MPRIME_LEN];
- __be16 k;
- struct hdcp2_streamid_type streams[];
-} __packed;
-
-struct wired_cmd_repeater_auth_stream_req_out {
- struct hdcp_cmd_header header;
- struct hdcp_port_id port;
-} __packed;
#endif /* __MEI_HDCP_H__ */
diff --git a/include/drm/i915_hdcp_interface.h b/include/drm/i915_hdcp_interface.h
index d24f6726e50c..a92925cd1eae 100644
--- a/include/drm/i915_hdcp_interface.h
+++ b/include/drm/i915_hdcp_interface.h
@@ -181,4 +181,359 @@ struct i915_hdcp_master {
struct mutex mutex;
};
+/* fw_hdcp_status: Enumeration of all HDCP Status Codes */
+enum fw_hdcp_status {
+ FW_HDCP_STATUS_SUCCESS = 0x0000,
+
+ /* WiDi Generic Status Codes */
+ FW_HDCP_STATUS_INTERNAL_ERROR = 0x1000,
+ FW_HDCP_STATUS_UNKNOWN_ERROR = 0x1001,
+ FW_HDCP_STATUS_INCORRECT_API_VERSION = 0x1002,
+ FW_HDCP_STATUS_INVALID_FUNCTION = 0x1003,
+ FW_HDCP_STATUS_INVALID_BUFFER_LENGTH = 0x1004,
+ FW_HDCP_STATUS_INVALID_PARAMS = 0x1005,
+ FW_HDCP_STATUS_AUTHENTICATION_FAILED = 0x1006,
+
+ /* WiDi Status Codes */
+ FW_HDCP_INVALID_SESSION_STATE = 0x6000,
+ FW_HDCP_SRM_FRAGMENT_UNEXPECTED = 0x6001,
+ FW_HDCP_SRM_INVALID_LENGTH = 0x6002,
+ FW_HDCP_SRM_FRAGMENT_OFFSET_INVALID = 0x6003,
+ FW_HDCP_SRM_VERIFICATION_FAILED = 0x6004,
+ FW_HDCP_SRM_VERSION_TOO_OLD = 0x6005,
+ FW_HDCP_RX_CERT_VERIFICATION_FAILED = 0x6006,
+ FW_HDCP_RX_REVOKED = 0x6007,
+ FW_HDCP_H_VERIFICATION_FAILED = 0x6008,
+ FW_HDCP_REPEATER_CHECK_UNEXPECTED = 0x6009,
+ FW_HDCP_TOPOLOGY_MAX_EXCEEDED = 0x600A,
+ FW_HDCP_V_VERIFICATION_FAILED = 0x600B,
+ FW_HDCP_L_VERIFICATION_FAILED = 0x600C,
+ FW_HDCP_STREAM_KEY_ALLOC_FAILED = 0x600D,
+ FW_HDCP_BASE_KEY_RESET_FAILED = 0x600E,
+ FW_HDCP_NONCE_GENERATION_FAILED = 0x600F,
+ FW_HDCP_STATUS_INVALID_E_KEY_STATE = 0x6010,
+ FW_HDCP_STATUS_INVALID_CS_ICV = 0x6011,
+ FW_HDCP_STATUS_INVALID_KB_KEY_STATE = 0x6012,
+ FW_HDCP_STATUS_INVALID_PAVP_MODE_ICV = 0x6013,
+ FW_HDCP_STATUS_INVALID_PAVP_MODE = 0x6014,
+ FW_HDCP_STATUS_LC_MAX_ATTEMPTS = 0x6015,
+
+ /* New status for HDCP 2.1 */
+ FW_HDCP_STATUS_MISMATCH_IN_M = 0x6016,
+
+ /* New status code for HDCP 2.2 Rx */
+ FW_HDCP_STATUS_RX_PROV_NOT_ALLOWED = 0x6017,
+ FW_HDCP_STATUS_RX_PROV_WRONG_SUBJECT = 0x6018,
+ FW_HDCP_RX_NEEDS_PROVISIONING = 0x6019,
+ FW_HDCP_BKSV_ICV_AUTH_FAILED = 0x6020,
+ FW_HDCP_STATUS_INVALID_STREAM_ID = 0x6021,
+ FW_HDCP_STATUS_CHAIN_NOT_INITIALIZED = 0x6022,
+ FW_HDCP_FAIL_NOT_EXPECTED = 0x6023,
+ FW_HDCP_FAIL_HDCP_OFF = 0x6024,
+ FW_HDCP_FAIL_INVALID_PAVP_MEMORY_MODE = 0x6025,
+ FW_HDCP_FAIL_AES_ECB_FAILURE = 0x6026,
+ FW_HDCP_FEATURE_NOT_SUPPORTED = 0x6027,
+ FW_HDCP_DMA_READ_ERROR = 0x6028,
+ FW_HDCP_DMA_WRITE_ERROR = 0x6029,
+ FW_HDCP_FAIL_INVALID_PACKET_SIZE = 0x6030,
+ FW_HDCP_H264_PARSING_ERROR = 0x6031,
+ FW_HDCP_HDCP2_ERRATA_VIDEO_VIOLATION = 0x6032,
+ FW_HDCP_HDCP2_ERRATA_AUDIO_VIOLATION = 0x6033,
+ FW_HDCP_TX_ACTIVE_ERROR = 0x6034,
+ FW_HDCP_MODE_CHANGE_ERROR = 0x6035,
+ FW_HDCP_STREAM_TYPE_ERROR = 0x6036,
+ FW_HDCP_STREAM_MANAGE_NOT_POSSIBLE = 0x6037,
+
+ FW_HDCP_STATUS_PORT_INVALID_COMMAND = 0x6038,
+ FW_HDCP_STATUS_UNSUPPORTED_PROTOCOL = 0x6039,
+ FW_HDCP_STATUS_INVALID_PORT_INDEX = 0x603a,
+ FW_HDCP_STATUS_TX_AUTH_NEEDED = 0x603b,
+ FW_HDCP_STATUS_NOT_INTEGRATED_PORT = 0x603c,
+ FW_HDCP_STATUS_SESSION_MAX_REACHED = 0x603d,
+
+ /* hdcp capable bit is not set in rx_caps(error is unique to DP) */
+ FW_HDCP_STATUS_NOT_HDCP_CAPABLE = 0x6041,
+
+ FW_HDCP_STATUS_INVALID_STREAM_COUNT = 0x6042,
+};
+
+#define HDCP_API_VERSION 0x00010000
+
+#define HDCP_M_LEN 16
+#define HDCP_KH_LEN 16
+
+/* Payload Buffer size(Excluding Header) for CMDs and corresponding response */
+/* Wired_Tx_AKE */
+#define WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN (4 + 1)
+#define WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_OUT (4 + 8 + 3)
+
+#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN (4 + 522 + 8 + 3)
+#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_MIN_OUT (4 + 1 + 3 + 16 + 16)
+#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_MAX_OUT (4 + 1 + 3 + 128)
+
+#define WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN (4 + 32)
+#define WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_OUT (4)
+
+#define WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN (4 + 16)
+#define WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_OUT (4)
+
+#define WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN (4)
+#define WIRED_CMD_BUF_LEN_CLOSE_SESSION_OUT (4)
+
+/* Wired_Tx_LC */
+#define WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN (4)
+#define WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_OUT (4 + 8)
+
+#define WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN (4 + 32)
+#define WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_OUT (4)
+
+/* Wired_Tx_SKE */
+#define WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN (4)
+#define WIRED_CMD_BUF_LEN_GET_SESSION_KEY_OUT (4 + 16 + 8)
+
+/* Wired_Tx_SKE */
+#define WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN (4 + 1)
+#define WIRED_CMD_BUF_LEN_ENABLE_AUTH_OUT (4)
+
+/* Wired_Tx_Repeater */
+#define WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN (4 + 2 + 3 + 16 + 155)
+#define WIRED_CMD_BUF_LEN_VERIFY_REPEATER_OUT (4 + 1 + 16)
+
+#define WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_MIN_IN (4 + 3 + \
+ 32 + 2 + 2)
+
+#define WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_OUT (4)
+
+/* hdcp_command_id: Enumeration of all WIRED HDCP Command IDs */
+enum hdcp_command_id {
+ _WIDI_COMMAND_BASE = 0x00030000,
+ WIDI_INITIATE_HDCP2_SESSION = _WIDI_COMMAND_BASE,
+ HDCP_GET_SRM_STATUS,
+ HDCP_SEND_SRM_FRAGMENT,
+
+ /* The wired HDCP Tx commands */
+ _WIRED_COMMAND_BASE = 0x00031000,
+ WIRED_INITIATE_HDCP2_SESSION = _WIRED_COMMAND_BASE,
+ WIRED_VERIFY_RECEIVER_CERT,
+ WIRED_AKE_SEND_HPRIME,
+ WIRED_AKE_SEND_PAIRING_INFO,
+ WIRED_INIT_LOCALITY_CHECK,
+ WIRED_VALIDATE_LOCALITY,
+ WIRED_GET_SESSION_KEY,
+ WIRED_ENABLE_AUTH,
+ WIRED_VERIFY_REPEATER,
+ WIRED_REPEATER_AUTH_STREAM_REQ,
+ WIRED_CLOSE_SESSION,
+
+ _WIRED_COMMANDS_COUNT,
+};
+
+union encrypted_buff {
+ u8 e_kpub_km[HDCP_2_2_E_KPUB_KM_LEN];
+ u8 e_kh_km_m[HDCP_2_2_E_KH_KM_M_LEN];
+ struct {
+ u8 e_kh_km[HDCP_KH_LEN];
+ u8 m[HDCP_M_LEN];
+ } __packed;
+};
+
+/* HDCP HECI message header. All header values are little endian. */
+struct hdcp_cmd_header {
+ u32 api_version;
+ u32 command_id;
+ enum fw_hdcp_status status;
+ /* Length of the HECI message (excluding the header) */
+ u32 buffer_len;
+} __packed;
+
+/* Empty command request or response. No data follows the header. */
+struct hdcp_cmd_no_data {
+ struct hdcp_cmd_header header;
+} __packed;
+
+/* Uniquely identifies the hdcp port being addressed for a given command. */
+struct hdcp_port_id {
+ u8 integrated_port_type;
+ /* physical_port is used until Gen11.5. Must be zero for Gen11.5+ */
+ u8 physical_port;
+ /* attached_transcoder is for Gen11.5+. Set to zero for <Gen11.5 */
+ u8 attached_transcoder;
+ u8 reserved;
+} __packed;
+
+/*
+ * Data structures for integrated wired HDCP2 Tx in
+ * support of the AKE protocol
+ */
+/* HECI struct for integrated wired HDCP Tx session initiation. */
+struct wired_cmd_initiate_hdcp2_session_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 protocol; /* for HDMI vs DP */
+} __packed;
+
+struct wired_cmd_initiate_hdcp2_session_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 r_tx[HDCP_2_2_RTX_LEN];
+ struct hdcp2_tx_caps tx_caps;
+} __packed;
+
+/* HECI struct for ending an integrated wired HDCP Tx session. */
+struct wired_cmd_close_session_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+} __packed;
+
+struct wired_cmd_close_session_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+} __packed;
+
+/* HECI struct for integrated wired HDCP Tx Rx Cert verification. */
+struct wired_cmd_verify_receiver_cert_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ struct hdcp2_cert_rx cert_rx;
+ u8 r_rx[HDCP_2_2_RRX_LEN];
+ u8 rx_caps[HDCP_2_2_RXCAPS_LEN];
+} __packed;
+
+struct wired_cmd_verify_receiver_cert_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 km_stored;
+ u8 reserved[3];
+ union encrypted_buff ekm_buff;
+} __packed;
+
+/* HECI struct for verification of Rx's Hprime in a HDCP Tx session */
+struct wired_cmd_ake_send_hprime_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 h_prime[HDCP_2_2_H_PRIME_LEN];
+} __packed;
+
+struct wired_cmd_ake_send_hprime_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+} __packed;
+
+/*
+ * HECI struct for sending in AKE pairing data generated by the Rx in an
+ * integrated wired HDCP Tx session.
+ */
+struct wired_cmd_ake_send_pairing_info_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 e_kh_km[HDCP_2_2_E_KH_KM_LEN];
+} __packed;
+
+struct wired_cmd_ake_send_pairing_info_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+} __packed;
+
+/* Data structures for integrated wired HDCP2 Tx in support of the LC protocol*/
+/*
+ * HECI struct for initiating locality check with an
+ * integrated wired HDCP Tx session.
+ */
+struct wired_cmd_init_locality_check_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+} __packed;
+
+struct wired_cmd_init_locality_check_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 r_n[HDCP_2_2_RN_LEN];
+} __packed;
+
+/*
+ * HECI struct for validating an Rx's LPrime value in an
+ * integrated wired HDCP Tx session.
+ */
+struct wired_cmd_validate_locality_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 l_prime[HDCP_2_2_L_PRIME_LEN];
+} __packed;
+
+struct wired_cmd_validate_locality_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+} __packed;
+
+/*
+ * Data structures for integrated wired HDCP2 Tx in support of the
+ * SKE protocol
+ */
+/* HECI struct for creating session key */
+struct wired_cmd_get_session_key_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+} __packed;
+
+struct wired_cmd_get_session_key_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 e_dkey_ks[HDCP_2_2_E_DKEY_KS_LEN];
+ u8 r_iv[HDCP_2_2_RIV_LEN];
+} __packed;
+
+/* HECI struct for the Tx enable authentication command */
+struct wired_cmd_enable_auth_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 stream_type;
+} __packed;
+
+struct wired_cmd_enable_auth_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+} __packed;
+
+/*
+ * Data structures for integrated wired HDCP2 Tx in support of
+ * the repeater protocols
+ */
+/*
+ * HECI struct for verifying the downstream repeater's HDCP topology in an
+ * integrated wired HDCP Tx session.
+ */
+struct wired_cmd_verify_repeater_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 rx_info[HDCP_2_2_RXINFO_LEN];
+ u8 seq_num_v[HDCP_2_2_SEQ_NUM_LEN];
+ u8 v_prime[HDCP_2_2_V_PRIME_HALF_LEN];
+ u8 receiver_ids[HDCP_2_2_RECEIVER_IDS_MAX_LEN];
+} __packed;
+
+struct wired_cmd_verify_repeater_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 content_type_supported;
+ u8 v[HDCP_2_2_V_PRIME_HALF_LEN];
+} __packed;
+
+/*
+ * HECI struct in support of stream management in an
+ * integrated wired HDCP Tx session.
+ */
+struct wired_cmd_repeater_auth_stream_req_in {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+ u8 seq_num_m[HDCP_2_2_SEQ_NUM_LEN];
+ u8 m_prime[HDCP_2_2_MPRIME_LEN];
+ __be16 k;
+ struct hdcp2_streamid_type streams[];
+} __packed;
+
+struct wired_cmd_repeater_auth_stream_req_out {
+ struct hdcp_cmd_header header;
+ struct hdcp_port_id port;
+} __packed;
+
#endif /* _I915_HDCP_INTERFACE_H_ */
--
2.25.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Intel-gfx] [PATCH v7 5/6] drm/i915/mtl: Add function to send command to GSC CS
2023-01-10 10:57 [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS Suraj Kandpal
` (3 preceding siblings ...)
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 4/6] drm/i915/hdcp: Refactor HDCP API structures Suraj Kandpal
@ 2023-01-10 10:57 ` Suraj Kandpal
2023-01-19 7:19 ` Teres Alexis, Alan Previn
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 6/6] drm/i915/mtl: Add HDCP GSC interface Suraj Kandpal
` (3 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Suraj Kandpal @ 2023-01-10 10:57 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Add function that takes care of sending command to gsc cs. We start
of with allocation of memory for our command intel_hdcp_gsc_message that
contains gsc cs memory header as directed in specs followed by the
actual payload hdcp message that we want to send.
Spec states that we need to poll pending bit of response header around
20 times each try being 50ms apart hence adding that to current
gsc_msg_send function
Also we use the same function to take care of both sending and receiving
hence no separate function to get the response.
--v4
-Create common function to fill in gsc_mtl_header [Alan]
-define host session bitmask [Alan]
--v5
-use i915 directly instead of gt->i915 [Alan]
-No need to make fields NULL as we are already
using kzalloc [Alan]
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 202 ++++++++++++++++++
drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 18 ++
.../i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 15 ++
.../i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h | 6 +
5 files changed, 242 insertions(+)
create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 461d6b40656d..194aae92c354 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -254,6 +254,7 @@ i915-y += \
display/intel_frontbuffer.o \
display/intel_global_state.o \
display/intel_hdcp.o \
+ display/intel_hdcp_gsc.o \
display/intel_hotplug.o \
display/intel_hti.o \
display/intel_lpe_audio.o \
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
new file mode 100644
index 000000000000..ca7bfeeb1768
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
@@ -0,0 +1,202 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2023, Intel Corporation.
+ */
+
+#include "display/intel_hdcp_gsc.h"
+#include "gem/i915_gem_region.h"
+#include "gt/uc/intel_gsc_uc_heci_cmd_submit.h"
+#include "i915_drv.h"
+#include "i915_utils.h"
+
+struct intel_hdcp_gsc_message {
+ struct drm_i915_gem_object *obj;
+ struct i915_vma *vma;
+ void *hdcp_cmd;
+};
+
+/*This function helps allocate memory for the command that we will send to gsc cs */
+static int intel_initialize_hdcp_gsc_message(struct drm_i915_private *i915,
+ struct intel_hdcp_gsc_message *hdcp_message)
+{
+ struct intel_gt *gt = i915->media_gt;
+ struct drm_i915_gem_object *obj = NULL;
+ struct i915_vma *vma = NULL;
+ void *cmd;
+ int err;
+
+ /* allocate object of one page for HDCP command memory and store it */
+ obj = i915_gem_object_create_shmem(i915, PAGE_SIZE);
+
+ if (IS_ERR(obj)) {
+ drm_err(&i915->drm, "Failed to allocate HDCP streaming command!\n");
+ return PTR_ERR(obj);
+ }
+
+ cmd = i915_gem_object_pin_map_unlocked(obj, i915_coherent_map_type(i915, obj, true));
+ if (IS_ERR(cmd)) {
+ drm_err(&i915->drm, "Failed to map gsc message page!\n");
+ err = PTR_ERR(cmd);
+ goto out_unpin;
+ }
+
+ vma = i915_vma_instance(obj, >->ggtt->vm, NULL);
+ if (IS_ERR(vma)) {
+ err = PTR_ERR(vma);
+ goto out_unmap;
+ }
+
+ err = i915_vma_pin(vma, 0, 0, PIN_GLOBAL);
+ if (err)
+ goto out_unmap;
+
+ memset(cmd, 0, obj->base.size);
+
+ hdcp_message->obj = obj;
+ hdcp_message->hdcp_cmd = cmd;
+ hdcp_message->vma = vma;
+
+ return 0;
+
+out_unmap:
+ i915_gem_object_unpin_map(obj);
+out_unpin:
+ i915_gem_object_put(obj);
+ return err;
+}
+
+static void intel_free_hdcp_gsc_message(struct intel_hdcp_gsc_message *hdcp_message)
+{
+ struct drm_i915_gem_object *obj = fetch_and_zero(&hdcp_message->obj);
+
+ if (!obj)
+ return;
+
+ if (hdcp_message->vma)
+ i915_vma_unpin(fetch_and_zero(&hdcp_message->vma));
+
+ i915_gem_object_unpin_map(obj);
+ i915_gem_object_put(obj);
+ kfree(hdcp_message);
+}
+
+static int intel_gsc_send_sync(struct drm_i915_private *i915,
+ struct intel_gsc_mtl_header *header, u64 addr,
+ size_t msg_out_len)
+{
+ struct intel_gt *gt = i915->media_gt;
+ int ret;
+
+ header->flags = 0;
+ ret = intel_gsc_uc_heci_cmd_submit_packet(>->uc.gsc, addr,
+ header->message_size,
+ addr,
+ msg_out_len + sizeof(*header));
+ if (ret) {
+ drm_err(&i915->drm, "failed to send gsc HDCP msg (%d)\n", ret);
+ return ret;
+ }
+ /*
+ * Checking validity marker for memory sanity
+ */
+ if (header->validity_marker != GSC_HECI_VALIDITY_MARKER) {
+ drm_err(&i915->drm, "invalid validity marker\n");
+ return -EINVAL;
+ }
+
+ if (header->status != 0) {
+ drm_err(&i915->drm, "header status indicates error %d\n",
+ header->status);
+ return -EINVAL;
+ }
+
+ if (header->flags & INTEL_GSC_MSG_PENDING)
+ return -EAGAIN;
+
+ return 0;
+}
+
+/*
+ * This function can now be used for sending requests and will also handle
+ * receipt of reply messages hence no different function of message retrieval
+ * is required. We will initialize intel_hdcp_gsc_message structure then add
+ * gsc cs memory header as stated in specs after which the normal HDCP payload
+ * will follow
+ */
+ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
+ size_t msg_in_len, u8 *msg_out, size_t msg_out_len)
+{
+ struct intel_gt *gt = i915->media_gt;
+ struct intel_gsc_mtl_header *header;
+ const size_t max_msg_size = PAGE_SIZE - sizeof(*header);
+ struct intel_hdcp_gsc_message *hdcp_message;
+ u64 addr, host_session_id;
+ u32 reply_size, msg_size;
+ int ret, tries = 0;
+
+ if (!intel_uc_uses_gsc_uc(>->uc))
+ return -ENODEV;
+
+ if (msg_in_len > max_msg_size || msg_out_len > max_msg_size)
+ return -ENOSPC;
+
+ hdcp_message = kzalloc(sizeof(*hdcp_message), GFP_KERNEL);
+
+ if (!hdcp_message)
+ return -ENOMEM;
+
+ ret = intel_initialize_hdcp_gsc_message(i915, hdcp_message);
+
+ if (ret) {
+ drm_err(&i915->drm,
+ "Could not initialize hdcp_message\n");
+ goto err;
+ }
+
+ header = hdcp_message->hdcp_cmd;
+ addr = i915_ggtt_offset(hdcp_message->vma);
+
+ memset(header, 0, sizeof(*header));
+ msg_size = msg_in_len + sizeof(*header);
+ get_random_bytes(&host_session_id, sizeof(u64));
+ intel_gsc_uc_heci_cmd_emit_mtl_header(header, HECI_MEADDRESS_HDCP,
+ msg_size, host_session_id);
+ memcpy(hdcp_message->hdcp_cmd + sizeof(*header), msg_in, msg_in_len);
+
+ /*
+ * Keep sending request in case the pending bit is set no need to add
+ * message handle as we are using same address hence loc. of header is
+ * same and it will contain the message handle. we will send the message
+ * 20 times each message 50 ms apart
+ */
+ do {
+ ret = intel_gsc_send_sync(i915, header, addr, msg_out_len);
+
+ /* Only try again if gsc says so */
+ if (ret != -EAGAIN)
+ break;
+
+ msleep(50);
+
+ } while (++tries < 20);
+
+ if (ret)
+ goto err;
+
+ /* we use the same mem for the reply, so header is in the same loc */
+ reply_size = header->message_size - sizeof(*header);
+ if (reply_size > msg_out_len) {
+ drm_warn(&i915->drm, "caller with insufficient HDCP reply size %u (%d)\n",
+ reply_size, (u32)msg_out_len);
+ reply_size = msg_out_len;
+ } else if (reply_size != msg_out_len) {
+ drm_dbg_kms(&i915->drm, "caller unexpected HCDP reply size %u (%d)\n",
+ reply_size, (u32)msg_out_len);
+ }
+
+ memcpy(msg_out, hdcp_message->hdcp_cmd + sizeof(*header), msg_out_len);
+
+err:
+ intel_free_hdcp_gsc_message(hdcp_message);
+ return ret;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
new file mode 100644
index 000000000000..582f4992be76
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef __INTEL_HDCP_GSC_H__
+#define __INTEL_HDCP_GSC_H__
+
+#include <linux/types.h>
+#include <linux/err.h>
+
+struct drm_i915_private;
+
+ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
+ size_t msg_in_len, u8 *msg_out,
+ size_t msg_out_len);
+
+#endif /* __INTEL_HDCP_GCS_H__ */
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
index be2424af521d..ea0da06e2f39 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
@@ -92,3 +92,18 @@ int intel_gsc_uc_heci_cmd_submit_packet(struct intel_gsc_uc *gsc, u64 addr_in,
return err;
}
+
+void intel_gsc_uc_heci_cmd_emit_mtl_header(struct intel_gsc_mtl_header *header,
+ u8 heci_client_id, u32 message_size,
+ u64 host_session_id)
+{
+ host_session_id &= ~HOST_SESSION_MASK;
+ if (heci_client_id == HECI_MEADDRESS_PXP)
+ host_session_id |= HOST_SESSION_PXP_SINGLE;
+
+ header->validity_marker = GSC_HECI_VALIDITY_MARKER;
+ header->heci_client_id = heci_client_id;
+ header->host_session_handle = host_session_id;
+ header->header_version = MTL_GSC_HEADER_VERSION;
+ header->message_size = message_size;
+}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
index cf610dfca7a5..78fe04f911b9 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
@@ -23,6 +23,8 @@ struct intel_gsc_mtl_header {
#define MTL_GSC_HEADER_VERSION 1
u64 host_session_handle;
+#define HOST_SESSION_MASK REG_GENMASK64(63, 60)
+#define HOST_SESSION_PXP_SINGLE BIT_ULL(60)
u64 gsc_message_handle;
u32 message_size; /* lower 20 bits only, upper 12 are reserved */
@@ -35,6 +37,7 @@ struct intel_gsc_mtl_header {
* Bits 16-31: Extension Size
*/
u32 flags;
+#define INTEL_GSC_MSG_PENDING 1
u32 status;
} __packed;
@@ -42,4 +45,7 @@ struct intel_gsc_mtl_header {
int intel_gsc_uc_heci_cmd_submit_packet(struct intel_gsc_uc *gsc,
u64 addr_in, u32 size_in,
u64 addr_out, u32 size_out);
+void intel_gsc_uc_heci_cmd_emit_mtl_header(struct intel_gsc_mtl_header *header,
+ u8 heci_client_id, u32 message_size,
+ u64 host_session_id);
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Intel-gfx] [PATCH v7 6/6] drm/i915/mtl: Add HDCP GSC interface
2023-01-10 10:57 [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS Suraj Kandpal
` (4 preceding siblings ...)
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 5/6] drm/i915/mtl: Add function to send command to GSC CS Suraj Kandpal
@ 2023-01-10 10:57 ` Suraj Kandpal
2023-01-20 10:09 ` Nautiyal, Ankit K
2023-01-10 12:03 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Enable HDCP2.x via GSC CS (rev7) Patchwork
` (2 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Suraj Kandpal @ 2023-01-10 10:57 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Rodrigo Vivi, Tomas Winkler
MTL uses GSC command streamer i.e gsc cs to send HDCP/PXP commands
to GSC f/w. It requires to keep hdcp display driver
agnostic to content protection f/w (ME/GSC fw) in the form of
i915_hdcp_fw_ops generic ops.
Adding HDCP GSC CS interface by leveraging the i915_hdcp_fw_ops generic
ops instead of I915_HDCP_COMPONENT as integral part of i915.
Adding checks to see if GSC is loaded and proxy is setup
--v6
-dont change the license date in same patch series [Jani]
-fix the license year {Jani]
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
drivers/gpu/drm/i915/display/intel_hdcp.c | 28 +-
drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 631 +++++++++++++++++-
drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 3 +
3 files changed, 655 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 0d6aed1eb171..0824c186a31f 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -25,6 +25,8 @@
#include "intel_hdcp.h"
#include "intel_hdcp_regs.h"
#include "intel_pcode.h"
+#include "intel_connector.h"
+#include "intel_hdcp_gsc.h"
#define KEY_LOAD_TRIES 5
#define HDCP2_LC_RETRY_CNT 3
@@ -203,13 +205,20 @@ bool intel_hdcp2_capable(struct intel_connector *connector)
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
struct intel_hdcp *hdcp = &connector->hdcp;
+ struct intel_gt *gt = dev_priv->media_gt;
+ struct intel_gsc_uc *gsc = >->uc.gsc;
bool capable = false;
/* I915 support for HDCP2.2 */
if (!hdcp->hdcp2_supported)
return false;
- /* MEI interface is solid */
+ /* If MTL+ make sure gsc is loaded and proxy is setup */
+ if (DISPLAY_VER(dev_priv) >= 14)
+ if (!intel_uc_fw_is_running(&gsc->fw))
+ return false;
+
+ /* MEI/GSC interface is solid depending on which is used */
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
if (!dev_priv->display.hdcp.comp_added || !dev_priv->display.hdcp.master) {
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
@@ -2235,7 +2244,7 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,
static bool is_hdcp2_supported(struct drm_i915_private *dev_priv)
{
- if (!IS_ENABLED(CONFIG_INTEL_MEI_HDCP))
+ if (intel_hdcp_gsc_cs_required(dev_priv) && !IS_ENABLED(CONFIG_INTEL_MEI_HDCP))
return false;
return (DISPLAY_VER(dev_priv) >= 10 ||
@@ -2256,10 +2265,14 @@ void intel_hdcp_component_init(struct drm_i915_private *dev_priv)
dev_priv->display.hdcp.comp_added = true;
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
- ret = component_add_typed(dev_priv->drm.dev, &i915_hdcp_ops,
- I915_COMPONENT_HDCP);
+ if (intel_hdcp_gsc_cs_required(dev_priv))
+ ret = intel_hdcp_gsc_init(dev_priv);
+ else
+ ret = component_add_typed(dev_priv->drm.dev, &i915_hdcp_ops,
+ I915_COMPONENT_HDCP);
+
if (ret < 0) {
- drm_dbg_kms(&dev_priv->drm, "Failed at component add(%d)\n",
+ drm_dbg_kms(&dev_priv->drm, "Failed at fw component add(%d)\n",
ret);
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
dev_priv->display.hdcp.comp_added = false;
@@ -2486,7 +2499,10 @@ void intel_hdcp_component_fini(struct drm_i915_private *dev_priv)
dev_priv->display.hdcp.comp_added = false;
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
- component_del(dev_priv->drm.dev, &i915_hdcp_ops);
+ if (intel_hdcp_gsc_cs_required(dev_priv))
+ intel_hdcp_gsc_fini(dev_priv);
+ else
+ component_del(dev_priv->drm.dev, &i915_hdcp_ops);
}
void intel_hdcp_cleanup(struct intel_connector *connector)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
index ca7bfeeb1768..838417e08610 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
@@ -3,6 +3,8 @@
* Copyright 2023, Intel Corporation.
*/
+#include <drm/i915_hdcp_interface.h>
+
#include "display/intel_hdcp_gsc.h"
#include "gem/i915_gem_region.h"
#include "gt/uc/intel_gsc_uc_heci_cmd_submit.h"
@@ -15,6 +17,632 @@ struct intel_hdcp_gsc_message {
void *hdcp_cmd;
};
+bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915)
+{
+ if (DISPLAY_VER(i915) >= 14)
+ return true;
+ return false;
+}
+
+static int
+gsc_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
+ struct hdcp2_ake_init *ake_data)
+{
+ struct wired_cmd_initiate_hdcp2_session_in session_init_in = { { 0 } };
+ struct wired_cmd_initiate_hdcp2_session_out
+ session_init_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+
+ if (!dev || !data || !ake_data)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ session_init_in.header.api_version = HDCP_API_VERSION;
+ session_init_in.header.command_id = WIRED_INITIATE_HDCP2_SESSION;
+ session_init_in.header.status = FW_HDCP_STATUS_SUCCESS;
+ session_init_in.header.buffer_len =
+ WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN;
+
+ session_init_in.port.integrated_port_type = data->port_type;
+ session_init_in.port.physical_port = (u8)data->hdcp_ddi;
+ session_init_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
+ session_init_in.protocol = data->protocol;
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&session_init_in,
+ sizeof(session_init_in),
+ (u8 *)&session_init_out,
+ sizeof(session_init_out));
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
+ return byte;
+ }
+
+ if (session_init_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "FW cmd 0x%08X Failed. Status: 0x%X\n",
+ WIRED_INITIATE_HDCP2_SESSION,
+ session_init_out.header.status);
+ return -EIO;
+ }
+
+ ake_data->msg_id = HDCP_2_2_AKE_INIT;
+ ake_data->tx_caps = session_init_out.tx_caps;
+ memcpy(ake_data->r_tx, session_init_out.r_tx, HDCP_2_2_RTX_LEN);
+
+ return 0;
+}
+
+static int
+gsc_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
+ struct hdcp_port_data *data,
+ struct hdcp2_ake_send_cert *rx_cert,
+ bool *km_stored,
+ struct hdcp2_ake_no_stored_km
+ *ek_pub_km,
+ size_t *msg_sz)
+{
+ struct wired_cmd_verify_receiver_cert_in verify_rxcert_in = { { 0 } };
+ struct wired_cmd_verify_receiver_cert_out verify_rxcert_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+
+ if (!dev || !data || !rx_cert || !km_stored || !ek_pub_km || !msg_sz)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ verify_rxcert_in.header.api_version = HDCP_API_VERSION;
+ verify_rxcert_in.header.command_id = WIRED_VERIFY_RECEIVER_CERT;
+ verify_rxcert_in.header.status = FW_HDCP_STATUS_SUCCESS;
+ verify_rxcert_in.header.buffer_len =
+ WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN;
+
+ verify_rxcert_in.port.integrated_port_type = data->port_type;
+ verify_rxcert_in.port.physical_port = (u8)data->hdcp_ddi;
+ verify_rxcert_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
+
+ verify_rxcert_in.cert_rx = rx_cert->cert_rx;
+ memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN);
+ memcpy(verify_rxcert_in.rx_caps, rx_cert->rx_caps, HDCP_2_2_RXCAPS_LEN);
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&verify_rxcert_in,
+ sizeof(verify_rxcert_in),
+ (u8 *)&verify_rxcert_out,
+ sizeof(verify_rxcert_out));
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed: %zd\n", byte);
+ return byte;
+ }
+
+ if (verify_rxcert_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "FW cmd 0x%08X Failed. Status: 0x%X\n",
+ WIRED_VERIFY_RECEIVER_CERT,
+ verify_rxcert_out.header.status);
+ return -EIO;
+ }
+
+ *km_stored = !!verify_rxcert_out.km_stored;
+ if (verify_rxcert_out.km_stored) {
+ ek_pub_km->msg_id = HDCP_2_2_AKE_STORED_KM;
+ *msg_sz = sizeof(struct hdcp2_ake_stored_km);
+ } else {
+ ek_pub_km->msg_id = HDCP_2_2_AKE_NO_STORED_KM;
+ *msg_sz = sizeof(struct hdcp2_ake_no_stored_km);
+ }
+
+ memcpy(ek_pub_km->e_kpub_km, &verify_rxcert_out.ekm_buff,
+ sizeof(verify_rxcert_out.ekm_buff));
+
+ return 0;
+}
+
+static int
+gsc_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
+ struct hdcp2_ake_send_hprime *rx_hprime)
+{
+ struct wired_cmd_ake_send_hprime_in send_hprime_in = { { 0 } };
+ struct wired_cmd_ake_send_hprime_out send_hprime_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+
+ if (!dev || !data || !rx_hprime)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ send_hprime_in.header.api_version = HDCP_API_VERSION;
+ send_hprime_in.header.command_id = WIRED_AKE_SEND_HPRIME;
+ send_hprime_in.header.status = FW_HDCP_STATUS_SUCCESS;
+ send_hprime_in.header.buffer_len = WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN;
+
+ send_hprime_in.port.integrated_port_type = data->port_type;
+ send_hprime_in.port.physical_port = (u8)data->hdcp_ddi;
+ send_hprime_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&send_hprime_in,
+ sizeof(send_hprime_in),
+ (u8 *)&send_hprime_out,
+ sizeof(send_hprime_out));
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
+ return byte;
+ }
+
+ if (send_hprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "FW cmd 0x%08X Failed. Status: 0x%X\n",
+ WIRED_AKE_SEND_HPRIME, send_hprime_out.header.status);
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static int
+gsc_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
+ struct hdcp2_ake_send_pairing_info *pairing_info)
+{
+ struct wired_cmd_ake_send_pairing_info_in pairing_info_in = { { 0 } };
+ struct wired_cmd_ake_send_pairing_info_out pairing_info_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+
+ if (!dev || !data || !pairing_info)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ pairing_info_in.header.api_version = HDCP_API_VERSION;
+ pairing_info_in.header.command_id = WIRED_AKE_SEND_PAIRING_INFO;
+ pairing_info_in.header.status = FW_HDCP_STATUS_SUCCESS;
+ pairing_info_in.header.buffer_len =
+ WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN;
+
+ pairing_info_in.port.integrated_port_type = data->port_type;
+ pairing_info_in.port.physical_port = (u8)data->hdcp_ddi;
+ pairing_info_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
+
+ memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
+ HDCP_2_2_E_KH_KM_LEN);
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&pairing_info_in,
+ sizeof(pairing_info_in),
+ (u8 *)&pairing_info_out,
+ sizeof(pairing_info_out));
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
+ return byte;
+ }
+
+ if (pairing_info_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. Status: 0x%X\n",
+ WIRED_AKE_SEND_PAIRING_INFO,
+ pairing_info_out.header.status);
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static int
+gsc_hdcp_initiate_locality_check(struct device *dev,
+ struct hdcp_port_data *data,
+ struct hdcp2_lc_init *lc_init_data)
+{
+ struct wired_cmd_init_locality_check_in lc_init_in = { { 0 } };
+ struct wired_cmd_init_locality_check_out lc_init_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+
+ if (!dev || !data || !lc_init_data)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ lc_init_in.header.api_version = HDCP_API_VERSION;
+ lc_init_in.header.command_id = WIRED_INIT_LOCALITY_CHECK;
+ lc_init_in.header.status = FW_HDCP_STATUS_SUCCESS;
+ lc_init_in.header.buffer_len = WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN;
+
+ lc_init_in.port.integrated_port_type = data->port_type;
+ lc_init_in.port.physical_port = (u8)data->hdcp_ddi;
+ lc_init_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&lc_init_in, sizeof(lc_init_in),
+ (u8 *)&lc_init_out, sizeof(lc_init_out));
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
+ return byte;
+ }
+
+ if (lc_init_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "FW cmd 0x%08X Failed. status: 0x%X\n",
+ WIRED_INIT_LOCALITY_CHECK, lc_init_out.header.status);
+ return -EIO;
+ }
+
+ lc_init_data->msg_id = HDCP_2_2_LC_INIT;
+ memcpy(lc_init_data->r_n, lc_init_out.r_n, HDCP_2_2_RN_LEN);
+
+ return 0;
+}
+
+static int
+gsc_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
+ struct hdcp2_lc_send_lprime *rx_lprime)
+{
+ struct wired_cmd_validate_locality_in verify_lprime_in = { { 0 } };
+ struct wired_cmd_validate_locality_out verify_lprime_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+
+ if (!dev || !data || !rx_lprime)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ verify_lprime_in.header.api_version = HDCP_API_VERSION;
+ verify_lprime_in.header.command_id = WIRED_VALIDATE_LOCALITY;
+ verify_lprime_in.header.status = FW_HDCP_STATUS_SUCCESS;
+ verify_lprime_in.header.buffer_len =
+ WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN;
+
+ verify_lprime_in.port.integrated_port_type = data->port_type;
+ verify_lprime_in.port.physical_port = (u8)data->hdcp_ddi;
+ verify_lprime_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
+
+ memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,
+ HDCP_2_2_L_PRIME_LEN);
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&verify_lprime_in,
+ sizeof(verify_lprime_in),
+ (u8 *)&verify_lprime_out,
+ sizeof(verify_lprime_out));
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
+ return byte;
+ }
+
+ if (verify_lprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. status: 0x%X\n",
+ WIRED_VALIDATE_LOCALITY,
+ verify_lprime_out.header.status);
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static int gsc_hdcp_get_session_key(struct device *dev,
+ struct hdcp_port_data *data,
+ struct hdcp2_ske_send_eks *ske_data)
+{
+ struct wired_cmd_get_session_key_in get_skey_in = { { 0 } };
+ struct wired_cmd_get_session_key_out get_skey_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+
+ if (!dev || !data || !ske_data)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ get_skey_in.header.api_version = HDCP_API_VERSION;
+ get_skey_in.header.command_id = WIRED_GET_SESSION_KEY;
+ get_skey_in.header.status = FW_HDCP_STATUS_SUCCESS;
+ get_skey_in.header.buffer_len = WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN;
+
+ get_skey_in.port.integrated_port_type = data->port_type;
+ get_skey_in.port.physical_port = (u8)data->hdcp_ddi;
+ get_skey_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&get_skey_in, sizeof(get_skey_in),
+ (u8 *)&get_skey_out, sizeof(get_skey_out));
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
+ return byte;
+ }
+
+ if (get_skey_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. status: 0x%X\n",
+ WIRED_GET_SESSION_KEY, get_skey_out.header.status);
+ return -EIO;
+ }
+
+ ske_data->msg_id = HDCP_2_2_SKE_SEND_EKS;
+ memcpy(ske_data->e_dkey_ks, get_skey_out.e_dkey_ks,
+ HDCP_2_2_E_DKEY_KS_LEN);
+ memcpy(ske_data->riv, get_skey_out.r_iv, HDCP_2_2_RIV_LEN);
+
+ return 0;
+}
+
+static int
+gsc_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
+ struct hdcp_port_data *data,
+ struct hdcp2_rep_send_receiverid_list
+ *rep_topology,
+ struct hdcp2_rep_send_ack
+ *rep_send_ack)
+{
+ struct wired_cmd_verify_repeater_in verify_repeater_in = { { 0 } };
+ struct wired_cmd_verify_repeater_out verify_repeater_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+
+ if (!dev || !rep_topology || !rep_send_ack || !data)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ verify_repeater_in.header.api_version = HDCP_API_VERSION;
+ verify_repeater_in.header.command_id = WIRED_VERIFY_REPEATER;
+ verify_repeater_in.header.status = FW_HDCP_STATUS_SUCCESS;
+ verify_repeater_in.header.buffer_len =
+ WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN;
+
+ verify_repeater_in.port.integrated_port_type = data->port_type;
+ verify_repeater_in.port.physical_port = (u8)data->hdcp_ddi;
+ verify_repeater_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
+
+ memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,
+ HDCP_2_2_RXINFO_LEN);
+ memcpy(verify_repeater_in.seq_num_v, rep_topology->seq_num_v,
+ HDCP_2_2_SEQ_NUM_LEN);
+ memcpy(verify_repeater_in.v_prime, rep_topology->v_prime,
+ HDCP_2_2_V_PRIME_HALF_LEN);
+ memcpy(verify_repeater_in.receiver_ids, rep_topology->receiver_ids,
+ HDCP_2_2_RECEIVER_IDS_MAX_LEN);
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&verify_repeater_in,
+ sizeof(verify_repeater_in),
+ (u8 *)&verify_repeater_out,
+ sizeof(verify_repeater_out));
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
+ return byte;
+ }
+
+ if (verify_repeater_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. status: 0x%X\n",
+ WIRED_VERIFY_REPEATER,
+ verify_repeater_out.header.status);
+ return -EIO;
+ }
+
+ memcpy(rep_send_ack->v, verify_repeater_out.v,
+ HDCP_2_2_V_PRIME_HALF_LEN);
+ rep_send_ack->msg_id = HDCP_2_2_REP_SEND_ACK;
+
+ return 0;
+}
+
+static int gsc_hdcp_verify_mprime(struct device *dev,
+ struct hdcp_port_data *data,
+ struct hdcp2_rep_stream_ready *stream_ready)
+{
+ struct wired_cmd_repeater_auth_stream_req_in *verify_mprime_in;
+ struct wired_cmd_repeater_auth_stream_req_out
+ verify_mprime_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+ size_t cmd_size;
+
+ if (!dev || !stream_ready || !data)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ cmd_size = struct_size(verify_mprime_in, streams, data->k);
+ if (cmd_size == SIZE_MAX)
+ return -EINVAL;
+
+ verify_mprime_in = kzalloc(cmd_size, GFP_KERNEL);
+ if (!verify_mprime_in)
+ return -ENOMEM;
+
+ verify_mprime_in->header.api_version = HDCP_API_VERSION;
+ verify_mprime_in->header.command_id = WIRED_REPEATER_AUTH_STREAM_REQ;
+ verify_mprime_in->header.status = FW_HDCP_STATUS_SUCCESS;
+ verify_mprime_in->header.buffer_len = cmd_size - sizeof(verify_mprime_in->header);
+
+ verify_mprime_in->port.integrated_port_type = data->port_type;
+ verify_mprime_in->port.physical_port = (u8)data->hdcp_ddi;
+ verify_mprime_in->port.attached_transcoder = (u8)data->hdcp_transcoder;
+
+ memcpy(verify_mprime_in->m_prime, stream_ready->m_prime, HDCP_2_2_MPRIME_LEN);
+ drm_hdcp_cpu_to_be24(verify_mprime_in->seq_num_m, data->seq_num_m);
+
+ memcpy(verify_mprime_in->streams, data->streams,
+ array_size(data->k, sizeof(*data->streams)));
+
+ verify_mprime_in->k = cpu_to_be16(data->k);
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)verify_mprime_in, cmd_size,
+ (u8 *)&verify_mprime_out,
+ sizeof(verify_mprime_out));
+ kfree(verify_mprime_in);
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
+ return byte;
+ }
+
+ if (verify_mprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. status: 0x%X\n",
+ WIRED_REPEATER_AUTH_STREAM_REQ,
+ verify_mprime_out.header.status);
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static int gsc_hdcp_enable_authentication(struct device *dev,
+ struct hdcp_port_data *data)
+{
+ struct wired_cmd_enable_auth_in enable_auth_in = { { 0 } };
+ struct wired_cmd_enable_auth_out enable_auth_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+
+ if (!dev || !data)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ enable_auth_in.header.api_version = HDCP_API_VERSION;
+ enable_auth_in.header.command_id = WIRED_ENABLE_AUTH;
+ enable_auth_in.header.status = FW_HDCP_STATUS_SUCCESS;
+ enable_auth_in.header.buffer_len = WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN;
+
+ enable_auth_in.port.integrated_port_type = data->port_type;
+ enable_auth_in.port.physical_port = (u8)data->hdcp_ddi;
+ enable_auth_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
+ enable_auth_in.stream_type = data->streams[0].stream_type;
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&enable_auth_in,
+ sizeof(enable_auth_in),
+ (u8 *)&enable_auth_out,
+ sizeof(enable_auth_out));
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
+ return byte;
+ }
+
+ if (enable_auth_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. status: 0x%X\n",
+ WIRED_ENABLE_AUTH, enable_auth_out.header.status);
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static int
+gsc_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
+{
+ struct wired_cmd_close_session_in session_close_in = { { 0 } };
+ struct wired_cmd_close_session_out session_close_out = { { 0 } };
+ struct drm_i915_private *i915;
+ ssize_t byte;
+
+ if (!dev || !data)
+ return -EINVAL;
+
+ i915 = kdev_to_i915(dev);
+ if (!i915) {
+ dev_err(dev, "DRM not initialized, aborting HDCP.\n");
+ return -ENODEV;
+ }
+
+ session_close_in.header.api_version = HDCP_API_VERSION;
+ session_close_in.header.command_id = WIRED_CLOSE_SESSION;
+ session_close_in.header.status = FW_HDCP_STATUS_SUCCESS;
+ session_close_in.header.buffer_len =
+ WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN;
+
+ session_close_in.port.integrated_port_type = data->port_type;
+ session_close_in.port.physical_port = (u8)data->hdcp_ddi;
+ session_close_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
+
+ byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&session_close_in,
+ sizeof(session_close_in),
+ (u8 *)&session_close_out,
+ sizeof(session_close_out));
+ if (byte < 0) {
+ drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
+ return byte;
+ }
+
+ if (session_close_out.header.status != FW_HDCP_STATUS_SUCCESS) {
+ drm_dbg_kms(&i915->drm, "Session Close Failed. status: 0x%X\n",
+ session_close_out.header.status);
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static const struct i915_hdcp_ops gsc_hdcp_ops = {
+ .initiate_hdcp2_session = gsc_hdcp_initiate_session,
+ .verify_receiver_cert_prepare_km =
+ gsc_hdcp_verify_receiver_cert_prepare_km,
+ .verify_hprime = gsc_hdcp_verify_hprime,
+ .store_pairing_info = gsc_hdcp_store_pairing_info,
+ .initiate_locality_check = gsc_hdcp_initiate_locality_check,
+ .verify_lprime = gsc_hdcp_verify_lprime,
+ .get_session_key = gsc_hdcp_get_session_key,
+ .repeater_check_flow_prepare_ack =
+ gsc_hdcp_repeater_check_flow_prepare_ack,
+ .verify_mprime = gsc_hdcp_verify_mprime,
+ .enable_hdcp_authentication = gsc_hdcp_enable_authentication,
+ .close_hdcp_session = gsc_hdcp_close_session,
+};
+
+int intel_hdcp_gsc_init(struct drm_i915_private *i915)
+{
+ struct i915_hdcp_master *data;
+
+ data = kzalloc(sizeof(struct i915_hdcp_master), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ mutex_lock(&i915->display.hdcp.comp_mutex);
+ i915->display.hdcp.master = data;
+ i915->display.hdcp.master->hdcp_dev = i915->drm.dev;
+ i915->display.hdcp.master->ops = &gsc_hdcp_ops;
+ mutex_unlock(&i915->display.hdcp.comp_mutex);
+
+ return 0;
+}
+
+int intel_hdcp_gsc_fini(struct drm_i915_private *i915)
+{
+ /* TODO: decrease GSC f/w reference count. */
+ kfree(i915->display.hdcp.master);
+ return 0;
+}
+
/*This function helps allocate memory for the command that we will send to gsc cs */
static int intel_initialize_hdcp_gsc_message(struct drm_i915_private *i915,
struct intel_hdcp_gsc_message *hdcp_message)
@@ -124,7 +752,8 @@ static int intel_gsc_send_sync(struct drm_i915_private *i915,
* will follow
*/
ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
- size_t msg_in_len, u8 *msg_out, size_t msg_out_len)
+ size_t msg_in_len, u8 *msg_out,
+ size_t msg_out_len)
{
struct intel_gt *gt = i915->media_gt;
struct intel_gsc_mtl_header *header;
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
index 582f4992be76..069a3b227a83 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
@@ -11,8 +11,11 @@
struct drm_i915_private;
+bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915);
ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
size_t msg_in_len, u8 *msg_out,
size_t msg_out_len);
+int intel_hdcp_gsc_init(struct drm_i915_private *i915);
+int intel_hdcp_gsc_fini(struct drm_i915_private *i915);
#endif /* __INTEL_HDCP_GCS_H__ */
--
2.25.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Enable HDCP2.x via GSC CS (rev7)
2023-01-10 10:57 [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS Suraj Kandpal
` (5 preceding siblings ...)
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 6/6] drm/i915/mtl: Add HDCP GSC interface Suraj Kandpal
@ 2023-01-10 12:03 ` Patchwork
2023-01-10 12:20 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-01-10 16:17 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
8 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2023-01-10 12:03 UTC (permalink / raw)
To: Suraj Kandpal; +Cc: intel-gfx
== Series Details ==
Series: Enable HDCP2.x via GSC CS (rev7)
URL : https://patchwork.freedesktop.org/series/111876/
State : warning
== Summary ==
Error: dim checkpatch failed
022d1c517e43 drm/i915/gsc: Create GSC request submission mechanism
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:57: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#57:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 159 lines checked
7e22230a1f49 drm/i915/hdcp: Keep hdcp agonstic naming convention
-:540: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#540:
rename from include/drm/i915_mei_hdcp_interface.h
total: 0 errors, 1 warnings, 0 checks, 590 lines checked
5b2b6ae1270e i915/hdcp: HDCP2.x Refactoring to agnostic hdcp
b1e632c2d197 drm/i915/hdcp: Refactor HDCP API structures
05f62eacacd3 drm/i915/mtl: Add function to send command to GSC CS
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:44: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#44:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 267 lines checked
7a6299842317 drm/i915/mtl: Add HDCP GSC interface
-:724: CHECK:ALLOC_SIZEOF_STRUCT: Prefer kzalloc(sizeof(*data)...) over kzalloc(sizeof(struct i915_hdcp_master)...)
#724: FILE: drivers/gpu/drm/i915/display/intel_hdcp_gsc.c:626:
+ data = kzalloc(sizeof(struct i915_hdcp_master), GFP_KERNEL);
total: 0 errors, 0 warnings, 1 checks, 725 lines checked
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for Enable HDCP2.x via GSC CS (rev7)
2023-01-10 10:57 [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS Suraj Kandpal
` (6 preceding siblings ...)
2023-01-10 12:03 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Enable HDCP2.x via GSC CS (rev7) Patchwork
@ 2023-01-10 12:20 ` Patchwork
2023-01-10 16:17 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
8 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2023-01-10 12:20 UTC (permalink / raw)
To: Suraj Kandpal; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 3401 bytes --]
== Series Details ==
Series: Enable HDCP2.x via GSC CS (rev7)
URL : https://patchwork.freedesktop.org/series/111876/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12565 -> Patchwork_111876v7
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/index.html
Participating hosts (41 -> 37)
------------------------------
Missing (4): fi-bsw-kefka bat-rpls-2 fi-rkl-11600 fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_111876v7 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [PASS][1] -> [INCOMPLETE][2] ([i915#6972])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/fi-bsw-nick/igt@i915_selftest@live@execlists.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/fi-bsw-nick/igt@i915_selftest@live@execlists.html
* igt@runner@aborted:
- fi-bsw-nick: NOTRUN -> [FAIL][3] ([fdo#109271] / [i915#4312])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/fi-bsw-nick/igt@runner@aborted.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-adln-1}: [DMESG-WARN][4] ([i915#2867]) -> [PASS][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/bat-adln-1/igt@gem_exec_suspend@basic-s0@smem.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/bat-adln-1/igt@gem_exec_suspend@basic-s0@smem.html
* igt@i915_selftest@live@mman:
- fi-rkl-guc: [TIMEOUT][6] ([i915#6794]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/fi-rkl-guc/igt@i915_selftest@live@mman.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/fi-rkl-guc/igt@i915_selftest@live@mman.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#6972]: https://gitlab.freedesktop.org/drm/intel/issues/6972
Build changes
-------------
* Linux: CI_DRM_12565 -> Patchwork_111876v7
CI-20190529: 20190529
CI_DRM_12565: 1617f7f4ff6b95ef03d4228bf9f757a6c6488c91 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7114: 2fd839599a200c089a5c9dbf5048609faf9b8104 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_111876v7: 1617f7f4ff6b95ef03d4228bf9f757a6c6488c91 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
02333c7bcc72 drm/i915/mtl: Add HDCP GSC interface
7ae16f92e896 drm/i915/mtl: Add function to send command to GSC CS
63e8481a8af7 drm/i915/hdcp: Refactor HDCP API structures
2316ba5ac066 i915/hdcp: HDCP2.x Refactoring to agnostic hdcp
b10f954c10e2 drm/i915/hdcp: Keep hdcp agonstic naming convention
8403ea5b3795 drm/i915/gsc: Create GSC request submission mechanism
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/index.html
[-- Attachment #2: Type: text/html, Size: 4065 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for Enable HDCP2.x via GSC CS (rev7)
2023-01-10 10:57 [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS Suraj Kandpal
` (7 preceding siblings ...)
2023-01-10 12:20 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2023-01-10 16:17 ` Patchwork
8 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2023-01-10 16:17 UTC (permalink / raw)
To: Suraj Kandpal; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 22919 bytes --]
== Series Details ==
Series: Enable HDCP2.x via GSC CS (rev7)
URL : https://patchwork.freedesktop.org/series/111876/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12565_full -> Patchwork_111876v7_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/index.html
Participating hosts (13 -> 11)
------------------------------
Additional (1): shard-rkl0
Missing (3): pig-skl-6260u pig-kbl-iris pig-glk-j5005
Known issues
------------
Here are the changes found in Patchwork_111876v7_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#2846])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-glk2/igt@gem_exec_fair@basic-deadline.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-glk3/igt@gem_exec_fair@basic-deadline.html
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#2842])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-glk8/igt@gem_exec_fair@basic-pace@vecs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-glk5/igt@gem_exec_fair@basic-pace@vecs0.html
* igt@gem_lmem_swapping@heavy-verify-random-ccs:
- shard-glk: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-glk2/igt@gem_lmem_swapping@heavy-verify-random-ccs.html
* igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#3886]) +2 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-glk2/igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_gen12_mc_ccs.html
* igt@kms_flip@plain-flip-ts-check-interruptible@a-hdmi-a1:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#2122])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-glk4/igt@kms_flip@plain-flip-ts-check-interruptible@a-hdmi-a1.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-glk2/igt@kms_flip@plain-flip-ts-check-interruptible@a-hdmi-a1.html
* igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-5@pipe-c-hdmi-a-1:
- shard-glk: NOTRUN -> [SKIP][9] ([fdo#109271]) +27 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-glk2/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-5@pipe-c-hdmi-a-1.html
* igt@sysfs_clients@fair-3:
- shard-glk: NOTRUN -> [SKIP][10] ([fdo#109271] / [i915#2994])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-glk2/igt@sysfs_clients@fair-3.html
#### Possible fixes ####
* igt@drm_fdinfo@most-busy-idle-check-all@rcs0:
- {shard-rkl}: [FAIL][11] ([i915#7742]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-4/igt@drm_fdinfo@most-busy-idle-check-all@rcs0.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-1/igt@drm_fdinfo@most-busy-idle-check-all@rcs0.html
* igt@feature_discovery@psr2:
- {shard-rkl}: [SKIP][13] ([i915#658]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-1/igt@feature_discovery@psr2.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-6/igt@feature_discovery@psr2.html
* igt@gem_create@hog-create@smem0:
- {shard-rkl}: [FAIL][15] ([i915#7679]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-1/igt@gem_create@hog-create@smem0.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-5/igt@gem_create@hog-create@smem0.html
* igt@gem_ctx_persistence@hang:
- {shard-rkl}: [SKIP][17] ([i915#6252]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-5/igt@gem_ctx_persistence@hang.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-4/igt@gem_ctx_persistence@hang.html
* igt@gem_eio@kms:
- {shard-dg1}: [FAIL][19] ([i915#5784]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-dg1-18/igt@gem_eio@kms.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-dg1-12/igt@gem_eio@kms.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- {shard-rkl}: [FAIL][21] ([i915#2842]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-1/igt@gem_exec_fair@basic-pace-share@rcs0.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-4/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-glk: [FAIL][23] ([i915#2842]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-glk8/igt@gem_exec_fair@basic-pace@vcs0.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-glk5/igt@gem_exec_fair@basic-pace@vcs0.html
* igt@gem_exec_reloc@basic-write-read:
- {shard-rkl}: [SKIP][25] ([i915#3281]) -> [PASS][26] +6 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-2/igt@gem_exec_reloc@basic-write-read.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-5/igt@gem_exec_reloc@basic-write-read.html
* igt@gem_mmap_gtt@coherency:
- {shard-rkl}: [SKIP][27] ([fdo#111656]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-2/igt@gem_mmap_gtt@coherency.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-5/igt@gem_mmap_gtt@coherency.html
* igt@gem_pwrite@basic-self:
- {shard-rkl}: [SKIP][29] ([i915#3282]) -> [PASS][30] +4 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@gem_pwrite@basic-self.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-5/igt@gem_pwrite@basic-self.html
* igt@gen9_exec_parse@bb-chained:
- {shard-rkl}: [SKIP][31] ([i915#2527]) -> [PASS][32] +3 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-2/igt@gen9_exec_parse@bb-chained.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-5/igt@gen9_exec_parse@bb-chained.html
* igt@i915_pm_dc@dc9-dpms:
- {shard-rkl}: [SKIP][33] ([i915#3361]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-5/igt@i915_pm_dc@dc9-dpms.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-1/igt@i915_pm_dc@dc9-dpms.html
* igt@i915_pm_rc6_residency@rc6-idle@bcs0:
- {shard-dg1}: [FAIL][35] ([i915#3591]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-dg1-14/igt@i915_pm_rc6_residency@rc6-idle@bcs0.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-dg1-12/igt@i915_pm_rc6_residency@rc6-idle@bcs0.html
* igt@i915_pm_rpm@i2c:
- {shard-tglu}: [SKIP][37] ([i915#3547]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-tglu-6/igt@i915_pm_rpm@i2c.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-tglu-2/igt@i915_pm_rpm@i2c.html
* igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait:
- {shard-dg1}: [SKIP][39] ([i915#1397]) -> [PASS][40] +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-dg1-14/igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-dg1-16/igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait.html
* igt@i915_pm_sseu@full-enable:
- {shard-rkl}: [SKIP][41] ([i915#4387]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@i915_pm_sseu@full-enable.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-5/igt@i915_pm_sseu@full-enable.html
* igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_gen12_rc_ccs_cc:
- {shard-tglu}: [SKIP][43] ([i915#7651]) -> [PASS][44] +7 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-tglu-6/igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-tglu-2/igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-d-bad-aux-stride-y_tiled_gen12_rc_ccs_cc:
- {shard-tglu}: [SKIP][45] ([i915#1845] / [i915#7651]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-tglu-6/igt@kms_ccs@pipe-d-bad-aux-stride-y_tiled_gen12_rc_ccs_cc.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-tglu-2/igt@kms_ccs@pipe-d-bad-aux-stride-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions:
- shard-glk: [FAIL][47] ([i915#2346]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-glk2/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-glk9/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt:
- {shard-tglu}: [SKIP][49] ([i915#1849]) -> [PASS][50] +3 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-tglu-6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-tglu-2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-plflip-blt:
- {shard-rkl}: [SKIP][51] ([i915#1849] / [i915#4098]) -> [PASS][52] +7 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-plflip-blt.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-plflip-blt.html
* igt@kms_plane@pixel-format-source-clamping@pipe-b-planes:
- {shard-rkl}: [SKIP][53] ([i915#1849]) -> [PASS][54] +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@kms_plane@pixel-format-source-clamping@pipe-b-planes.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-6/igt@kms_plane@pixel-format-source-clamping@pipe-b-planes.html
* igt@kms_plane@pixel-format@pipe-b-planes:
- {shard-tglu}: [SKIP][55] ([i915#1849] / [i915#3558]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-tglu-6/igt@kms_plane@pixel-format@pipe-b-planes.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-tglu-2/igt@kms_plane@pixel-format@pipe-b-planes.html
* igt@kms_psr@sprite_mmap_gtt:
- {shard-rkl}: [SKIP][57] ([i915#1072]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@kms_psr@sprite_mmap_gtt.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-6/igt@kms_psr@sprite_mmap_gtt.html
* igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-b:
- {shard-rkl}: [SKIP][59] ([i915#4098]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-b.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-6/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-b.html
* igt@kms_universal_plane@universal-plane-pipe-a-sanity:
- {shard-rkl}: [SKIP][61] ([i915#1845] / [i915#4070] / [i915#4098]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-1/igt@kms_universal_plane@universal-plane-pipe-a-sanity.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-6/igt@kms_universal_plane@universal-plane-pipe-a-sanity.html
* igt@kms_vblank@pipe-a-ts-continuation-idle:
- {shard-rkl}: [SKIP][63] ([i915#1845] / [i915#4098]) -> [PASS][64] +16 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-rkl-3/igt@kms_vblank@pipe-a-ts-continuation-idle.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-rkl-6/igt@kms_vblank@pipe-a-ts-continuation-idle.html
* igt@perf@polling-small-buf:
- {shard-tglu}: [FAIL][65] ([i915#1722]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12565/shard-tglu-6/igt@perf@polling-small-buf.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/shard-tglu-2/igt@perf@polling-small-buf.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1722]: https://gitlab.freedesktop.org/drm/intel/issues/1722
[i915#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1850]: https://gitlab.freedesktop.org/drm/intel/issues/1850
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3547]: https://gitlab.freedesktop.org/drm/intel/issues/3547
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3825]: https://gitlab.freedesktop.org/drm/intel/issues/3825
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4877]: https://gitlab.freedesktop.org/drm/intel/issues/4877
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5327]: https://gitlab.freedesktop.org/drm/intel/issues/5327
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5723]: https://gitlab.freedesktop.org/drm/intel/issues/5723
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252
[i915#6259]: https://gitlab.freedesktop.org/drm/intel/issues/6259
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335
[i915#6344]: https://gitlab.freedesktop.org/drm/intel/issues/6344
[i915#6355]: https://gitlab.freedesktop.org/drm/intel/issues/6355
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7679]: https://gitlab.freedesktop.org/drm/intel/issues/7679
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
Build changes
-------------
* Linux: CI_DRM_12565 -> Patchwork_111876v7
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12565: 1617f7f4ff6b95ef03d4228bf9f757a6c6488c91 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7114: 2fd839599a200c089a5c9dbf5048609faf9b8104 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_111876v7: 1617f7f4ff6b95ef03d4228bf9f757a6c6488c91 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111876v7/index.html
[-- Attachment #2: Type: text/html, Size: 18481 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Intel-gfx] [PATCH v7 5/6] drm/i915/mtl: Add function to send command to GSC CS
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 5/6] drm/i915/mtl: Add function to send command to GSC CS Suraj Kandpal
@ 2023-01-19 7:19 ` Teres Alexis, Alan Previn
0 siblings, 0 replies; 15+ messages in thread
From: Teres Alexis, Alan Previn @ 2023-01-19 7:19 UTC (permalink / raw)
To: Kandpal, Suraj, intel-gfx; +Cc: Nikula, Jani
On Tue, 2023-01-10 at 16:27 +0530, Suraj Kandpal wrote:
> Add function that takes care of sending command to gsc cs. We start
> of with allocation of memory for our command intel_hdcp_gsc_message that
> contains gsc cs memory header as directed in specs followed by the
> actual payload hdcp message that we want to send.
> Spec states that we need to poll pending bit of response header around
> 20 times each try being 50ms apart hence adding that to current
> gsc_msg_send function
> Also we use the same function to take care of both sending and receiving
> hence no separate function to get the response.
>
Alan: [snip]
> +
> +/*This function helps allocate memory for the command that we will send to gsc cs */
> +static int intel_initialize_hdcp_gsc_message(struct drm_i915_private *i915,
> + struct intel_hdcp_gsc_message *hdcp_message)
> +{
> + struct intel_gt *gt = i915->media_gt;
> + struct drm_i915_gem_object *obj = NULL;
> + struct i915_vma *vma = NULL;
> + void *cmd;
> + int err;
> +
> + /* allocate object of one page for HDCP command memory and store it */
> + obj = i915_gem_object_create_shmem(i915, PAGE_SIZE);
> +
> + if (IS_ERR(obj)) {
> + drm_err(&i915->drm, "Failed to allocate HDCP streaming command!\n");
> + return PTR_ERR(obj);
> + }
> +
> + cmd = i915_gem_object_pin_map_unlocked(obj, i915_coherent_map_type(i915, obj, true));
> + if (IS_ERR(cmd)) {
> + drm_err(&i915->drm, "Failed to map gsc message page!\n");
> + err = PTR_ERR(cmd);
> + goto out_unpin;
> + }
> +
> + vma = i915_vma_instance(obj, >->ggtt->vm, NULL);
> + if (IS_ERR(vma)) {
> + err = PTR_ERR(vma);
> + goto out_unmap;
> + }
> +
> + err = i915_vma_pin(vma, 0, 0, PIN_GLOBAL);
> + if (err)
> + goto out_unmap;
> +
> + memset(cmd, 0, obj->base.size);
> +
Alan: I'm still not convinced why we need to memset the whole 4K page (especially considering you are allocating, using and freeing this buffer during establishment and then again and again every few second while hdcp link is up). Also, in intel_hdcp_gsc_msg_send, i see the following code:
"memcpy(hdcp_message->hdcp_cmd + sizeof(*header), msg_in, msg_in_len);"
Thus I dont see why the firmware would ever overfetch AND decode data past the valid message being sent (hdcp_cmd_header->command_id). If it does, then wouldnt that be a GSC fw bug?
> + hdcp_message->obj = obj;
> + hdcp_message->hdcp_cmd = cmd;
> + hdcp_message->vma = vma;
> +
> + return 0;
> +
> +out_unmap:
> + i915_gem_object_unpin_map(obj);
> +out_unpin:
> + i915_gem_object_put(obj);
> + return err;
> +}
> +
> +static void intel_free_hdcp_gsc_message(struct intel_hdcp_gsc_message *hdcp_message)
> +{
> + struct drm_i915_gem_object *obj = fetch_and_zero(&hdcp_message->obj);
> +
> + if (!obj)
> + return;
> +
> + if (hdcp_message->vma)
> + i915_vma_unpin(fetch_and_zero(&hdcp_message->vma));
> +
> + i915_gem_object_unpin_map(obj);
> + i915_gem_object_put(obj);
Alan: I realize now that the hdcp_message->obj is not used anywhere else except for here.
If you are also unpinning the vma in the same go, you can just i915_vma_unpin_and_release with I915_VMA_RELEASE_MAP
and it'll do the unmapping and unpinning for you. That way, you won't
need to store the hdcp_message->obj.
> + kfree(hdcp_message);
> +}
> +
Alan: [snip]
> +/*
> + * This function can now be used for sending requests and will also handle
> + * receipt of reply messages hence no different function of message retrieval
> + * is required. We will initialize intel_hdcp_gsc_message structure then add
> + * gsc cs memory header as stated in specs after which the normal HDCP payload
> + * will follow
> + */
> +ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
> + size_t msg_in_len, u8 *msg_out, size_t msg_out_len)
> +{
> + struct intel_gt *gt = i915->media_gt;
> + struct intel_gsc_mtl_header *header;
> + const size_t max_msg_size = PAGE_SIZE - sizeof(*header);
> + struct intel_hdcp_gsc_message *hdcp_message;
> + u64 addr, host_session_id;
> + u32 reply_size, msg_size;
> + int ret, tries = 0;
> +
> + if (!intel_uc_uses_gsc_uc(>->uc))
> + return -ENODEV;
> +
> + if (msg_in_len > max_msg_size || msg_out_len > max_msg_size)
> + return -ENOSPC;
> +
> + hdcp_message = kzalloc(sizeof(*hdcp_message), GFP_KERNEL);
> +
> + if (!hdcp_message)
> + return -ENOMEM;
> +
> + ret = intel_initialize_hdcp_gsc_message(i915, hdcp_message);
> +
> + if (ret) {
> + drm_err(&i915->drm,
> + "Could not initialize hdcp_message\n");
> + goto err;
> + }
> +
> + header = hdcp_message->hdcp_cmd;
> + addr = i915_ggtt_offset(hdcp_message->vma);
> +
> + memset(header, 0, sizeof(*header));
Alan: we know this is redundant code if intel_initialize_hdcp_gsc_message memsets the the entire hdcp_message object.
However, i rather we eliminate the huge 4k memset in intel_initialize_hdcp_gsc_message and keep this one.
> + msg_size = msg_in_len + sizeof(*header);
> + get_random_bytes(&host_session_id, sizeof(u64));
> + intel_gsc_uc_heci_cmd_emit_mtl_header(header, HECI_MEADDRESS_HDCP,
> + msg_size, host_session_id);
> + memcpy(hdcp_message->hdcp_cmd + sizeof(*header), msg_in, msg_in_len);
> +
> + /*
> + * Keep sending request in case the pending bit is set no need to add
> + * message handle as we are using same address hence loc. of header is
> + * same and it will contain the message handle. we will send the message
> + * 20 times each message 50 ms apart
> + */
> + do {
> + ret = intel_gsc_send_sync(i915, header, addr, msg_out_len);
> +
> + /* Only try again if gsc says so */
> + if (ret != -EAGAIN)
> + break;
> +
> + msleep(50);
> +
> + } while (++tries < 20);
> +
> + if (ret)
> + goto err;
> +
> + /* we use the same mem for the reply, so header is in the same loc */
> + reply_size = header->message_size - sizeof(*header);
> + if (reply_size > msg_out_len) {
> + drm_warn(&i915->drm, "caller with insufficient HDCP reply size %u (%d)\n",
> + reply_size, (u32)msg_out_len);
> + reply_size = msg_out_len;
> + } else if (reply_size != msg_out_len) {
> + drm_dbg_kms(&i915->drm, "caller unexpected HCDP reply size %u (%d)\n",
> + reply_size, (u32)msg_out_len);
> + }
> +
> + memcpy(msg_out, hdcp_message->hdcp_cmd + sizeof(*header), msg_out_len);
> +
> +err:
> + intel_free_hdcp_gsc_message(hdcp_message);
> + return ret;
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> new file mode 100644
> index 000000000000..582f4992be76
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> @@ -0,0 +1,18 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2023 Intel Corporation
> + */
> +
> +#ifndef __INTEL_HDCP_GSC_H__
> +#define __INTEL_HDCP_GSC_H__
> +
> +#include <linux/types.h>
> +#include <linux/err.h>
Alan: should this be alphabetical?
Alan:[snip]
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
> index cf610dfca7a5..78fe04f911b9 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
> @@ -23,6 +23,8 @@ struct intel_gsc_mtl_header {
> #define MTL_GSC_HEADER_VERSION 1
>
> u64 host_session_handle;
> +#define HOST_SESSION_MASK REG_GENMASK64(63, 60)
> +#define HOST_SESSION_PXP_SINGLE BIT_ULL(60)
Alan: Daniele communicated this through MTL-PXP series that has this same hunk above: Since this bitmask is something we want in driver side, we need to add some comments like "FW allows host to decide the host_session_handle as it see fits. For internal tracibility, lets reserve select bits to differentiate the caller-target subsystem."
> u64 gsc_message_handle;
>
> u32 message_size; /* lower 20 bits only, upper 12 are reserved */
> @@ -35,6 +37,7 @@ struct intel_gsc_mtl_header {
> * Bits 16-31: Extension Size
> */
> u32 flags;
> +#define INTEL_GSC_MSG_PENDING 1
Alan: Nit: Based on internal spec, some flags are inputs and some are output, perhaps we add a comment on a naming format and change this to GSC_OUTFLAG_MSG_PENDING?
>
> u32 status;
> } __packed;
> @@ -42,4 +45,7 @@ struct intel_gsc_mtl_header {
> int intel_gsc_uc_heci_cmd_submit_packet(struct intel_gsc_uc *gsc,
> u64 addr_in, u32 size_in,
> u64 addr_out, u32 size_out);
> +void intel_gsc_uc_heci_cmd_emit_mtl_header(struct intel_gsc_mtl_header *header,
> + u8 heci_client_id, u32 message_size,
> + u64 host_session_id);
> #endif
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Intel-gfx] [PATCH v7 6/6] drm/i915/mtl: Add HDCP GSC interface
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 6/6] drm/i915/mtl: Add HDCP GSC interface Suraj Kandpal
@ 2023-01-20 10:09 ` Nautiyal, Ankit K
0 siblings, 0 replies; 15+ messages in thread
From: Nautiyal, Ankit K @ 2023-01-20 10:09 UTC (permalink / raw)
To: Suraj Kandpal, intel-gfx; +Cc: jani.nikula, Tomas Winkler, Rodrigo Vivi
On 1/10/2023 4:27 PM, Suraj Kandpal wrote:
> MTL uses GSC command streamer i.e gsc cs to send HDCP/PXP commands
> to GSC f/w. It requires to keep hdcp display driver
> agnostic to content protection f/w (ME/GSC fw) in the form of
> i915_hdcp_fw_ops generic ops.
>
> Adding HDCP GSC CS interface by leveraging the i915_hdcp_fw_ops generic
> ops instead of I915_HDCP_COMPONENT as integral part of i915.
>
> Adding checks to see if GSC is loaded and proxy is setup
>
> --v6
> -dont change the license date in same patch series [Jani]
> -fix the license year {Jani]
>
> Cc: Tomas Winkler <tomas.winkler@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 28 +-
> drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 631 +++++++++++++++++-
> drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 3 +
> 3 files changed, 655 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 0d6aed1eb171..0824c186a31f 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -25,6 +25,8 @@
> #include "intel_hdcp.h"
> #include "intel_hdcp_regs.h"
> #include "intel_pcode.h"
> +#include "intel_connector.h"
This is already included.
> +#include "intel_hdcp_gsc.h"
>
This should be included in alphabetic order, after intel_hdcp.h
> #define KEY_LOAD_TRIES 5
> #define HDCP2_LC_RETRY_CNT 3
> @@ -203,13 +205,20 @@ bool intel_hdcp2_capable(struct intel_connector *connector)
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> struct intel_hdcp *hdcp = &connector->hdcp;
> + struct intel_gt *gt = dev_priv->media_gt;
> + struct intel_gsc_uc *gsc = >->uc.gsc;
> bool capable = false;
>
> /* I915 support for HDCP2.2 */
> if (!hdcp->hdcp2_supported)
> return false;
>
> - /* MEI interface is solid */
> + /* If MTL+ make sure gsc is loaded and proxy is setup */
> + if (DISPLAY_VER(dev_priv) >= 14)
Can use intel_hdcp_gsc_cs_required() here.
> + if (!intel_uc_fw_is_running(&gsc->fw))
> + return false;
> +
> + /* MEI/GSC interface is solid depending on which is used */
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> if (!dev_priv->display.hdcp.comp_added || !dev_priv->display.hdcp.master) {
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
> @@ -2235,7 +2244,7 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,
>
> static bool is_hdcp2_supported(struct drm_i915_private *dev_priv)
> {
> - if (!IS_ENABLED(CONFIG_INTEL_MEI_HDCP))
> + if (intel_hdcp_gsc_cs_required(dev_priv) && !IS_ENABLED(CONFIG_INTEL_MEI_HDCP))
> return false;
This seems odd. What we might want is something like:
if (intel_hdcp_gsc_cs_required(dev_priv))
return true;
if (!IS_ENABLED(CONFIG_INTEL_MEI_HDCP))
return false;
return (DISPLAY_VER(dev_priv) >= 10 ||
IS_KABYLAKE(dev_priv) ||
IS_COFFEELAKE(dev_priv) ||
IS_COMETLAKE(dev_priv));
>
> return (DISPLAY_VER(dev_priv) >= 10 ||
> @@ -2256,10 +2265,14 @@ void intel_hdcp_component_init(struct drm_i915_private *dev_priv)
>
> dev_priv->display.hdcp.comp_added = true;
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
> - ret = component_add_typed(dev_priv->drm.dev, &i915_hdcp_ops,
> - I915_COMPONENT_HDCP);
> + if (intel_hdcp_gsc_cs_required(dev_priv))
> + ret = intel_hdcp_gsc_init(dev_priv);
> + else
> + ret = component_add_typed(dev_priv->drm.dev, &i915_hdcp_ops,
> + I915_COMPONENT_HDCP);
> +
> if (ret < 0) {
> - drm_dbg_kms(&dev_priv->drm, "Failed at component add(%d)\n",
> + drm_dbg_kms(&dev_priv->drm, "Failed at fw component add(%d)\n",
> ret);
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> dev_priv->display.hdcp.comp_added = false;
> @@ -2486,7 +2499,10 @@ void intel_hdcp_component_fini(struct drm_i915_private *dev_priv)
> dev_priv->display.hdcp.comp_added = false;
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
>
> - component_del(dev_priv->drm.dev, &i915_hdcp_ops);
> + if (intel_hdcp_gsc_cs_required(dev_priv))
> + intel_hdcp_gsc_fini(dev_priv);
> + else
> + component_del(dev_priv->drm.dev, &i915_hdcp_ops);
> }
>
> void intel_hdcp_cleanup(struct intel_connector *connector)
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
> index ca7bfeeb1768..838417e08610 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
> @@ -3,6 +3,8 @@
> * Copyright 2023, Intel Corporation.
> */
>
> +#include <drm/i915_hdcp_interface.h>
> +
> #include "display/intel_hdcp_gsc.h"
> #include "gem/i915_gem_region.h"
> #include "gt/uc/intel_gsc_uc_heci_cmd_submit.h"
> @@ -15,6 +17,632 @@ struct intel_hdcp_gsc_message {
> void *hdcp_cmd;
> };
>
> +bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915)
> +{
> + if (DISPLAY_VER(i915) >= 14)
> + return true;
> + return false;
> +}
> +
return DISPLAY_VER(i915) >= 14
> +static int
> +gsc_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
> + struct hdcp2_ake_init *ake_data)
> +{
> + struct wired_cmd_initiate_hdcp2_session_in session_init_in = { { 0 } };
> + struct wired_cmd_initiate_hdcp2_session_out
> + session_init_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> +
> + if (!dev || !data || !ake_data)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + session_init_in.header.api_version = HDCP_API_VERSION;
> + session_init_in.header.command_id = WIRED_INITIATE_HDCP2_SESSION;
> + session_init_in.header.status = FW_HDCP_STATUS_SUCCESS;
> + session_init_in.header.buffer_len =
> + WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN;
> +
> + session_init_in.port.integrated_port_type = data->port_type;
> + session_init_in.port.physical_port = (u8)data->hdcp_ddi;
> + session_init_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> + session_init_in.protocol = data->protocol;
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&session_init_in,
> + sizeof(session_init_in),
> + (u8 *)&session_init_out,
> + sizeof(session_init_out));
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
> + return byte;
> + }
> +
> + if (session_init_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "FW cmd 0x%08X Failed. Status: 0x%X\n",
> + WIRED_INITIATE_HDCP2_SESSION,
> + session_init_out.header.status);
> + return -EIO;
> + }
> +
> + ake_data->msg_id = HDCP_2_2_AKE_INIT;
> + ake_data->tx_caps = session_init_out.tx_caps;
> + memcpy(ake_data->r_tx, session_init_out.r_tx, HDCP_2_2_RTX_LEN);
> +
> + return 0;
> +}
> +
> +static int
> +gsc_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
> + struct hdcp_port_data *data,
> + struct hdcp2_ake_send_cert *rx_cert,
> + bool *km_stored,
> + struct hdcp2_ake_no_stored_km
> + *ek_pub_km,
> + size_t *msg_sz)
> +{
> + struct wired_cmd_verify_receiver_cert_in verify_rxcert_in = { { 0 } };
> + struct wired_cmd_verify_receiver_cert_out verify_rxcert_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> +
> + if (!dev || !data || !rx_cert || !km_stored || !ek_pub_km || !msg_sz)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + verify_rxcert_in.header.api_version = HDCP_API_VERSION;
> + verify_rxcert_in.header.command_id = WIRED_VERIFY_RECEIVER_CERT;
> + verify_rxcert_in.header.status = FW_HDCP_STATUS_SUCCESS;
> + verify_rxcert_in.header.buffer_len =
> + WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN;
> +
> + verify_rxcert_in.port.integrated_port_type = data->port_type;
> + verify_rxcert_in.port.physical_port = (u8)data->hdcp_ddi;
> + verify_rxcert_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> +
> + verify_rxcert_in.cert_rx = rx_cert->cert_rx;
> + memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN);
> + memcpy(verify_rxcert_in.rx_caps, rx_cert->rx_caps, HDCP_2_2_RXCAPS_LEN);
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&verify_rxcert_in,
> + sizeof(verify_rxcert_in),
> + (u8 *)&verify_rxcert_out,
> + sizeof(verify_rxcert_out));
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed: %zd\n", byte);
> + return byte;
> + }
> +
> + if (verify_rxcert_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "FW cmd 0x%08X Failed. Status: 0x%X\n",
> + WIRED_VERIFY_RECEIVER_CERT,
> + verify_rxcert_out.header.status);
> + return -EIO;
> + }
> +
> + *km_stored = !!verify_rxcert_out.km_stored;
> + if (verify_rxcert_out.km_stored) {
> + ek_pub_km->msg_id = HDCP_2_2_AKE_STORED_KM;
> + *msg_sz = sizeof(struct hdcp2_ake_stored_km);
> + } else {
> + ek_pub_km->msg_id = HDCP_2_2_AKE_NO_STORED_KM;
> + *msg_sz = sizeof(struct hdcp2_ake_no_stored_km);
> + }
> +
> + memcpy(ek_pub_km->e_kpub_km, &verify_rxcert_out.ekm_buff,
> + sizeof(verify_rxcert_out.ekm_buff));
> +
> + return 0;
> +}
> +
> +static int
> +gsc_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
> + struct hdcp2_ake_send_hprime *rx_hprime)
> +{
> + struct wired_cmd_ake_send_hprime_in send_hprime_in = { { 0 } };
> + struct wired_cmd_ake_send_hprime_out send_hprime_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> +
> + if (!dev || !data || !rx_hprime)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + send_hprime_in.header.api_version = HDCP_API_VERSION;
> + send_hprime_in.header.command_id = WIRED_AKE_SEND_HPRIME;
> + send_hprime_in.header.status = FW_HDCP_STATUS_SUCCESS;
> + send_hprime_in.header.buffer_len = WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN;
> +
> + send_hprime_in.port.integrated_port_type = data->port_type;
> + send_hprime_in.port.physical_port = (u8)data->hdcp_ddi;
> + send_hprime_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&send_hprime_in,
> + sizeof(send_hprime_in),
> + (u8 *)&send_hprime_out,
> + sizeof(send_hprime_out));
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
> + return byte;
> + }
> +
> + if (send_hprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "FW cmd 0x%08X Failed. Status: 0x%X\n",
> + WIRED_AKE_SEND_HPRIME, send_hprime_out.header.status);
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static int
> +gsc_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
> + struct hdcp2_ake_send_pairing_info *pairing_info)
> +{
> + struct wired_cmd_ake_send_pairing_info_in pairing_info_in = { { 0 } };
> + struct wired_cmd_ake_send_pairing_info_out pairing_info_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> +
> + if (!dev || !data || !pairing_info)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + pairing_info_in.header.api_version = HDCP_API_VERSION;
> + pairing_info_in.header.command_id = WIRED_AKE_SEND_PAIRING_INFO;
> + pairing_info_in.header.status = FW_HDCP_STATUS_SUCCESS;
> + pairing_info_in.header.buffer_len =
> + WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN;
> +
> + pairing_info_in.port.integrated_port_type = data->port_type;
> + pairing_info_in.port.physical_port = (u8)data->hdcp_ddi;
> + pairing_info_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> +
> + memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
> + HDCP_2_2_E_KH_KM_LEN);
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&pairing_info_in,
> + sizeof(pairing_info_in),
> + (u8 *)&pairing_info_out,
> + sizeof(pairing_info_out));
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
> + return byte;
> + }
> +
> + if (pairing_info_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. Status: 0x%X\n",
> + WIRED_AKE_SEND_PAIRING_INFO,
> + pairing_info_out.header.status);
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static int
> +gsc_hdcp_initiate_locality_check(struct device *dev,
> + struct hdcp_port_data *data,
> + struct hdcp2_lc_init *lc_init_data)
> +{
> + struct wired_cmd_init_locality_check_in lc_init_in = { { 0 } };
> + struct wired_cmd_init_locality_check_out lc_init_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> +
> + if (!dev || !data || !lc_init_data)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + lc_init_in.header.api_version = HDCP_API_VERSION;
> + lc_init_in.header.command_id = WIRED_INIT_LOCALITY_CHECK;
> + lc_init_in.header.status = FW_HDCP_STATUS_SUCCESS;
> + lc_init_in.header.buffer_len = WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN;
> +
> + lc_init_in.port.integrated_port_type = data->port_type;
> + lc_init_in.port.physical_port = (u8)data->hdcp_ddi;
> + lc_init_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&lc_init_in, sizeof(lc_init_in),
> + (u8 *)&lc_init_out, sizeof(lc_init_out));
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
> + return byte;
> + }
> +
> + if (lc_init_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "FW cmd 0x%08X Failed. status: 0x%X\n",
> + WIRED_INIT_LOCALITY_CHECK, lc_init_out.header.status);
> + return -EIO;
> + }
> +
> + lc_init_data->msg_id = HDCP_2_2_LC_INIT;
> + memcpy(lc_init_data->r_n, lc_init_out.r_n, HDCP_2_2_RN_LEN);
> +
> + return 0;
> +}
> +
> +static int
> +gsc_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
> + struct hdcp2_lc_send_lprime *rx_lprime)
> +{
> + struct wired_cmd_validate_locality_in verify_lprime_in = { { 0 } };
> + struct wired_cmd_validate_locality_out verify_lprime_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> +
> + if (!dev || !data || !rx_lprime)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + verify_lprime_in.header.api_version = HDCP_API_VERSION;
> + verify_lprime_in.header.command_id = WIRED_VALIDATE_LOCALITY;
> + verify_lprime_in.header.status = FW_HDCP_STATUS_SUCCESS;
> + verify_lprime_in.header.buffer_len =
> + WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN;
> +
> + verify_lprime_in.port.integrated_port_type = data->port_type;
> + verify_lprime_in.port.physical_port = (u8)data->hdcp_ddi;
> + verify_lprime_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> +
> + memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,
> + HDCP_2_2_L_PRIME_LEN);
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&verify_lprime_in,
> + sizeof(verify_lprime_in),
> + (u8 *)&verify_lprime_out,
> + sizeof(verify_lprime_out));
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
> + return byte;
> + }
> +
> + if (verify_lprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. status: 0x%X\n",
> + WIRED_VALIDATE_LOCALITY,
> + verify_lprime_out.header.status);
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static int gsc_hdcp_get_session_key(struct device *dev,
> + struct hdcp_port_data *data,
> + struct hdcp2_ske_send_eks *ske_data)
> +{
> + struct wired_cmd_get_session_key_in get_skey_in = { { 0 } };
> + struct wired_cmd_get_session_key_out get_skey_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> +
> + if (!dev || !data || !ske_data)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + get_skey_in.header.api_version = HDCP_API_VERSION;
> + get_skey_in.header.command_id = WIRED_GET_SESSION_KEY;
> + get_skey_in.header.status = FW_HDCP_STATUS_SUCCESS;
> + get_skey_in.header.buffer_len = WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN;
> +
> + get_skey_in.port.integrated_port_type = data->port_type;
> + get_skey_in.port.physical_port = (u8)data->hdcp_ddi;
> + get_skey_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&get_skey_in, sizeof(get_skey_in),
> + (u8 *)&get_skey_out, sizeof(get_skey_out));
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
> + return byte;
> + }
> +
> + if (get_skey_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. status: 0x%X\n",
> + WIRED_GET_SESSION_KEY, get_skey_out.header.status);
> + return -EIO;
> + }
> +
> + ske_data->msg_id = HDCP_2_2_SKE_SEND_EKS;
> + memcpy(ske_data->e_dkey_ks, get_skey_out.e_dkey_ks,
> + HDCP_2_2_E_DKEY_KS_LEN);
> + memcpy(ske_data->riv, get_skey_out.r_iv, HDCP_2_2_RIV_LEN);
> +
> + return 0;
> +}
> +
> +static int
> +gsc_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
> + struct hdcp_port_data *data,
> + struct hdcp2_rep_send_receiverid_list
> + *rep_topology,
> + struct hdcp2_rep_send_ack
> + *rep_send_ack)
> +{
> + struct wired_cmd_verify_repeater_in verify_repeater_in = { { 0 } };
> + struct wired_cmd_verify_repeater_out verify_repeater_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> +
> + if (!dev || !rep_topology || !rep_send_ack || !data)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + verify_repeater_in.header.api_version = HDCP_API_VERSION;
> + verify_repeater_in.header.command_id = WIRED_VERIFY_REPEATER;
> + verify_repeater_in.header.status = FW_HDCP_STATUS_SUCCESS;
> + verify_repeater_in.header.buffer_len =
> + WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN;
> +
> + verify_repeater_in.port.integrated_port_type = data->port_type;
> + verify_repeater_in.port.physical_port = (u8)data->hdcp_ddi;
> + verify_repeater_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> +
> + memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,
> + HDCP_2_2_RXINFO_LEN);
> + memcpy(verify_repeater_in.seq_num_v, rep_topology->seq_num_v,
> + HDCP_2_2_SEQ_NUM_LEN);
> + memcpy(verify_repeater_in.v_prime, rep_topology->v_prime,
> + HDCP_2_2_V_PRIME_HALF_LEN);
> + memcpy(verify_repeater_in.receiver_ids, rep_topology->receiver_ids,
> + HDCP_2_2_RECEIVER_IDS_MAX_LEN);
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&verify_repeater_in,
> + sizeof(verify_repeater_in),
> + (u8 *)&verify_repeater_out,
> + sizeof(verify_repeater_out));
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
> + return byte;
> + }
> +
> + if (verify_repeater_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. status: 0x%X\n",
> + WIRED_VERIFY_REPEATER,
> + verify_repeater_out.header.status);
> + return -EIO;
> + }
> +
> + memcpy(rep_send_ack->v, verify_repeater_out.v,
> + HDCP_2_2_V_PRIME_HALF_LEN);
> + rep_send_ack->msg_id = HDCP_2_2_REP_SEND_ACK;
> +
> + return 0;
> +}
> +
> +static int gsc_hdcp_verify_mprime(struct device *dev,
> + struct hdcp_port_data *data,
> + struct hdcp2_rep_stream_ready *stream_ready)
> +{
> + struct wired_cmd_repeater_auth_stream_req_in *verify_mprime_in;
> + struct wired_cmd_repeater_auth_stream_req_out
> + verify_mprime_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> + size_t cmd_size;
> +
> + if (!dev || !stream_ready || !data)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + cmd_size = struct_size(verify_mprime_in, streams, data->k);
> + if (cmd_size == SIZE_MAX)
> + return -EINVAL;
> +
> + verify_mprime_in = kzalloc(cmd_size, GFP_KERNEL);
> + if (!verify_mprime_in)
> + return -ENOMEM;
> +
> + verify_mprime_in->header.api_version = HDCP_API_VERSION;
> + verify_mprime_in->header.command_id = WIRED_REPEATER_AUTH_STREAM_REQ;
> + verify_mprime_in->header.status = FW_HDCP_STATUS_SUCCESS;
> + verify_mprime_in->header.buffer_len = cmd_size - sizeof(verify_mprime_in->header);
> +
> + verify_mprime_in->port.integrated_port_type = data->port_type;
> + verify_mprime_in->port.physical_port = (u8)data->hdcp_ddi;
> + verify_mprime_in->port.attached_transcoder = (u8)data->hdcp_transcoder;
> +
> + memcpy(verify_mprime_in->m_prime, stream_ready->m_prime, HDCP_2_2_MPRIME_LEN);
> + drm_hdcp_cpu_to_be24(verify_mprime_in->seq_num_m, data->seq_num_m);
> +
> + memcpy(verify_mprime_in->streams, data->streams,
> + array_size(data->k, sizeof(*data->streams)));
> +
> + verify_mprime_in->k = cpu_to_be16(data->k);
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)verify_mprime_in, cmd_size,
> + (u8 *)&verify_mprime_out,
> + sizeof(verify_mprime_out));
> + kfree(verify_mprime_in);
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
> + return byte;
> + }
> +
> + if (verify_mprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. status: 0x%X\n",
> + WIRED_REPEATER_AUTH_STREAM_REQ,
> + verify_mprime_out.header.status);
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static int gsc_hdcp_enable_authentication(struct device *dev,
> + struct hdcp_port_data *data)
> +{
> + struct wired_cmd_enable_auth_in enable_auth_in = { { 0 } };
> + struct wired_cmd_enable_auth_out enable_auth_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> +
> + if (!dev || !data)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + enable_auth_in.header.api_version = HDCP_API_VERSION;
> + enable_auth_in.header.command_id = WIRED_ENABLE_AUTH;
> + enable_auth_in.header.status = FW_HDCP_STATUS_SUCCESS;
> + enable_auth_in.header.buffer_len = WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN;
> +
> + enable_auth_in.port.integrated_port_type = data->port_type;
> + enable_auth_in.port.physical_port = (u8)data->hdcp_ddi;
> + enable_auth_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> + enable_auth_in.stream_type = data->streams[0].stream_type;
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&enable_auth_in,
> + sizeof(enable_auth_in),
> + (u8 *)&enable_auth_out,
> + sizeof(enable_auth_out));
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
> + return byte;
> + }
> +
> + if (enable_auth_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "FW cmd 0x%08X failed. status: 0x%X\n",
> + WIRED_ENABLE_AUTH, enable_auth_out.header.status);
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static int
> +gsc_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
> +{
> + struct wired_cmd_close_session_in session_close_in = { { 0 } };
> + struct wired_cmd_close_session_out session_close_out = { { 0 } };
> + struct drm_i915_private *i915;
> + ssize_t byte;
> +
> + if (!dev || !data)
> + return -EINVAL;
> +
> + i915 = kdev_to_i915(dev);
> + if (!i915) {
> + dev_err(dev, "DRM not initialized, aborting HDCP.\n");
> + return -ENODEV;
> + }
> +
> + session_close_in.header.api_version = HDCP_API_VERSION;
> + session_close_in.header.command_id = WIRED_CLOSE_SESSION;
> + session_close_in.header.status = FW_HDCP_STATUS_SUCCESS;
> + session_close_in.header.buffer_len =
> + WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN;
> +
> + session_close_in.port.integrated_port_type = data->port_type;
> + session_close_in.port.physical_port = (u8)data->hdcp_ddi;
> + session_close_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> +
> + byte = intel_hdcp_gsc_msg_send(i915, (u8 *)&session_close_in,
> + sizeof(session_close_in),
> + (u8 *)&session_close_out,
> + sizeof(session_close_out));
> + if (byte < 0) {
> + drm_dbg_kms(&i915->drm, "intel_hdcp_gsc_msg_send failed. %zd\n", byte);
> + return byte;
> + }
> +
> + if (session_close_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> + drm_dbg_kms(&i915->drm, "Session Close Failed. status: 0x%X\n",
> + session_close_out.header.status);
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static const struct i915_hdcp_ops gsc_hdcp_ops = {
> + .initiate_hdcp2_session = gsc_hdcp_initiate_session,
> + .verify_receiver_cert_prepare_km =
> + gsc_hdcp_verify_receiver_cert_prepare_km,
> + .verify_hprime = gsc_hdcp_verify_hprime,
> + .store_pairing_info = gsc_hdcp_store_pairing_info,
> + .initiate_locality_check = gsc_hdcp_initiate_locality_check,
> + .verify_lprime = gsc_hdcp_verify_lprime,
> + .get_session_key = gsc_hdcp_get_session_key,
> + .repeater_check_flow_prepare_ack =
> + gsc_hdcp_repeater_check_flow_prepare_ack,
> + .verify_mprime = gsc_hdcp_verify_mprime,
> + .enable_hdcp_authentication = gsc_hdcp_enable_authentication,
> + .close_hdcp_session = gsc_hdcp_close_session,
> +};
> +
> +int intel_hdcp_gsc_init(struct drm_i915_private *i915)
> +{
> + struct i915_hdcp_master *data;
> +
> + data = kzalloc(sizeof(struct i915_hdcp_master), GFP_KERNEL);
> + if (!data)
> + return -ENOMEM;
> +
> + mutex_lock(&i915->display.hdcp.comp_mutex);
> + i915->display.hdcp.master = data;
> + i915->display.hdcp.master->hdcp_dev = i915->drm.dev;
> + i915->display.hdcp.master->ops = &gsc_hdcp_ops;
> + mutex_unlock(&i915->display.hdcp.comp_mutex);
> +
> + return 0;
> +}
> +
> +int intel_hdcp_gsc_fini(struct drm_i915_private *i915)
> +{
> + /* TODO: decrease GSC f/w reference count. */
Do we need this?
Regards,
Ankit
> + kfree(i915->display.hdcp.master);
> + return 0;
> +}
> +
> /*This function helps allocate memory for the command that we will send to gsc cs */
> static int intel_initialize_hdcp_gsc_message(struct drm_i915_private *i915,
> struct intel_hdcp_gsc_message *hdcp_message)
> @@ -124,7 +752,8 @@ static int intel_gsc_send_sync(struct drm_i915_private *i915,
> * will follow
> */
> ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
> - size_t msg_in_len, u8 *msg_out, size_t msg_out_len)
> + size_t msg_in_len, u8 *msg_out,
> + size_t msg_out_len)
> {
> struct intel_gt *gt = i915->media_gt;
> struct intel_gsc_mtl_header *header;
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> index 582f4992be76..069a3b227a83 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
> @@ -11,8 +11,11 @@
>
> struct drm_i915_private;
>
> +bool intel_hdcp_gsc_cs_required(struct drm_i915_private *i915);
> ssize_t intel_hdcp_gsc_msg_send(struct drm_i915_private *i915, u8 *msg_in,
> size_t msg_in_len, u8 *msg_out,
> size_t msg_out_len);
> +int intel_hdcp_gsc_init(struct drm_i915_private *i915);
> +int intel_hdcp_gsc_fini(struct drm_i915_private *i915);
>
> #endif /* __INTEL_HDCP_GCS_H__ */
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Intel-gfx] [PATCH v7 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention Suraj Kandpal
@ 2023-01-20 10:52 ` Nautiyal, Ankit K
0 siblings, 0 replies; 15+ messages in thread
From: Nautiyal, Ankit K @ 2023-01-20 10:52 UTC (permalink / raw)
To: Suraj Kandpal, intel-gfx; +Cc: jani.nikula, Tomas Winkler, Rodrigo Vivi
Hi,
Patch looks good. But I see there are few formatting issues and places
where documentation is still mentions MEI FW, I have mentioned the same
inline.
With that fixed:
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
On 1/10/2023 4:27 PM, Suraj Kandpal wrote:
> From: Anshuman Gupta <anshuman.gupta@intel.com>
>
> Change the include/drm/i915_mei_hdcp_interface.h to
> include/drm/i915_hdcp_interface.h
>
> --v6
> -make each patch build individually [Jani]
>
> Cc: Tomas Winkler <tomas.winkler@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> Acked-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
> .../gpu/drm/i915/display/intel_display_core.h | 2 +-
> .../drm/i915/display/intel_display_types.h | 2 +-
> drivers/gpu/drm/i915/display/intel_hdcp.c | 81 ++++++++---------
> drivers/misc/mei/hdcp/mei_hdcp.c | 58 ++++++-------
> ...hdcp_interface.h => i915_hdcp_interface.h} | 86 +++++++++----------
> 5 files changed, 115 insertions(+), 114 deletions(-)
> rename include/drm/{i915_mei_hdcp_interface.h => i915_hdcp_interface.h} (75%)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
> index 57ddce3ba02b..de71ff6ad80a 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> @@ -368,7 +368,7 @@ struct intel_display {
> } gmbus;
>
> struct {
> - struct i915_hdcp_comp_master *master;
> + struct i915_hdcp_master *master;
> bool comp_added;
>
> /* Mutex to protect the above hdcp component related values. */
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 32e8b2fc3cc6..81d195ef5e57 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -43,7 +43,7 @@
> #include <drm/drm_rect.h>
> #include <drm/drm_vblank.h>
> #include <drm/drm_vblank_work.h>
> -#include <drm/i915_mei_hdcp_interface.h>
> +#include <drm/i915_hdcp_interface.h>
> #include <media/cec-notifier.h>
>
> #include "i915_vma.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 6406fd487ee5..262c76f21801 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -1143,7 +1143,7 @@ hdcp2_prepare_ake_init(struct intel_connector *connector,
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1154,7 +1154,7 @@ hdcp2_prepare_ake_init(struct intel_connector *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->initiate_hdcp2_session(comp->mei_dev, data, ake_data);
> + ret = comp->ops->initiate_hdcp2_session(comp->hdcp_dev, data, ake_data);
> if (ret)
> drm_dbg_kms(&dev_priv->drm, "Prepare_ake_init failed. %d\n",
> ret);
> @@ -1173,7 +1173,7 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector *connector,
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1184,7 +1184,7 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->verify_receiver_cert_prepare_km(comp->mei_dev, data,
> + ret = comp->ops->verify_receiver_cert_prepare_km(comp->hdcp_dev, data,
> rx_cert, paired,
> ek_pub_km, msg_sz);
> if (ret < 0)
> @@ -1201,7 +1201,7 @@ static int hdcp2_verify_hprime(struct intel_connector *connector,
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1212,7 +1212,7 @@ static int hdcp2_verify_hprime(struct intel_connector *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->verify_hprime(comp->mei_dev, data, rx_hprime);
> + ret = comp->ops->verify_hprime(comp->hdcp_dev, data, rx_hprime);
> if (ret < 0)
> drm_dbg_kms(&dev_priv->drm, "Verify hprime failed. %d\n", ret);
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1227,7 +1227,7 @@ hdcp2_store_pairing_info(struct intel_connector *connector,
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1238,7 +1238,7 @@ hdcp2_store_pairing_info(struct intel_connector *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->store_pairing_info(comp->mei_dev, data, pairing_info);
> + ret = comp->ops->store_pairing_info(comp->hdcp_dev, data, pairing_info);
> if (ret < 0)
> drm_dbg_kms(&dev_priv->drm, "Store pairing info failed. %d\n",
> ret);
> @@ -1254,7 +1254,7 @@ hdcp2_prepare_lc_init(struct intel_connector *connector,
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1265,7 +1265,7 @@ hdcp2_prepare_lc_init(struct intel_connector *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->initiate_locality_check(comp->mei_dev, data, lc_init);
> + ret = comp->ops->initiate_locality_check(comp->hdcp_dev, data, lc_init);
> if (ret < 0)
> drm_dbg_kms(&dev_priv->drm, "Prepare lc_init failed. %d\n",
> ret);
> @@ -1281,7 +1281,7 @@ hdcp2_verify_lprime(struct intel_connector *connector,
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1292,7 +1292,7 @@ hdcp2_verify_lprime(struct intel_connector *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->verify_lprime(comp->mei_dev, data, rx_lprime);
> + ret = comp->ops->verify_lprime(comp->hdcp_dev, data, rx_lprime);
> if (ret < 0)
> drm_dbg_kms(&dev_priv->drm, "Verify L_Prime failed. %d\n",
> ret);
> @@ -1307,7 +1307,7 @@ static int hdcp2_prepare_skey(struct intel_connector *connector,
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1318,7 +1318,7 @@ static int hdcp2_prepare_skey(struct intel_connector *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->get_session_key(comp->mei_dev, data, ske_data);
> + ret = comp->ops->get_session_key(comp->hdcp_dev, data, ske_data);
> if (ret < 0)
> drm_dbg_kms(&dev_priv->drm, "Get session key failed. %d\n",
> ret);
> @@ -1336,7 +1336,7 @@ hdcp2_verify_rep_topology_prepare_ack(struct intel_connector *connector,
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1347,7 +1347,7 @@ hdcp2_verify_rep_topology_prepare_ack(struct intel_connector *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->repeater_check_flow_prepare_ack(comp->mei_dev, data,
> + ret = comp->ops->repeater_check_flow_prepare_ack(comp->hdcp_dev, data,
> rep_topology,
> rep_send_ack);
> if (ret < 0)
> @@ -1365,7 +1365,7 @@ hdcp2_verify_mprime(struct intel_connector *connector,
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1376,7 +1376,7 @@ hdcp2_verify_mprime(struct intel_connector *connector,
> return -EINVAL;
> }
>
> - ret = comp->ops->verify_mprime(comp->mei_dev, data, stream_ready);
> + ret = comp->ops->verify_mprime(comp->hdcp_dev, data, stream_ready);
> if (ret < 0)
> drm_dbg_kms(&dev_priv->drm, "Verify mprime failed. %d\n", ret);
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1389,7 +1389,7 @@ static int hdcp2_authenticate_port(struct intel_connector *connector)
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct hdcp_port_data *data = &dig_port->hdcp_port_data;
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1400,7 +1400,7 @@ static int hdcp2_authenticate_port(struct intel_connector *connector)
> return -EINVAL;
> }
>
> - ret = comp->ops->enable_hdcp_authentication(comp->mei_dev, data);
> + ret = comp->ops->enable_hdcp_authentication(comp->hdcp_dev, data);
> if (ret < 0)
> drm_dbg_kms(&dev_priv->drm, "Enable hdcp auth failed. %d\n",
> ret);
> @@ -1413,7 +1413,7 @@ static int hdcp2_close_mei_session(struct intel_connector *connector)
> {
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> - struct i915_hdcp_comp_master *comp;
> + struct i915_hdcp_master *comp;
> int ret;
>
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> @@ -1424,7 +1424,7 @@ static int hdcp2_close_mei_session(struct intel_connector *connector)
> return -EINVAL;
> }
>
> - ret = comp->ops->close_hdcp_session(comp->mei_dev,
> + ret = comp->ops->close_hdcp_session(comp->hdcp_dev,
> &dig_port->hdcp_port_data);
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
>
> @@ -2145,8 +2145,8 @@ static int i915_hdcp_component_bind(struct device *i915_kdev,
>
> drm_dbg(&dev_priv->drm, "I915 HDCP comp bind\n");
> mutex_lock(&dev_priv->display.hdcp.comp_mutex);
> - dev_priv->display.hdcp.master = (struct i915_hdcp_comp_master *)data;
> - dev_priv->display.hdcp.master->mei_dev = mei_kdev;
> + dev_priv->display.hdcp.master = (struct i915_hdcp_master *)data;
> + dev_priv->display.hdcp.master->hdcp_dev = mei_kdev;
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
>
> return 0;
> @@ -2163,30 +2163,30 @@ static void i915_hdcp_component_unbind(struct device *i915_kdev,
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
> }
>
> -static const struct component_ops i915_hdcp_component_ops = {
> +static const struct component_ops i915_hdcp_ops = {
> .bind = i915_hdcp_component_bind,
> .unbind = i915_hdcp_component_unbind,
> };
>
> -static enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port)
> +static enum hdcp_ddi intel_get_hdcp_ddi_index(enum port port)
> {
> switch (port) {
> case PORT_A:
> - return MEI_DDI_A;
> + return HDCP_DDI_A;
> case PORT_B ... PORT_F:
> - return (enum mei_fw_ddi)port;
> + return (enum hdcp_ddi)port;
> default:
> - return MEI_DDI_INVALID_PORT;
> + return HDCP_DDI_INVALID_PORT;
> }
> }
>
> -static enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder)
> +static enum hdcp_transcoder intel_get_hdcp_transcoder(enum transcoder cpu_transcoder)
> {
> switch (cpu_transcoder) {
> case TRANSCODER_A ... TRANSCODER_D:
> - return (enum mei_fw_tc)(cpu_transcoder | 0x10);
> + return (enum hdcp_transcoder)(cpu_transcoder | 0x10);
> default: /* eDP, DSI TRANSCODERS are non HDCP capable */
> - return MEI_INVALID_TRANSCODER;
> + return HDCP_INVALID_TRANSCODER;
> }
> }
>
> @@ -2200,20 +2200,20 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,
> enum port port = dig_port->base.port;
>
> if (DISPLAY_VER(dev_priv) < 12)
> - data->fw_ddi = intel_get_mei_fw_ddi_index(port);
> + data->hdcp_ddi = intel_get_hdcp_ddi_index(port);
> else
> /*
> - * As per ME FW API expectation, for GEN 12+, fw_ddi is filled
> + * As per ME FW API expectation, for GEN 12+, hdcp_ddi is filled
> * with zero(INVALID PORT index).
> */
> - data->fw_ddi = MEI_DDI_INVALID_PORT;
> + data->hdcp_ddi = HDCP_DDI_INVALID_PORT;
>
> /*
> - * As associated transcoder is set and modified at modeset, here fw_tc
> + * As associated transcoder is set and modified at modeset, here hdcp_transcoder
> * is initialized to zero (invalid transcoder index). This will be
> * retained for <Gen12 forever.
> */
> - data->fw_tc = MEI_INVALID_TRANSCODER;
> + data->hdcp_transcoder = HDCP_INVALID_TRANSCODER;
>
> data->port_type = (u8)HDCP_PORT_TYPE_INTEGRATED;
> data->protocol = (u8)shim->protocol;
> @@ -2256,7 +2256,7 @@ void intel_hdcp_component_init(struct drm_i915_private *dev_priv)
>
> dev_priv->display.hdcp.comp_added = true;
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
> - ret = component_add_typed(dev_priv->drm.dev, &i915_hdcp_component_ops,
> + ret = component_add_typed(dev_priv->drm.dev, &i915_hdcp_ops,
> I915_COMPONENT_HDCP);
> if (ret < 0) {
> drm_dbg_kms(&dev_priv->drm, "Failed at component add(%d)\n",
> @@ -2350,7 +2350,8 @@ int intel_hdcp_enable(struct intel_connector *connector,
> }
>
> if (DISPLAY_VER(dev_priv) >= 12)
> - dig_port->hdcp_port_data.fw_tc = intel_get_mei_fw_tc(hdcp->cpu_transcoder);
> + dig_port->hdcp_port_data.hdcp_transcoder =
> + intel_get_hdcp_transcoder(hdcp->cpu_transcoder);
>
> /*
> * Considering that HDCP2.2 is more secure than HDCP1.4, If the setup
> @@ -2485,7 +2486,7 @@ void intel_hdcp_component_fini(struct drm_i915_private *dev_priv)
> dev_priv->display.hdcp.comp_added = false;
> mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
>
> - component_del(dev_priv->drm.dev, &i915_hdcp_component_ops);
> + component_del(dev_priv->drm.dev, &i915_hdcp_ops);
> }
>
> void intel_hdcp_cleanup(struct intel_connector *connector)
> diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
> index e889a8bd7ac8..0ff0bd07e385 100644
> --- a/drivers/misc/mei/hdcp/mei_hdcp.c
> +++ b/drivers/misc/mei/hdcp/mei_hdcp.c
> @@ -23,7 +23,7 @@
> #include <linux/component.h>
> #include <drm/drm_connector.h>
> #include <drm/i915_component.h>
> -#include <drm/i915_mei_hdcp_interface.h>
> +#include <drm/i915_hdcp_interface.h>
>
> #include "mei_hdcp.h"
>
> @@ -57,8 +57,8 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
> WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN;
>
> session_init_in.port.integrated_port_type = data->port_type;
> - session_init_in.port.physical_port = (u8)data->fw_ddi;
> - session_init_in.port.attached_transcoder = (u8)data->fw_tc;
> + session_init_in.port.physical_port = (u8)data->hdcp_ddi;
> + session_init_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> session_init_in.protocol = data->protocol;
>
> byte = mei_cldev_send(cldev, (u8 *)&session_init_in,
> @@ -127,8 +127,8 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
> WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN;
>
> verify_rxcert_in.port.integrated_port_type = data->port_type;
> - verify_rxcert_in.port.physical_port = (u8)data->fw_ddi;
> - verify_rxcert_in.port.attached_transcoder = (u8)data->fw_tc;
> + verify_rxcert_in.port.physical_port = (u8)data->hdcp_ddi;
> + verify_rxcert_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
>
> verify_rxcert_in.cert_rx = rx_cert->cert_rx;
> memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN);
> @@ -198,8 +198,8 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
> send_hprime_in.header.buffer_len = WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN;
>
> send_hprime_in.port.integrated_port_type = data->port_type;
> - send_hprime_in.port.physical_port = (u8)data->fw_ddi;
> - send_hprime_in.port.attached_transcoder = (u8)data->fw_tc;
> + send_hprime_in.port.physical_port = (u8)data->hdcp_ddi;
> + send_hprime_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
>
> memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,
> HDCP_2_2_H_PRIME_LEN);
> @@ -256,8 +256,8 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
> WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN;
>
> pairing_info_in.port.integrated_port_type = data->port_type;
> - pairing_info_in.port.physical_port = (u8)data->fw_ddi;
> - pairing_info_in.port.attached_transcoder = (u8)data->fw_tc;
> + pairing_info_in.port.physical_port = (u8)data->hdcp_ddi;
> + pairing_info_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
>
> memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
> HDCP_2_2_E_KH_KM_LEN);
> @@ -315,8 +315,8 @@ mei_hdcp_initiate_locality_check(struct device *dev,
> lc_init_in.header.buffer_len = WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN;
>
> lc_init_in.port.integrated_port_type = data->port_type;
> - lc_init_in.port.physical_port = (u8)data->fw_ddi;
> - lc_init_in.port.attached_transcoder = (u8)data->fw_tc;
> + lc_init_in.port.physical_port = (u8)data->hdcp_ddi;
> + lc_init_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
>
> byte = mei_cldev_send(cldev, (u8 *)&lc_init_in, sizeof(lc_init_in));
> if (byte < 0) {
> @@ -371,8 +371,8 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
> WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN;
>
> verify_lprime_in.port.integrated_port_type = data->port_type;
> - verify_lprime_in.port.physical_port = (u8)data->fw_ddi;
> - verify_lprime_in.port.attached_transcoder = (u8)data->fw_tc;
> + verify_lprime_in.port.physical_port = (u8)data->hdcp_ddi;
> + verify_lprime_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
>
> memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,
> HDCP_2_2_L_PRIME_LEN);
> @@ -429,8 +429,8 @@ static int mei_hdcp_get_session_key(struct device *dev,
> get_skey_in.header.buffer_len = WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN;
>
> get_skey_in.port.integrated_port_type = data->port_type;
> - get_skey_in.port.physical_port = (u8)data->fw_ddi;
> - get_skey_in.port.attached_transcoder = (u8)data->fw_tc;
> + get_skey_in.port.physical_port = (u8)data->hdcp_ddi;
> + get_skey_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
>
> byte = mei_cldev_send(cldev, (u8 *)&get_skey_in, sizeof(get_skey_in));
> if (byte < 0) {
> @@ -494,8 +494,8 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
> WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN;
>
> verify_repeater_in.port.integrated_port_type = data->port_type;
> - verify_repeater_in.port.physical_port = (u8)data->fw_ddi;
> - verify_repeater_in.port.attached_transcoder = (u8)data->fw_tc;
> + verify_repeater_in.port.physical_port = (u8)data->hdcp_ddi;
> + verify_repeater_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
>
> memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,
> HDCP_2_2_RXINFO_LEN);
> @@ -572,8 +572,8 @@ static int mei_hdcp_verify_mprime(struct device *dev,
> verify_mprime_in->header.buffer_len = cmd_size - sizeof(verify_mprime_in->header);
>
> verify_mprime_in->port.integrated_port_type = data->port_type;
> - verify_mprime_in->port.physical_port = (u8)data->fw_ddi;
> - verify_mprime_in->port.attached_transcoder = (u8)data->fw_tc;
> + verify_mprime_in->port.physical_port = (u8)data->hdcp_ddi;
> + verify_mprime_in->port.attached_transcoder = (u8)data->hdcp_transcoder;
>
> memcpy(verify_mprime_in->m_prime, stream_ready->m_prime, HDCP_2_2_MPRIME_LEN);
> drm_hdcp_cpu_to_be24(verify_mprime_in->seq_num_m, data->seq_num_m);
> @@ -634,8 +634,8 @@ static int mei_hdcp_enable_authentication(struct device *dev,
> enable_auth_in.header.buffer_len = WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN;
>
> enable_auth_in.port.integrated_port_type = data->port_type;
> - enable_auth_in.port.physical_port = (u8)data->fw_ddi;
> - enable_auth_in.port.attached_transcoder = (u8)data->fw_tc;
> + enable_auth_in.port.physical_port = (u8)data->hdcp_ddi;
> + enable_auth_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
> enable_auth_in.stream_type = data->streams[0].stream_type;
>
> byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in,
> @@ -689,8 +689,8 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
> WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN;
>
> session_close_in.port.integrated_port_type = data->port_type;
> - session_close_in.port.physical_port = (u8)data->fw_ddi;
> - session_close_in.port.attached_transcoder = (u8)data->fw_tc;
> + session_close_in.port.physical_port = (u8)data->hdcp_ddi;
> + session_close_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
>
> byte = mei_cldev_send(cldev, (u8 *)&session_close_in,
> sizeof(session_close_in));
> @@ -715,7 +715,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
> return 0;
> }
>
> -static const struct i915_hdcp_component_ops mei_hdcp_ops = {
> +static const struct i915_hdcp_ops mei_hdcp_ops = {
> .owner = THIS_MODULE,
> .initiate_hdcp2_session = mei_hdcp_initiate_session,
> .verify_receiver_cert_prepare_km =
> @@ -735,13 +735,13 @@ static const struct i915_hdcp_component_ops mei_hdcp_ops = {
> static int mei_component_master_bind(struct device *dev)
> {
> struct mei_cl_device *cldev = to_mei_cl_device(dev);
> - struct i915_hdcp_comp_master *comp_master =
> + struct i915_hdcp_master *comp_master =
> mei_cldev_get_drvdata(cldev);
Formatting looks odd here. Can be in the same line.
Same for other places below.
> int ret;
>
> dev_dbg(dev, "%s\n", __func__);
> comp_master->ops = &mei_hdcp_ops;
> - comp_master->mei_dev = dev;
> + comp_master->hdcp_dev = dev;
> ret = component_bind_all(dev, comp_master);
> if (ret < 0)
> return ret;
> @@ -752,7 +752,7 @@ static int mei_component_master_bind(struct device *dev)
> static void mei_component_master_unbind(struct device *dev)
> {
> struct mei_cl_device *cldev = to_mei_cl_device(dev);
> - struct i915_hdcp_comp_master *comp_master =
> + struct i915_hdcp_master *comp_master =
> mei_cldev_get_drvdata(cldev);
>
> dev_dbg(dev, "%s\n", __func__);
> @@ -801,7 +801,7 @@ static int mei_hdcp_component_match(struct device *dev, int subcomponent,
> static int mei_hdcp_probe(struct mei_cl_device *cldev,
> const struct mei_cl_device_id *id)
> {
> - struct i915_hdcp_comp_master *comp_master;
> + struct i915_hdcp_master *comp_master;
> struct component_match *master_match;
> int ret;
>
> @@ -846,7 +846,7 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev,
>
> static void mei_hdcp_remove(struct mei_cl_device *cldev)
> {
> - struct i915_hdcp_comp_master *comp_master =
> + struct i915_hdcp_master *comp_master =
> mei_cldev_get_drvdata(cldev);
> int ret;
>
> diff --git a/include/drm/i915_mei_hdcp_interface.h b/include/drm/i915_hdcp_interface.h
> similarity index 75%
> rename from include/drm/i915_mei_hdcp_interface.h
> rename to include/drm/i915_hdcp_interface.h
> index f441cbcd95a4..d24f6726e50c 100644
> --- a/include/drm/i915_mei_hdcp_interface.h
> +++ b/include/drm/i915_hdcp_interface.h
> @@ -6,8 +6,8 @@
> * Ramalingam C <ramalingam.c@intel.com>
> */
>
> -#ifndef _I915_MEI_HDCP_INTERFACE_H_
> -#define _I915_MEI_HDCP_INTERFACE_H_
> +#ifndef _I915_HDCP_INTERFACE_H_
> +#define _I915_HDCP_INTERFACE_H_
>
> #include <linux/mutex.h>
> #include <linux/device.h>
> @@ -41,44 +41,44 @@ enum hdcp_wired_protocol {
> HDCP_PROTOCOL_DP
> };
>
> -enum mei_fw_ddi {
> - MEI_DDI_INVALID_PORT = 0x0,
> +enum hdcp_ddi {
> + HDCP_DDI_INVALID_PORT = 0x0,
>
> - MEI_DDI_B = 1,
> - MEI_DDI_C,
> - MEI_DDI_D,
> - MEI_DDI_E,
> - MEI_DDI_F,
> - MEI_DDI_A = 7,
> - MEI_DDI_RANGE_END = MEI_DDI_A,
> + HDCP_DDI_B = 1,
> + HDCP_DDI_C,
> + HDCP_DDI_D,
> + HDCP_DDI_E,
> + HDCP_DDI_F,
> + HDCP_DDI_A = 7,
> + HDCP_DDI_RANGE_END = HDCP_DDI_A,
> };
>
> /**
> - * enum mei_fw_tc - ME Firmware defined index for transcoders
> - * @MEI_INVALID_TRANSCODER: Index for Invalid transcoder
> - * @MEI_TRANSCODER_EDP: Index for EDP Transcoder
> - * @MEI_TRANSCODER_DSI0: Index for DSI0 Transcoder
> - * @MEI_TRANSCODER_DSI1: Index for DSI1 Transcoder
> - * @MEI_TRANSCODER_A: Index for Transcoder A
> - * @MEI_TRANSCODER_B: Index for Transcoder B
> - * @MEI_TRANSCODER_C: Index for Transcoder C
> - * @MEI_TRANSCODER_D: Index for Transcoder D
> + * enum hdcp_tc - ME Firmware defined index for transcoders
ME/GSC FW, perhaps?
> + * @HDCP_INVALID_TRANSCODER: Index for Invalid transcoder
> + * @HDCP_TRANSCODER_EDP: Index for EDP Transcoder
> + * @HDCP_TRANSCODER_DSI0: Index for DSI0 Transcoder
> + * @HDCP_TRANSCODER_DSI1: Index for DSI1 Transcoder
> + * @HDCP_TRANSCODER_A: Index for Transcoder A
> + * @HDCP_TRANSCODER_B: Index for Transcoder B
> + * @HDCP_TRANSCODER_C: Index for Transcoder C
> + * @HDCP_TRANSCODER_D: Index for Transcoder D
> */
> -enum mei_fw_tc {
> - MEI_INVALID_TRANSCODER = 0x00,
> - MEI_TRANSCODER_EDP,
> - MEI_TRANSCODER_DSI0,
> - MEI_TRANSCODER_DSI1,
> - MEI_TRANSCODER_A = 0x10,
> - MEI_TRANSCODER_B,
> - MEI_TRANSCODER_C,
> - MEI_TRANSCODER_D
> +enum hdcp_transcoder {
> + HDCP_INVALID_TRANSCODER = 0x00,
> + HDCP_TRANSCODER_EDP,
> + HDCP_TRANSCODER_DSI0,
> + HDCP_TRANSCODER_DSI1,
> + HDCP_TRANSCODER_A = 0x10,
> + HDCP_TRANSCODER_B,
> + HDCP_TRANSCODER_C,
> + HDCP_TRANSCODER_D
> };
>
> /**
> * struct hdcp_port_data - intel specific HDCP port data
> - * @fw_ddi: ddi index as per ME FW
> - * @fw_tc: transcoder index as per ME FW
> + * @hdcp_ddi: ddi index as per ME FW
> + * @hdcp_transcoder: transcoder index as per ME FW
> * @port_type: HDCP port type as per ME FW classification
> * @protocol: HDCP adaptation as per ME FW
> * @k: No of streams transmitted on a port. Only on DP MST this is != 1
Documentation should drop ME FW.
> @@ -90,8 +90,8 @@ enum mei_fw_tc {
> * streams
> */
> struct hdcp_port_data {
> - enum mei_fw_ddi fw_ddi;
> - enum mei_fw_tc fw_tc;
> + enum hdcp_ddi hdcp_ddi;
> + enum hdcp_transcoder hdcp_transcoder;
> u8 port_type;
> u8 protocol;
> u16 k;
> @@ -100,7 +100,7 @@ struct hdcp_port_data {
> };
>
> /**
> - * struct i915_hdcp_component_ops- ops for HDCP2.2 services.
> + * struct i915_hdcp_ops- ops for HDCP2.2 services.
> * @owner: Module providing the ops
> * @initiate_hdcp2_session: Initiate a Wired HDCP2.2 Tx Session.
> * And Prepare AKE_Init.
> @@ -119,9 +119,9 @@ struct hdcp_port_data {
> * @close_hdcp_session: Close the Wired HDCP Tx session per port.
> * This also disables the authenticated state of the port.
> */
> -struct i915_hdcp_component_ops {
> +struct i915_hdcp_ops {
> /**
> - * @owner: mei_hdcp module
> + * @owner: hdcp module
> */
> struct module *owner;
>
> @@ -169,16 +169,16 @@ struct i915_hdcp_component_ops {
>
> /**
> * struct i915_hdcp_component_master - Used for communication between i915
> - * and mei_hdcp drivers for the HDCP2.2 services
> - * @mei_dev: device that provide the HDCP2.2 service from MEI Bus.
> - * @hdcp_ops: Ops implemented by mei_hdcp driver, used by i915 driver.
> + * and hdcp drivers for the HDCP2.2 services
> + * @hdcp_dev: device that provide the HDCP2.2 service from MEI Bus.
> + * @hdcp_ops: Ops implemented by hdcp driver or intel_hdcp_gsc , used by i915 driver.
> */
> -struct i915_hdcp_comp_master {
> - struct device *mei_dev;
> - const struct i915_hdcp_component_ops *ops;
> +struct i915_hdcp_master {
> + struct device *hdcp_dev;
> + const struct i915_hdcp_ops *ops;
>
> /* To protect the above members. */
> struct mutex mutex;
> };
>
> -#endif /* _I915_MEI_HDCP_INTERFACE_H_ */
> +#endif /* _I915_HDCP_INTERFACE_H_ */
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Intel-gfx] [PATCH v7 3/6] i915/hdcp: HDCP2.x Refactoring to agnostic hdcp
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 3/6] i915/hdcp: HDCP2.x Refactoring to agnostic hdcp Suraj Kandpal
@ 2023-01-24 4:19 ` Nautiyal, Ankit K
0 siblings, 0 replies; 15+ messages in thread
From: Nautiyal, Ankit K @ 2023-01-24 4:19 UTC (permalink / raw)
To: Suraj Kandpal, intel-gfx; +Cc: jani.nikula, Tomas Winkler, Rodrigo Vivi
LGTM.
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
On 1/10/2023 4:27 PM, Suraj Kandpal wrote:
> As now we have more then one type of content protection
> secrity firmware. Let change the i915_cp_fw_hdcp_interface.h
> header naming convention to suit generic f/w type.
> %s/MEI_/HDCP_
> %s/mei_dev/hdcp_dev
>
> As interface to CP FW can be either a non i915 component or
> i915 intergral component, change structure name Accordingly.
> %s/i915_hdcp_comp_master/i915_hdcp_master
> %s/i915_hdcp_component_ops/i915_hdcp_ops
>
> --v3
> -Changing names to drop cp_fw to make naming more agnostic[Jani]
>
> Cc: Tomas Winkler <tomas.winkler@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display_core.h | 1 +
> drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++--
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
> index de71ff6ad80a..132e9134ba05 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> @@ -15,6 +15,7 @@
>
> #include <drm/drm_connector.h>
> #include <drm/drm_modeset_lock.h>
> +#include <drm/i915_hdcp_interface.h>
>
> #include "intel_cdclk.h"
> #include "intel_display.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 262c76f21801..0d6aed1eb171 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -1409,7 +1409,7 @@ static int hdcp2_authenticate_port(struct intel_connector *connector)
> return ret;
> }
>
> -static int hdcp2_close_mei_session(struct intel_connector *connector)
> +static int hdcp2_close_session(struct intel_connector *connector)
> {
> struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
> struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
> @@ -1433,7 +1433,7 @@ static int hdcp2_close_mei_session(struct intel_connector *connector)
>
> static int hdcp2_deauthenticate_port(struct intel_connector *connector)
> {
> - return hdcp2_close_mei_session(connector);
> + return hdcp2_close_session(connector);
> }
>
> /* Authentication flow starts from here */
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Intel-gfx] [PATCH v7 4/6] drm/i915/hdcp: Refactor HDCP API structures
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 4/6] drm/i915/hdcp: Refactor HDCP API structures Suraj Kandpal
@ 2023-01-24 4:37 ` Nautiyal, Ankit K
0 siblings, 0 replies; 15+ messages in thread
From: Nautiyal, Ankit K @ 2023-01-24 4:37 UTC (permalink / raw)
To: Suraj Kandpal, intel-gfx; +Cc: jani.nikula, Tomas Winkler, Rodrigo Vivi
LGTM.
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
On 1/10/2023 4:27 PM, Suraj Kandpal wrote:
> It requires to move intel specific HDCP API structures to
> i915_cp_fw_hdcp_interface.h from driver/misc/mei/hdcp/mei_hdcp.h
> so that any content protection fw interfaces can use these
> structures.
>
> Cc: Tomas Winkler <tomas.winkler@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> ---
> drivers/misc/mei/hdcp/mei_hdcp.c | 44 ++--
> drivers/misc/mei/hdcp/mei_hdcp.h | 354 -----------------------------
> include/drm/i915_hdcp_interface.h | 355 ++++++++++++++++++++++++++++++
> 3 files changed, 377 insertions(+), 376 deletions(-)
>
> diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
> index 0ff0bd07e385..d4faecbbbe76 100644
> --- a/drivers/misc/mei/hdcp/mei_hdcp.c
> +++ b/drivers/misc/mei/hdcp/mei_hdcp.c
> @@ -52,7 +52,7 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
>
> session_init_in.header.api_version = HDCP_API_VERSION;
> session_init_in.header.command_id = WIRED_INITIATE_HDCP2_SESSION;
> - session_init_in.header.status = ME_HDCP_STATUS_SUCCESS;
> + session_init_in.header.status = FW_HDCP_STATUS_SUCCESS;
> session_init_in.header.buffer_len =
> WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN;
>
> @@ -75,7 +75,7 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
> return byte;
> }
>
> - if (session_init_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (session_init_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
> WIRED_INITIATE_HDCP2_SESSION,
> session_init_out.header.status);
> @@ -122,7 +122,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
>
> verify_rxcert_in.header.api_version = HDCP_API_VERSION;
> verify_rxcert_in.header.command_id = WIRED_VERIFY_RECEIVER_CERT;
> - verify_rxcert_in.header.status = ME_HDCP_STATUS_SUCCESS;
> + verify_rxcert_in.header.status = FW_HDCP_STATUS_SUCCESS;
> verify_rxcert_in.header.buffer_len =
> WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN;
>
> @@ -148,7 +148,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
> return byte;
> }
>
> - if (verify_rxcert_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (verify_rxcert_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
> WIRED_VERIFY_RECEIVER_CERT,
> verify_rxcert_out.header.status);
> @@ -194,7 +194,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
>
> send_hprime_in.header.api_version = HDCP_API_VERSION;
> send_hprime_in.header.command_id = WIRED_AKE_SEND_HPRIME;
> - send_hprime_in.header.status = ME_HDCP_STATUS_SUCCESS;
> + send_hprime_in.header.status = FW_HDCP_STATUS_SUCCESS;
> send_hprime_in.header.buffer_len = WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN;
>
> send_hprime_in.port.integrated_port_type = data->port_type;
> @@ -218,7 +218,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
> return byte;
> }
>
> - if (send_hprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (send_hprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
> WIRED_AKE_SEND_HPRIME, send_hprime_out.header.status);
> return -EIO;
> @@ -251,7 +251,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
>
> pairing_info_in.header.api_version = HDCP_API_VERSION;
> pairing_info_in.header.command_id = WIRED_AKE_SEND_PAIRING_INFO;
> - pairing_info_in.header.status = ME_HDCP_STATUS_SUCCESS;
> + pairing_info_in.header.status = FW_HDCP_STATUS_SUCCESS;
> pairing_info_in.header.buffer_len =
> WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN;
>
> @@ -276,7 +276,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
> return byte;
> }
>
> - if (pairing_info_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (pairing_info_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "ME cmd 0x%08X failed. Status: 0x%X\n",
> WIRED_AKE_SEND_PAIRING_INFO,
> pairing_info_out.header.status);
> @@ -311,7 +311,7 @@ mei_hdcp_initiate_locality_check(struct device *dev,
>
> lc_init_in.header.api_version = HDCP_API_VERSION;
> lc_init_in.header.command_id = WIRED_INIT_LOCALITY_CHECK;
> - lc_init_in.header.status = ME_HDCP_STATUS_SUCCESS;
> + lc_init_in.header.status = FW_HDCP_STATUS_SUCCESS;
> lc_init_in.header.buffer_len = WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN;
>
> lc_init_in.port.integrated_port_type = data->port_type;
> @@ -330,7 +330,7 @@ mei_hdcp_initiate_locality_check(struct device *dev,
> return byte;
> }
>
> - if (lc_init_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (lc_init_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "ME cmd 0x%08X Failed. status: 0x%X\n",
> WIRED_INIT_LOCALITY_CHECK, lc_init_out.header.status);
> return -EIO;
> @@ -366,7 +366,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
>
> verify_lprime_in.header.api_version = HDCP_API_VERSION;
> verify_lprime_in.header.command_id = WIRED_VALIDATE_LOCALITY;
> - verify_lprime_in.header.status = ME_HDCP_STATUS_SUCCESS;
> + verify_lprime_in.header.status = FW_HDCP_STATUS_SUCCESS;
> verify_lprime_in.header.buffer_len =
> WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN;
>
> @@ -391,7 +391,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
> return byte;
> }
>
> - if (verify_lprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (verify_lprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
> WIRED_VALIDATE_LOCALITY,
> verify_lprime_out.header.status);
> @@ -425,7 +425,7 @@ static int mei_hdcp_get_session_key(struct device *dev,
>
> get_skey_in.header.api_version = HDCP_API_VERSION;
> get_skey_in.header.command_id = WIRED_GET_SESSION_KEY;
> - get_skey_in.header.status = ME_HDCP_STATUS_SUCCESS;
> + get_skey_in.header.status = FW_HDCP_STATUS_SUCCESS;
> get_skey_in.header.buffer_len = WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN;
>
> get_skey_in.port.integrated_port_type = data->port_type;
> @@ -445,7 +445,7 @@ static int mei_hdcp_get_session_key(struct device *dev,
> return byte;
> }
>
> - if (get_skey_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (get_skey_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
> WIRED_GET_SESSION_KEY, get_skey_out.header.status);
> return -EIO;
> @@ -489,7 +489,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
>
> verify_repeater_in.header.api_version = HDCP_API_VERSION;
> verify_repeater_in.header.command_id = WIRED_VERIFY_REPEATER;
> - verify_repeater_in.header.status = ME_HDCP_STATUS_SUCCESS;
> + verify_repeater_in.header.status = FW_HDCP_STATUS_SUCCESS;
> verify_repeater_in.header.buffer_len =
> WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN;
>
> @@ -520,7 +520,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
> return byte;
> }
>
> - if (verify_repeater_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (verify_repeater_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
> WIRED_VERIFY_REPEATER,
> verify_repeater_out.header.status);
> @@ -568,7 +568,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,
>
> verify_mprime_in->header.api_version = HDCP_API_VERSION;
> verify_mprime_in->header.command_id = WIRED_REPEATER_AUTH_STREAM_REQ;
> - verify_mprime_in->header.status = ME_HDCP_STATUS_SUCCESS;
> + verify_mprime_in->header.status = FW_HDCP_STATUS_SUCCESS;
> verify_mprime_in->header.buffer_len = cmd_size - sizeof(verify_mprime_in->header);
>
> verify_mprime_in->port.integrated_port_type = data->port_type;
> @@ -597,7 +597,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,
> return byte;
> }
>
> - if (verify_mprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (verify_mprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
> WIRED_REPEATER_AUTH_STREAM_REQ,
> verify_mprime_out.header.status);
> @@ -630,7 +630,7 @@ static int mei_hdcp_enable_authentication(struct device *dev,
>
> enable_auth_in.header.api_version = HDCP_API_VERSION;
> enable_auth_in.header.command_id = WIRED_ENABLE_AUTH;
> - enable_auth_in.header.status = ME_HDCP_STATUS_SUCCESS;
> + enable_auth_in.header.status = FW_HDCP_STATUS_SUCCESS;
> enable_auth_in.header.buffer_len = WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN;
>
> enable_auth_in.port.integrated_port_type = data->port_type;
> @@ -652,7 +652,7 @@ static int mei_hdcp_enable_authentication(struct device *dev,
> return byte;
> }
>
> - if (enable_auth_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (enable_auth_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
> WIRED_ENABLE_AUTH, enable_auth_out.header.status);
> return -EIO;
> @@ -684,7 +684,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
>
> session_close_in.header.api_version = HDCP_API_VERSION;
> session_close_in.header.command_id = WIRED_CLOSE_SESSION;
> - session_close_in.header.status = ME_HDCP_STATUS_SUCCESS;
> + session_close_in.header.status = FW_HDCP_STATUS_SUCCESS;
> session_close_in.header.buffer_len =
> WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN;
>
> @@ -706,7 +706,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
> return byte;
> }
>
> - if (session_close_out.header.status != ME_HDCP_STATUS_SUCCESS) {
> + if (session_close_out.header.status != FW_HDCP_STATUS_SUCCESS) {
> dev_dbg(dev, "Session Close Failed. status: 0x%X\n",
> session_close_out.header.status);
> return -EIO;
> diff --git a/drivers/misc/mei/hdcp/mei_hdcp.h b/drivers/misc/mei/hdcp/mei_hdcp.h
> index ca09c8f83d6b..0683d83ec17a 100644
> --- a/drivers/misc/mei/hdcp/mei_hdcp.h
> +++ b/drivers/misc/mei/hdcp/mei_hdcp.h
> @@ -11,358 +11,4 @@
>
> #include <drm/display/drm_hdcp.h>
>
> -/* me_hdcp_status: Enumeration of all HDCP Status Codes */
> -enum me_hdcp_status {
> - ME_HDCP_STATUS_SUCCESS = 0x0000,
> -
> - /* WiDi Generic Status Codes */
> - ME_HDCP_STATUS_INTERNAL_ERROR = 0x1000,
> - ME_HDCP_STATUS_UNKNOWN_ERROR = 0x1001,
> - ME_HDCP_STATUS_INCORRECT_API_VERSION = 0x1002,
> - ME_HDCP_STATUS_INVALID_FUNCTION = 0x1003,
> - ME_HDCP_STATUS_INVALID_BUFFER_LENGTH = 0x1004,
> - ME_HDCP_STATUS_INVALID_PARAMS = 0x1005,
> - ME_HDCP_STATUS_AUTHENTICATION_FAILED = 0x1006,
> -
> - /* WiDi Status Codes */
> - ME_HDCP_INVALID_SESSION_STATE = 0x6000,
> - ME_HDCP_SRM_FRAGMENT_UNEXPECTED = 0x6001,
> - ME_HDCP_SRM_INVALID_LENGTH = 0x6002,
> - ME_HDCP_SRM_FRAGMENT_OFFSET_INVALID = 0x6003,
> - ME_HDCP_SRM_VERIFICATION_FAILED = 0x6004,
> - ME_HDCP_SRM_VERSION_TOO_OLD = 0x6005,
> - ME_HDCP_RX_CERT_VERIFICATION_FAILED = 0x6006,
> - ME_HDCP_RX_REVOKED = 0x6007,
> - ME_HDCP_H_VERIFICATION_FAILED = 0x6008,
> - ME_HDCP_REPEATER_CHECK_UNEXPECTED = 0x6009,
> - ME_HDCP_TOPOLOGY_MAX_EXCEEDED = 0x600A,
> - ME_HDCP_V_VERIFICATION_FAILED = 0x600B,
> - ME_HDCP_L_VERIFICATION_FAILED = 0x600C,
> - ME_HDCP_STREAM_KEY_ALLOC_FAILED = 0x600D,
> - ME_HDCP_BASE_KEY_RESET_FAILED = 0x600E,
> - ME_HDCP_NONCE_GENERATION_FAILED = 0x600F,
> - ME_HDCP_STATUS_INVALID_E_KEY_STATE = 0x6010,
> - ME_HDCP_STATUS_INVALID_CS_ICV = 0x6011,
> - ME_HDCP_STATUS_INVALID_KB_KEY_STATE = 0x6012,
> - ME_HDCP_STATUS_INVALID_PAVP_MODE_ICV = 0x6013,
> - ME_HDCP_STATUS_INVALID_PAVP_MODE = 0x6014,
> - ME_HDCP_STATUS_LC_MAX_ATTEMPTS = 0x6015,
> -
> - /* New status for HDCP 2.1 */
> - ME_HDCP_STATUS_MISMATCH_IN_M = 0x6016,
> -
> - /* New status code for HDCP 2.2 Rx */
> - ME_HDCP_STATUS_RX_PROV_NOT_ALLOWED = 0x6017,
> - ME_HDCP_STATUS_RX_PROV_WRONG_SUBJECT = 0x6018,
> - ME_HDCP_RX_NEEDS_PROVISIONING = 0x6019,
> - ME_HDCP_BKSV_ICV_AUTH_FAILED = 0x6020,
> - ME_HDCP_STATUS_INVALID_STREAM_ID = 0x6021,
> - ME_HDCP_STATUS_CHAIN_NOT_INITIALIZED = 0x6022,
> - ME_HDCP_FAIL_NOT_EXPECTED = 0x6023,
> - ME_HDCP_FAIL_HDCP_OFF = 0x6024,
> - ME_HDCP_FAIL_INVALID_PAVP_MEMORY_MODE = 0x6025,
> - ME_HDCP_FAIL_AES_ECB_FAILURE = 0x6026,
> - ME_HDCP_FEATURE_NOT_SUPPORTED = 0x6027,
> - ME_HDCP_DMA_READ_ERROR = 0x6028,
> - ME_HDCP_DMA_WRITE_ERROR = 0x6029,
> - ME_HDCP_FAIL_INVALID_PACKET_SIZE = 0x6030,
> - ME_HDCP_H264_PARSING_ERROR = 0x6031,
> - ME_HDCP_HDCP2_ERRATA_VIDEO_VIOLATION = 0x6032,
> - ME_HDCP_HDCP2_ERRATA_AUDIO_VIOLATION = 0x6033,
> - ME_HDCP_TX_ACTIVE_ERROR = 0x6034,
> - ME_HDCP_MODE_CHANGE_ERROR = 0x6035,
> - ME_HDCP_STREAM_TYPE_ERROR = 0x6036,
> - ME_HDCP_STREAM_MANAGE_NOT_POSSIBLE = 0x6037,
> -
> - ME_HDCP_STATUS_PORT_INVALID_COMMAND = 0x6038,
> - ME_HDCP_STATUS_UNSUPPORTED_PROTOCOL = 0x6039,
> - ME_HDCP_STATUS_INVALID_PORT_INDEX = 0x603a,
> - ME_HDCP_STATUS_TX_AUTH_NEEDED = 0x603b,
> - ME_HDCP_STATUS_NOT_INTEGRATED_PORT = 0x603c,
> - ME_HDCP_STATUS_SESSION_MAX_REACHED = 0x603d,
> -
> - /* hdcp capable bit is not set in rx_caps(error is unique to DP) */
> - ME_HDCP_STATUS_NOT_HDCP_CAPABLE = 0x6041,
> -
> - ME_HDCP_STATUS_INVALID_STREAM_COUNT = 0x6042,
> -};
> -
> -#define HDCP_API_VERSION 0x00010000
> -
> -#define HDCP_M_LEN 16
> -#define HDCP_KH_LEN 16
> -
> -/* Payload Buffer size(Excluding Header) for CMDs and corresponding response */
> -/* Wired_Tx_AKE */
> -#define WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN (4 + 1)
> -#define WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_OUT (4 + 8 + 3)
> -
> -#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN (4 + 522 + 8 + 3)
> -#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_MIN_OUT (4 + 1 + 3 + 16 + 16)
> -#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_MAX_OUT (4 + 1 + 3 + 128)
> -
> -#define WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN (4 + 32)
> -#define WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_OUT (4)
> -
> -#define WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN (4 + 16)
> -#define WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_OUT (4)
> -
> -#define WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN (4)
> -#define WIRED_CMD_BUF_LEN_CLOSE_SESSION_OUT (4)
> -
> -/* Wired_Tx_LC */
> -#define WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN (4)
> -#define WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_OUT (4 + 8)
> -
> -#define WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN (4 + 32)
> -#define WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_OUT (4)
> -
> -/* Wired_Tx_SKE */
> -#define WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN (4)
> -#define WIRED_CMD_BUF_LEN_GET_SESSION_KEY_OUT (4 + 16 + 8)
> -
> -/* Wired_Tx_SKE */
> -#define WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN (4 + 1)
> -#define WIRED_CMD_BUF_LEN_ENABLE_AUTH_OUT (4)
> -
> -/* Wired_Tx_Repeater */
> -#define WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN (4 + 2 + 3 + 16 + 155)
> -#define WIRED_CMD_BUF_LEN_VERIFY_REPEATER_OUT (4 + 1 + 16)
> -
> -#define WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_MIN_IN (4 + 3 + \
> - 32 + 2 + 2)
> -
> -#define WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_OUT (4)
> -
> -/* hdcp_command_id: Enumeration of all WIRED HDCP Command IDs */
> -enum hdcp_command_id {
> - _WIDI_COMMAND_BASE = 0x00030000,
> - WIDI_INITIATE_HDCP2_SESSION = _WIDI_COMMAND_BASE,
> - HDCP_GET_SRM_STATUS,
> - HDCP_SEND_SRM_FRAGMENT,
> -
> - /* The wired HDCP Tx commands */
> - _WIRED_COMMAND_BASE = 0x00031000,
> - WIRED_INITIATE_HDCP2_SESSION = _WIRED_COMMAND_BASE,
> - WIRED_VERIFY_RECEIVER_CERT,
> - WIRED_AKE_SEND_HPRIME,
> - WIRED_AKE_SEND_PAIRING_INFO,
> - WIRED_INIT_LOCALITY_CHECK,
> - WIRED_VALIDATE_LOCALITY,
> - WIRED_GET_SESSION_KEY,
> - WIRED_ENABLE_AUTH,
> - WIRED_VERIFY_REPEATER,
> - WIRED_REPEATER_AUTH_STREAM_REQ,
> - WIRED_CLOSE_SESSION,
> -
> - _WIRED_COMMANDS_COUNT,
> -};
> -
> -union encrypted_buff {
> - u8 e_kpub_km[HDCP_2_2_E_KPUB_KM_LEN];
> - u8 e_kh_km_m[HDCP_2_2_E_KH_KM_M_LEN];
> - struct {
> - u8 e_kh_km[HDCP_KH_LEN];
> - u8 m[HDCP_M_LEN];
> - } __packed;
> -};
> -
> -/* HDCP HECI message header. All header values are little endian. */
> -struct hdcp_cmd_header {
> - u32 api_version;
> - u32 command_id;
> - enum me_hdcp_status status;
> - /* Length of the HECI message (excluding the header) */
> - u32 buffer_len;
> -} __packed;
> -
> -/* Empty command request or response. No data follows the header. */
> -struct hdcp_cmd_no_data {
> - struct hdcp_cmd_header header;
> -} __packed;
> -
> -/* Uniquely identifies the hdcp port being addressed for a given command. */
> -struct hdcp_port_id {
> - u8 integrated_port_type;
> - /* physical_port is used until Gen11.5. Must be zero for Gen11.5+ */
> - u8 physical_port;
> - /* attached_transcoder is for Gen11.5+. Set to zero for <Gen11.5 */
> - u8 attached_transcoder;
> - u8 reserved;
> -} __packed;
> -
> -/*
> - * Data structures for integrated wired HDCP2 Tx in
> - * support of the AKE protocol
> - */
> -/* HECI struct for integrated wired HDCP Tx session initiation. */
> -struct wired_cmd_initiate_hdcp2_session_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 protocol; /* for HDMI vs DP */
> -} __packed;
> -
> -struct wired_cmd_initiate_hdcp2_session_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 r_tx[HDCP_2_2_RTX_LEN];
> - struct hdcp2_tx_caps tx_caps;
> -} __packed;
> -
> -/* HECI struct for ending an integrated wired HDCP Tx session. */
> -struct wired_cmd_close_session_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> -} __packed;
> -
> -struct wired_cmd_close_session_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> -} __packed;
> -
> -/* HECI struct for integrated wired HDCP Tx Rx Cert verification. */
> -struct wired_cmd_verify_receiver_cert_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - struct hdcp2_cert_rx cert_rx;
> - u8 r_rx[HDCP_2_2_RRX_LEN];
> - u8 rx_caps[HDCP_2_2_RXCAPS_LEN];
> -} __packed;
> -
> -struct wired_cmd_verify_receiver_cert_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 km_stored;
> - u8 reserved[3];
> - union encrypted_buff ekm_buff;
> -} __packed;
> -
> -/* HECI struct for verification of Rx's Hprime in a HDCP Tx session */
> -struct wired_cmd_ake_send_hprime_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 h_prime[HDCP_2_2_H_PRIME_LEN];
> -} __packed;
> -
> -struct wired_cmd_ake_send_hprime_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> -} __packed;
> -
> -/*
> - * HECI struct for sending in AKE pairing data generated by the Rx in an
> - * integrated wired HDCP Tx session.
> - */
> -struct wired_cmd_ake_send_pairing_info_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 e_kh_km[HDCP_2_2_E_KH_KM_LEN];
> -} __packed;
> -
> -struct wired_cmd_ake_send_pairing_info_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> -} __packed;
> -
> -/* Data structures for integrated wired HDCP2 Tx in support of the LC protocol*/
> -/*
> - * HECI struct for initiating locality check with an
> - * integrated wired HDCP Tx session.
> - */
> -struct wired_cmd_init_locality_check_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> -} __packed;
> -
> -struct wired_cmd_init_locality_check_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 r_n[HDCP_2_2_RN_LEN];
> -} __packed;
> -
> -/*
> - * HECI struct for validating an Rx's LPrime value in an
> - * integrated wired HDCP Tx session.
> - */
> -struct wired_cmd_validate_locality_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 l_prime[HDCP_2_2_L_PRIME_LEN];
> -} __packed;
> -
> -struct wired_cmd_validate_locality_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> -} __packed;
> -
> -/*
> - * Data structures for integrated wired HDCP2 Tx in support of the
> - * SKE protocol
> - */
> -/* HECI struct for creating session key */
> -struct wired_cmd_get_session_key_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> -} __packed;
> -
> -struct wired_cmd_get_session_key_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 e_dkey_ks[HDCP_2_2_E_DKEY_KS_LEN];
> - u8 r_iv[HDCP_2_2_RIV_LEN];
> -} __packed;
> -
> -/* HECI struct for the Tx enable authentication command */
> -struct wired_cmd_enable_auth_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 stream_type;
> -} __packed;
> -
> -struct wired_cmd_enable_auth_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> -} __packed;
> -
> -/*
> - * Data structures for integrated wired HDCP2 Tx in support of
> - * the repeater protocols
> - */
> -/*
> - * HECI struct for verifying the downstream repeater's HDCP topology in an
> - * integrated wired HDCP Tx session.
> - */
> -struct wired_cmd_verify_repeater_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 rx_info[HDCP_2_2_RXINFO_LEN];
> - u8 seq_num_v[HDCP_2_2_SEQ_NUM_LEN];
> - u8 v_prime[HDCP_2_2_V_PRIME_HALF_LEN];
> - u8 receiver_ids[HDCP_2_2_RECEIVER_IDS_MAX_LEN];
> -} __packed;
> -
> -struct wired_cmd_verify_repeater_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 content_type_supported;
> - u8 v[HDCP_2_2_V_PRIME_HALF_LEN];
> -} __packed;
> -
> -/*
> - * HECI struct in support of stream management in an
> - * integrated wired HDCP Tx session.
> - */
> -struct wired_cmd_repeater_auth_stream_req_in {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> - u8 seq_num_m[HDCP_2_2_SEQ_NUM_LEN];
> - u8 m_prime[HDCP_2_2_MPRIME_LEN];
> - __be16 k;
> - struct hdcp2_streamid_type streams[];
> -} __packed;
> -
> -struct wired_cmd_repeater_auth_stream_req_out {
> - struct hdcp_cmd_header header;
> - struct hdcp_port_id port;
> -} __packed;
> #endif /* __MEI_HDCP_H__ */
> diff --git a/include/drm/i915_hdcp_interface.h b/include/drm/i915_hdcp_interface.h
> index d24f6726e50c..a92925cd1eae 100644
> --- a/include/drm/i915_hdcp_interface.h
> +++ b/include/drm/i915_hdcp_interface.h
> @@ -181,4 +181,359 @@ struct i915_hdcp_master {
> struct mutex mutex;
> };
>
> +/* fw_hdcp_status: Enumeration of all HDCP Status Codes */
> +enum fw_hdcp_status {
> + FW_HDCP_STATUS_SUCCESS = 0x0000,
> +
> + /* WiDi Generic Status Codes */
> + FW_HDCP_STATUS_INTERNAL_ERROR = 0x1000,
> + FW_HDCP_STATUS_UNKNOWN_ERROR = 0x1001,
> + FW_HDCP_STATUS_INCORRECT_API_VERSION = 0x1002,
> + FW_HDCP_STATUS_INVALID_FUNCTION = 0x1003,
> + FW_HDCP_STATUS_INVALID_BUFFER_LENGTH = 0x1004,
> + FW_HDCP_STATUS_INVALID_PARAMS = 0x1005,
> + FW_HDCP_STATUS_AUTHENTICATION_FAILED = 0x1006,
> +
> + /* WiDi Status Codes */
> + FW_HDCP_INVALID_SESSION_STATE = 0x6000,
> + FW_HDCP_SRM_FRAGMENT_UNEXPECTED = 0x6001,
> + FW_HDCP_SRM_INVALID_LENGTH = 0x6002,
> + FW_HDCP_SRM_FRAGMENT_OFFSET_INVALID = 0x6003,
> + FW_HDCP_SRM_VERIFICATION_FAILED = 0x6004,
> + FW_HDCP_SRM_VERSION_TOO_OLD = 0x6005,
> + FW_HDCP_RX_CERT_VERIFICATION_FAILED = 0x6006,
> + FW_HDCP_RX_REVOKED = 0x6007,
> + FW_HDCP_H_VERIFICATION_FAILED = 0x6008,
> + FW_HDCP_REPEATER_CHECK_UNEXPECTED = 0x6009,
> + FW_HDCP_TOPOLOGY_MAX_EXCEEDED = 0x600A,
> + FW_HDCP_V_VERIFICATION_FAILED = 0x600B,
> + FW_HDCP_L_VERIFICATION_FAILED = 0x600C,
> + FW_HDCP_STREAM_KEY_ALLOC_FAILED = 0x600D,
> + FW_HDCP_BASE_KEY_RESET_FAILED = 0x600E,
> + FW_HDCP_NONCE_GENERATION_FAILED = 0x600F,
> + FW_HDCP_STATUS_INVALID_E_KEY_STATE = 0x6010,
> + FW_HDCP_STATUS_INVALID_CS_ICV = 0x6011,
> + FW_HDCP_STATUS_INVALID_KB_KEY_STATE = 0x6012,
> + FW_HDCP_STATUS_INVALID_PAVP_MODE_ICV = 0x6013,
> + FW_HDCP_STATUS_INVALID_PAVP_MODE = 0x6014,
> + FW_HDCP_STATUS_LC_MAX_ATTEMPTS = 0x6015,
> +
> + /* New status for HDCP 2.1 */
> + FW_HDCP_STATUS_MISMATCH_IN_M = 0x6016,
> +
> + /* New status code for HDCP 2.2 Rx */
> + FW_HDCP_STATUS_RX_PROV_NOT_ALLOWED = 0x6017,
> + FW_HDCP_STATUS_RX_PROV_WRONG_SUBJECT = 0x6018,
> + FW_HDCP_RX_NEEDS_PROVISIONING = 0x6019,
> + FW_HDCP_BKSV_ICV_AUTH_FAILED = 0x6020,
> + FW_HDCP_STATUS_INVALID_STREAM_ID = 0x6021,
> + FW_HDCP_STATUS_CHAIN_NOT_INITIALIZED = 0x6022,
> + FW_HDCP_FAIL_NOT_EXPECTED = 0x6023,
> + FW_HDCP_FAIL_HDCP_OFF = 0x6024,
> + FW_HDCP_FAIL_INVALID_PAVP_MEMORY_MODE = 0x6025,
> + FW_HDCP_FAIL_AES_ECB_FAILURE = 0x6026,
> + FW_HDCP_FEATURE_NOT_SUPPORTED = 0x6027,
> + FW_HDCP_DMA_READ_ERROR = 0x6028,
> + FW_HDCP_DMA_WRITE_ERROR = 0x6029,
> + FW_HDCP_FAIL_INVALID_PACKET_SIZE = 0x6030,
> + FW_HDCP_H264_PARSING_ERROR = 0x6031,
> + FW_HDCP_HDCP2_ERRATA_VIDEO_VIOLATION = 0x6032,
> + FW_HDCP_HDCP2_ERRATA_AUDIO_VIOLATION = 0x6033,
> + FW_HDCP_TX_ACTIVE_ERROR = 0x6034,
> + FW_HDCP_MODE_CHANGE_ERROR = 0x6035,
> + FW_HDCP_STREAM_TYPE_ERROR = 0x6036,
> + FW_HDCP_STREAM_MANAGE_NOT_POSSIBLE = 0x6037,
> +
> + FW_HDCP_STATUS_PORT_INVALID_COMMAND = 0x6038,
> + FW_HDCP_STATUS_UNSUPPORTED_PROTOCOL = 0x6039,
> + FW_HDCP_STATUS_INVALID_PORT_INDEX = 0x603a,
> + FW_HDCP_STATUS_TX_AUTH_NEEDED = 0x603b,
> + FW_HDCP_STATUS_NOT_INTEGRATED_PORT = 0x603c,
> + FW_HDCP_STATUS_SESSION_MAX_REACHED = 0x603d,
> +
> + /* hdcp capable bit is not set in rx_caps(error is unique to DP) */
> + FW_HDCP_STATUS_NOT_HDCP_CAPABLE = 0x6041,
> +
> + FW_HDCP_STATUS_INVALID_STREAM_COUNT = 0x6042,
> +};
> +
> +#define HDCP_API_VERSION 0x00010000
> +
> +#define HDCP_M_LEN 16
> +#define HDCP_KH_LEN 16
> +
> +/* Payload Buffer size(Excluding Header) for CMDs and corresponding response */
> +/* Wired_Tx_AKE */
> +#define WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN (4 + 1)
> +#define WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_OUT (4 + 8 + 3)
> +
> +#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN (4 + 522 + 8 + 3)
> +#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_MIN_OUT (4 + 1 + 3 + 16 + 16)
> +#define WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_MAX_OUT (4 + 1 + 3 + 128)
> +
> +#define WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN (4 + 32)
> +#define WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_OUT (4)
> +
> +#define WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN (4 + 16)
> +#define WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_OUT (4)
> +
> +#define WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN (4)
> +#define WIRED_CMD_BUF_LEN_CLOSE_SESSION_OUT (4)
> +
> +/* Wired_Tx_LC */
> +#define WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN (4)
> +#define WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_OUT (4 + 8)
> +
> +#define WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN (4 + 32)
> +#define WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_OUT (4)
> +
> +/* Wired_Tx_SKE */
> +#define WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN (4)
> +#define WIRED_CMD_BUF_LEN_GET_SESSION_KEY_OUT (4 + 16 + 8)
> +
> +/* Wired_Tx_SKE */
> +#define WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN (4 + 1)
> +#define WIRED_CMD_BUF_LEN_ENABLE_AUTH_OUT (4)
> +
> +/* Wired_Tx_Repeater */
> +#define WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN (4 + 2 + 3 + 16 + 155)
> +#define WIRED_CMD_BUF_LEN_VERIFY_REPEATER_OUT (4 + 1 + 16)
> +
> +#define WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_MIN_IN (4 + 3 + \
> + 32 + 2 + 2)
> +
> +#define WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_OUT (4)
> +
> +/* hdcp_command_id: Enumeration of all WIRED HDCP Command IDs */
> +enum hdcp_command_id {
> + _WIDI_COMMAND_BASE = 0x00030000,
> + WIDI_INITIATE_HDCP2_SESSION = _WIDI_COMMAND_BASE,
> + HDCP_GET_SRM_STATUS,
> + HDCP_SEND_SRM_FRAGMENT,
> +
> + /* The wired HDCP Tx commands */
> + _WIRED_COMMAND_BASE = 0x00031000,
> + WIRED_INITIATE_HDCP2_SESSION = _WIRED_COMMAND_BASE,
> + WIRED_VERIFY_RECEIVER_CERT,
> + WIRED_AKE_SEND_HPRIME,
> + WIRED_AKE_SEND_PAIRING_INFO,
> + WIRED_INIT_LOCALITY_CHECK,
> + WIRED_VALIDATE_LOCALITY,
> + WIRED_GET_SESSION_KEY,
> + WIRED_ENABLE_AUTH,
> + WIRED_VERIFY_REPEATER,
> + WIRED_REPEATER_AUTH_STREAM_REQ,
> + WIRED_CLOSE_SESSION,
> +
> + _WIRED_COMMANDS_COUNT,
> +};
> +
> +union encrypted_buff {
> + u8 e_kpub_km[HDCP_2_2_E_KPUB_KM_LEN];
> + u8 e_kh_km_m[HDCP_2_2_E_KH_KM_M_LEN];
> + struct {
> + u8 e_kh_km[HDCP_KH_LEN];
> + u8 m[HDCP_M_LEN];
> + } __packed;
> +};
> +
> +/* HDCP HECI message header. All header values are little endian. */
> +struct hdcp_cmd_header {
> + u32 api_version;
> + u32 command_id;
> + enum fw_hdcp_status status;
> + /* Length of the HECI message (excluding the header) */
> + u32 buffer_len;
> +} __packed;
> +
> +/* Empty command request or response. No data follows the header. */
> +struct hdcp_cmd_no_data {
> + struct hdcp_cmd_header header;
> +} __packed;
> +
> +/* Uniquely identifies the hdcp port being addressed for a given command. */
> +struct hdcp_port_id {
> + u8 integrated_port_type;
> + /* physical_port is used until Gen11.5. Must be zero for Gen11.5+ */
> + u8 physical_port;
> + /* attached_transcoder is for Gen11.5+. Set to zero for <Gen11.5 */
> + u8 attached_transcoder;
> + u8 reserved;
> +} __packed;
> +
> +/*
> + * Data structures for integrated wired HDCP2 Tx in
> + * support of the AKE protocol
> + */
> +/* HECI struct for integrated wired HDCP Tx session initiation. */
> +struct wired_cmd_initiate_hdcp2_session_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 protocol; /* for HDMI vs DP */
> +} __packed;
> +
> +struct wired_cmd_initiate_hdcp2_session_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 r_tx[HDCP_2_2_RTX_LEN];
> + struct hdcp2_tx_caps tx_caps;
> +} __packed;
> +
> +/* HECI struct for ending an integrated wired HDCP Tx session. */
> +struct wired_cmd_close_session_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> +} __packed;
> +
> +struct wired_cmd_close_session_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> +} __packed;
> +
> +/* HECI struct for integrated wired HDCP Tx Rx Cert verification. */
> +struct wired_cmd_verify_receiver_cert_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + struct hdcp2_cert_rx cert_rx;
> + u8 r_rx[HDCP_2_2_RRX_LEN];
> + u8 rx_caps[HDCP_2_2_RXCAPS_LEN];
> +} __packed;
> +
> +struct wired_cmd_verify_receiver_cert_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 km_stored;
> + u8 reserved[3];
> + union encrypted_buff ekm_buff;
> +} __packed;
> +
> +/* HECI struct for verification of Rx's Hprime in a HDCP Tx session */
> +struct wired_cmd_ake_send_hprime_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 h_prime[HDCP_2_2_H_PRIME_LEN];
> +} __packed;
> +
> +struct wired_cmd_ake_send_hprime_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> +} __packed;
> +
> +/*
> + * HECI struct for sending in AKE pairing data generated by the Rx in an
> + * integrated wired HDCP Tx session.
> + */
> +struct wired_cmd_ake_send_pairing_info_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 e_kh_km[HDCP_2_2_E_KH_KM_LEN];
> +} __packed;
> +
> +struct wired_cmd_ake_send_pairing_info_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> +} __packed;
> +
> +/* Data structures for integrated wired HDCP2 Tx in support of the LC protocol*/
> +/*
> + * HECI struct for initiating locality check with an
> + * integrated wired HDCP Tx session.
> + */
> +struct wired_cmd_init_locality_check_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> +} __packed;
> +
> +struct wired_cmd_init_locality_check_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 r_n[HDCP_2_2_RN_LEN];
> +} __packed;
> +
> +/*
> + * HECI struct for validating an Rx's LPrime value in an
> + * integrated wired HDCP Tx session.
> + */
> +struct wired_cmd_validate_locality_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 l_prime[HDCP_2_2_L_PRIME_LEN];
> +} __packed;
> +
> +struct wired_cmd_validate_locality_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> +} __packed;
> +
> +/*
> + * Data structures for integrated wired HDCP2 Tx in support of the
> + * SKE protocol
> + */
> +/* HECI struct for creating session key */
> +struct wired_cmd_get_session_key_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> +} __packed;
> +
> +struct wired_cmd_get_session_key_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 e_dkey_ks[HDCP_2_2_E_DKEY_KS_LEN];
> + u8 r_iv[HDCP_2_2_RIV_LEN];
> +} __packed;
> +
> +/* HECI struct for the Tx enable authentication command */
> +struct wired_cmd_enable_auth_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 stream_type;
> +} __packed;
> +
> +struct wired_cmd_enable_auth_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> +} __packed;
> +
> +/*
> + * Data structures for integrated wired HDCP2 Tx in support of
> + * the repeater protocols
> + */
> +/*
> + * HECI struct for verifying the downstream repeater's HDCP topology in an
> + * integrated wired HDCP Tx session.
> + */
> +struct wired_cmd_verify_repeater_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 rx_info[HDCP_2_2_RXINFO_LEN];
> + u8 seq_num_v[HDCP_2_2_SEQ_NUM_LEN];
> + u8 v_prime[HDCP_2_2_V_PRIME_HALF_LEN];
> + u8 receiver_ids[HDCP_2_2_RECEIVER_IDS_MAX_LEN];
> +} __packed;
> +
> +struct wired_cmd_verify_repeater_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 content_type_supported;
> + u8 v[HDCP_2_2_V_PRIME_HALF_LEN];
> +} __packed;
> +
> +/*
> + * HECI struct in support of stream management in an
> + * integrated wired HDCP Tx session.
> + */
> +struct wired_cmd_repeater_auth_stream_req_in {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> + u8 seq_num_m[HDCP_2_2_SEQ_NUM_LEN];
> + u8 m_prime[HDCP_2_2_MPRIME_LEN];
> + __be16 k;
> + struct hdcp2_streamid_type streams[];
> +} __packed;
> +
> +struct wired_cmd_repeater_auth_stream_req_out {
> + struct hdcp_cmd_header header;
> + struct hdcp_port_id port;
> +} __packed;
> +
> #endif /* _I915_HDCP_INTERFACE_H_ */
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-01-24 4:37 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-10 10:57 [Intel-gfx] [PATCH v7 0/7] Enable HDCP2.x via GSC CS Suraj Kandpal
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 1/6] drm/i915/gsc: Create GSC request submission mechanism Suraj Kandpal
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention Suraj Kandpal
2023-01-20 10:52 ` Nautiyal, Ankit K
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 3/6] i915/hdcp: HDCP2.x Refactoring to agnostic hdcp Suraj Kandpal
2023-01-24 4:19 ` Nautiyal, Ankit K
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 4/6] drm/i915/hdcp: Refactor HDCP API structures Suraj Kandpal
2023-01-24 4:37 ` Nautiyal, Ankit K
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 5/6] drm/i915/mtl: Add function to send command to GSC CS Suraj Kandpal
2023-01-19 7:19 ` Teres Alexis, Alan Previn
2023-01-10 10:57 ` [Intel-gfx] [PATCH v7 6/6] drm/i915/mtl: Add HDCP GSC interface Suraj Kandpal
2023-01-20 10:09 ` Nautiyal, Ankit K
2023-01-10 12:03 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Enable HDCP2.x via GSC CS (rev7) Patchwork
2023-01-10 12:20 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-01-10 16:17 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.