* [PATCH v2 0/2] HDCP 2.2 DP errata
@ 2021-03-24 11:30 Anshuman Gupta
2021-03-24 11:30 ` [PATCH v2 1/2] drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg Anshuman Gupta
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Anshuman Gupta @ 2021-03-24 11:30 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Anshuman Gupta, ankit.k.nautiyal, maarten.lankhorst
HDCP DP 2.2 errata is part of HDCP DP 2.3 specs
as well.
Anshuman Gupta (2):
drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg
drm/hdcp: DP HDCP2.2 errata LC_Send_L_Prime=16
drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 45 ++++++++++++++------
include/drm/drm_hdcp.h | 5 ++-
2 files changed, 36 insertions(+), 14 deletions(-)
--
2.26.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg
2021-03-24 11:30 [PATCH v2 0/2] HDCP 2.2 DP errata Anshuman Gupta
@ 2021-03-24 11:30 ` Anshuman Gupta
2021-03-25 6:51 ` Nautiyal, Ankit K
2021-03-24 11:30 ` [PATCH v2 2/2] drm/hdcp: DP HDCP2.2 errata LC_Send_L_Prime=16 Anshuman Gupta
2021-03-25 13:39 ` [Intel-gfx] [PATCH v2 0/2] HDCP 2.2 DP errata Jani Nikula
2 siblings, 1 reply; 7+ messages in thread
From: Anshuman Gupta @ 2021-03-24 11:30 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Anshuman Gupta, ankit.k.nautiyal, maarten.lankhorst
As documented in HDCP 2.2 DP Errata spec transmitter should abort the
authentication protocol in case transmitter has not received the
entire {AKE_Send_Cert, AKE_Send_H_prime, AKE_Send_Paring_Info} msg
within {110,7,5} miliseconds.
Adding above msg timeout values and aborting the HDCP authentication
in case it timedout to read entire msg.
https://www.digital-cp.com/sites/default/files/HDCP%202_2_DisplayPort_Errata_v3_0.pdf
v2:
- Removed redundant variable msg_can_timedout. [Ankit]
Cc: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 45 ++++++++++++++------
include/drm/drm_hdcp.h | 3 ++
2 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index 40c516e90193..8bad4b3d34dd 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
@@ -294,37 +294,39 @@ struct hdcp2_dp_msg_data {
bool msg_detectable;
u32 timeout;
u32 timeout2; /* Added for non_paired situation */
+ /* Timeout to read entire msg */
+ u32 msg_read_timeout;
};
static const struct hdcp2_dp_msg_data hdcp2_dp_msg_data[] = {
- { HDCP_2_2_AKE_INIT, DP_HDCP_2_2_AKE_INIT_OFFSET, false, 0, 0 },
+ { HDCP_2_2_AKE_INIT, DP_HDCP_2_2_AKE_INIT_OFFSET, false, 0, 0, 0},
{ HDCP_2_2_AKE_SEND_CERT, DP_HDCP_2_2_AKE_SEND_CERT_OFFSET,
- false, HDCP_2_2_CERT_TIMEOUT_MS, 0 },
+ false, HDCP_2_2_CERT_TIMEOUT_MS, 0, HDCP_2_2_DP_CERT_READ_TIMEOUT_MS},
{ HDCP_2_2_AKE_NO_STORED_KM, DP_HDCP_2_2_AKE_NO_STORED_KM_OFFSET,
- false, 0, 0 },
+ false, 0, 0, 0 },
{ HDCP_2_2_AKE_STORED_KM, DP_HDCP_2_2_AKE_STORED_KM_OFFSET,
- false, 0, 0 },
+ false, 0, 0, 0 },
{ HDCP_2_2_AKE_SEND_HPRIME, DP_HDCP_2_2_AKE_SEND_HPRIME_OFFSET,
true, HDCP_2_2_HPRIME_PAIRED_TIMEOUT_MS,
- HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS },
+ HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS, HDCP_2_2_DP_HPRIME_READ_TIMEOUT_MS},
{ HDCP_2_2_AKE_SEND_PAIRING_INFO,
DP_HDCP_2_2_AKE_SEND_PAIRING_INFO_OFFSET, true,
- HDCP_2_2_PAIRING_TIMEOUT_MS, 0 },
- { HDCP_2_2_LC_INIT, DP_HDCP_2_2_LC_INIT_OFFSET, false, 0, 0 },
+ HDCP_2_2_PAIRING_TIMEOUT_MS, 0, HDCP_2_2_DP_PAIRING_READ_TIMEOUT_MS },
+ { HDCP_2_2_LC_INIT, DP_HDCP_2_2_LC_INIT_OFFSET, false, 0, 0, 0 },
{ HDCP_2_2_LC_SEND_LPRIME, DP_HDCP_2_2_LC_SEND_LPRIME_OFFSET,
- false, HDCP_2_2_DP_LPRIME_TIMEOUT_MS, 0 },
+ false, HDCP_2_2_DP_LPRIME_TIMEOUT_MS, 0, 0 },
{ HDCP_2_2_SKE_SEND_EKS, DP_HDCP_2_2_SKE_SEND_EKS_OFFSET, false,
- 0, 0 },
+ 0, 0, 0 },
{ HDCP_2_2_REP_SEND_RECVID_LIST,
DP_HDCP_2_2_REP_SEND_RECVID_LIST_OFFSET, true,
- HDCP_2_2_RECVID_LIST_TIMEOUT_MS, 0 },
+ HDCP_2_2_RECVID_LIST_TIMEOUT_MS, 0, 0 },
{ HDCP_2_2_REP_SEND_ACK, DP_HDCP_2_2_REP_SEND_ACK_OFFSET, false,
- 0, 0 },
+ 0, 0, 0 },
{ HDCP_2_2_REP_STREAM_MANAGE,
DP_HDCP_2_2_REP_STREAM_MANAGE_OFFSET, false,
- 0, 0 },
+ 0, 0, 0},
{ HDCP_2_2_REP_STREAM_READY, DP_HDCP_2_2_REP_STREAM_READY_OFFSET,
- false, HDCP_2_2_STREAM_READY_TIMEOUT_MS, 0 },
+ false, HDCP_2_2_STREAM_READY_TIMEOUT_MS, 0, 0 },
/* local define to shovel this through the write_2_2 interface */
#define HDCP_2_2_ERRATA_DP_STREAM_TYPE 50
{ HDCP_2_2_ERRATA_DP_STREAM_TYPE,
@@ -513,6 +515,8 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port,
u8 *byte = buf;
ssize_t ret, bytes_to_recv, len;
const struct hdcp2_dp_msg_data *hdcp2_msg_data;
+ ktime_t msg_end;
+ bool msg_expired;
hdcp2_msg_data = get_hdcp2_dp_msg_data(msg_id);
if (!hdcp2_msg_data)
@@ -539,6 +543,11 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port,
len = bytes_to_recv > DP_AUX_MAX_PAYLOAD_BYTES ?
DP_AUX_MAX_PAYLOAD_BYTES : bytes_to_recv;
+ /* Entire msg read timeout since initiate of msg read */
+ if (bytes_to_recv == size - 1 && hdcp2_msg_data->msg_read_timeout > 0)
+ msg_end = ktime_add_ms(ktime_get_raw(),
+ hdcp2_msg_data->msg_read_timeout);
+
ret = drm_dp_dpcd_read(&dig_port->dp.aux, offset,
(void *)byte, len);
if (ret < 0) {
@@ -551,6 +560,16 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port,
byte += ret;
offset += ret;
}
+
+ if (hdcp2_msg_data->msg_read_timeout > 0) {
+ msg_expired = ktime_after(ktime_get_raw(), msg_end);
+ if (msg_expired) {
+ drm_dbg_kms(&i915->drm, "msg_id %d, entire msg read timeout(mSec): %d\n",
+ msg_id, hdcp2_msg_data->msg_read_timeout);
+ return -ETIMEDOUT;
+ }
+ }
+
byte = buf;
*byte = msg_id;
diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
index ac22c246542a..2b165a0f434f 100644
--- a/include/drm/drm_hdcp.h
+++ b/include/drm/drm_hdcp.h
@@ -224,9 +224,12 @@ struct hdcp2_rep_stream_ready {
/* HDCP2.2 TIMEOUTs in mSec */
#define HDCP_2_2_CERT_TIMEOUT_MS 100
+#define HDCP_2_2_DP_CERT_READ_TIMEOUT_MS 110
#define HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS 1000
#define HDCP_2_2_HPRIME_PAIRED_TIMEOUT_MS 200
+#define HDCP_2_2_DP_HPRIME_READ_TIMEOUT_MS 7
#define HDCP_2_2_PAIRING_TIMEOUT_MS 200
+#define HDCP_2_2_DP_PAIRING_READ_TIMEOUT_MS 5
#define HDCP_2_2_HDMI_LPRIME_TIMEOUT_MS 20
#define HDCP_2_2_DP_LPRIME_TIMEOUT_MS 7
#define HDCP_2_2_RECVID_LIST_TIMEOUT_MS 3000
--
2.26.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] drm/hdcp: DP HDCP2.2 errata LC_Send_L_Prime=16
2021-03-24 11:30 [PATCH v2 0/2] HDCP 2.2 DP errata Anshuman Gupta
2021-03-24 11:30 ` [PATCH v2 1/2] drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg Anshuman Gupta
@ 2021-03-24 11:30 ` Anshuman Gupta
2021-03-25 13:39 ` [Intel-gfx] [PATCH v2 0/2] HDCP 2.2 DP errata Jani Nikula
2 siblings, 0 replies; 7+ messages in thread
From: Anshuman Gupta @ 2021-03-24 11:30 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Anshuman Gupta, ankit.k.nautiyal, maarten.lankhorst
Fix LC_Send_L_Prime message timeout to 16 as documented
in DP HDCP 2.2 errata page 3.
https://www.digital-cp.com/sites/default/files/HDCP%202_2_DisplayPort_Errata_v3_0.pdf
Cc: Ramalingam C <ramalingam.c@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
include/drm/drm_hdcp.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
index 2b165a0f434f..0b1111e3228e 100644
--- a/include/drm/drm_hdcp.h
+++ b/include/drm/drm_hdcp.h
@@ -231,7 +231,7 @@ struct hdcp2_rep_stream_ready {
#define HDCP_2_2_PAIRING_TIMEOUT_MS 200
#define HDCP_2_2_DP_PAIRING_READ_TIMEOUT_MS 5
#define HDCP_2_2_HDMI_LPRIME_TIMEOUT_MS 20
-#define HDCP_2_2_DP_LPRIME_TIMEOUT_MS 7
+#define HDCP_2_2_DP_LPRIME_TIMEOUT_MS 16
#define HDCP_2_2_RECVID_LIST_TIMEOUT_MS 3000
#define HDCP_2_2_STREAM_READY_TIMEOUT_MS 100
--
2.26.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg
2021-03-24 11:30 ` [PATCH v2 1/2] drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg Anshuman Gupta
@ 2021-03-25 6:51 ` Nautiyal, Ankit K
2021-03-31 11:38 ` [Intel-gfx] " Jani Nikula
0 siblings, 1 reply; 7+ messages in thread
From: Nautiyal, Ankit K @ 2021-03-25 6:51 UTC (permalink / raw)
To: Anshuman Gupta, intel-gfx, dri-devel; +Cc: maarten.lankhorst
LGTM.
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
On 3/24/2021 5:00 PM, Anshuman Gupta wrote:
> As documented in HDCP 2.2 DP Errata spec transmitter should abort the
> authentication protocol in case transmitter has not received the
> entire {AKE_Send_Cert, AKE_Send_H_prime, AKE_Send_Paring_Info} msg
> within {110,7,5} miliseconds.
>
> Adding above msg timeout values and aborting the HDCP authentication
> in case it timedout to read entire msg.
>
> https://www.digital-cp.com/sites/default/files/HDCP%202_2_DisplayPort_Errata_v3_0.pdf
>
> v2:
> - Removed redundant variable msg_can_timedout. [Ankit]
>
> Cc: Ramalingam C <ramalingam.c@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 45 ++++++++++++++------
> include/drm/drm_hdcp.h | 3 ++
> 2 files changed, 35 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> index 40c516e90193..8bad4b3d34dd 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> @@ -294,37 +294,39 @@ struct hdcp2_dp_msg_data {
> bool msg_detectable;
> u32 timeout;
> u32 timeout2; /* Added for non_paired situation */
> + /* Timeout to read entire msg */
> + u32 msg_read_timeout;
> };
>
> static const struct hdcp2_dp_msg_data hdcp2_dp_msg_data[] = {
> - { HDCP_2_2_AKE_INIT, DP_HDCP_2_2_AKE_INIT_OFFSET, false, 0, 0 },
> + { HDCP_2_2_AKE_INIT, DP_HDCP_2_2_AKE_INIT_OFFSET, false, 0, 0, 0},
> { HDCP_2_2_AKE_SEND_CERT, DP_HDCP_2_2_AKE_SEND_CERT_OFFSET,
> - false, HDCP_2_2_CERT_TIMEOUT_MS, 0 },
> + false, HDCP_2_2_CERT_TIMEOUT_MS, 0, HDCP_2_2_DP_CERT_READ_TIMEOUT_MS},
> { HDCP_2_2_AKE_NO_STORED_KM, DP_HDCP_2_2_AKE_NO_STORED_KM_OFFSET,
> - false, 0, 0 },
> + false, 0, 0, 0 },
> { HDCP_2_2_AKE_STORED_KM, DP_HDCP_2_2_AKE_STORED_KM_OFFSET,
> - false, 0, 0 },
> + false, 0, 0, 0 },
> { HDCP_2_2_AKE_SEND_HPRIME, DP_HDCP_2_2_AKE_SEND_HPRIME_OFFSET,
> true, HDCP_2_2_HPRIME_PAIRED_TIMEOUT_MS,
> - HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS },
> + HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS, HDCP_2_2_DP_HPRIME_READ_TIMEOUT_MS},
> { HDCP_2_2_AKE_SEND_PAIRING_INFO,
> DP_HDCP_2_2_AKE_SEND_PAIRING_INFO_OFFSET, true,
> - HDCP_2_2_PAIRING_TIMEOUT_MS, 0 },
> - { HDCP_2_2_LC_INIT, DP_HDCP_2_2_LC_INIT_OFFSET, false, 0, 0 },
> + HDCP_2_2_PAIRING_TIMEOUT_MS, 0, HDCP_2_2_DP_PAIRING_READ_TIMEOUT_MS },
> + { HDCP_2_2_LC_INIT, DP_HDCP_2_2_LC_INIT_OFFSET, false, 0, 0, 0 },
> { HDCP_2_2_LC_SEND_LPRIME, DP_HDCP_2_2_LC_SEND_LPRIME_OFFSET,
> - false, HDCP_2_2_DP_LPRIME_TIMEOUT_MS, 0 },
> + false, HDCP_2_2_DP_LPRIME_TIMEOUT_MS, 0, 0 },
> { HDCP_2_2_SKE_SEND_EKS, DP_HDCP_2_2_SKE_SEND_EKS_OFFSET, false,
> - 0, 0 },
> + 0, 0, 0 },
> { HDCP_2_2_REP_SEND_RECVID_LIST,
> DP_HDCP_2_2_REP_SEND_RECVID_LIST_OFFSET, true,
> - HDCP_2_2_RECVID_LIST_TIMEOUT_MS, 0 },
> + HDCP_2_2_RECVID_LIST_TIMEOUT_MS, 0, 0 },
> { HDCP_2_2_REP_SEND_ACK, DP_HDCP_2_2_REP_SEND_ACK_OFFSET, false,
> - 0, 0 },
> + 0, 0, 0 },
> { HDCP_2_2_REP_STREAM_MANAGE,
> DP_HDCP_2_2_REP_STREAM_MANAGE_OFFSET, false,
> - 0, 0 },
> + 0, 0, 0},
> { HDCP_2_2_REP_STREAM_READY, DP_HDCP_2_2_REP_STREAM_READY_OFFSET,
> - false, HDCP_2_2_STREAM_READY_TIMEOUT_MS, 0 },
> + false, HDCP_2_2_STREAM_READY_TIMEOUT_MS, 0, 0 },
> /* local define to shovel this through the write_2_2 interface */
> #define HDCP_2_2_ERRATA_DP_STREAM_TYPE 50
> { HDCP_2_2_ERRATA_DP_STREAM_TYPE,
> @@ -513,6 +515,8 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port,
> u8 *byte = buf;
> ssize_t ret, bytes_to_recv, len;
> const struct hdcp2_dp_msg_data *hdcp2_msg_data;
> + ktime_t msg_end;
> + bool msg_expired;
>
> hdcp2_msg_data = get_hdcp2_dp_msg_data(msg_id);
> if (!hdcp2_msg_data)
> @@ -539,6 +543,11 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port,
> len = bytes_to_recv > DP_AUX_MAX_PAYLOAD_BYTES ?
> DP_AUX_MAX_PAYLOAD_BYTES : bytes_to_recv;
>
> + /* Entire msg read timeout since initiate of msg read */
> + if (bytes_to_recv == size - 1 && hdcp2_msg_data->msg_read_timeout > 0)
> + msg_end = ktime_add_ms(ktime_get_raw(),
> + hdcp2_msg_data->msg_read_timeout);
> +
> ret = drm_dp_dpcd_read(&dig_port->dp.aux, offset,
> (void *)byte, len);
> if (ret < 0) {
> @@ -551,6 +560,16 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port,
> byte += ret;
> offset += ret;
> }
> +
> + if (hdcp2_msg_data->msg_read_timeout > 0) {
> + msg_expired = ktime_after(ktime_get_raw(), msg_end);
> + if (msg_expired) {
> + drm_dbg_kms(&i915->drm, "msg_id %d, entire msg read timeout(mSec): %d\n",
> + msg_id, hdcp2_msg_data->msg_read_timeout);
> + return -ETIMEDOUT;
> + }
> + }
> +
> byte = buf;
> *byte = msg_id;
>
> diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
> index ac22c246542a..2b165a0f434f 100644
> --- a/include/drm/drm_hdcp.h
> +++ b/include/drm/drm_hdcp.h
> @@ -224,9 +224,12 @@ struct hdcp2_rep_stream_ready {
>
> /* HDCP2.2 TIMEOUTs in mSec */
> #define HDCP_2_2_CERT_TIMEOUT_MS 100
> +#define HDCP_2_2_DP_CERT_READ_TIMEOUT_MS 110
> #define HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS 1000
> #define HDCP_2_2_HPRIME_PAIRED_TIMEOUT_MS 200
> +#define HDCP_2_2_DP_HPRIME_READ_TIMEOUT_MS 7
> #define HDCP_2_2_PAIRING_TIMEOUT_MS 200
> +#define HDCP_2_2_DP_PAIRING_READ_TIMEOUT_MS 5
> #define HDCP_2_2_HDMI_LPRIME_TIMEOUT_MS 20
> #define HDCP_2_2_DP_LPRIME_TIMEOUT_MS 7
> #define HDCP_2_2_RECVID_LIST_TIMEOUT_MS 3000
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] [PATCH v2 0/2] HDCP 2.2 DP errata
2021-03-24 11:30 [PATCH v2 0/2] HDCP 2.2 DP errata Anshuman Gupta
2021-03-24 11:30 ` [PATCH v2 1/2] drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg Anshuman Gupta
2021-03-24 11:30 ` [PATCH v2 2/2] drm/hdcp: DP HDCP2.2 errata LC_Send_L_Prime=16 Anshuman Gupta
@ 2021-03-25 13:39 ` Jani Nikula
2021-03-31 10:22 ` Jani Nikula
2 siblings, 1 reply; 7+ messages in thread
From: Jani Nikula @ 2021-03-25 13:39 UTC (permalink / raw)
To: Anshuman Gupta, intel-gfx, dri-devel; +Cc: Thomas Zimmermann
On Wed, 24 Mar 2021, Anshuman Gupta <anshuman.gupta@intel.com> wrote:
> HDCP DP 2.2 errata is part of HDCP DP 2.3 specs
> as well.
>
> Anshuman Gupta (2):
> drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg
> drm/hdcp: DP HDCP2.2 errata LC_Send_L_Prime=16
>
> drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 45 ++++++++++++++------
> include/drm/drm_hdcp.h | 5 ++-
> 2 files changed, 36 insertions(+), 14 deletions(-)
Maarten, Maxime, Thomas -
Can I get an ack for merging this via drm-intel-next, please?
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] [PATCH v2 0/2] HDCP 2.2 DP errata
2021-03-25 13:39 ` [Intel-gfx] [PATCH v2 0/2] HDCP 2.2 DP errata Jani Nikula
@ 2021-03-31 10:22 ` Jani Nikula
0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2021-03-31 10:22 UTC (permalink / raw)
To: Anshuman Gupta, intel-gfx, dri-devel; +Cc: Thomas Zimmermann
On Thu, 25 Mar 2021, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Wed, 24 Mar 2021, Anshuman Gupta <anshuman.gupta@intel.com> wrote:
>> HDCP DP 2.2 errata is part of HDCP DP 2.3 specs
>> as well.
>>
>> Anshuman Gupta (2):
>> drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg
>> drm/hdcp: DP HDCP2.2 errata LC_Send_L_Prime=16
>>
>> drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 45 ++++++++++++++------
>> include/drm/drm_hdcp.h | 5 ++-
>> 2 files changed, 36 insertions(+), 14 deletions(-)
>
> Maarten, Maxime, Thomas -
>
> Can I get an ack for merging this via drm-intel-next, please?
Ping! :)
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] [PATCH v2 1/2] drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg
2021-03-25 6:51 ` Nautiyal, Ankit K
@ 2021-03-31 11:38 ` Jani Nikula
0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2021-03-31 11:38 UTC (permalink / raw)
To: Nautiyal, Ankit K, Anshuman Gupta, intel-gfx, dri-devel; +Cc: maarten.lankhorst
On Thu, 25 Mar 2021, "Nautiyal, Ankit K" <ankit.k.nautiyal@intel.com> wrote:
> LGTM.
>
> Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Both patches pushed to drm-intel-next with Maxime's irc ack.
BR,
Jani.
>
> On 3/24/2021 5:00 PM, Anshuman Gupta wrote:
>> As documented in HDCP 2.2 DP Errata spec transmitter should abort the
>> authentication protocol in case transmitter has not received the
>> entire {AKE_Send_Cert, AKE_Send_H_prime, AKE_Send_Paring_Info} msg
>> within {110,7,5} miliseconds.
>>
>> Adding above msg timeout values and aborting the HDCP authentication
>> in case it timedout to read entire msg.
>>
>> https://www.digital-cp.com/sites/default/files/HDCP%202_2_DisplayPort_Errata_v3_0.pdf
>>
>> v2:
>> - Removed redundant variable msg_can_timedout. [Ankit]
>>
>> Cc: Ramalingam C <ramalingam.c@intel.com>
>> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
>> ---
>> drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 45 ++++++++++++++------
>> include/drm/drm_hdcp.h | 3 ++
>> 2 files changed, 35 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
>> index 40c516e90193..8bad4b3d34dd 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
>> @@ -294,37 +294,39 @@ struct hdcp2_dp_msg_data {
>> bool msg_detectable;
>> u32 timeout;
>> u32 timeout2; /* Added for non_paired situation */
>> + /* Timeout to read entire msg */
>> + u32 msg_read_timeout;
>> };
>>
>> static const struct hdcp2_dp_msg_data hdcp2_dp_msg_data[] = {
>> - { HDCP_2_2_AKE_INIT, DP_HDCP_2_2_AKE_INIT_OFFSET, false, 0, 0 },
>> + { HDCP_2_2_AKE_INIT, DP_HDCP_2_2_AKE_INIT_OFFSET, false, 0, 0, 0},
>> { HDCP_2_2_AKE_SEND_CERT, DP_HDCP_2_2_AKE_SEND_CERT_OFFSET,
>> - false, HDCP_2_2_CERT_TIMEOUT_MS, 0 },
>> + false, HDCP_2_2_CERT_TIMEOUT_MS, 0, HDCP_2_2_DP_CERT_READ_TIMEOUT_MS},
>> { HDCP_2_2_AKE_NO_STORED_KM, DP_HDCP_2_2_AKE_NO_STORED_KM_OFFSET,
>> - false, 0, 0 },
>> + false, 0, 0, 0 },
>> { HDCP_2_2_AKE_STORED_KM, DP_HDCP_2_2_AKE_STORED_KM_OFFSET,
>> - false, 0, 0 },
>> + false, 0, 0, 0 },
>> { HDCP_2_2_AKE_SEND_HPRIME, DP_HDCP_2_2_AKE_SEND_HPRIME_OFFSET,
>> true, HDCP_2_2_HPRIME_PAIRED_TIMEOUT_MS,
>> - HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS },
>> + HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS, HDCP_2_2_DP_HPRIME_READ_TIMEOUT_MS},
>> { HDCP_2_2_AKE_SEND_PAIRING_INFO,
>> DP_HDCP_2_2_AKE_SEND_PAIRING_INFO_OFFSET, true,
>> - HDCP_2_2_PAIRING_TIMEOUT_MS, 0 },
>> - { HDCP_2_2_LC_INIT, DP_HDCP_2_2_LC_INIT_OFFSET, false, 0, 0 },
>> + HDCP_2_2_PAIRING_TIMEOUT_MS, 0, HDCP_2_2_DP_PAIRING_READ_TIMEOUT_MS },
>> + { HDCP_2_2_LC_INIT, DP_HDCP_2_2_LC_INIT_OFFSET, false, 0, 0, 0 },
>> { HDCP_2_2_LC_SEND_LPRIME, DP_HDCP_2_2_LC_SEND_LPRIME_OFFSET,
>> - false, HDCP_2_2_DP_LPRIME_TIMEOUT_MS, 0 },
>> + false, HDCP_2_2_DP_LPRIME_TIMEOUT_MS, 0, 0 },
>> { HDCP_2_2_SKE_SEND_EKS, DP_HDCP_2_2_SKE_SEND_EKS_OFFSET, false,
>> - 0, 0 },
>> + 0, 0, 0 },
>> { HDCP_2_2_REP_SEND_RECVID_LIST,
>> DP_HDCP_2_2_REP_SEND_RECVID_LIST_OFFSET, true,
>> - HDCP_2_2_RECVID_LIST_TIMEOUT_MS, 0 },
>> + HDCP_2_2_RECVID_LIST_TIMEOUT_MS, 0, 0 },
>> { HDCP_2_2_REP_SEND_ACK, DP_HDCP_2_2_REP_SEND_ACK_OFFSET, false,
>> - 0, 0 },
>> + 0, 0, 0 },
>> { HDCP_2_2_REP_STREAM_MANAGE,
>> DP_HDCP_2_2_REP_STREAM_MANAGE_OFFSET, false,
>> - 0, 0 },
>> + 0, 0, 0},
>> { HDCP_2_2_REP_STREAM_READY, DP_HDCP_2_2_REP_STREAM_READY_OFFSET,
>> - false, HDCP_2_2_STREAM_READY_TIMEOUT_MS, 0 },
>> + false, HDCP_2_2_STREAM_READY_TIMEOUT_MS, 0, 0 },
>> /* local define to shovel this through the write_2_2 interface */
>> #define HDCP_2_2_ERRATA_DP_STREAM_TYPE 50
>> { HDCP_2_2_ERRATA_DP_STREAM_TYPE,
>> @@ -513,6 +515,8 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port,
>> u8 *byte = buf;
>> ssize_t ret, bytes_to_recv, len;
>> const struct hdcp2_dp_msg_data *hdcp2_msg_data;
>> + ktime_t msg_end;
>> + bool msg_expired;
>>
>> hdcp2_msg_data = get_hdcp2_dp_msg_data(msg_id);
>> if (!hdcp2_msg_data)
>> @@ -539,6 +543,11 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port,
>> len = bytes_to_recv > DP_AUX_MAX_PAYLOAD_BYTES ?
>> DP_AUX_MAX_PAYLOAD_BYTES : bytes_to_recv;
>>
>> + /* Entire msg read timeout since initiate of msg read */
>> + if (bytes_to_recv == size - 1 && hdcp2_msg_data->msg_read_timeout > 0)
>> + msg_end = ktime_add_ms(ktime_get_raw(),
>> + hdcp2_msg_data->msg_read_timeout);
>> +
>> ret = drm_dp_dpcd_read(&dig_port->dp.aux, offset,
>> (void *)byte, len);
>> if (ret < 0) {
>> @@ -551,6 +560,16 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port,
>> byte += ret;
>> offset += ret;
>> }
>> +
>> + if (hdcp2_msg_data->msg_read_timeout > 0) {
>> + msg_expired = ktime_after(ktime_get_raw(), msg_end);
>> + if (msg_expired) {
>> + drm_dbg_kms(&i915->drm, "msg_id %d, entire msg read timeout(mSec): %d\n",
>> + msg_id, hdcp2_msg_data->msg_read_timeout);
>> + return -ETIMEDOUT;
>> + }
>> + }
>> +
>> byte = buf;
>> *byte = msg_id;
>>
>> diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
>> index ac22c246542a..2b165a0f434f 100644
>> --- a/include/drm/drm_hdcp.h
>> +++ b/include/drm/drm_hdcp.h
>> @@ -224,9 +224,12 @@ struct hdcp2_rep_stream_ready {
>>
>> /* HDCP2.2 TIMEOUTs in mSec */
>> #define HDCP_2_2_CERT_TIMEOUT_MS 100
>> +#define HDCP_2_2_DP_CERT_READ_TIMEOUT_MS 110
>> #define HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT_MS 1000
>> #define HDCP_2_2_HPRIME_PAIRED_TIMEOUT_MS 200
>> +#define HDCP_2_2_DP_HPRIME_READ_TIMEOUT_MS 7
>> #define HDCP_2_2_PAIRING_TIMEOUT_MS 200
>> +#define HDCP_2_2_DP_PAIRING_READ_TIMEOUT_MS 5
>> #define HDCP_2_2_HDMI_LPRIME_TIMEOUT_MS 20
>> #define HDCP_2_2_DP_LPRIME_TIMEOUT_MS 7
>> #define HDCP_2_2_RECVID_LIST_TIMEOUT_MS 3000
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-03-31 11:38 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-24 11:30 [PATCH v2 0/2] HDCP 2.2 DP errata Anshuman Gupta
2021-03-24 11:30 ` [PATCH v2 1/2] drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg Anshuman Gupta
2021-03-25 6:51 ` Nautiyal, Ankit K
2021-03-31 11:38 ` [Intel-gfx] " Jani Nikula
2021-03-24 11:30 ` [PATCH v2 2/2] drm/hdcp: DP HDCP2.2 errata LC_Send_L_Prime=16 Anshuman Gupta
2021-03-25 13:39 ` [Intel-gfx] [PATCH v2 0/2] HDCP 2.2 DP errata Jani Nikula
2021-03-31 10:22 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).