drm/i915: Implement HDCP2.2
Subsystems (5)
v3 cover drm/i915: Implement HDCP2.2
The sequence for HDCP2.2 authentication and encryption is implemented in I915. Encoder specific implementations are moved into hdcp_shim.
Intel HWs supports HDCP2.2 through ME FW. Hence this series introduces a client driver for mei bus, so that for HDCP2.2 authentication, HDCP2.2 stack in I915 can avail the services from ME FW.
Userspace interface remains unchanged as version agnostic. When userspace request for HDCP enable, Kernel will detect the HDCP source and sink's HDCP version(1.4/2.2)capability and enable the best capable version for that combination.
This series enables the HDCP2.2 for Type0 content streams.
Major Changes in v3:
- Few patches are squashed in mei related code [Tomas]
- Kernel Notifier is used for sync between mei_hdcp driver and I915 [Tomas]
- mei_cl_device is passed to mei_hdcp driver as an arg [Tomas]
- dropped double check of cl_device [Tomas]
- Used the Dual Licenses and SPDX Notation for new files and drivers [Tomas]
- wait_queue is used instead of completion for CP_IRQ [Chris Wilson]
- mei_cl_device reference is removed from i915_dev_private
- notification of mei_cldev change is handled for each connector
Ramalingam C (39):
drm: hdcp2.2 authentication msg definitions
drm: HDMI and DP specific HDCP2.2 defines misc/mei/hdcp: Client driver for HDCP application misc/mei/hdcp: Notifier chain for mei cldev state change misc/mei/hdcp: Define ME FW interface for HDCP2.2 linux/mei: Header for mei_hdcp driver interface misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session misc/mei/hdcp: Verify Receiver Cert and prepare km misc/mei/hdcp: Verify H_prime
misc/mei/hdcp: Store the HDCP Pairing info misc/mei/hdcp: Initiate Locality check misc/mei/hdcp: Verify L_prime
misc/mei/hdcp: Prepare Session Key misc/mei/hdcp: Repeater topology verifcation and ack misc/mei/hdcp: Verify M_prime
misc/mei/hdcp: Enabling the HDCP authentication misc/mei/hdcp: Closing wired HDCP2.2 Tx Session drm/i915: wrapping all hdcp var into intel_hdcp drm/i915: Define HDCP2.2 related variables drm/i915: Define Intel HDCP2.2 registers drm/i915: Wrappers for mei HDCP2.2 services drm/i915: Implement HDCP2.2 receiver authentication drm/i915: Implement HDCP2.2 repeater authentication drm/i915: Enable and Disable HDCP2.2 port encryption drm/i915: Implement HDCP2.2 En/Dis-able drm/i915: Implement HDCP2.2 link integrity check drm/i915: Handle HDCP2.2 downstream topology change drm/i915: Pullout the bksv read and validation drm/i915: Initialize HDCP2.2 and its MEI interface drm/i915: Schedule hdcp_check_link in _intel_hdcp_enable drm/i915: Enable superior HDCP ver that is capable drm/i915: Enable HDCP1.4 incase of HDCP2.2 failure drm/i915: hdcp_check_link only on CP_IRQ drm/i915: Check HDCP 1.4 and 2.2 link on CP_IRQ drm/i915: Implement gmbus burst read
drm/i915: Implement the HDCP2.2 support for DP drm/i915: Implement the HDCP2.2 support for HDMI drm/i915: Add HDCP2.2 support for DP connectors drm/i915: Add HDCP2.2 support for HDMI connectors
Tomas Winkler (1):
mei: bus: whitelist hdcp client
drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 35 ++ drivers/gpu/drm/i915/intel_display.c | 7 +- drivers/gpu/drm/i915/intel_dp.c | 364 +++++++++++- drivers/gpu/drm/i915/intel_drv.h | 88 ++- drivers/gpu/drm/i915/intel_hdcp.c | 1090 ++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_hdmi.c | 206 ++++++- drivers/gpu/drm/i915/intel_i2c.c | 124 +++- drivers/misc/mei/Kconfig | 6 + drivers/misc/mei/Makefile | 2 + drivers/misc/mei/bus-fixup.c | 16 + drivers/misc/mei/hdcp/Makefile | 6 + drivers/misc/mei/hdcp/mei_hdcp.c | 809 +++++++++++++++++++++++++ drivers/misc/mei/hdcp/mei_hdcp.h | 415 +++++++++++++ include/drm/drm_dp_helper.h | 54 ++ include/drm/drm_hdcp.h | 220 +++++++ include/linux/mei_hdcp.h | 227 +++++++ 17 files changed, 3573 insertions(+), 98 deletions(-) create mode 100644 drivers/misc/mei/hdcp/Makefile create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.c create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.h create mode 100644 include/linux/mei_hdcp.h
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/40 drm: hdcp2.2 authentication msg definitions
This patch defines the hdcp2.2 protocol messages for the HDCP2.2 authentication.
v2:
bit_fields are removed. Instead bitmasking used. [Tomas and Jani] prefix HDCP_2_2_ is added to the macros. [Tomas]
v3:
No Changes.
--- include/drm/drm_hdcp.h | 183 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+)
include/drm/drm_hdcp.h +183 -0
@@ -38,4 +38,187 @@#define DRM_HDCP_DDC_BSTATUS 0x41#define DRM_HDCP_DDC_KSV_FIFO 0x43 +#define DRM_HDCP_1_4_SRM_ID 0x8 +#define DRM_HDCP_1_4_VRL_LENGTH_SIZE 3 +#define DRM_HDCP_1_4_DCP_SIG_SIZE 40 + +/** +* Protocol message definition for HDCP2.2 specification +*/ + +#define HDCP_STREAM_TYPE0 0x00 +#define HDCP_STREAM_TYPE1 0x01 + +/* HDCP2.2 Msg IDs */ +#define HDCP_2_2_NULL_MSG 1 +#define HDCP_2_2_AKE_INIT 2 +#define HDCP_2_2_AKE_SEND_CERT 3 +#define HDCP_2_2_AKE_NO_STORED_KM 4 +#define HDCP_2_2_AKE_STORED_KM 5 +#define HDCP_2_2_AKE_SEND_HPRIME 7 +#define HDCP_2_2_AKE_SEND_PARING_INFO 8 +#define HDCP_2_2_LC_INIT 9 +#define HDCP_2_2_LC_SEND_LPRIME 10 +#define HDCP_2_2_SKE_SEND_EKS 11 +#define HDCP_2_2_REP_SEND_RECVID_LIST 12 +#define HDCP_2_2_REP_SEND_ACK 15 +#define HDCP_2_2_REP_STREAM_MANAGE 16 +#define HDCP_2_2_REP_STREAM_READY 17 +#define HDCP_2_2_ERRATA_DP_STREAM_TYPE 50 + +#define HDCP_2_2_RTX_LEN 8 +#define HDCP_2_2_RRX_LEN 8 + +#define HDCP_2_2_K_PUB_RX_MOD_N_LEN 128 +#define HDCP_2_2_K_PUB_RX_EXP_E_LEN 3 +#define HDCP_2_2_K_PUB_RX_LEN (HDCP_2_2_K_PUB_RX_MOD_N_LEN + \ + HDCP_2_2_K_PUB_RX_EXP_E_LEN) + +#define HDCP_2_2_DCP_LLC_SIG_LEN 384 + +#define HDCP_2_2_E_KPUB_KM_LEN 128 +#define HDCP_2_2_E_KH_KM_M_LEN (16 + 16) +#define HDCP_2_2_H_PRIME_LEN 32 +#define HDCP_2_2_E_KH_KM_LEN 16 +#define HDCP_2_2_RN_LEN 8 +#define HDCP_2_2_L_PRIME_LEN 32 +#define HDCP_2_2_E_DKEY_KS_LEN 16 +#define HDCP_2_2_RIV_LEN 8 +#define HDCP_2_2_SEQ_NUM_LEN 3 +#define HDCP_2_2_LPRIME_HALF_LEN (HDCP_2_2_L_PRIME_LEN / 2) +#define HDCP_2_2_RECEIVER_ID_LEN DRM_HDCP_KSV_LEN +#define HDCP_2_2_MAX_DEVICE_COUNT 31 +#define HDCP_2_2_RECEIVER_IDS_MAX_LEN (HDCP_2_2_RECEIVER_ID_LEN * \ + HDCP_2_2_MAX_DEVICE_COUNT) +#define HDCP_2_2_MPRIME_LEN 32 + +/** +* TODO: This has to be changed for DP MST, as multiple stream on +* same port is possible. +* For HDCP2.2 on HDMI and DP SST this value is always 1. +*/ +#define HDCP_2_2_MAX_CONTENT_STREAMS_CNT 1 +#define HDCP_2_2_TXCAP_MASK_LEN 2 +#define HDCP_2_2_RXCAPS_LEN 3 +#define HDCP_2_2_RX_REPEATER (x) (x & BIT(0)) +#define HDCP_2_2_DP_HDCP_CAPABLE (x) (x & BIT(1)) +#define HDCP_2_2_RXINFO_LEN 2 + +/* HDCP1.x compliant device in downstream */ +#define HDCP_2_2_HDCP1_DEVICE_CONNECTED (x) (x & BIT(0)) + +/* HDCP2.0 Compliant repeater in downstream */ +#define HDCP_2_2_HDCP_2_0_REP_CONNECTED (x) (x & BIT(1)) +#define HDCP_2_2_MAX_CASCADE_EXCEEDED (x) (x & BIT(2)) +#define HDCP_2_2_MAX_DEVS_EXCEEDED (x) (x & BIT(3)) +#define HDCP_2_2_DEV_COUNT_LO (x) ((x & (0xF << 4)) >> 4) +#define HDCP_2_2_DEV_COUNT_HI (x) (x & BIT(0)) +#define HDCP_2_2_DEPTH (x) ((x & (0x7 << 1)) >> 1) + +struct hdcp2_cert_rx { +uint8_t receiver_id[HDCP_2_2_RECEIVER_ID_LEN ]; +uint8_t kpub_rx[HDCP_2_2_K_PUB_RX_LEN ]; +uint8_t reserved[2 ]; +uint8_t dcp_signature[HDCP_2_2_DCP_LLC_SIG_LEN ]; +} __packed; + +struct hdcp2_streamid_type { +uint8_t stream_id; +uint8_t stream_type; +} __packed; + +/** +* The TxCaps field specified in the HDCP HDMI, DP specs +* This field is big endian as specified in the errata. +*/ +struct hdcp2_tx_caps { +/* Transmitter must set this to 0x2 */ +uint8_t version; + +/* Reserved for HDCP and DP Spec. Read as Zero */ +uint8_t tx_cap_mask[HDCP_2_2_TXCAP_MASK_LEN ]; +} __packed; + +/* +* Main structures for HDCP2.2 protocol communication +*/ +struct hdcp2_ake_init { +uint8_t msg_id; +uint8_t r_tx[HDCP_2_2_RTX_LEN ]; +struct hdcp2_tx_caps tx_caps; +} __packed; + +struct hdcp2_ake_send_cert { +uint8_t msg_id; +struct hdcp2_cert_rx cert_rx; +uint8_t r_rx[HDCP_2_2_RRX_LEN ]; +uint8_t rx_caps[HDCP_2_2_RXCAPS_LEN ]; +} __packed; + +struct hdcp2_ake_no_stored_km { +uint8_t msg_id; +uint8_t e_kpub_km[HDCP_2_2_E_KPUB_KM_LEN ]; +} __packed; + +struct hdcp2_ake_stored_km { +uint8_t msg_id; +uint8_t e_kh_km_m[HDCP_2_2_E_KH_KM_M_LEN ]; +} __packed; + +struct hdcp2_ake_send_hprime { +uint8_t msg_id; +uint8_t h_prime[HDCP_2_2_H_PRIME_LEN ]; +} __packed; + +struct hdcp2_ake_send_pairing_info { +uint8_t msg_id; +uint8_t e_kh_km[HDCP_2_2_E_KH_KM_LEN ]; +} __packed; + +struct hdcp2_lc_init { +uint8_t msg_id; +uint8_t r_n[HDCP_2_2_RN_LEN ]; +} __packed; + +struct hdcp2_lc_send_lprime { +uint8_t msg_id; +uint8_t l_prime[HDCP_2_2_L_PRIME_LEN ]; +} __packed; + +struct hdcp2_ske_send_eks { +uint8_t msg_id; +uint8_t e_dkey_ks[HDCP_2_2_E_DKEY_KS_LEN ]; +uint8_t riv[HDCP_2_2_RIV_LEN ]; +} __packed; + +struct hdcp2_rep_send_receiverid_list { +uint8_t msg_id; +uint8_t rx_info[HDCP_2_2_RXINFO_LEN ]; +uint8_t seq_num_v[HDCP_2_2_SEQ_NUM_LEN ]; +uint8_t v_prime[HDCP_2_2_LPRIME_HALF_LEN ]; +uint8_t receiver_ids[HDCP_2_2_RECEIVER_IDS_MAX_LEN ]; +} __packed; + +struct hdcp2_rep_send_ack { +uint8_t msg_id; +uint8_t v[HDCP_2_2_LPRIME_HALF_LEN ]; +} __packed; + +struct hdcp2_rep_stream_manage { +uint8_t msg_id; +uint8_t seq_num_m[HDCP_2_2_SEQ_NUM_LEN ]; +__be16 k; +struct hdcp2_streamid_type streams[HDCP_2_2_MAX_CONTENT_STREAMS_CNT ]; +} __packed; + +struct hdcp2_rep_stream_ready { +uint8_t msg_id; +uint8_t m_prime[HDCP_2_2_MPRIME_LEN ]; +} __packed; + +struct hdcp2_dp_errata_stream_type { +uint8_t msg_id; +uint8_t stream_type; +} __packed; +#endif
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 01/40] drm: hdcp2.2 authentication msg definitions
Quoted 13 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 01/40] drm: hdcp2.2 authentication msg definitions
Quoted 1 line
This patch defines the hdcp2.2 protocol messages for the
Drop redundant "the" and one of the hdcp2.2. Not required.
Quoted 19 lines
HDCP2.2 authentication.
v2:
bit_fieldsare removed. Instead bitmasking used. [Tomas and Jani] prefixHDCP_2_2_is added to the macros. [Tomas]
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
include/drm/drm_hdcp.h| 183
+++++++++++++++++++++++++++++++++++++++++++++++++1 file changed, 183 insertions(+)include/drm/drm_hdcp.h index renamed from include/drm/drm_hdcp.h +0
-0
562fa7df2637..5e0a5ed1a08e100644
include/drm/drm_hdcp.h line 46
Quoted 9 lines
include/drm/drm_hdcp.h +6
-0@@ -38,4 +38,187 @@#define DRM_HDCP_DDC_BSTATUS 0x41#define DRM_HDCP_DDC_KSV_FIFO 0x43 +#define DRM_HDCP_1_4_SRM_ID 0x8 +#define DRM_HDCP_1_4_VRL_LENGTH_SIZE 3 +#define DRM_HDCP_1_4_DCP_SIG_SIZE 40 + +/** +* Protocol message definition for HDCP2.2 specification */
Multi Line comment style not needed here.
include/drm/drm_hdcp.h line 59
Quoted 12 lines
include/drm/drm_hdcp.h +12
-0+ +#define HDCP_STREAM_TYPE0 0x00 +#define HDCP_STREAM_TYPE1 0x01 + +/* HDCP2.2 Msg IDs */ +#define HDCP_2_2_NULL_MSG 1 +#define HDCP_2_2_AKE_INIT 2 +#define HDCP_2_2_AKE_SEND_CERT 3 +#define HDCP_2_2_AKE_NO_STORED_KM 4 +#define HDCP_2_2_AKE_STORED_KM 5 +#define HDCP_2_2_AKE_SEND_HPRIME 7 +#define HDCP_2_2_AKE_SEND_PARING_INFO 8
Typo in Pairing
Quoted 37 lines
include/drm/drm_hdcp.h +16
-0+#define HDCP_2_2_LC_INIT 9 +#define HDCP_2_2_LC_SEND_LPRIME 10 +#define HDCP_2_2_SKE_SEND_EKS 11 +#define HDCP_2_2_REP_SEND_RECVID_LIST 12 +#define HDCP_2_2_REP_SEND_ACK 15 +#define HDCP_2_2_REP_STREAM_MANAGE 16 +#define HDCP_2_2_REP_STREAM_READY 17 +#define HDCP_2_2_ERRATA_DP_STREAM_TYPE 50 + +#define HDCP_2_2_RTX_LEN 8 +#define HDCP_2_2_RRX_LEN 8 + +#define HDCP_2_2_K_PUB_RX_MOD_N_LEN 128 +#define HDCP_2_2_K_PUB_RX_EXP_E_LEN 3 +#define HDCP_2_2_K_PUB_RX_LEN (HDCP_2_2_K_PUB_RX_MOD_N_LEN + \ +
HDCP_2_2_K_PUB_RX_EXP_E_LEN)include/drm/drm_hdcp.h +16
-0+ +#define HDCP_2_2_DCP_LLC_SIG_LEN 384 + +#define HDCP_2_2_E_KPUB_KM_LEN 128 +#define HDCP_2_2_E_KH_KM_M_LEN (16 + 16) +#define HDCP_2_2_H_PRIME_LEN 32 +#define HDCP_2_2_E_KH_KM_LEN 16 +#define HDCP_2_2_RN_LEN 8 +#define HDCP_2_2_L_PRIME_LEN 32 +#define HDCP_2_2_E_DKEY_KS_LEN 16 +#define HDCP_2_2_RIV_LEN 8 +#define HDCP_2_2_SEQ_NUM_LEN 3 +#define HDCP_2_2_LPRIME_HALF_LEN (HDCP_2_2_L_PRIME_LEN / 2) +#define HDCP_2_2_RECEIVER_ID_LEN DRM_HDCP_KSV_LEN +#define HDCP_2_2_MAX_DEVICE_COUNT 31 +#define HDCP_2_2_RECEIVER_IDS_MAX_LEN (HDCP_2_2_RECEIVER_ID_LEN * \+
HDCP_2_2_MAX_DEVICE_COUNT)
include/drm/drm_hdcp.h line 95
Quoted 3 lines
include/drm/drm_hdcp.h +3
-0+#define HDCP_2_2_MPRIME_LEN 32 + +/**
Remove an extra "*".
Quoted 10 lines
+ * TODO: This has to be changed for DP MST, as multiple stream on
+ * same port is possible.
+ * For HDCP2.2 on HDMI and DP SST this value is always 1.
+ */include/drm/drm_hdcp.h +6
-0+#define HDCP_2_2_MAX_CONTENT_STREAMS_CNT 1 +#define HDCP_2_2_TXCAP_MASK_LEN 2 +#define HDCP_2_2_RXCAPS_LEN 3 +#define HDCP_2_2_RX_REPEATER (x) (x & BIT(0)) +#define HDCP_2_2_DP_HDCP_CAPABLE (x) (x & BIT(1)) +#define HDCP_2_2_RXINFO_LEN 2
include/drm/drm_hdcp.h line 115
Quoted 10 lines
include/drm/drm_hdcp.h +10
-0+ +/* HDCP1.x compliant device in downstream */ +#define HDCP_2_2_HDCP1_DEVICE_CONNECTED (x) (x & BIT(0)) + +/* HDCP2.0 Compliant repeater in downstream */ +#define HDCP_2_2_HDCP_2_0_REP_CONNECTED (x) (x & BIT(1)) +#define HDCP_2_2_MAX_CASCADE_EXCEEDED (x) (x & BIT(2)) +#define HDCP_2_2_MAX_DEVS_EXCEEDED (x) (x & BIT(3)) +#define HDCP_2_2_DEV_COUNT_LO (x) ((x & (0xF << 4)) >> 4) +#define HDCP_2_2_DEV_COUNT_HI (x) (x & BIT(0))
As per 2.2 spec this is a 5 bit field and no mention of HI and LO is there for dev count. A comment explaining why this masking style is chosen will be helpful since it doesn't match exactly with spec.
Quoted 1 line
+#define
HDCP_2_2_DEPTH(x)((x & (0x7<< 1)) >> 1)
Same here, may be add a generic comment explaining the logic for all the relevant macro definitions.
Quoted 4 lines
include/drm/drm_hdcp.h +4
-0+ +struct hdcp2_cert_rx { +uint8_t receiver_id[HDCP_2_2_RECEIVER_ID_LEN ]; +uint8_t kpub_rx[HDCP_2_2_K_PUB_RX_LEN ];
include/drm/drm_hdcp.h line 130
Quoted 10 lines
include/drm/drm_hdcp.h +10
-0+uint8_t reserved[2 ]; +uint8_t dcp_signature[HDCP_2_2_DCP_LLC_SIG_LEN ]; +} __packed; + +struct hdcp2_streamid_type { +uint8_t stream_id; +uint8_t stream_type; +} __packed; + +/**
Drop the extra "*".
include/drm/drm_hdcp.h line 139
Quoted 9 lines
+ * The TxCaps field specified in the HDCP HDMI, DP specs
+ * This field is big endian as specified in the errata.
+ */include/drm/drm_hdcp.h +6
-0+struct hdcp2_tx_caps { +/* Transmitter must set this to 0x2 */ +uint8_t version; + +/* Reserved for HDCP and DP Spec. Read as Zero */ +uint8_t tx_cap_mask[HDCP_2_2_TXCAP_MASK_LEN ];
Drop extra tabs here.
include/drm/drm_hdcp.h
Quoted 4 lines
include/drm/drm_hdcp.h +4
-0+} __packed; + +/* + * Main structures for HDCP2.2 protocol communication */ struct
No need of multi-line comment style.
Quoted 6 lines
include/drm/drm_hdcp.h +6
-0+hdcp2_ake_init { +uint8_t msg_id; +uint8_t r_tx[HDCP_2_2_RTX_LEN ]; +struct hdcp2_tx_caps tx_caps; +} __packed; +
include/drm/drm_hdcp.h line 160
Quoted 10 lines
include/drm/drm_hdcp.h +10
-0+struct hdcp2_ake_send_cert { +uint8_t msg_id; +struct hdcp2_cert_rx cert_rx; +uint8_t r_rx[HDCP_2_2_RRX_LEN ]; +uint8_t rx_caps[HDCP_2_2_RXCAPS_LEN ]; +} __packed; + +struct hdcp2_ake_no_stored_km { +uint8_t msg_id; +uint8_t e_kpub_km[HDCP_2_2_E_KPUB_KM_LEN ];
Drop extra tabs. Do it universally in all structure definitions.
Quoted 69 lines
include/drm/drm_hdcp.h +39
-0+} __packed; + +struct hdcp2_ake_stored_km { +uint8_t msg_id; +uint8_t e_kh_km_m[HDCP_2_2_E_KH_KM_M_LEN ]; +} __packed; + +struct hdcp2_ake_send_hprime { +uint8_t msg_id; +uint8_t h_prime[HDCP_2_2_H_PRIME_LEN ]; +} __packed; + +struct hdcp2_ake_send_pairing_info { +uint8_t msg_id; +uint8_t e_kh_km[HDCP_2_2_E_KH_KM_LEN ]; +} __packed; + +struct hdcp2_lc_init { +uint8_t msg_id; +uint8_t r_n[HDCP_2_2_RN_LEN ]; +} __packed; + +struct hdcp2_lc_send_lprime { +uint8_t msg_id; +uint8_t l_prime[HDCP_2_2_L_PRIME_LEN ]; +} __packed; + +struct hdcp2_ske_send_eks { +uint8_t msg_id; +uint8_t e_dkey_ks[HDCP_2_2_E_DKEY_KS_LEN ]; +uint8_t riv[HDCP_2_2_RIV_LEN ]; +} __packed; + +struct hdcp2_rep_send_receiverid_list { +uint8_t msg_id; +uint8_t rx_info[HDCP_2_2_RXINFO_LEN ]; +uint8_t seq_num_v[HDCP_2_2_SEQ_NUM_LEN ]; +uint8_t v_prime[HDCP_2_2_LPRIME_HALF_LEN ]; +uint8_t receiver_ids[HDCP_2_2_RECEIVER_IDS_MAX_LEN];include/drm/drm_hdcp.h +12
-0+} __packed; + +struct hdcp2_rep_send_ack { +uint8_t msg_id; +uint8_t v[HDCP_2_2_LPRIME_HALF_LEN ]; +} __packed; + +struct hdcp2_rep_stream_manage { +uint8_t msg_id; +uint8_t seq_num_m[HDCP_2_2_SEQ_NUM_LEN ]; +__be16 k; +struct hdcp2_streamid_type streams[HDCP_2_2_MAX_CONTENT_STREAMS_CNT];
include/drm/drm_hdcp.h +12
-0+} __packed; + +struct hdcp2_rep_stream_ready { +uint8_t msg_id; +uint8_t m_prime[HDCP_2_2_MPRIME_LEN ]; +} __packed; + +struct hdcp2_dp_errata_stream_type { +uint8_t msg_id; +uint8_t stream_type; +} __packed; +#endif
--
2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 01/40] drm: hdcp2.2 authentication msg definitions
Thank you for the review comments Uma Shankar!
Quoted 12 lines · Uma
Quoted 12 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 01/40] drm: hdcp2.2 authentication msg definitions
Quoted 2 lines
Quoted 1 line
This patch defines the hdcp2.2 protocol messages for the
Drop redundant "the" and one of the hdcp2.2. Not required.
ok
Quoted 23 lines
Quoted 23 lines
HDCP2.2 authentication.
v2:
bit_fieldsare removed. Instead bitmasking used. [Tomas and Jani] prefixHDCP_2_2_is added to the macros. [Tomas]
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
include/drm/drm_hdcp.h| 183
+++++++++++++++++++++++++++++++++++++++++++++++++1 file changed, 183 insertions(+)include/drm/drm_hdcp.h index renamed from include/drm/drm_hdcp.h +0
-0
562fa7df2637..5e0a5ed1a08e100644include/drm/drm_hdcp.h +0
-0@@ -38,4 +38,187 @@#define DRM_HDCP_DDC_BSTATUS 0x41#define DRM_HDCP_DDC_KSV_FIFO 0x43
Quoted 7 lines
include/drm/drm_hdcp.h
Quoted 6 lines
include/drm/drm_hdcp.h +6
-0+#define DRM_HDCP_1_4_SRM_ID 0x8 +#define DRM_HDCP_1_4_VRL_LENGTH_SIZE 3 +#define DRM_HDCP_1_4_DCP_SIG_SIZE 40 + +/** +* Protocol message definition for HDCP2.2 specification */ Multi Line comment style not needed here.
Ok
Quoted 14 lines
include/drm/drm_hdcp.h line 59
Quoted 13 lines
include/drm/drm_hdcp.h +12
-0+ +#define HDCP_STREAM_TYPE0 0x00 +#define HDCP_STREAM_TYPE1 0x01 + +/* HDCP2.2 Msg IDs */ +#define HDCP_2_2_NULL_MSG 1 +#define HDCP_2_2_AKE_INIT 2 +#define HDCP_2_2_AKE_SEND_CERT 3 +#define HDCP_2_2_AKE_NO_STORED_KM 4 +#define HDCP_2_2_AKE_STORED_KM 5 +#define HDCP_2_2_AKE_SEND_HPRIME 7 +#define HDCP_2_2_AKE_SEND_PARING_INFO 8Typo in Pairing
Fixed
Quoted 58 lines
Quoted 38 lines
include/drm/drm_hdcp.h +16
-0+#define HDCP_2_2_LC_INIT 9 +#define HDCP_2_2_LC_SEND_LPRIME 10 +#define HDCP_2_2_SKE_SEND_EKS 11 +#define HDCP_2_2_REP_SEND_RECVID_LIST 12 +#define HDCP_2_2_REP_SEND_ACK 15 +#define HDCP_2_2_REP_STREAM_MANAGE 16 +#define HDCP_2_2_REP_STREAM_READY 17 +#define HDCP_2_2_ERRATA_DP_STREAM_TYPE 50 + +#define HDCP_2_2_RTX_LEN 8 +#define HDCP_2_2_RRX_LEN 8 + +#define HDCP_2_2_K_PUB_RX_MOD_N_LEN 128 +#define HDCP_2_2_K_PUB_RX_EXP_E_LEN 3 +#define HDCP_2_2_K_PUB_RX_LEN (HDCP_2_2_K_PUB_RX_MOD_N_LEN + \ +
HDCP_2_2_K_PUB_RX_EXP_E_LEN)include/drm/drm_hdcp.h +16
-0+ +#define HDCP_2_2_DCP_LLC_SIG_LEN 384 + +#define HDCP_2_2_E_KPUB_KM_LEN 128 +#define HDCP_2_2_E_KH_KM_M_LEN (16 + 16) +#define HDCP_2_2_H_PRIME_LEN 32 +#define HDCP_2_2_E_KH_KM_LEN 16 +#define HDCP_2_2_RN_LEN 8 +#define HDCP_2_2_L_PRIME_LEN 32 +#define HDCP_2_2_E_DKEY_KS_LEN 16 +#define HDCP_2_2_RIV_LEN 8 +#define HDCP_2_2_SEQ_NUM_LEN 3 +#define HDCP_2_2_LPRIME_HALF_LEN (HDCP_2_2_L_PRIME_LEN / 2) +#define HDCP_2_2_RECEIVER_ID_LEN DRM_HDCP_KSV_LEN +#define HDCP_2_2_MAX_DEVICE_COUNT 31 +#define HDCP_2_2_RECEIVER_IDS_MAX_LEN (HDCP_2_2_RECEIVER_ID_LEN * \+
HDCP_2_2_MAX_DEVICE_COUNT)include/drm/drm_hdcp.h line 95
Quoted 3 lines
include/drm/drm_hdcp.h +3
-0+#define HDCP_2_2_MPRIME_LEN 32 + +/** Remove an extra "*".
Quoted 15 lines
+ * TODO: This has to be changed for DP MST, as multiple stream on
+ * same port is possible.
+ * For HDCP2.2 on HDMI and DP SST this value is always 1.
+ */include/drm/drm_hdcp.h +11
-0+#define HDCP_2_2_MAX_CONTENT_STREAMS_CNT 1 +#define HDCP_2_2_TXCAP_MASK_LEN 2 +#define HDCP_2_2_RXCAPS_LEN 3 +#define HDCP_2_2_RX_REPEATER (x) (x & BIT(0)) +#define HDCP_2_2_DP_HDCP_CAPABLE (x) (x & BIT(1)) +#define HDCP_2_2_RXINFO_LEN 2 + +/* HDCP1.x compliant device in downstream */ +#define HDCP_2_2_HDCP1_DEVICE_CONNECTED (x) (x & BIT(0)) + +/* HDCP2.0 Compliant repeater in downstream */
Quoted 8 lines
include/drm/drm_hdcp.h line 115
Quoted 5 lines
include/drm/drm_hdcp.h +5
-0+#define HDCP_2_2_HDCP_2_0_REP_CONNECTED (x) (x & BIT(1)) +#define HDCP_2_2_MAX_CASCADE_EXCEEDED (x) (x & BIT(2)) +#define HDCP_2_2_MAX_DEVS_EXCEEDED (x) (x & BIT(3)) +#define HDCP_2_2_DEV_COUNT_LO (x) ((x & (0xF << 4)) >> 4) +#define HDCP_2_2_DEV_COUNT_HI (x) (x & BIT(0))As per 2.2 spec this is a 5 bit field and no mention of HI and LO is there for dev count. A comment explaining why this masking style is chosen will be helpful since it doesn't match exactly with spec.
dev count is spread across multi byte value. And these macros are processing the each byte separately. Agreed that a comment would help here.
Quoted 4 lines
Quoted 2 lines
+#define
HDCP_2_2_DEPTH(x)((x & (0x7<< 1)) >> 1)Same here, may be add a generic comment explaining the logic for all the relevant macro definitions.
Quoted 15 lines
Quoted 4 lines
include/drm/drm_hdcp.h +4
-0+ +struct hdcp2_cert_rx { +uint8_t receiver_id[HDCP_2_2_RECEIVER_ID_LEN ]; +uint8_t kpub_rx[HDCP_2_2_K_PUB_RX_LEN ];include/drm/drm_hdcp.h line 130
Quoted 10 lines
include/drm/drm_hdcp.h +10
-0+uint8_t reserved[2 ]; +uint8_t dcp_signature[HDCP_2_2_DCP_LLC_SIG_LEN ]; +} __packed; + +struct hdcp2_streamid_type { +uint8_t stream_id; +uint8_t stream_type; +} __packed; + +/** Drop the extra "*".
Fixed.
Quoted 11 lines
include/drm/drm_hdcp.h line 139
Quoted 10 lines
+ * The TxCaps field specified in the HDCP HDMI, DP specs
+ * This field is big endian as specified in the errata.
+ */include/drm/drm_hdcp.h +6
-0+struct hdcp2_tx_caps { +/* Transmitter must set this to 0x2 */ +uint8_t version; + +/* Reserved for HDCP and DP Spec. Read as Zero */ +uint8_t tx_cap_mask[HDCP_2_2_TXCAP_MASK_LEN ];Drop extra tabs here.
Keeping the extra tabs for the uniformity. If it is ok, I would like to keep it as it is now.
Quoted 94 lines
include/drm/drm_hdcp.h
Quoted 5 lines
include/drm/drm_hdcp.h +4
-0+} __packed; + +/* + * Main structures for HDCP2.2 protocol communication */ structNo need of multi-line comment style.
Quoted 6 lines
include/drm/drm_hdcp.h +6
-0+hdcp2_ake_init { +uint8_t msg_id; +uint8_t r_tx[HDCP_2_2_RTX_LEN ]; +struct hdcp2_tx_caps tx_caps; +} __packed; +include/drm/drm_hdcp.h line 160
Quoted 10 lines
include/drm/drm_hdcp.h +10
-0+struct hdcp2_ake_send_cert { +uint8_t msg_id; +struct hdcp2_cert_rx cert_rx; +uint8_t r_rx[HDCP_2_2_RRX_LEN ]; +uint8_t rx_caps[HDCP_2_2_RXCAPS_LEN ]; +} __packed; + +struct hdcp2_ake_no_stored_km { +uint8_t msg_id; +uint8_t e_kpub_km[HDCP_2_2_E_KPUB_KM_LEN ];Drop extra tabs. Do it universally in all structure definitions.
Quoted 69 lines
include/drm/drm_hdcp.h +39
-0+} __packed; + +struct hdcp2_ake_stored_km { +uint8_t msg_id; +uint8_t e_kh_km_m[HDCP_2_2_E_KH_KM_M_LEN ]; +} __packed; + +struct hdcp2_ake_send_hprime { +uint8_t msg_id; +uint8_t h_prime[HDCP_2_2_H_PRIME_LEN ]; +} __packed; + +struct hdcp2_ake_send_pairing_info { +uint8_t msg_id; +uint8_t e_kh_km[HDCP_2_2_E_KH_KM_LEN ]; +} __packed; + +struct hdcp2_lc_init { +uint8_t msg_id; +uint8_t r_n[HDCP_2_2_RN_LEN ]; +} __packed; + +struct hdcp2_lc_send_lprime { +uint8_t msg_id; +uint8_t l_prime[HDCP_2_2_L_PRIME_LEN ]; +} __packed; + +struct hdcp2_ske_send_eks { +uint8_t msg_id; +uint8_t e_dkey_ks[HDCP_2_2_E_DKEY_KS_LEN ]; +uint8_t riv[HDCP_2_2_RIV_LEN ]; +} __packed; + +struct hdcp2_rep_send_receiverid_list { +uint8_t msg_id; +uint8_t rx_info[HDCP_2_2_RXINFO_LEN ]; +uint8_t seq_num_v[HDCP_2_2_SEQ_NUM_LEN ]; +uint8_t v_prime[HDCP_2_2_LPRIME_HALF_LEN ]; +uint8_t receiver_ids[HDCP_2_2_RECEIVER_IDS_MAX_LEN];include/drm/drm_hdcp.h +12
-0+} __packed; + +struct hdcp2_rep_send_ack { +uint8_t msg_id; +uint8_t v[HDCP_2_2_LPRIME_HALF_LEN ]; +} __packed; + +struct hdcp2_rep_stream_manage { +uint8_t msg_id; +uint8_t seq_num_m[HDCP_2_2_SEQ_NUM_LEN ]; +__be16 k; +struct hdcp2_streamid_type streams[HDCP_2_2_MAX_CONTENT_STREAMS_CNT];
include/drm/drm_hdcp.h +12
-0+} __packed; + +struct hdcp2_rep_stream_ready { +uint8_t msg_id; +uint8_t m_prime[HDCP_2_2_MPRIME_LEN ]; +} __packed; + +struct hdcp2_dp_errata_stream_type { +uint8_t msg_id; +uint8_t stream_type; +} __packed; +#endif
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 2/40 drm: HDMI and DP specific HDCP2.2 defines
In reply to Ramalingam CIn preparation for implementing HDCP2.2 in I915, this patch adds HDCP register definitions for HDMI and DP HDCP adaptations.
HDMI specific HDCP2.2 register definitions are added into drm_hdcp.h, where are HDCP2.2 register offsets in DPCD offsets are defined at drm_dp_helper.h.
v2:
bit_field definitions are replaced by macros. [Tomas and Jany]
v3:
No Changes.
--- include/drm/drm_dp_helper.h | 54 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_hdcp.h | 29 ++++++++++++++++++++++++ 2 files changed, 83 insertions(+)
include/drm/drm_dp_helper.h +54 -0
@@ -887,6 +887,60 @@#define DP_AUX_HDCP_KSV_FIFO 0x6802C#define DP_AUX_HDCP_AINFO 0x6803B +/** +* DP HDCP2.2 parameter offsets in DPCD address space +*/ +#define DP_HDCP_2_2_REG_RTX_OFFSET 0x69000 +#define DP_HDCP_2_2_REG_TXCAPS_OFFSET 0x69008 +#define DP_HDCP_2_2_REG_CERT_RX_OFFSET 0x6900B +#define DP_HDCP_2_2_REG_RRX_OFFSET 0x69215 +#define DP_HDCP_2_2_REG_RX_CAPS_OFFSET 0x6921D +#define DP_HDCP_2_2_REG_EKPUB_KM_OFFSET 0x69220 +#define DP_HDCP_2_2_REG_EKH_KM_OFFSET 0x692A0 +#define DP_HDCP_2_2_REG_M_OFFSET 0x692B0 +#define DP_HDCP_2_2_REG_HPRIME_OFFSET 0x692C0 +#define DP_HDCP_2_2_REG_EKH_KM_RD_OFFSET 0x692E0 +#define DP_HDCP_2_2_REG_RN_OFFSET 0x692F0 +#define DP_HDCP_2_2_REG_LPRIME_OFFSET 0x692F8 +#define DP_HDCP_2_2_REG_EDKEY_KS_OFFSET 0x69318 +#define DP_HDCP_2_2_REG_RIV_OFFSET 0x69328 +#define DP_HDCP_2_2_REG_RXINFO_OFFSET 0x69330 +#define DP_HDCP_2_2_REG_SEQ_NUM_V_OFFSET 0x69332 +#define DP_HDCP_2_2_REG_VPRIME_OFFSET 0x69335 +#define DP_HDCP_2_2_REG_RECV_ID_LIST_OFFSET 0x69345 +#define DP_HDCP_2_2_REG_V_OFFSET 0x693E0 +#define DP_HDCP_2_2_REG_SEQ_NUM_M_OFFSET 0x693F0 +#define DP_HDCP_2_2_REG_K_OFFSET 0x693F3 +#define DP_HDCP_2_2_REG_STREAM_ID_TYPE_OFFSET 0x693F5 +#define DP_HDCP_2_2_REG_MPRIME_OFFSET 0x69473 +#define DP_HDCP_2_2_REG_RXSTATUS_OFFSET 0x69493 +#define DP_HDCP_2_2_REG_STREAM_TYPE_OFFSET 0x69494 +#define DP_HDCP_2_2_REG_DBG_OFFSET 0x69518 + +/** +* DP HDCP message start offsets in DPCD address space +*/ +#define DP_HDCP_2_2_AKE_INIT_OFFSET DP_HDCP_2_2_REG_RTX_OFFSET +#define DP_HDCP_2_2_AKE_SEND_CERT_OFFSET DP_HDCP_2_2_REG_CERT_RX_OFFSET +#define DP_HDCP_2_2_AKE_NO_STORED_KM_OFFSET DP_HDCP_2_2_REG_EKPUB_KM_OFFSET +#define DP_HDCP_2_2_AKE_STORED_KM_OFFSET DP_HDCP_2_2_REG_EKH_KM_OFFSET +#define DP_HDCP_2_2_AKE_SEND_HPRIME_OFFSET DP_HDCP_2_2_REG_HPRIME_OFFSET +#define DP_HDCP_2_2_AKE_SEND_PARING_INFO_OFFSET DP_HDCP_2_2_REG_EKH_KM_RD_OFFSET +#define DP_HDCP_2_2_LC_INIT_OFFSET DP_HDCP_2_2_REG_RN_OFFSET +#define DP_HDCP_2_2_LC_SEND_LPRIME_OFFSET DP_HDCP_2_2_REG_LPRIME_OFFSET +#define DP_HDCP_2_2_SKE_SEND_EKS_OFFSET DP_HDCP_2_2_REG_EDKEY_KS_OFFSET +#define DP_HDCP_2_2_REP_SEND_RECVID_LIST_OFFSET DP_HDCP_2_2_REG_RXINFO_OFFSET +#define DP_HDCP_2_2_REP_SEND_ACK_OFFSET DP_HDCP_2_2_REG_V_OFFSET +#define DP_HDCP_2_2_REP_STREAM_MANAGE_OFFSET DP_HDCP_2_2_REG_SEQ_NUM_M_OFFSET +#define DP_HDCP_2_2_REP_STREAM_READY_OFFSET DP_HDCP_2_2_REG_MPRIME_OFFSET + +#define HDCP_2_2_DP_RXSTATUS_LEN 1 +#define HDCP_2_2_DP_RXSTATUS_READY (x) (x & BIT(0)) +#define HDCP_2_2_DP_RXSTATUS_H_PRIME (x) (x & BIT(1)) +#define HDCP_2_2_DP_RXSTATUS_PAIRING (x) (x & BIT(2)) +#define HDCP_2_2_DP_RXSTATUS_REAUTH_REQ (x) (x & BIT(3)) +#define HDCP_2_2_DP_RXSTATUS_LINK_FAILED (x) (x & BIT(4)) +/* DP 1.2 Sideband message defines */ /* peer device type - DP 1.2a Table 2-92 */ #define DP_PEER_DEVICE_NONE 0x0
include/drm/drm_hdcp.h +29 -0
@@ -221,4 +221,33 @@ struct hdcp2_dp_errata_stream_type { uint8_t stream_type; } __packed; +/* HDCP2.2 TIMEOUTs in mSec */ +#define HDCP_2_2_CERT_TIMEOUT 100 +#define HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT 1000 +#define HDCP_2_2_HPRIME_PAIRED_TIMEOUT 200 +#define HDCP_2_2_PAIRING_TIMEOUT 200 +#define HDCP_2_2_HDMI_LPRIME_TIMEOUT 20 +#define HDCP_2_2_DP_LPRIME_TIMEOUT 7 +#define HDCP_2_2_RECVID_LIST_TIMEOUT 3000 +#define HDCP_2_2_STREAM_READY_TIMEOUT 100 + +/* HDMI HDCP2.2 Register Offsets */ +#define HDCP_2_2_HDMI_REG_VER_OFFSET 0x50 +#define HDCP_2_2_HDMI_REG_WR_MSG_OFFSET 0x60 +#define HDCP_2_2_HDMI_REG_RXSTATUS_OFFSET 0x70 +#define HDCP_2_2_HDMI_REG_RD_MSG_OFFSET 0x80 +#define HDCP_2_2_HDMI_REG_DBG_OFFSET 0xC0 + +#define HDCP_2_2_HDMI_SUPPORT_MASK BIT(2) +#define HDCP_2_2_RXCAPS_VERSION_VAL 0x2 + +#define HDCP_2_2_RX_CAPS_VERSION_VAL 0x02 +#define HDCP_2_2_SEQ_NUM_MAX 0xFFFFFF +#define HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN 200 + +#define HDCP_2_2_HDMI_RXSTATUS_LEN 2 +#define HDCP_2_2_HDMI_RXSTATUS_MSG_SZ_HI (x) (x & 0x3) +#define HDCP_2_2_HDMI_RXSTATUS_READY (x) (x & BIT(2)) +#define HDCP_2_2_HDMI_RXSTATUS_REAUTH_REQ (x) (x & BIT(3)) +#endif
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 02/40] drm: HDMI and DP specific HDCP2.2 defines
Quoted 13 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 02/40] drm: HDMI and DP specific HDCP2.2 defines
Quoted 2 lines
In preparation for implementing HDCP2.2 in I915, this patch adds HDCP register definitions for HDMI and DP HDCP adaptations.
I believe we can just keep this message generic at drm layer, instead of calling out i915 specifically. Currently it may be enabled for i915, but it will used for other drivers as well in future.
Quoted 2 lines
HDMI specific HDCP2.2 register definitions are added into
drm_hdcp.h, where are
Make it "where as".
Quoted 4 lines
HDCP2.2 register offsets in DPCD offsets are defined at
drm_dp_helper.h.v2:
bit_fielddefinitions are replaced by macros. [Tomas and Jany]
Typo in "Jani's" name.
Quoted 15 lines
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
include/drm/drm_dp_helper.h| 54
+++++++++++++++++++++++++++++++++++++++++++++include/drm/drm_hdcp.h| 29 ++++++++++++++++++++++++2 files changed, 83 insertions(+)include/drm/drm_dp_helper.h index renamed from include/drm/drm_dp_helper.h +0
-0
4de97e94ef9d..2185b3a88911100644
include/drm/drm_dp_helper.h line 891
Quoted 5 lines
include/drm/drm_dp_helper.h +2
-0@@ -887,6 +887,60 @@#define DP_AUX_HDCP_KSV_FIFO 0x6802C#define DP_AUX_HDCP_AINFO 0x6803B +/** +* DP HDCP2.2 parameter offsets in DPCD address space */
Rectify the comment style
Quoted 15 lines
include/drm/drm_dp_helper.h +15
-0+#define DP_HDCP_2_2_REG_RTX_OFFSET 0x69000 +#define DP_HDCP_2_2_REG_TXCAPS_OFFSET 0x69008 +#define DP_HDCP_2_2_REG_CERT_RX_OFFSET 0x6900B +#define DP_HDCP_2_2_REG_RRX_OFFSET 0x69215 +#define DP_HDCP_2_2_REG_RX_CAPS_OFFSET 0x6921D +#define DP_HDCP_2_2_REG_EKPUB_KM_OFFSET 0x69220 +#define DP_HDCP_2_2_REG_EKH_KM_OFFSET 0x692A0 +#define DP_HDCP_2_2_REG_M_OFFSET 0x692B0 +#define DP_HDCP_2_2_REG_HPRIME_OFFSET 0x692C0 +#define DP_HDCP_2_2_REG_EKH_KM_RD_OFFSET 0x692E0 +#define DP_HDCP_2_2_REG_RN_OFFSET 0x692F0 +#define DP_HDCP_2_2_REG_LPRIME_OFFSET 0x692F8 +#define DP_HDCP_2_2_REG_EDKEY_KS_OFFSET 0x69318 +#define DP_HDCP_2_2_REG_RIV_OFFSET 0x69328 +#define DP_HDCP_2_2_REG_RXINFO_OFFSET 0x69330
include/drm/drm_dp_helper.h line 917
Quoted 10 lines
include/drm/drm_dp_helper.h +10
-0+#define DP_HDCP_2_2_REG_SEQ_NUM_V_OFFSET 0x69332 +#define DP_HDCP_2_2_REG_VPRIME_OFFSET 0x69335 +#define DP_HDCP_2_2_REG_RECV_ID_LIST_OFFSET 0x69345 +#define DP_HDCP_2_2_REG_V_OFFSET 0x693E0 +#define DP_HDCP_2_2_REG_SEQ_NUM_M_OFFSET 0x693F0 +#define DP_HDCP_2_2_REG_K_OFFSET 0x693F3 +#define DP_HDCP_2_2_REG_STREAM_ID_TYPE_OFFSET 0x693F5 +#define DP_HDCP_2_2_REG_MPRIME_OFFSET 0x69473 +#define DP_HDCP_2_2_REG_RXSTATUS_OFFSET 0x69493 +#define DP_HDCP_2_2_REG_STREAM_TYPE_OFFSET 0x69494
This is not matching to the spec. Seems reserved in spec.
include/drm/drm_dp_helper.h
Quoted 4 lines
include/drm/drm_dp_helper.h +4
-0+#define DP_HDCP_2_2_REG_DBG_OFFSET 0x69518 + +/** +* DP HDCP message start offsets in DPCD address space */
Rectify comment style
Quoted 11 lines
include/drm/drm_dp_helper.h +4
-0+#define DP_HDCP_2_2_AKE_INIT_OFFSET DP_HDCP_2_2_REG_RTX_OFFSET +#define DP_HDCP_2_2_AKE_SEND_CERT_OFFSET DP_HDCP_2_2_REG_CERT_RX_OFFSET +#define DP_HDCP_2_2_AKE_NO_STORED_KM_OFFSET DP_HDCP_2_2_REG_EKPUB_KM_OFFSET +#define DP_HDCP_2_2_AKE_STORED_KM_OFFSETDP_HDCP_2_2_REG_EKH_KM_OFFSET +#define DP_HDCP_2_2_AKE_SEND_HPRIME_OFFSET DP_HDCP_2_2_REG_HPRIME_OFFSET+#define
DP_HDCP_2_2_AKE_SEND_PARING_INFO_OFFSET
Typo in pairing
Quoted 23 lines
DP_HDCP_2_2_REG_EKH_KM_RD_OFFSET +#define DP_HDCP_2_2_LC_INIT_OFFSET DP_HDCP_2_2_REG_RN_OFFSET +#define DP_HDCP_2_2_LC_SEND_LPRIME_OFFSET DP_HDCP_2_2_REG_LPRIME_OFFSET +#define DP_HDCP_2_2_SKE_SEND_EKS_OFFSET DP_HDCP_2_2_REG_EDKEY_KS_OFFSET +#define DP_HDCP_2_2_REP_SEND_RECVID_LIST_OFFSET DP_HDCP_2_2_REG_RXINFO_OFFSET +#define DP_HDCP_2_2_REP_SEND_ACK_OFFSET DP_HDCP_2_2_REG_V_OFFSET +#define DP_HDCP_2_2_REP_STREAM_MANAGE_OFFSET DP_HDCP_2_2_REG_SEQ_NUM_M_OFFSET +#define DP_HDCP_2_2_REP_STREAM_READY_OFFSET DP_HDCP_2_2_REG_MPRIME_OFFSETinclude/drm/drm_dp_helper.h +8
-0+ +#define HDCP_2_2_DP_RXSTATUS_LEN 1 +#define HDCP_2_2_DP_RXSTATUS_READY (x) (x & BIT(0)) +#define HDCP_2_2_DP_RXSTATUS_H_PRIME (x) (x & BIT(1)) +#define HDCP_2_2_DP_RXSTATUS_PAIRING (x) (x & BIT(2)) +#define HDCP_2_2_DP_RXSTATUS_REAUTH_REQ (x) (x & BIT(3)) +#define HDCP_2_2_DP_RXSTATUS_LINK_FAILED (x) (x & BIT(4)) +
Quoted 2 lines
/* DP 1.2 Sideband message defines */
/* peer device type - DP 1.2a Table 2-92 */
Make it multi line comment.
Quoted 25 lines
#define
DP_PEER_DEVICE_NONE0x0include/drm/drm_hdcp.h index renamed from include/drm/drm_hdcp.h +0
-0
5e0a5ed1a08e..f3f28414b189100644include/drm/drm_hdcp.h +16
-0@@ -221,4 +221,33 @@ struct hdcp2_dp_errata_stream_type {uint8_t stream_type; } __packed; +/* HDCP2.2 TIMEOUTs in mSec */ +#define HDCP_2_2_CERT_TIMEOUT 100 +#define HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT 1000 +#define HDCP_2_2_HPRIME_PAIRED_TIMEOUT 200 +#define HDCP_2_2_PAIRING_TIMEOUT 200 +#define HDCP_2_2_HDMI_LPRIME_TIMEOUT 20 +#define HDCP_2_2_DP_LPRIME_TIMEOUT 7 +#define HDCP_2_2_RECVID_LIST_TIMEOUT 3000 +#define HDCP_2_2_STREAM_READY_TIMEOUT 100 + +/* HDMI HDCP2.2 Register Offsets */ +#define HDCP_2_2_HDMI_REG_VER_OFFSET 0x50 +#define HDCP_2_2_HDMI_REG_WR_MSG_OFFSET 0x60 +#define HDCP_2_2_HDMI_REG_RXSTATUS_OFFSET 0x70 +#define HDCP_2_2_HDMI_REG_RD_MSG_OFFSET 0x80 +#define HDCP_2_2_HDMI_REG_DBG_OFFSET 0xC0
include/drm/drm_hdcp.h struct hdcp2_dp_errata_stream_type { · line 249
Quoted 10 lines
include/drm/drm_hdcp.h +10
-0+ +#define HDCP_2_2_HDMI_SUPPORT_MASK BIT(2) +#define HDCP_2_2_RXCAPS_VERSION_VAL 0x2 + +#define HDCP_2_2_RX_CAPS_VERSION_VAL 0x02 +#define HDCP_2_2_SEQ_NUM_MAX 0xFFFFFF +#define HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN 200 + +#define HDCP_2_2_HDMI_RXSTATUS_LEN 2 +#define HDCP_2_2_HDMI_RXSTATUS_MSG_SZ_HI (x) (x & 0x3)
This seems to be a 10 bit field. Please check or am I missing something ?
include/drm/drm_hdcp.h struct hdcp2_dp_errata_stream_type { · line 250
Quoted 1 line
include/drm/drm_hdcp.h +1
-0+#define HDCP_2_2_HDMI_RXSTATUS_READY (x) (x & BIT(2))
It should be bit 10. Add a comment to explain so that it gets easier to match to spec.
include/drm/drm_hdcp.h struct hdcp2_dp_errata_stream_type { · line 251
Quoted 1 line
include/drm/drm_hdcp.h +1
-0+#define HDCP_2_2_HDMI_RXSTATUS_REAUTH_REQ (x) (x & BIT(3))
Same as above. May be add a generic comment.
Quoted 9 lines
include/drm/drm_hdcp.h +1
-1+#endif --2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 02/40] drm: HDMI and DP specific HDCP2.2 defines
Quoted 12 lines · Uma
Quoted 12 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 02/40] drm: HDMI and DP specific HDCP2.2 defines
Quoted 5 lines
Quoted 2 lines
In preparation for implementing HDCP2.2 in I915, this patch adds HDCP register definitions for HDMI and DP HDCP adaptations.
I believe we can just keep this message generic at drm layer, instead of calling out i915 specifically. Currently it may be enabled for i915, but it will used for other drivers as well in future.
ok
Quoted 3 lines
Quoted 2 lines
HDMI specific HDCP2.2 register definitions are added into
drm_hdcp.h, where areMake it "where as".
ok
Quoted 6 lines
Quoted 5 lines
HDCP2.2 register offsets in DPCD offsets are defined at
drm_dp_helper.h.v2:
bit_fielddefinitions are replaced by macros. [Tomas and Jany]Typo in "Jani's" name.
Sorry Jani.
Quoted 19 lines
Quoted 19 lines
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
include/drm/drm_dp_helper.h| 54
+++++++++++++++++++++++++++++++++++++++++++++include/drm/drm_hdcp.h| 29 ++++++++++++++++++++++++2 files changed, 83 insertions(+)include/drm/drm_dp_helper.h index renamed from include/drm/drm_dp_helper.h +0
-0
4de97e94ef9d..2185b3a88911100644include/drm/drm_dp_helper.h +0
-0@@ -887,6 +887,60 @@#define DP_AUX_HDCP_KSV_FIFO 0x6802C#define DP_AUX_HDCP_AINFO 0x6803B
Quoted 3 lines
include/drm/drm_dp_helper.h line 891
Quoted 2 lines
include/drm/drm_dp_helper.h +2
-0+/** +* DP HDCP2.2 parameter offsets in DPCD address space */ Rectify the comment style
ok
Quoted 19 lines
Quoted 19 lines
include/drm/drm_dp_helper.h +18
-0+#define DP_HDCP_2_2_REG_RTX_OFFSET 0x69000 +#define DP_HDCP_2_2_REG_TXCAPS_OFFSET 0x69008 +#define DP_HDCP_2_2_REG_CERT_RX_OFFSET 0x6900B +#define DP_HDCP_2_2_REG_RRX_OFFSET 0x69215 +#define DP_HDCP_2_2_REG_RX_CAPS_OFFSET 0x6921D +#define DP_HDCP_2_2_REG_EKPUB_KM_OFFSET 0x69220 +#define DP_HDCP_2_2_REG_EKH_KM_OFFSET 0x692A0 +#define DP_HDCP_2_2_REG_M_OFFSET 0x692B0 +#define DP_HDCP_2_2_REG_HPRIME_OFFSET 0x692C0 +#define DP_HDCP_2_2_REG_EKH_KM_RD_OFFSET 0x692E0 +#define DP_HDCP_2_2_REG_RN_OFFSET 0x692F0 +#define DP_HDCP_2_2_REG_LPRIME_OFFSET 0x692F8 +#define DP_HDCP_2_2_REG_EDKEY_KS_OFFSET 0x69318 +#define DP_HDCP_2_2_REG_RIV_OFFSET 0x69328 +#define DP_HDCP_2_2_REG_RXINFO_OFFSET 0x69330 +#define DP_HDCP_2_2_REG_SEQ_NUM_V_OFFSET 0x69332 +#define DP_HDCP_2_2_REG_VPRIME_OFFSET 0x69335 +#define DP_HDCP_2_2_REG_RECV_ID_LIST_OFFSET 0x69345
Quoted 8 lines
include/drm/drm_dp_helper.h line 917
Quoted 7 lines
include/drm/drm_dp_helper.h +7
-0+#define DP_HDCP_2_2_REG_V_OFFSET 0x693E0 +#define DP_HDCP_2_2_REG_SEQ_NUM_M_OFFSET 0x693F0 +#define DP_HDCP_2_2_REG_K_OFFSET 0x693F3 +#define DP_HDCP_2_2_REG_STREAM_ID_TYPE_OFFSET 0x693F5 +#define DP_HDCP_2_2_REG_MPRIME_OFFSET 0x69473 +#define DP_HDCP_2_2_REG_RXSTATUS_OFFSET 0x69493 +#define DP_HDCP_2_2_REG_STREAM_TYPE_OFFSET 0x69494This is not matching to the spec. Seems reserved in spec.
Not really. Register is defined in the DP HDCP2.2 Spec.
Quoted 7 lines
include/drm/drm_dp_helper.h
Quoted 5 lines
include/drm/drm_dp_helper.h +4
-0+#define DP_HDCP_2_2_REG_DBG_OFFSET 0x69518 + +/** +* DP HDCP message start offsets in DPCD address space */ Rectify comment style
Quoted 12 lines
Quoted 11 lines
include/drm/drm_dp_helper.h +4
-0+#define DP_HDCP_2_2_AKE_INIT_OFFSET DP_HDCP_2_2_REG_RTX_OFFSET +#define DP_HDCP_2_2_AKE_SEND_CERT_OFFSET DP_HDCP_2_2_REG_CERT_RX_OFFSET +#define DP_HDCP_2_2_AKE_NO_STORED_KM_OFFSET DP_HDCP_2_2_REG_EKPUB_KM_OFFSET +#define DP_HDCP_2_2_AKE_STORED_KM_OFFSETDP_HDCP_2_2_REG_EKH_KM_OFFSET +#define DP_HDCP_2_2_AKE_SEND_HPRIME_OFFSET DP_HDCP_2_2_REG_HPRIME_OFFSET+#define
DP_HDCP_2_2_AKE_SEND_PARING_INFO_OFFSETTypo in pairing
Fixed.
Quoted 19 lines
Quoted 19 lines
DP_HDCP_2_2_REG_EKH_KM_RD_OFFSET +#define DP_HDCP_2_2_LC_INIT_OFFSET DP_HDCP_2_2_REG_RN_OFFSET +#define DP_HDCP_2_2_LC_SEND_LPRIME_OFFSET DP_HDCP_2_2_REG_LPRIME_OFFSET +#define DP_HDCP_2_2_SKE_SEND_EKS_OFFSET DP_HDCP_2_2_REG_EDKEY_KS_OFFSET +#define DP_HDCP_2_2_REP_SEND_RECVID_LIST_OFFSET DP_HDCP_2_2_REG_RXINFO_OFFSET +#define DP_HDCP_2_2_REP_SEND_ACK_OFFSET DP_HDCP_2_2_REG_V_OFFSET +#define DP_HDCP_2_2_REP_STREAM_MANAGE_OFFSET DP_HDCP_2_2_REG_SEQ_NUM_M_OFFSET +#define DP_HDCP_2_2_REP_STREAM_READY_OFFSET DP_HDCP_2_2_REG_MPRIME_OFFSETinclude/drm/drm_dp_helper.h +3
-0+ +#define HDCP_2_2_DP_RXSTATUS_LEN 1 +#define HDCP_2_2_DP_RXSTATUS_READY (x) (x & BIT(0))
Quoted 8 lines
Quoted 7 lines
include/drm/drm_dp_helper.h +5
-0+#define HDCP_2_2_DP_RXSTATUS_H_PRIME (x) (x & BIT(1)) +#define HDCP_2_2_DP_RXSTATUS_PAIRING (x) (x & BIT(2)) +#define HDCP_2_2_DP_RXSTATUS_REAUTH_REQ (x) (x & BIT(3)) +#define HDCP_2_2_DP_RXSTATUS_LINK_FAILED (x) (x & BIT(4)) +/* DP 1.2 Sideband message defines */
/* peer device type - DP 1.2a Table 2-92 */Make it multi line comment.
This is not part of this patch. Already existing lines.
Quoted 29 lines
Quoted 29 lines
#define
DP_PEER_DEVICE_NONE0x0include/drm/drm_hdcp.h index renamed from include/drm/drm_hdcp.h +0
-0
5e0a5ed1a08e..f3f28414b189100644include/drm/drm_hdcp.h +19
-0@@ -221,4 +221,33 @@ struct hdcp2_dp_errata_stream_type {uint8_t stream_type; } __packed; +/* HDCP2.2 TIMEOUTs in mSec */ +#define HDCP_2_2_CERT_TIMEOUT 100 +#define HDCP_2_2_HPRIME_NO_PAIRED_TIMEOUT 1000 +#define HDCP_2_2_HPRIME_PAIRED_TIMEOUT 200 +#define HDCP_2_2_PAIRING_TIMEOUT 200 +#define HDCP_2_2_HDMI_LPRIME_TIMEOUT 20 +#define HDCP_2_2_DP_LPRIME_TIMEOUT 7 +#define HDCP_2_2_RECVID_LIST_TIMEOUT 3000 +#define HDCP_2_2_STREAM_READY_TIMEOUT 100 + +/* HDMI HDCP2.2 Register Offsets */ +#define HDCP_2_2_HDMI_REG_VER_OFFSET 0x50 +#define HDCP_2_2_HDMI_REG_WR_MSG_OFFSET 0x60 +#define HDCP_2_2_HDMI_REG_RXSTATUS_OFFSET 0x70 +#define HDCP_2_2_HDMI_REG_RD_MSG_OFFSET 0x80 +#define HDCP_2_2_HDMI_REG_DBG_OFFSET 0xC0 + +#define HDCP_2_2_HDMI_SUPPORT_MASK BIT(2) +#define HDCP_2_2_RXCAPS_VERSION_VAL 0x2
Quoted 8 lines
include/drm/drm_hdcp.h struct hdcp2_dp_errata_stream_type { · line 249
Quoted 7 lines
include/drm/drm_hdcp.h +7
-0+ +#define HDCP_2_2_RX_CAPS_VERSION_VAL 0x02 +#define HDCP_2_2_SEQ_NUM_MAX 0xFFFFFF +#define HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN 200 + +#define HDCP_2_2_HDMI_RXSTATUS_LEN 2 +#define HDCP_2_2_HDMI_RXSTATUS_MSG_SZ_HI (x) (x & 0x3)This seems to be a 10 bit field. Please check or am I missing something ?
Yes. Only high 2bits need to be parsed from a byte. LSB is read as it is.
Quoted 6 lines
include/drm/drm_hdcp.h struct hdcp2_dp_errata_stream_type { · line 250
Quoted 2 lines
include/drm/drm_hdcp.h +1
-0+#define HDCP_2_2_HDMI_RXSTATUS_READY (x) (x & BIT(2))It should be bit 10. Add a comment to explain so that it gets easier to match to spec.
include/drm/drm_hdcp.h struct hdcp2_dp_errata_stream_type { · line 251
Quoted 1 line
include/drm/drm_hdcp.h +1
-0+#define HDCP_2_2_HDMI_RXSTATUS_REAUTH_REQ (x) (x & BIT(3))Same as above. May be add a generic comment.
Comment is added.
Quoted 10 lines
Quoted 10 lines
include/drm/drm_hdcp.h +1
-1+#endif --2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/40 mei: bus: whitelist hdcp client
In reply to Ramalingam CFrom: Tomas Winkler <[email protected]>
Whitelist HDCP client for in kernel drm use
v2:
Rebased.
v3:
No changes.
--- drivers/misc/mei/bus-fixup.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/misc/mei/bus-fixup.c +16 -0
@@ -41,6 +41,9 @@ static const uuid_le mei_nfc_info_guid = MEI_UUID_NFC_INFO;#define MEI_UUID_MKHIF_FIX UUID_LE(0x55213584, 0x9a29, 0x4916, \ 0xba, 0xdf, 0xf, 0xb7, 0xed, 0x68, 0x2a, 0xeb) +#define MEI_UUID_HDCP UUID_LE(0xB638AB7E, 0x94E2, 0x4EA2, \ + 0xA5, 0x52, 0xD1, 0xC5, 0x4B, 0x62, 0x7F, 0x04) +#define MEI_UUID_ANY NULL_UUID_LE/**
@@ -72,6 +75,18 @@ static void blacklist(struct mei_cl_device *cldev) cldev->do_match =0 ; } +/** +* whitelist - forcefully whitelist client +* +* @cldev: me clients device +*/ +static void whitelist (struct mei_cl_device *cldev) +{ +dev_dbg (&cldev->dev,"running hook %s\n" , __func__); + + cldev->do_match =1 ; +} +#define OSTYPE_LINUX 2struct mei_os_ver {__le16 build;
@@ -399,6 +414,7 @@ static struct mei_fixup {MEI_FIXUP (MEI_UUID_NFC_HCI , mei_nfc),MEI_FIXUP (MEI_UUID_WD , mei_wd),MEI_FIXUP (MEI_UUID_MKHIF_FIX , mei_mkhi_fix), + MEI_FIXUP(MEI_UUID_HDCP, whitelist), };/**
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/40 misc/mei/hdcp: Client driver for HDCP application
In reply to Ramalingam CME FW is contributes a vital role in HDCP2.2 authentication. HDCP2.2 driver needs to communicate to ME FW for each step of the HDCP2.2 authentication.
ME FW prepare and HDCP2.2 authentication parameters and encrypt them as per spec. With such parameter Driver prepares HDCP2.2 auth messages and communicate with HDCP2.2 sink.
Similarly HDCP2. sink's response is shared with ME FW for decrypt and verification.
Once All the steps of HDCP2.2 authentications are complete on driver's request ME FW will configure the port as authenticated and supply the HDCP keys to the Gen HW for encryption.
Only after this stage HDCP2.2 driver can start the HDCP2.2 encryption for a port.
ME FW is interfaced to kernel through MEI Bus Driver. To obtain the HDCP2.2 services from the ME FW through MEI Bus driver MEI Client Driver is developed.
v2:
hdcp files are moved to drivers/misc/mei/hdcp/ [Tomas]
v3:
Squashed the Kbuild support [Tomas]
UUID renamed and Module License is modified [Tomas] drv_data is set to null at remove [Tomas]
--- drivers/misc/mei/Kconfig | 6 ++++ drivers/misc/mei/Makefile | 2 ++ drivers/misc/mei/hdcp/Makefile | 6 ++++ drivers/misc/mei/hdcp/mei_hdcp.c | 74 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 drivers/misc/mei/hdcp/Makefile create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.c
drivers/misc/mei/Kconfig +6 -0
@@ -43,3 +43,9 @@ config INTEL_MEI_TXE Supported SoCs: Intel Bay Trail + +config INTEL_MEI_HDCP + tristate "Intel HDCP2.2 services of ME Interface" + depends on INTEL_MEI && DRM_I915 + help + MEI Support for HDCP2.2 Services on Intel SoCs.
drivers/misc/mei/Makefile +2 -0
@@ -23,3 +23,5 @@ mei-txe-objs += hw-txe.o mei-$(CONFIG_EVENT_TRACING) += mei-trace.o CFLAGS_mei-trace.o = -I$(src) + +obj-$(CONFIG_INTEL_MEI_HDCP) += hdcp/
drivers/misc/mei/hdcp/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile - HDCP client driver for Intel MEI Bus Driver. +# Copyright (c) 2010-2014, Intel Corporation. +# +obj-$(CONFIG_INTEL_MEI_HDCP) += mei_hdcp.o
drivers/misc/mei/hdcp/mei_hdcp.c new file +74 -0
74 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RE: [PATCH v3 04/40] misc/mei/hdcp: Client driver for HDCP application
Quoted 13 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 04/40] misc/mei/hdcp: Client driver for HDCP application
Quoted 1 line
ME FW is contributes a vital role in HDCP2.2 authentication.
Remove "is".
Quoted 4 lines
HDCP2.2 driver needs to communicate to ME FW for each step of the HDCP2.2 authentication.
ME FW prepare and HDCP2.2 authentication parameters and encrypt them as per
Drop "and HDCP2.2" here.
Quoted 4 lines
spec. With such parameter Driver prepares HDCP2.2 auth messages and communicate with HDCP2.2 sink.
Similarly HDCP2. sink's response is shared with ME FW for decrypt and
Drop "HDCP2.". Its implicit, no need to call multiple times.
Quoted 3 lines
verification.
Once All the steps of HDCP2.2 authentications are complete on driver's request
Change "All to all". Drop "s" from authentication. Add a "," after complete.
Quoted 160 lines
ME FW will configure the port as authenticated and supply the HDCP keys to the Gen HW for encryption.
Only after this stage HDCP2.2 driver can start the HDCP2.2 encryption for a port.
ME FW is interfaced to kernel through MEI Bus Driver. To obtain the HDCP2.2 services from the ME FW through MEI Bus driver MEI Client Driver is developed.
v2:
hdcp files are moved todrivers/misc/mei/hdcp/[Tomas]
v3:
Squashed theKbuildsupport [Tomas]
UUID renamed and Module License is modified [Tomas]drv_datais set to null at remove [Tomas]Signed-off-by Ramalingam C <[email protected]>Signed-off-by Tomas Winkler <[email protected]>---
drivers/misc/mei/Kconfig | 6 ++++ drivers/misc/mei/Makefile | 2 ++ drivers/misc/mei/hdcp/Makefile | 6 ++++ drivers/misc/mei/hdcp/mei_hdcp.c | 74 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+)create mode 100644
drivers/misc/mei/hdcp/Makefilecreate mode 100644drivers/misc/mei/hdcp/mei_hdcp.cdrivers/misc/mei/Kconfig index renamed from drivers/misc/mei/Kconfig +0
-0
c49e1d2269af..90977132d1e2100644drivers/misc/mei/Kconfig +6
-0@@ -43,3 +43,9 @@ config INTEL_MEI_TXE Supported SoCs: Intel Bay Trail + +config INTEL_MEI_HDCP + tristate "Intel HDCP2.2 services of ME Interface" + depends on INTEL_MEI && DRM_I915 + help + MEI Support for HDCP2.2 Services on Intel SoCs.drivers/misc/mei/Makefile index renamed from drivers/misc/mei/Makefile +0
-0
cd6825afa8e1..e64d1212fb85100644drivers/misc/mei/Makefile +2
-0@@ -23,3 +23,5 @@ mei-txe-objs += hw-txe.o mei-$(CONFIG_EVENT_TRACING) += mei-trace.o CFLAGS_mei-trace.o = -I$(src) + +obj-$(CONFIG_INTEL_MEI_HDCP) += hdcp/drivers/misc/mei/hdcp/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile - HDCP client driver for Intel MEI Bus Driver. +# Copyright (c) 2010-2014, Intel Corporation. +# +obj-$(CONFIG_INTEL_MEI_HDCP) += mei_hdcp.odrivers/misc/mei/hdcp/mei_hdcp.c new file +29
-0@@ -0,0 +1,74 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* +* Copyright © 2017-2018 Intel Corporation +* +* Mei_hdcp.c: HDCP client driver for mei bus +* +* Permission is hereby granted, free of charge, to any person +obtaining a +* copy of this software and associated documentation files (the +"Software"), +* to deal in the Software without restriction, including without +limitation +* the rights to use, copy, modify, merge, publish, distribute, +sublicense, +* and/or sell copies of the Software, and to permit persons to whom +the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the +next +* paragraph) shall be included in all copies or substantial portions +of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES ORdrivers/misc/mei/hdcp/mei_hdcp.c new file +4
-0+OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OROTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ * Ramalingam C <[email protected]>
+ */drivers/misc/mei/hdcp/mei_hdcp.c new file +23
-0+ +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/uuid.h> +#include <linux/mei_cl_bus.h> + +static int mei_hdcp_probe (struct mei_cl_device *cldev, +const struct mei_cl_device_id *id) { +int ret; + + ret =mei_cldev_enable (cldev); +if (ret <0 ) +dev_err (&cldev->dev,"mei_cldev_enable Failed. %d\n" , ret); + +return ret; +} + +static int mei_hdcp_remove (struct mei_cl_device *cldev) { +mei_cldev_set_drvdata (cldev,NULL ); +return mei_cldev_disable (cldev); +} + +#define MEI_UUID_HDCP UUID_LE(0xB638AB7E, 0x94E2, 0x4EA2,
0xA5, \drivers/misc/mei/hdcp/mei_hdcp.c new file +21
-1+ 0x52, 0xD1, 0xC5, 0x4B, \ + 0x62, 0x7F, 0x04) + +static struct mei_cl_device_id mei_hdcp_tbl[] = { + { .uuid =MEI_UUID_HDCP , .version =MEI_CL_VERSION_ANY }, + { } +}; +MODULE_DEVICE_TABLE (mei, mei_hdcp_tbl); + +static struct mei_cl_driver mei_hdcp_driver = { + .id_table = mei_hdcp_tbl, + .name =KBUILD_MODNAME , + .probe = mei_hdcp_probe, + .remove = mei_hdcp_remove, +}; + +module_mei_cl_driver (mei_hdcp_driver); + +MODULE_AUTHOR ("Intel Corporation" ); +MODULE_LICENSE ("Dual BSD/GPL" ); +MODULE_DESCRIPTION ("HDCP" ); --2.7.4
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 5/40 misc/mei/hdcp: Notifier chain for mei cldev state change
In reply to Ramalingam CNotifier Chain is defined to inform all its clients about the mei client device state change. Routine is defined for the clients to register and unregister for the notification on state change.
v2:
Rebased.
v3:
Notifier chain is adopted for cldev state update [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 36 +++++++++++++++++++++++++++--- include/linux/mei_hdcp.h | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 include/linux/mei_hdcp.h
drivers/misc/mei/hdcp/mei_hdcp.c +33 -3
@@ -31,6 +31,32 @@#include <linux/slab.h> #include <linux/uuid.h> #include <linux/mei_cl_bus.h> +#include <linux/notifier.h> +#include <linux/mei_hdcp.h> + +static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); + +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) +{ +if (enabled) +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_ENABLED , cldev); +else +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_DISABLED ,NULL ); +} + +int mei_cldev_register_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_register (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_register_notify); + +int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_unregister (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_unregister_notify);static int mei_hdcp_probe (struct mei_cl_device *cldev,const struct mei_cl_device_id *id)
@@ -38,14 +64,18 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev,int ret; ret =mei_cldev_enable (cldev); -if (ret <0 ) +if (ret <0 ) {dev_err (&cldev->dev,"mei_cldev_enable Failed. %d\n" , ret); +return ret; + } -return ret; +mei_cldev_state_notify_clients (cldev, true); +return 0 ; }static int mei_hdcp_remove (struct mei_cl_device *cldev) { +mei_cldev_state_notify_clients (cldev, false);mei_cldev_set_drvdata (cldev,NULL );return mei_cldev_disable (cldev); }
@@ -71,4 +101,4 @@ module_mei_cl_driver(mei_hdcp_driver);MODULE_AUTHOR ("Intel Corporation" );MODULE_LICENSE ("Dual BSD/GPL" ); -MODULE_DESCRIPTION ("HDCP" ); +MODULE_DESCRIPTION ("MEI HDCP" );
include/linux/mei_hdcp.h new file +48 -0
48 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state change
Quoted 10 lines · Ramalingam C
Notifier Chain is defined to inform all its clients about the mei client device state change. Routine is defined for the clients to register and unregister for the notification on state change.
v2:
Rebased.
v3:
Notifier chain is adopted for cldev state update [Tomas]Signed-off-by Ramalingam C <[email protected]>
For managing interactions between multiple drivers notifier chains are fairly problematic. The main reason is the locking embedded in the notifier chain. To make things safe, that lock must be held everytime we add/remove any part of the link, and when calling any callback. Usually that means you get a neat deadlock sooner or later, because the load/unload code has inverse paths compared to normal operation.
Notifiers also not not provide a clean way to handle suspend/resume ordering.
There's two parts to do this properly.
1. Finding the other driver. Multi-part drivers are assembled nowadays using the component framework. We're using that already to manage the interaction between drm/i915 and snd-hda. If not all components are ready yet, then the driver load sequence must be aborted by returning -EPROBE_DEFER. That's going to be lots of fun, since for the mei/i915 interaction it's probably going to be i915 that needs to abort and retry the driver load. But we do CI test all the abort points in our driver load, so should work well.
2. Handling the ordering restrictions for suspend/resume. For i915/snd-hda we used a early_resume/late_suspend callback trickery, but that doesn't really scale to multiple levels. Since we've done that device_link has been added. As a bonus device_link can also ensure that not only suspend/resume (including runtime suspend/resume) is ordered correctly, but also that driver bind/unbind works correctly. Still needs the component stuff and initial -EPROBE_DEFER, but will all least make sure we' only reprobe once more. See device_link_add + docs in device_link.rst.
One thing I didn't check is whether we want the device linke to also manage runtime pm for us. It would mean that we keep the ME awake as long as anything is using the gpu (any display on or any rendering happening). That might be too much, but could also be that it won't matter (and then using DL_FLAG_PM_RUNTIME would simply our code).
We might also need to convert the i915/snd-hda interactions to device_link first, since the early/late_resume/suspend hack probably doesn't interact too well with proper device_links.
Cheers, Daniel
Quoted 127 lines
--- drivers/misc/mei/hdcp/mei_hdcp.c | 36 +++++++++++++++++++++++++++--- include/linux/mei_hdcp.h | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 include/linux/mei_hdcp.hdrivers/misc/mei/hdcp/mei_hdcp.c +33
-3@@ -31,6 +31,32 @@#include <linux/slab.h> #include <linux/uuid.h> #include <linux/mei_cl_bus.h> +#include <linux/notifier.h> +#include <linux/mei_hdcp.h> + +static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); + +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) +{ +if (enabled) +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_ENABLED , cldev); +else +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_DISABLED ,NULL ); +} + +int mei_cldev_register_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_register (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_register_notify); + +int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_unregister (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_unregister_notify);static int mei_hdcp_probe (struct mei_cl_device *cldev,const struct mei_cl_device_id *id)@@ -38,14 +64,18 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev,int ret; ret =mei_cldev_enable (cldev); -if (ret <0 ) +if (ret <0 ) {dev_err (&cldev->dev,"mei_cldev_enable Failed. %d\n" , ret); +return ret; + } -return ret; +mei_cldev_state_notify_clients (cldev, true); +return 0 ; }static int mei_hdcp_remove (struct mei_cl_device *cldev) { +mei_cldev_state_notify_clients (cldev, false);mei_cldev_set_drvdata (cldev,NULL );return mei_cldev_disable (cldev); }@@ -71,4 +101,4 @@ module_mei_cl_driver(mei_hdcp_driver);MODULE_AUTHOR ("Intel Corporation" );MODULE_LICENSE ("Dual BSD/GPL" ); -MODULE_DESCRIPTION ("HDCP" ); +MODULE_DESCRIPTION ("MEI HDCP" );include/linux/mei_hdcp.h new file +48
-0@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* +* Copyright © 2017-2018 Intel Corporation +* +* Permission to use, copy, modify, distribute, and sell this software and its +* documentation for any purpose is hereby granted without fee, provided that +* the above copyright notice appear in all copies and that both that copyright +* notice and this permission notice appear in supporting documentation, and +* that the name of the copyright holders not be used in advertising or +* publicity pertaining to distribution of the software without specific, +* written prior permission. The copyright holders make no representations +* about the suitability of this software for any purpose. It is provided "as +* is" without express or implied warranty. +* +* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +* OF THIS SOFTWARE. +* +* Authors: +* Ramalingam C <[email protected]> +*/ + +#ifndef _LINUX_MEI_HDCP_H +#define _LINUX_MEI_HDCP_H + +enum mei_cldev_state { +MEI_CLDEV_DISABLED , +MEI_CLDEV_ENABLED +}; + +#ifdef CONFIG_INTEL_MEI_HDCP +int mei_cldev_register_notify (struct notifier_block *nb); +int mei_cldev_unregister_notify (struct notifier_block *nb); +#else +static int mei_cldev_register_notify (struct notifier_block *nb) +{ +return -ENODEV ; +} +static int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return -ENODEV ; +} +#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ +#endif /* defined (_LINUX_MEI_HDCP_H) */ Signature · 1 line
2.7.4
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state change
Quoted 18 lines · Daniel Vetter
Quoted 10 lines · Ramalingam C
Notifier Chain is defined to inform all its clients about the mei client device state change. Routine is defined for the clients to register and unregister for the notification on state change.
v2:
Rebased.
v3:
Notifier chain is adopted for cldev state update [Tomas]Signed-off-by Ramalingam C <[email protected]>For managing interactions between multiple drivers notifier chains are fairly problematic. The main reason is the locking embedded in the notifier chain. To make things safe, that lock must be held everytime we add/remove any part of the link, and when calling any callback. Usually that means you get a neat deadlock sooner or later, because the load/unload code has inverse paths compared to normal operation.
Quoted 2 lines
Notifiers also not not provide a clean way to handle suspend/resume ordering.
Recording the IRC discussion here:
As Daniel Vetter suggested, with notifiers to mei client device binding status, I have tested the I915 and mei_hdcp modules as inbuild and as modules at suspend and resume of them.
During the experiment, CONFIG_PROVE_LOCKING was enabled. No issue was observed due to the usecase of the notifier here. Notifier was used here just to inform the I915 that mei client device is no more. So that I915 will stop any ongoing HDCP2.2 protection and reject any further request.
Hence Planning to continue with same shape of the patch on v4. If any erroneous scenario is detected we will work on the alternate solution.
--Ram
Quoted 152 lines
There's two parts to do this properly.
1. Finding the other driver. Multi-part drivers are assembled nowadays using the component framework. We're using that already to manage the interaction between drm/i915 and snd-hda. If not all components are ready yet, then the driver load sequence must be aborted by returning -EPROBE_DEFER. That's going to be lots of fun, since for the mei/i915 interaction it's probably going to be i915 that needs to abort and retry the driver load. But we do CI test all the abort points in our driver load, so should work well.
2. Handling the ordering restrictions for suspend/resume. For i915/snd-hda we used a early_resume/late_suspend callback trickery, but that doesn't really scale to multiple levels. Since we've done that
device_linkhas been added. As a bonusdevice_linkcan also ensure that not only suspend/resume (including runtime suspend/resume) is ordered correctly, but also that driver bind/unbind works correctly. Still needs the component stuff and initial -EPROBE_DEFER, but will all least make sure we' only reprobe once more. Seedevice_link_add+ docs indevice_link.rst.One thing I didn't check is whether we want the device linke to also manage runtime pm for us. It would mean that we keep the ME awake as long as anything is using the gpu (any display on or any rendering happening). That might be too much, but could also be that it won't matter (and then using
DL_FLAG_PM_RUNTIMEwould simply our code).We might also need to convert the i915/snd-hda interactions to
device_linkfirst, since the early/late_resume/suspend hack probably doesn't interact too well with properdevice_links.Cheers, Daniel
Quoted 119 lines
--- drivers/misc/mei/hdcp/mei_hdcp.c | 36 +++++++++++++++++++++++++++--- include/linux/mei_hdcp.h | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-)create mode 100644
include/linux/mei_hdcp.hdrivers/misc/mei/hdcp/mei_hdcp.c +33
-3@@ -31,6 +31,32 @@#include <linux/slab.h> #include <linux/uuid.h> #include <linux/mei_cl_bus.h> +#include <linux/notifier.h> +#include <linux/mei_hdcp.h> + +static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); + +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) +{ +if (enabled) +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_ENABLED , cldev); +else +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_DISABLED ,NULL ); +} + +int mei_cldev_register_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_register (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_register_notify); + +int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_unregister (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_unregister_notify);static int mei_hdcp_probe (struct mei_cl_device *cldev,const struct mei_cl_device_id *id)@@ -38,14 +64,18 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev,int ret; ret =mei_cldev_enable (cldev); -if (ret <0 ) +if (ret <0 ) {dev_err (&cldev->dev,"mei_cldev_enable Failed. %d\n" , ret); +return ret; + } -return ret; +mei_cldev_state_notify_clients (cldev, true); +return 0 ; }static int mei_hdcp_remove (struct mei_cl_device *cldev) { +mei_cldev_state_notify_clients (cldev, false);mei_cldev_set_drvdata (cldev,NULL );return mei_cldev_disable (cldev); }@@ -71,4 +101,4 @@ module_mei_cl_driver(mei_hdcp_driver);MODULE_AUTHOR ("Intel Corporation" );MODULE_LICENSE ("Dual BSD/GPL" ); -MODULE_DESCRIPTION ("HDCP" ); +MODULE_DESCRIPTION ("MEI HDCP" );include/linux/mei_hdcp.h new file +43
-0@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* +* Copyright © 2017-2018 Intel Corporation +* +* Permission to use, copy, modify, distribute, and sell this software and its +* documentation for any purpose is hereby granted without fee, provided that +* the above copyright notice appear in all copies and that both that copyright +* notice and this permission notice appear in supporting documentation, and +* that the name of the copyright holders not be used in advertising or +* publicity pertaining to distribution of the software without specific, +* written prior permission. The copyright holders make no representations +* about the suitability of this software for any purpose. It is provided "as +* is" without express or implied warranty. +* +* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +* OF THIS SOFTWARE. +* +* Authors: +* Ramalingam C <[email protected]> +*/ + +#ifndef _LINUX_MEI_HDCP_H +#define _LINUX_MEI_HDCP_H + +enum mei_cldev_state { +MEI_CLDEV_DISABLED , +MEI_CLDEV_ENABLED +}; + +#ifdef CONFIG_INTEL_MEI_HDCP +int mei_cldev_register_notify (struct notifier_block *nb); +int mei_cldev_unregister_notify (struct notifier_block *nb); +#else +static int mei_cldev_register_notify (struct notifier_block *nb) +{ +return -ENODEV ; +} +static int mei_cldev_unregister_notify (struct notifier_block *nb)
Quoted 8 lines
Quoted 8 lines
include/linux/mei_hdcp.h new file +5
-0+{ +return -ENODEV ; +} +#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ +#endif /* defined (_LINUX_MEI_HDCP_H) */ Signature · 1 line
2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
kbuild test robot
build botRe: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state change
In reply to Ramalingam CThank you for the patch! Yet something to improve:
Hi Ramalingam,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20180403]
[cannot apply to v4.16]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ramalingam-C/drm-i915-Implement-HDCP2-2/20180404-031743 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
>> drivers/misc/mei/hdcp/mei_hdcp.c:49:5: error: redefinition of 'mei_cldev_register_notify'
int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:39:12: note: previous definition of 'mei_cldev_register_notify' was here
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/misc/mei/hdcp/mei_hdcp.c:55:5: error: redefinition of 'mei_cldev_unregister_notify' int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:43:12: note: previous definition of 'mei_cldev_unregister_notify' was here
static int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/mei_hdcp.h:43:12: warning: 'mei_cldev_unregister_notify' defined but not used [-Wunused-function] include/linux/mei_hdcp.h:39:12: warning: 'mei_cldev_register_notify' defined but not used [-Wunused-function]
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
vim +/mei_cldev_register_notify +49 drivers/misc/mei/hdcp/mei_hdcp.c
48
> 49 int mei_cldev_register_notify(struct notifier_block *nb)
50 {
51 return blocking_notifier_chain_register(&mei_cldev_notifier_list, nb);
52 }
53 EXPORT_SYMBOL_GPL(mei_cldev_register_notify);
54
> 55 int mei_cldev_unregister_notify(struct notifier_block *nb)
56 {
57 return blocking_notifier_chain_unregister(&mei_cldev_notifier_list, nb);
58 }
59 EXPORT_SYMBOL_GPL(mei_cldev_unregister_notify);
60 ---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build bot[RFC PATCH] misc/mei/hdcp: mei_cldev_state_notify_clients() can be static
In reply to Ramalingam Cdri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
--- mei_hdcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mei/hdcp/mei_hdcp.c +1 -1
@@ -36,7 +36,7 @@static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); -void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) +static void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled) blocking_notifier_call_chain(&mei_cldev_notifier_list,
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Usyskin, Alexander
maintainerRe: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state change
In reply to Ramalingam CQuoted 16 lines
-----Original Message-----
From: C, Ramalingam
Sent: Tuesday, April 03, 2018 16:57
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>; C, Ramalingam <[email protected]>
Subject: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state changeNotifier Chain is defined to inform all its clients about the mei client device state change. Routine is defined for the clients to register and unregister for the notification on state change.
Quoted 7 lines
v2:
Rebased.
v3:
Notifier chain is adopted for cldev state update [Tomas]Signed-off-by Ramalingam C <[email protected]>---
May be I miss something, but bus subsystem already has notifier chain. (BUS_NOTIFY_ADD_DEVICE etc.) We only ought to make mei_cl_bus_type available in header.
Quoted 139 lines
drivers/misc/mei/hdcp/mei_hdcp.c | 36 +++++++++++++++++++++++++++--- include/linux/mei_hdcp.h | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 include/linux/mei_hdcp.hdrivers/misc/mei/hdcp/mei_hdcp.c +26
-0@@ -31,6 +31,32 @@#include <linux/slab.h> #include <linux/uuid.h> #include <linux/mei_cl_bus.h> +#include <linux/notifier.h> +#include <linux/mei_hdcp.h> + +static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); + +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) +{ +if (enabled) +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_ENABLED , cldev); +else +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_DISABLED ,NULL ); +} + +int mei_cldev_register_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_register (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_register_notify); + +int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_unregister (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_unregister_notify);static int mei_hdcp_probe(struct
mei_cl_device*cldev,drivers/misc/mei/hdcp/mei_hdcp.c +6
-2const struct mei_cl_device_id *id)@@ -38,14 +64,18 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev, int ret; ret =mei_cldev_enable (cldev); -if (ret <0 ) +if (ret <0 ) {dev_err (&cldev->dev,"mei_cldev_enable Failed. %d\n" , ret); +return ret; + } -return ret; +mei_cldev_state_notify_clients (cldev, true); +return 0 ; }static int mei_hdcp_remove (struct mei_cl_device *cldev) { +mei_cldev_state_notify_clients (cldev, false);mei_cldev_set_drvdata (cldev,NULL );return mei_cldev_disable (cldev);}
drivers/misc/mei/hdcp/mei_hdcp.c +1
-1@@ -71,4 +101,4 @@ module_mei_cl_driver(mei_hdcp_driver);MODULE_AUTHOR ("Intel Corporation" );MODULE_LICENSE ("Dual BSD/GPL" ); -MODULE_DESCRIPTION ("HDCP" ); +MODULE_DESCRIPTION ("MEI HDCP" );include/linux/mei_hdcp.h new file +6
-0@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* +* Copyright © 2017-2018 Intel Corporation +* +* Permission to use, copy, modify, distribute, and sell this software and its +* documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Authors:
+ * Ramalingam C <[email protected]>
+ */include/linux/mei_hdcp.h new file +23
-1+ +#ifndef _LINUX_MEI_HDCP_H +#define _LINUX_MEI_HDCP_H + +enum mei_cldev_state { +MEI_CLDEV_DISABLED , +MEI_CLDEV_ENABLED +}; + +#ifdef CONFIG_INTEL_MEI_HDCP +int mei_cldev_register_notify (struct notifier_block *nb); +int mei_cldev_unregister_notify (struct notifier_block *nb); +#else +static int mei_cldev_register_notify (struct notifier_block *nb) +{ +return -ENODEV ; +} +static int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return -ENODEV ; +} +#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ +#endif /* defined (_LINUX_MEI_HDCP_H) */ --
Quoted 1 line
2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state change
Thanks Alexander for the review. Sorry for the delay in addressing the review comments
Quoted 21 lines · Alexander
Quoted 21 lines
-----Original Message-----
From: C, Ramalingam
Sent: Tuesday, April 03, 2018 16:57
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>; C, Ramalingam <[email protected]>
Subject: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state changeNotifier Chain is defined to inform all its clients about the mei client device state change. Routine is defined for the clients to register and unregister for the notification on state change.
v2:
Rebased.
v3:
Notifier chain is adopted for cldev state update [Tomas]
Quoted 4 lines
Quoted 2 lines
Signed-off-by Ramalingam C <[email protected]>---
May be I miss something, but bus subsystem already has notifier chain. (
BUS_NOTIFY_ADD_DEVICEetc.) We only ought to makemei_cl_bus_typeavailable in header.
We need re notification incase of binding of the mei device happened well before the I915 init. This is the case if I915 and MEI HDCP are build as modules and loaded in order.
So I prefer the separate notifier for mei_hdcp. Hope that is fine.
--Ram
Quoted 133 lines
Quoted 133 lines
drivers/misc/mei/hdcp/mei_hdcp.c | 36 +++++++++++++++++++++++++++--- include/linux/mei_hdcp.h | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-)create mode 100644
include/linux/mei_hdcp.hdrivers/misc/mei/hdcp/mei_hdcp.c +26
-0@@ -31,6 +31,32 @@#include <linux/slab.h> #include <linux/uuid.h> #include <linux/mei_cl_bus.h> +#include <linux/notifier.h> +#include <linux/mei_hdcp.h> + +static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); + +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) +{ +if (enabled) +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_ENABLED , cldev); +else +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_DISABLED ,NULL ); +} + +int mei_cldev_register_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_register (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_register_notify); + +int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_unregister (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_unregister_notify);static int mei_hdcp_probe(struct
mei_cl_device*cldev,
const structmei_cl_device_id*id)drivers/misc/mei/hdcp/mei_hdcp.c +6
-2@@ -38,14 +64,18 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev, int ret; ret =mei_cldev_enable (cldev); -if (ret <0 ) +if (ret <0 ) {dev_err (&cldev->dev,"mei_cldev_enable Failed. %d\n" , ret); +return ret; + } -return ret; +mei_cldev_state_notify_clients (cldev, true); +return 0 ; }static int mei_hdcp_remove (struct mei_cl_device *cldev) { +mei_cldev_state_notify_clients (cldev, false);mei_cldev_set_drvdata (cldev,NULL );return mei_cldev_disable (cldev);}drivers/misc/mei/hdcp/mei_hdcp.c +1
-1@@ -71,4 +101,4 @@ module_mei_cl_driver(mei_hdcp_driver);MODULE_AUTHOR ("Intel Corporation" );MODULE_LICENSE ("Dual BSD/GPL" ); -MODULE_DESCRIPTION ("HDCP" ); +MODULE_DESCRIPTION ("MEI HDCP" );include/linux/mei_hdcp.h new file +6
-0@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* +* Copyright © 2017-2018 Intel Corporation +* +* Permission to use, copy, modify, distribute, and sell this software and its +* documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Authors:
+ * Ramalingam C <[email protected]>
+ */include/linux/mei_hdcp.h new file +17
-0+ +#ifndef _LINUX_MEI_HDCP_H +#define _LINUX_MEI_HDCP_H + +enum mei_cldev_state { +MEI_CLDEV_DISABLED , +MEI_CLDEV_ENABLED +}; + +#ifdef CONFIG_INTEL_MEI_HDCP +int mei_cldev_register_notify (struct notifier_block *nb); +int mei_cldev_unregister_notify (struct notifier_block *nb); +#else +static int mei_cldev_register_notify (struct notifier_block *nb) +{ +return -ENODEV ; +}
Quoted 8 lines
Quoted 8 lines
include/linux/mei_hdcp.h new file +6
-1+static int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return -ENODEV ; +} +#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ +#endif /* defined (_LINUX_MEI_HDCP_H) */ --2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Usyskin, Alexander
maintainerRE: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state change
Quoted 45 lines
-----Original Message-----
From: C, Ramalingam
Sent: Wednesday, May 16, 2018 16:05
To: Usyskin, Alexander <[email protected]>; intel- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: Re: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state changeThanks Alexander for the review. Sorry for the delay in addressing the review comments
Quoted 10 lines · Alexander
Quoted 10 lines
-----Original Message-----
From: C, Ramalingam
Sent: Tuesday, April 03, 2018 16:57
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>; C, Ramalingam <[email protected]>
Subject: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldevstate
Quoted 6 lines
Quoted 6 lines
change
Notifier Chain is defined to inform all its clients about the mei client device state change. Routine is defined for the clients to register and unregister for the notification on state change.
Quoted 8 lines
Quoted 7 lines
v2:
Rebased.
v3:
Notifier chain is adopted for cldev state update [Tomas]Signed-off-by Ramalingam C <[email protected]>---
May be I miss something, but bus subsystem already has notifier chain.
(
BUS_NOTIFY_ADD_DEVICEetc.)Quoted 1 line
We only ought to make
mei_cl_bus_typeavailable in header.
Quoted 8 lines
We need re notification incase of binding of the mei device happened well before the I915 init.
This is the case if I915 and MEI HDCP are build as modules and loaded in order.So I prefer the separate notifier for
mei_hdcp. Hope that is fine.--Ram
Still miss the part how you design coupe with mei device loaded well before i915? Can you explain?
Quoted 143 lines
Quoted 2 lines
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c | 36+++++++++++++++++++++++++++---
Quoted 70 lines
Quoted 70 lines
include/linux/mei_hdcp.h | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-)create mode 100644
include/linux/mei_hdcp.hdrivers/misc/mei/hdcp/mei_hdcp.c +26
-0@@ -31,6 +31,32 @@#include <linux/slab.h> #include <linux/uuid.h> #include <linux/mei_cl_bus.h> +#include <linux/notifier.h> +#include <linux/mei_hdcp.h> + +static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); + +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) +{ +if (enabled) +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_ENABLED , cldev); +else +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_DISABLED ,NULL ); +} + +int mei_cldev_register_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_register (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_register_notify); + +int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_unregister (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_unregister_notify);static int mei_hdcp_probe(struct
mei_cl_device*cldev,
const structmei_cl_device_id*id)drivers/misc/mei/hdcp/mei_hdcp.c +6
-2@@ -38,14 +64,18 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev, int ret; ret =mei_cldev_enable (cldev); -if (ret <0 ) +if (ret <0 ) {dev_err (&cldev->dev,"mei_cldev_enable Failed. %d\n" , ret); +return ret; + } -return ret; +mei_cldev_state_notify_clients (cldev, true); +return 0 ; }static int mei_hdcp_remove (struct mei_cl_device *cldev) { +mei_cldev_state_notify_clients (cldev, false);mei_cldev_set_drvdata (cldev,NULL );return mei_cldev_disable (cldev);}drivers/misc/mei/hdcp/mei_hdcp.c +0
-0@@ -71,4 +101,4 @@ module_mei_cl_driver(mei_hdcp_driver);Quoted 15 lines
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +1
-1MODULE_AUTHOR ("Intel Corporation" );MODULE_LICENSE ("Dual BSD/GPL" ); -MODULE_DESCRIPTION ("HDCP" ); +MODULE_DESCRIPTION ("MEI HDCP" );include/linux/mei_hdcp.h new file +0
-0include/linux/mei_hdcp.h line 5
Quoted 5 lines
include/linux/mei_hdcp.h new file +5
-0@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* +* Copyright © 2017-2018 Intel Corporation +* +* Permission to use, copy, modify, distribute, and sell this software and its
Quoted 1 line
include/linux/mei_hdcp.h line 6
Quoted 1 line
include/linux/mei_hdcp.h new file +1
-0+* documentation for any purpose is hereby granted without fee, provided
Quoted 4 lines
Quoted 4 lines
that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supportingdocumentation,
Quoted 4 lines
Quoted 4 lines
and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make norepresentations
Quoted 1 line
Quoted 1 line
+ * about the suitability of this software for any purpose. It is provided
"as
Quoted 3 lines
Quoted 3 lines
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARDTO
Quoted 6 lines
Quoted 6 lines
THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVERRESULTING
Quoted 2 lines
Quoted 2 lines
FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE
Quoted 2 lines
Quoted 2 lines
OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THEUSE
Quoted 23 lines
Quoted 23 lines
OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Authors:
+ * Ramalingam C <[email protected]>
+ */include/linux/mei_hdcp.h new file +17
-0+ +#ifndef _LINUX_MEI_HDCP_H +#define _LINUX_MEI_HDCP_H + +enum mei_cldev_state { +MEI_CLDEV_DISABLED , +MEI_CLDEV_ENABLED +}; + +#ifdef CONFIG_INTEL_MEI_HDCP +int mei_cldev_register_notify (struct notifier_block *nb); +int mei_cldev_unregister_notify (struct notifier_block *nb); +#else +static int mei_cldev_register_notify (struct notifier_block *nb) +{ +return -ENODEV ; +}
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/linux/mei_hdcp.h new file +6
-1+static int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return -ENODEV ; +} +#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ +#endif /* defined (_LINUX_MEI_HDCP_H) */ --2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state change
Quoted 49 lines · Alexander
Quoted 49 lines
-----Original Message-----
From: C, Ramalingam
Sent: Wednesday, May 16, 2018 16:05
To: Usyskin, Alexander <[email protected]>; intel- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: Re: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldev state changeThanks Alexander for the review. Sorry for the delay in addressing the review comments
Quoted 10 lines · Alexander
Quoted 10 lines
-----Original Message-----
From: C, Ramalingam
Sent: Tuesday, April 03, 2018 16:57
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>; C, Ramalingam <[email protected]>
Subject: [PATCH v3 05/40] misc/mei/hdcp: Notifier chain for mei cldevstate
Quoted 6 lines
Quoted 6 lines
change
Notifier Chain is defined to inform all its clients about the mei client device state change. Routine is defined for the clients to register and unregister for the notification on state change.
Quoted 8 lines
Quoted 7 lines
v2:
Rebased.
v3:
Notifier chain is adopted for cldev state update [Tomas]Signed-off-by Ramalingam C <[email protected]>---
May be I miss something, but bus subsystem already has notifier chain.
(
BUS_NOTIFY_ADD_DEVICEetc.)Quoted 1 line
We only ought to make
mei_cl_bus_typeavailable in header.We need re notification incase of binding of the mei device happened well before the I915 init.
This is the case if I915 and MEI HDCP are build as modules and loaded in order.
Quoted 5 lines
Quoted 3 lines
So I prefer the separate notifier for
mei_hdcp. Hope that is fine.--Ram
Still miss the part how you design coupe with mei device loaded well before i915? Can you explain?
If you build both I915 and mei_hdcp as modules, as mei_hdcp provides some symbols for the I915, mei_hdcp needs to be loaded first. Hence mei hdcp client device binding is completed before the I915 Load. So notifier triggered even before its listener I915 is ready. So When you load the I915 after mei hdcp client device binding, We need to trigger the notifier calls once again, so that I915 will get the handle cldev.
--Ram
Quoted 143 lines
Quoted 143 lines
Quoted 2 lines
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c | 36+++++++++++++++++++++++++++---
Quoted 70 lines
Quoted 70 lines
include/linux/mei_hdcp.h | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-)create mode 100644
include/linux/mei_hdcp.hdrivers/misc/mei/hdcp/mei_hdcp.c +26
-0@@ -31,6 +31,32 @@#include <linux/slab.h> #include <linux/uuid.h> #include <linux/mei_cl_bus.h> +#include <linux/notifier.h> +#include <linux/mei_hdcp.h> + +static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); + +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) +{ +if (enabled) +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_ENABLED , cldev); +else +blocking_notifier_call_chain (&mei_cldev_notifier_list, +MEI_CLDEV_DISABLED ,NULL ); +} + +int mei_cldev_register_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_register (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_register_notify); + +int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_unregister (&mei_cldev_notifier_list, nb); +} +EXPORT_SYMBOL_GPL (mei_cldev_unregister_notify);static int mei_hdcp_probe(struct
mei_cl_device*cldev,
const structmei_cl_device_id*id)drivers/misc/mei/hdcp/mei_hdcp.c +6
-2@@ -38,14 +64,18 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev, int ret; ret =mei_cldev_enable (cldev); -if (ret <0 ) +if (ret <0 ) {dev_err (&cldev->dev,"mei_cldev_enable Failed. %d\n" , ret); +return ret; + } -return ret; +mei_cldev_state_notify_clients (cldev, true); +return 0 ; }static int mei_hdcp_remove (struct mei_cl_device *cldev) { +mei_cldev_state_notify_clients (cldev, false);mei_cldev_set_drvdata (cldev,NULL );return mei_cldev_disable (cldev);}drivers/misc/mei/hdcp/mei_hdcp.c +0
-0@@ -71,4 +101,4 @@ module_mei_cl_driver(mei_hdcp_driver);Quoted 15 lines
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +1
-1MODULE_AUTHOR ("Intel Corporation" );MODULE_LICENSE ("Dual BSD/GPL" ); -MODULE_DESCRIPTION ("HDCP" ); +MODULE_DESCRIPTION ("MEI HDCP" );include/linux/mei_hdcp.h new file +0
-0include/linux/mei_hdcp.h line 5
Quoted 5 lines
include/linux/mei_hdcp.h new file +5
-0@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* +* Copyright © 2017-2018 Intel Corporation +* +* Permission to use, copy, modify, distribute, and sell this software and its
Quoted 1 line
include/linux/mei_hdcp.h line 6
Quoted 1 line
include/linux/mei_hdcp.h new file +1
-0+* documentation for any purpose is hereby granted without fee, provided
Quoted 4 lines
Quoted 4 lines
that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supportingdocumentation,
Quoted 4 lines
Quoted 4 lines
and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make norepresentations
Quoted 1 line
Quoted 1 line
+ * about the suitability of this software for any purpose. It is provided
"as
Quoted 3 lines
Quoted 3 lines
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARDTO
Quoted 6 lines
Quoted 6 lines
THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVERRESULTING
Quoted 2 lines
Quoted 2 lines
FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE
Quoted 2 lines
Quoted 2 lines
OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THEUSE
Quoted 23 lines
Quoted 23 lines
OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Authors:
+ * Ramalingam C <[email protected]>
+ */include/linux/mei_hdcp.h new file +17
-0+ +#ifndef _LINUX_MEI_HDCP_H +#define _LINUX_MEI_HDCP_H + +enum mei_cldev_state { +MEI_CLDEV_DISABLED , +MEI_CLDEV_ENABLED +}; + +#ifdef CONFIG_INTEL_MEI_HDCP +int mei_cldev_register_notify (struct notifier_block *nb); +int mei_cldev_unregister_notify (struct notifier_block *nb); +#else +static int mei_cldev_register_notify (struct notifier_block *nb) +{ +return -ENODEV ; +}
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/linux/mei_hdcp.h new file +6
-1+static int mei_cldev_unregister_notify (struct notifier_block *nb) +{ +return -ENODEV ; +} +#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ +#endif /* defined (_LINUX_MEI_HDCP_H) */ --2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 6/40 misc/mei/hdcp: Define ME FW interface for HDCP2.2
In reply to Ramalingam CDefines the HDCP specific ME FW interfaces such as Request CMDs, payload structure for CMDs and their response status codes.
This patch defines payload size(Excluding the Header)for each WIRED HDCP2.2 CMDs.
v2:
Rebased.
v3:
Extra comments are removed.
--- drivers/misc/mei/hdcp/mei_hdcp.h | 415 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 415 insertions(+) create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.h
drivers/misc/mei/hdcp/mei_hdcp.h new file +415 -0
@@ -0,0 +1,415 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* +* Copyright © 2017-2018 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +* Authors: +* Ramalingam C <[email protected]> +*/ + +#ifndef __MEI_HDCP_H__ +#define __MEI_HDCP_H__ + +#include <drm/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 each CMD 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 { +uint8_t e_kpub_km[HDCP_2_2_E_KPUB_KM_LEN ]; +uint8_t e_kh_km_m[HDCP_2_2_E_KH_KM_M_LEN ]; +struct { +uint8_t e_kh_km[HDCP_KH_LEN ]; +uint8_t m[HDCP_M_LEN ]; + } __packed; +}; + +/** +* HDCP HECI message header. All header values are little endian. +*/ +struct hdcp_cmd_header { +uint32_t api_version; +uint32_t command_id; +enum me_hdcp_status status; +/* Length of the HECI message (excluding the header) */ +uint32_t 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 { +uint8_t integrated_port_type; +uint8_t physical_port; +uint16_t 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; +uint8_t protocol;/* for HDMI vs DP */ +} __packed; + +struct wired_cmd_initiate_hdcp2_session_out { +struct hdcp_cmd_header header; +struct hdcp_port_id port; +uint8_t 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; +uint8_t r_rx[HDCP_2_2_RRX_LEN ]; +uint8_t 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; +uint8_t km_stored; +uint8_t 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; +uint8_t 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; +uint8_t 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; +uint8_t 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; +uint8_t 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; +uint8_t e_dkey_ks[HDCP_2_2_E_DKEY_KS_LEN ]; +uint8_t 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; +uint8_t 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; +uint8_t rx_info[HDCP_2_2_RXINFO_LEN ]; +uint8_t seq_num_v[HDCP_2_2_SEQ_NUM_LEN ]; +uint8_t v_prime[HDCP_2_2_LPRIME_HALF_LEN ]; +uint8_t 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; +uint8_t content_type_supported; +uint8_t v[HDCP_2_2_LPRIME_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; +uint8_t seq_num_m[HDCP_2_2_SEQ_NUM_LEN ]; +uint8_t m_prime[HDCP_2_2_MPRIME_LEN ]; +uint16_t k; +struct hdcp2_streamid_type streams[1 ]; +} __packed; + +struct wired_cmd_repeater_auth_stream_req_out { +struct hdcp_cmd_header header; +struct hdcp_port_id port; +} __packed; + +#endif /* __MEI_HDCP_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 7/40 linux/mei: Header for mei_hdcp driver interface
In reply to Ramalingam CData structures and Enum for the I915-MEI_HDCP interface are defined at <linux/mei_hdcp.h>
v2:
Rebased.
v3:
mei_cl_device is removed from mei_hdcp_data [Tomas]
--- include/linux/mei_hdcp.h | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+)
include/linux/mei_hdcp.h +70 -0
@@ -27,11 +27,81 @@#ifndef _LINUX_MEI_HDCP_H#define _LINUX_MEI_HDCP_H +#include <linux/mei_cl_bus.h> +enum mei_cldev_state {MEI_CLDEV_DISABLED ,MEI_CLDEV_ENABLED }; +/* +* Enumeration of the physical DDI available on the platform +*/ +enum hdcp_physical_port { +INVALID_PORT =0x00 ,/* Not a valid port */ + +DDI_RANGE_BEGIN =0x01 ,/* Beginning of the valid DDI port range */ +DDI_B =0x01 ,/* Port DDI B */ +DDI_C =0x02 ,/* Port DDI C */ +DDI_D =0x03 ,/* Port DDI D */ +DDI_E =0x04 ,/* Port DDI E */ +DDI_F =0x05 ,/* Port DDI F */ +DDI_A =0x07 ,/* Port DDI A */ +DDI_RANGE_END =DDI_A ,/* End of the valid DDI port range */ +}; + +/* The types of HDCP 2.2 ports supported */ +enum hdcp_integrated_port_type { +HDCP_INVALID_TYPE =0x00 , + +/* HDCP 2.x ports that are integrated into Intel HW */ +INTEGRATED =0x01 , + +/* HDCP2.2 discrete wired Tx port with LSPCON (HDMI 2.0) solution */ +LSPCON =0x02 , + +/* HDCP2.2 discrete wired Tx port using the CPDP (DP 1.3) solution */ +CPDP =0x03 , +}; + +/** +* wired_protocol: Supported integrated wired HDCP protocol. +* Based on this value, Minor differenceneeded between wired specifications +* are handled. +*/ +enum hdcp_protocol { +HDCP_PROTOCOL_INVALID , +HDCP_PROTOCOL_HDMI , +HDCP_PROTOCOL_DP +}; + +/** +* mei_hdcp_data: Input data to the mei_hdcp APIs. +*/ +struct mei_hdcp_data { +enum hdcp_physical_port port; +enum hdcp_integrated_port_type port_type; +enum hdcp_protocol protocol; + +/* +* No of streams transmitted on a port. +* In case of HDMI & DP SST, single stream will be +* transmitted on a port. +*/ +uint16_t k; + +/* +* Count of RepeaterAuth_Stream_Manage msg propagated. +* Initialized to 0 on AKE_INIT. Incremented after every successful +* transmission of RepeaterAuth_Stream_Manage message. When it rolls +* over re-Auth has to be triggered. +*/ +uint32_t seq_num_m; + +/* k(No of Streams per port) x structure of wired_streamid_type */ +struct hdcp2_streamid_type *streams; +}; +#ifdef CONFIG_INTEL_MEI_HDCP int mei_cldev_register_notify (struct notifier_block *nb);int mei_cldev_unregister_notify (struct notifier_block *nb);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 07/40] linux/mei: Header for mei_hdcp driver interface
Quoted 45 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 07/40] linux/mei: Header formei_hdcpdriver interfaceData structures and Enum for the I915-MEI_HDCP interface are defined at <
linux/mei_hdcp.h>v2:
Rebased.
v3:
mei_cl_deviceis removed frommei_hdcp_data[Tomas]Signed-off-by Ramalingam C <[email protected]>---
include/linux/mei_hdcp.h| 70
++++++++++++++++++++++++++++++++++++++++++++++++1 file changed, 70 insertions(+)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
3b46bebde718..634c1a5bdf1e100644include/linux/mei_hdcp.h +5
-0@@ -27,11 +27,81 @@#ifndef _LINUX_MEI_HDCP_H#define _LINUX_MEI_HDCP_H +#include <linux/mei_cl_bus.h> +enum mei_cldev_state {MEI_CLDEV_DISABLED ,MEI_CLDEV_ENABLED }; +/* +* Enumeration of the physical DDI available on the platform */ enum +hdcp_physical_port {
include/linux/mei_hdcp.h line 49
Quoted 10 lines
include/linux/mei_hdcp.h +9
-0+INVALID_PORT =0x00 ,/* Not a valid port */ + +DDI_RANGE_BEGIN =0x01 ,/* Beginning of the valid DDI port range */ +DDI_B =0x01 ,/* Port DDI B */ +DDI_C =0x02 ,/* Port DDI C */ +DDI_D =0x03 ,/* Port DDI D */ +DDI_E =0x04 ,/* Port DDI E */ +DDI_F =0x05 ,/* Port DDI F */ + DDI_A = 0x07, /* Port DDI A */
Why A is made as 0x7. In I915, enum port defines A as 0. Any special reason to deviate from that ?
Quoted 8 lines
include/linux/mei_hdcp.h +8
-0+ DDI_RANGE_END = DDI_A,/* End of the valid DDI port range */ +}; + +/* The types of HDCP 2.2 ports supported */ enum +hdcp_integrated_port_type { +HDCP_INVALID_TYPE =0x00 , + +/* HDCP 2.x ports that are integrated into Intel HW */
include/linux/mei_hdcp.h line 67
Quoted 10 lines
include/linux/mei_hdcp.h +10
-0+INTEGRATED =0x01 , + +/* HDCP2.2 discrete wired Tx port with LSPCON (HDMI 2.0) solution */ +LSPCON =0x02 , + +/* HDCP2.2 discrete wired Tx port using the CPDP (DP 1.3) solution */ + CPDP = 0x03, +}; + +/**
Drop an extra *
include/linux/mei_hdcp.h line 69
Quoted 2 lines
include/linux/mei_hdcp.h +2
-0+* wired_protocol: Supported integrated wired HDCP protocol. +* Based on this value, Minor differenceneeded between wired
"Add space after differences"
Quoted 42 lines
include/linux/mei_hdcp.h +36
-0+specifications +* are handled. +*/ +enum hdcp_protocol { +HDCP_PROTOCOL_INVALID , +HDCP_PROTOCOL_HDMI , +HDCP_PROTOCOL_DP +}; + +/** +* mei_hdcp_data: Input data to the mei_hdcp APIs. +*/ +struct mei_hdcp_data { +enum hdcp_physical_port port; +enum hdcp_integrated_port_type port_type; +enum hdcp_protocol protocol; + +/* +* No of streams transmitted on a port. +* In case of HDMI & DP SST, single stream will be +* transmitted on a port. +*/ +uint16_t k; + +/* +* Count of RepeaterAuth_Stream_Manage msg propagated. +* Initialized to 0 on AKE_INIT. Incremented after every successful +* transmission of RepeaterAuth_Stream_Manage message. When it rolls +* over re-Auth has to be triggered. +*/ +uint32_t seq_num_m; + +/* k(No of Streams per port) x structure of wired_streamid_type */ +struct hdcp2_streamid_type *streams; +}; +#ifdef CONFIG_INTEL_MEI_HDCP int
mei_cldev_register_notify(struct notifier_block *nb); intmei_cldev_unregister_notify(struct notifier_block *nb); --
2.7.4
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 07/40] linux/mei: Header for mei_hdcp driver interface
Quoted 41 lines · Uma
Quoted 41 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 07/40] linux/mei: Header formei_hdcpdriver interfaceData structures and Enum for the I915-MEI_HDCP interface are defined at <
linux/mei_hdcp.h>v2:
Rebased.
v3:
mei_cl_deviceis removed frommei_hdcp_data[Tomas]Signed-off-by Ramalingam C <[email protected]>---
include/linux/mei_hdcp.h| 70
++++++++++++++++++++++++++++++++++++++++++++++++1 file changed, 70 insertions(+)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
3b46bebde718..634c1a5bdf1e100644include/linux/mei_hdcp.h +2
-0@@ -27,11 +27,81 @@#ifndef _LINUX_MEI_HDCP_H#define _LINUX_MEI_HDCP_H +#include <linux/mei_cl_bus.h> +enum mei_cldev_state {MEI_CLDEV_DISABLED ,MEI_CLDEV_ENABLED };
Quoted 15 lines
include/linux/mei_hdcp.h line 49
Quoted 13 lines
include/linux/mei_hdcp.h +12
-0+/* +* Enumeration of the physical DDI available on the platform */ enum +hdcp_physical_port { +INVALID_PORT =0x00 ,/* Not a valid port */ + +DDI_RANGE_BEGIN =0x01 ,/* Beginning of the valid DDI port range */ +DDI_B =0x01 ,/* Port DDI B */ +DDI_C =0x02 ,/* Port DDI C */ +DDI_D =0x03 ,/* Port DDI D */ +DDI_E =0x04 ,/* Port DDI E */ +DDI_F =0x05 ,/* Port DDI F */ +DDI_A =0x07 ,/* Port DDI A */ Why A is made as
0x7. In I915, enum port defines A as 0. Any special reason to deviate from that ?
ME FW represent the ports with similar enum. So we have no choice but translate our port representation to this enum values.
Quoted 21 lines
Quoted 9 lines
include/linux/mei_hdcp.h +8
-0+ DDI_RANGE_END = DDI_A,/* End of the valid DDI port range */ +}; + +/* The types of HDCP 2.2 ports supported */ enum +hdcp_integrated_port_type { +HDCP_INVALID_TYPE =0x00 , + +/* HDCP 2.x ports that are integrated into Intel HW */ include/linux/mei_hdcp.h line 67
Quoted 10 lines
include/linux/mei_hdcp.h +10
-0+INTEGRATED =0x01 , + +/* HDCP2.2 discrete wired Tx port with LSPCON (HDMI 2.0) solution */ +LSPCON =0x02 , + +/* HDCP2.2 discrete wired Tx port using the CPDP (DP 1.3) solution */ + CPDP = 0x03, +}; + +/** Drop an extra *
Quoted 3 lines
include/linux/mei_hdcp.h line 69
Quoted 2 lines
include/linux/mei_hdcp.h +2
-0+* wired_protocol: Supported integrated wired HDCP protocol. +* Based on this value, Minor differenceneeded between wired "Add space after differences"
Sure.
--Ram
Quoted 43 lines
Quoted 43 lines
include/linux/mei_hdcp.h +36
-0+specifications +* are handled. +*/ +enum hdcp_protocol { +HDCP_PROTOCOL_INVALID , +HDCP_PROTOCOL_HDMI , +HDCP_PROTOCOL_DP +}; + +/** +* mei_hdcp_data: Input data to the mei_hdcp APIs. +*/ +struct mei_hdcp_data { +enum hdcp_physical_port port; +enum hdcp_integrated_port_type port_type; +enum hdcp_protocol protocol; + +/* +* No of streams transmitted on a port. +* In case of HDMI & DP SST, single stream will be +* transmitted on a port. +*/ +uint16_t k; + +/* +* Count of RepeaterAuth_Stream_Manage msg propagated. +* Initialized to 0 on AKE_INIT. Incremented after every successful +* transmission of RepeaterAuth_Stream_Manage message. When it rolls +* over re-Auth has to be triggered. +*/ +uint32_t seq_num_m; + +/* k(No of Streams per port) x structure of wired_streamid_type */ +struct hdcp2_streamid_type *streams; +}; +#ifdef CONFIG_INTEL_MEI_HDCP int
mei_cldev_register_notify(struct notifier_block *nb); intmei_cldev_unregister_notify(struct notifier_block *nb); --
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 8/40 misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session
In reply to Ramalingam CRequest ME FW to start the HDCP2.2 session for a intel port. Prepares payloads for command WIRED_INITIATE_HDCP2_SESSION and sent to ME FW.
On Success, ME FW will start a HDCP2.2 session for the port and provides the content for HDCP2.2 AKE_Init message.
v2:
Rebased.
v3:
cldev is add as a separate parameter [Tomas] Redundant comment and typecast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 68 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 11 +++++++ 2 files changed, 79 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +68 -0
@@ -33,9 +33,77 @@#include <linux/mei_cl_bus.h> #include <linux/notifier.h> #include <linux/mei_hdcp.h> +#include <drm/drm_connector.h> + +#include "mei_hdcp.h" static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); +/** +* mei_initiate_hdcp2_session: +* Function to start a Wired HDCP2.2 Tx Session with ME FW +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @ake_data : ptr to store AKE_Init +* +* Returns 0 on Success, <0 on Failure. +*/ +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !ake_data) +return -EINVAL ; + + dev = &cldev->dev; + + 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.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 = data->port; + session_init_in.protocol = (uint8_t )data->protocol; + + byte =mei_cldev_send (cldev, (u8 *)&session_init_in, +sizeof (session_init_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&session_init_out, +sizeof (session_init_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (session_init_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X Failed. Status: 0x%X\n" , +WIRED_INITIATE_HDCP2_SESSION , + session_init_out.header.status); +return -1 ; + } + + 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, +sizeof (session_init_out.r_tx)); + +return 0 ; +} +EXPORT_SYMBOL (mei_initiate_hdcp2_session); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +11 -0
@@ -28,6 +28,7 @@#define _LINUX_MEI_HDCP_H#include <linux/mei_cl_bus.h> +#include <drm/drm_hdcp.h> enum mei_cldev_state {MEI_CLDEV_DISABLED ,
@@ -105,6 +106,9 @@ struct mei_hdcp_data {#ifdef CONFIG_INTEL_MEI_HDCP int mei_cldev_register_notify (struct notifier_block *nb);int mei_cldev_unregister_notify (struct notifier_block *nb); +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -114,5 +118,12 @@ static int mei_cldev_unregister_notify(struct notifier_block *nb) {return -ENODEV ; } +static inline +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [Intel-gfx] [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session
Thank you for the patch! Yet something to improve:
Hi Ramalingam,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20180403]
[cannot apply to v4.16]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ramalingam-C/drm-i915-Implement-HDCP2-2/20180404-031743 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
>> drivers/misc/mei/hdcp/mei_hdcp.c:52:5: error: redefinition of 'mei_initiate_hdcp2_session'
int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:122:5: note: previous definition of 'mei_initiate_hdcp2_session' was here
int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:117:5: error: redefinition of 'mei_cldev_register_notify'
int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:113:12: note: previous definition of 'mei_cldev_register_notify' was here
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:123:5: error: redefinition of 'mei_cldev_unregister_notify'
int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:117:12: note: previous definition of 'mei_cldev_unregister_notify' was here
static int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/mei_hdcp.h:117:12: warning: 'mei_cldev_unregister_notify' defined but not used [-Wunused-function] include/linux/mei_hdcp.h:113:12: warning: 'mei_cldev_register_notify' defined but not used [-Wunused-function]
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
vim +/mei_initiate_hdcp2_session +52 drivers/misc/mei/hdcp/mei_hdcp.c
41
42 /**
43 * mei_initiate_hdcp2_session:
44 * Function to start a Wired HDCP2.2 Tx Session with ME FW
45 *
46 * @cldev : Pointer for mei client device
47 * @data : Intel HW specific Data
48 * @ake_data : ptr to store AKE_Init
49 *
50 * Returns 0 on Success, <0 on Failure.
51 */
> 52 int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
53 struct mei_hdcp_data *data,
54 struct hdcp2_ake_init *ake_data)
55 {
56 struct wired_cmd_initiate_hdcp2_session_in session_init_in = { { 0 } };
57 struct wired_cmd_initiate_hdcp2_session_out
58 session_init_out = { { 0 } };
59 struct device *dev;
60 ssize_t byte;
61
62 if (!data || !ake_data)
63 return -EINVAL;
64
65 dev = &cldev->dev;
66
67 session_init_in.header.api_version = HDCP_API_VERSION;
68 session_init_in.header.command_id = WIRED_INITIATE_HDCP2_SESSION;
69 session_init_in.header.status = ME_HDCP_STATUS_SUCCESS;
70 session_init_in.header.buffer_len =
71 WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN;
72
73 session_init_in.port.integrated_port_type = data->port_type;
74 session_init_in.port.physical_port = data->port;
75 session_init_in.protocol = (uint8_t)data->protocol;
76
77 byte = mei_cldev_send(cldev, (u8 *)&session_init_in,
78 sizeof(session_init_in));
79 if (byte < 0) {
80 dev_dbg(dev, "mei_cldev_send failed. %d\n", (int)byte);
81 return byte;
82 }
83
84 byte = mei_cldev_recv(cldev, (u8 *)&session_init_out,
85 sizeof(session_init_out));
86 if (byte < 0) {
87 dev_dbg(dev, "mei_cldev_recv failed. %d\n", (int)byte);
88 return byte;
89 }
90
91 if (session_init_out.header.status != ME_HDCP_STATUS_SUCCESS) {
92 dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
93 WIRED_INITIATE_HDCP2_SESSION,
94 session_init_out.header.status);
95 return -1;
96 }
97
98 ake_data->msg_id = HDCP_2_2_AKE_INIT;
99 ake_data->tx_caps = session_init_out.tx_caps; 100 memcpy(ake_data->r_tx, session_init_out.r_tx,
101 sizeof(session_init_out.r_tx));
102
103 return 0;
104 }
105 EXPORT_SYMBOL(mei_initiate_hdcp2_session);
106
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Usyskin, Alexander
maintainerRE: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session
In reply to Ramalingam CQuoted 80 lines
-----Original Message-----
From: C, Ramalingam
Sent: Tuesday, April 03, 2018 16:57
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>; C, Ramalingam <[email protected]>
Subject: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx SessionRequest ME FW to start the HDCP2.2 session for a intel port. Prepares payloads for command
WIRED_INITIATE_HDCP2_SESSIONand sent to ME FW.On Success, ME FW will start a HDCP2.2 session for the port and provides the content for HDCP2.2
AKE_Initmessage.v2:
Rebased.
v3:
cldev is add as a separate parameter [Tomas] Redundant comment and typecast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>--- drivers/misc/mei/hdcp/mei_hdcp.c | 68 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 11 +++++++ 2 files changed, 79 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +33
-0@@ -33,9 +33,77 @@#include <linux/mei_cl_bus.h> #include <linux/notifier.h> #include <linux/mei_hdcp.h> +#include <drm/drm_connector.h> + +#include "mei_hdcp.h" static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); +/** +* mei_initiate_hdcp2_session: +* Function to start a Wired HDCP2.2 Tx Session with ME FW +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @ake_data : ptr to store AKE_Init +* +* Returns 0 on Success, <0 on Failure. +*/ +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !ake_data) +return -EINVAL ; + + dev = &cldev->dev; + + 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.buffer_len = +
drivers/misc/mei/hdcp/mei_hdcp.c line 83
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN ; + + session_init_in.port.integrated_port_type = data->port_type; + session_init_in.port.physical_port = data->port; + session_init_in.protocol = (uint8_t )data->protocol; + + byte =mei_cldev_send (cldev, (u8 *)&session_init_in, +sizeof (session_init_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte);
%zd don't require (int)
drivers/misc/mei/hdcp/mei_hdcp.c line 87
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&session_init_out, +sizeof (session_init_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte);
%zd don't require (int)
drivers/misc/mei/hdcp/mei_hdcp.c line 95
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c +8
-0+return byte; + } + +if (session_init_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X Failed. Status: 0x%X\n" , +WIRED_INITIATE_HDCP2_SESSION , + session_init_out.header.status); +return -1 ;
It will be better to return some meaningful error code here.
Quoted 50 lines
drivers/misc/mei/hdcp/mei_hdcp.c +11
-0+ } + + 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, +sizeof (session_init_out.r_tx)); + +return 0 ; +} +EXPORT_SYMBOL (mei_initiate_hdcp2_session); +void mei_cldev_state_notify_clients(struct
mei_cl_device*cldev, bool
enabled)
{drivers/misc/mei/hdcp/mei_hdcp.c +0
-0if (enabled)include/linux/mei_hdcp.h +11
-0@@ -28,6 +28,7 @@#define _LINUX_MEI_HDCP_H#include <linux/mei_cl_bus.h> +#include <drm/drm_hdcp.h> enum mei_cldev_state {MEI_CLDEV_DISABLED ,@@ -105,6 +106,9 @@ struct mei_hdcp_data {#ifdef CONFIG_INTEL_MEI_HDCP int mei_cldev_register_notify (struct notifier_block *nb);int mei_cldev_unregister_notify (struct notifier_block *nb); +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data);#else static int mei_cldev_register_notify (struct notifier_block *nb) {@@ -114,5 +118,12 @@ static int mei_cldev_unregister_notify(struct notifier_block *nb) {return -ENODEV ; } +static inline +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */
Quoted 3 lines
#endif /* defined (
_LINUX_MEI_HDCP_H) */
--
2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session
Quoted 82 lines · Alexander
Quoted 82 lines
-----Original Message-----
From: C, Ramalingam
Sent: Tuesday, April 03, 2018 16:57
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>; C, Ramalingam <[email protected]>
Subject: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx SessionRequest ME FW to start the HDCP2.2 session for a intel port. Prepares payloads for command
WIRED_INITIATE_HDCP2_SESSIONand sent to ME FW.On Success, ME FW will start a HDCP2.2 session for the port and provides the content for HDCP2.2
AKE_Initmessage.v2:
Rebased.
v3:
cldev is add as a separate parameter [Tomas] Redundant comment and typecast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>--- drivers/misc/mei/hdcp/mei_hdcp.c | 68 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 11 +++++++ 2 files changed, 79 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +35
-0@@ -33,9 +33,77 @@#include <linux/mei_cl_bus.h> #include <linux/notifier.h> #include <linux/mei_hdcp.h> +#include <drm/drm_connector.h> + +#include "mei_hdcp.h" static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); +/** +* mei_initiate_hdcp2_session: +* Function to start a Wired HDCP2.2 Tx Session with ME FW +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @ake_data : ptr to store AKE_Init +* +* Returns 0 on Success, <0 on Failure. +*/ +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !ake_data) +return -EINVAL ; + + dev = &cldev->dev; + + 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.buffer_len = +WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN ; + + session_init_in.port.integrated_port_type = data->port_type;
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c line 80
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+ session_init_in.port.physical_port = data->port; + session_init_in.protocol = (uint8_t )data->protocol; + + byte =mei_cldev_send (cldev, (u8 *)&session_init_in, +sizeof (session_init_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte);%zd don't require (int)
Sure. Thanks
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c line 87
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&session_init_out, +sizeof (session_init_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte);%zd don't require (int)
Quoted 9 lines
drivers/misc/mei/hdcp/mei_hdcp.c line 95
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c +8
-0+return byte; + } + +if (session_init_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X Failed. Status: 0x%X\n" , +WIRED_INITIATE_HDCP2_SESSION , + session_init_out.header.status); +return -1 ;It will be better to return some meaningful error code here.
I dont think default error codes will match here. And at present other side I915 doesn't expect the reason but the failure state. May be we could do something like -(session_init_out.header.status). But error codes of ME FW is not known to I915.
So may be as of now lets keep it as some -ve return value -1?
--Ram
Quoted 45 lines
Quoted 45 lines
drivers/misc/mei/hdcp/mei_hdcp.c +11
-0+ } + + 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, +sizeof (session_init_out.r_tx)); + +return 0 ; +} +EXPORT_SYMBOL (mei_initiate_hdcp2_session); +void mei_cldev_state_notify_clients(struct
mei_cl_device*cldev, bool
enabled)
{
if (enabled)include/linux/mei_hdcp.h +7
-0@@ -28,6 +28,7 @@#define _LINUX_MEI_HDCP_H#include <linux/mei_cl_bus.h> +#include <drm/drm_hdcp.h> enum mei_cldev_state {MEI_CLDEV_DISABLED ,@@ -105,6 +106,9 @@ struct mei_hdcp_data {#ifdef CONFIG_INTEL_MEI_HDCP int mei_cldev_register_notify (struct notifier_block *nb);int mei_cldev_unregister_notify (struct notifier_block *nb); +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data);#else static int mei_cldev_register_notify (struct notifier_block *nb) {@@ -114,5 +118,12 @@ static int mei_cldev_unregister_notify(struct notifier_block *nb) {return -ENODEV ; } +static inline +int mei_initiate_hdcp2_session(struct mei_cl_device *cldev, + struct mei_hdcp_data *data,
Quoted 8 lines
Quoted 8 lines
include/linux/mei_hdcp.h +4
-0+ struct hdcp2_ake_init *ake_data) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (
_LINUX_MEI_HDCP_H) */
--
2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Usyskin, Alexander
maintainerRE: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session
Quoted 127 lines
-----Original Message-----
From: C, Ramalingam
Sent: Wednesday, May 16, 2018 18:20
To: Usyskin, Alexander <[email protected]>; intel- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: Re: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx SessionQuoted 14 lines · Alexander
Quoted 14 lines
-----Original Message-----
From: C, Ramalingam
Sent: Tuesday, April 03, 2018 16:57
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>; C, Ramalingam <[email protected]>
Subject: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx SessionQuoted 2 lines
Quoted 2 lines
Request ME FW to start the HDCP2.2 session for a intel port. Prepares payloads for command
WIRED_INITIATE_HDCP2_SESSIONandsent
Quoted 68 lines
Quoted 68 lines
to ME FW.
On Success, ME FW will start a HDCP2.2 session for the port and provides the content for HDCP2.2
AKE_Initmessage.v2:
Rebased.
v3:
cldev is add as a separate parameter [Tomas] Redundant comment and typecast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>--- drivers/misc/mei/hdcp/mei_hdcp.c | 68 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 11 +++++++ 2 files changed, 79 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +35
-0@@ -33,9 +33,77 @@#include <linux/mei_cl_bus.h> #include <linux/notifier.h> #include <linux/mei_hdcp.h> +#include <drm/drm_connector.h> + +#include "mei_hdcp.h" static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); +/** +* mei_initiate_hdcp2_session: +* Function to start a Wired HDCP2.2 Tx Session with ME FW +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @ake_data : ptr to store AKE_Init +* +* Returns 0 on Success, <0 on Failure. +*/ +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !ake_data) +return -EINVAL ; + + dev = &cldev->dev; + + 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.buffer_len = +WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN ; + + session_init_in.port.integrated_port_type = data->port_type;Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c line 80
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+ session_init_in.port.physical_port = data->port; + session_init_in.protocol = (uint8_t )data->protocol; + + byte =mei_cldev_send (cldev, (u8 *)&session_init_in, +sizeof (session_init_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte);%zd don't require (int)
Sure. Thanks
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c line 87
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&session_init_out, +sizeof (session_init_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte);%zd don't require (int)
Quoted 9 lines
drivers/misc/mei/hdcp/mei_hdcp.c line 95
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c +8
-0+return byte; + } + +if (session_init_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X Failed. Status: 0x%X\n" , +WIRED_INITIATE_HDCP2_SESSION , + session_init_out.header.status); +return -1 ;It will be better to return some meaningful error code here.
Quoted 6 lines
I dont think default error codes will match here. And at present other side I915 doesn't expect the reason but the failure state.
May be we could do something like -(session_init_out.header.status). But error codes of ME FW is not known to I915.So may be as of now lets keep it as some -ve return value -1?
-1 is -EPERM - that may confuse, better to use some neutral value, like -EIO
Quoted 47 lines
--Ram
Quoted 45 lines
Quoted 45 lines
drivers/misc/mei/hdcp/mei_hdcp.c +11
-0+ } + + 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, +sizeof (session_init_out.r_tx)); + +return 0 ; +} +EXPORT_SYMBOL (mei_initiate_hdcp2_session); +void mei_cldev_state_notify_clients(struct
mei_cl_device*cldev,
bool
enabled)
{
if (enabled)include/linux/mei_hdcp.h +6
-0@@ -28,6 +28,7 @@#define _LINUX_MEI_HDCP_H#include <linux/mei_cl_bus.h> +#include <drm/drm_hdcp.h> enum mei_cldev_state {MEI_CLDEV_DISABLED ,@@ -105,6 +106,9 @@ struct mei_hdcp_data {#ifdef CONFIG_INTEL_MEI_HDCP int mei_cldev_register_notify (struct notifier_block *nb);int mei_cldev_unregister_notify (struct notifier_block *nb); +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data);#else static int mei_cldev_register_notify (struct notifier_block *nb) {@@ -114,5 +118,12 @@ static int mei_cldev_unregister_notify(struct notifier_block *nb) {return -ENODEV ; } +static inline +int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/linux/mei_hdcp.h +4
-1+struct mei_hdcp_data *data, + struct hdcp2_ake_init *ake_data) { + return -ENODEV; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */ --2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session
Quoted 125 lines · Alexander
Quoted 125 lines
-----Original Message-----
From: C, Ramalingam
Sent: Wednesday, May 16, 2018 18:20
To: Usyskin, Alexander <[email protected]>; intel- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: Re: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx SessionQuoted 13 lines · Alexander
Quoted 13 lines
-----Original Message-----
From: C, Ramalingam
Sent: Tuesday, April 03, 2018 16:57
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>; C, Ramalingam <[email protected]>
Subject: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx SessionQuoted 2 lines
Quoted 2 lines
Request ME FW to start the HDCP2.2 session for a intel port. Prepares payloads for command
WIRED_INITIATE_HDCP2_SESSIONandsent
Quoted 68 lines
Quoted 68 lines
to ME FW.
On Success, ME FW will start a HDCP2.2 session for the port and provides the content for HDCP2.2
AKE_Initmessage.v2:
Rebased.
v3:
cldev is add as a separate parameter [Tomas] Redundant comment and typecast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>--- drivers/misc/mei/hdcp/mei_hdcp.c | 68 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 11 +++++++ 2 files changed, 79 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +35
-0@@ -33,9 +33,77 @@#include <linux/mei_cl_bus.h> #include <linux/notifier.h> #include <linux/mei_hdcp.h> +#include <drm/drm_connector.h> + +#include "mei_hdcp.h" static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); +/** +* mei_initiate_hdcp2_session: +* Function to start a Wired HDCP2.2 Tx Session with ME FW +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @ake_data : ptr to store AKE_Init +* +* Returns 0 on Success, <0 on Failure. +*/ +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !ake_data) +return -EINVAL ; + + dev = &cldev->dev; + + 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.buffer_len = +WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN ; + + session_init_in.port.integrated_port_type = data->port_type;Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c line 80
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+ session_init_in.port.physical_port = data->port; + session_init_in.protocol = (uint8_t )data->protocol; + + byte =mei_cldev_send (cldev, (u8 *)&session_init_in, +sizeof (session_init_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte);%zd don't require (int)
Sure. Thanks
Quoted 17 lines
drivers/misc/mei/hdcp/mei_hdcp.c line 87
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&session_init_out, +sizeof (session_init_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte);%zd don't require (int)
drivers/misc/mei/hdcp/mei_hdcp.c line 95
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c +8
-0+return byte; + } + +if (session_init_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X Failed. Status: 0x%X\n" , +WIRED_INITIATE_HDCP2_SESSION , + session_init_out.header.status); +return -1 ;It will be better to return some meaningful error code here.
Quoted 7 lines
Quoted 6 lines
I dont think default error codes will match here. And at present other side I915 doesn't expect the reason but the failure state.
May be we could do something like -(session_init_out.header.status). But error codes of ME FW is not known to I915.So may be as of now lets keep it as some -ve return value -1?
-1 is
-EPERM- that may confuse, better to use some neutral value, like-EIO
-EIO also misleading. Not only this but other err codes in 1 to 34 range also. As the failure could be due to the wrong state of state machine for the port or n other number of reasons.
But as mentioned I915 looks for 0 on success or <0 for errors. So fir functionality any value <0 will work. So I will start using -EIO.
--Ram
Quoted 47 lines
Quoted 47 lines
--Ram
Quoted 45 lines
Quoted 45 lines
drivers/misc/mei/hdcp/mei_hdcp.c +11
-0+ } + + 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, +sizeof (session_init_out.r_tx)); + +return 0 ; +} +EXPORT_SYMBOL (mei_initiate_hdcp2_session); +void mei_cldev_state_notify_clients(struct
mei_cl_device*cldev,
bool
enabled)
{
if (enabled)include/linux/mei_hdcp.h +6
-0@@ -28,6 +28,7 @@#define _LINUX_MEI_HDCP_H#include <linux/mei_cl_bus.h> +#include <drm/drm_hdcp.h> enum mei_cldev_state {MEI_CLDEV_DISABLED ,@@ -105,6 +106,9 @@ struct mei_hdcp_data {#ifdef CONFIG_INTEL_MEI_HDCP int mei_cldev_register_notify (struct notifier_block *nb);int mei_cldev_unregister_notify (struct notifier_block *nb); +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data);#else static int mei_cldev_register_notify (struct notifier_block *nb) {@@ -114,5 +118,12 @@ static int mei_cldev_unregister_notify(struct notifier_block *nb) {return -ENODEV ; } +static inline +int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/linux/mei_hdcp.h +4
-1+struct mei_hdcp_data *data, + struct hdcp2_ake_init *ake_data) { + return -ENODEV; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */ --2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session
In reply to Ramalingam CQuoted 14 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session
Quoted 1 line
Request ME FW to start the HDCP2.2 session for a intel port.
Change "a" to "an".
Quoted 1 line
Prepares payloads for command
WIRED_INITIATE_HDCP2_SESSIONand sent to
"sent" to "sends"
Quoted 83 lines
ME FW.
On Success, ME FW will start a HDCP2.2 session for the port and provides the content for HDCP2.2
AKE_Initmessage.v2:
Rebased.
v3:
cldev is add as a separate parameter [Tomas] Redundant comment and typecast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 68
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 11 +++++++2 files changed, 79 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +51
-0@@ -33,9 +33,77 @@#include <linux/mei_cl_bus.h> #include <linux/notifier.h> #include <linux/mei_hdcp.h> +#include <drm/drm_connector.h> + +#include "mei_hdcp.h" static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); +/** +* mei_initiate_hdcp2_session: +* Function to start a Wired HDCP2.2 Tx Session with ME FW +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @ake_data : ptr to store AKE_Init +* +* Returns 0 on Success, <0 on Failure. +*/ +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !ake_data) +return -EINVAL ; + + dev = &cldev->dev; + + 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.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 = data->port; + session_init_in.protocol = (uint8_t )data->protocol; + + byte =mei_cldev_send (cldev, (u8 *)&session_init_in, +sizeof (session_init_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&session_init_out, +sizeof (session_init_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } +
drivers/misc/mei/hdcp/mei_hdcp.c line 101
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +10
-0+if (session_init_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X Failed. Status: 0x%X\n" , +WIRED_INITIATE_HDCP2_SESSION , + session_init_out.header.status); +return -1 ; + } + + 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,
We should check for ake_data->r_tx for NULL as well before attempting this copy.
Quoted 42 lines
drivers/misc/mei/hdcp/mei_hdcp.c +6
-0+ sizeof(session_init_out.r_tx)); + +return 0 ; +} +EXPORT_SYMBOL (mei_initiate_hdcp2_session); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
634c1a5bdf1e..bb4f27d3abcb100644include/linux/mei_hdcp.h +1
-0@@ -28,6 +28,7 @@#define _LINUX_MEI_HDCP_H#include <linux/mei_cl_bus.h> +#include <drm/drm_hdcp.h> enum mei_cldev_state {MEI_CLDEV_DISABLED ,@@ -105,6 +106,9 @@ struct mei_hdcp_data { #ifdef
CONFIG_INTEL_MEI_HDCPintmei_cldev_register_notify(struct notifier_block *nb); intmei_cldev_unregister_notify(struct notifier_block *nb);include/linux/mei_hdcp.h +3
-0+int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data);#else
static intmei_cldev_register_notify(struct notifier_block *nb){ @@ -114,5+118,12 @@ static int mei_cldev_unregister_notify(struct notifier_block *nb) { return -ENODEV; }include/linux/mei_hdcp.h +6
-0+static inline +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session
Quoted 105 lines · Uma
Quoted 13 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx SessionQuoted 1 line
Request ME FW to start the HDCP2.2 session for a intel port.
Change "a" to "an".
Quoted 1 line
Prepares payloads for command
WIRED_INITIATE_HDCP2_SESSIONand sent to"sent" to "sends"
Quoted 86 lines
ME FW.
On Success, ME FW will start a HDCP2.2 session for the port and provides the content for HDCP2.2
AKE_Initmessage.v2:
Rebased.
v3:
cldev is add as a separate parameter [Tomas] Redundant comment and typecast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 68
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 11 +++++++2 files changed, 79 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +54
-0@@ -33,9 +33,77 @@#include <linux/mei_cl_bus.h> #include <linux/notifier.h> #include <linux/mei_hdcp.h> +#include <drm/drm_connector.h> + +#include "mei_hdcp.h" static BLOCKING_NOTIFIER_HEAD (mei_cldev_notifier_list); +/** +* mei_initiate_hdcp2_session: +* Function to start a Wired HDCP2.2 Tx Session with ME FW +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @ake_data : ptr to store AKE_Init +* +* Returns 0 on Success, <0 on Failure. +*/ +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !ake_data) +return -EINVAL ; + + dev = &cldev->dev; + + 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.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 = data->port; + session_init_in.protocol = (uint8_t )data->protocol; + + byte =mei_cldev_send (cldev, (u8 *)&session_init_in, +sizeof (session_init_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&session_init_out, +sizeof (session_init_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (session_init_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { + dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n", + WIRED_INITIATE_HDCP2_SESSION,
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c line 100
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+ session_init_out.header.status); +return -1 ; + } + + 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,We should check for
ake_data->r_txfor NULL as well before attempting this copy.
r_tx is statically allocated array within struct ake_data. So I guess once ptr ake_data is valid we need not check for r_tx.
--Ram
Quoted 43 lines
Quoted 43 lines
drivers/misc/mei/hdcp/mei_hdcp.c +6
-0+ sizeof(session_init_out.r_tx)); + +return 0 ; +} +EXPORT_SYMBOL (mei_initiate_hdcp2_session); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
634c1a5bdf1e..bb4f27d3abcb100644include/linux/mei_hdcp.h +1
-0@@ -28,6 +28,7 @@#define _LINUX_MEI_HDCP_H#include <linux/mei_cl_bus.h> +#include <drm/drm_hdcp.h> enum mei_cldev_state {MEI_CLDEV_DISABLED ,@@ -105,6 +106,9 @@ struct mei_hdcp_data { #ifdef
CONFIG_INTEL_MEI_HDCPintmei_cldev_register_notify(struct notifier_block *nb); intmei_cldev_unregister_notify(struct notifier_block *nb);include/linux/mei_hdcp.h +3
-0+int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data);#else
static intmei_cldev_register_notify(struct notifier_block *nb){ @@ -114,5+118,12 @@ static int mei_cldev_unregister_notify(struct notifier_block *nb) { return -ENODEV; }include/linux/mei_hdcp.h +6
-0+static inline +int mei_initiate_hdcp2_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_init *ake_data) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 9/40 misc/mei/hdcp: Verify Receiver Cert and prepare km
In reply to Ramalingam CRequests for verification for receiver certification and also the preparation for next AKE auth message with km.
On Success ME FW validate the HDCP2.2 receivers certificate and do the revocation check on the receiver ID. AKE_Stored_Km will be prepared if the receiver is already paired, else AKE_No_Stored_Km will be prepared.
Here AKE_Stored_Km and AKE_No_Stored_Km are HDCP2.2 protocol msgs.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 82 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 17 +++++++++ 2 files changed, 99 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +82 -0
@@ -104,6 +104,88 @@ int mei_initiate_hdcp2_session(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_initiate_hdcp2_session); +/** +* mei_verify_receiver_cert_prepare_km: +* Function to verify the Receiver Certificate AKE_Send_Cert +* and prepare AKE_Stored_Km or AKE_No_Stored_Km +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @rx_cert : Pointer for AKE_Send_Cert +* @km_stored : Pointer for pairing status flag +* @ek_pub_km : Pointer for output msg +* @msg_sz : Pointer for size of AKE_XXXXX_Km +* +* Returns 0 on Success, <0 on Failure +*/ +int +mei_verify_receiver_cert_prepare_km (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !rx_cert || !km_stored || !ek_pub_km || !msg_sz) +return -EINVAL ; + + dev = &cldev->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.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 = data->port; + +memcpy (&verify_rxcert_in.cert_rx, &rx_cert->cert_rx, +sizeof (rx_cert->cert_rx)); +memcpy (verify_rxcert_in.r_rx, &rx_cert->r_rx,sizeof (rx_cert->r_rx)); +memcpy (verify_rxcert_in.rx_caps, rx_cert->rx_caps,HDCP_2_2_RXCAPS_LEN ); + + byte =mei_cldev_send (cldev, (u8 *)&verify_rxcert_in, +sizeof (verify_rxcert_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed: %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&verify_rxcert_out, +sizeof (verify_rxcert_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed: %d\n" , (int )byte); +return byte; + } + +if (verify_rxcert_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X Failed. Status: 0x%X\n" , +WIRED_VERIFY_RECEIVER_CERT , + verify_rxcert_out.header.status); +return -1 ; + } + + *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 ; +} +EXPORT_SYMBOL (mei_verify_receiver_cert_prepare_km); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +17 -0
@@ -109,6 +109,13 @@ int mei_cldev_unregister_notify(struct notifier_block *nb);int mei_initiate_hdcp2_session (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_ake_init *ake_data); +int +mei_verify_receiver_cert_prepare_km (struct mei_cl_device *cldev, +struct mei_hdcp_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);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -125,5 +132,15 @@ int mei_initiate_hdcp2_session(struct mei_cl_device *cldev, {return -ENODEV ; } +static inline int +mei_verify_receiver_cert_prepare_km (struct mei_cl_device *cldev, +struct mei_hdcp_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) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [PATCH v3 09/40] misc/mei/hdcp: Verify Receiver Cert and prepare km
Thank you for the patch! Yet something to improve:
Hi Ramalingam,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20180403]
[cannot apply to v4.16]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ramalingam-C/drm-i915-Implement-HDCP2-2/20180404-031743 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
drivers/misc/mei/hdcp/mei_hdcp.c:52:5: error: redefinition of 'mei_initiate_hdcp2_session'
int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:129:5: note: previous definition of 'mei_initiate_hdcp2_session' was here
int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/misc/mei/hdcp/mei_hdcp.c:122:1: error: redefinition of 'mei_verify_receiver_cert_prepare_km'
mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:136:1: note: previous definition of 'mei_verify_receiver_cert_prepare_km' was here
mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:199:5: error: redefinition of 'mei_cldev_register_notify'
int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:120:12: note: previous definition of 'mei_cldev_register_notify' was here
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:205:5: error: redefinition of 'mei_cldev_unregister_notify'
int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:124:12: note: previous definition of 'mei_cldev_unregister_notify' was here
static int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/mei_hdcp.h:124:12: warning: 'mei_cldev_unregister_notify' defined but not used [-Wunused-function] include/linux/mei_hdcp.h:120:12: warning: 'mei_cldev_register_notify' defined but not used [-Wunused-function]
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
vim +/mei_verify_receiver_cert_prepare_km +122 drivers/misc/mei/hdcp/mei_hdcp.c
41
42 /**
43 * mei_initiate_hdcp2_session:
44 * Function to start a Wired HDCP2.2 Tx Session with ME FW
45 *
46 * @cldev : Pointer for mei client device
47 * @data : Intel HW specific Data
48 * @ake_data : ptr to store AKE_Init
49 *
50 * Returns 0 on Success, <0 on Failure.
51 */
> 52 int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
53 struct mei_hdcp_data *data,
54 struct hdcp2_ake_init *ake_data)
55 {
56 struct wired_cmd_initiate_hdcp2_session_in session_init_in = { { 0 } };
57 struct wired_cmd_initiate_hdcp2_session_out
58 session_init_out = { { 0 } };
59 struct device *dev;
60 ssize_t byte;
61
62 if (!data || !ake_data)
63 return -EINVAL;
64
65 dev = &cldev->dev;
66
67 session_init_in.header.api_version = HDCP_API_VERSION;
68 session_init_in.header.command_id = WIRED_INITIATE_HDCP2_SESSION;
69 session_init_in.header.status = ME_HDCP_STATUS_SUCCESS;
70 session_init_in.header.buffer_len =
71 WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN;
72
73 session_init_in.port.integrated_port_type = data->port_type;
74 session_init_in.port.physical_port = data->port;
75 session_init_in.protocol = (uint8_t)data->protocol;
76
77 byte = mei_cldev_send(cldev, (u8 *)&session_init_in,
78 sizeof(session_init_in));
79 if (byte < 0) {
80 dev_dbg(dev, "mei_cldev_send failed. %d\n", (int)byte);
81 return byte;
82 }
83
84 byte = mei_cldev_recv(cldev, (u8 *)&session_init_out,
85 sizeof(session_init_out));
86 if (byte < 0) {
87 dev_dbg(dev, "mei_cldev_recv failed. %d\n", (int)byte);
88 return byte;
89 }
90
91 if (session_init_out.header.status != ME_HDCP_STATUS_SUCCESS) {
92 dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
93 WIRED_INITIATE_HDCP2_SESSION,
94 session_init_out.header.status);
95 return -1;
96 }
97
98 ake_data->msg_id = HDCP_2_2_AKE_INIT;
99 ake_data->tx_caps = session_init_out.tx_caps;
100 memcpy(ake_data->r_tx, session_init_out.r_tx,
101 sizeof(session_init_out.r_tx));
102
103 return 0;
104 }
105 EXPORT_SYMBOL(mei_initiate_hdcp2_session);
106
107 /**
108 * mei_verify_receiver_cert_prepare_km:
109 * Function to verify the Receiver Certificate AKE_Send_Cert
110 * and prepare AKE_Stored_Km or AKE_No_Stored_Km
111 *
112 * @cldev : Pointer for mei client device
113 * @data : Intel HW specific Data
114 * @rx_cert : Pointer for AKE_Send_Cert
115 * @km_stored : Pointer for pairing status flag
116 * @ek_pub_km : Pointer for output msg
117 * @msg_sz : Pointer for size of AKE_XXXXX_Km
118 *
119 * Returns 0 on Success, <0 on Failure
120 */
121 int
> 122 mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev,
123 struct mei_hdcp_data *data,
124 struct hdcp2_ake_send_cert *rx_cert,
125 bool *km_stored,
126 struct hdcp2_ake_no_stored_km *ek_pub_km,
127 size_t *msg_sz) 128 {
129 struct wired_cmd_verify_receiver_cert_in verify_rxcert_in = { { 0 } };
130 struct wired_cmd_verify_receiver_cert_out verify_rxcert_out = { { 0 } };
131 struct device *dev;
132 ssize_t byte;
133
134 if (!data || !rx_cert || !km_stored || !ek_pub_km || !msg_sz)
135 return -EINVAL;
136
137 dev = &cldev->dev;
138
139 verify_rxcert_in.header.api_version = HDCP_API_VERSION;
140 verify_rxcert_in.header.command_id = WIRED_VERIFY_RECEIVER_CERT;
141 verify_rxcert_in.header.status = ME_HDCP_STATUS_SUCCESS;
142 verify_rxcert_in.header.buffer_len =
143 WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN;
144
145 verify_rxcert_in.port.integrated_port_type = data->port_type;
146 verify_rxcert_in.port.physical_port = data->port;
147
148 memcpy(&verify_rxcert_in.cert_rx, &rx_cert->cert_rx,
149 sizeof(rx_cert->cert_rx));
150 memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, sizeof(rx_cert->r_rx));
151 memcpy(verify_rxcert_in.rx_caps, rx_cert->rx_caps, HDCP_2_2_RXCAPS_LEN);
152
153 byte = mei_cldev_send(cldev, (u8 *)&verify_rxcert_in,
154 sizeof(verify_rxcert_in));
155 if (byte < 0) {
156 dev_dbg(dev, "mei_cldev_send failed: %d\n", (int)byte);
157 return byte;
158 }
159
160 byte = mei_cldev_recv(cldev, (u8 *)&verify_rxcert_out,
161 sizeof(verify_rxcert_out));
162 if (byte < 0) {
163 dev_dbg(dev, "mei_cldev_recv failed: %d\n", (int)byte);
164 return byte;
165 }
166
167 if (verify_rxcert_out.header.status != ME_HDCP_STATUS_SUCCESS) {
168 dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
169 WIRED_VERIFY_RECEIVER_CERT,
170 verify_rxcert_out.header.status);
171 return -1;
172 }
173
174 *km_stored = verify_rxcert_out.km_stored;
175 if (verify_rxcert_out.km_stored) {
176 ek_pub_km->msg_id = HDCP_2_2_AKE_STORED_KM;
177 *msg_sz = sizeof(struct hdcp2_ake_stored_km);
178 } else {
179 ek_pub_km->msg_id = HDCP_2_2_AKE_NO_STORED_KM;
180 *msg_sz = sizeof(struct hdcp2_ake_no_stored_km);
181 }
182
183 memcpy(ek_pub_km->e_kpub_km, &verify_rxcert_out.ekm_buff,
184 sizeof(verify_rxcert_out.ekm_buff));
185 return 0;
186 }
187 EXPORT_SYMBOL(mei_verify_receiver_cert_prepare_km);
188
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 10/40 misc/mei/hdcp: Verify H_prime
In reply to Ramalingam CRequests for the verifcation of AKE_Send_H_prime.
ME will calculation the H and comparing it with received H_Prime. Here AKE_Send_H_prime is a HDCP2.2 Authentication msg.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 58 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 8 ++++++ 2 files changed, 66 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +58 -0
@@ -186,6 +186,64 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_verify_receiver_cert_prepare_km); +/** +* mei_verify_hprime: +* Function to verify AKE_Send_H_prime received +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @rx_hprime : Pointer for AKE_Send_H_prime +* @hprime_sz : Input buffer size +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !rx_hprime) +return -EINVAL ; + + dev = &cldev->dev; + + 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.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 = data->port; + +memcpy (send_hprime_in.h_prime, rx_hprime->h_prime, +sizeof (rx_hprime->h_prime)); + + byte =mei_cldev_send (cldev, (u8 *)&send_hprime_in, +sizeof (send_hprime_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&send_hprime_out, +sizeof (send_hprime_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (send_hprime_out.header.status !=ME_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 -1 ; + } +return 0 ; +} +EXPORT_SYMBOL (mei_verify_hprime); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +8 -0
@@ -116,6 +116,8 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev,bool *km_stored, struct hdcp2_ake_no_stored_km *ek_pub_km, size_t *msg_sz); +int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_ake_send_hprime *rx_hprime);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -142,5 +144,11 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, {return -ENODEV ; } +static inline +int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_ake_send_hprime *rx_hprime) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [PATCH v3 10/40] misc/mei/hdcp: Verify H_prime
Thank you for the patch! Yet something to improve:
Hi Ramalingam,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20180403]
[cannot apply to v4.16]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ramalingam-C/drm-i915-Implement-HDCP2-2/20180404-031743 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
drivers/misc/mei/hdcp/mei_hdcp.c:52:5: error: redefinition of 'mei_initiate_hdcp2_session'
int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:131:5: note: previous definition of 'mei_initiate_hdcp2_session' was here
int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:122:1: error: redefinition of 'mei_verify_receiver_cert_prepare_km'
mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:138:1: note: previous definition of 'mei_verify_receiver_cert_prepare_km' was here
mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/misc/mei/hdcp/mei_hdcp.c:200:5: error: redefinition of 'mei_verify_hprime'
int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
^~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:148:5: note: previous definition of 'mei_verify_hprime' was here
int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
^~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:257:5: error: redefinition of 'mei_cldev_register_notify'
int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:122:12: note: previous definition of 'mei_cldev_register_notify' was here
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:263:5: error: redefinition of 'mei_cldev_unregister_notify'
int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:126:12: note: previous definition of 'mei_cldev_unregister_notify' was here
static int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/mei_hdcp.h:126:12: warning: 'mei_cldev_unregister_notify' defined but not used [-Wunused-function] include/linux/mei_hdcp.h:122:12: warning: 'mei_cldev_register_notify' defined but not used [-Wunused-function]
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
vim +/mei_verify_hprime +200 drivers/misc/mei/hdcp/mei_hdcp.c
106
107 /**
108 * mei_verify_receiver_cert_prepare_km:
109 * Function to verify the Receiver Certificate AKE_Send_Cert
110 * and prepare AKE_Stored_Km or AKE_No_Stored_Km
111 *
112 * @cldev : Pointer for mei client device
113 * @data : Intel HW specific Data
114 * @rx_cert : Pointer for AKE_Send_Cert
115 * @km_stored : Pointer for pairing status flag
116 * @ek_pub_km : Pointer for output msg
117 * @msg_sz : Pointer for size of AKE_XXXXX_Km
118 *
119 * Returns 0 on Success, <0 on Failure
120 */
121 int
> 122 mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev,
123 struct mei_hdcp_data *data,
124 struct hdcp2_ake_send_cert *rx_cert,
125 bool *km_stored,
126 struct hdcp2_ake_no_stored_km *ek_pub_km,
127 size_t *msg_sz)
128 {
129 struct wired_cmd_verify_receiver_cert_in verify_rxcert_in = { { 0 } };
130 struct wired_cmd_verify_receiver_cert_out verify_rxcert_out = { { 0 } };
131 struct device *dev;
132 ssize_t byte;
133
134 if (!data || !rx_cert || !km_stored || !ek_pub_km || !msg_sz)
135 return -EINVAL;
136
137 dev = &cldev->dev;
138
139 verify_rxcert_in.header.api_version = HDCP_API_VERSION;
140 verify_rxcert_in.header.command_id = WIRED_VERIFY_RECEIVER_CERT;
141 verify_rxcert_in.header.status = ME_HDCP_STATUS_SUCCESS;
142 verify_rxcert_in.header.buffer_len =
143 WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN;
144
145 verify_rxcert_in.port.integrated_port_type = data->port_type;
146 verify_rxcert_in.port.physical_port = data->port;
147
148 memcpy(&verify_rxcert_in.cert_rx, &rx_cert->cert_rx,
149 sizeof(rx_cert->cert_rx));
150 memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, sizeof(rx_cert->r_rx));
151 memcpy(verify_rxcert_in.rx_caps, rx_cert->rx_caps, HDCP_2_2_RXCAPS_LEN);
152
153 byte = mei_cldev_send(cldev, (u8 *)&verify_rxcert_in,
154 sizeof(verify_rxcert_in));
155 if (byte < 0) {
156 dev_dbg(dev, "mei_cldev_send failed: %d\n", (int)byte);
157 return byte;
158 }
159
160 byte = mei_cldev_recv(cldev, (u8 *)&verify_rxcert_out,
161 sizeof(verify_rxcert_out));
162 if (byte < 0) {
163 dev_dbg(dev, "mei_cldev_recv failed: %d\n", (int)byte);
164 return byte;
165 }
166
167 if (verify_rxcert_out.header.status != ME_HDCP_STATUS_SUCCESS) {
168 dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
169 WIRED_VERIFY_RECEIVER_CERT,
170 verify_rxcert_out.header.status);
171 return -1;
172 }
173
174 *km_stored = verify_rxcert_out.km_stored;
175 if (verify_rxcert_out.km_stored) {
176 ek_pub_km->msg_id = HDCP_2_2_AKE_STORED_KM;
177 *msg_sz = sizeof(struct hdcp2_ake_stored_km);
178 } else {
179 ek_pub_km->msg_id = HDCP_2_2_AKE_NO_STORED_KM;
180 *msg_sz = sizeof(struct hdcp2_ake_no_stored_km);
181 }
182
183 memcpy(ek_pub_km->e_kpub_km, &verify_rxcert_out.ekm_buff,
184 sizeof(verify_rxcert_out.ekm_buff));
185 return 0;
186 }
187 EXPORT_SYMBOL(mei_verify_receiver_cert_prepare_km);
188
189 /**
190 * mei_verify_hprime:
191 * Function to verify AKE_Send_H_prime received
192 *
193 * @cldev : Pointer for mei client device
194 * @data : Intel HW specific Data
195 * @rx_hprime : Pointer for AKE_Send_H_prime
196 * @hprime_sz : Input buffer size
197 *
198 * Returns 0 on Success, <0 on Failure
199 */
> 200 int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, 201 struct hdcp2_ake_send_hprime *rx_hprime)
202 {
203 struct wired_cmd_ake_send_hprime_in send_hprime_in = { { 0 } };
204 struct wired_cmd_ake_send_hprime_out send_hprime_out = { { 0 } };
205 struct device *dev;
206 ssize_t byte;
207
208 if (!data || !rx_hprime)
209 return -EINVAL;
210
211 dev = &cldev->dev;
212
213 send_hprime_in.header.api_version = HDCP_API_VERSION;
214 send_hprime_in.header.command_id = WIRED_AKE_SEND_HPRIME;
215 send_hprime_in.header.status = ME_HDCP_STATUS_SUCCESS;
216 send_hprime_in.header.buffer_len = WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN;
217
218 send_hprime_in.port.integrated_port_type = data->port_type;
219 send_hprime_in.port.physical_port = data->port;
220
221 memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,
222 sizeof(rx_hprime->h_prime));
223
224 byte = mei_cldev_send(cldev, (u8 *)&send_hprime_in,
225 sizeof(send_hprime_in));
226 if (byte < 0) {
227 dev_dbg(dev, "mei_cldev_send failed. %d\n", (int)byte);
228 return byte;
229 }
230
231 byte = mei_cldev_recv(cldev, (u8 *)&send_hprime_out,
232 sizeof(send_hprime_out));
233 if (byte < 0) {
234 dev_dbg(dev, "mei_cldev_recv failed. %d\n", (int)byte);
235 return byte;
236 }
237
238 if (send_hprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
239 dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
240 WIRED_AKE_SEND_HPRIME, send_hprime_out.header.status);
241 return -1;
242 }
243 return 0;
244 }
245 EXPORT_SYMBOL(mei_verify_hprime);
246
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RE: [Intel-gfx] [PATCH v3 10/40] misc/mei/hdcp: Verify H_prime
In reply to Ramalingam CQuoted 13 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 10/40] misc/mei/hdcp: VerifyH_prime
Quoted 1 line
Requests for the verifcation of
AKE_Send_H_prime.
Typo in verification.
Quoted 2 lines
ME will calculation the H and comparing it with received
H_Prime.
Change to "calculate". Also change "comparing" to "compares".
Quoted 47 lines
Here
AKE_Send_H_primeis a HDCP2.2 Authentication msg.v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 58
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 8 ++++++2 files changed, 66 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +23
-0@@ -186,6 +186,64 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_verify_receiver_cert_prepare_km ); +/** +* mei_verify_hprime: +* Function to verify AKE_Send_H_prime received +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @rx_hprime : Pointer for AKE_Send_H_prime +* @hprime_sz : Input buffer size +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !rx_hprime) +return -EINVAL ; + + dev = &cldev->dev; +
drivers/misc/mei/hdcp/mei_hdcp.c mei_verify_receiver_cert_prepare_km(struct · line 221
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +10
-0+ 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.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 = data->port; + + memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,
Need to validate rx_hprime->h_prime for NULL.
Quoted 12 lines
drivers/misc/mei/hdcp/mei_hdcp.c +12
-0+ sizeof(rx_hprime->h_prime)); + + byte =mei_cldev_send (cldev, (u8 *)&send_hprime_in, +sizeof (send_hprime_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&send_hprime_out, +sizeof (send_hprime_out)); +if (byte <0 ) {
drivers/misc/mei/hdcp/mei_hdcp.c mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, · line 242
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0+dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (send_hprime_out.header.status !=ME_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 -1 ; + }
Leave a blank line here.
drivers/misc/mei/hdcp/mei_hdcp.c mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, · line 243
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+return 0 ;
One clarification required - the h prime value sent and received are not compared here. So, whether hw matches them and returns success only if they match or it just returns the H prime value and driver should compare ?
Quoted 33 lines
drivers/misc/mei/hdcp/mei_hdcp.c +3
-0+} +EXPORT_SYMBOL (mei_verify_hprime); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
314b15f6afc0..00bfde251ba4100644include/linux/mei_hdcp.h +2
-0@@ -116,6 +116,8 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, bool *km_stored, struct hdcp2_ake_no_stored_km *ek_pub_km, size_t *msg_sz); +int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_ake_send_hprime *rx_hprime);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -142,5 +144,11 @@ mei_verify_receiver_cert_prepare_km(structmei_cl_device*cldev,{ return -ENODEV; }include/linux/mei_hdcp.h +5
-0+static inline +int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_ake_send_hprime *rx_hprime) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 10/40] misc/mei/hdcp: Verify H_prime
Quoted 12 lines · Uma
Quoted 12 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 10/40] misc/mei/hdcp: VerifyH_prime
Quoted 2 lines
Quoted 1 line
Requests for the verifcation of
AKE_Send_H_prime.Typo in verification.
thanks :)
Quoted 54 lines
Quoted 2 lines
ME will calculation the H and comparing it with received
H_Prime.Change to "calculate". Also change "comparing" to "compares".
Quoted 50 lines
Here
AKE_Send_H_primeis a HDCP2.2 Authentication msg.v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 58
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 8 ++++++2 files changed, 66 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +26
-0@@ -186,6 +186,64 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_verify_receiver_cert_prepare_km ); +/** +* mei_verify_hprime: +* Function to verify AKE_Send_H_prime received +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @rx_hprime : Pointer for AKE_Send_H_prime +* @hprime_sz : Input buffer size +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !rx_hprime) +return -EINVAL ; + + dev = &cldev->dev; + + 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 ;
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, · line 221
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+ 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 = data->port; + + memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,Need to validate
rx_hprime->h_primefor NULL.
h_prime is statically allocated array within rx_hprime. So we need not check .
Quoted 15 lines
Quoted 15 lines
drivers/misc/mei/hdcp/mei_hdcp.c +15
-0+ sizeof(rx_hprime->h_prime)); + + byte =mei_cldev_send (cldev, (u8 *)&send_hprime_in, +sizeof (send_hprime_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&send_hprime_out, +sizeof (send_hprime_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + }
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, · line 242
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +6
-0+ +if (send_hprime_out.header.status !=ME_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 -1 ; + }Leave a blank line here.
Sure.
Quoted 4 lines
drivers/misc/mei/hdcp/mei_hdcp.c mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, · line 243
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+return 0 ;One clarification required - the h prime value sent and received are not compared here. So, whether hw matches them and returns success only if they match or it just returns the H prime value and driver should compare ?
This shows that commit message need an edit :). Yes, ME FW calculate the hprime and compare it with the received hprime. Returns the comparition result at send_hprime_out.header.status.
--Ram
Quoted 34 lines
Quoted 34 lines
drivers/misc/mei/hdcp/mei_hdcp.c +3
-0+} +EXPORT_SYMBOL (mei_verify_hprime); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
314b15f6afc0..00bfde251ba4100644include/linux/mei_hdcp.h +2
-0@@ -116,6 +116,8 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, bool *km_stored, struct hdcp2_ake_no_stored_km *ek_pub_km, size_t *msg_sz); +int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_ake_send_hprime *rx_hprime);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -142,5 +144,11 @@ mei_verify_receiver_cert_prepare_km(structmei_cl_device*cldev,{ return -ENODEV; }include/linux/mei_hdcp.h +5
-0+static inline +int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_ake_send_hprime *rx_hprime) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 11/40 misc/mei/hdcp: Store the HDCP Pairing info
In reply to Ramalingam CProvides Pairing info to ME to store.
Pairing is a process to fast track the subsequent authentication with the same HDCP sink.
On Success, received HDCP pairing info is stored in non-volatile memory of ME.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 61 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 10 +++++++ 2 files changed, 71 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +61 -0
@@ -244,6 +244,67 @@ int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, }EXPORT_SYMBOL (mei_verify_hprime); +/** +* mei_store_pairing_info: +* Function to store pairing info received from panel +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @pairing_info : Pointer for AKE_Send_Pairing_Info +* +* Returns 0 on Success, <0 on Failure +*/ + +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !pairing_info) +return -EINVAL ; + + dev = &cldev->dev; + + 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.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 = data->port; + +memcpy (pairing_info_in.e_kh_km, pairing_info->e_kh_km, +sizeof (pairing_info_in.e_kh_km)); + + byte =mei_cldev_send (cldev, (u8 *)&pairing_info_in, +sizeof (pairing_info_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&pairing_info_out, +sizeof (pairing_info_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (pairing_info_out.header.status !=ME_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); +return -1 ; + } +return 0 ; +} +EXPORT_SYMBOL (mei_store_pairing_info); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +10 -0
@@ -118,6 +118,9 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, size_t *msg_sz);int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_ake_send_hprime *rx_hprime); +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -150,5 +153,12 @@ int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, {return -ENODEV ; } +static inline +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing info
Thank you for the patch! Yet something to improve:
Hi Ramalingam,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20180403]
[cannot apply to v4.16]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ramalingam-C/drm-i915-Implement-HDCP2-2/20180404-031743 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
drivers/misc/mei/hdcp/mei_hdcp.c:52:5: error: redefinition of 'mei_initiate_hdcp2_session'
int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:134:5: note: previous definition of 'mei_initiate_hdcp2_session' was here
int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:122:1: error: redefinition of 'mei_verify_receiver_cert_prepare_km'
mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:141:1: note: previous definition of 'mei_verify_receiver_cert_prepare_km' was here
mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:200:5: error: redefinition of 'mei_verify_hprime'
int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
^~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:151:5: note: previous definition of 'mei_verify_hprime' was here
int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
^~~~~~~~~~~~~~~~~
>> drivers/misc/mei/hdcp/mei_hdcp.c:258:5: error: redefinition of 'mei_store_pairing_info'
int mei_store_pairing_info(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:157:5: note: previous definition of 'mei_store_pairing_info' was here
int mei_store_pairing_info(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:318:5: error: redefinition of 'mei_cldev_register_notify'
int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:125:12: note: previous definition of 'mei_cldev_register_notify' was here
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:324:5: error: redefinition of 'mei_cldev_unregister_notify'
int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:129:12: note: previous definition of 'mei_cldev_unregister_notify' was here
static int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/mei_hdcp.h:129:12: warning: 'mei_cldev_unregister_notify' defined but not used [-Wunused-function] include/linux/mei_hdcp.h:125:12: warning: 'mei_cldev_register_notify' defined but not used [-Wunused-function]
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
vim +/mei_store_pairing_info +258 drivers/misc/mei/hdcp/mei_hdcp.c
188
189 /**
190 * mei_verify_hprime:
191 * Function to verify AKE_Send_H_prime received
192 *
193 * @cldev : Pointer for mei client device
194 * @data : Intel HW specific Data
195 * @rx_hprime : Pointer for AKE_Send_H_prime
196 * @hprime_sz : Input buffer size
197 *
198 * Returns 0 on Success, <0 on Failure
199 */
> 200 int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
201 struct hdcp2_ake_send_hprime *rx_hprime)
202 {
203 struct wired_cmd_ake_send_hprime_in send_hprime_in = { { 0 } };
204 struct wired_cmd_ake_send_hprime_out send_hprime_out = { { 0 } };
205 struct device *dev;
206 ssize_t byte;
207
208 if (!data || !rx_hprime)
209 return -EINVAL;
210
211 dev = &cldev->dev;
212
213 send_hprime_in.header.api_version = HDCP_API_VERSION;
214 send_hprime_in.header.command_id = WIRED_AKE_SEND_HPRIME;
215 send_hprime_in.header.status = ME_HDCP_STATUS_SUCCESS;
216 send_hprime_in.header.buffer_len = WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN;
217
218 send_hprime_in.port.integrated_port_type = data->port_type;
219 send_hprime_in.port.physical_port = data->port;
220
221 memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,
222 sizeof(rx_hprime->h_prime));
223
224 byte = mei_cldev_send(cldev, (u8 *)&send_hprime_in,
225 sizeof(send_hprime_in));
226 if (byte < 0) {
227 dev_dbg(dev, "mei_cldev_send failed. %d\n", (int)byte);
228 return byte;
229 }
230
231 byte = mei_cldev_recv(cldev, (u8 *)&send_hprime_out,
232 sizeof(send_hprime_out));
233 if (byte < 0) {
234 dev_dbg(dev, "mei_cldev_recv failed. %d\n", (int)byte);
235 return byte;
236 }
237
238 if (send_hprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
239 dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
240 WIRED_AKE_SEND_HPRIME, send_hprime_out.header.status);
241 return -1;
242 }
243 return 0;
244 }
245 EXPORT_SYMBOL(mei_verify_hprime);
246
247 /**
248 * mei_store_pairing_info:
249 * Function to store pairing info received from panel
250 *
251 * @cldev : Pointer for mei client device
252 * @data : Intel HW specific Data
253 * @pairing_info : Pointer for AKE_Send_Pairing_Info
254 *
255 * Returns 0 on Success, <0 on Failure
256 */
257
> 258 int mei_store_pairing_info(struct mei_cl_device *cldev, 259 struct mei_hdcp_data *data,
260 struct hdcp2_ake_send_pairing_info *pairing_info)
261 {
262 struct wired_cmd_ake_send_pairing_info_in pairing_info_in = { { 0 } };
263 struct wired_cmd_ake_send_pairing_info_out pairing_info_out = { { 0 } };
264 struct device *dev;
265 ssize_t byte;
266
267 if (!data || !pairing_info)
268 return -EINVAL;
269
270 dev = &cldev->dev;
271
272 pairing_info_in.header.api_version = HDCP_API_VERSION;
273 pairing_info_in.header.command_id = WIRED_AKE_SEND_PAIRING_INFO;
274 pairing_info_in.header.status = ME_HDCP_STATUS_SUCCESS;
275 pairing_info_in.header.buffer_len =
276 WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN;
277
278 pairing_info_in.port.integrated_port_type = data->port_type;
279 pairing_info_in.port.physical_port = data->port;
280
281 memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
282 sizeof(pairing_info_in.e_kh_km));
283
284 byte = mei_cldev_send(cldev, (u8 *)&pairing_info_in,
285 sizeof(pairing_info_in));
286 if (byte < 0) {
287 dev_dbg(dev, "mei_cldev_send failed. %d\n", (int)byte);
288 return byte;
289 }
290
291 byte = mei_cldev_recv(cldev, (u8 *)&pairing_info_out,
292 sizeof(pairing_info_out));
293 if (byte < 0) {
294 dev_dbg(dev, "mei_cldev_recv failed. %d\n", (int)byte);
295 return byte;
296 }
297
298 if (pairing_info_out.header.status != ME_HDCP_STATUS_SUCCESS) {
299 dev_dbg(dev, "ME cmd 0x%08X failed. Status: 0x%X\n",
300 WIRED_AKE_SEND_PAIRING_INFO,
301 pairing_info_out.header.status);
302 return -1;
303 }
304 return 0;
305 }
306 EXPORT_SYMBOL(mei_store_pairing_info);
307
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing info
In reply to Ramalingam CQuoted 39 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing infoProvides Pairing info to ME to store.
Pairing is a process to fast track the subsequent authentication with the same HDCP sink.
On Success, received HDCP pairing info is stored in non-volatile memory of ME.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 61
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 10 +++++++2 files changed, 71 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +0
-0
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, · line 246
Quoted 3 lines
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0@@ -244,6 +244,67 @@ int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, } EXPORT_SYMBOL(mei_verify_hprime); +/**
Drop the extra *, unless you really love it :)
Quoted 25 lines
drivers/misc/mei/hdcp/mei_hdcp.c +25
-0+* mei_store_pairing_info: +* Function to store pairing info received from panel +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @pairing_info : Pointer for AKE_Send_Pairing_Info +* +* Returns 0 on Success, <0 on Failure +*/ + +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !pairing_info) +return -EINVAL ; + + dev = &cldev->dev; + + pairing_info_in.header.api_version =HDCP_API_VERSION ; + pairing_info_in.header.command_id =
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +8
-0WIRED_AKE_SEND_PAIRING_INFO ; + pairing_info_in.header.status =ME_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 = data->port; + + memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
Validate pairing_info->e_kh_km for NULL.
Quoted 12 lines
drivers/misc/mei/hdcp/mei_hdcp.c +12
-0+ sizeof(pairing_info_in.e_kh_km)); + + byte =mei_cldev_send (cldev, (u8 *)&pairing_info_in, +sizeof (pairing_info_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&pairing_info_out, +sizeof (pairing_info_out)); +if (byte <0 ) {
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 303
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +10
-0+dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (pairing_info_out.header.status !=ME_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); +return -1 ; + }
Leave a blank line here.
Quoted 35 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_store_pairing_info); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
00bfde251ba4..be16e49d8018100644include/linux/mei_hdcp.h +3
-0@@ -118,6 +118,9 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, size_t *msg_sz);int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_ake_send_hprime *rx_hprime); +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -150,5 +153,12 @@ int mei_verify_hprime(structmei_cl_device*cldev, structmei_hdcp_data *data, { return -ENODEV; }include/linux/mei_hdcp.h +6
-0+static inline +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing info
Quoted 40 lines · Uma
Quoted 40 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing infoProvides Pairing info to ME to store.
Pairing is a process to fast track the subsequent authentication with the same HDCP sink.
On Success, received HDCP pairing info is stored in non-volatile memory of ME.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 61
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 10 +++++++2 files changed, 71 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +0
-0@@ -244,6 +244,67 @@ int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, } EXPORT_SYMBOL(mei_verify_hprime);
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 247
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+/** Drop the extra *, unless you really love it :)
ha ha. Actually I have added intentionally. But removing them across all patches as per your suggestions. :)
Quoted 29 lines
Quoted 29 lines
drivers/misc/mei/hdcp/mei_hdcp.c +27
-0+* mei_store_pairing_info: +* Function to store pairing info received from panel +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @pairing_info : Pointer for AKE_Send_Pairing_Info +* +* Returns 0 on Success, <0 on Failure +*/ + +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !pairing_info) +return -EINVAL ; + + dev = &cldev->dev; + + 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.buffer_len =
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 281
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +6
-0+WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN ; + + pairing_info_in.port.integrated_port_type = data->port_type; + pairing_info_in.port.physical_port = data->port; + + memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,Validate
pairing_info->e_kh_kmfor NULL.
As we discussed we need not check for null here.
Quoted 16 lines
Quoted 16 lines
drivers/misc/mei/hdcp/mei_hdcp.c +15
-0+ sizeof(pairing_info_in.e_kh_km)); + + byte =mei_cldev_send (cldev, (u8 *)&pairing_info_in, +sizeof (pairing_info_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&pairing_info_out, +sizeof (pairing_info_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + }
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 303
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+ +if (pairing_info_out.header.status !=ME_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); +return -1 ; + }Leave a blank line here.
sure. I will do it in all patches. Thanks.
--Ram
Quoted 36 lines
Quoted 36 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_store_pairing_info); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
00bfde251ba4..be16e49d8018100644include/linux/mei_hdcp.h +3
-0@@ -118,6 +118,9 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, size_t *msg_sz);int mei_verify_hprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_ake_send_hprime *rx_hprime); +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -150,5 +153,12 @@ int mei_verify_hprime(structmei_cl_device*cldev, structmei_hdcp_data *data, { return -ENODEV; }include/linux/mei_hdcp.h +6
-0+static inline +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Usyskin, Alexander
maintainerRe: [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing info
Quoted 61 lines
-----Original Message-----
From: C, Ramalingam
Sent: Wednesday, May 16, 2018 18:53
To: Shankar, Uma <[email protected]>; intel- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: Re: [Intel-gfx] [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing infoQuoted 14 lines · Uma
Quoted 14 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing infoQuoted 6 lines
Quoted 6 lines
Provides Pairing info to ME to store.
Pairing is a process to fast track the subsequent authentication with the same HDCP sink.
On Success, received HDCP pairing info is stored in non-volatile memory
of ME.
Quoted 23 lines
Quoted 23 lines
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 61
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 10 +++++++2 files changed, 71 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +0
-0@@ -244,6 +244,67 @@ int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, }EXPORT_SYMBOL (mei_verify_hprime);
Quoted 4 lines
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 247
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+/** Drop the extra *, unless you really love it :)
ha ha. Actually I have added intentionally. But removing them across all patches as per your suggestions. :)
/** is a syntax for KDoc, so if you want to receive automatic code documentation you should use it and adhere to KDoc syntax
Quoted 108 lines
Quoted 13 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 260
Quoted 13 lines
drivers/misc/mei/hdcp/mei_hdcp.c +12
-0+* mei_store_pairing_info: +* Function to store pairing info received from panel +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @pairing_info : Pointer for AKE_Send_Pairing_Info +* +* Returns 0 on Success, <0 on Failure */ + +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info){
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device · line 260
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+struct wired_cmd_ake_send_pairing_info_in pairing_info_in = { {0 }};
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device · line 261
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+struct wired_cmd_ake_send_pairing_info_out pairing_info_out = { {0 } };
Quoted 13 lines
Quoted 13 lines
drivers/misc/mei/hdcp/mei_hdcp.c +12
-0+struct device *dev; +ssize_t byte; + +if (!data || !pairing_info) +return -EINVAL ; + + dev = &cldev->dev; + + 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.buffer_len =Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 281
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +6
-0+WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN ; + + pairing_info_in.port.integrated_port_type = data->port_type; + pairing_info_in.port.physical_port = data->port; + + memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,Validate
pairing_info->e_kh_kmfor NULL.As we discussed we need not check for null here.
Quoted 16 lines
Quoted 16 lines
drivers/misc/mei/hdcp/mei_hdcp.c +15
-0+ sizeof(pairing_info_in.e_kh_km)); + + byte =mei_cldev_send (cldev, (u8 *)&pairing_info_in, +sizeof (pairing_info_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&pairing_info_out, +sizeof (pairing_info_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + }Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 303
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+ +if (pairing_info_out.header.status !=ME_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); +return -1 ; + }Leave a blank line here.
sure. I will do it in all patches. Thanks.
--Ram
Quoted 6 lines
Quoted 6 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_store_pairing_info); +void mei_cldev_state_notify_clients(struct
mei_cl_device*cldev, boolenabled) {
Quoted 10 lines
Quoted 10 lines
if (enabled)
include/linux/mei_hdcp.h +0
-0index
00bfde251ba4..be16e49d8018100644include/linux/mei_hdcp.h +0
-0@@ -118,6 +118,9 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, size_t *msg_sz);int mei_verify_hprime(struct
mei_cl_device*cldev, structmei_hdcp_data*data,
Quoted 7 lines
Quoted 7 lines
struct hdcp2_ake_send_hprime *rx_hprime);include/linux/mei_hdcp.h +3
-0+int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info);#else
static intmei_cldev_register_notify(struct notifier_block *nb){ @@ -150,5Quoted 8 lines
include/linux/mei_hdcp.h int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 159
Quoted 8 lines
+153,12 @@ int mei_verify_hprime(struct
mei_cl_device*cldev, structmei_hdcp_data *data, { return -ENODEV; }include/linux/mei_hdcp.h +4
-0+static inline +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info){
Quoted 7 lines
Quoted 7 lines
include/linux/mei_hdcp.h +2
-0+return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing info
Quoted 76 lines
-----Original Message-----
From: Usyskin, Alexander
Sent: Thursday, May 17, 2018 11:29 AM
To: C, Ramalingam <[email protected]>; Shankar, Uma <[email protected]>; [email protected]; dri- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: RE: [Intel-gfx] [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing infoQuoted 61 lines
-----Original Message-----
From: C, Ramalingam
Sent: Wednesday, May 16, 2018 18:53
To: Shankar, Uma <[email protected]>; intel- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: Re: [Intel-gfx] [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing infoQuoted 15 lines · Uma
Quoted 15 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing infoQuoted 7 lines
Quoted 7 lines
Provides Pairing info to ME to store.
Pairing is a process to fast track the subsequent authentication with the same HDCP sink.
On Success, received HDCP pairing info is stored in non-volatile memory
of ME.
Quoted 23 lines
Quoted 23 lines
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 61
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 10 +++++++2 files changed, 71 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +0
-0@@ -244,6 +244,67 @@ int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, }EXPORT_SYMBOL (mei_verify_hprime);
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 247
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+/** Drop the extra *, unless you really love it :)
ha ha. Actually I have added intentionally. But removing them across all patches as per your suggestions. :)
/** is a syntax for KDoc, so if you want to receive automatic code documentation you should use it and adhere to KDoc syntax
Thanks Alexander for the information. At present I am not adding the KDoc support, if it is not compulsory. So I will remove the /**.
--Ram
Quoted 113 lines
Quoted 113 lines
Quoted 13 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 260
Quoted 13 lines
drivers/misc/mei/hdcp/mei_hdcp.c +12
-0+* mei_store_pairing_info: +* Function to store pairing info received from panel +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @pairing_info : Pointer for AKE_Send_Pairing_Info +* +* Returns 0 on Success, <0 on Failure */ + +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info){
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device · line 261
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c +2
-0+struct wired_cmd_ake_send_pairing_info_in pairing_info_in = { {0 +}};
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device · line 262
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+struct wired_cmd_ake_send_pairing_info_out pairing_info_out = { {0 } };
Quoted 13 lines
Quoted 13 lines
drivers/misc/mei/hdcp/mei_hdcp.c +12
-0+struct device *dev; +ssize_t byte; + +if (!data || !pairing_info) +return -EINVAL ; + + dev = &cldev->dev; + + 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.buffer_len =Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 281
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +6
-0+WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN ; + + pairing_info_in.port.integrated_port_type = data->port_type; + pairing_info_in.port.physical_port = data->port; + + memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,Validate
pairing_info->e_kh_kmfor NULL.As we discussed we need not check for null here.
Quoted 16 lines
Quoted 16 lines
drivers/misc/mei/hdcp/mei_hdcp.c +15
-0+ sizeof(pairing_info_in.e_kh_km)); + + byte =mei_cldev_send (cldev, (u8 *)&pairing_info_in, +sizeof (pairing_info_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&pairing_info_out, +sizeof (pairing_info_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + }Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 303
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+ +if (pairing_info_out.header.status !=ME_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); +return -1 ; + }Leave a blank line here.
sure. I will do it in all patches. Thanks.
--Ram
Quoted 7 lines
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_store_pairing_info); + void mei_cldev_state_notify_clients(struct mei_cl_device *cldev,bool
enabled) {
Quoted 11 lines
Quoted 11 lines
if (enabled)
include/linux/mei_hdcp.h +0
-0index
00bfde251ba4..be16e49d8018100644include/linux/mei_hdcp.h +0
-0@@ -118,6 +118,9 @@ mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, size_t *msg_sz);int mei_verify_hprime(struct
mei_cl_device*cldev, structmei_hdcp_data*data,
Quoted 9 lines
Quoted 9 lines
struct hdcp2_ake_send_hprime *rx_hprime);include/linux/mei_hdcp.h +3
-0+int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info);#else
static intmei_cldev_register_notify(struct notifier_block *nb){ @@
-150,5
+153,12 @@ int mei_verify_hprime(structmei_cl_device*cldev,Quoted 8 lines
include/linux/mei_hdcp.h int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 159
Quoted 8 lines
+struct
mei_hdcp_data *data, { return -ENODEV; }include/linux/mei_hdcp.h +4
-0+static inline +int mei_store_pairing_info (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_ake_send_pairing_info *pairing_info){
Quoted 7 lines
Quoted 7 lines
include/linux/mei_hdcp.h +2
-0+return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing info
Quoted 10 lines · Ramalingam
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Quoted 1 line
+/**
Drop the extra *, unless you really love it :)
ha ha. Actually I have added intentionally. But removing them across all patches as per your suggestions. :)
/** is a syntax for KDoc, so if you want to receive automatic code documentation you should use it and adhere to KDoc syntax
Thanks Alexander for the information. At present I am not adding the KDoc support, if it is not compulsory. So I will remove the /**.
It's "kernel-doc" to be pedantic. No such thing as KDoc.
If you use /** please stick to the exact kernel-doc format. The below is not. You'll find the documentation under Documentation/doc-guide.
If you drop /** please either use free form comments or stick to the kernel-doc format. Please don't leave behind things that look eerily similar to kernel-doc comments but are not. Without /** you won't even get warnings about them.
/**
* mei_store_pairing_info - Store pairing info received from panel
* @cldev: Pointer for mei client device
* @data: Intel HW specific Data
* @pairing_info: Pointer for AKE_Send_Pairing_Info
*
* Returns 0 on success, <0 on failure.
*/
BR,
Jani.
Quoted 11 lines
--Ram
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
+ *
mei_store_pairing_info:
+ * Function to store pairing info received from panel
+ *
+ * @cldev : Pointer for mei client device
+ * @data : Intel HW specific Data
+ * @pairing_info : Pointer forAKE_Send_Pairing_Info
+ *
+ * Returns 0 on Success, <0 on Failure */
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 11/40] misc/mei/hdcp: Store the HDCP Pairing info
Thanks Jani. I will use free form comments in v4, meanwhile i will explore the required stuff for kernel-doc and add kernel-doc entries where ever it makes sense, in upcoming versions.
--Ram
Quoted 28 lines · Jani Nikula
Quoted 8 lines · Ramalingam
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Quoted 1 line
+/**
Drop the extra *, unless you really love it :)
ha ha. Actually I have added intentionally. But removing them across all patches as per your suggestions. :)
/** is a syntax for KDoc, so if you want to receive automatic code documentation you should use it and adhere to KDoc syntax
Thanks Alexander for the information. At present I am not adding the KDoc support, if it is not compulsory. So I will remove the /**.
It's "kernel-doc" to be pedantic. No such thing as KDoc.
If you use /** please stick to the exact kernel-doc format. The below is not. You'll find the documentation under
Documentation/doc-guide.If you drop /** please either use free form comments or stick to the kernel-doc format. Please don't leave behind things that look eerily similar to kernel-doc comments but are not. Without /** you won't even get warnings about them.
/**
*mei_store_pairing_info- Store pairing info received from panel
* @cldev: Pointer for mei client device
* @data: Intel HW specific Data
* @pairing_info: Pointer forAKE_Send_Pairing_Info
*
* Returns 0 on success, <0 on failure.
*/
Quoted 13 lines
BR,
Jani.Quoted 9 lines
--Ram
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
+ *
mei_store_pairing_info:
+ * Function to store pairing info received from panel
+ *
+ * @cldev : Pointer for mei client device
+ * @data : Intel HW specific Data
+ * @pairing_info : Pointer forAKE_Send_Pairing_Info
+ *
+ * Returns 0 on Success, <0 on Failure */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 12/40 misc/mei/hdcp: Initiate Locality check
In reply to Ramalingam CRequests ME to start the second stage of HDCP2.2 authentication, called Locality Check.
On Success, ME FW will provide LC_Init message to send to hdcp sink.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 56 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 10 +++++++ 2 files changed, 66 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +56 -0
@@ -305,6 +305,62 @@ int mei_store_pairing_info(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_store_pairing_info); +/** +* mei_initiate_locality_check: +* Function to prepare LC_Init. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @hdcp2_lc_init : Pointer for storing LC_Init +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_initiate_locality_check (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !lc_init_data) +return -EINVAL ; + + dev = &cldev->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.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 = data->port; + + byte =mei_cldev_send (cldev, (u8 *)&lc_init_in,sizeof (lc_init_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&lc_init_out,sizeof (lc_init_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (lc_init_out.header.status !=ME_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 -1 ; + } + + 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 ; +} +EXPORT_SYMBOL (mei_initiate_locality_check); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +10 -0
@@ -121,6 +121,9 @@ int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,int mei_store_pairing_info (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_ake_send_pairing_info *pairing_info); +int mei_initiate_locality_check (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_lc_init *lc_init_data);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -160,5 +163,12 @@ int mei_store_pairing_info(struct mei_cl_device *cldev, {return -ENODEV ; } +static inline +int mei_initiate_locality_check (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_lc_init *lc_init_data) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
kbuild test robot
build botRe: [PATCH v3 12/40] misc/mei/hdcp: Initiate Locality check
Thank you for the patch! Yet something to improve:
Hi Ramalingam,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20180403]
[cannot apply to v4.16]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ramalingam-C/drm-i915-Implement-HDCP2-2/20180404-031743 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
drivers/misc/mei/hdcp/mei_hdcp.c:52:5: error: redefinition of 'mei_initiate_hdcp2_session'
int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:137:5: note: previous definition of 'mei_initiate_hdcp2_session' was here
int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:122:1: error: redefinition of 'mei_verify_receiver_cert_prepare_km'
mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:144:1: note: previous definition of 'mei_verify_receiver_cert_prepare_km' was here
mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:200:5: error: redefinition of 'mei_verify_hprime'
int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
^~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:154:5: note: previous definition of 'mei_verify_hprime' was here
int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
^~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:258:5: error: redefinition of 'mei_store_pairing_info'
int mei_store_pairing_info(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:160:5: note: previous definition of 'mei_store_pairing_info' was here
int mei_store_pairing_info(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~
>> drivers/misc/mei/hdcp/mei_hdcp.c:318:5: error: redefinition of 'mei_initiate_locality_check'
int mei_initiate_locality_check(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:167:5: note: previous definition of 'mei_initiate_locality_check' was here
int mei_initiate_locality_check(struct mei_cl_device *cldev,
^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:374:5: error: redefinition of 'mei_cldev_register_notify'
int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:128:12: note: previous definition of 'mei_cldev_register_notify' was here
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/misc/mei/hdcp/mei_hdcp.c:380:5: error: redefinition of 'mei_cldev_unregister_notify'
int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/misc/mei/hdcp/mei_hdcp.c:35:0:
include/linux/mei_hdcp.h:132:12: note: previous definition of 'mei_cldev_unregister_notify' was here
static int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/mei_hdcp.h:132:12: warning: 'mei_cldev_unregister_notify' defined but not used [-Wunused-function] include/linux/mei_hdcp.h:128:12: warning: 'mei_cldev_register_notify' defined but not used [-Wunused-function]
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
vim +/mei_initiate_locality_check +318 drivers/misc/mei/hdcp/mei_hdcp.c
246
247 /**
248 * mei_store_pairing_info:
249 * Function to store pairing info received from panel
250 *
251 * @cldev : Pointer for mei client device
252 * @data : Intel HW specific Data
253 * @pairing_info : Pointer for AKE_Send_Pairing_Info
254 *
255 * Returns 0 on Success, <0 on Failure
256 */
257
> 258 int mei_store_pairing_info(struct mei_cl_device *cldev,
259 struct mei_hdcp_data *data,
260 struct hdcp2_ake_send_pairing_info *pairing_info)
261 {
262 struct wired_cmd_ake_send_pairing_info_in pairing_info_in = { { 0 } };
263 struct wired_cmd_ake_send_pairing_info_out pairing_info_out = { { 0 } };
264 struct device *dev;
265 ssize_t byte;
266
267 if (!data || !pairing_info)
268 return -EINVAL;
269
270 dev = &cldev->dev;
271
272 pairing_info_in.header.api_version = HDCP_API_VERSION;
273 pairing_info_in.header.command_id = WIRED_AKE_SEND_PAIRING_INFO;
274 pairing_info_in.header.status = ME_HDCP_STATUS_SUCCESS;
275 pairing_info_in.header.buffer_len =
276 WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN;
277
278 pairing_info_in.port.integrated_port_type = data->port_type;
279 pairing_info_in.port.physical_port = data->port;
280
281 memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
282 sizeof(pairing_info_in.e_kh_km));
283
284 byte = mei_cldev_send(cldev, (u8 *)&pairing_info_in,
285 sizeof(pairing_info_in));
286 if (byte < 0) {
287 dev_dbg(dev, "mei_cldev_send failed. %d\n", (int)byte);
288 return byte;
289 }
290
291 byte = mei_cldev_recv(cldev, (u8 *)&pairing_info_out,
292 sizeof(pairing_info_out));
293 if (byte < 0) {
294 dev_dbg(dev, "mei_cldev_recv failed. %d\n", (int)byte);
295 return byte;
296 }
297
298 if (pairing_info_out.header.status != ME_HDCP_STATUS_SUCCESS) {
299 dev_dbg(dev, "ME cmd 0x%08X failed. Status: 0x%X\n",
300 WIRED_AKE_SEND_PAIRING_INFO,
301 pairing_info_out.header.status);
302 return -1;
303 }
304 return 0;
305 }
306 EXPORT_SYMBOL(mei_store_pairing_info);
307
308 /**
309 * mei_initiate_locality_check:
310 * Function to prepare LC_Init.
311 *
312 * @cldev : Pointer for mei client device
313 * @data : Intel HW specific Data
314 * @hdcp2_lc_init : Pointer for storing LC_Init
315 *
316 * Returns 0 on Success, <0 on Failure
317 */
> 318 int mei_initiate_locality_check(struct mei_cl_device *cldev, 319 struct mei_hdcp_data *data,
320 struct hdcp2_lc_init *lc_init_data)
321 {
322 struct wired_cmd_init_locality_check_in lc_init_in = { { 0 } };
323 struct wired_cmd_init_locality_check_out lc_init_out = { { 0 } };
324 struct device *dev;
325 ssize_t byte;
326
327 if (!data || !lc_init_data)
328 return -EINVAL;
329
330 dev = &cldev->dev;
331
332 lc_init_in.header.api_version = HDCP_API_VERSION;
333 lc_init_in.header.command_id = WIRED_INIT_LOCALITY_CHECK;
334 lc_init_in.header.status = ME_HDCP_STATUS_SUCCESS;
335 lc_init_in.header.buffer_len = WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN;
336
337 lc_init_in.port.integrated_port_type = data->port_type;
338 lc_init_in.port.physical_port = data->port;
339
340 byte = mei_cldev_send(cldev, (u8 *)&lc_init_in, sizeof(lc_init_in));
341 if (byte < 0) {
342 dev_dbg(dev, "mei_cldev_send failed. %d\n", (int)byte);
343 return byte;
344 }
345
346 byte = mei_cldev_recv(cldev, (u8 *)&lc_init_out, sizeof(lc_init_out));
347 if (byte < 0) {
348 dev_dbg(dev, "mei_cldev_recv failed. %d\n", (int)byte);
349 return byte;
350 }
351
352 if (lc_init_out.header.status != ME_HDCP_STATUS_SUCCESS) {
353 dev_dbg(dev, "ME cmd 0x%08X Failed. status: 0x%X\n",
354 WIRED_INIT_LOCALITY_CHECK, lc_init_out.header.status);
355 return -1;
356 }
357
358 lc_init_data->msg_id = HDCP_2_2_LC_INIT;
359 memcpy(lc_init_data->r_n, lc_init_out.r_n, HDCP_2_2_RN_LEN);
360 return 0;
361 }
362 EXPORT_SYMBOL(mei_initiate_locality_check);
363
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 12/40] misc/mei/hdcp: Initiate Locality check
In reply to Ramalingam CQuoted 82 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 12/40] misc/mei/hdcp: Initiate Locality checkRequests ME to start the second stage of HDCP2.2 authentication, called Locality Check.
On Success, ME FW will provide
LC_Initmessage to send to hdcp sink.v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 56
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 10 +++++++2 files changed, 66 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +43
-0@@ -305,6 +305,62 @@ int mei_store_pairing_info(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_store_pairing_info); +/** +* mei_initiate_locality_check: +* Function to prepare LC_Init. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @hdcp2_lc_init : Pointer for storing LC_Init +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_initiate_locality_check (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !lc_init_data) +return -EINVAL ; + + dev = &cldev->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.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 = data->port; + + byte =mei_cldev_send (cldev, (u8 *)&lc_init_in,sizeof (lc_init_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&lc_init_out,sizeof (lc_init_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + }
drivers/misc/mei/hdcp/mei_hdcp.c int mei_store_pairing_info(struct mei_cl_device *cldev, · line 359
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0+ +if (lc_init_out.header.status !=ME_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 -1 ; + } + + 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 );
Check for validity of lc_init_data->r_n.
Also, leave a blank line.
Quoted 33 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_initiate_locality_check); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
be16e49d8018..d9c4cac0b276100644include/linux/mei_hdcp.h +3
-0@@ -121,6 +121,9 @@ int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, int mei_store_pairing_info(struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_ake_send_pairing_info *pairing_info); +int mei_initiate_locality_check (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_lc_init *lc_init_data);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -160,5+163,12 @@ int mei_store_pairing_info(struct mei_cl_device *cldev, { return -ENODEV; }include/linux/mei_hdcp.h +6
-0+static inline +int mei_initiate_locality_check (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_lc_init *lc_init_data) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 12/40] misc/mei/hdcp: Initiate Locality check
Quoted 85 lines · Uma
Quoted 85 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 12/40] misc/mei/hdcp: Initiate Locality checkRequests ME to start the second stage of HDCP2.2 authentication, called Locality Check.
On Success, ME FW will provide
LC_Initmessage to send to hdcp sink.v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 56
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 10 +++++++2 files changed, 66 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +47
-0@@ -305,6 +305,62 @@ int mei_store_pairing_info(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_store_pairing_info); +/** +* mei_initiate_locality_check: +* Function to prepare LC_Init. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @hdcp2_lc_init : Pointer for storing LC_Init +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_initiate_locality_check (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !lc_init_data) +return -EINVAL ; + + dev = &cldev->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.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 = data->port; + + byte =mei_cldev_send (cldev, (u8 *)&lc_init_in,sizeof (lc_init_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&lc_init_out,sizeof (lc_init_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (lc_init_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { + dev_dbg(dev, "ME cmd 0x%08X Failed. status: 0x%X\n", + WIRED_INIT_LOCALITY_CHECK,
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_store_pairing_info(struct mei_cl_device *cldev, · line 359
Quoted 6 lines
drivers/misc/mei/hdcp/mei_hdcp.c +5
-0lc_init_out.header.status); +return -1 ; + } + + 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 );Check for validity of
lc_init_data->r_n.
Also, leave a blank line.
ok
--Ram
Quoted 34 lines
Quoted 34 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_initiate_locality_check); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
be16e49d8018..d9c4cac0b276100644include/linux/mei_hdcp.h +3
-0@@ -121,6 +121,9 @@ int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, int mei_store_pairing_info(struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_ake_send_pairing_info *pairing_info); +int mei_initiate_locality_check (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_lc_init *lc_init_data);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -160,5+163,12 @@ int mei_store_pairing_info(struct mei_cl_device *cldev, { return -ENODEV; }include/linux/mei_hdcp.h +6
-0+static inline +int mei_initiate_locality_check (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_lc_init *lc_init_data) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 13/40 misc/mei/hdcp: Verify L_prime
In reply to Ramalingam CRequest to ME to verify the LPrime received from HDCP sink.
On Success, ME FW will verify the received Lprime by calculating and comparing with L.
This represents the completion of Locality Check.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 59 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 8 ++++++ 2 files changed, 67 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +59 -0
@@ -361,6 +361,65 @@ int mei_initiate_locality_check(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_initiate_locality_check); +/** +* mei_verify_lprime: +* Function to verify lprime. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @rx_lprime : Pointer for LC_Send_L_prime +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !rx_lprime) +return -EINVAL ; + + dev = &cldev->dev; + + 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.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 = data->port; + +memcpy (verify_lprime_in.l_prime, rx_lprime->l_prime, +sizeof (rx_lprime->l_prime)); + + byte =mei_cldev_send (cldev, (u8 *)&verify_lprime_in, +sizeof (verify_lprime_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&verify_lprime_out, +sizeof (verify_lprime_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (verify_lprime_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X failed. status: 0x%X\n" , +WIRED_VALIDATE_LOCALITY , + verify_lprime_out.header.status); +return -1 ; + } +return 0 ; +} +EXPORT_SYMBOL (mei_verify_lprime); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +8 -0
@@ -124,6 +124,8 @@ int mei_store_pairing_info(struct mei_cl_device *cldev,int mei_initiate_locality_check (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_lc_init *lc_init_data); +int mei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_lc_send_lprime *rx_lprime);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -170,5 +172,11 @@ int mei_initiate_locality_check(struct mei_cl_device *cldev, {return -ENODEV ; } +static inline +int mei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_lc_send_lprime *rx_lprime) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 13/40] misc/mei/hdcp: Verify L_prime
Quoted 64 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 13/40] misc/mei/hdcp: VerifyL_primeRequest to ME to verify the LPrime received from HDCP sink.
On Success, ME FW will verify the received Lprime by calculating and comparing with L.
This represents the completion of Locality Check.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 59
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 8 ++++++2 files changed, 67 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +23
-0@@ -361,6 +361,65 @@ int mei_initiate_locality_check(struct mei_cl_device *cldev, } EXPORT_SYMBOL(mei_initiate_locality_check); +/** +* mei_verify_lprime: +* Function to verify lprime. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @rx_lprime : Pointer for LC_Send_L_prime +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !rx_lprime) +return -EINVAL ; + + dev = &cldev->dev; + + verify_lprime_in.header.api_version =HDCP_API_VERSION ;
drivers/misc/mei/hdcp/mei_hdcp.c int mei_initiate_locality_check(struct mei_cl_device · line 395
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0+ verify_lprime_in.header.command_id =WIRED_VALIDATE_LOCALITY ; + verify_lprime_in.header.status =ME_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 = data->port; + + memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,
Validate rx_lprime->l_prime for NULL
Quoted 12 lines
drivers/misc/mei/hdcp/mei_hdcp.c +12
-0+ sizeof(rx_lprime->l_prime)); + + byte =mei_cldev_send (cldev, (u8 *)&verify_lprime_in, +sizeof (verify_lprime_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&verify_lprime_out, +sizeof (verify_lprime_out)); +if (byte <0 ) {
drivers/misc/mei/hdcp/mei_hdcp.c int mei_initiate_locality_check(struct mei_cl_device *cldev, · line 418
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +10
-0+dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (verify_lprime_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X failed. status: 0x%X\n" , +WIRED_VALIDATE_LOCALITY , + verify_lprime_out.header.status); +return -1 ; + }
Leave a blank line.
Quoted 31 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_verify_lprime); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
d9c4cac0b276..792143563c46100644include/linux/mei_hdcp.h +2
-0@@ -124,6 +124,8 @@ int mei_store_pairing_info(struct mei_cl_device *cldev,int mei_initiate_locality_check (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_lc_init *lc_init_data); +int mei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_lc_send_lprime *rx_lprime);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -170,5+172,11 @@ int mei_initiate_locality_check(struct mei_cl_device *cldev, { return -ENODEV; }include/linux/mei_hdcp.h +5
-0+static inline +int mei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_lc_send_lprime *rx_lprime) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 13/40] misc/mei/hdcp: Verify L_prime
Quoted 90 lines · Uma
Quoted 63 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 13/40] misc/mei/hdcp: VerifyL_primeRequest to ME to verify the LPrime received from HDCP sink.
On Success, ME FW will verify the received Lprime by calculating and comparing with L.
This represents the completion of Locality Check.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 59
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 8 ++++++2 files changed, 67 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +23
-0@@ -361,6 +361,65 @@ int mei_initiate_locality_check(struct mei_cl_device *cldev, } EXPORT_SYMBOL(mei_initiate_locality_check); +/** +* mei_verify_lprime: +* Function to verify lprime. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @rx_lprime : Pointer for LC_Send_L_prime +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !rx_lprime) +return -EINVAL ; + + dev = &cldev->dev; + + verify_lprime_in.header.api_version =HDCP_API_VERSION ;drivers/misc/mei/hdcp/mei_hdcp.c int mei_initiate_locality_check(struct mei_cl_device · line 395
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0+ verify_lprime_in.header.command_id =WIRED_VALIDATE_LOCALITY ; + verify_lprime_in.header.status =ME_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 = data->port; + + memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,Validate
rx_lprime->l_primefor NULLQuoted 15 lines
drivers/misc/mei/hdcp/mei_hdcp.c +15
-0+ sizeof(rx_lprime->l_prime)); + + byte =mei_cldev_send (cldev, (u8 *)&verify_lprime_in, +sizeof (verify_lprime_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&verify_lprime_out, +sizeof (verify_lprime_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + }
Quoted 8 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_initiate_locality_check(struct mei_cl_device *cldev, · line 418
Quoted 7 lines
drivers/misc/mei/hdcp/mei_hdcp.c +7
-0+ +if (verify_lprime_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X failed. status: 0x%X\n" , +WIRED_VALIDATE_LOCALITY , + verify_lprime_out.header.status); +return -1 ; + }Leave a blank line.
Ok sure.
--Ram
Quoted 32 lines
Quoted 32 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_verify_lprime); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
d9c4cac0b276..792143563c46100644include/linux/mei_hdcp.h +2
-0@@ -124,6 +124,8 @@ int mei_store_pairing_info(struct mei_cl_device *cldev,int mei_initiate_locality_check (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_lc_init *lc_init_data); +int mei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_lc_send_lprime *rx_lprime);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -170,5+172,11 @@ int mei_initiate_locality_check(struct mei_cl_device *cldev, { return -ENODEV; }include/linux/mei_hdcp.h +5
-0+static inline +int mei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_lc_send_lprime *rx_lprime) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 14/40 misc/mei/hdcp: Prepare Session Key
In reply to Ramalingam CRequest to ME to prepare the encrypted session key.
On Success, ME provides Encrypted session key. Functions populates the HDCP2.2 authentication msg SKE_Send_Eks.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 58 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 8 ++++++ 2 files changed, 66 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +58 -0
@@ -420,6 +420,64 @@ int mei_verify_lprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, }EXPORT_SYMBOL (mei_verify_lprime); +/** +* mei_get_session_key: +* Function to prepare SKE_Send_Eks. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @ske_data : Pointer for SKE_Send_Eks. +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_get_session_key (struct mei_cl_device *cldev,struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !ske_data) +return -EINVAL ; + + dev = &cldev->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.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 = data->port; + + byte =mei_cldev_send (cldev, (u8 *)&get_skey_in,sizeof (get_skey_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&get_skey_out,sizeof (get_skey_out)); + +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (get_skey_out.header.status !=ME_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 -1 ; + } + + 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 ; +} +EXPORT_SYMBOL (mei_get_session_key); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +8 -0
@@ -126,6 +126,8 @@ int mei_initiate_locality_check(struct mei_cl_device *cldev, struct hdcp2_lc_init *lc_init_data);int mei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_lc_send_lprime *rx_lprime); +int mei_get_session_key (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_ske_send_eks *ske_data);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -178,5 +180,11 @@ int mei_verify_lprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, {return -ENODEV ; } +static inline +int mei_get_session_key (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_ske_send_eks *ske_data) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 14/40] misc/mei/hdcp: Prepare Session Key
Quoted 13 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 14/40] misc/mei/hdcp: Prepare Session Key
Quoted 3 lines
Request to ME to prepare the encrypted session key.
On Success, ME provides Encrypted session key. Functions populates the HDCP2.2
Drop "s" from function.
Quoted 68 lines
authentication msg
SKE_Send_Eks.v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 58
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 8 ++++++2 files changed, 66 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +43
-0@@ -420,6 +420,64 @@ int mei_verify_lprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, } EXPORT_SYMBOL(mei_verify_lprime); +/** +* mei_get_session_key: +* Function to prepare SKE_Send_Eks. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @ske_data : Pointer for SKE_Send_Eks. +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_get_session_key (struct mei_cl_device *cldev,struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !ske_data) +return -EINVAL ; + + dev = &cldev->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.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 = data->port; + + byte =mei_cldev_send (cldev, (u8 *)&get_skey_in,sizeof (get_skey_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&get_skey_out, +sizeof (get_skey_out)); + +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + }
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_lprime(struct mei_cl_device *cldev, · line 476
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0+ +if (get_skey_out.header.status !=ME_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 -1 ; + } + + ske_data->msg_id =HDCP_2_2_SKE_SEND_EKS ; + memcpy(ske_data->e_dkey_ks, get_skey_out.e_dkey_ks,
Check for validity of ske_data->e_dkey_ks.
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_lprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 476
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c +2
-0+ HDCP_2_2_E_DKEY_KS_LEN); +memcpy (ske_data->riv, get_skey_out.r_iv,HDCP_2_2_RIV_LEN );
Again check for ske_data->riv. Also leave a blank line here.
Quoted 35 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_get_session_key); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
792143563c46..534170d746af100644include/linux/mei_hdcp.h +2
-0@@ -126,6 +126,8 @@ int mei_initiate_locality_check(struct mei_cl_device *cldev, struct hdcp2_lc_init *lc_init_data); intmei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_lc_send_lprime *rx_lprime); +int mei_get_session_key (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_ske_send_eks *ske_data);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -178,5 +180,11 @@ int mei_verify_lprime(structmei_cl_device*cldev, structmei_hdcp_data *data, { return -ENODEV; }include/linux/mei_hdcp.h +2
-0+static inline +int mei_get_session_key(struct mei_cl_device *cldev, struct mei_hdcp_data*data,
include/linux/mei_hdcp.h +3
-0+ struct hdcp2_ske_send_eks *ske_data) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 14/40] misc/mei/hdcp: Prepare Session Key
Quoted 12 lines · Uma
Quoted 12 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 14/40] misc/mei/hdcp: Prepare Session Key
Quoted 4 lines
Quoted 3 lines
Request to ME to prepare the encrypted session key.
On Success, ME provides Encrypted session key. Functions populates the HDCP2.2
Drop "s" from function.
ok. Thanks.
Quoted 81 lines
Quoted 69 lines
authentication msg
SKE_Send_Eks.v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 58
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 8 ++++++2 files changed, 66 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +43
-0@@ -420,6 +420,64 @@ int mei_verify_lprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, } EXPORT_SYMBOL(mei_verify_lprime); +/** +* mei_get_session_key: +* Function to prepare SKE_Send_Eks. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @ske_data : Pointer for SKE_Send_Eks. +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_get_session_key (struct mei_cl_device *cldev,struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!data || !ske_data) +return -EINVAL ; + + dev = &cldev->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.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 = data->port; + + byte =mei_cldev_send (cldev, (u8 *)&get_skey_in,sizeof (get_skey_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&get_skey_out, +sizeof (get_skey_out)); + +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + }drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_lprime(struct mei_cl_device *cldev, · line 476
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0+ +if (get_skey_out.header.status !=ME_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 -1 ; + } + + ske_data->msg_id =HDCP_2_2_SKE_SEND_EKS ; + memcpy(ske_data->e_dkey_ks, get_skey_out.e_dkey_ks,Check for validity of
ske_data->e_dkey_ks.
Quoted 3 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_lprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 476
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c +2
-0+ HDCP_2_2_E_DKEY_KS_LEN); +memcpy (ske_data->riv, get_skey_out.r_iv,HDCP_2_2_RIV_LEN );Again check for
ske_data->riv. Also leave a blank line here.
New line will be added
--Ram
Quoted 36 lines
Quoted 36 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_get_session_key); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
792143563c46..534170d746af100644include/linux/mei_hdcp.h +2
-0@@ -126,6 +126,8 @@ int mei_initiate_locality_check(struct mei_cl_device *cldev, struct hdcp2_lc_init *lc_init_data); intmei_verify_lprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_lc_send_lprime *rx_lprime); +int mei_get_session_key (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_ske_send_eks *ske_data);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -178,5 +180,11 @@ int mei_verify_lprime(structmei_cl_device*cldev, structmei_hdcp_data *data, { return -ENODEV; }include/linux/mei_hdcp.h +2
-0+static inline +int mei_get_session_key(struct mei_cl_device *cldev, struct mei_hdcp_data*data,
include/linux/mei_hdcp.h +3
-0+ struct hdcp2_ske_send_eks *ske_data) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 15/40 misc/mei/hdcp: Repeater topology verifcation and ack
In reply to Ramalingam CRequest ot ME to verify the downatream topology information received.
ME FW will validate the Repeaters receiver id list and downstream topology.
On Success ME FW will provide the Least Significant 128bits of VPrime, which forms the repeater ack.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 75 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 15 ++++++++ 2 files changed, 90 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +75 -0
@@ -478,6 +478,81 @@ int mei_get_session_key(struct mei_cl_device *cldev, struct mei_hdcp_data *data, }EXPORT_SYMBOL (mei_get_session_key); +/** +* mei_repeater_check_flow_prepare_ack: +* Function to validate the Downstream topology and prepare rep_ack. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @rep_topology : Pointer for Receiver Id List to be validated. +* @rep_send_ack : Pointer for repeater ack +* +* Returns 0 on Success, <0 on Failure +*/ + +int +mei_repeater_check_flow_prepare_ack (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!rep_topology || !rep_send_ack || !data) +return -EINVAL ; + + dev = &cldev->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.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 = data->port; + +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_LPRIME_HALF_LEN ); +memcpy (verify_repeater_in.receiver_ids, rep_topology->receiver_ids, +HDCP_2_2_RECEIVER_IDS_MAX_LEN ); + + byte =mei_cldev_send (cldev, (u8 *)&verify_repeater_in, +sizeof (verify_repeater_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&verify_repeater_out, +sizeof (verify_repeater_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (verify_repeater_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X failed. status: 0x%X\n" , +WIRED_VERIFY_REPEATER , + verify_repeater_out.header.status); +return -1 ; + } + +memcpy (rep_send_ack->v, verify_repeater_out.v, +HDCP_2_2_LPRIME_HALF_LEN ); + rep_send_ack->msg_id =HDCP_2_2_REP_SEND_ACK ; +return 0 ; +} +EXPORT_SYMBOL (mei_repeater_check_flow_prepare_ack); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +15 -0
@@ -128,6 +128,12 @@ int mei_verify_lprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, struct hdcp2_lc_send_lprime *rx_lprime);int mei_get_session_key (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_ske_send_eks *ske_data); +int +mei_repeater_check_flow_prepare_ack (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_rep_send_receiverid_list + *rep_topology, +struct hdcp2_rep_send_ack *rep_send_ack);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -186,5 +192,14 @@ int mei_get_session_key(struct mei_cl_device *cldev, struct mei_hdcp_data *data, {return -ENODEV ; } +static inline int +mei_repeater_check_flow_prepare_ack (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_rep_send_receiverid_list + *rep_topology, +struct hdcp2_rep_send_ack *rep_send_ack) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 15/40] misc/mei/hdcp: Repeater topology verifcation and ack
Quoted 12 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 15/40] misc/mei/hdcp: Repeater topology verifcation and ack
Typo in verification.
Quoted 2 lines
Request ot ME to verify the downatream topology information received.
"To" misspelled. Also typo in downstream.
Quoted 63 lines
ME FW will validate the Repeaters receiver id list and downstream topology.
On Success ME FW will provide the Least Significant 128bits of VPrime, which forms the repeater ack.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 75
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 15 ++++++++2 files changed, 90 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +35
-0@@ -478,6 +478,81 @@ int mei_get_session_key(struct mei_cl_device *cldev, struct mei_hdcp_data *data, } EXPORT_SYMBOL(mei_get_session_key); +/** +* mei_repeater_check_flow_prepare_ack: +* Function to validate the Downstream topology and prepare rep_ack. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @rep_topology : Pointer for Receiver Id List to be validated. +* @rep_send_ack : Pointer for repeater ack +* +* Returns 0 on Success, <0 on Failure +*/ + +int +mei_repeater_check_flow_prepare_ack (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!rep_topology || !rep_send_ack || !data) +return -EINVAL ; + + dev = &cldev->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.buffer_len = +WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN ; + + verify_repeater_in.port.integrated_port_type = data->port_type;
drivers/misc/mei/hdcp/mei_hdcp.c int mei_get_session_key(struct mei_cl_device *cldev, · line 525
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +10
-0+ verify_repeater_in.port.physical_port = data->port; + +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_LPRIME_HALF_LEN ); +memcpy (verify_repeater_in.receiver_ids, rep_topology->receiver_ids, +HDCP_2_2_RECEIVER_IDS_MAX_LEN );
Check for validity of rep_topology->... pointers.
Quoted 13 lines
drivers/misc/mei/hdcp/mei_hdcp.c +13
-0+ + byte =mei_cldev_send (cldev, (u8 *)&verify_repeater_in, +sizeof (verify_repeater_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&verify_repeater_out, +sizeof (verify_repeater_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte;
drivers/misc/mei/hdcp/mei_hdcp.c int mei_get_session_key(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 549
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +10
-0+ } + +if (verify_repeater_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X failed. status: 0x%X\n" , +WIRED_VERIFY_REPEATER , + verify_repeater_out.header.status); +return -1 ; + } + + memcpy(rep_send_ack->v, verify_repeater_out.v,
Same as above.
drivers/misc/mei/hdcp/mei_hdcp.c int mei_get_session_key(struct mei_cl_device *cldev, · line 550
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c +2
-0+ HDCP_2_2_LPRIME_HALF_LEN); + rep_send_ack->msg_id =HDCP_2_2_REP_SEND_ACK ;
Leave a blank line here.
Quoted 40 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_repeater_check_flow_prepare_ack); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
534170d746af..46e2dc295d03100644include/linux/mei_hdcp.h +6
-0@@ -128,6 +128,12 @@ int mei_verify_lprime(struct mei_cl_device *cldev,struct mei_hdcp_data *data, struct hdcp2_lc_send_lprime *rx_lprime); intmei_get_session_key (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_ske_send_eks *ske_data); +int +mei_repeater_check_flow_prepare_ack (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_rep_send_receiverid_list + *rep_topology, +struct hdcp2_rep_send_ack *rep_send_ack);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -186,5 +192,14 @@ int mei_get_session_key(structmei_cl_device*cldev, structmei_hdcp_data *data, { return -ENODEV; }include/linux/mei_hdcp.h +8
-0+static inline int +mei_repeater_check_flow_prepare_ack (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_rep_send_receiverid_list + *rep_topology, +struct hdcp2_rep_send_ack *rep_send_ack) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 15/40] misc/mei/hdcp: Repeater topology verifcation and ack
Quoted 11 lines · Uma
Quoted 11 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 15/40] misc/mei/hdcp: Repeater topology verifcation and ack
Quoted 4 lines
Typo in verification.
Quoted 1 line
Request ot ME to verify the downatream topology information received.
"To" misspelled. Also typo in downstream.
ok. Will fix it.
Quoted 100 lines
Quoted 63 lines
ME FW will validate the Repeaters receiver id list and downstream topology.
On Success ME FW will provide the Least Significant 128bits of VPrime, which forms the repeater ack.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 75
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 15 ++++++++2 files changed, 90 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +35
-0@@ -478,6 +478,81 @@ int mei_get_session_key(struct mei_cl_device *cldev, struct mei_hdcp_data *data, } EXPORT_SYMBOL(mei_get_session_key); +/** +* mei_repeater_check_flow_prepare_ack: +* Function to validate the Downstream topology and prepare rep_ack. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @rep_topology : Pointer for Receiver Id List to be validated. +* @rep_send_ack : Pointer for repeater ack +* +* Returns 0 on Success, <0 on Failure +*/ + +int +mei_repeater_check_flow_prepare_ack (struct mei_cl_device *cldev, +struct mei_hdcp_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 device *dev; +ssize_t byte; + +if (!rep_topology || !rep_send_ack || !data) +return -EINVAL ; + + dev = &cldev->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.buffer_len = +WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN ; + + verify_repeater_in.port.integrated_port_type = data->port_type;drivers/misc/mei/hdcp/mei_hdcp.c int mei_get_session_key(struct mei_cl_device *cldev, · line 525
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +10
-0+ verify_repeater_in.port.physical_port = data->port; + +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_LPRIME_HALF_LEN ); +memcpy (verify_repeater_in.receiver_ids, rep_topology->receiver_ids, +HDCP_2_2_RECEIVER_IDS_MAX_LEN );Check for validity of rep_topology->... pointers.
Quoted 13 lines
drivers/misc/mei/hdcp/mei_hdcp.c +13
-0+ + byte =mei_cldev_send (cldev, (u8 *)&verify_repeater_in, +sizeof (verify_repeater_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&verify_repeater_out, +sizeof (verify_repeater_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte;drivers/misc/mei/hdcp/mei_hdcp.c int mei_get_session_key(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 549
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +10
-0+ } + +if (verify_repeater_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X failed. status: 0x%X\n" , +WIRED_VERIFY_REPEATER , + verify_repeater_out.header.status); +return -1 ; + } + + memcpy(rep_send_ack->v, verify_repeater_out.v,Same as above.
Quoted 3 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_get_session_key(struct mei_cl_device *cldev, · line 550
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c +2
-0+ HDCP_2_2_LPRIME_HALF_LEN); + rep_send_ack->msg_id =HDCP_2_2_REP_SEND_ACK ;Leave a blank line here.
Ok.
--Ram
Quoted 41 lines
Quoted 41 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_repeater_check_flow_prepare_ack); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
534170d746af..46e2dc295d03100644include/linux/mei_hdcp.h +6
-0@@ -128,6 +128,12 @@ int mei_verify_lprime(struct mei_cl_device *cldev,struct mei_hdcp_data *data, struct hdcp2_lc_send_lprime *rx_lprime); intmei_get_session_key (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_ske_send_eks *ske_data); +int +mei_repeater_check_flow_prepare_ack (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_rep_send_receiverid_list + *rep_topology, +struct hdcp2_rep_send_ack *rep_send_ack);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -186,5 +192,14 @@ int mei_get_session_key(structmei_cl_device*cldev, structmei_hdcp_data *data, { return -ENODEV; }include/linux/mei_hdcp.h +8
-0+static inline int +mei_repeater_check_flow_prepare_ack (struct mei_cl_device *cldev, +struct mei_hdcp_data *data, +struct hdcp2_rep_send_receiverid_list + *rep_topology, +struct hdcp2_rep_send_ack *rep_send_ack) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 16/40 misc/mei/hdcp: Verify M_prime
In reply to Ramalingam CRequest to ME to verify the M_Prime received from the HDCP sink.
ME FW will calculate the M and compare with M_prime received as part of RepeaterAuth_Stream_Ready, which is HDCP2.2 protocol msg.
On successful completion of this stage, downstream propagation of the stream management info is completed.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 79 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 8 ++++ 2 files changed, 87 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +79 -0
@@ -553,6 +553,85 @@ mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_repeater_check_flow_prepare_ack); +static inline void reverse_endianness (u8 *dest,size_t dst_sz,u8 *src) +{ +u32 index; + +if (dest !=NULL && dst_sz !=0 ) { +for (index =0 ; index < dst_sz && index <sizeof (u32); + index++) { + dest[dst_sz - index -1 ] = src[index]; + } + } +} + +/** +* mei_verify_mprime: +* Function to verify mprime. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @stream_ready : pointer for RepeaterAuth_Stream_Ready message. +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_verify_mprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_rep_stream_ready *stream_ready) +{ +struct wired_cmd_repeater_auth_stream_req_in + verify_mprime_in = { {0 } }; +struct wired_cmd_repeater_auth_stream_req_out + verify_mprime_out = { {0 } }; +struct device *dev; +ssize_t byte; + +if (!stream_ready || !data) +return -EINVAL ; + + dev = &cldev->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.buffer_len = +WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_MIN_IN ; + + verify_mprime_in.port.integrated_port_type = data->port_type; + verify_mprime_in.port.physical_port = data->port; + +memcpy (verify_mprime_in.m_prime, stream_ready->m_prime, +HDCP_2_2_MPRIME_LEN ); +reverse_endianness ((u8 *)&verify_mprime_in.seq_num_m, +HDCP_2_2_SEQ_NUM_LEN , (u8 *)&data->seq_num_m); +memcpy (verify_mprime_in.streams, data->streams, + (data->k *sizeof (struct hdcp2_streamid_type ))); + + verify_mprime_in.k =__swab16 (data->k); + + byte =mei_cldev_send (cldev, (u8 *)&verify_mprime_in, +sizeof (verify_mprime_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&verify_mprime_out, +sizeof (verify_mprime_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (verify_mprime_out.header.status !=ME_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); +return -1 ; + } +return 0 ; +} +EXPORT_SYMBOL (mei_verify_mprime); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +8 -0
@@ -134,6 +134,8 @@ mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev,struct hdcp2_rep_send_receiverid_list *rep_topology, struct hdcp2_rep_send_ack *rep_send_ack); +int mei_verify_mprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_rep_stream_ready *stream_ready);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -201,5 +203,11 @@ mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, {return -ENODEV ; } +static inline +int mei_verify_mprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_rep_stream_ready *stream_ready) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 16/40] misc/mei/hdcp: Verify M_prime
Quoted 40 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 16/40] misc/mei/hdcp: VerifyM_primeRequest to ME to verify the
M_Primereceived from the HDCP sink.ME FW will calculate the M and compare with
M_primereceived as part ofRepeaterAuth_Stream_Ready, which is HDCP2.2 protocol msg.On successful completion of this stage, downstream propagation of the stream management info is completed.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 79
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 8 ++++2 files changed, 87 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +0
-0
drivers/misc/mei/hdcp/mei_hdcp.c mei_repeater_check_flow_prepare_ack(struct · line 556
Quoted 4 lines
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0@@ -553,6 +553,85 @@ mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_repeater_check_flow_prepare_ack ); +static inline void reverse_endianness (u8 *dest,size_t dst_sz,u8 *src)
Function with loop ideally should not be inline.
drivers/misc/mei/hdcp/mei_hdcp.c mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, · line 560
Quoted 4 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+{ +u32 index; + +if (dest !=NULL && dst_sz !=0 ) {
Good to check for src as well. Also this function will not do anything if these check fails with caller not even been aware of the failure. Atleast return an error or make sure no parameter validation happens here and its done by calling function.
Quoted 34 lines
drivers/misc/mei/hdcp/mei_hdcp.c +33
-0+for (index =0 ; index < dst_sz && index <sizeof (u32); + index++) { + dest[dst_sz - index -1 ] = src[index]; + } + } +} + +/** +* mei_verify_mprime: +* Function to verify mprime. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @stream_ready : pointer for RepeaterAuth_Stream_Ready message. +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_verify_mprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_rep_stream_ready *stream_ready) { +struct wired_cmd_repeater_auth_stream_req_in + verify_mprime_in = { {0 } }; +struct wired_cmd_repeater_auth_stream_req_out + verify_mprime_out = { {0 } }; +struct device *dev; +ssize_t byte; + +if (!stream_ready || !data) +return -EINVAL ; + + dev = &cldev->dev; + + verify_mprime_in.header.api_version =HDCP_API_VERSION ; + verify_mprime_in.header.command_id =
drivers/misc/mei/hdcp/mei_hdcp.c mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev,
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +8
-0WIRED_REPEATER_AUTH_STREAM_REQ ; + verify_mprime_in.header.status =ME_HDCP_STATUS_SUCCESS ; + verify_mprime_in.header.buffer_len = +WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_MIN_IN ; + + verify_mprime_in.port.integrated_port_type = data->port_type; + verify_mprime_in.port.physical_port = data->port; + + memcpy(verify_mprime_in.m_prime, stream_ready->m_prime,
Validate stream_ready->m_prime.
drivers/misc/mei/hdcp/mei_hdcp.c mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, · line 606
Quoted 6 lines
drivers/misc/mei/hdcp/mei_hdcp.c +3
-0+ HDCP_2_2_MPRIME_LEN); + reverse_endianness((u8 *)&verify_mprime_in.seq_num_m, + HDCP_2_2_SEQ_NUM_LEN, (u8 *)&data-Quoted 1 line
seq_num_m);drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+ memcpy(verify_mprime_in.streams, data->streams,
Validate data->streams.
Quoted 14 lines
drivers/misc/mei/hdcp/mei_hdcp.c +14
-0+ (data->k * sizeof(struct hdcp2_streamid_type))); + + verify_mprime_in.k =__swab16 (data->k); + + byte =mei_cldev_send (cldev, (u8 *)&verify_mprime_in, +sizeof (verify_mprime_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&verify_mprime_out, +sizeof (verify_mprime_out)); +if (byte <0 ) {
drivers/misc/mei/hdcp/mei_hdcp.c mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, · line 630
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +10
-0+dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (verify_mprime_out.header.status !=ME_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); +return -1 ; + }
Leave a blank line here.
Quoted 35 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_verify_mprime); +void
mei_cldev_state_notify_clients(struct mei_cl_device *cldev, bool enabled){
if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
46e2dc295d03..dbc216e13f97100644include/linux/mei_hdcp.h +2
-0@@ -134,6 +134,8 @@ mei_repeater_check_flow_prepare_ack(structmei_cl_device *cldev, struct hdcp2_rep_send_receiverid_list *rep_topology, struct hdcp2_rep_send_ack *rep_send_ack); +int mei_verify_mprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_rep_stream_ready *stream_ready);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -201,5 +203,11 @@ mei_repeater_check_flow_prepare_ack(structmei_cl_device*cldev, { return -ENODEV; }include/linux/mei_hdcp.h +2
-0+static inline +int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data*data,
include/linux/mei_hdcp.h +3
-0+ struct hdcp2_rep_stream_ready *stream_ready) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 16/40] misc/mei/hdcp: Verify M_prime
Quoted 42 lines · Uma
Quoted 42 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:27 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 16/40] misc/mei/hdcp: VerifyM_primeRequest to ME to verify the
M_Primereceived from the HDCP sink.ME FW will calculate the M and compare with
M_primereceived as part ofRepeaterAuth_Stream_Ready, which is HDCP2.2 protocol msg.On successful completion of this stage, downstream propagation of the stream management info is completed.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 79
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 8 ++++2 files changed, 87 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +0
-0@@ -553,6 +553,85 @@ mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_repeater_check_flow_prepare_ack );
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, · line 556
Quoted 1 line
drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+static inline void reverse_endianness (u8 *dest,size_t dst_sz,u8 *src)Function with loop ideally should not be inline.
Thanks for catching it.
Quoted 9 lines
drivers/misc/mei/hdcp/mei_hdcp.c mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, · line 560
Quoted 5 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+{ +u32 index; + +if (dest !=NULL && dst_sz !=0 ) {Good to check for src as well. Also this function will not do anything if these check fails with caller not even been aware of the failure. Atleast return an error or make sure no parameter validation happens here and its done by calling function.
bit rewriting this function. Thanks
--Ram
Quoted 115 lines
Quoted 35 lines
drivers/misc/mei/hdcp/mei_hdcp.c +33
-0+for (index =0 ; index < dst_sz && index <sizeof (u32); + index++) { + dest[dst_sz - index -1 ] = src[index]; + } + } +} + +/** +* mei_verify_mprime: +* Function to verify mprime. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* @stream_ready : pointer for RepeaterAuth_Stream_Ready message. +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_verify_mprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_rep_stream_ready *stream_ready) { +struct wired_cmd_repeater_auth_stream_req_in + verify_mprime_in = { {0 } }; +struct wired_cmd_repeater_auth_stream_req_out + verify_mprime_out = { {0 } }; +struct device *dev; +ssize_t byte; + +if (!stream_ready || !data) +return -EINVAL ; + + dev = &cldev->dev; + + verify_mprime_in.header.api_version =HDCP_API_VERSION ; + verify_mprime_in.header.command_id =drivers/misc/mei/hdcp/mei_hdcp.c mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev,
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +8
-0WIRED_REPEATER_AUTH_STREAM_REQ ; + verify_mprime_in.header.status =ME_HDCP_STATUS_SUCCESS ; + verify_mprime_in.header.buffer_len = +WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_MIN_IN ; + + verify_mprime_in.port.integrated_port_type = data->port_type; + verify_mprime_in.port.physical_port = data->port; + + memcpy(verify_mprime_in.m_prime, stream_ready->m_prime,Validate
stream_ready->m_prime.drivers/misc/mei/hdcp/mei_hdcp.c mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, · line 606
Quoted 5 lines
drivers/misc/mei/hdcp/mei_hdcp.c +3
-0+ HDCP_2_2_MPRIME_LEN); + reverse_endianness((u8 *)&verify_mprime_in.seq_num_m, + HDCP_2_2_SEQ_NUM_LEN, (u8 *)&data-Quoted 1 line
seq_num_m);drivers/misc/mei/hdcp/mei_hdcp.c +1
-0+ memcpy(verify_mprime_in.streams, data->streams,Validate
data->streams.Quoted 14 lines
drivers/misc/mei/hdcp/mei_hdcp.c +14
-0+ (data->k * sizeof(struct hdcp2_streamid_type))); + + verify_mprime_in.k =__swab16 (data->k); + + byte =mei_cldev_send (cldev, (u8 *)&verify_mprime_in, +sizeof (verify_mprime_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&verify_mprime_out, +sizeof (verify_mprime_out)); +if (byte <0 ) {drivers/misc/mei/hdcp/mei_hdcp.c mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, · line 630
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +10
-0+dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (verify_mprime_out.header.status !=ME_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); +return -1 ; + }Leave a blank line here.
Quoted 35 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_verify_mprime); +void
mei_cldev_state_notify_clients(struct mei_cl_device *cldev, bool enabled){
if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
46e2dc295d03..dbc216e13f97100644include/linux/mei_hdcp.h +2
-0@@ -134,6 +134,8 @@ mei_repeater_check_flow_prepare_ack(structmei_cl_device *cldev, struct hdcp2_rep_send_receiverid_list *rep_topology, struct hdcp2_rep_send_ack *rep_send_ack); +int mei_verify_mprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data, +struct hdcp2_rep_stream_ready *stream_ready);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -201,5 +203,11 @@ mei_repeater_check_flow_prepare_ack(structmei_cl_device*cldev, { return -ENODEV; }include/linux/mei_hdcp.h +2
-0+static inline +int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data*data,
include/linux/mei_hdcp.h +3
-0+ struct hdcp2_rep_stream_ready *stream_ready) { +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 17/40 misc/mei/hdcp: Enabling the HDCP authentication
In reply to Ramalingam CRequest to ME to configure a port as authenticated.
On Success, ME FW will mark th eport as authenticated and provides HDCP chiper of the port with the encryption keys.
Enabling the Authentication can be requested once the all stages of HDCP2.2 authentication is completed by interating with ME FW.
Only after this stage, driver can enable the HDCP encryption for the port, through HW registers.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 54 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 7 ++++++ 2 files changed, 61 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +54 -0
@@ -632,6 +632,60 @@ int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, }EXPORT_SYMBOL (mei_verify_mprime); +/** +* mei_enable_hdcp_authentication: +* Function to request ME FW to mark a port as authenticated. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_enable_hdcp_authentication (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +struct wired_cmd_enable_auth_in enable_auth_in = { {0 } }; +struct wired_cmd_enable_auth_out enable_auth_out = { {0 } }; +struct device *dev; +ssize_t byte; + +if (!data) +return -EINVAL ; + + dev = &cldev->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.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 = data->port; + enable_auth_in.stream_type = data->streams[0 ].stream_type; + + byte =mei_cldev_send (cldev, (u8 *)&enable_auth_in, +sizeof (enable_auth_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&enable_auth_out, +sizeof (enable_auth_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (enable_auth_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X failed. status: 0x%X\n" , +WIRED_ENABLE_AUTH , enable_auth_out.header.status); +return -1 ; + } +return 0 ; +} +EXPORT_SYMBOL (mei_enable_hdcp_authentication); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +7 -0
@@ -136,6 +136,8 @@ mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev, struct hdcp2_rep_send_ack *rep_send_ack);int mei_verify_mprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_rep_stream_ready *stream_ready); +int mei_enable_hdcp_authentication (struct mei_cl_device *cldev, +struct mei_hdcp_data *data);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -209,5 +211,10 @@ int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, {return -ENODEV ; } +static inline int mei_enable_hdcp_authentication (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 17/40] misc/mei/hdcp: Enabling the HDCP authentication
Quoted 13 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 17/40] misc/mei/hdcp: Enabling the HDCP authentication
Quoted 3 lines
Request to ME to configure a port as authenticated.
On Success, ME FW will mark th eport as authenticated and provides HDCP chipper
Rectify "the". Also it should be HDCP cipher.
Quoted 4 lines
of the port with the encryption keys.
Enabling the Authentication can be requested once the all stages of HDCP2.2 authentication is completed by interating with ME FW.
Typo in interacting.
Quoted 46 lines
Only after this stage, driver can enable the HDCP encryption for the port, through HW registers.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 54
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 7 ++++++2 files changed, 61 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +21
-0@@ -632,6 +632,60 @@ int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, } EXPORT_SYMBOL(mei_verify_mprime); +/** +* mei_enable_hdcp_authentication: +* Function to request ME FW to mark a port as authenticated. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_enable_hdcp_authentication (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +struct wired_cmd_enable_auth_in enable_auth_in = { {0 } }; +struct wired_cmd_enable_auth_out enable_auth_out = { {0 } }; +struct device *dev; +ssize_t byte; + +if (!data) +return -EINVAL ; + + dev = &cldev->dev;
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_mprime(struct mei_cl_device *cldev, · line 664
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0+ + 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.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 = data->port; + enable_auth_in.stream_type = data->streams[0 ].stream_type;
Check for data->streams.
Quoted 11 lines
drivers/misc/mei/hdcp/mei_hdcp.c +11
-0+ + byte =mei_cldev_send (cldev, (u8 *)&enable_auth_in, +sizeof (enable_auth_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&enable_auth_out, +sizeof (enable_auth_out)); +if (byte <0 ) {
drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 684
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0+dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (enable_auth_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X failed. status: 0x%X\n" , +WIRED_ENABLE_AUTH , enable_auth_out.header.status); +return -1 ; + }
Leave a blank line here.
Quoted 33 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_enable_hdcp_authentication); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
dbc216e13f97..2366d0741abe100644include/linux/mei_hdcp.h +2
-0@@ -136,6 +136,8 @@ mei_repeater_check_flow_prepare_ack(structmei_cl_device *cldev, struct hdcp2_rep_send_ack *rep_send_ack);int mei_verify_mprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_rep_stream_ready *stream_ready); +int mei_enable_hdcp_authentication (struct mei_cl_device *cldev, +struct mei_hdcp_data *data);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -209,5 +211,10 @@ int mei_verify_mprime(structmei_cl_device*cldev, structmei_hdcp_data *data, { return -ENODEV; }include/linux/mei_hdcp.h +5
-0+static inline int mei_enable_hdcp_authentication (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 17/40] misc/mei/hdcp: Enabling the HDCP authentication
Quoted 14 lines · Uma
Quoted 14 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 17/40] misc/mei/hdcp: Enabling the HDCP authenticationRequest to ME to configure a port as authenticated.
Quoted 8 lines
Quoted 1 line
On Success, ME FW will mark th eport as authenticated and provides HDCP chipper
Rectify "the". Also it should be HDCP cipher.
Quoted 4 lines
of the port with the encryption keys.
Enabling the Authentication can be requested once the all stages of HDCP2.2 authentication is completed by interating with ME FW.
Typo in interacting.
Will fix it.
--Ram
Quoted 114 lines
Quoted 46 lines
Only after this stage, driver can enable the HDCP encryption for the port, through HW registers.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 54
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 7 ++++++2 files changed, 61 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +21
-0@@ -632,6 +632,60 @@ int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, } EXPORT_SYMBOL(mei_verify_mprime); +/** +* mei_enable_hdcp_authentication: +* Function to request ME FW to mark a port as authenticated. +* +* @cldev : Pointer for mei client device +* @data : Intel HW specific Data +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_enable_hdcp_authentication (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +struct wired_cmd_enable_auth_in enable_auth_in = { {0 } }; +struct wired_cmd_enable_auth_out enable_auth_out = { {0 } }; +struct device *dev; +ssize_t byte; + +if (!data) +return -EINVAL ; + + dev = &cldev->dev;drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_mprime(struct mei_cl_device *cldev, · line 664
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0+ + 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.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 = data->port; + enable_auth_in.stream_type = data->streams[0 ].stream_type;Check for
data->streams.Quoted 11 lines
drivers/misc/mei/hdcp/mei_hdcp.c +11
-0+ + byte =mei_cldev_send (cldev, (u8 *)&enable_auth_in, +sizeof (enable_auth_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&enable_auth_out, +sizeof (enable_auth_out)); +if (byte <0 ) {drivers/misc/mei/hdcp/mei_hdcp.c int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, · line 684
Quoted 10 lines
drivers/misc/mei/hdcp/mei_hdcp.c +9
-0+dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (enable_auth_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"ME cmd 0x%08X failed. status: 0x%X\n" , +WIRED_ENABLE_AUTH , enable_auth_out.header.status); +return -1 ; + }Leave a blank line here.
Quoted 33 lines
drivers/misc/mei/hdcp/mei_hdcp.c +4
-0+return 0 ; +} +EXPORT_SYMBOL (mei_enable_hdcp_authentication); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
dbc216e13f97..2366d0741abe100644include/linux/mei_hdcp.h +2
-0@@ -136,6 +136,8 @@ mei_repeater_check_flow_prepare_ack(structmei_cl_device *cldev, struct hdcp2_rep_send_ack *rep_send_ack);int mei_verify_mprime (struct mei_cl_device *cldev,struct mei_hdcp_data *data,struct hdcp2_rep_stream_ready *stream_ready); +int mei_enable_hdcp_authentication (struct mei_cl_device *cldev, +struct mei_hdcp_data *data);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -209,5 +211,10 @@ int mei_verify_mprime(structmei_cl_device*cldev, structmei_hdcp_data *data, { return -ENODEV; }include/linux/mei_hdcp.h +5
-0+static inline int mei_enable_hdcp_authentication (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 18/40 misc/mei/hdcp: Closing wired HDCP2.2 Tx Session
In reply to Ramalingam CRequest the ME to terminate the HDCP2.2 session for a port.
On Success, ME FW will mark the intel port as Deauthenticated and terminate the wired HDCP2.2 Tx session started due to the cmd WIRED_INITIATE_HDCP2_SESSION.
v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]
--- drivers/misc/mei/hdcp/mei_hdcp.c | 55 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 7 +++++ 2 files changed, 62 insertions(+)
drivers/misc/mei/hdcp/mei_hdcp.c +55 -0
@@ -686,6 +686,61 @@ int mei_enable_hdcp_authentication(struct mei_cl_device *cldev, }EXPORT_SYMBOL (mei_enable_hdcp_authentication); +/** +* me_close_hdcp_session: +* Function to close the Wired HDCP Tx session of ME FW. +* This also disables the authenticated state of the port. +* +* @data : Intel HW specific Data +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_close_hdcp_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +struct wired_cmd_close_session_in session_close_in = { {0 } }; +struct wired_cmd_close_session_out session_close_out = { {0 } }; +struct device *dev; +ssize_t byte; + +if (!data) +return -EINVAL ; + + dev = &cldev->dev; + + 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.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 = data->port; + + + byte =mei_cldev_send (cldev, (u8 *)&session_close_in, +sizeof (session_close_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&session_close_out, +sizeof (session_close_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (session_close_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"Session Close Failed. status: 0x%X\n" , + session_close_out.header.status); +return -1 ; + } +return 0 ; +} +EXPORT_SYMBOL (mei_close_hdcp_session); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)
include/linux/mei_hdcp.h +7 -0
@@ -138,6 +138,8 @@ int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, struct hdcp2_rep_stream_ready *stream_ready);int mei_enable_hdcp_authentication (struct mei_cl_device *cldev,struct mei_hdcp_data *data); +int mei_close_hdcp_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data);#else static int mei_cldev_register_notify (struct notifier_block *nb) {
@@ -216,5 +218,10 @@ static inline int mei_enable_hdcp_authentication(struct mei_cl_device *cldev, {return -ENODEV ; } +static inline int mei_close_hdcp_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +return -ENODEV ; +}#endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RE: [Intel-gfx] [PATCH v3 18/40] misc/mei/hdcp: Closing wired HDCP2.2 Tx Session
Quoted 39 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 18/40] misc/mei/hdcp: Closing wired HDCP2.2 Tx SessionRequest the ME to terminate the HDCP2.2 session for a port.
On Success, ME FW will mark the intel port as Deauthenticated and terminate the wired HDCP2.2 Tx session started due to the cmd
WIRED_INITIATE_HDCP2_SESSION.v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 55
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 7 +++++2 files changed, 62 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +0
-0
drivers/misc/mei/hdcp/mei_hdcp.c int mei_enable_hdcp_authentication(struct · line 689
Quoted 4 lines
drivers/misc/mei/hdcp/mei_hdcp.c +2
-0@@ -686,6 +686,61 @@ int mei_enable_hdcp_authentication(struct mei_cl_device *cldev, } EXPORT_SYMBOL(mei_enable_hdcp_authentication); +/** +* me_close_hdcp_session:
Typo in me. Should be mei.
Quoted 82 lines
drivers/misc/mei/hdcp/mei_hdcp.c +53
-0+* Function to close the Wired HDCP Tx session of ME FW. +* This also disables the authenticated state of the port. +* +* @data : Intel HW specific Data +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_close_hdcp_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +struct wired_cmd_close_session_in session_close_in = { {0 } }; +struct wired_cmd_close_session_out session_close_out = { {0 } }; +struct device *dev; +ssize_t byte; + +if (!data) +return -EINVAL ; + + dev = &cldev->dev; + + 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.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 = data->port; + + + byte =mei_cldev_send (cldev, (u8 *)&session_close_in, +sizeof (session_close_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&session_close_out, +sizeof (session_close_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (session_close_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"Session Close Failed. status: 0x%X\n" , + session_close_out.header.status); +return -1 ; + } +return 0 ; +} +EXPORT_SYMBOL (mei_close_hdcp_session); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
2366d0741abe..55cbde890571100644include/linux/mei_hdcp.h +2
-0@@ -138,6 +138,8 @@ int mei_verify_mprime(struct mei_cl_device *cldev,struct mei_hdcp_data *data, struct hdcp2_rep_stream_ready *stream_ready); intmei_enable_hdcp_authentication (struct mei_cl_device *cldev,struct mei_hdcp_data *data); +int mei_close_hdcp_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -216,5 +218,10 @@ static inline int mei_enable_hdcp_authentication(structmei_cl_device *cldev, { return -ENODEV; }include/linux/mei_hdcp.h +5
-0+static inline int mei_close_hdcp_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 18/40] misc/mei/hdcp: Closing wired HDCP2.2 Tx Session
Quoted 40 lines · Uma
Quoted 40 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 18/40] misc/mei/hdcp: Closing wired HDCP2.2 Tx SessionRequest the ME to terminate the HDCP2.2 session for a port.
On Success, ME FW will mark the intel port as Deauthenticated and terminate the wired HDCP2.2 Tx session started due to the cmd
WIRED_INITIATE_HDCP2_SESSION.v2:
Rebased.
v3:
cldev is passed as first parameter [Tomas]
Redundant comments and cast are removed [Tomas]Signed-off-by Ramalingam C <[email protected]>---
drivers/misc/mei/hdcp/mei_hdcp.c| 55
++++++++++++++++++++++++++++++++++++++++include/linux/mei_hdcp.h| 7 +++++2 files changed, 62 insertions(+)drivers/misc/mei/hdcp/mei_hdcp.c +0
-0@@ -686,6 +686,61 @@ int mei_enable_hdcp_authentication(struct mei_cl_device *cldev, } EXPORT_SYMBOL(mei_enable_hdcp_authentication);
Quoted 3 lines
drivers/misc/mei/hdcp/mei_hdcp.c int mei_enable_hdcp_authentication(struct mei_cl_device *cldev, · line 690
Quoted 2 lines
drivers/misc/mei/hdcp/mei_hdcp.c +2
-0+/** +* me_close_hdcp_session: Typo in me. Should be mei.
Thank you for catching it.
--Ram
Quoted 83 lines
Quoted 83 lines
drivers/misc/mei/hdcp/mei_hdcp.c +53
-0+* Function to close the Wired HDCP Tx session of ME FW. +* This also disables the authenticated state of the port. +* +* @data : Intel HW specific Data +* +* Returns 0 on Success, <0 on Failure +*/ +int mei_close_hdcp_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +struct wired_cmd_close_session_in session_close_in = { {0 } }; +struct wired_cmd_close_session_out session_close_out = { {0 } }; +struct device *dev; +ssize_t byte; + +if (!data) +return -EINVAL ; + + dev = &cldev->dev; + + 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.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 = data->port; + + + byte =mei_cldev_send (cldev, (u8 *)&session_close_in, +sizeof (session_close_in)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_send failed. %d\n" , (int )byte); +return byte; + } + + byte =mei_cldev_recv (cldev, (u8 *)&session_close_out, +sizeof (session_close_out)); +if (byte <0 ) { +dev_dbg (dev,"mei_cldev_recv failed. %d\n" , (int )byte); +return byte; + } + +if (session_close_out.header.status !=ME_HDCP_STATUS_SUCCESS ) { +dev_dbg (dev,"Session Close Failed. status: 0x%X\n" , + session_close_out.header.status); +return -1 ; + } +return 0 ; +} +EXPORT_SYMBOL (mei_close_hdcp_session); +void mei_cldev_state_notify_clients (struct mei_cl_device *cldev,bool enabled) {if (enabled)include/linux/mei_hdcp.h index renamed from include/linux/mei_hdcp.h +0
-0
2366d0741abe..55cbde890571100644include/linux/mei_hdcp.h +2
-0@@ -138,6 +138,8 @@ int mei_verify_mprime(struct mei_cl_device *cldev,struct mei_hdcp_data *data, struct hdcp2_rep_stream_ready *stream_ready); intmei_enable_hdcp_authentication (struct mei_cl_device *cldev,struct mei_hdcp_data *data); +int mei_close_hdcp_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data);#else static int
mei_cldev_register_notify(struct notifier_block *nb){ @@ -216,5 +218,10 @@ static inline int mei_enable_hdcp_authentication(structmei_cl_device *cldev, { return -ENODEV; }include/linux/mei_hdcp.h +5
-0+static inline int mei_close_hdcp_session (struct mei_cl_device *cldev, +struct mei_hdcp_data *data) +{ +return -ENODEV ; +}#endif /* defined (
CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 19/40 drm/i915: wrapping all hdcp var into intel_hdcp
In reply to Ramalingam CConsidering the upcoming significant no HDCP2.2 variables, it will be clean to have separate struct fo HDCP.
New structure called intel_hdcp is introduced.
v2:
struct hdcp statically allocated. [Sean Paul]
enable and disable function parameters are retained.[Sean Paul]
v3:
No Changes.
--- drivers/gpu/drm/i915/intel_display.c | 7 +-- drivers/gpu/drm/i915/intel_drv.h | 14 ++++-- drivers/gpu/drm/i915/intel_hdcp.c | 94 ++++++++++++++++++++---------------- 3 files changed, 66 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/intel_display.c +4 -3
@@ -15395,9 +15395,10 @@ static void intel_hpd_poll_fini(struct drm_device *dev)for_each_intel_connector_iter (connector, &conn_iter) {if (connector->modeset_retry_work.func)cancel_work_sync (&connector->modeset_retry_work); -if (connector->hdcp_shim) { -cancel_delayed_work_sync (&connector->hdcp_check_work); -cancel_work_sync (&connector->hdcp_prop_work); +if (connector->hdcp.hdcp_shim) { +cancel_delayed_work_sync ( + &connector->hdcp.hdcp_check_work); +cancel_work_sync (&connector->hdcp.hdcp_prop_work); } }drm_connector_list_iter_end (&conn_iter);
drivers/gpu/drm/i915/intel_drv.h +9 -5
@@ -377,6 +377,14 @@ struct intel_hdcp_shim { bool *hdcp_capable); }; +struct intel_hdcp { +const struct intel_hdcp_shim *hdcp_shim; +struct mutex hdcp_mutex; +uint64_t hdcp_value;/* protected by hdcp_mutex */ +struct delayed_work hdcp_check_work; +struct work_struct hdcp_prop_work; +}; +struct intel_connector {struct drm_connector base;/*
@@ -409,11 +417,7 @@ struct intel_connector {/* Work struct to schedule a uevent on link train failure */ struct work_struct modeset_retry_work; -const struct intel_hdcp_shim *hdcp_shim; -struct mutex hdcp_mutex; -uint64_t hdcp_value;/* protected by hdcp_mutex */ -struct delayed_work hdcp_check_work; -struct work_struct hdcp_prop_work; +struct intel_hdcp hdcp; };struct intel_digital_connector_state {
drivers/gpu/drm/i915/intel_hdcp.c +53 -41
226 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
RE: [PATCH v3 19/40] drm/i915: wrapping all hdcp var into intel_hdcp
Quoted 13 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 19/40] drm/i915: wrapping all hdcp var intointel_hdcp
Quoted 1 line
Considering the upcoming significant no HDCP2.2 variables, it will be clean to
Rephrase this sentence.
Quoted 1 line
have separate struct fo HDCP.
Typo here.
Quoted 328 lines
New structure called
intel_hdcpis introduced.v2:
struct hdcp statically allocated. [Sean Paul]
enable and disable function parameters are retained.[Sean Paul]
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_display.c | 7 +-- drivers/gpu/drm/i915/intel_drv.h | 14 ++++-- drivers/gpu/drm/i915/intel_hdcp.c | 94 ++++++++++++++++++++---------------- 3 files changed, 66 insertions(+), 49 deletions(-)drivers/gpu/drm/i915/intel_display.c +4
-3@@ -15395,9 +15395,10 @@ static void intel_hpd_poll_fini(struct drm_device *dev)for_each_intel_connector_iter (connector, &conn_iter) {if (connector->modeset_retry_work.func)cancel_work_sync (&connector->modeset_retry_work); -if (connector->hdcp_shim) { -cancel_delayed_work_sync (&connector- >hdcp_check_work); -cancel_work_sync (&connector->hdcp_prop_work); +if (connector->hdcp.hdcp_shim) { +cancel_delayed_work_sync ( + &connector->hdcp.hdcp_check_work); +cancel_work_sync (&connector->hdcp.hdcp_prop_work); }} drm_connector_list_iter_end(&conn_iter);drivers/gpu/drm/i915/intel_drv.h +9
-5@@ -377,6 +377,14 @@ struct intel_hdcp_shim { bool *hdcp_capable); }; +struct intel_hdcp { +const struct intel_hdcp_shim *hdcp_shim; +struct mutex hdcp_mutex; +uint64_t hdcp_value;/* protected by hdcp_mutex */ +struct delayed_work hdcp_check_work; +struct work_struct hdcp_prop_work; +}; +struct intel_connector {struct drm_connector base;/* @@ -409,11 +417,7 @@ struct intel_connector {/* Work struct to schedule a uevent on link train failure */ struct work_struct modeset_retry_work; -const struct intel_hdcp_shim *hdcp_shim; -struct mutex hdcp_mutex; -uint64_t hdcp_value;/* protected by hdcp_mutex */ -struct delayed_work hdcp_check_work; -struct work_struct hdcp_prop_work; +struct intel_hdcp hdcp; };struct intel_digital_connector_state {drivers/gpu/drm/i915/intel_hdcp.c +1
-0@@ -547,6 +547,7 @@ struct intel_digital_port *conn_to_dig_port(struct intel_connector *connector)static int _intel_hdcp_disable (struct intel_connector *connector) { +struct intel_hdcp *hdcp = &connector->hdcp;struct drm_i915_private *dev_priv = connector->base.dev->dev_private;struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); enum port port = intel_dig_port->base.port; @@ -562,7 +563,7 @@static int
_intel_hdcp_disable(struct intel_connector *connector)return -ETIMEDOUT; }drivers/gpu/drm/i915/intel_hdcp.c +1
-1- ret = connector->hdcp_shim->toggle_signalling (intel_dig_port, false); + ret = hdcp->hdcp_shim->toggle_signalling (intel_dig_port, false);if (ret) { DRM_ERROR("Failed to disable HDCP signalling\n"); return ret;drivers/gpu/drm/i915/intel_hdcp.c +17
-10@@ -574,6 +575,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector)static int _intel_hdcp_enable (struct intel_connector *connector) { +struct intel_hdcp *hdcp = &connector->hdcp;struct drm_i915_private *dev_priv = connector->base.dev->dev_private;int i, ret, tries =3 ;@@ -599,7 +601,7 @@ static int _intel_hdcp_enable(struct intel_connector *connector)/* Incase of authentication failures, HDCP spec expects reauth. */ for (i =0 ; i < tries; i++) { ret =intel_hdcp_auth (conn_to_dig_port (connector), - connector->hdcp_shim); + hdcp->hdcp_shim);if (!ret)return 0 ;@@ -615,36 +617,42 @@ static int _intel_hdcp_enable(struct intel_connector *connector)static void intel_hdcp_check_work (struct work_struct *work) { -struct intel_connector *connector =container_of (to_delayed_work (work), + struct intel_hdcp *hdcp = container_of(to_delayed_work(work), + struct intel_hdcp, + hdcp_check_work); +struct intel_connector *connector =container_of (hdcp, struct intel_connector, - hdcp_check_work); + hdcp); +if (!intel_hdcp_check_link (connector)) -schedule_delayed_work (&connector->hdcp_check_work, +schedule_delayed_work (&hdcp->hdcp_check_work,DRM_HDCP_CHECK_PERIOD_MS ); }static void intel_hdcp_prop_work (struct work_struct *work) { -struct intel_connector *connector =container_of (work, + struct intel_hdcp *hdcp = container_of(work, struct intel_hdcp, + hdcp_prop_work); +struct intel_connector *connector =container_of (hdcp, struct intel_connector, - hdcp_prop_work); + hdcp);struct drm_device *dev = connector->base.dev;struct drm_connector_state *state;drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); -mutex_lock (&connector->hdcp_mutex); +mutex_lock (&hdcp->hdcp_mutex);/* * This worker is only used to flip between ENABLED/DESIRED. Either of * those to UNDESIRED is handled by core. If hdcp_value == UNDESIRED, * we're running just after hdcp has been disabled, so just exit */ -if (connector->hdcp_value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) { +if (hdcp->hdcp_value !=DRM_MODE_CONTENT_PROTECTION_UNDESIRED ) { state = connector->base.state; - state->content_protection = connector->hdcp_value; + state->content_protection = hdcp->hdcp_value; } -mutex_unlock (&connector->hdcp_mutex); +mutex_unlock (&hdcp->hdcp_mutex);drm_modeset_unlock (&dev->mode_config.connection_mutex);}
drivers/gpu/drm/i915/intel_hdcp.c +11
-9@@ -658,6 +666,7 @@ bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port) int intel_hdcp_init(struct intel_connector *connector,const struct intel_hdcp_shim *hdcp_shim) { +struct intel_hdcp *hdcp = &connector->hdcp;int ret; ret = drm_connector_attach_content_protection_property(@@ -665,51 +674,53 @@ int intel_hdcp_init(struct intel_connector *connector,if (ret)return ret; - connector->hdcp_shim = hdcp_shim; -mutex_init (&connector->hdcp_mutex); -INIT_DELAYED_WORK (&connector->hdcp_check_work, intel_hdcp_check_work); -INIT_WORK (&connector->hdcp_prop_work, intel_hdcp_prop_work); + hdcp->hdcp_shim = hdcp_shim; +mutex_init (&hdcp->hdcp_mutex); +INIT_DELAYED_WORK (&hdcp->hdcp_check_work, intel_hdcp_check_work); +INIT_WORK (&hdcp->hdcp_prop_work, intel_hdcp_prop_work);return 0 ; }int intel_hdcp_enable (struct intel_connector *connector) { +struct intel_hdcp *hdcp = &connector->hdcp;int ret; -if (!connector->hdcp_shim) +if (!hdcp->hdcp_shim)return -ENOENT ; -mutex_lock (&connector->hdcp_mutex); +mutex_lock (&hdcp->hdcp_mutex); ret =_intel_hdcp_enable (connector);if (ret) goto out; - connector->hdcp_value =DRM_MODE_CONTENT_PROTECTION_ENABLED ; -schedule_work (&connector->hdcp_prop_work); -schedule_delayed_work (&connector->hdcp_check_work, + hdcp->hdcp_value =DRM_MODE_CONTENT_PROTECTION_ENABLED ; +schedule_work (&hdcp->hdcp_prop_work); +schedule_delayed_work (&hdcp->hdcp_check_work,DRM_HDCP_CHECK_PERIOD_MS );out:
drivers/gpu/drm/i915/intel_hdcp.c +1
-1-mutex_unlock (&connector->hdcp_mutex); +mutex_unlock (&hdcp->hdcp_mutex);return ret; }int
intel_hdcp_disable(struct intel_connector *connector){drivers/gpu/drm/i915/intel_hdcp.c +1
-0+struct intel_hdcp *hdcp = &connector->hdcp;int ret = 0;drivers/gpu/drm/i915/intel_hdcp.c +1
-1-if (!connector->hdcp_shim) +if (!hdcp->hdcp_shim)return -ENOENT;drivers/gpu/drm/i915/intel_hdcp.c +1
-2-mutex_lock (&connector->hdcp_mutex); +mutex_lock (&hdcp->hdcp_mutex); - if (connector->hdcp_value !=
DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {drivers/gpu/drm/i915/intel_hdcp.c +0
-1- connector->hdcp_value =
DRM_MODE_CONTENT_PROTECTION_UNDESIRED;drivers/gpu/drm/i915/intel_hdcp.c +1
-0+ if (hdcp->hdcp_value !=
DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {drivers/gpu/drm/i915/intel_hdcp.c +1
-0+ hdcp->hdcp_value =DRM_MODE_CONTENT_PROTECTION_UNDESIRED; ret = _intel_hdcp_disable(connector); }drivers/gpu/drm/i915/intel_hdcp.c +2
-2-mutex_unlock (&connector->hdcp_mutex); -cancel_delayed_work_sync (&connector->hdcp_check_work); +mutex_unlock (&hdcp->hdcp_mutex); +cancel_delayed_work_sync (&hdcp->hdcp_check_work);return ret; }drivers/gpu/drm/i915/intel_hdcp.c +4
-3@@ -749,17 +760,18 @@ void intel_hdcp_atomic_check(struct drm_connector *connector,/* Implements Part 3 of the HDCP authorization procedure */ int intel_hdcp_check_link (struct intel_connector *connector) { +struct intel_hdcp *hdcp = &connector->hdcp;struct drm_i915_private *dev_priv = connector->base.dev->dev_private;struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector);enum port port = intel_dig_port->base.port;int ret =0 ; -if (!connector->hdcp_shim) +if (!hdcp->hdcp_shim)return -ENOENT ; -mutex_lock (&connector->hdcp_mutex); +mutex_lock (&hdcp->hdcp_mutex); -if (connector->hdcp_value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED) +if (hdcp->hdcp_value ==DRM_MODE_CONTENT_PROTECTION_UNDESIRED ) goto out;if (!(I915_READ(PORT_HDCP_STATUS(port)) & HDCP_STATUS_ENC)) {drivers/gpu/drm/i915/intel_hdcp.c +6
-6@@ -767,17 +779,17 @@ int intel_hdcp_check_link(struct intel_connector *connector) connector->base.name, connector->base.base.id, I915_READ(PORT_HDCP_STATUS(port))); ret = -ENXIO ; - connector->hdcp_value =DRM_MODE_CONTENT_PROTECTION_DESIRED ; -schedule_work (&connector->hdcp_prop_work); + hdcp->hdcp_value =DRM_MODE_CONTENT_PROTECTION_DESIRED ; +schedule_work (&hdcp->hdcp_prop_work); goto out; } -if (connector->hdcp_shim->check_link (intel_dig_port)) { -if (connector->hdcp_value != +if (hdcp->hdcp_shim->check_link (intel_dig_port)) { +if (hdcp->hdcp_value !=DRM_MODE_CONTENT_PROTECTION_UNDESIRED ) { - connector->hdcp_value = + hdcp->hdcp_value =DRM_MODE_CONTENT_PROTECTION_ENABLED ; -schedule_work (&connector->hdcp_prop_work); +schedule_work (&hdcp->hdcp_prop_work);} goto out; }drivers/gpu/drm/i915/intel_hdcp.c +4
-4@@ -788,20 +800,20 @@ int intel_hdcp_check_link(struct intel_connector *connector) ret =_intel_hdcp_disable (connector);if (ret) {DRM_ERROR ("Failed to disable hdcp (%d)\n" , ret); - connector->hdcp_value =DRM_MODE_CONTENT_PROTECTION_DESIRED ; -schedule_work (&connector->hdcp_prop_work); + hdcp->hdcp_value =DRM_MODE_CONTENT_PROTECTION_DESIRED ; +schedule_work (&hdcp->hdcp_prop_work); goto out; } ret =_intel_hdcp_enable (connector);if (ret) {DRM_ERROR ("Failed to enable hdcp (%d)\n" , ret); - connector->hdcp_value =DRM_MODE_CONTENT_PROTECTION_DESIRED ; -schedule_work (&connector->hdcp_prop_work); + hdcp->hdcp_value =DRM_MODE_CONTENT_PROTECTION_DESIRED ; +schedule_work (&hdcp->hdcp_prop_work); goto out; }out:
drivers/gpu/drm/i915/intel_hdcp.c +1
-1-mutex_unlock (&connector->hdcp_mutex); +mutex_unlock (&hdcp->hdcp_mutex);return ret; }
Quoted 7 lines
--
2.7.4_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 20/40 drm/i915: Define HDCP2.2 related variables
In reply to Ramalingam CFor upcoming implementation of HDCP2.2 in I915, important variable required for HDCP2.2 are defined.
HDCP_shim is extended to support encoder specific HDCP2.2 flows.
v2:
1.4 shim is extended to support hdcp2.2. [Sean Paul] platform's/panel's hdcp ver capability is removed. [Sean Paul] mei references in i915_private are moved to later patches. [Chris Wilson]
v3:
mei_cl_device ref is moved into intel_hdcp
--- drivers/gpu/drm/i915/intel_drv.h | 61 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)
drivers/gpu/drm/i915/intel_drv.h +61 -0
@@ -29,6 +29,7 @@#include <linux/i2c.h> #include <linux/hdmi.h> #include <linux/sched/clock.h> +#include <linux/mei_hdcp.h> #include <drm/i915_drm.h> #include "i915_drv.h" #include <drm/drm_crtc.h>
@@ -375,6 +376,32 @@ struct intel_hdcp_shim {/* Detects panel's hdcp capability. This is optional for HDMI. */ int (*hdcp_capable)(struct intel_digital_port *intel_dig_port,bool *hdcp_capable); + +/* Write HDCP2.2 messages */ +int (*write_2_2_msg)(struct intel_digital_port *intel_dig_port, +void *buf,size_t size); + +/* Read HDCP2.2 messages */ +int (*read_2_2_msg)(struct intel_digital_port *intel_dig_port, +uint8_t msg_id,void *buf,size_t size); + +/* +* Implementation of DP HDCP2.2 Errata for the communication of stream +* type to Receivers. In DP HDCP2.2 Stream type is one of the input to +* the HDCP2.2 Chiper for En/De-Cryption. Not applicable for HDMI. +*/ +int (*config_stream_type)(struct intel_digital_port *intel_dig_port, +void *buf,size_t size); + +/* HDCP2.2 Link Integrity Check */ +int (*check_2_2_link)(struct intel_digital_port *intel_dig_port); + +/* Detects whether Panel is HDCP2.2 capable */ +int (*hdcp_2_2_capable)(struct intel_digital_port *intel_dig_port, +bool *capable); + +/* Detects the HDCP protocol(DP/HDMI) required on the port */ +enum hdcp_protocol (*hdcp_protocol)(void ); };struct intel_hdcp {
@@ -383,6 +410,40 @@ struct intel_hdcp {uint64_t hdcp_value;/* protected by hdcp_mutex */ struct delayed_work hdcp_check_work;struct work_struct hdcp_prop_work; + +/** HDCP2.2 related definitions **/ +bool hdcp2_supported; + +/* +* Content Stream Type defined by content owner. TYPE0(0x0) content can +* flow in the link protected by HDCP2.2 or HDCP1.4, where as TYPE1(0x1) +* content can flow only through a link protected by HDCP2.2. +*/ +u8 content_type; + +bool is_paired; +bool is_repeater; + +/* +* Count of ReceiverID_List received. Initialized to 0 at AKE_INIT. +* Incremented after processing the RepeaterAuth_Send_ReceiverID_List. +* When it rolls over re-auth has to be triggered. +*/ +uint32_t seq_num_v; + +/* +* Count of RepeaterAuth_Stream_Manage msg propagated. +* Initialized to 0 on AKE_INIT. Incremented after every successful +* transmission of RepeaterAuth_Stream_Manage message. When it rolls +* over re-Auth has to be triggered. +*/ +uint32_t seq_num_m; + +/* mei interface related information */ +struct mei_cl_device *cldev; +struct mei_hdcp_data mei_data; + +struct delayed_work hdcp2_check_work; };struct intel_connector {
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
kbuild test robot
build botRe: [PATCH v3 20/40] drm/i915: Define HDCP2.2 related variables
Thank you for the patch! Yet something to improve:
Hi Ramalingam,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20180403]
[cannot apply to v4.16]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ramalingam-C/drm-i915-Implement-HDCP2-2/20180404-031743 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-randconfig-x001-201813 (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
All errors (new ones prefixed by >>):
In file included from drivers/gpu//drm/i915/intel_drv.h:32:0,
from drivers/gpu//drm/i915/i915_trace.h:11,
from drivers/gpu//drm/i915/i915_drv.h:2919,
from drivers/gpu//drm/i915/i915_drv.c:49:
>> include/linux/mei_hdcp.h:148:12: error: 'mei_cldev_unregister_notify' defined but not used [-Werror=unused-function]
static int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
>> include/linux/mei_hdcp.h:144:12: error: 'mei_cldev_register_notify' defined but not used [-Werror=unused-function] static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
vim +/mei_cldev_unregister_notify +148 include/linux/mei_hdcp.h
3ce9e24eb Ramalingam C 2018-04-03 105
ca998fc38 Ramalingam C 2018-04-03 106 #ifdef CONFIG_INTEL_MEI_HDCP
ca998fc38 Ramalingam C 2018-04-03 107 int mei_cldev_register_notify(struct notifier_block *nb);
ca998fc38 Ramalingam C 2018-04-03 108 int mei_cldev_unregister_notify(struct notifier_block *nb);
5240fee41 Ramalingam C 2018-04-03 109 int mei_initiate_hdcp2_session(struct mei_cl_device *cldev,
5240fee41 Ramalingam C 2018-04-03 110 struct mei_hdcp_data *data,
5240fee41 Ramalingam C 2018-04-03 111 struct hdcp2_ake_init *ake_data);
e33886f53 Ramalingam C 2018-04-03 112 int
e33886f53 Ramalingam C 2018-04-03 113 mei_verify_receiver_cert_prepare_km(struct mei_cl_device *cldev,
e33886f53 Ramalingam C 2018-04-03 114 struct mei_hdcp_data *data,
e33886f53 Ramalingam C 2018-04-03 115 struct hdcp2_ake_send_cert *rx_cert,
e33886f53 Ramalingam C 2018-04-03 116 bool *km_stored,
e33886f53 Ramalingam C 2018-04-03 117 struct hdcp2_ake_no_stored_km *ek_pub_km,
e33886f53 Ramalingam C 2018-04-03 118 size_t *msg_sz);
a27b68fb5 Ramalingam C 2018-04-03 119 int mei_verify_hprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
a27b68fb5 Ramalingam C 2018-04-03 120 struct hdcp2_ake_send_hprime *rx_hprime);
dc86bde43 Ramalingam C 2018-04-03 121 int mei_store_pairing_info(struct mei_cl_device *cldev,
dc86bde43 Ramalingam C 2018-04-03 122 struct mei_hdcp_data *data,
dc86bde43 Ramalingam C 2018-04-03 123 struct hdcp2_ake_send_pairing_info *pairing_info);
67158470b Ramalingam C 2018-04-03 124 int mei_initiate_locality_check(struct mei_cl_device *cldev,
67158470b Ramalingam C 2018-04-03 125 struct mei_hdcp_data *data,
67158470b Ramalingam C 2018-04-03 126 struct hdcp2_lc_init *lc_init_data);
b10099c9a Ramalingam C 2018-04-03 127 int mei_verify_lprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
b10099c9a Ramalingam C 2018-04-03 128 struct hdcp2_lc_send_lprime *rx_lprime);
931c35709 Ramalingam C 2018-04-03 129 int mei_get_session_key(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
931c35709 Ramalingam C 2018-04-03 130 struct hdcp2_ske_send_eks *ske_data);
654828e8b Ramalingam C 2018-04-03 131 int
654828e8b Ramalingam C 2018-04-03 132 mei_repeater_check_flow_prepare_ack(struct mei_cl_device *cldev,
654828e8b Ramalingam C 2018-04-03 133 struct mei_hdcp_data *data,
654828e8b Ramalingam C 2018-04-03 134 struct hdcp2_rep_send_receiverid_list
654828e8b Ramalingam C 2018-04-03 135 *rep_topology,
654828e8b Ramalingam C 2018-04-03 136 struct hdcp2_rep_send_ack *rep_send_ack);
315c37225 Ramalingam C 2018-04-03 137 int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data,
315c37225 Ramalingam C 2018-04-03 138 struct hdcp2_rep_stream_ready *stream_ready);
702a0ad13 Ramalingam C 2018-04-03 139 int mei_enable_hdcp_authentication(struct mei_cl_device *cldev,
702a0ad13 Ramalingam C 2018-04-03 140 struct mei_hdcp_data *data);
015031e8d Ramalingam C 2018-04-03 141 int mei_close_hdcp_session(struct mei_cl_device *cldev,
015031e8d Ramalingam C 2018-04-03 142 struct mei_hdcp_data *data);
ca998fc38 Ramalingam C 2018-04-03 143 #else
ca998fc38 Ramalingam C 2018-04-03 @144 static int mei_cldev_register_notify(struct notifier_block *nb)
ca998fc38 Ramalingam C 2018-04-03 145 {
ca998fc38 Ramalingam C 2018-04-03 146 return -ENODEV;
ca998fc38 Ramalingam C 2018-04-03 147 }
ca998fc38 Ramalingam C 2018-04-03 @148 static int mei_cldev_unregister_notify(struct notifier_block *nb):::::: The code at line 148 was first introduced by commit
:::::: ca998fc3888ec55e0039c23b61cbe2057cc5d7a9 misc/mei/hdcp: Notifier chain for mei cldev state change
:::::: TO: Ramalingam C <[email protected]>
:::::: CC: 0day robot <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 20/40] drm/i915: Define HDCP2.2 related variables
In reply to Ramalingam CQuoted 78 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 20/40] drm/i915: Define HDCP2.2 related variablesFor upcoming implementation of HDCP2.2 in I915, important variable required for HDCP2.2 are defined.
HDCP_shimis extended to support encoder specific HDCP2.2 flows.v2:
1.4 shim is extended to support hdcp2.2. [Sean Paul] platform's/panel's hdcp ver capability is removed. [Sean Paul] mei references ini915_privateare moved to later patches. [Chris Wilson]
v3:
mei_cl_deviceref is moved intointel_hdcpSigned-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_drv.h| 61
++++++++++++++++++++++++++++++++++++++++1 file changed, 61 insertions(+)drivers/gpu/drm/i915/intel_drv.h +12
-0@@ -29,6 +29,7 @@#include <linux/i2c.h> #include <linux/hdmi.h> #include <linux/sched/clock.h> +#include <linux/mei_hdcp.h> #include <drm/i915_drm.h> #include "i915_drv.h" #include <drm/drm_crtc.h> @@ -375,6 +376,32 @@ struct intel_hdcp_shim {/* Detects panel's hdcp capability. This is optional for HDMI. */ int (*hdcp_capable)(struct intel_digital_port *intel_dig_port,bool *hdcp_capable); + +/* Write HDCP2.2 messages */ +int (*write_2_2_msg)(struct intel_digital_port *intel_dig_port, +void *buf,size_t size); + +/* Read HDCP2.2 messages */ +int (*read_2_2_msg)(struct intel_digital_port *intel_dig_port, +uint8_t msg_id,void *buf,size_t size); + +/* +* Implementation of DP HDCP2.2 Errata for the communication of stream
drivers/gpu/drm/i915/intel_drv.h +15
-0+* type to Receivers. In DP HDCP2.2 Stream type is one of the input to +* the HDCP2.2 Chiper for En/De-Cryption. Not applicable for HDMI. +*/ +int (*config_stream_type)(struct intel_digital_port *intel_dig_port, +void *buf,size_t size); + +/* HDCP2.2 Link Integrity Check */ +int (*check_2_2_link)(struct intel_digital_port *intel_dig_port); + +/* Detects whether Panel is HDCP2.2 capable */ +int (*hdcp_2_2_capable)(struct intel_digital_port *intel_dig_port, +bool *capable); + +/* Detects the HDCP protocol(DP/HDMI) required on the port */ +enum hdcp_protocol (*hdcp_protocol)(void );};
struct
intel_hdcp{
drivers/gpu/drm/i915/intel_drv.h struct intel_hdcp { · line 414
Quoted 5 lines
drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -383,6 +410,40 @@ struct intel_hdcp {uint64_t hdcp_value;/* protected by hdcp_mutex */ struct delayed_work hdcp_check_work;struct work_struct hdcp_prop_work; + +/** HDCP2.2 related definitions **/
Drop extra *.
Quoted 36 lines
drivers/gpu/drm/i915/intel_drv.h +4
-0+bool hdcp2_supported; + +/* +* Content Stream Type defined by content owner. TYPE0(0x0) content can
drivers/gpu/drm/i915/intel_drv.h +1
-0+* flow in the link protected by HDCP2.2 or HDCP1.4, where as TYPE1(0x1)
drivers/gpu/drm/i915/intel_drv.h +27
-0+* content can flow only through a link protected by HDCP2.2. +*/ +u8 content_type; + +bool is_paired; +bool is_repeater; + +/* +* Count of ReceiverID_List received. Initialized to 0 at AKE_INIT. +* Incremented after processing the RepeaterAuth_Send_ReceiverID_List. +* When it rolls over re-auth has to be triggered. +*/ +uint32_t seq_num_v; + +/* +* Count of RepeaterAuth_Stream_Manage msg propagated. +* Initialized to 0 on AKE_INIT. Incremented after every successful +* transmission of RepeaterAuth_Stream_Manage message. When it rolls +* over re-Auth has to be triggered. +*/ +uint32_t seq_num_m; + +/* mei interface related information */ +struct mei_cl_device *cldev; +struct mei_hdcp_data mei_data; + +struct delayed_work hdcp2_check_work;};
Quoted 8 lines
struct
intel_connector{
--
2.7.4_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 21/40 drm/i915: Define Intel HDCP2.2 registers
In reply to Ramalingam CIntel HDCP2.2 registers are defined with addr offsets and bit details.
v2:
Replaced the arith calc with _PICK [Sean Paul]
v3:
No changes.
--- drivers/gpu/drm/i915/i915_reg.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +32 -0
@@ -8649,6 +8649,38 @@ enum skl_power_gate {#define HDCP_STATUS_CIPHER BIT(16)#define HDCP_STATUS_FRAME_CNT (x) ((x >> 8) & 0xff) +/* HDCP2.2 Registers */ +#define _PORTA_HDCP2_BASE 0x66800 +#define _PORTB_HDCP2_BASE 0x66500 +#define _PORTC_HDCP2_BASE 0x66600 +#define _PORTD_HDCP2_BASE 0x66700 +#define _PORTE_HDCP2_BASE 0x66A00 +#define _PORTF_HDCP2_BASE 0x66900 +#define _PORT_HDCP2_BASE (port, x) _MMIO(_PICK(port, \ + _PORTA_HDCP2_BASE, \ + _PORTB_HDCP2_BASE, \ + _PORTC_HDCP2_BASE, \ + _PORTD_HDCP2_BASE, \ + _PORTE_HDCP2_BASE, \ + _PORTF_HDCP2_BASE) + x) + +#define HDCP2_AUTH_DDI (port) _PORT_HDCP2_BASE(port, 0x98) +#define AUTH_LINK_AUTHENTICATED BIT(31) +#define AUTH_LINK_TYPE BIT(30) +#define AUTH_FORCE_CLR_INPUTCTR BIT(19) +#define AUTH_CLR_KEYS BIT(18) + +#define HDCP2_CTR_DDI (port) _PORT_HDCP2_BASE(port, 0xB0) +#define CTL_LINK_ENCRYPTION_REQ BIT(31) + +#define HDCP2_STATUS_DDI (port) _PORT_HDCP2_BASE(port, 0xB4) +#define STREAM_ENCRYPTION_STATUS_A BIT(31) +#define STREAM_ENCRYPTION_STATUS_B BIT(30) +#define STREAM_ENCRYPTION_STATUS_C BIT(29) +#define LINK_TYPE_STATUS BIT(22) +#define LINK_AUTH_STATUS BIT(21) +#define LINK_ENCRYPTION_STATUS BIT(20) +/* Per-pipe DDI Function Control */ #define _TRANS_DDI_FUNC_CTL_A 0x60400#define _TRANS_DDI_FUNC_CTL_B 0x61400
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 21/40] drm/i915: Define Intel HDCP2.2 registers
Quoted 46 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 21/40] drm/i915: Define Intel HDCP2.2 registersIntel HDCP2.2 registers are defined with addr offsets and bit details.
v2:
Replaced the arith calc with_PICK[Sean Paul]
v3:
No changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/i915_reg.h| 32 ++++++++++++++++++++++++++++++++1 file changed, 32 insertions(+)drivers/gpu/drm/i915/i915_reg.h +13
-0@@ -8649,6 +8649,38 @@ enum skl_power_gate {#define HDCP_STATUS_CIPHER BIT(16)#define HDCP_STATUS_FRAME_CNT (x) ((x >> 8) & 0xff) +/* HDCP2.2 Registers */ +#define _PORTA_HDCP2_BASE 0x66800 +#define _PORTB_HDCP2_BASE 0x66500 +#define _PORTC_HDCP2_BASE 0x66600 +#define _PORTD_HDCP2_BASE 0x66700 +#define _PORTE_HDCP2_BASE 0x66A00 +#define _PORTF_HDCP2_BASE 0x66900 +#define _PORT_HDCP2_BASE (port, x) _MMIO(_PICK(port, \ + _PORTA_HDCP2_BASE, \ + _PORTB_HDCP2_BASE, \ + _PORTC_HDCP2_BASE, \ + _PORTD_HDCP2_BASE, \ + _PORTE_HDCP2_BASE, \
drivers/gpu/drm/i915/i915_reg.h enum skl_power_gate { · line 8674
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +9
-0+ _PORTF_HDCP2_BASE) + x) + +#define HDCP2_AUTH_DDI (port) _PORT_HDCP2_BASE(port, 0x98) +#define AUTH_LINK_AUTHENTICATED BIT(31) +#define AUTH_LINK_TYPE BIT(30) +#define AUTH_FORCE_CLR_INPUTCTR BIT(19) +#define AUTH_CLR_KEYS BIT(18) + +#define HDCP2_CTR_DDI (port) _PORT_HDCP2_BASE(port, 0xB0)
Rename it to HDCP2_CTL_DDI to match with spec and avoid any ambiguity.
Quoted 17 lines
drivers/gpu/drm/i915/i915_reg.h +10
-0+#define CTL_LINK_ENCRYPTION_REQ BIT(31) + +#define HDCP2_STATUS_DDI (port) _PORT_HDCP2_BASE(port, 0xB4) +#define STREAM_ENCRYPTION_STATUS_A BIT(31) +#define STREAM_ENCRYPTION_STATUS_B BIT(30) +#define STREAM_ENCRYPTION_STATUS_C BIT(29) +#define LINK_TYPE_STATUS BIT(22) +#define LINK_AUTH_STATUS BIT(21) +#define LINK_ENCRYPTION_STATUS BIT(20) +/* Per-pipe DDI Function Control */ #define
_TRANS_DDI_FUNC_CTL_A0x60400
#define_TRANS_DDI_FUNC_CTL_B0x61400
--
2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 21/40] drm/i915: Define Intel HDCP2.2 registers
Quoted 48 lines · Uma
Quoted 48 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 21/40] drm/i915: Define Intel HDCP2.2 registersIntel HDCP2.2 registers are defined with addr offsets and bit details.
v2:
Replaced the arith calc with_PICK[Sean Paul]
v3:
No changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/i915_reg.h| 32 ++++++++++++++++++++++++++++++++1 file changed, 32 insertions(+)drivers/gpu/drm/i915/i915_reg.h +16
-0@@ -8649,6 +8649,38 @@ enum skl_power_gate {#define HDCP_STATUS_CIPHER BIT(16)#define HDCP_STATUS_FRAME_CNT (x) ((x >> 8) & 0xff) +/* HDCP2.2 Registers */ +#define _PORTA_HDCP2_BASE 0x66800 +#define _PORTB_HDCP2_BASE 0x66500 +#define _PORTC_HDCP2_BASE 0x66600 +#define _PORTD_HDCP2_BASE 0x66700 +#define _PORTE_HDCP2_BASE 0x66A00 +#define _PORTF_HDCP2_BASE 0x66900 +#define _PORT_HDCP2_BASE (port, x) _MMIO(_PICK(port, \ + _PORTA_HDCP2_BASE, \ + _PORTB_HDCP2_BASE, \ + _PORTC_HDCP2_BASE, \ + _PORTD_HDCP2_BASE, \ + _PORTE_HDCP2_BASE, \ + _PORTF_HDCP2_BASE) + x) + +#define HDCP2_AUTH_DDI (port) _PORT_HDCP2_BASE(port,
Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h enum skl_power_gate { · line 8673
Quoted 7 lines
drivers/gpu/drm/i915/i915_reg.h +6
-00x98) +#define AUTH_LINK_AUTHENTICATED BIT(31) +#define AUTH_LINK_TYPE BIT(30) +#define AUTH_FORCE_CLR_INPUTCTR BIT(19) +#define AUTH_CLR_KEYS BIT(18) + +#define HDCP2_CTR_DDI (port) _PORT_HDCP2_BASE(port, 0xB0)Rename it to
HDCP2_CTL_DDIto match with spec and avoid any ambiguity.
I will rename it as CTL.
--Ram
Quoted 18 lines
Quoted 18 lines
drivers/gpu/drm/i915/i915_reg.h +10
-0+#define CTL_LINK_ENCRYPTION_REQ BIT(31) + +#define HDCP2_STATUS_DDI (port) _PORT_HDCP2_BASE(port, 0xB4) +#define STREAM_ENCRYPTION_STATUS_A BIT(31) +#define STREAM_ENCRYPTION_STATUS_B BIT(30) +#define STREAM_ENCRYPTION_STATUS_C BIT(29) +#define LINK_TYPE_STATUS BIT(22) +#define LINK_AUTH_STATUS BIT(21) +#define LINK_ENCRYPTION_STATUS BIT(20) +/* Per-pipe DDI Function Control */ #define
_TRANS_DDI_FUNC_CTL_A0x60400
#define_TRANS_DDI_FUNC_CTL_B0x61400
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 22/40 drm/i915: Wrappers for mei HDCP2.2 services
In reply to Ramalingam CAdds the wrapper for all mei hdcp2.2 service functions.
v2:
Rebased.
v3:
cldev is moved from mei_hdcp_data to hdcp.
--- drivers/gpu/drm/i915/intel_hdcp.c | 194 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+)
drivers/gpu/drm/i915/intel_hdcp.c +194 -0
@@ -10,10 +10,13 @@#include <drm/drm_hdcp.h> #include <linux/i2c.h> #include <linux/random.h> +#include <linux/mei_hdcp.h> #include "intel_drv.h" #include "i915_reg.h" +#define GET_MEI_DDI_INDEX (port) (((port) == PORT_A) ? DDI_A : \ + (enum hdcp_physical_port) (port))#define KEY_LOAD_TRIES 5 static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,
@@ -817,3 +820,194 @@ int intel_hdcp_check_link(struct intel_connector *connector)mutex_unlock (&hdcp->hdcp_mutex);return ret; } + +static int +hdcp2_prepare_ake_init (struct intel_hdcp *hdcp,struct hdcp2_ake_init *ake_data) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +struct intel_connector *connector =container_of (hdcp, + struct intel_connector, + hdcp); + +if (!hdcp->cldev) +return -EINVAL ; + +if (data->port ==INVALID_PORT && connector->encoder) + data->port =GET_MEI_DDI_INDEX (connector->encoder->port); + +/* Clear ME FW instance for the port, just incase */ +mei_close_hdcp_session (hdcp->cldev, data); + +return mei_initiate_hdcp2_session (hdcp->cldev, data, ake_data); +} + +static int hdcp2_close_mei_session (struct intel_hdcp *hdcp) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; + +if (!hdcp->cldev || data->port ==INVALID_PORT ) +return -EINVAL ; + +return mei_close_hdcp_session (hdcp->cldev, data); +} + +static int +hdcp2_verify_rx_cert_prepare_km (struct intel_hdcp *hdcp, +struct hdcp2_ake_send_cert *rx_cert, +bool *paired, +struct hdcp2_ake_no_stored_km *ek_pub_km, +size_t *msg_sz) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_receiver_cert_prepare_km (hdcp->cldev, data, rx_cert, + paired, ek_pub_km, msg_sz); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int hdcp2_verify_hprime (struct intel_hdcp *hdcp, +struct hdcp2_ake_send_hprime *rx_hprime) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_hprime (hdcp->cldev, data, rx_hprime); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_store_paring_info (struct intel_hdcp *hdcp, +struct hdcp2_ake_send_pairing_info *pairing_info) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_store_pairing_info (hdcp->cldev, data, pairing_info); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_prepare_lc_init (struct intel_hdcp *hdcp,struct hdcp2_lc_init *lc_init) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_initiate_locality_check (hdcp->cldev, data, lc_init); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_verify_lprime (struct intel_hdcp *hdcp, +struct hdcp2_lc_send_lprime *rx_lprime) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_lprime (hdcp->cldev, data, rx_lprime); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int hdcp2_prepare_skey (struct intel_hdcp *hdcp, +struct hdcp2_ske_send_eks *ske_data) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_get_session_key (hdcp->cldev, data, ske_data); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_verify_rep_topology_prepare_ack ( +struct intel_hdcp *hdcp, +struct hdcp2_rep_send_receiverid_list *rep_topology, +struct hdcp2_rep_send_ack *rep_send_ack) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_repeater_check_flow_prepare_ack (hdcp->cldev, data, + rep_topology, rep_send_ack); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_verify_mprime (struct intel_hdcp *hdcp, +struct hdcp2_rep_stream_ready *stream_ready) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_mprime (hdcp->cldev, data, stream_ready); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + + +static int hdcp2_authenticate_port (struct intel_hdcp *hdcp) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_enable_hdcp_authentication (hdcp->cldev, data); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static inline int hdcp2_deauthenticate_port (struct intel_hdcp *hdcp) +{ +return hdcp2_close_mei_session (hdcp); +}
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 22/40] drm/i915: Wrappers for mei HDCP2.2 services
Quoted 55 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 22/40] drm/i915: Wrappers for mei HDCP2.2 servicesAdds the wrapper for all mei hdcp2.2 service functions.
v2:
Rebased.
v3:
cldev is moved frommei_hdcp_datato hdcp.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_hdcp.c| 194
++++++++++++++++++++++++++++++++++++++1 file changed, 194 insertions(+)drivers/gpu/drm/i915/intel_hdcp.c +3
-0@@ -10,10 +10,13 @@#include <drm/drm_hdcp.h> #include <linux/i2c.h> #include <linux/random.h> +#include <linux/mei_hdcp.h> #include "intel_drv.h" #include "i915_reg.h" +#define GET_MEI_DDI_INDEX (port) (((port) == PORT_A) ? DDI_A : \ + (enum hdcp_physical_port) (port))#define KEY_LOAD_TRIES 5static int intel_hdcp_poll_ksv_fifo(struct
intel_digital_port*intel_dig_port, @@ - 817,3 +820,194 @@ intintel_hdcp_check_link(struct intel_connector *connector)mutex_unlock(&hdcp->hdcp_mutex); return ret; }drivers/gpu/drm/i915/intel_hdcp.c +4
-0+ +static int +hdcp2_prepare_ake_init (struct intel_hdcp *hdcp,struct hdcp2_ake_init +*ake_data) {
drivers/gpu/drm/i915/intel_hdcp.c int intel_hdcp_check_link(struct intel_connector *connector) · line 836
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +10
-0+struct mei_hdcp_data *data = &hdcp->mei_data; +struct intel_connector *connector =container_of (hdcp, + struct intel_connector, + hdcp); + +if (!hdcp->cldev) +return -EINVAL ; + +if (data->port ==INVALID_PORT && connector->encoder) + data->port =GET_MEI_DDI_INDEX (connector->encoder->port);
I believe caller should provide valid port and this should fail if port received is invalid instead of retrieving it here.
drivers/gpu/drm/i915/intel_hdcp.c int intel_hdcp_check_link(struct intel_connector *connector) · line 848
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +10
-0+ +/* Clear ME FW instance for the port, just incase */ +mei_close_hdcp_session (hdcp->cldev, data); + +return mei_initiate_hdcp2_session (hdcp->cldev, data, ake_data); } + +static int hdcp2_close_mei_session (struct intel_hdcp *hdcp) { +struct mei_hdcp_data *data = &hdcp->mei_data; + +if (!hdcp->cldev || data->port ==INVALID_PORT )
This is what I was saying for above.
Quoted 159 lines
drivers/gpu/drm/i915/intel_hdcp.c +156
-1+return -EINVAL ; + +return mei_close_hdcp_session (hdcp->cldev, data); } + +static int +hdcp2_verify_rx_cert_prepare_km (struct intel_hdcp *hdcp, +struct hdcp2_ake_send_cert *rx_cert, +bool *paired, +struct hdcp2_ake_no_stored_km *ek_pub_km, +size_t *msg_sz) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_receiver_cert_prepare_km (hdcp->cldev, data, rx_cert, + paired, ek_pub_km, msg_sz); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int hdcp2_verify_hprime (struct intel_hdcp *hdcp, +struct hdcp2_ake_send_hprime *rx_hprime) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_hprime (hdcp->cldev, data, rx_hprime); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_store_paring_info (struct intel_hdcp *hdcp, +struct hdcp2_ake_send_pairing_info *pairing_info) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_store_pairing_info (hdcp->cldev, data, pairing_info); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_prepare_lc_init (struct intel_hdcp *hdcp,struct hdcp2_lc_init +*lc_init) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_initiate_locality_check (hdcp->cldev, data, lc_init); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_verify_lprime (struct intel_hdcp *hdcp, +struct hdcp2_lc_send_lprime *rx_lprime) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_lprime (hdcp->cldev, data, rx_lprime); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int hdcp2_prepare_skey (struct intel_hdcp *hdcp, +struct hdcp2_ske_send_eks *ske_data) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_get_session_key (hdcp->cldev, data, ske_data); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_verify_rep_topology_prepare_ack ( +struct intel_hdcp *hdcp, +struct hdcp2_rep_send_receiverid_list *rep_topology, +struct hdcp2_rep_send_ack *rep_send_ack) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_repeater_check_flow_prepare_ack (hdcp->cldev, data, + rep_topology, rep_send_ack); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_verify_mprime (struct intel_hdcp *hdcp, +struct hdcp2_rep_stream_ready *stream_ready) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_mprime (hdcp->cldev, data, stream_ready); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + + +static int hdcp2_authenticate_port (struct intel_hdcp *hdcp) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_enable_hdcp_authentication (hdcp->cldev, data); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static inline int hdcp2_deauthenticate_port (struct intel_hdcp *hdcp) { +return hdcp2_close_mei_session (hdcp); +} --2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 22/40] drm/i915: Wrappers for mei HDCP2.2 services
Quoted 58 lines · Uma
Quoted 58 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 22/40] drm/i915: Wrappers for mei HDCP2.2 servicesAdds the wrapper for all mei hdcp2.2 service functions.
v2:
Rebased.
v3:
cldev is moved frommei_hdcp_datato hdcp.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_hdcp.c| 194
++++++++++++++++++++++++++++++++++++++1 file changed, 194 insertions(+)drivers/gpu/drm/i915/intel_hdcp.c +3
-0@@ -10,10 +10,13 @@#include <drm/drm_hdcp.h> #include <linux/i2c.h> #include <linux/random.h> +#include <linux/mei_hdcp.h> #include "intel_drv.h" #include "i915_reg.h" +#define GET_MEI_DDI_INDEX (port) (((port) == PORT_A) ? DDI_A : \ + (enum hdcp_physical_port) (port))#define KEY_LOAD_TRIES 5static int intel_hdcp_poll_ksv_fifo(struct
intel_digital_port*intel_dig_port, @@ - 817,3 +820,194 @@ intintel_hdcp_check_link(struct intel_connector *connector)mutex_unlock(&hdcp->hdcp_mutex); return ret; }drivers/gpu/drm/i915/intel_hdcp.c +8
-0+ +static int +hdcp2_prepare_ake_init (struct intel_hdcp *hdcp,struct hdcp2_ake_init +*ake_data) { +struct mei_hdcp_data *data = &hdcp->mei_data; +struct intel_connector *connector =container_of (hdcp, + struct intel_connector, + hdcp);
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c int intel_hdcp_check_link(struct intel_connector *connector) · line 836
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdcp.c +6
-0+ +if (!hdcp->cldev) +return -EINVAL ; + +if (data->port ==INVALID_PORT && connector->encoder) + data->port =GET_MEI_DDI_INDEX (connector->encoder->port);I believe caller should provide valid port and this should fail if port received is invalid instead of retrieving it here.
Agreed. But at the initialization of mei_hdcp_data, if the encoder is not initialized, data->port will be uninitialized (invalid). So in that case at the start of the hdcp authentication we initialize the port. May be I am bit paranoid here!
But on all other wrappers port needs to be valid.
--Ram
Quoted 171 lines
drivers/gpu/drm/i915/intel_hdcp.c int intel_hdcp_check_link(struct intel_connector *connector) · line 848
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +10
-0+ +/* Clear ME FW instance for the port, just incase */ +mei_close_hdcp_session (hdcp->cldev, data); + +return mei_initiate_hdcp2_session (hdcp->cldev, data, ake_data); } + +static int hdcp2_close_mei_session (struct intel_hdcp *hdcp) { +struct mei_hdcp_data *data = &hdcp->mei_data; + +if (!hdcp->cldev || data->port ==INVALID_PORT )This is what I was saying for above.
Quoted 159 lines
drivers/gpu/drm/i915/intel_hdcp.c +156
-1+return -EINVAL ; + +return mei_close_hdcp_session (hdcp->cldev, data); } + +static int +hdcp2_verify_rx_cert_prepare_km (struct intel_hdcp *hdcp, +struct hdcp2_ake_send_cert *rx_cert, +bool *paired, +struct hdcp2_ake_no_stored_km *ek_pub_km, +size_t *msg_sz) +{ +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_receiver_cert_prepare_km (hdcp->cldev, data, rx_cert, + paired, ek_pub_km, msg_sz); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int hdcp2_verify_hprime (struct intel_hdcp *hdcp, +struct hdcp2_ake_send_hprime *rx_hprime) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_hprime (hdcp->cldev, data, rx_hprime); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_store_paring_info (struct intel_hdcp *hdcp, +struct hdcp2_ake_send_pairing_info *pairing_info) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_store_pairing_info (hdcp->cldev, data, pairing_info); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_prepare_lc_init (struct intel_hdcp *hdcp,struct hdcp2_lc_init +*lc_init) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_initiate_locality_check (hdcp->cldev, data, lc_init); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_verify_lprime (struct intel_hdcp *hdcp, +struct hdcp2_lc_send_lprime *rx_lprime) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_lprime (hdcp->cldev, data, rx_lprime); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int hdcp2_prepare_skey (struct intel_hdcp *hdcp, +struct hdcp2_ske_send_eks *ske_data) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_get_session_key (hdcp->cldev, data, ske_data); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_verify_rep_topology_prepare_ack ( +struct intel_hdcp *hdcp, +struct hdcp2_rep_send_receiverid_list *rep_topology, +struct hdcp2_rep_send_ack *rep_send_ack) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_repeater_check_flow_prepare_ack (hdcp->cldev, data, + rep_topology, rep_send_ack); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static int +hdcp2_verify_mprime (struct intel_hdcp *hdcp, +struct hdcp2_rep_stream_ready *stream_ready) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_verify_mprime (hdcp->cldev, data, stream_ready); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + + +static int hdcp2_authenticate_port (struct intel_hdcp *hdcp) { +struct mei_hdcp_data *data = &hdcp->mei_data; +int ret; + +if (!hdcp->cldev) +return -EINVAL ; + + ret =mei_enable_hdcp_authentication (hdcp->cldev, data); +if (ret <0 ) +mei_close_hdcp_session (hdcp->cldev, data); + +return ret; +} + +static inline int hdcp2_deauthenticate_port (struct intel_hdcp *hdcp) { +return hdcp2_close_mei_session (hdcp); +} --2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 23/40 drm/i915: Implement HDCP2.2 receiver authentication
In reply to Ramalingam CImplements HDCP2.2 authentication for hdcp2.2 receivers, with following steps:
Authentication and Key enchange (AKE). Locality Check (LC).
Session Key Exchange(SKE).
DP Errata for stream type confuguration for receivers.
At AKE, the HDCP Receiver’s public key certificate is verified by the HDCP Transmitter. A Master Key k m is exchanged.
At LC, the HDCP Transmitter enforces locality on the content by requiring that the Round Trip Time (RTT) between a pair of messages is not more than 20 ms.
At SKE, The HDCP Transmitter exchanges Session Key ks with the HDCP Receiver.
In DP HDCP2.2 encryption and decryption logics use the stream type as one of the parameter. So Before enabling the Encryption DP HDCP2.2 receiver needs to be communicated with stream type. This is added to spec as ERRATA.
This generic implementation is complete only with the hdcp2_shim defined.
v2:
Rebased.
v3:
No Changes.
--- drivers/gpu/drm/i915/intel_hdcp.c | 184 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+)
drivers/gpu/drm/i915/intel_hdcp.c +184 -0
@@ -18,6 +18,7 @@#define GET_MEI_DDI_INDEX (port) (((port) == PORT_A) ? DDI_A : \ (enum hdcp_physical_port) (port))#define KEY_LOAD_TRIES 5 +#define HDCP2_LC_RETRY_CNT 3static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port,const struct intel_hdcp_shim *shim)
@@ -1011,3 +1012,186 @@ static inline int hdcp2_deauthenticate_port(struct intel_hdcp *hdcp) {return hdcp2_close_mei_session (hdcp); } + +static int hdcp2_authentication_key_exchange (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +union { +struct hdcp2_ake_init ake_init; +struct hdcp2_ake_send_cert send_cert; +struct hdcp2_ake_no_stored_km no_stored_km; +struct hdcp2_ake_send_hprime send_hprime; +struct hdcp2_ake_send_pairing_info pairing_info; + } msgs; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +size_t size; +int ret; + +/* Init for seq_num */ + hdcp->seq_num_v =0 ; + hdcp->seq_num_m =0 ; + + ret =hdcp2_prepare_ake_init (hdcp, &msgs.ake_init); +if (ret <0 ) +return ret; + + ret = shim->write_2_2_msg (intel_dig_port, &msgs.ake_init, +sizeof (msgs.ake_init)); +if (ret <0 ) +return ret; + + ret = shim->read_2_2_msg (intel_dig_port,HDCP_2_2_AKE_SEND_CERT , + &msgs.send_cert,sizeof (msgs.send_cert)); +if (ret <0 ) +return ret; + +if (msgs.send_cert.rx_caps[0 ] !=HDCP_2_2_RX_CAPS_VERSION_VAL ) +return -EINVAL ; + + hdcp->is_repeater =HDCP_2_2_RX_REPEATER (msgs.send_cert.rx_caps[2 ]); + +/* +* Here msgs.no_stored_km will hold msgs corresponding to the km +* stored also. +*/ + ret =hdcp2_verify_rx_cert_prepare_km (hdcp, &msgs.send_cert, + &hdcp->is_paired, + &msgs.no_stored_km, &size); +if (ret <0 ) +return ret; + + ret = shim->write_2_2_msg (intel_dig_port, &msgs.no_stored_km, size); +if (ret <0 ) +return ret; + + ret = shim->read_2_2_msg (intel_dig_port,HDCP_2_2_AKE_SEND_HPRIME , + &msgs.send_hprime,sizeof (msgs.send_hprime)); +if (ret <0 ) +return ret; + + ret =hdcp2_verify_hprime (hdcp, &msgs.send_hprime); +if (ret <0 ) +return ret; + +if (!hdcp->is_paired) { +/* Pairing is required */ + ret = shim->read_2_2_msg (intel_dig_port, +HDCP_2_2_AKE_SEND_PARING_INFO , + &msgs.pairing_info, +sizeof (msgs.pairing_info)); +if (ret <0 ) +return ret; + + ret =hdcp2_store_paring_info (hdcp, &msgs.pairing_info); +if (ret <0 ) +return ret; + hdcp->is_paired = true; + } +return 0 ; +} + +static int hdcp2_locality_check (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +union { +struct hdcp2_lc_init lc_init; +struct hdcp2_lc_send_lprime send_lprime; + } msgs; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +int tries =HDCP2_LC_RETRY_CNT , ret, i; + +for (i =0 ; i < tries; i++) { + ret =hdcp2_prepare_lc_init (hdcp, &msgs.lc_init); +if (ret <0 ) +continue ; + + ret = shim->write_2_2_msg (intel_dig_port, &msgs.lc_init, +sizeof (msgs.lc_init)); +if (ret <0 ) +continue ; + + ret = shim->read_2_2_msg (intel_dig_port, +HDCP_2_2_LC_SEND_LPRIME , + &msgs.send_lprime, +sizeof (msgs.send_lprime)); +if (ret <0 ) +continue ; + + ret =hdcp2_verify_lprime (hdcp, &msgs.send_lprime); +if (!ret) +break ; + } +return ret; +} + +static int hdcp2_session_key_exchange (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +struct hdcp2_ske_send_eks send_eks; +int ret; + + ret =hdcp2_prepare_skey (hdcp, &send_eks); +if (ret <0 ) +return ret; + + ret = hdcp->hdcp_shim->write_2_2_msg (intel_dig_port, &send_eks, +sizeof (send_eks)); +if (ret <0 ) +return ret; + +return 0 ; +} + +static int hdcp2_authenticate_sink (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +struct hdcp2_dp_errata_stream_type stream_type_msg; +int ret; + + ret =hdcp2_authentication_key_exchange (connector); +if (ret <0 ) { +DRM_DEBUG_KMS ("AKE Failed. Err : %d\n" , ret); +return ret; + } + + ret =hdcp2_locality_check (connector); +if (ret <0 ) { +DRM_DEBUG_KMS ("Locality Check failed. Err : %d\n" , ret); +return ret; + } + + ret =hdcp2_session_key_exchange (connector); +if (ret <0 ) { +DRM_DEBUG_KMS ("SKE Failed. Err : %d\n" , ret); +return ret; + } + +if (!hdcp->is_repeater && shim->config_stream_type) { + +/* Errata for DP: As Stream type is used for encryption, +* Receiver should be communicated with stream type for the +* decryption of the content. +* Repeater will be communicated with stream type as a +* part of it's auth in later in time +*/ + stream_type_msg.msg_id =HDCP_2_2_ERRATA_DP_STREAM_TYPE ; + stream_type_msg.stream_type = hdcp->content_type; + + ret = shim->config_stream_type (intel_dig_port, &stream_type_msg, +sizeof (stream_type_msg)); +if (ret <0 ) +return ret; + } + + hdcp->mei_data.streams[0 ].stream_type = hdcp->content_type; + ret =hdcp2_authenticate_port (hdcp); +if (ret <0 ) +return ret; + +return ret; +}
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 23/40] drm/i915: Implement HDCP2.2 receiver authentication
Quoted 14 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 23/40] drm/i915: Implement HDCP2.2 receiver authentication
Quoted 2 lines
Implements HDCP2.2 authentication for hdcp2.2 receivers, with following steps:
Authentication and Key enchange (AKE).
Typo in exchange.
Quoted 3 lines
Locality Check (LC).
Session Key Exchange(SKE).
DP Errata for stream type confuguration for receivers.
Typo in configuration.
Quoted 112 lines
At AKE, the HDCP Receiver’s public key certificate is verified by the HDCP Transmitter. A Master Key k m is exchanged.
At LC, the HDCP Transmitter enforces locality on the content by requiring that the Round Trip Time (RTT) between a pair of messages is not more than 20 ms.
At SKE, The HDCP Transmitter exchanges Session Key ks with the HDCP Receiver.
In DP HDCP2.2 encryption and decryption logics use the stream type as one of the parameter. So Before enabling the Encryption DP HDCP2.2 receiver needs to be communicated with stream type. This is added to spec as ERRATA.
This generic implementation is complete only with the
hdcp2_shimdefined.v2:
Rebased.
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_hdcp.c| 184
++++++++++++++++++++++++++++++++++++++1 file changed, 184 insertions(+)drivers/gpu/drm/i915/intel_hdcp.c +1
-0@@ -18,6 +18,7 @@#define GET_MEI_DDI_INDEX (port) (((port) == PORT_A) ? DDI_A : \ (enum hdcp_physical_port) (port))#define KEY_LOAD_TRIES 5 +#define HDCP2_LC_RETRY_CNT 3static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port, const struct intel_hdcp_shim *shim) @@ -1011,3 +1012,186 @@ static inline int hdcp2_deauthenticate_port(struct
intel_hdcp *hdcp) { return hdcp2_close_mei_session(hdcp); }drivers/gpu/drm/i915/intel_hdcp.c +38
-0+ +static int hdcp2_authentication_key_exchange (struct intel_connector +*connector) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +union { +struct hdcp2_ake_init ake_init; +struct hdcp2_ake_send_cert send_cert; +struct hdcp2_ake_no_stored_km no_stored_km; +struct hdcp2_ake_send_hprime send_hprime; +struct hdcp2_ake_send_pairing_info pairing_info; + } msgs; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +size_t size; +int ret; + +/* Init for seq_num */ + hdcp->seq_num_v =0 ; + hdcp->seq_num_m =0 ; + + ret =hdcp2_prepare_ake_init (hdcp, &msgs.ake_init); +if (ret <0 ) +return ret; + + ret = shim->write_2_2_msg (intel_dig_port, &msgs.ake_init, +sizeof (msgs.ake_init)); +if (ret <0 ) +return ret; + + ret = shim->read_2_2_msg (intel_dig_port,HDCP_2_2_AKE_SEND_CERT , + &msgs.send_cert,sizeof (msgs.send_cert)); +if (ret <0 ) +return ret; + +if (msgs.send_cert.rx_caps[0 ] !=HDCP_2_2_RX_CAPS_VERSION_VAL ) +return -EINVAL ; + + hdcp->is_repeater =
HDCP_2_2_RX_REPEATER(msgs.send_cert.rx_caps[2]);drivers/gpu/drm/i915/intel_hdcp.c +16
-0+ +/* +* Here msgs.no_stored_km will hold msgs corresponding to the km +* stored also. +*/ + ret =hdcp2_verify_rx_cert_prepare_km (hdcp, &msgs.send_cert, + &hdcp->is_paired, + &msgs.no_stored_km, &size); +if (ret <0 ) +return ret; + + ret = shim->write_2_2_msg (intel_dig_port, &msgs.no_stored_km, size); +if (ret <0 ) +return ret; + + ret = shim->read_2_2_msg(intel_dig_port,
HDCP_2_2_AKE_SEND_HPRIME,drivers/gpu/drm/i915/intel_hdcp.c +1
-0+ &msgs.send_hprime,
sizeof(msgs.send_hprime));drivers/gpu/drm/i915/intel_hdcp.c +11
-0+if (ret <0 ) +return ret; + + ret =hdcp2_verify_hprime (hdcp, &msgs.send_hprime); +if (ret <0 ) +return ret; + +if (!hdcp->is_paired) { +/* Pairing is required */ + ret = shim->read_2_2_msg(intel_dig_port, + HDCP_2_2_AKE_SEND_PARING_INFO,
drivers/gpu/drm/i915/intel_hdcp.c static inline int hdcp2_deauthenticate_port(struct intel_hdcp *hdcp) · line 1090
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +10
-0+ &msgs.pairing_info, + sizeof(msgs.pairing_info)); +if (ret <0 ) +return ret; + + ret =hdcp2_store_paring_info (hdcp, &msgs.pairing_info); +if (ret <0 ) +return ret; + hdcp->is_paired = true; + }
Leave a blank line here.
Quoted 24 lines
drivers/gpu/drm/i915/intel_hdcp.c +24
-0+return 0 ; +} + +static int hdcp2_locality_check (struct intel_connector *connector) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +union { +struct hdcp2_lc_init lc_init; +struct hdcp2_lc_send_lprime send_lprime; + } msgs; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +int tries =HDCP2_LC_RETRY_CNT , ret, i; + +for (i =0 ; i < tries; i++) { + ret =hdcp2_prepare_lc_init (hdcp, &msgs.lc_init); +if (ret <0 ) +continue ; + + ret = shim->write_2_2_msg (intel_dig_port, &msgs.lc_init, +sizeof (msgs.lc_init)); +if (ret <0 ) +continue ; + + ret = shim->read_2_2_msg(intel_dig_port,
drivers/gpu/drm/i915/intel_hdcp.c static inline int hdcp2_deauthenticate_port(struct intel_hdcp *hdcp) · line 1125
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +10
-0+HDCP_2_2_LC_SEND_LPRIME , + &msgs.send_lprime, + sizeof(msgs.send_lprime)); +if (ret <0 ) +continue ; + + ret =hdcp2_verify_lprime (hdcp, &msgs.send_lprime); +if (!ret) +break ; + }
Leave a blank line.
Quoted 40 lines
drivers/gpu/drm/i915/intel_hdcp.c +40
-0+return ret; +} + +static int hdcp2_session_key_exchange (struct intel_connector +*connector) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +struct hdcp2_ske_send_eks send_eks; +int ret; + + ret =hdcp2_prepare_skey (hdcp, &send_eks); +if (ret <0 ) +return ret; + + ret = hdcp->hdcp_shim->write_2_2_msg (intel_dig_port, &send_eks, +sizeof (send_eks)); +if (ret <0 ) +return ret; + +return 0 ; +} + +static int hdcp2_authenticate_sink (struct intel_connector *connector) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +struct hdcp2_dp_errata_stream_type stream_type_msg; +int ret; + + ret =hdcp2_authentication_key_exchange (connector); +if (ret <0 ) { +DRM_DEBUG_KMS ("AKE Failed. Err : %d\n" , ret); +return ret; + } + + ret =hdcp2_locality_check (connector); +if (ret <0 ) { +DRM_DEBUG_KMS ("Locality Check failed. Err : %d\n" , ret); +return ret; + }
drivers/gpu/drm/i915/intel_hdcp.c static inline int hdcp2_deauthenticate_port(struct intel_hdcp *hdcp) · line 1176
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +10
-0+ + ret =hdcp2_session_key_exchange (connector); +if (ret <0 ) { +DRM_DEBUG_KMS ("SKE Failed. Err : %d\n" , ret); +return ret; + } + +if (!hdcp->is_repeater && shim->config_stream_type) { + +/* Errata for DP: As Stream type is used for encryption,
Incorrect multi line comment style.
drivers/gpu/drm/i915/intel_hdcp.c static inline int hdcp2_deauthenticate_port(struct intel_hdcp *hdcp) · line 1180
Quoted 4 lines
drivers/gpu/drm/i915/intel_hdcp.c +4
-0+* Receiver should be communicated with stream type for the +* decryption of the content. +* Repeater will be communicated with stream type as a +* part of it's auth in later in time
Remove "in"
Quoted 22 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-0+*/ + stream_type_msg.msg_id =
HDCP_2_2_ERRATA_DP_STREAM_TYPE;drivers/gpu/drm/i915/intel_hdcp.c +3
-0+ stream_type_msg.stream_type = hdcp->content_type; + + ret = shim->config_stream_type(intel_dig_port,
&stream_type_msg,drivers/gpu/drm/i915/intel_hdcp.c +12
-1+ sizeof(stream_type_msg)); +if (ret <0 ) +return ret; + } + + hdcp->mei_data.streams[0 ].stream_type = hdcp->content_type; + ret =hdcp2_authenticate_port (hdcp); +if (ret <0 ) +return ret; + +return ret; +} --2.7.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 24/40 drm/i915: Implement HDCP2.2 repeater authentication
In reply to Ramalingam CImplements the HDCP2.2 repeaters authentication steps such as verifying the downstream topology and sending stream management information.
v2:
Rebased.
v3:
No Changes.
--- drivers/gpu/drm/i915/intel_hdcp.c | 135 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+)
drivers/gpu/drm/i915/intel_hdcp.c +135 -0
@@ -1145,6 +1145,135 @@ static int hdcp2_session_key_exchange(struct intel_connector *connector)return 0 ; } +/* +* Lib endianness functions are aligned for 16/32/64 bits. Since here sequence +* num is 24bits developed a small conversion function. +*/ +static inline void reverse_endianness (u8 *dest,size_t dst_sz,u8 *src) +{ +u32 index; + +if (dest !=NULL && dst_sz !=0 ) { +for (index =0 ; index < dst_sz && index <sizeof (u32); + index++) { + dest[dst_sz - index -1 ] = src[index]; + } + } +} + +static +int hdcp2_propagate_stream_management_info (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +union { +struct hdcp2_rep_stream_manage stream_manage; +struct hdcp2_rep_stream_ready stream_ready; + } msgs; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +int ret; + +/* Prepare RepeaterAuth_Stream_Manage msg */ + msgs.stream_manage.msg_id =HDCP_2_2_REP_STREAM_MANAGE ; +reverse_endianness (msgs.stream_manage.seq_num_m,HDCP_2_2_SEQ_NUM_LEN , + (u8 *)&hdcp->seq_num_m); + +/* K no of streams is fixed as 1. Stored as big-endian. */ + msgs.stream_manage.k =__swab16 (1 ); + +/* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */ + msgs.stream_manage.streams[0 ].stream_id =0 ; + msgs.stream_manage.streams[0 ].stream_type = hdcp->content_type; + +/* Send it to Repeater */ + ret = shim->write_2_2_msg (intel_dig_port, &msgs.stream_manage, +sizeof (msgs.stream_manage)); +if (ret <0 ) +return ret; + + ret = shim->read_2_2_msg (intel_dig_port,HDCP_2_2_REP_STREAM_READY , + &msgs.stream_ready,sizeof (msgs.stream_ready)); +if (ret <0 ) +return ret; + + hdcp->mei_data.seq_num_m = hdcp->seq_num_m; + hdcp->mei_data.streams[0 ].stream_type = hdcp->content_type; + + ret =hdcp2_verify_mprime (hdcp, &msgs.stream_ready); +if (ret <0 ) +return ret; + + hdcp->seq_num_m++; + +if (hdcp->seq_num_m >HDCP_2_2_SEQ_NUM_MAX ) { +DRM_DEBUG_KMS ("seq_num_m roll over.\n" ); +return -1 ; + } +return 0 ; +} + +static +int hdcp2_authenticate_repeater_topology (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +union { +struct hdcp2_rep_send_receiverid_list recvid_list; +struct hdcp2_rep_send_ack rep_ack; + } msgs; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +uint8_t *rx_info; +uint32_t seq_num_v; +int ret; + + ret = shim->read_2_2_msg (intel_dig_port,HDCP_2_2_REP_SEND_RECVID_LIST , + &msgs.recvid_list,sizeof (msgs.recvid_list)); +if (ret <0 ) +return ret; + + rx_info = msgs.recvid_list.rx_info; + +if (HDCP_2_2_MAX_CASCADE_EXCEEDED (rx_info[1 ]) || +HDCP_2_2_MAX_DEVS_EXCEEDED (rx_info[1 ])) { +DRM_DEBUG_KMS ("Topology Max Size Exceeded\n" ); +return -1 ; + } + +/* Converting and Storing the seq_num_v to local variable as DWORD */ +reverse_endianness ((u8 *)&seq_num_v,HDCP_2_2_SEQ_NUM_LEN , + msgs.recvid_list.seq_num_v); + +if (seq_num_v < hdcp->seq_num_v) { +/* Roll over of the seq_num_v from repeater. Reauthenticate. */ +DRM_DEBUG_KMS ("Seq_num_v roll over.\n" ); +return -1 ; + } + + ret =hdcp2_verify_rep_topology_prepare_ack (hdcp, &msgs.recvid_list, + &msgs.rep_ack); +if (ret <0 ) +return ret; + + hdcp->seq_num_v = seq_num_v; + ret = shim->write_2_2_msg (intel_dig_port, &msgs.rep_ack, +sizeof (msgs.rep_ack)); +if (ret <0 ) +return ret; + +return 0 ; +} + +static int hdcp2_authenticate_repeater (struct intel_connector *connector) +{ +int ret; + + ret =hdcp2_authenticate_repeater_topology (connector); +if (ret <0 ) +return ret; + +return hdcp2_propagate_stream_management_info (connector); +} +static int hdcp2_authenticate_sink (struct intel_connector *connector) {struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector);
@@ -1186,6 +1315,12 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector) sizeof(stream_type_msg));if (ret <0 )return ret; + }else if (hdcp->is_repeater) { + ret =hdcp2_authenticate_repeater (connector); +if (ret <0 ) { +DRM_DEBUG_KMS ("Repeater Auth Failed. Err: %d\n" , ret); +return ret; + } } hdcp->mei_data.streams[0 ].stream_type = hdcp->content_type;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [PATCH v3 24/40] drm/i915: Implement HDCP2.2 repeater authentication
Thank you for the patch! Perhaps something to improve:
Hi Ramalingam,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on next-20180403]
[cannot apply to v4.16]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ramalingam-C/drm-i915-Implement-HDCP2-2/20180404-031743 base: git://anongit.freedesktop.org/drm-intel for-linux-next reproduce: # apt-get install sparse make ARCH=x86_64 allmodconfig make C=1 CF=-D__CHECK_ENDIAN__
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/intel_hdcp.c:1182:30: sparse: incorrect type in assignment (different base types) @@ expected restricted __be16 [assigned] [usertype] k @@ got e] k @@
drivers/gpu/drm/i915/intel_hdcp.c:1182:30: expected restricted __be16 [assigned] [usertype] k
drivers/gpu/drm/i915/intel_hdcp.c:1182:30: got int
drivers/gpu/drm/i915/intel_hdcp.c:1277:12: warning: 'hdcp2_authenticate_sink' defined but not used [-Wunused-function]
static int hdcp2_authenticate_sink(struct intel_connector *connector)
^~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/i915/intel_hdcp.c:13:0:
include/linux/mei_hdcp.h:148:12: warning: 'mei_cldev_unregister_notify' defined but not used [-Wunused-function]
static int mei_cldev_unregister_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/mei_hdcp.h:144:12: warning: 'mei_cldev_register_notify' defined but not used [-Wunused-function]
static int mei_cldev_register_notify(struct notifier_block *nb)
^~~~~~~~~~~~~~~~~~~~~~~~~
vim +1182 drivers/gpu/drm/i915/intel_hdcp.c
1163
1164 static
1165 int hdcp2_propagate_stream_management_info(struct intel_connector *connector)
1166 {
1167 struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
1168 struct intel_hdcp *hdcp = &connector->hdcp;
1169 union {
1170 struct hdcp2_rep_stream_manage stream_manage;
1171 struct hdcp2_rep_stream_ready stream_ready;
1172 } msgs;
1173 const struct intel_hdcp_shim *shim = hdcp->hdcp_shim;
1174 int ret;
1175
1176 /* Prepare RepeaterAuth_Stream_Manage msg */
1177 msgs.stream_manage.msg_id = HDCP_2_2_REP_STREAM_MANAGE;
1178 reverse_endianness(msgs.stream_manage.seq_num_m, HDCP_2_2_SEQ_NUM_LEN,
1179 (u8 *)&hdcp->seq_num_m);
1180
1181 /* K no of streams is fixed as 1. Stored as big-endian. */
> 1182 msgs.stream_manage.k = __swab16(1);
1183
1184 /* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */
1185 msgs.stream_manage.streams[0].stream_id = 0;
1186 msgs.stream_manage.streams[0].stream_type = hdcp->content_type;
1187
1188 /* Send it to Repeater */
1189 ret = shim->write_2_2_msg(intel_dig_port, &msgs.stream_manage,
1190 sizeof(msgs.stream_manage));
1191 if (ret < 0)
1192 return ret;
1193
1194 ret = shim->read_2_2_msg(intel_dig_port, HDCP_2_2_REP_STREAM_READY,
1195 &msgs.stream_ready, sizeof(msgs.stream_ready));
1196 if (ret < 0)
1197 return ret;
1198
1199 hdcp->mei_data.seq_num_m = hdcp->seq_num_m;
1200 hdcp->mei_data.streams[0].stream_type = hdcp->content_type;
1201
1202 ret = hdcp2_verify_mprime(hdcp, &msgs.stream_ready);
1203 if (ret < 0)
1204 return ret;
1205
1206 hdcp->seq_num_m++;
1207
1208 if (hdcp->seq_num_m > HDCP_2_2_SEQ_NUM_MAX) {
1209 DRM_DEBUG_KMS("seq_num_m roll over.\n");
1210 return -1;
1211 }
1212 return 0;
1213 }
1214
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 24/40] drm/i915: Implement HDCP2.2 repeater authentication
In reply to Ramalingam CQuoted 34 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 24/40] drm/i915: Implement HDCP2.2 repeater authenticationImplements the HDCP2.2 repeaters authentication steps such as verifying the downstream topology and sending stream management information.
v2:
Rebased.
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_hdcp.c| 135
++++++++++++++++++++++++++++++++++++++1 file changed, 135 insertions(+)drivers/gpu/drm/i915/intel_hdcp.c +0
-0
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_session_key_exchange(struct · line 1154
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +6
-0@@ -1145,6 +1145,135 @@ static int hdcp2_session_key_exchange(struct intel_connector *connector)return 0 ; } +/* +* Lib endianness functions are aligned for 16/32/64 bits. Since here +sequence +* num is 24bits developed a small conversion function. +*/ +static inline void reverse_endianness (u8 *dest,size_t dst_sz,u8 *src)
This function is already defined and used in mei layer. Define this in some common header file and use instead of duplicating it here. May be in below file:
<drm/drm_connector.h>
Quoted 52 lines
drivers/gpu/drm/i915/intel_hdcp.c +43
-0+{ +u32 index; + +if (dest !=NULL && dst_sz !=0 ) { +for (index =0 ; index < dst_sz && index <sizeof (u32); + index++) { + dest[dst_sz - index -1 ] = src[index]; + } + } +} + +static +int hdcp2_propagate_stream_management_info (struct intel_connector +*connector) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +union { +struct hdcp2_rep_stream_manage stream_manage; +struct hdcp2_rep_stream_ready stream_ready; + } msgs; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +int ret; + +/* Prepare RepeaterAuth_Stream_Manage msg */ + msgs.stream_manage.msg_id =HDCP_2_2_REP_STREAM_MANAGE ; +reverse_endianness (msgs.stream_manage.seq_num_m,HDCP_2_2_SEQ_NUM_LEN , + (u8 *)&hdcp->seq_num_m); + +/* K no of streams is fixed as 1. Stored as big-endian. */ + msgs.stream_manage.k =__swab16 (1 ); + +/* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */ + msgs.stream_manage.streams[0 ].stream_id =0 ; + msgs.stream_manage.streams[0 ].stream_type = hdcp->content_type; + +/* Send it to Repeater */ + ret = shim->write_2_2_msg (intel_dig_port, &msgs.stream_manage, +sizeof (msgs.stream_manage)); +if (ret <0 ) +return ret; + + ret = shim->read_2_2_msg(intel_dig_port, HDCP_2_2_REP_STREAM_READY, + &msgs.stream_ready,
sizeof(msgs.stream_ready));drivers/gpu/drm/i915/intel_hdcp.c +6
-0+if (ret <0 ) +return ret; + + hdcp->mei_data.seq_num_m = hdcp->seq_num_m; + hdcp->mei_data.streams[0 ].stream_type = hdcp->content_type; +
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_session_key_exchange(struct intel_connector *connector) · line 1211
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +10
-0+ ret =hdcp2_verify_mprime (hdcp, &msgs.stream_ready); +if (ret <0 ) +return ret; + + hdcp->seq_num_m++; + +if (hdcp->seq_num_m >HDCP_2_2_SEQ_NUM_MAX ) { +DRM_DEBUG_KMS ("seq_num_m roll over.\n" ); +return -1 ; + }
Leave a blank line.
Quoted 82 lines
drivers/gpu/drm/i915/intel_hdcp.c +18
-0+return 0 ; +} + +static +int hdcp2_authenticate_repeater_topology (struct intel_connector +*connector) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +union { +struct hdcp2_rep_send_receiverid_list recvid_list; +struct hdcp2_rep_send_ack rep_ack; + } msgs; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +uint8_t *rx_info; +uint32_t seq_num_v; +int ret; + + ret = shim->read_2_2_msg(intel_dig_port,
HDCP_2_2_REP_SEND_RECVID_LIST,drivers/gpu/drm/i915/intel_hdcp.c +47
-0+ &msgs.recvid_list, sizeof(msgs.recvid_list)); +if (ret <0 ) +return ret; + + rx_info = msgs.recvid_list.rx_info; + +if (HDCP_2_2_MAX_CASCADE_EXCEEDED (rx_info[1 ]) || +HDCP_2_2_MAX_DEVS_EXCEEDED (rx_info[1 ])) { +DRM_DEBUG_KMS ("Topology Max Size Exceeded\n" ); +return -1 ; + } + +/* Converting and Storing the seq_num_v to local variable as DWORD */ +reverse_endianness ((u8 *)&seq_num_v,HDCP_2_2_SEQ_NUM_LEN , + msgs.recvid_list.seq_num_v); + +if (seq_num_v < hdcp->seq_num_v) { +/* Roll over of the seq_num_v from repeater. Reauthenticate. */ +DRM_DEBUG_KMS ("Seq_num_v roll over.\n" ); +return -1 ; + } + + ret =hdcp2_verify_rep_topology_prepare_ack (hdcp, &msgs.recvid_list, + &msgs.rep_ack); +if (ret <0 ) +return ret; + + hdcp->seq_num_v = seq_num_v; + ret = shim->write_2_2_msg (intel_dig_port, &msgs.rep_ack, +sizeof (msgs.rep_ack)); +if (ret <0 ) +return ret; + +return 0 ; +} + +static int hdcp2_authenticate_repeater (struct intel_connector +*connector) { +int ret; + + ret =hdcp2_authenticate_repeater_topology (connector); +if (ret <0 ) +return ret; + +return hdcp2_propagate_stream_management_info (connector); +} +static int hdcp2_authenticate_sink(struct intel_connector *connector) { struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);drivers/gpu/drm/i915/intel_hdcp.c +6
-0@@ -1186,6 +1315,12 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector) sizeof(stream_type_msg));if (ret <0 )return ret; + }else if (hdcp->is_repeater) { + ret =hdcp2_authenticate_repeater (connector); +if (ret <0 ) { +DRM_DEBUG_KMS ("Repeater Auth Failed. Err: %d\n" , ret); +return ret; + } }
Quoted 8 lines
hdcp->mei_data.streams[0].stream_type = hdcp->content_type;--
2.7.4_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 24/40] drm/i915: Implement HDCP2.2 repeater authentication
Quoted 37 lines · Uma
Quoted 37 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH v3 24/40] drm/i915: Implement HDCP2.2 repeater authenticationImplements the HDCP2.2 repeaters authentication steps such as verifying the downstream topology and sending stream management information.
v2:
Rebased.
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_hdcp.c| 135
++++++++++++++++++++++++++++++++++++++1 file changed, 135 insertions(+)drivers/gpu/drm/i915/intel_hdcp.c +0
-0@@ -1145,6 +1145,135 @@ static int hdcp2_session_key_exchange(struct intel_connector *connector)return 0 ; }
Quoted 9 lines
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_session_key_exchange(struct intel_connector *connector) · line 1152
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdcp.c +6
-0+/* +* Lib endianness functions are aligned for 16/32/64 bits. Since here +sequence +* num is 24bits developed a small conversion function. +*/ +static inline void reverse_endianness (u8 *dest,size_t dst_sz,u8 *src)This function is already defined and used in mei layer. Define this in some common header file and use instead of duplicating it here. May be in below file:
<drm/drm_connector.h>
Sure.
--Ram
Quoted 146 lines
Quoted 52 lines
drivers/gpu/drm/i915/intel_hdcp.c +43
-0+{ +u32 index; + +if (dest !=NULL && dst_sz !=0 ) { +for (index =0 ; index < dst_sz && index <sizeof (u32); + index++) { + dest[dst_sz - index -1 ] = src[index]; + } + } +} + +static +int hdcp2_propagate_stream_management_info (struct intel_connector +*connector) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +union { +struct hdcp2_rep_stream_manage stream_manage; +struct hdcp2_rep_stream_ready stream_ready; + } msgs; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +int ret; + +/* Prepare RepeaterAuth_Stream_Manage msg */ + msgs.stream_manage.msg_id =HDCP_2_2_REP_STREAM_MANAGE ; +reverse_endianness (msgs.stream_manage.seq_num_m,HDCP_2_2_SEQ_NUM_LEN , + (u8 *)&hdcp->seq_num_m); + +/* K no of streams is fixed as 1. Stored as big-endian. */ + msgs.stream_manage.k =__swab16 (1 ); + +/* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */ + msgs.stream_manage.streams[0 ].stream_id =0 ; + msgs.stream_manage.streams[0 ].stream_type = hdcp->content_type; + +/* Send it to Repeater */ + ret = shim->write_2_2_msg (intel_dig_port, &msgs.stream_manage, +sizeof (msgs.stream_manage)); +if (ret <0 ) +return ret; + + ret = shim->read_2_2_msg(intel_dig_port, HDCP_2_2_REP_STREAM_READY, + &msgs.stream_ready,
sizeof(msgs.stream_ready));drivers/gpu/drm/i915/intel_hdcp.c +6
-0+if (ret <0 ) +return ret; + + hdcp->mei_data.seq_num_m = hdcp->seq_num_m; + hdcp->mei_data.streams[0 ].stream_type = hdcp->content_type; +drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_session_key_exchange(struct intel_connector *connector) · line 1211
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +10
-0+ ret =hdcp2_verify_mprime (hdcp, &msgs.stream_ready); +if (ret <0 ) +return ret; + + hdcp->seq_num_m++; + +if (hdcp->seq_num_m >HDCP_2_2_SEQ_NUM_MAX ) { +DRM_DEBUG_KMS ("seq_num_m roll over.\n" ); +return -1 ; + }Leave a blank line.
Quoted 82 lines
drivers/gpu/drm/i915/intel_hdcp.c +18
-0+return 0 ; +} + +static +int hdcp2_authenticate_repeater_topology (struct intel_connector +*connector) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +union { +struct hdcp2_rep_send_receiverid_list recvid_list; +struct hdcp2_rep_send_ack rep_ack; + } msgs; +const struct intel_hdcp_shim *shim = hdcp->hdcp_shim; +uint8_t *rx_info; +uint32_t seq_num_v; +int ret; + + ret = shim->read_2_2_msg(intel_dig_port,
HDCP_2_2_REP_SEND_RECVID_LIST,drivers/gpu/drm/i915/intel_hdcp.c +47
-0+ &msgs.recvid_list, sizeof(msgs.recvid_list)); +if (ret <0 ) +return ret; + + rx_info = msgs.recvid_list.rx_info; + +if (HDCP_2_2_MAX_CASCADE_EXCEEDED (rx_info[1 ]) || +HDCP_2_2_MAX_DEVS_EXCEEDED (rx_info[1 ])) { +DRM_DEBUG_KMS ("Topology Max Size Exceeded\n" ); +return -1 ; + } + +/* Converting and Storing the seq_num_v to local variable as DWORD */ +reverse_endianness ((u8 *)&seq_num_v,HDCP_2_2_SEQ_NUM_LEN , + msgs.recvid_list.seq_num_v); + +if (seq_num_v < hdcp->seq_num_v) { +/* Roll over of the seq_num_v from repeater. Reauthenticate. */ +DRM_DEBUG_KMS ("Seq_num_v roll over.\n" ); +return -1 ; + } + + ret =hdcp2_verify_rep_topology_prepare_ack (hdcp, &msgs.recvid_list, + &msgs.rep_ack); +if (ret <0 ) +return ret; + + hdcp->seq_num_v = seq_num_v; + ret = shim->write_2_2_msg (intel_dig_port, &msgs.rep_ack, +sizeof (msgs.rep_ack)); +if (ret <0 ) +return ret; + +return 0 ; +} + +static int hdcp2_authenticate_repeater (struct intel_connector +*connector) { +int ret; + + ret =hdcp2_authenticate_repeater_topology (connector); +if (ret <0 ) +return ret; + +return hdcp2_propagate_stream_management_info (connector); +} +static int hdcp2_authenticate_sink(struct intel_connector *connector) { struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);drivers/gpu/drm/i915/intel_hdcp.c +6
-0@@ -1186,6 +1315,12 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector) sizeof(stream_type_msg));if (ret <0 )return ret; + }else if (hdcp->is_repeater) { + ret =hdcp2_authenticate_repeater (connector); +if (ret <0 ) { +DRM_DEBUG_KMS ("Repeater Auth Failed. Err: %d\n" , ret); +return ret; + } }
Quoted 8 lines
Quoted 8 lines
hdcp->mei_data.streams[0].stream_type = hdcp->content_type;--
2.7.4_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 25/40 drm/i915: Enable and Disable HDCP2.2 port encryption
In reply to Ramalingam CImplements the enable and disable functions for HDCP2.2 encryption of the PORT.
v2:
intel_wait_for_register is used instead of wait_for. [Chris Wilson]
v3:
No Changes.
--- drivers/gpu/drm/i915/intel_hdcp.c | 54 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
drivers/gpu/drm/i915/intel_hdcp.c +54 -0
@@ -19,6 +19,7 @@ (enum hdcp_physical_port) (port))#define KEY_LOAD_TRIES 5#define HDCP2_LC_RETRY_CNT 3 +#define TIME_FOR_ENCRYPT_STATUS_CHANGE 32static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port,const struct intel_hdcp_shim *shim)
@@ -1330,3 +1331,56 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector)return ret; } + +static int hdcp2_enable_encryption (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; +enum port port = connector->encoder->port; +int ret; + +if (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS ) +return 0 ; + +if (hdcp->hdcp_shim->toggle_signalling) + hdcp->hdcp_shim->toggle_signalling (intel_dig_port, true); + +if (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_AUTH_STATUS ) { + +/* Link is Authenticated. Now set for Encryption */ +I915_WRITE (HDCP2_CTR_DDI (port), +I915_READ (HDCP2_CTR_DDI (port)) | +CTL_LINK_ENCRYPTION_REQ ); + } + + ret =intel_wait_for_register (dev_priv,HDCP2_STATUS_DDI (port), +LINK_ENCRYPTION_STATUS , +LINK_ENCRYPTION_STATUS , +TIME_FOR_ENCRYPT_STATUS_CHANGE ); +return ret; +} + +static int hdcp2_disable_encryption (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; +enum port port = connector->encoder->port; +int ret; + +if (!(I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS )) +return 0 ; + +I915_WRITE (HDCP2_CTR_DDI (port), +I915_READ (HDCP2_CTR_DDI (port)) & ~CTL_LINK_ENCRYPTION_REQ ); + + ret =intel_wait_for_register (dev_priv,HDCP2_STATUS_DDI (port), +LINK_ENCRYPTION_STATUS ,0x0 , +TIME_FOR_ENCRYPT_STATUS_CHANGE ); + +if (hdcp->hdcp_shim->toggle_signalling) + hdcp->hdcp_shim->toggle_signalling (intel_dig_port, false); + +return ret; +}
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
RE: [PATCH v3 25/40] drm/i915: Enable and Disable HDCP2.2 port encryption
Quoted 45 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 25/40] drm/i915: Enable and Disable HDCP2.2 port encryptionImplements the enable and disable functions for HDCP2.2 encryption of the PORT.
v2:
intel_wait_for_registeris used instead ofwait_for. [Chris Wilson]
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_hdcp.c| 54
+++++++++++++++++++++++++++++++++++++++1 file changed, 54 insertions(+)drivers/gpu/drm/i915/intel_hdcp.c +1
-0@@ -19,6 +19,7 @@ (enum hdcp_physical_port) (port))#define KEY_LOAD_TRIES 5#define HDCP2_LC_RETRY_CNT 3 +#define TIME_FOR_ENCRYPT_STATUS_CHANGE 32static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port, const struct intel_hdcp_shim *shim) @@ -1330,3 +1331,56 @@ static int
hdcp2_authenticate_sink(struct intel_connector *connector)return ret; }
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_authenticate_sink(struct intel_connector *connector) · line 1343
Quoted 9 lines
drivers/gpu/drm/i915/intel_hdcp.c +9
-0+ +static int hdcp2_enable_encryption (struct intel_connector *connector) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; +enum port port = connector->encoder->port; +int ret; + +if (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS )
Print a message saying "Encryption Already enabled" .
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_authenticate_sink(struct intel_connector *connector) · line 1346
Quoted 3 lines
drivers/gpu/drm/i915/intel_hdcp.c +3
-0+return 0 ; + +if (hdcp->hdcp_shim->toggle_signalling)
Check for "hdcp->hdcp_shim" as well.
Quoted 4 lines
drivers/gpu/drm/i915/intel_hdcp.c +4
-0+ hdcp->hdcp_shim->toggle_signalling (intel_dig_port, true); + +if (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_AUTH_STATUS ) { +
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_authenticate_sink(struct intel_connector *connector) · line 1360
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +10
-0+/* Link is Authenticated. Now set for Encryption */ +I915_WRITE (HDCP2_CTR_DDI (port), +I915_READ (HDCP2_CTR_DDI (port)) | +CTL_LINK_ENCRYPTION_REQ ); + } + + ret =intel_wait_for_register (dev_priv,HDCP2_STATUS_DDI (port), +LINK_ENCRYPTION_STATUS , +LINK_ENCRYPTION_STATUS , +TIME_FOR_ENCRYPT_STATUS_CHANGE );
Print a message in case of timeout.
Quoted 12 lines
drivers/gpu/drm/i915/intel_hdcp.c +12
-0+return ret; +} + +static int hdcp2_disable_encryption (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; +enum port port = connector->encoder->port; +int ret; + + if (!(I915_READ(HDCP2_STATUS_DDI(port)) &
Quoted 1 line
LINK_ENCRYPTION_STATUS))
Put a info message saying "Already Disabled" .
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_authenticate_sink(struct intel_connector *connector) · line 1380
Quoted 9 lines
drivers/gpu/drm/i915/intel_hdcp.c +4
-0+return 0 ; + + I915_WRITE(HDCP2_CTR_DDI(port), + I915_READ(HDCP2_CTR_DDI(port)) &~CTL_LINK_ENCRYPTION_REQ);
drivers/gpu/drm/i915/intel_hdcp.c +4
-0+ + ret =intel_wait_for_register (dev_priv,HDCP2_STATUS_DDI (port), +LINK_ENCRYPTION_STATUS ,0x0 , +TIME_FOR_ENCRYPT_STATUS_CHANGE );
If this times out, do we still need to toggle the signalling ?
drivers/gpu/drm/i915/intel_hdcp.c
Quoted 2 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-0+ +if (hdcp->hdcp_shim->toggle_signalling)
Check for validity of " hdcp->hdcp_shim".
Quoted 11 lines
drivers/gpu/drm/i915/intel_hdcp.c +4
-1+ hdcp->hdcp_shim->toggle_signalling (intel_dig_port, false); + +return ret; +} --2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 25/40] drm/i915: Enable and Disable HDCP2.2 port encryption
Quoted 42 lines · Uma
Quoted 42 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 25/40] drm/i915: Enable and Disable HDCP2.2 port encryptionImplements the enable and disable functions for HDCP2.2 encryption of the PORT.
v2:
intel_wait_for_registeris used instead ofwait_for. [Chris Wilson]
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_hdcp.c| 54
+++++++++++++++++++++++++++++++++++++++1 file changed, 54 insertions(+)drivers/gpu/drm/i915/intel_hdcp.c +1
-0@@ -19,6 +19,7 @@ (enum hdcp_physical_port) (port))#define KEY_LOAD_TRIES 5#define HDCP2_LC_RETRY_CNT 3 +#define TIME_FOR_ENCRYPT_STATUS_CHANGE 32static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port, const struct intel_hdcp_shim *shim) @@ -1330,3 +1331,56 @@ static int
hdcp2_authenticate_sink(struct intel_connector *connector)
Quoted 12 lines
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_authenticate_sink(struct intel_connector *connector) · line 1343
Quoted 11 lines
return ret; }drivers/gpu/drm/i915/intel_hdcp.c +9
-0+ +static int hdcp2_enable_encryption (struct intel_connector *connector) { +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; +enum port port = connector->encoder->port; +int ret; + +if (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_ENCRYPTION_STATUS )Print a message saying "Encryption Already enabled" .
It doesn't serve any purpose uma. why do we need this?
Quoted 4 lines
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_authenticate_sink(struct intel_connector *connector) · line 1346
Quoted 3 lines
drivers/gpu/drm/i915/intel_hdcp.c +3
-0+return 0 ; + +if (hdcp->hdcp_shim->toggle_signalling)Check for "
hdcp->hdcp_shim" as well.
Without hdcp_shim structure, we wont reach here.
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_hdcp.c +7
-0+ hdcp->hdcp_shim->toggle_signalling (intel_dig_port, true); + +if (I915_READ (HDCP2_STATUS_DDI (port)) &LINK_AUTH_STATUS ) { + +/* Link is Authenticated. Now set for Encryption */ + I915_WRITE(HDCP2_CTR_DDI(port), + I915_READ(HDCP2_CTR_DDI(port)) |
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_authenticate_sink(struct intel_connector *connector) · line 1360
Quoted 7 lines
drivers/gpu/drm/i915/intel_hdcp.c +7
-0+ CTL_LINK_ENCRYPTION_REQ); + } + + ret =intel_wait_for_register (dev_priv,HDCP2_STATUS_DDI (port), +LINK_ENCRYPTION_STATUS , +LINK_ENCRYPTION_STATUS , +TIME_FOR_ENCRYPT_STATUS_CHANGE );Print a message in case of timeout.
Yes. Since this timeout is unexpected, debug msg would help.
Quoted 15 lines
Quoted 13 lines
drivers/gpu/drm/i915/intel_hdcp.c +12
-0+return ret; +} + +static int hdcp2_disable_encryption (struct intel_connector *connector) +{ +struct intel_digital_port *intel_dig_port =conn_to_dig_port (connector); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_hdcp *hdcp = &connector->hdcp; +enum port port = connector->encoder->port; +int ret; + + if (!(I915_READ(HDCP2_STATUS_DDI(port)) &Quoted 1 line
LINK_ENCRYPTION_STATUS))Put a info message saying "Already Disabled" .
I feel this msg wont help uma.
Quoted 11 lines
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_authenticate_sink(struct intel_connector *connector) · line 1380
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +4
-0+return 0 ; + + I915_WRITE(HDCP2_CTR_DDI(port), + I915_READ(HDCP2_CTR_DDI(port)) &~CTL_LINK_ENCRYPTION_REQ);
drivers/gpu/drm/i915/intel_hdcp.c +4
-0+ + ret =intel_wait_for_register (dev_priv,HDCP2_STATUS_DDI (port), +LINK_ENCRYPTION_STATUS ,0x0 , +TIME_FOR_ENCRYPT_STATUS_CHANGE );If this times out, do we still need to toggle the signalling ?
As per the Bspec Encryption will stop in a frame time. So 32mSec should be adequate. So we need to toggle the hdcp signaling so that panel will know that unencrypted data is expected.
Quoted 3 lines
drivers/gpu/drm/i915/intel_hdcp.c
Quoted 2 lines
drivers/gpu/drm/i915/intel_hdcp.c +2
-0+ +if (hdcp->hdcp_shim->toggle_signalling)Check for validity of "
hdcp->hdcp_shim".
hdcp_shim will be valid at this point. but where as toggling function is only for hdmi.
--Ram
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c +4
-1+ hdcp->hdcp_shim->toggle_signalling (intel_dig_port, false); + +return ret; +} --2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 25/40] drm/i915: Enable and Disable HDCP2.2 port encryption
Quoted 80 lines · Ramalingam C
Quoted 42 lines · Uma
Quoted 42 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 25/40] drm/i915: Enable and Disable HDCP2.2 port encryptionImplements the enable and disable functions for HDCP2.2 encryption of the PORT.
v2:
intel_wait_for_registeris used instead ofwait_for. [Chris Wilson] v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_hdcp.c| 54
+++++++++++++++++++++++++++++++++++++++1 file changed, 54 insertions(+)drivers/gpu/drm/i915/intel_hdcp.c +1
-0@@ -19,6 +19,7 @@ (enum hdcp_physical_port) (port))#define KEY_LOAD_TRIES 5#define HDCP2_LC_RETRY_CNT 3 +#define TIME_FOR_ENCRYPT_STATUS_CHANGE 32 static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,const struct
intel_hdcp_shim*shim) @@ - 1330,3 +1331,56 @@ static inthdcp2_authenticate_sink(struct intel_connector *connector)Quoted 14 lines
Quoted 5 lines
return ret;
}drivers/gpu/drm/i915/intel_hdcp.c +2
-0+ +static int hdcp2_enable_encryption(struct intel_connector*connector) {
Quoted 8 lines
+ struct
intel_digital_port*intel_dig_port=conn_to_dig_port(connector);
+ structdrm_i915_private*dev_priv=to_i915(connector->base.dev); + structintel_hdcp*hdcp =&connector->hdcp;
+ enum port port =connector->encoder->port;
+ int ret;
+
+ if (I915_READ(HDCP2_STATUS_DDI(port)) &LINK_ENCRYPTION_STATUS)Print a message saying "Encryption Already enabled" .
It doesn't serve any purpose uma. why do we need this?
Quoted 4 lines
Quoted 3 lines
+ return 0;
+
+ if (hdcp->hdcp_shim->toggle_signalling)Check for "
hdcp->hdcp_shim" as well.Without
hdcp_shimstructure, we wont reach here.Quoted 7 lines
Quoted 7 lines
+
hdcp->hdcp_shim->toggle_signalling(intel_dig_port, true);drivers/gpu/drm/i915/intel_hdcp.c +6
-0+ + if (I915_READ(HDCP2_STATUS_DDI(port)) & LINK_AUTH_STATUS) { + + /* Link is Authenticated. Now set for Encryption */ + I915_WRITE(HDCP2_CTR_DDI(port), + I915_READ(HDCP2_CTR_DDI(port)) |Quoted 8 lines
Quoted 7 lines
+
CTL_LINK_ENCRYPTION_REQ);
+ }
+
+ ret = intel_wait_for_register(dev_priv,HDCP2_STATUS_DDI(port), +LINK_ENCRYPTION_STATUS,
+LINK_ENCRYPTION_STATUS,
+TIME_FOR_ENCRYPT_STATUS_CHANGE);Print a message in case of timeout.
Quoted 1 line
Yes. Since this timeout is unexpected, debug msg would help.
Sorry my bad, caller is already handling the error case. So such debug msg is needed only for disable sequence.
Quoted 45 lines
Quoted 16 lines
Quoted 7 lines
+ return ret;
drivers/gpu/drm/i915/intel_hdcp.c +5
-0+} + +static int hdcp2_disable_encryption (struct intel_connector *connector) +{ + struct intel_digital_port *intel_dig_port =Quoted 8 lines
conn_to_dig_port(connector);
+ structdrm_i915_private*dev_priv=to_i915(connector->base.dev); + structintel_hdcp*hdcp =&connector->hdcp;
+ enum port port =connector->encoder->port;
+ int ret;
+
+ if (!(I915_READ(HDCP2_STATUS_DDI(port)) &LINK_ENCRYPTION_STATUS))Put a info message saying "Already Disabled" .
I feel this msg wont help uma.
Quoted 11 lines
Quoted 10 lines
+ return 0;
+
+ I915_WRITE(HDCP2_CTR_DDI(port),
+ I915_READ(HDCP2_CTR_DDI(port)) & ~CTL_LINK_ENCRYPTION_REQ);
+
+ ret = intel_wait_for_register(dev_priv,HDCP2_STATUS_DDI(port), +LINK_ENCRYPTION_STATUS,0x0,
+TIME_FOR_ENCRYPT_STATUS_CHANGE);If this times out, do we still need to toggle the signalling ?
As per the Bspec Encryption will stop in a frame time. So 32mSec should be adequate. So we need to toggle the hdcp signaling so that panel will know that unencrypted data is expected.
Quoted 3 lines
Quoted 2 lines
+
+ if (hdcp->hdcp_shim->toggle_signalling)Check for validity of "
hdcp->hdcp_shim".
hdcp_shimwill be valid at this point. but where as toggling function is only for hdmi.--Ram
Quoted 8 lines
Quoted 8 lines
+
hdcp->hdcp_shim->toggle_signalling(intel_dig_port, false);drivers/gpu/drm/i915/intel_hdcp.c +3
-0+ + return ret; +}Signature · 1 line
2.7.4
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 26/40 drm/i915: Implement HDCP2.2 En/Dis-able
In reply to Ramalingam CImplements a sequence of enabling and disabling the HDCP2.2 (auth and encryption).
v2:
Rebased.
v3:
No Changes.
--- drivers/gpu/drm/i915/intel_hdcp.c | 75 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+)
drivers/gpu/drm/i915/intel_hdcp.c +75 -0
@@ -21,6 +21,9 @@#define HDCP2_LC_RETRY_CNT 3#define TIME_FOR_ENCRYPT_STATUS_CHANGE 32 +static int _intel_hdcp2_enable (struct intel_connector *connector); +static int _intel_hdcp2_disable (struct intel_connector *connector); +static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port,const struct intel_hdcp_shim *shim) {
@@ -1384,3 +1387,75 @@ static int hdcp2_disable_encryption(struct intel_connector *connector)return ret; } + +static int hdcp2_authenticate_and_encrypt (struct intel_connector *connector) +{ +int ret, i, tries =3 ; + +for (i =0 ; i < tries; i++) { + ret =hdcp2_authenticate_sink (connector); +if (!ret) +break ; + +/* Clearing the mei hdcp session */ +hdcp2_deauthenticate_port (&connector->hdcp); +DRM_DEBUG_KMS ("HDCP2.2 Auth %d of %d Failed.(%d)\n" , + i +1 , tries, ret); + } + +if (i != tries) { + +/* +* Ensuring the required 200mSec min time interval between +* Session Key Exchange and encryption. +*/ +msleep (HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN ); + ret =hdcp2_enable_encryption (connector); +if (ret <0 ) { +DRM_DEBUG_KMS ("Encryption Enable Failed.(%d)\n" , ret); +hdcp2_deauthenticate_port (&connector->hdcp); + } + } + +return ret; +} + +static int _intel_hdcp2_disable (struct intel_connector *connector) +{ +int ret; + +DRM_DEBUG_KMS ("[%s:%d] HDCP2.2 is being Disabled\n" , + connector->base.name, connector->base.base.id); + + ret =hdcp2_disable_encryption (connector); + +hdcp2_deauthenticate_port (&connector->hdcp); + +return ret; +} + +static int _intel_hdcp2_enable (struct intel_connector *connector) +{ +struct intel_hdcp *hdcp = &connector->hdcp; +int ret; + +DRM_DEBUG_KMS ("[%s:%d] HDCP2.2 is being enabled. Type: %d\n" , + connector->base.name, connector->base.base.id, + hdcp->content_type); + + ret =hdcp2_authenticate_and_encrypt (connector); +if (ret) { +DRM_ERROR ("HDCP2 Type%d Enabling Failed. (%d)\n" , + hdcp->content_type, ret); +return ret; + } + +DRM_DEBUG_KMS ("[%s:%d] HDCP2.2 is enabled. Type %d\n" , + connector->base.name, connector->base.base.id, + hdcp->content_type); + + hdcp->hdcp_value =DRM_MODE_CONTENT_PROTECTION_ENABLED ; +schedule_work (&hdcp->hdcp_prop_work); + +return 0 ; +}
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 26/40] drm/i915: Implement HDCP2.2 En/Dis-able
Quoted 12 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 26/40] drm/i915: Implement HDCP2.2 En/Dis-able
May be calling enable/disable sequence separately will be better :)
Quoted 65 lines
Implements a sequence of enabling and disabling the HDCP2.2 (auth and encryption).
v2:
Rebased.
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_hdcp.c| 75
+++++++++++++++++++++++++++++++++++++++1 file changed, 75 insertions(+)drivers/gpu/drm/i915/intel_hdcp.c +3
-0@@ -21,6 +21,9 @@#define HDCP2_LC_RETRY_CNT 3#define TIME_FOR_ENCRYPT_STATUS_CHANGE 32 +static int _intel_hdcp2_enable (struct intel_connector *connector); +static int _intel_hdcp2_disable (struct intel_connector *connector); +static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port, const struct intel_hdcp_shim *shim) { @@ -1384,3 +1387,75 @@ static int
hdcp2_disable_encryption(struct intel_connector *connector)return ret; }drivers/gpu/drm/i915/intel_hdcp.c +26
-0+ +static int hdcp2_authenticate_and_encrypt (struct intel_connector +*connector) { +int ret, i, tries =3 ; + +for (i =0 ; i < tries; i++) { + ret =hdcp2_authenticate_sink (connector); +if (!ret) +break ; + +/* Clearing the mei hdcp session */ +hdcp2_deauthenticate_port (&connector->hdcp); +DRM_DEBUG_KMS ("HDCP2.2 Auth %d of %d Failed.(%d)\n" , + i +1 , tries, ret); + } + +if (i != tries) { + +/* +* Ensuring the required 200mSec min time interval between +* Session Key Exchange and encryption. +*/ +msleep (HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN ); + ret =hdcp2_enable_encryption (connector); +if (ret <0 ) { + DRM_DEBUG_KMS("Encryption Enable Failed.(%d)\n",ret);
drivers/gpu/drm/i915/intel_hdcp.c +4
-0+hdcp2_deauthenticate_port (&connector->hdcp); + } + } +
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_disable_encryption(struct intel_connector *connector) · line 1430
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdcp.c +10
-0+return ret; +} + +static int _intel_hdcp2_disable (struct intel_connector *connector) { +int ret; + +DRM_DEBUG_KMS ("[%s:%d] HDCP2.2 is being Disabled\n" , + connector->base.name, connector->base.base.id); + + ret =hdcp2_disable_encryption (connector);
Check for return and print a message.
Quoted 33 lines
drivers/gpu/drm/i915/intel_hdcp.c +30
-1+ +hdcp2_deauthenticate_port (&connector->hdcp); + +return ret; +} + +static int _intel_hdcp2_enable (struct intel_connector *connector) { +struct intel_hdcp *hdcp = &connector->hdcp; +int ret; + +DRM_DEBUG_KMS ("[%s:%d] HDCP2.2 is being enabled. Type: %d\n" , + connector->base.name, connector->base.base.id, + hdcp->content_type); + + ret =hdcp2_authenticate_and_encrypt (connector); +if (ret) { +DRM_ERROR ("HDCP2 Type%d Enabling Failed. (%d)\n" , + hdcp->content_type, ret); +return ret; + } + +DRM_DEBUG_KMS ("[%s:%d] HDCP2.2 is enabled. Type %d\n" , + connector->base.name, connector->base.base.id, + hdcp->content_type); + + hdcp->hdcp_value =DRM_MODE_CONTENT_PROTECTION_ENABLED ; +schedule_work (&hdcp->hdcp_prop_work); + +return 0 ; +} --2.7.4
Quoted 3 lines
_______________________________________________
dri-devel mailing list
[email protected]
;>https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 26/40] drm/i915: Implement HDCP2.2 En/Dis-able
Quoted 80 lines · Uma
Quoted 11 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ramalingam C
Sent: Tuesday, April 3, 2018 7:28 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Winkler, Tomas <[email protected]>; Usyskin, Alexander <[email protected]>
Cc: Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3 26/40] drm/i915: Implement HDCP2.2 En/Dis-ableMay be calling enable/disable sequence separately will be better :)
Quoted 67 lines
Implements a sequence of enabling and disabling the HDCP2.2 (auth and encryption).
v2:
Rebased.
v3:
No Changes.Signed-off-by Ramalingam C <[email protected]>---
drivers/gpu/drm/i915/intel_hdcp.c| 75
+++++++++++++++++++++++++++++++++++++++1 file changed, 75 insertions(+)drivers/gpu/drm/i915/intel_hdcp.c +3
-0@@ -21,6 +21,9 @@#define HDCP2_LC_RETRY_CNT 3#define TIME_FOR_ENCRYPT_STATUS_CHANGE 32 +static int _intel_hdcp2_enable (struct intel_connector *connector); +static int _intel_hdcp2_disable (struct intel_connector *connector); +static int intel_hdcp_poll_ksv_fifo (struct intel_digital_port *intel_dig_port, const struct intel_hdcp_shim *shim) { @@ -1384,3 +1387,75 @@ static int
hdcp2_disable_encryption(struct intel_connector *connector)return ret; }drivers/gpu/drm/i915/intel_hdcp.c +26
-0+ +static int hdcp2_authenticate_and_encrypt (struct intel_connector +*connector) { +int ret, i, tries =3 ; + +for (i =0 ; i < tries; i++) { + ret =hdcp2_authenticate_sink (connector); +if (!ret) +break ; + +/* Clearing the mei hdcp session */ +hdcp2_deauthenticate_port (&connector->hdcp); +DRM_DEBUG_KMS ("HDCP2.2 Auth %d of %d Failed.(%d)\n" , + i +1 , tries, ret); + } + +if (i != tries) { + +/* +* Ensuring the required 200mSec min time interval between +* Session Key Exchange and encryption. +*/ +msleep (HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN ); + ret =hdcp2_enable_encryption (connector); +if (ret <0 ) { + DRM_DEBUG_KMS("Encryption Enable Failed.(%d)\n",ret);
drivers/gpu/drm/i915/intel_hdcp.c +7
-0+hdcp2_deauthenticate_port (&connector->hdcp); + } + } + +return ret; +} +
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdcp.c static int hdcp2_disable_encryption(struct intel_connector *connector) · line 1430
Quoted 7 lines
drivers/gpu/drm/i915/intel_hdcp.c +7
-0+static int _intel_hdcp2_disable (struct intel_connector *connector) { +int ret; + +DRM_DEBUG_KMS ("[%s:%d] HDCP2.2 is being Disabled\n" , + connector->base.name, connector->base.base.id); + + ret =hdcp2_disable_encryption (connector);Check for return and print a message.
Caller will handle the error cases I guess. So we will just pass the error here.
Quoted 34 lines
Quoted 34 lines
drivers/gpu/drm/i915/intel_hdcp.c +30
-1+ +hdcp2_deauthenticate_port (&connector->hdcp); + +return ret; +} + +static int _intel_hdcp2_enable (struct intel_connector *connector) { +struct intel_hdcp *hdcp = &connector->hdcp; +int ret; + +DRM_DEBUG_KMS ("[%s:%d] HDCP2.2 is being enabled. Type: %d\n" , + connector->base.name, connector->base.base.id, + hdcp->content_type); + + ret =hdcp2_authenticate_and_encrypt (connector); +if (ret) { +DRM_ERROR ("HDCP2 Type%d Enabling Failed. (%d)\n" , + hdcp->content_type, ret); +return ret; + } + +DRM_DEBUG_KMS ("[%s:%d] HDCP2.2 is enabled. Type %d\n" , + connector->base.name, connector->base.base.id, + hdcp->content_type); + + hdcp->hdcp_value =DRM_MODE_CONTENT_PROTECTION_ENABLED ; +schedule_work (&hdcp->hdcp_prop_work); + +return 0 ; +} --2.7.4
Quoted 4 lines
Quoted 3 lines
_______________________________________________
dri-devel mailing list
[email protected]
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel