From: "C, Ramalingam" <ramalingam.c@intel.com>
To: "Shankar, Uma" <uma.shankar@intel.com>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>,
"daniel.vetter@ffwll.ch" <daniel.vetter@ffwll.ch>,
"Winkler, Tomas" <tomas.winkler@intel.com>
Subject: Re: [PATCH v10 07/40] drm/i915: hdcp1.4 CP_IRQ handling and SW encryption tracking
Date: Mon, 4 Feb 2019 20:13:54 +0530 [thread overview]
Message-ID: <133f1b27-b9d0-4d04-5e2f-a3faed7c53e3@intel.com> (raw)
In-Reply-To: <E7C9878FBA1C6D42A1CA3F62AEB6945F81EEBFC5@BGSMSX104.gar.corp.intel.com>
On 2/4/2019 7:39 PM, Shankar, Uma wrote:
>
>> -----Original Message-----
>> From: C, Ramalingam
>> Sent: Thursday, January 31, 2019 12:29 PM
>> To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org;
>> daniel.vetter@ffwll.ch; Winkler, Tomas <tomas.winkler@intel.com>; Shankar,
>> Uma <uma.shankar@intel.com>
>> Cc: C, Ramalingam <ramalingam.c@intel.com>
>> Subject: [PATCH v10 07/40] drm/i915: hdcp1.4 CP_IRQ handling and SW
>> encryption tracking
>>
>> "hdcp_encrypted" flag is defined to denote the HDCP1.4 encryption status.
>> This SW tracking is used to determine the need for real hdcp1.4 disable and
>> hdcp_check_link upon CP_IRQ.
>>
>> On CP_IRQ we filter the CP_IRQ related to the states like Link failure and
>> reauthentication req etc and handle them in hdcp_check_link.
>> CP_IRQ corresponding to the authentication msg availability are ignored.
>>
>> WARN_ON is added for the abrupt stop of HDCP encryption of a port.
>>
>> v2:
>> bool is used in struct for the cleaner coding. [Daniel]
>> check_link work_fn is scheduled for cp_irq handling [Daniel]
>>
>> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_dp.c | 2 +-
>> drivers/gpu/drm/i915/intel_drv.h | 5 ++- drivers/gpu/drm/i915/intel_hdcp.c |
>> 73 ++++++++++++++++++++++++++++-----------
>> 3 files changed, 58 insertions(+), 22 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>> index 815ee68efa2f..9ce05819fc11 100644
>> --- a/drivers/gpu/drm/i915/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/intel_dp.c
>> @@ -4776,7 +4776,7 @@ static void intel_dp_check_service_irq(struct intel_dp
>> *intel_dp)
>> intel_dp_handle_test_request(intel_dp);
>>
>> if (val & DP_CP_IRQ)
>> - intel_hdcp_check_link(intel_dp->attached_connector);
>> + intel_hdcp_handle_cp_irq(intel_dp->attached_connector);
>>
>> if (val & DP_SINK_SPECIFIC_IRQ)
>> DRM_DEBUG_DRIVER("Sink specific irq unhandled\n"); diff --git
>> a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>> index 63e009286d5f..13a41e8cf4ff 100644
>> --- a/drivers/gpu/drm/i915/intel_drv.h
>> +++ b/drivers/gpu/drm/i915/intel_drv.h
>> @@ -399,6 +399,9 @@ struct intel_hdcp {
>> struct delayed_work check_work;
>> struct work_struct prop_work;
>>
>> + /* HDCP1.4 Encryption status */
>> + bool hdcp_encrypted;
>> +
>> /* HDCP2.2 related definitions */
>> /* Flag indicates whether this connector supports HDCP2.2 or not. */
>> bool hdcp2_supported;
>> @@ -2073,10 +2076,10 @@ int intel_hdcp_init(struct intel_connector
>> *connector,
>> bool hdcp2_supported);
>> int intel_hdcp_enable(struct intel_connector *connector); int
>> intel_hdcp_disable(struct intel_connector *connector); -int
>> intel_hdcp_check_link(struct intel_connector *connector); bool
>> is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port); bool
>> intel_hdcp_capable(struct intel_connector *connector); bool
>> is_hdcp2_supported(struct drm_i915_private *dev_priv);
>> +void intel_hdcp_handle_cp_irq(struct intel_connector *connector);
>>
>> /* intel_psr.c */
>> #define CAN_PSR(dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support)
>> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c
>> b/drivers/gpu/drm/i915/intel_hdcp.c
>> index e0bb5f32ba90..c1b057f1501b 100644
>> --- a/drivers/gpu/drm/i915/intel_hdcp.c
>> +++ b/drivers/gpu/drm/i915/intel_hdcp.c
>> @@ -74,6 +74,16 @@ bool intel_hdcp_capable(struct intel_connector
>> *connector)
>> return capable;
>> }
>>
>> +static inline bool intel_hdcp_in_use(struct intel_connector *connector)
>> +{
>> + struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>> + enum port port = connector->encoder->port;
>> + u32 reg;
>> +
>> + reg = I915_READ(PORT_HDCP_STATUS(port));
>> + return reg & HDCP_STATUS_ENC;
>> +}
>> +
>> static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port,
>> const struct intel_hdcp_shim *shim) { @@ -
>> 668,6 +678,7 @@ static int _intel_hdcp_disable(struct intel_connector
>> *connector)
>> DRM_DEBUG_KMS("[%s:%d] HDCP is being disabled...\n",
>> connector->base.name, connector->base.base.id);
>>
>> + hdcp->hdcp_encrypted = false;
>> I915_WRITE(PORT_HDCP_CONF(port), 0);
>> if (intel_wait_for_register(dev_priv, PORT_HDCP_STATUS(port), ~0, 0,
>> ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) {
>> @@ -713,8 +724,10 @@ 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), hdcp-
>>> shim);
>> - if (!ret)
>> + if (!ret) {
>> + hdcp->hdcp_encrypted = true;
>> return 0;
>> + }
>>
>> DRM_DEBUG_KMS("HDCP Auth failure (%d)\n", ret);
>>
>> @@ -741,16 +754,17 @@ int intel_hdcp_check_link(struct intel_connector
>> *connector)
>> enum port port = intel_dig_port->base.port;
>> int ret = 0;
>>
>> - if (!hdcp->shim)
>> - return -ENOENT;
>> -
>> mutex_lock(&hdcp->mutex);
>>
>> - if (hdcp->value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
>> + /* Check_link valid only when HDCP1.4 is enabled */
>> + if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||
>> + !hdcp->hdcp_encrypted) {
>> + ret = -EINVAL;
>> goto out;
>> + }
>>
>> - if (!(I915_READ(PORT_HDCP_STATUS(port)) & HDCP_STATUS_ENC)) {
>> - DRM_ERROR("%s:%d HDCP check failed: link is not
>> encrypted,%x\n",
>> + if (WARN_ON(!intel_hdcp_in_use(connector))) {
>> + DRM_ERROR("%s:%d HDCP link stopped encryption,%x\n",
>> connector->base.name, connector->base.base.id,
>> I915_READ(PORT_HDCP_STATUS(port)));
>> ret = -ENXIO;
>> @@ -791,18 +805,6 @@ int intel_hdcp_check_link(struct intel_connector
>> *connector)
>> return ret;
>> }
>>
>> -static void intel_hdcp_check_work(struct work_struct *work) -{
>> - struct intel_hdcp *hdcp = container_of(to_delayed_work(work),
>> - struct intel_hdcp,
>> - check_work);
>> - struct intel_connector *connector = intel_hdcp_to_connector(hdcp);
>> -
>> - if (!intel_hdcp_check_link(connector))
>> - schedule_delayed_work(&hdcp->check_work,
>> - DRM_HDCP_CHECK_PERIOD_MS);
>> -}
>> -
>> static void intel_hdcp_prop_work(struct work_struct *work) {
>> struct intel_hdcp *hdcp = container_of(work, struct intel_hdcp, @@ -
>> 1120,6 +1122,18 @@ int hdcp2_deauthenticate_port(struct intel_connector
>> *connector)
>> return hdcp2_close_mei_session(connector);
>> }
>>
>> +static void intel_hdcp_check_work(struct work_struct *work) {
> Why this code movement for check_work. If not intentional no need for this change.
> With proper justification or this fixed.
All common(1.4 and 2.2) HDCP functions (enable, disable, check_work etc)
are gathered together
Thanks for R-b.
--Ram
>
> Reviewed-by: Uma Shankar <uma.shankar@intel.com>
>
>> + struct intel_hdcp *hdcp = container_of(to_delayed_work(work),
>> + struct intel_hdcp,
>> + check_work);
>> + struct intel_connector *connector = intel_hdcp_to_connector(hdcp);
>> +
>> + if (!intel_hdcp_check_link(connector))
>> + schedule_delayed_work(&hdcp->check_work,
>> + DRM_HDCP_CHECK_PERIOD_MS);
>> +}
>> +
>> static int i915_hdcp_component_bind(struct device *i915_kdev,
>> struct device *mei_kdev, void *data) { @@ -
>> 1288,7 +1302,8 @@ int intel_hdcp_disable(struct intel_connector *connector)
>>
>> if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
>> hdcp->value =
>> DRM_MODE_CONTENT_PROTECTION_UNDESIRED;
>> - ret = _intel_hdcp_disable(connector);
>> + if (hdcp->hdcp_encrypted)
>> + ret = _intel_hdcp_disable(connector);
>> }
>>
>> mutex_unlock(&hdcp->mutex);
>> @@ -1328,3 +1343,21 @@ void intel_hdcp_atomic_check(struct drm_connector
>> *connector,
>> new_state->crtc);
>> crtc_state->mode_changed = true;
>> }
>> +
>> +/* Handles the CP_IRQ raised from the DP HDCP sink */ void
>> +intel_hdcp_handle_cp_irq(struct intel_connector *connector) {
>> + struct intel_hdcp *hdcp = &connector->hdcp;
>> +
>> + if (!hdcp->shim)
>> + return;
>> +
>> + /*
>> + * CP_IRQ could be triggered due to 1. HDCP2.2 auth msgs availability,
>> + * 2. link failure and 3. repeater reauth request. At present we dont
>> + * handle the CP_IRQ for the HDCP2.2 auth msg availability for read.
>> + * To handle other two causes for CP_IRQ we have the work_fn which is
>> + * scheduled here.
>> + */
>> + schedule_delayed_work(&hdcp->check_work, 0); }
>> --
>> 2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-02-04 14:43 UTC|newest]
Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 6:59 [PATCH v10 00/40] drm/i915: Implement HDCP2.2 Ramalingam C
2019-01-31 6:59 ` [PATCH v10 01/40] components: multiple components for a device Ramalingam C
2019-01-31 7:50 ` Greg Kroah-Hartman
2019-01-31 8:00 ` Daniel Vetter
2019-01-31 8:12 ` Greg Kroah-Hartman
2019-01-31 8:39 ` Daniel Vetter
2019-01-31 14:46 ` [PATCH 1/2] component: Add documentation Daniel Vetter
2019-01-31 14:46 ` [PATCH 2/2] components: multiple components for a device Daniel Vetter
2019-02-04 16:00 ` Daniel Vetter
2019-02-05 10:47 ` [PATCH 1/2] component: Add documentation Rafael J. Wysocki
2019-02-05 16:20 ` Daniel Vetter
2019-02-05 16:21 ` [PATCH] " Daniel Vetter
2019-02-05 16:49 ` Russell King - ARM Linux admin
2019-02-05 18:45 ` Daniel Vetter
2019-02-06 16:45 ` [PATCH 1/3] " Daniel Vetter
2019-02-06 16:45 ` [PATCH 2/3] components: multiple components for a device Daniel Vetter
2019-02-06 22:57 ` Rafael J. Wysocki
2019-02-07 22:35 ` Daniel Vetter
2019-02-07 22:40 ` Daniel Vetter
2019-02-07 22:48 ` Rafael J. Wysocki
2019-02-06 16:45 ` [PATCH 3/3] drm/doc: document recommended component helper usage Daniel Vetter
2019-02-06 16:47 ` [PATCH] component: Add documentation Daniel Vetter
2019-02-06 22:01 ` Rafael J. Wysocki
2019-01-31 6:59 ` [PATCH v10 02/40] i915/snd_hdac: I915 subcomponent for the snd_hdac Ramalingam C
2019-02-04 15:00 ` Daniel Vetter
2019-02-04 15:09 ` Takashi Iwai
2019-01-31 6:59 ` [PATCH v10 03/40] drm/i915: Gathering the HDCP1.4 routines together Ramalingam C
2019-02-04 13:11 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 04/40] drm: header for i915 - MEI_HDCP interface Ramalingam C
2019-02-04 13:24 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 05/40] drm/i915: Initialize HDCP2.2 Ramalingam C
2019-02-04 13:29 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 06/40] drm/i915: MEI interface definition Ramalingam C
2019-01-31 8:17 ` Daniel Vetter
2019-01-31 13:39 ` C, Ramalingam
2019-01-31 6:59 ` [PATCH v10 07/40] drm/i915: hdcp1.4 CP_IRQ handling and SW encryption tracking Ramalingam C
2019-01-31 7:56 ` Daniel Vetter
2019-01-31 13:41 ` C, Ramalingam
2019-02-04 14:09 ` Shankar, Uma
2019-02-04 14:43 ` C, Ramalingam [this message]
2019-01-31 6:59 ` [PATCH v10 08/40] drm/i915: Enable and Disable of HDCP2.2 Ramalingam C
2019-02-04 14:17 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 09/40] drm/i915: Implement HDCP2.2 receiver authentication Ramalingam C
2019-02-04 14:20 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 10/40] drm: helper functions for hdcp2 seq_num to from u32 Ramalingam C
2019-02-04 14:20 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 11/40] drm/i915: Implement HDCP2.2 repeater authentication Ramalingam C
2019-02-04 14:21 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 12/40] drm: HDCP2.2 link check period Ramalingam C
2019-02-04 14:24 ` Shankar, Uma
2019-02-04 14:50 ` C, Ramalingam
2019-01-31 6:59 ` [PATCH v10 13/40] drm/i915: Implement HDCP2.2 link integrity check Ramalingam C
2019-02-04 14:28 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 14/40] drm/i915: Handle HDCP2.2 downstream topology change Ramalingam C
2019-02-04 14:31 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 15/40] drm: removing the DP Errata msg and its msg id Ramalingam C
2019-01-31 8:02 ` Daniel Vetter
2019-02-04 14:35 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 16/40] drm/i915: Implement the HDCP2.2 support for DP Ramalingam C
2019-02-04 16:02 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 17/40] drm/i915: Implement the HDCP2.2 support for HDMI Ramalingam C
2019-02-04 16:03 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 18/40] drm/i915: CP_IRQ handling for DP HDCP2.2 msgs Ramalingam C
2019-01-31 8:08 ` Daniel Vetter
2019-01-31 12:50 ` Daniel Vetter
2019-01-31 6:59 ` [PATCH v10 19/40] drm/i915: Add HDCP2.2 support for DP connectors Ramalingam C
2019-02-04 16:08 ` Winkler, Tomas
2019-01-31 6:59 ` [PATCH v10 20/40] drm/i915: Add HDCP2.2 support for HDMI connectors Ramalingam C
2019-02-04 16:04 ` Winkler, Tomas
2019-02-04 16:11 ` C, Ramalingam
2019-01-31 6:59 ` [PATCH v10 21/40] mei: bus: whitelist hdcp client Ramalingam C
2019-01-31 6:59 ` [PATCH v10 22/40] mei: bus: export to_mei_cl_device for mei client device drivers Ramalingam C
2019-01-31 6:59 ` [PATCH v10 23/40] misc/mei/hdcp: Client driver for HDCP application Ramalingam C
2019-02-05 12:33 ` Winkler, Tomas
2019-01-31 6:59 ` [PATCH v10 24/40] misc/mei/hdcp: Define ME FW interface for HDCP2.2 Ramalingam C
2019-02-04 16:07 ` Shankar, Uma
2019-02-05 13:01 ` Winkler, Tomas
2019-01-31 6:59 ` [PATCH v10 25/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session Ramalingam C
2019-02-04 16:09 ` Shankar, Uma
2019-02-05 13:09 ` Winkler, Tomas
2019-02-05 14:13 ` C, Ramalingam
2019-02-06 10:27 ` Winkler, Tomas
2019-02-06 21:14 ` C, Ramalingam
2019-01-31 6:59 ` [PATCH v10 26/40] misc/mei/hdcp: Verify Receiver Cert and prepare km Ramalingam C
2019-02-04 16:10 ` Shankar, Uma
2019-02-06 8:28 ` Winkler, Tomas
2019-01-31 6:59 ` [PATCH v10 27/40] misc/mei/hdcp: Verify H_prime Ramalingam C
2019-02-04 16:11 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 28/40] misc/mei/hdcp: Store the HDCP Pairing info Ramalingam C
2019-02-04 16:13 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 29/40] misc/mei/hdcp: Initiate Locality check Ramalingam C
2019-02-04 16:16 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 30/40] misc/mei/hdcp: Verify L_prime Ramalingam C
2019-02-04 16:16 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 31/40] misc/mei/hdcp: Prepare Session Key Ramalingam C
2019-02-04 16:17 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 32/40] misc/mei/hdcp: Repeater topology verification and ack Ramalingam C
2019-02-04 16:17 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 33/40] misc/mei/hdcp: Verify M_prime Ramalingam C
2019-02-04 16:18 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 34/40] misc/mei/hdcp: Enabling the HDCP authentication Ramalingam C
2019-02-04 16:19 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 35/40] misc/mei/hdcp: Closing wired HDCP2.2 Tx Session Ramalingam C
2019-02-04 16:20 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 36/40] misc/mei/hdcp: Component framework for I915 Interface Ramalingam C
2019-01-31 8:23 ` Daniel Vetter
2019-02-04 16:27 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 37/40] drm/i915: Commit CP without modeset Ramalingam C
2019-01-31 8:32 ` Daniel Vetter
2019-02-04 8:39 ` C, Ramalingam
2019-01-31 6:59 ` [PATCH v10 38/40] drm/i915: Fix KBL HDCP2.2 encrypt status signalling Ramalingam C
2019-02-04 15:32 ` C, Ramalingam
2019-02-05 8:54 ` Daniel Vetter
2019-02-04 16:35 ` Shankar, Uma
2019-01-31 6:59 ` [PATCH v10 39/40] FOR_TEST: i915/Kconfig: Select mei_hdcp by I915 Ramalingam C
2019-01-31 6:59 ` [PATCH v10 40/40] FOR_TESTING_ONLY: debugfs: Excluding the LSPCon for HDCP1.4 Ramalingam C
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=133f1b27-b9d0-4d04-5e2f-a3faed7c53e3@intel.com \
--to=ramalingam.c@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=tomas.winkler@intel.com \
--cc=uma.shankar@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).