* [PATCH v4 08/14] drm/msm/dpu_kms: Re-order dpu includes
[not found] <20211105030434.2828845-1-sean@poorly.run>
@ 2021-11-05 3:04 ` Sean Paul
2021-11-05 3:04 ` [PATCH v4 09/14] drm/msm/dpu: Remove useless checks in dpu_encoder Sean Paul
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Sean Paul @ 2021-11-05 3:04 UTC (permalink / raw)
To: dri-devel, intel-gfx, freedreno
Cc: bjorn.andersson, swboyd, jani.nikula, abhinavk, Sean Paul,
Dmitry Baryshkov, Rob Clark, Sean Paul, David Airlie,
Daniel Vetter, linux-arm-msm
From: Sean Paul <seanpaul@chromium.org>
Make includes alphabetical in dpu_kms.c
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-9-sean@poorly.run #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-9-sean@poorly.run #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-9-sean@poorly.run #v3
Changes in v2:
-None
Changes in v3:
-None
Changes in v4:
-None
---
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index a15b26428280..66b7df7daa6a 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -21,14 +21,14 @@
#include "msm_gem.h"
#include "disp/msm_disp_snapshot.h"
-#include "dpu_kms.h"
#include "dpu_core_irq.h"
+#include "dpu_crtc.h"
+#include "dpu_encoder.h"
#include "dpu_formats.h"
#include "dpu_hw_vbif.h"
-#include "dpu_vbif.h"
-#include "dpu_encoder.h"
+#include "dpu_kms.h"
#include "dpu_plane.h"
-#include "dpu_crtc.h"
+#include "dpu_vbif.h"
#define CREATE_TRACE_POINTS
#include "dpu_trace.h"
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v4 09/14] drm/msm/dpu: Remove useless checks in dpu_encoder
[not found] <20211105030434.2828845-1-sean@poorly.run>
2021-11-05 3:04 ` [PATCH v4 08/14] drm/msm/dpu_kms: Re-order dpu includes Sean Paul
@ 2021-11-05 3:04 ` Sean Paul
2021-11-05 3:04 ` [PATCH v4 10/14] drm/msm/dpu: Remove encoder->enable() hack Sean Paul
` (4 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Sean Paul @ 2021-11-05 3:04 UTC (permalink / raw)
To: dri-devel, intel-gfx, freedreno
Cc: bjorn.andersson, swboyd, jani.nikula, abhinavk, Sean Paul,
Dmitry Baryshkov, Rob Clark, Sean Paul, David Airlie,
Daniel Vetter, linux-arm-msm
From: Sean Paul <seanpaul@chromium.org>
A couple more useless checks to remove in dpu_encoder.
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-10-sean@poorly.run #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-10-sean@poorly.run #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-10-sean@poorly.run #v3
Changes in v2:
-None
Changes in v3:
-None
Changes in v4:
-None
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index e7ee4cfb8461..cc57c615be67 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1148,10 +1148,6 @@ static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)
struct msm_drm_private *priv;
struct drm_display_mode *cur_mode = NULL;
- if (!drm_enc) {
- DPU_ERROR("invalid encoder\n");
- return;
- }
dpu_enc = to_dpu_encoder_virt(drm_enc);
mutex_lock(&dpu_enc->enc_lock);
@@ -1197,14 +1193,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)
struct msm_drm_private *priv;
int i = 0;
- if (!drm_enc) {
- DPU_ERROR("invalid encoder\n");
- return;
- } else if (!drm_enc->dev) {
- DPU_ERROR("invalid dev\n");
- return;
- }
-
dpu_enc = to_dpu_encoder_virt(drm_enc);
DPU_DEBUG_ENC(dpu_enc, "\n");
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v4 10/14] drm/msm/dpu: Remove encoder->enable() hack
[not found] <20211105030434.2828845-1-sean@poorly.run>
2021-11-05 3:04 ` [PATCH v4 08/14] drm/msm/dpu_kms: Re-order dpu includes Sean Paul
2021-11-05 3:04 ` [PATCH v4 09/14] drm/msm/dpu: Remove useless checks in dpu_encoder Sean Paul
@ 2021-11-05 3:04 ` Sean Paul
2021-11-05 3:04 ` [PATCH v4 11/14] drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules Sean Paul
` (3 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Sean Paul @ 2021-11-05 3:04 UTC (permalink / raw)
To: dri-devel, intel-gfx, freedreno
Cc: bjorn.andersson, swboyd, jani.nikula, abhinavk, Sean Paul,
Dmitry Baryshkov, Rob Clark, Sean Paul, David Airlie,
Daniel Vetter, linux-arm-msm
From: Sean Paul <seanpaul@chromium.org>
encoder->commit() was being misused because there were some global
resources which needed to be tweaked in encoder->enable() which were not
accessible in dpu_encoder.c. That is no longer true and the redirect
serves no purpose any longer. So remove the indirection.
Tested-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-11-sean@poorly.run #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-11-sean@poorly.run #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-11-sean@poorly.run #v3
Changes in v2:
-None
Changes in v3:
-None
Changes in v4:
-None
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 5 +----
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 22 ---------------------
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 --
drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 ----
4 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index cc57c615be67..c83bfda6a1ee 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -2116,11 +2116,8 @@ static void dpu_encoder_frame_done_timeout(struct timer_list *t)
static const struct drm_encoder_helper_funcs dpu_encoder_helper_funcs = {
.mode_set = dpu_encoder_virt_mode_set,
.disable = dpu_encoder_virt_disable,
- .enable = dpu_kms_encoder_enable,
+ .enable = dpu_encoder_virt_enable,
.atomic_check = dpu_encoder_virt_atomic_check,
-
- /* This is called by dpu_kms_encoder_enable */
- .commit = dpu_encoder_virt_enable,
};
static const struct drm_encoder_funcs dpu_encoder_funcs = {
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 66b7df7daa6a..891faf8d6e21 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -384,28 +384,6 @@ static void dpu_kms_flush_commit(struct msm_kms *kms, unsigned crtc_mask)
}
}
-/*
- * Override the encoder enable since we need to setup the inline rotator and do
- * some crtc magic before enabling any bridge that might be present.
- */
-void dpu_kms_encoder_enable(struct drm_encoder *encoder)
-{
- const struct drm_encoder_helper_funcs *funcs = encoder->helper_private;
- struct drm_device *dev = encoder->dev;
- struct drm_crtc *crtc;
-
- /* Forward this enable call to the commit hook */
- if (funcs && funcs->commit)
- funcs->commit(encoder);
-
- drm_for_each_crtc(crtc, dev) {
- if (!(crtc->state->encoder_mask & drm_encoder_mask(encoder)))
- continue;
-
- trace_dpu_kms_enc_enable(DRMID(crtc));
- }
-}
-
static void dpu_kms_complete_commit(struct msm_kms *kms, unsigned crtc_mask)
{
struct dpu_kms *dpu_kms = to_dpu_kms(kms);
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
index 775bcbda860f..0707b2cb43c8 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
@@ -235,8 +235,6 @@ void *dpu_debugfs_get_root(struct dpu_kms *dpu_kms);
int dpu_enable_vblank(struct msm_kms *kms, struct drm_crtc *crtc);
void dpu_disable_vblank(struct msm_kms *kms, struct drm_crtc *crtc);
-void dpu_kms_encoder_enable(struct drm_encoder *encoder);
-
/**
* dpu_kms_get_clk_rate() - get the clock rate
* @dpu_kms: pointer to dpu_kms structure
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
index 37bba57675a8..54d74341e690 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
@@ -266,10 +266,6 @@ DEFINE_EVENT(dpu_drm_obj_template, dpu_crtc_complete_commit,
TP_PROTO(uint32_t drm_id),
TP_ARGS(drm_id)
);
-DEFINE_EVENT(dpu_drm_obj_template, dpu_kms_enc_enable,
- TP_PROTO(uint32_t drm_id),
- TP_ARGS(drm_id)
-);
DEFINE_EVENT(dpu_drm_obj_template, dpu_kms_commit,
TP_PROTO(uint32_t drm_id),
TP_ARGS(drm_id)
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v4 11/14] drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules
[not found] <20211105030434.2828845-1-sean@poorly.run>
` (2 preceding siblings ...)
2021-11-05 3:04 ` [PATCH v4 10/14] drm/msm/dpu: Remove encoder->enable() hack Sean Paul
@ 2021-11-05 3:04 ` Sean Paul
2021-11-05 3:04 ` [PATCH v4 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers Sean Paul
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Sean Paul @ 2021-11-05 3:04 UTC (permalink / raw)
To: dri-devel, intel-gfx, freedreno
Cc: bjorn.andersson, swboyd, jani.nikula, abhinavk, Sean Paul,
Dmitry Baryshkov, Rob Clark, Sean Paul, David Airlie,
Daniel Vetter, linux-arm-msm
From: Sean Paul <seanpaul@chromium.org>
Audio is initialized last, it should be de-initialized first to match
the order in dp_init_sub_modules().
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-12-sean@poorly.run #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-12-sean@poorly.run #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-12-sean@poorly.run #v3
Changes in v2:
-None
Changes in v3:
-None
Changes in v4:
-None
---
drivers/gpu/drm/msm/dp/dp_display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index aba8aa47ed76..79412a8fbaff 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -707,9 +707,9 @@ static int dp_irq_hpd_handle(struct dp_display_private *dp, u32 data)
static void dp_display_deinit_sub_modules(struct dp_display_private *dp)
{
dp_debug_put(dp->debug);
+ dp_audio_put(dp->audio);
dp_panel_put(dp->panel);
dp_aux_put(dp->aux);
- dp_audio_put(dp->audio);
}
static int dp_init_sub_modules(struct dp_display_private *dp)
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v4 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers
[not found] <20211105030434.2828845-1-sean@poorly.run>
` (3 preceding siblings ...)
2021-11-05 3:04 ` [PATCH v4 11/14] drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules Sean Paul
@ 2021-11-05 3:04 ` Sean Paul
2021-11-12 22:06 ` Rob Herring
2021-11-05 3:04 ` [PATCH v4 13/14] arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller Sean Paul
2021-11-05 3:04 ` [PATCH v4 14/14] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers Sean Paul
6 siblings, 1 reply; 13+ messages in thread
From: Sean Paul @ 2021-11-05 3:04 UTC (permalink / raw)
To: dri-devel, intel-gfx, freedreno
Cc: bjorn.andersson, swboyd, jani.nikula, abhinavk, Sean Paul,
Rob Herring, Rob Clark, Sean Paul, David Airlie, Daniel Vetter,
Rob Herring, Kuogee Hsieh, linux-arm-msm, devicetree
From: Sean Paul <seanpaul@chromium.org>
This patch adds the bindings for the MSM DisplayPort HDCP registers
which are required to write the HDCP key into the display controller as
well as the registers to enable HDCP authentication/key
exchange/encryption.
We'll use a new compatible string for this since the fields are optional.
Cc: Rob Herring <robh@kernel.org>
Cc: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-13-sean@poorly.run #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-13-sean@poorly.run #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-13-sean@poorly.run #v3
Changes in v2:
-Drop register range names (Stephen)
-Fix yaml errors (Rob)
Changes in v3:
-Add new compatible string for dp-hdcp
-Add descriptions to reg
-Add minItems/maxItems to reg
-Make reg depend on the new hdcp compatible string
Changes in v4:
-Rebase on Bjorn's multi-dp patchset
---
.../devicetree/bindings/display/msm/dp-controller.yaml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml
index b36d74c1da7c..f6e4b102373a 100644
--- a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml
+++ b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml
@@ -21,12 +21,16 @@ properties:
- qcom,sc8180x-edp
reg:
+ minItems: 5
+ maxItems: 7
items:
- description: ahb register block
- description: aux register block
- description: link register block
- description: p0 register block
- description: p1 register block
+ - description: (Optional) Registers for HDCP device key injection
+ - description: (Optional) Registers for HDCP TrustZone interaction
interrupts:
maxItems: 1
@@ -111,7 +115,9 @@ examples:
<0xae90200 0x200>,
<0xae90400 0xc00>,
<0xae91000 0x400>,
- <0xae91400 0x400>;
+ <0xae91400 0x400>,
+ <0x0aed1000 0x174>,
+ <0x0aee1000 0x2c>;
interrupt-parent = <&mdss>;
interrupts = <12>;
clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v4 13/14] arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller
[not found] <20211105030434.2828845-1-sean@poorly.run>
` (4 preceding siblings ...)
2021-11-05 3:04 ` [PATCH v4 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers Sean Paul
@ 2021-11-05 3:04 ` Sean Paul
2021-12-08 22:06 ` [Freedreno] " Rob Clark
2021-11-05 3:04 ` [PATCH v4 14/14] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers Sean Paul
6 siblings, 1 reply; 13+ messages in thread
From: Sean Paul @ 2021-11-05 3:04 UTC (permalink / raw)
To: dri-devel, intel-gfx, freedreno
Cc: bjorn.andersson, swboyd, jani.nikula, abhinavk, Sean Paul,
Andy Gross, Rob Herring, linux-arm-msm, devicetree
From: Sean Paul <seanpaul@chromium.org>
This patch adds the register ranges required for HDCP key injection and
HDCP TrustZone interaction as described in the dt-bindings for the
sc7180 dp controller. Now that these are supported, change the
compatible string to "dp-hdcp".
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-15-sean@poorly.run #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-14-sean@poorly.run #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-14-sean@poorly.run #v3
Changes in v3:
-Split off into a new patch containing just the dts change (Stephen)
-Add hdcp compatible string (Stephen)
Changes in v4:
-Rebase on Bjorn's multi-dp patchset
---
arch/arm64/boot/dts/qcom/sc7180.dtsi | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index c8921e2d6480..838270f70b62 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -3088,7 +3088,13 @@ mdss_dp: displayport-controller@ae90000 {
compatible = "qcom,sc7180-dp";
status = "disabled";
- reg = <0 0x0ae90000 0 0x1400>;
+ reg = <0 0x0ae90000 0 0x200>,
+ <0 0x0ae90200 0 0x200>,
+ <0 0x0ae90400 0 0xc00>,
+ <0 0x0ae91000 0 0x400>,
+ <0 0x0ae91400 0 0x400>,
+ <0 0x0aed1000 0 0x175>,
+ <0 0x0aee1000 0 0x2c>;
interrupt-parent = <&mdss>;
interrupts = <12>;
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v4 14/14] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers
[not found] <20211105030434.2828845-1-sean@poorly.run>
` (5 preceding siblings ...)
2021-11-05 3:04 ` [PATCH v4 13/14] arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller Sean Paul
@ 2021-11-05 3:04 ` Sean Paul
2021-12-09 3:31 ` Stephen Boyd
2022-02-09 21:41 ` Dmitry Baryshkov
6 siblings, 2 replies; 13+ messages in thread
From: Sean Paul @ 2021-11-05 3:04 UTC (permalink / raw)
To: dri-devel, intel-gfx, freedreno
Cc: bjorn.andersson, swboyd, jani.nikula, abhinavk, Sean Paul,
Rob Clark, Sean Paul, David Airlie, Daniel Vetter, linux-arm-msm
From: Sean Paul <seanpaul@chromium.org>
This patch adds HDCP 1.x support to msm DP connectors using the new HDCP
helpers.
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Abhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-15-sean@poorly.run #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-14-sean@poorly.run #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-15-sean@poorly.run #v3
Changes in v2:
-Squash [1] into this patch with the following changes (Stephen)
-Update the sc7180 dtsi file
-Remove resource names and just use index (Stephen)
Changes in v3:
-Split out the dtsi change from v2 (Stephen)
-Fix set-but-unused warning identified by 0-day
-Fix up a couple of style nits (Stephen)
-Store HDCP key directly in dp_hdcp struct (Stephen)
-Remove wmb in HDCP key initialization, move an_seed (Stephen)
-Use FIELD_PREP for bstatus/bcaps (Stephen)
-#define read_poll_timeout values (Stephen)
-Remove unnecessary parentheses in dp_hdcp_store_ksv_fifo (Stephen)
-Add compatible string for hdcp (Stephen)
-Rename dp_hdcp_write_* functions (Abhinav)
-Add 1us delay between An reads (Abhinav)
-Delete unused dp_hdcp_read_* functions
Changes in v4:
-Rebase on Bjorn's multi-dp patchset
[1] https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-14-sean@poorly.run
---
drivers/gpu/drm/msm/Makefile | 1 +
drivers/gpu/drm/msm/dp/dp_debug.c | 46 ++-
drivers/gpu/drm/msm/dp/dp_debug.h | 6 +-
drivers/gpu/drm/msm/dp/dp_display.c | 46 ++-
drivers/gpu/drm/msm/dp/dp_display.h | 5 +
drivers/gpu/drm/msm/dp/dp_drm.c | 68 +++-
drivers/gpu/drm/msm/dp/dp_drm.h | 5 +
drivers/gpu/drm/msm/dp/dp_hdcp.c | 462 ++++++++++++++++++++++++++++
drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 ++
drivers/gpu/drm/msm/dp/dp_parser.c | 20 +-
drivers/gpu/drm/msm/dp/dp_parser.h | 4 +
drivers/gpu/drm/msm/dp/dp_reg.h | 32 +-
drivers/gpu/drm/msm/msm_atomic.c | 15 +
13 files changed, 729 insertions(+), 8 deletions(-)
create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c
create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
index 40577f8856d8..fb3411a74e61 100644
--- a/drivers/gpu/drm/msm/Makefile
+++ b/drivers/gpu/drm/msm/Makefile
@@ -108,6 +108,7 @@ msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \
dp/dp_ctrl.o \
dp/dp_display.o \
dp/dp_drm.o \
+ dp/dp_hdcp.o \
dp/dp_hpd.o \
dp/dp_link.o \
dp/dp_panel.o \
diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c
index da4323556ef3..c16fce17d096 100644
--- a/drivers/gpu/drm/msm/dp/dp_debug.c
+++ b/drivers/gpu/drm/msm/dp/dp_debug.c
@@ -8,6 +8,7 @@
#include <linux/debugfs.h>
#include <drm/drm_connector.h>
#include <drm/drm_file.h>
+#include <drm/drm_hdcp.h>
#include "dp_parser.h"
#include "dp_catalog.h"
@@ -15,6 +16,7 @@
#include "dp_ctrl.h"
#include "dp_debug.h"
#include "dp_display.h"
+#include "dp_hdcp.h"
#define DEBUG_NAME "msm_dp"
@@ -25,6 +27,7 @@ struct dp_debug_private {
struct dp_link *link;
struct dp_panel *panel;
struct drm_connector *connector;
+ struct dp_hdcp *hdcp;
struct device *dev;
struct drm_device *drm_dev;
@@ -198,6 +201,35 @@ static int dp_test_active_open(struct inode *inode,
inode->i_private);
}
+static ssize_t dp_hdcp_key_write(struct file *file, const char __user *ubuf,
+ size_t len, loff_t *offp)
+{
+ char *input_buffer;
+ int ret;
+ struct dp_debug_private *debug = file->private_data;
+
+ if (len != (DRM_HDCP_KSV_LEN + DP_HDCP_NUM_KEYS * DP_HDCP_KEY_LEN))
+ return -EINVAL;
+
+ if (!debug->hdcp)
+ return -ENOENT;
+
+ input_buffer = memdup_user_nul(ubuf, len);
+ if (IS_ERR(input_buffer))
+ return PTR_ERR(input_buffer);
+
+ ret = dp_hdcp_ingest_key(debug->hdcp, input_buffer, len);
+
+ kfree(input_buffer);
+ if (ret < 0) {
+ DRM_ERROR("Could not ingest HDCP key, ret=%d\n", ret);
+ return ret;
+ }
+
+ *offp += len;
+ return len;
+}
+
static const struct file_operations test_active_fops = {
.owner = THIS_MODULE,
.open = dp_test_active_open,
@@ -207,6 +239,12 @@ static const struct file_operations test_active_fops = {
.write = dp_test_active_write
};
+static const struct file_operations dp_hdcp_key_fops = {
+ .owner = THIS_MODULE,
+ .open = simple_open,
+ .write = dp_hdcp_key_write,
+};
+
static int dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor)
{
int rc = 0;
@@ -228,6 +266,10 @@ static int dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor)
minor->debugfs_root,
debug, &dp_test_type_fops);
+ debugfs_create_file("msm_dp_hdcp_key", 0222,
+ minor->debugfs_root,
+ debug, &dp_hdcp_key_fops);
+
debug->root = minor->debugfs_root;
return rc;
@@ -235,7 +277,8 @@ static int dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor)
struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
struct dp_usbpd *usbpd, struct dp_link *link,
- struct drm_connector *connector, struct drm_minor *minor)
+ struct dp_hdcp *hdcp, struct drm_connector *connector,
+ struct drm_minor *minor)
{
int rc = 0;
struct dp_debug_private *debug;
@@ -257,6 +300,7 @@ struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
debug->usbpd = usbpd;
debug->link = link;
debug->panel = panel;
+ debug->hdcp = hdcp;
debug->dev = dev;
debug->drm_dev = minor->dev;
debug->connector = connector;
diff --git a/drivers/gpu/drm/msm/dp/dp_debug.h b/drivers/gpu/drm/msm/dp/dp_debug.h
index 8c0d0b5178fd..55ab008876e7 100644
--- a/drivers/gpu/drm/msm/dp/dp_debug.h
+++ b/drivers/gpu/drm/msm/dp/dp_debug.h
@@ -6,6 +6,7 @@
#ifndef _DP_DEBUG_H_
#define _DP_DEBUG_H_
+#include "dp_hdcp.h"
#include "dp_panel.h"
#include "dp_link.h"
@@ -43,7 +44,7 @@ struct dp_debug {
*/
struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
struct dp_usbpd *usbpd, struct dp_link *link,
- struct drm_connector *connector,
+ struct dp_hdcp *hdcp, struct drm_connector *connector,
struct drm_minor *minor);
/**
@@ -60,7 +61,8 @@ void dp_debug_put(struct dp_debug *dp_debug);
static inline
struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
struct dp_usbpd *usbpd, struct dp_link *link,
- struct drm_connector *connector, struct drm_minor *minor)
+ struct dp_hdcp *hdcp, struct drm_connector *connector,
+ struct drm_minor *minor)
{
return ERR_PTR(-EINVAL);
}
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 79412a8fbaff..5d8c118e7365 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -27,6 +27,7 @@
#include "dp_drm.h"
#include "dp_audio.h"
#include "dp_debug.h"
+#include "dp_hdcp.h"
#define HPD_STRING_SIZE 30
@@ -98,6 +99,7 @@ struct dp_display_private {
struct dp_panel *panel;
struct dp_ctrl *ctrl;
struct dp_debug *debug;
+ struct dp_hdcp *hdcp;
struct dp_usbpd_cb usbpd_cb;
struct dp_display_mode dp_mode;
@@ -147,6 +149,15 @@ static struct dp_display_private *dev_get_dp_display_private(struct device *dev)
return container_of(dp, struct dp_display_private, dp_display);
}
+struct dp_hdcp *dp_display_connector_to_hdcp(struct drm_connector *connector)
+{
+ struct msm_dp *dp_display = msm_dp_from_connector(connector);
+ struct dp_display_private *dp;
+
+ dp = container_of(dp_display, struct dp_display_private, dp_display);
+ return dp->hdcp;
+}
+
static int dp_add_event(struct dp_display_private *dp_priv, u32 event,
u32 data, u32 delay)
{
@@ -707,6 +718,7 @@ static int dp_irq_hpd_handle(struct dp_display_private *dp, u32 data)
static void dp_display_deinit_sub_modules(struct dp_display_private *dp)
{
dp_debug_put(dp->debug);
+ dp_hdcp_put(dp->hdcp);
dp_audio_put(dp->audio);
dp_panel_put(dp->panel);
dp_aux_put(dp->aux);
@@ -803,8 +815,18 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
goto error_ctrl;
}
+ dp->hdcp = dp_hdcp_get(dp->parser, dp->aux);
+ if (IS_ERR(dp->hdcp)) {
+ rc = PTR_ERR(dp->hdcp);
+ DRM_ERROR("failed to initialize hdcp, rc = %d\n", rc);
+ dp->hdcp = NULL;
+ goto error_hdcp;
+ }
+
return rc;
+error_hdcp:
+ dp_audio_put(dp->audio);
error_ctrl:
dp_panel_put(dp->panel);
error_link:
@@ -919,6 +941,16 @@ int dp_display_set_plugged_cb(struct msm_dp *dp_display,
return 0;
}
+void dp_display_hdcp_commit(struct msm_dp *dp, struct drm_atomic_state *state)
+{
+ struct dp_display_private *dp_display;
+
+ dp_display = container_of(dp, struct dp_display_private, dp_display);
+
+ if (dp_display->hdcp)
+ dp_hdcp_commit(dp_display->hdcp, state);
+}
+
int dp_display_validate_mode(struct msm_dp *dp, u32 mode_pclk_khz)
{
const u32 num_components = 3, default_bpp = 24;
@@ -1442,8 +1474,8 @@ void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor)
dev = &dp->pdev->dev;
dp->debug = dp_debug_get(dev, dp->panel, dp->usbpd,
- dp->link, dp->dp_display.connector,
- minor);
+ dp->link, dp->hdcp,
+ dp->dp_display.connector, minor);
if (IS_ERR(dp->debug)) {
rc = PTR_ERR(dp->debug);
DRM_ERROR("failed to initialize debug, rc = %d\n", rc);
@@ -1454,12 +1486,16 @@ void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor)
int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
struct drm_encoder *encoder)
{
+ struct dp_display_private *dp_display_priv;
struct msm_drm_private *priv;
int ret;
if (WARN_ON(!encoder) || WARN_ON(!dp_display) || WARN_ON(!dev))
return -EINVAL;
+ dp_display_priv = container_of(dp_display, struct dp_display_private,
+ dp_display);
+
priv = dev->dev_private;
dp_display->drm_dev = dev;
@@ -1480,6 +1516,12 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
return ret;
}
+ ret = dp_hdcp_attach(dp_display_priv->hdcp, dp_display->connector);
+ if (ret) {
+ DRM_ERROR("Failed to attach hdcp, ret=%d\n", ret);
+ return ret;
+ }
+
priv->connectors[priv->num_connectors++] = dp_display->connector;
return 0;
}
diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
index 8e80e3bac394..1d202223593c 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.h
+++ b/drivers/gpu/drm/msm/dp/dp_display.h
@@ -29,8 +29,13 @@ struct msm_dp {
struct dp_audio *dp_audio;
};
+struct drm_atomic_state;
+
int dp_display_set_plugged_cb(struct msm_dp *dp_display,
hdmi_codec_plugged_cb fn, struct device *codec_dev);
+struct dp_hdcp *dp_display_connector_to_hdcp(struct drm_connector *connector);
+void dp_display_hdcp_commit(struct msm_dp *dp_display,
+ struct drm_atomic_state *state);
int dp_display_validate_mode(struct msm_dp *dp_display, u32 mode_pclk_khz);
int dp_display_get_modes(struct msm_dp *dp_display,
struct dp_display_mode *dp_mode);
diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
index 76856c4ee1d6..f6694ed82169 100644
--- a/drivers/gpu/drm/msm/dp/dp_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
@@ -6,11 +6,20 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_atomic.h>
#include <drm/drm_bridge.h>
+#include <drm/drm_connector.h>
#include <drm/drm_crtc.h>
+#include <drm/drm_hdcp.h>
#include "msm_drv.h"
#include "msm_kms.h"
#include "dp_drm.h"
+#include "dp_hdcp.h"
+
+struct dp_connector_state {
+ struct drm_connector_state base;
+ bool hdcp_transition;
+};
+#define to_dp_connector_state(x) container_of(x, struct dp_connector_state, base)
struct dp_connector {
struct drm_connector base;
@@ -18,6 +27,11 @@ struct dp_connector {
};
#define to_dp_connector(x) container_of(x, struct dp_connector, base)
+struct msm_dp *msm_dp_from_connector(struct drm_connector *connector)
+{
+ return to_dp_connector(connector)->dp_display;
+}
+
/**
* dp_connector_detect - callback to determine if connector is connected
* @conn: Pointer to drm connector structure
@@ -115,20 +129,72 @@ static enum drm_mode_status dp_connector_mode_valid(
return dp_display_validate_mode(dp_disp, mode->clock);
}
+static int dp_connector_atomic_check(struct drm_connector *connector,
+ struct drm_atomic_state *state)
+{
+ struct drm_connector_state *conn_state;
+ struct dp_connector_state *dp_state;
+
+ conn_state = drm_atomic_get_new_connector_state(state, connector);
+ dp_state = to_dp_connector_state(conn_state);
+
+ dp_state->hdcp_transition = drm_hdcp_atomic_check(connector, state);
+
+ return 0;
+}
+
+static struct drm_connector_state *
+dp_connector_atomic_duplicate_state(struct drm_connector *connector)
+{
+ struct dp_connector_state *state;
+
+ state = kzalloc(sizeof(*state), GFP_KERNEL);
+ if (!state)
+ return NULL;
+
+ state->hdcp_transition = false;
+
+ __drm_atomic_helper_connector_duplicate_state(connector, &state->base);
+ return &state->base;
+}
+
static const struct drm_connector_funcs dp_connector_funcs = {
.detect = dp_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
.reset = drm_atomic_helper_connector_reset,
- .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ .atomic_duplicate_state = dp_connector_atomic_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
};
static const struct drm_connector_helper_funcs dp_connector_helper_funcs = {
.get_modes = dp_connector_get_modes,
.mode_valid = dp_connector_mode_valid,
+ .atomic_check = dp_connector_atomic_check,
};
+bool dp_drm_is_connector_msm_dp(struct drm_connector *connector)
+{
+ return connector->funcs == &dp_connector_funcs;
+}
+
+void dp_drm_atomic_commit(struct drm_connector *connector,
+ struct drm_connector_state *conn_state,
+ struct drm_atomic_state *state)
+{
+ struct dp_connector_state *dp_state;
+ struct msm_dp *dp_disp;
+
+ dp_state = to_dp_connector_state(conn_state);
+
+ if (!dp_state->hdcp_transition)
+ return;
+
+ dp_disp = msm_dp_from_connector(connector);
+
+ dp_display_hdcp_commit(dp_disp, state);
+}
+
/* connector initialization */
struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display)
{
diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_drm.h
index c27bfceefdf0..a5d95c6acd67 100644
--- a/drivers/gpu/drm/msm/dp/dp_drm.h
+++ b/drivers/gpu/drm/msm/dp/dp_drm.h
@@ -14,5 +14,10 @@
#include "dp_display.h"
struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display);
+struct msm_dp *msm_dp_from_connector(struct drm_connector *connector);
+bool dp_drm_is_connector_msm_dp(struct drm_connector *connector);
+void dp_drm_atomic_commit(struct drm_connector *connector,
+ struct drm_connector_state *conn_state,
+ struct drm_atomic_state *state);
#endif /* _DP_DRM_H_ */
diff --git a/drivers/gpu/drm/msm/dp/dp_hdcp.c b/drivers/gpu/drm/msm/dp/dp_hdcp.c
new file mode 100644
index 000000000000..03ea3a974576
--- /dev/null
+++ b/drivers/gpu/drm/msm/dp/dp_hdcp.c
@@ -0,0 +1,462 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (C) 2021 Google, Inc.
+ *
+ * Authors:
+ * Sean Paul <seanpaul@chromium.org>
+ */
+
+#include "dp_display.h"
+#include "dp_drm.h"
+#include "dp_hdcp.h"
+#include "dp_reg.h"
+
+#include <drm/drm_connector.h>
+#include <drm/drm_device.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_hdcp.h>
+#include <drm/drm_print.h>
+
+#include <linux/bitfield.h>
+#include <linux/bits.h>
+#include <linux/iopoll.h>
+#include <linux/mutex.h>
+#include <linux/random.h>
+#include <linux/slab.h>
+
+/* Offsets based on hdcp_ksv mmio */
+#define DP_HDCP_KSV_AN_LSB 0x0
+#define DP_HDCP_KSV_AN_MSB 0x4
+#define DP_HDCP_KSV_AKSV_MSB 0x1D8
+#define DP_HDCP_KSV_AKSV_LSB 0x1DC
+
+/* Key offsets based on hdcp_key mmio */
+#define DP_HDCP_KEY_BASE 0x30
+#define DP_HDCP_KEY_MSB(x) (DP_HDCP_KEY_BASE + (x * 8))
+#define DP_HDCP_KEY_LSB(x) (DP_HDCP_KEY_MSB(x) + 4)
+#define DP_HDCP_KEY_VALID 0x170
+#define DP_HDCP_SW_KEY_VALID BIT(0)
+
+/* Timeouts */
+#define DP_KEYS_VALID_SLEEP_US (20 * 1000)
+#define DP_KEYS_VALID_TIMEOUT_US (100 * 1000)
+#define DP_AN_READY_SLEEP_US 100
+#define DP_AN_READY_TIMEOUT_US (10 * 1000)
+#define DP_R0_READY_SLEEP_US 100
+#define DP_R0_READY_TIMEOUT_US (10 * 1000)
+#define DP_RI_MATCH_SLEEP_US (20 * 1000)
+#define DP_RI_MATCH_TIMEOUT_US (100 * 1000)
+#define DP_KSV_WRITTEN_SLEEP_US 100
+#define DP_KSV_WRITTEN_TIMEOUT_US (100 * 1000)
+#define DP_SHA_COMPUTATION_SLEEP_US 100
+#define DP_SHA_COMPUTATION_TIMEOUT_US (100 * 1000)
+#define DP_AN_READ_DELAY_US 1
+
+/*
+ * dp_hdcp_key - structure which contains an HDCP key set
+ * @ksv: The key selection vector
+ * @keys: Contains 40 keys
+ */
+struct dp_hdcp_key {
+ struct drm_hdcp_ksv ksv;
+ union {
+ u32 words[2];
+ u8 bytes[DP_HDCP_KEY_LEN];
+ } keys[DP_HDCP_NUM_KEYS];
+ bool valid;
+};
+
+struct dp_hdcp {
+ struct drm_device *dev;
+ struct drm_connector *connector;
+
+ struct drm_dp_aux *aux;
+ struct dp_parser *parser;
+
+ struct drm_hdcp_helper_data *helper_data;
+
+ struct mutex key_lock;
+ struct dp_hdcp_key key;
+};
+
+static inline void dp_hdcp_write_ahb(struct dp_hdcp *hdcp, u32 offset, u32 val)
+{
+ writel(val, hdcp->parser->io.dp_controller.ahb.base + offset);
+}
+
+static inline u32 dp_hdcp_read_ahb(struct dp_hdcp *hdcp, u32 offset)
+{
+ return readl(hdcp->parser->io.dp_controller.ahb.base + offset);
+}
+
+static inline void dp_hdcp_write_aux(struct dp_hdcp *hdcp, u32 offset, u32 val)
+{
+ writel(val, hdcp->parser->io.dp_controller.aux.base + offset);
+}
+
+static inline u32 dp_hdcp_read_aux(struct dp_hdcp *hdcp, u32 offset)
+{
+ return readl(hdcp->parser->io.dp_controller.aux.base + offset);
+}
+
+static inline void dp_hdcp_write_link(struct dp_hdcp *hdcp, u32 offset, u32 val)
+{
+ writel(val, hdcp->parser->io.dp_controller.link.base + offset);
+}
+
+static inline u32 dp_hdcp_read_link(struct dp_hdcp *hdcp, u32 offset)
+{
+ return readl(hdcp->parser->io.dp_controller.link.base + offset);
+}
+
+static inline void dp_hdcp_write_key(struct dp_hdcp *hdcp, u32 offset, u32 val)
+{
+ writel(val, hdcp->parser->io.dp_controller.hdcp_key.base + offset);
+}
+
+static inline void dp_hdcp_write_tz_hlos(struct dp_hdcp *hdcp, u32 offset,
+ u32 val)
+{
+ writel(val, hdcp->parser->io.dp_controller.hdcp_tz.base + offset);
+}
+
+int dp_hdcp_ingest_key(struct dp_hdcp *hdcp, const u8 *raw_key, int raw_len)
+{
+ unsigned int ksv_weight;
+ int i, ret = 0;
+
+ if (raw_len != (DRM_HDCP_KSV_LEN + DP_HDCP_NUM_KEYS * DP_HDCP_KEY_LEN)) {
+ DRM_ERROR("Invalid HDCP key length expected=%d actual=%d\n",
+ (DRM_HDCP_KSV_LEN + DP_HDCP_NUM_KEYS * DP_HDCP_KEY_LEN),
+ raw_len);
+ return -EINVAL;
+ }
+
+ mutex_lock(&hdcp->key_lock);
+
+ memcpy(hdcp->key.ksv.bytes, raw_key, DRM_HDCP_KSV_LEN);
+ ksv_weight = hweight32(hdcp->key.ksv.words[0]) +
+ hweight32(hdcp->key.ksv.words[1]);
+ if (ksv_weight != 20) {
+ DRM_ERROR("Invalid ksv weight, expected=20 actual=%d\n",
+ ksv_weight);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ raw_key += DRM_HDCP_KSV_LEN;
+ for (i = 0; i < DP_HDCP_NUM_KEYS; i++) {
+ memcpy(hdcp->key.keys[i].bytes, raw_key, DP_HDCP_KEY_LEN);
+ raw_key += DP_HDCP_KEY_LEN;
+ }
+
+ DRM_DEBUG_DRIVER("Successfully ingested HDCP key\n");
+ hdcp->key.valid = true;
+
+out:
+ mutex_unlock(&hdcp->key_lock);
+ return ret;
+}
+
+static bool dp_hdcp_are_keys_valid(struct drm_connector *connector)
+{
+ struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
+ u32 val;
+
+ val = dp_hdcp_read_ahb(hdcp, DP_HDCP_STATUS);
+ return FIELD_GET(DP_HDCP_KEY_STATUS, val) == DP_HDCP_KEY_STATUS_VALID;
+}
+
+static int dp_hdcp_load_keys(struct drm_connector *connector)
+{
+ struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
+ int i, ret = 0;
+ u64 an_seed = get_random_u64();
+
+ mutex_lock(&hdcp->key_lock);
+
+ if (!hdcp->key.valid) {
+ ret = -ENOENT;
+ goto out;
+ }
+
+ dp_hdcp_write_aux(hdcp, DP_HDCP_SW_LOWER_AKSV, hdcp->key.ksv.words[0]);
+ dp_hdcp_write_aux(hdcp, DP_HDCP_SW_UPPER_AKSV, hdcp->key.ksv.words[1]);
+
+ for (i = 0; i < DP_HDCP_NUM_KEYS; i++) {
+ dp_hdcp_write_key(hdcp, DP_HDCP_KEY_LSB(i),
+ hdcp->key.keys[i].words[0]);
+ dp_hdcp_write_key(hdcp, DP_HDCP_KEY_MSB(i),
+ hdcp->key.keys[i].words[1]);
+ }
+
+ dp_hdcp_write_key(hdcp, DP_HDCP_KEY_VALID, DP_HDCP_SW_KEY_VALID);
+
+ dp_hdcp_write_link(hdcp, DP_HDCP_ENTROPY_CTRL0,
+ FIELD_GET(GENMASK(31,0), an_seed));
+ dp_hdcp_write_link(hdcp, DP_HDCP_ENTROPY_CTRL1,
+ FIELD_GET(GENMASK_ULL(63,32), an_seed));
+
+out:
+ mutex_unlock(&hdcp->key_lock);
+ return ret;
+}
+
+static int dp_hdcp_hdcp2_capable(struct drm_connector *connector, bool *capable)
+{
+ *capable = false;
+ return 0;
+}
+
+static int dp_hdcp_hdcp1_read_an_aksv(struct drm_connector *connector,
+ u32 *an, u32 *aksv)
+{
+ struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
+ bool keys_valid;
+ int ret;
+ u32 val;
+
+ dp_hdcp_write_ahb(hdcp, DP_HDCP_CTRL, 1);
+
+ ret = read_poll_timeout(dp_hdcp_are_keys_valid, keys_valid, keys_valid,
+ DP_KEYS_VALID_SLEEP_US,
+ DP_KEYS_VALID_TIMEOUT_US, false, connector);
+ if (ret) {
+ drm_err(hdcp->dev, "HDCP keys invalid %d\n", ret);
+ return ret;
+ }
+
+ /* Clear AInfo */
+ dp_hdcp_write_aux(hdcp, DP_HDCP_RCVPORT_DATA4, 0);
+
+ aksv[0] = dp_hdcp_read_aux(hdcp, DP_HDCP_RCVPORT_DATA3);
+ aksv[1] = GENMASK(7, 0) & dp_hdcp_read_aux(hdcp, DP_HDCP_RCVPORT_DATA4);
+
+ ret = read_poll_timeout(dp_hdcp_read_ahb, val,
+ (val & DP_HDCP_AN_READY_MASK) == DP_HDCP_AN_READY_MASK,
+ DP_AN_READY_SLEEP_US, DP_AN_READY_TIMEOUT_US,
+ false, hdcp, DP_HDCP_STATUS);
+ if (ret) {
+ drm_err(hdcp->dev, "AN failed to become ready %x/%d\n", val,
+ ret);
+ return ret;
+ }
+
+ /*
+ * Get An from hardware, for unknown reasons we need to read the reg
+ * twice to get valid data.
+ */
+ dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA5);
+ an[0] = dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA5);
+
+ udelay(DP_AN_READ_DELAY_US);
+
+ dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA6);
+ an[1] = dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA6);
+
+ return 0;
+}
+
+static int dp_hdcp_hdcp1_store_receiver_info(struct drm_connector *connector,
+ u32 *ksv, u32 status, u8 bcaps,
+ bool is_repeater)
+{
+ struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
+ u32 val;
+
+ dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA0,
+ ksv[0]);
+ dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA1,
+ ksv[1]);
+
+ val = FIELD_PREP(GENMASK(23, 8), status) |
+ FIELD_PREP(GENMASK(7, 0), bcaps);
+
+ dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA12,
+ val);
+
+ return 0;
+}
+
+static int dp_hdcp_hdcp1_enable_encryption(struct drm_connector *connector)
+{
+ return 0;
+}
+
+static int dp_hdcp_hdcp1_wait_for_r0(struct drm_connector *connector)
+{
+ struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
+ int ret;
+ u32 val;
+
+ ret = read_poll_timeout(dp_hdcp_read_ahb, val, (val & DP_HDCP_R0_READY),
+ DP_R0_READY_SLEEP_US, DP_R0_READY_TIMEOUT_US,
+ false, hdcp, DP_HDCP_STATUS);
+ if (ret) {
+ drm_err(hdcp->dev, "HDCP R0 not ready %x/%d\n", val, ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int dp_hdcp_hdcp1_match_ri(struct drm_connector *connector, u32 ri_prime)
+{
+ struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
+ int ret;
+ u32 val;
+
+ dp_hdcp_write_ahb(hdcp, DP_HDCP_RCVPORT_DATA2_0, ri_prime);
+
+ ret = read_poll_timeout(dp_hdcp_read_ahb, val, (val & DP_HDCP_RI_MATCH),
+ DP_RI_MATCH_SLEEP_US, DP_RI_MATCH_TIMEOUT_US,
+ false, hdcp, DP_HDCP_STATUS);
+ if (ret) {
+ drm_err(hdcp->dev, "Failed to match Ri and Ri` (%08x) %08x/%d\n",
+ ri_prime, val, ret);
+ return ret;
+ }
+ return 0;
+}
+
+static int dp_hdcp_hdcp1_store_ksv_fifo(struct drm_connector *connector,
+ u8 *ksv_fifo, u8 num_downstream,
+ u8 *bstatus, u32 *vprime)
+{
+ struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
+ int num_bytes = num_downstream * DRM_HDCP_KSV_LEN;
+ int ret, i;
+ u32 val;
+
+ /* Reset the SHA computation block */
+ dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_CTRL,
+ DP_HDCP_SHA_CTRL_RESET);
+ dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_CTRL, 0);
+
+ /*
+ * KSV info gets written a byte at a time in the same order it was
+ * received. Every 64 bytes, we need to wait for the SHA_BLOCK_DONE
+ * bit to be set in SHA_CTRL.
+ */
+ for (i = 0; i < num_bytes; i++) {
+ val = FIELD_PREP(DP_HDCP_SHA_DATA_MASK, ksv_fifo[i]);
+
+ if (i == (num_bytes - 1))
+ val |= DP_HDCP_SHA_DATA_DONE;
+
+ dp_hdcp_write_tz_hlos(hdcp,
+ HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_DATA,
+ val);
+
+ if (((i + 1) % 64) != 0)
+ continue;
+
+ ret = read_poll_timeout(dp_hdcp_read_ahb, val,
+ (val & DP_HDCP_SHA_DONE),
+ DP_KSV_WRITTEN_SLEEP_US,
+ DP_KSV_WRITTEN_TIMEOUT_US, false, hdcp,
+ DP_HDCP_SHA_STATUS);
+ if (ret) {
+ drm_err(hdcp->dev, "SHA block incomplete %d\n", ret);
+ return ret;
+ }
+ }
+
+ ret = read_poll_timeout(dp_hdcp_read_ahb, val,
+ (val & DP_HDCP_SHA_COMP_DONE),
+ DP_SHA_COMPUTATION_SLEEP_US,
+ DP_SHA_COMPUTATION_TIMEOUT_US,
+ false, hdcp, DP_HDCP_SHA_STATUS);
+ if (ret) {
+ drm_err(hdcp->dev, "SHA computation incomplete %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int dp_hdcp_hdcp1_disable(struct drm_connector *connector)
+{
+ struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
+ u32 val;
+
+ val = dp_hdcp_read_ahb(hdcp, REG_DP_SW_RESET);
+ dp_hdcp_write_ahb(hdcp, REG_DP_SW_RESET, val | DP_HDCP_SW_RESET);
+
+ /* Disable encryption and disable the HDCP block */
+ dp_hdcp_write_ahb(hdcp, DP_HDCP_CTRL, 0);
+
+ dp_hdcp_write_ahb(hdcp, REG_DP_SW_RESET, val);
+
+ return 0;
+}
+
+void dp_hdcp_commit(struct dp_hdcp *hdcp, struct drm_atomic_state *state)
+{
+ drm_hdcp_helper_atomic_commit(hdcp->helper_data, state, NULL);
+}
+
+static const struct drm_hdcp_helper_funcs dp_hdcp_funcs = {
+ .are_keys_valid = dp_hdcp_are_keys_valid,
+ .load_keys = dp_hdcp_load_keys,
+ .hdcp2_capable = dp_hdcp_hdcp2_capable,
+ .hdcp1_read_an_aksv = dp_hdcp_hdcp1_read_an_aksv,
+ .hdcp1_store_receiver_info = dp_hdcp_hdcp1_store_receiver_info,
+ .hdcp1_enable_encryption = dp_hdcp_hdcp1_enable_encryption,
+ .hdcp1_wait_for_r0 = dp_hdcp_hdcp1_wait_for_r0,
+ .hdcp1_match_ri = dp_hdcp_hdcp1_match_ri,
+ .hdcp1_store_ksv_fifo = dp_hdcp_hdcp1_store_ksv_fifo,
+ .hdcp1_disable = dp_hdcp_hdcp1_disable,
+};
+
+int dp_hdcp_attach(struct dp_hdcp *hdcp, struct drm_connector *connector)
+{
+ struct drm_device *dev = connector->dev;
+ struct drm_hdcp_helper_data *helper_data;
+ int ret;
+
+ /* HDCP is not configured for this device */
+ if (!hdcp->parser->io.dp_controller.hdcp_key.base)
+ return 0;
+
+ helper_data = drm_hdcp_helper_initialize_dp(connector, hdcp->aux,
+ &dp_hdcp_funcs, false);
+ if (IS_ERR_OR_NULL(helper_data))
+ return PTR_ERR(helper_data);
+
+ ret = drm_connector_attach_content_protection_property(connector, false);
+ if (ret) {
+ drm_hdcp_helper_destroy(helper_data);
+ drm_err(dev, "Failed to attach content protection prop %d\n", ret);
+ return ret;
+ }
+
+ hdcp->dev = connector->dev;
+ hdcp->connector = connector;
+ hdcp->helper_data = helper_data;
+
+ return 0;
+}
+
+struct dp_hdcp *dp_hdcp_get(struct dp_parser *parser, struct drm_dp_aux *aux)
+{
+ struct device *dev = &parser->pdev->dev;
+ struct dp_hdcp *hdcp;
+
+ hdcp = devm_kzalloc(dev, sizeof(*hdcp), GFP_KERNEL);
+ if (!hdcp)
+ return ERR_PTR(-ENOMEM);
+
+ hdcp->parser = parser;
+ hdcp->aux = aux;
+
+ mutex_init(&hdcp->key_lock);
+
+ return hdcp;
+}
+
+void dp_hdcp_put(struct dp_hdcp *hdcp)
+{
+ if (hdcp)
+ drm_hdcp_helper_destroy(hdcp->helper_data);
+}
diff --git a/drivers/gpu/drm/msm/dp/dp_hdcp.h b/drivers/gpu/drm/msm/dp/dp_hdcp.h
new file mode 100644
index 000000000000..5637a9b0dea2
--- /dev/null
+++ b/drivers/gpu/drm/msm/dp/dp_hdcp.h
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (C) 2021 Google, Inc.
+ *
+ * Authors:
+ * Sean Paul <seanpaul@chromium.org>
+ */
+
+#ifndef DP_HDCP_H_
+#define DP_HDCP_H_
+
+#define DP_HDCP_KEY_LEN 7
+#define DP_HDCP_NUM_KEYS 40
+
+struct dp_hdcp;
+struct dp_parser;
+struct drm_atomic_state;
+struct drm_dp_aux;
+
+struct dp_hdcp *dp_hdcp_get(struct dp_parser *parser, struct drm_dp_aux *aux);
+void dp_hdcp_put(struct dp_hdcp *hdcp);
+
+int dp_hdcp_attach(struct dp_hdcp *hdcp, struct drm_connector *connector);
+int dp_hdcp_ingest_key(struct dp_hdcp *hdcp, const u8 *raw_key, int raw_len);
+void dp_hdcp_commit(struct dp_hdcp *hdcp, struct drm_atomic_state *state);
+
+#endif
diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c
index a7acc23f742b..5d35ef46120b 100644
--- a/drivers/gpu/drm/msm/dp/dp_parser.c
+++ b/drivers/gpu/drm/msm/dp/dp_parser.c
@@ -66,7 +66,6 @@ static int dp_parser_ctrl_res(struct dp_parser *parser)
DRM_ERROR("legacy memory region not large enough\n");
return -EINVAL;
}
-
dss->ahb.len = DP_DEFAULT_AHB_SIZE;
dss->aux.base = dss->ahb.base + DP_DEFAULT_AUX_OFFSET;
dss->aux.len = DP_DEFAULT_AUX_SIZE;
@@ -74,6 +73,10 @@ static int dp_parser_ctrl_res(struct dp_parser *parser)
dss->link.len = DP_DEFAULT_LINK_SIZE;
dss->p0.base = dss->ahb.base + DP_DEFAULT_P0_OFFSET;
dss->p0.len = DP_DEFAULT_P0_SIZE;
+ dss->hdcp_key.base = NULL;
+ dss->hdcp_key.len = 0;
+ dss->hdcp_tz.base = NULL;
+ dss->hdcp_tz.len = 0;
} else {
DRM_ERROR("unable to remap aux region: %pe\n", dss->aux.base);
return PTR_ERR(dss->aux.base);
@@ -90,6 +93,21 @@ static int dp_parser_ctrl_res(struct dp_parser *parser)
DRM_ERROR("unable to remap p0 region: %pe\n", dss->p0.base);
return PTR_ERR(dss->p0.base);
}
+
+ dss->hdcp_key.base = dp_ioremap(pdev, 5, &dss->hdcp_key.len);
+ if (!IS_ERR(dss->hdcp_key.base)) {
+ dss->hdcp_tz.base = dp_ioremap(pdev, 6, &dss->hdcp_tz.len);
+ if (IS_ERR(dss->hdcp_tz.base)) {
+ DRM_ERROR("unable to remap hdcp_tz region: %pe\n",
+ dss->hdcp_tz.base);
+ return PTR_ERR(dss->hdcp_tz.base);
+ }
+ } else {
+ dss->hdcp_key.base = NULL;
+ dss->hdcp_key.len = 0;
+ dss->hdcp_tz.base = NULL;
+ dss->hdcp_tz.len = 0;
+ }
}
io->phy = devm_phy_get(&pdev->dev, "dp");
diff --git a/drivers/gpu/drm/msm/dp/dp_parser.h b/drivers/gpu/drm/msm/dp/dp_parser.h
index 3172da089421..4edd499ebaf2 100644
--- a/drivers/gpu/drm/msm/dp/dp_parser.h
+++ b/drivers/gpu/drm/msm/dp/dp_parser.h
@@ -35,6 +35,8 @@ struct dss_io_data {
struct dss_io_region aux;
struct dss_io_region link;
struct dss_io_region p0;
+ struct dss_io_region hdcp_key;
+ struct dss_io_region hdcp_tz;
};
static inline const char *dp_parser_pm_name(enum dp_pm_type module)
@@ -69,6 +71,8 @@ struct dp_display_data {
* struct dp_ctrl_resource - controller's IO related data
*
* @dp_controller: Display Port controller mapped memory address
+ * @hdcp_key: mapped memory for HDCP key ingestion
+ * @hdcp_tz: mapped memory for HDCP TZ interaction
* @phy_io: phy's mapped memory address
*/
struct dp_io {
diff --git a/drivers/gpu/drm/msm/dp/dp_reg.h b/drivers/gpu/drm/msm/dp/dp_reg.h
index 268602803d9a..61ab70850f6b 100644
--- a/drivers/gpu/drm/msm/dp/dp_reg.h
+++ b/drivers/gpu/drm/msm/dp/dp_reg.h
@@ -6,11 +6,14 @@
#ifndef _DP_REG_H_
#define _DP_REG_H_
+#include <linux/bits.h>
+
/* DP_TX Registers */
#define REG_DP_HW_VERSION (0x00000000)
#define REG_DP_SW_RESET (0x00000010)
-#define DP_SW_RESET (0x00000001)
+#define DP_SW_RESET BIT(0)
+#define DP_HDCP_SW_RESET BIT(1)
#define REG_DP_PHY_CTRL (0x00000014)
#define DP_PHY_CTRL_SW_RESET_PLL (0x00000001)
@@ -283,19 +286,46 @@
/* DP HDCP 1.3 registers */
#define DP_HDCP_CTRL (0x0A0)
#define DP_HDCP_STATUS (0x0A4)
+#define DP_HDCP_KEY_STATUS GENMASK(18, 16)
+#define DP_HDCP_KEY_STATUS_NO_KEYS 0
+#define DP_HDCP_KEY_STATUS_NOT_CHECKED 1
+#define DP_HDCP_KEY_STATUS_CHECKING 2
+#define DP_HDCP_KEY_STATUS_VALID 3
+#define DP_HDCP_KEY_STATUS_INVALID_AKSV 4
+#define DP_HDCP_KEY_STATUS_BAD_CHECKSUM 5
+#define DP_HDCP_KEY_STATUS_PROD_AKSV 6
+#define DP_HDCP_KEY_STATUS_RESV 7
+#define DP_HDCP_R0_READY BIT(14)
+#define DP_HDCP_SHA_V_MATCH BIT(13)
+#define DP_HDCP_RI_MATCH BIT(12)
+#define DP_HDCP_AN_MSB_READY BIT(9)
+#define DP_HDCP_AN_LSB_READY BIT(8)
+#define DP_HDCP_AN_READY_MASK (DP_HDCP_AN_MSB_READY | DP_HDCP_AN_LSB_READY)
+#define DP_HDCP_AUTH_FAIL_INFO GENMASK(7, 4)
+#define DP_HDCP_AUTH_FAIL_INVALID_AKSV 3
+#define DP_HDCP_AUTH_FAIL_INVALID_BKSV 4
+#define DP_HDCP_AUTH_FAIL_RI_MISMATCH 5
+#define DP_HDCP_AUTH_FAIL BIT(2)
+#define DP_HDCP_AUTH_SUCCESS BIT(0)
#define DP_HDCP_SW_UPPER_AKSV (0x098)
#define DP_HDCP_SW_LOWER_AKSV (0x09C)
#define DP_HDCP_ENTROPY_CTRL0 (0x350)
#define DP_HDCP_ENTROPY_CTRL1 (0x35C)
#define DP_HDCP_SHA_STATUS (0x0C8)
+#define DP_HDCP_SHA_COMP_DONE BIT(4)
+#define DP_HDCP_SHA_DONE BIT(0)
#define DP_HDCP_RCVPORT_DATA2_0 (0x0B0)
#define DP_HDCP_RCVPORT_DATA3 (0x0A4)
#define DP_HDCP_RCVPORT_DATA4 (0x0A8)
#define DP_HDCP_RCVPORT_DATA5 (0x0C0)
#define DP_HDCP_RCVPORT_DATA6 (0x0C4)
+#define DP_HDCP_RCVPORT_DATA7 (0x0C8)
#define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_CTRL (0x024)
+#define DP_HDCP_SHA_CTRL_RESET BIT(0)
#define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_DATA (0x028)
+#define DP_HDCP_SHA_DATA_MASK GENMASK(23, 16)
+#define DP_HDCP_SHA_DATA_DONE BIT(0)
#define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA0 (0x004)
#define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA1 (0x008)
#define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA7 (0x00C)
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index 27c9ae563f2f..8bcade1c1e6c 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -8,6 +8,7 @@
#include <drm/drm_gem_atomic_helper.h>
#include <drm/drm_vblank.h>
+#include "dp_drm.h"
#include "msm_atomic_trace.h"
#include "msm_drv.h"
#include "msm_gem.h"
@@ -194,6 +195,18 @@ static unsigned get_crtc_mask(struct drm_atomic_state *state)
return mask;
}
+static void msm_atomic_commit_connectors(struct drm_atomic_state *state)
+{
+ struct drm_connector_state *conn_state;
+ struct drm_connector *connector;
+ int i;
+
+ for_each_new_connector_in_state(state, connector, conn_state, i) {
+ if (dp_drm_is_connector_msm_dp(connector))
+ dp_drm_atomic_commit(connector, conn_state, state);
+ }
+}
+
void msm_atomic_commit_tail(struct drm_atomic_state *state)
{
struct drm_device *dev = state->dev;
@@ -230,6 +243,8 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state)
drm_atomic_helper_commit_planes(dev, state, 0);
drm_atomic_helper_commit_modeset_enables(dev, state);
+ msm_atomic_commit_connectors(state);
+
if (async) {
struct msm_pending_timer *timer =
&kms->pending_timers[drm_crtc_index(async_crtc)];
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v4 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers
2021-11-05 3:04 ` [PATCH v4 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers Sean Paul
@ 2021-11-12 22:06 ` Rob Herring
2021-11-15 20:21 ` [PATCH v4.5 " Sean Paul
0 siblings, 1 reply; 13+ messages in thread
From: Rob Herring @ 2021-11-12 22:06 UTC (permalink / raw)
To: Sean Paul
Cc: dri-devel, intel-gfx, freedreno, bjorn.andersson, swboyd,
jani.nikula, abhinavk, Sean Paul, Rob Clark, David Airlie,
Daniel Vetter, Kuogee Hsieh, linux-arm-msm, devicetree
On Thu, Nov 04, 2021 at 11:04:29PM -0400, Sean Paul wrote:
> From: Sean Paul <seanpaul@chromium.org>
>
> This patch adds the bindings for the MSM DisplayPort HDCP registers
> which are required to write the HDCP key into the display controller as
> well as the registers to enable HDCP authentication/key
> exchange/encryption.
>
> We'll use a new compatible string for this since the fields are optional.
>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-13-sean@poorly.run #v1
> Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-13-sean@poorly.run #v2
> Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-13-sean@poorly.run #v3
>
> Changes in v2:
> -Drop register range names (Stephen)
> -Fix yaml errors (Rob)
> Changes in v3:
> -Add new compatible string for dp-hdcp
> -Add descriptions to reg
> -Add minItems/maxItems to reg
> -Make reg depend on the new hdcp compatible string
> Changes in v4:
> -Rebase on Bjorn's multi-dp patchset
> ---
> .../devicetree/bindings/display/msm/dp-controller.yaml | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml
> index b36d74c1da7c..f6e4b102373a 100644
> --- a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml
> +++ b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml
> @@ -21,12 +21,16 @@ properties:
> - qcom,sc8180x-edp
>
> reg:
> + minItems: 5
> + maxItems: 7
This should be a warning. Not sure why the bot didn't run. You just need
'minItems: 5'
> items:
> - description: ahb register block
> - description: aux register block
> - description: link register block
> - description: p0 register block
> - description: p1 register block
> + - description: (Optional) Registers for HDCP device key injection
> + - description: (Optional) Registers for HDCP TrustZone interaction
>
> interrupts:
> maxItems: 1
> @@ -111,7 +115,9 @@ examples:
> <0xae90200 0x200>,
> <0xae90400 0xc00>,
> <0xae91000 0x400>,
> - <0xae91400 0x400>;
> + <0xae91400 0x400>,
> + <0x0aed1000 0x174>,
> + <0x0aee1000 0x2c>;
Be consistent and drop the leading 0.
> interrupt-parent = <&mdss>;
> interrupts = <12>;
> clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
> --
> Sean Paul, Software Engineer, Google / Chromium OS
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v4.5 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers
2021-11-12 22:06 ` Rob Herring
@ 2021-11-15 20:21 ` Sean Paul
2021-11-29 22:03 ` Rob Herring
0 siblings, 1 reply; 13+ messages in thread
From: Sean Paul @ 2021-11-15 20:21 UTC (permalink / raw)
To: dri-devel, intel-gfx, freedreno
Cc: bjorn.andersson, swboyd, jani.nikula, abhinavk, seanpaul, robh,
robh+dt, khsieh, linux-arm-msm, devicetree, Rob Clark, Sean Paul,
David Airlie, Daniel Vetter
From: Sean Paul <seanpaul@chromium.org>
This patch adds the bindings for the MSM DisplayPort HDCP registers
which are required to write the HDCP key into the display controller as
well as the registers to enable HDCP authentication/key
exchange/encryption.
We'll use a new compatible string for this since the fields are optional.
Cc: Rob Herring <robh@kernel.org>
Cc: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-13-sean@poorly.run #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-13-sean@poorly.run #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-13-sean@poorly.run #v3
Link: https://patchwork.freedesktop.org/patch/msgid/20211105030434.2828845-13-sean@poorly.run #v4
Changes in v2:
-Drop register range names (Stephen)
-Fix yaml errors (Rob)
Changes in v3:
-Add new compatible string for dp-hdcp
-Add descriptions to reg
-Add minItems/maxItems to reg
-Make reg depend on the new hdcp compatible string
Changes in v4:
-Rebase on Bjorn's multi-dp patchset
Changes in v4.5:
-Remove maxItems from reg (Rob)
-Remove leading zeros in example (Rob)
---
.../devicetree/bindings/display/msm/dp-controller.yaml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml
index b36d74c1da7c..aff7d45ba6ed 100644
--- a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml
+++ b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml
@@ -21,12 +21,15 @@ properties:
- qcom,sc8180x-edp
reg:
+ minItems: 5
items:
- description: ahb register block
- description: aux register block
- description: link register block
- description: p0 register block
- description: p1 register block
+ - description: (Optional) Registers for HDCP device key injection
+ - description: (Optional) Registers for HDCP TrustZone interaction
interrupts:
maxItems: 1
@@ -111,7 +114,9 @@ examples:
<0xae90200 0x200>,
<0xae90400 0xc00>,
<0xae91000 0x400>,
- <0xae91400 0x400>;
+ <0xae91400 0x400>,
+ <0xaed1000 0x174>,
+ <0xaee1000 0x2c>;
interrupt-parent = <&mdss>;
interrupts = <12>;
clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v4.5 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers
2021-11-15 20:21 ` [PATCH v4.5 " Sean Paul
@ 2021-11-29 22:03 ` Rob Herring
0 siblings, 0 replies; 13+ messages in thread
From: Rob Herring @ 2021-11-29 22:03 UTC (permalink / raw)
To: Sean Paul
Cc: swboyd, seanpaul, linux-arm-msm, Rob Clark, khsieh, intel-gfx,
freedreno, devicetree, jani.nikula, Daniel Vetter, abhinavk,
David Airlie, dri-devel, bjorn.andersson, robh+dt
On Mon, 15 Nov 2021 20:21:48 +0000, Sean Paul wrote:
> From: Sean Paul <seanpaul@chromium.org>
>
> This patch adds the bindings for the MSM DisplayPort HDCP registers
> which are required to write the HDCP key into the display controller as
> well as the registers to enable HDCP authentication/key
> exchange/encryption.
>
> We'll use a new compatible string for this since the fields are optional.
>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-13-sean@poorly.run #v1
> Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-13-sean@poorly.run #v2
> Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-13-sean@poorly.run #v3
> Link: https://patchwork.freedesktop.org/patch/msgid/20211105030434.2828845-13-sean@poorly.run #v4
>
> Changes in v2:
> -Drop register range names (Stephen)
> -Fix yaml errors (Rob)
> Changes in v3:
> -Add new compatible string for dp-hdcp
> -Add descriptions to reg
> -Add minItems/maxItems to reg
> -Make reg depend on the new hdcp compatible string
> Changes in v4:
> -Rebase on Bjorn's multi-dp patchset
> Changes in v4.5:
> -Remove maxItems from reg (Rob)
> -Remove leading zeros in example (Rob)
> ---
> .../devicetree/bindings/display/msm/dp-controller.yaml | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Freedreno] [PATCH v4 13/14] arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller
2021-11-05 3:04 ` [PATCH v4 13/14] arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller Sean Paul
@ 2021-12-08 22:06 ` Rob Clark
0 siblings, 0 replies; 13+ messages in thread
From: Rob Clark @ 2021-12-08 22:06 UTC (permalink / raw)
To: Sean Paul
Cc: dri-devel, Intel Graphics Development, freedreno,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Jani Nikula, linux-arm-msm, Abhinav Kumar, Stephen Boyd,
Rob Herring, Andy Gross, Sean Paul, Bjorn Andersson
On Thu, Nov 4, 2021 at 8:05 PM Sean Paul <sean@poorly.run> wrote:
>
> From: Sean Paul <seanpaul@chromium.org>
>
> This patch adds the register ranges required for HDCP key injection and
> HDCP TrustZone interaction as described in the dt-bindings for the
> sc7180 dp controller. Now that these are supported, change the
> compatible string to "dp-hdcp".
>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-15-sean@poorly.run #v1
> Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-14-sean@poorly.run #v2
> Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-14-sean@poorly.run #v3
>
> Changes in v3:
> -Split off into a new patch containing just the dts change (Stephen)
> -Add hdcp compatible string (Stephen)
> Changes in v4:
> -Rebase on Bjorn's multi-dp patchset
> ---
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index c8921e2d6480..838270f70b62 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -3088,7 +3088,13 @@ mdss_dp: displayport-controller@ae90000 {
> compatible = "qcom,sc7180-dp";
> status = "disabled";
>
> - reg = <0 0x0ae90000 0 0x1400>;
> + reg = <0 0x0ae90000 0 0x200>,
> + <0 0x0ae90200 0 0x200>,
> + <0 0x0ae90400 0 0xc00>,
> + <0 0x0ae91000 0 0x400>,
> + <0 0x0ae91400 0 0x400>,
> + <0 0x0aed1000 0 0x175>,
> + <0 0x0aee1000 0 0x2c>;
So one small issue, if someone tries to get linux running on a sc7180
windows laptop (which uses qcom's tz instead of the CrOS tz), things
will go BOOM!
We might want instead to move this somewhere chromebook specific,
maybe sc7180-trogdor.dtsi?
BR,
-R
>
> interrupt-parent = <&mdss>;
> interrupts = <12>;
> --
> Sean Paul, Software Engineer, Google / Chromium OS
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v4 14/14] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers
2021-11-05 3:04 ` [PATCH v4 14/14] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers Sean Paul
@ 2021-12-09 3:31 ` Stephen Boyd
2022-02-09 21:41 ` Dmitry Baryshkov
1 sibling, 0 replies; 13+ messages in thread
From: Stephen Boyd @ 2021-12-09 3:31 UTC (permalink / raw)
To: Sean Paul, dri-devel, freedreno, intel-gfx
Cc: bjorn.andersson, jani.nikula, abhinavk, Sean Paul, Rob Clark,
David Airlie, Daniel Vetter, linux-arm-msm
Quoting Sean Paul (2021-11-04 20:04:31)
> From: Sean Paul <seanpaul@chromium.org>
>
> This patch adds HDCP 1.x support to msm DP connectors using the new HDCP
$ git grep "This patch" -- Documentation/process/
> helpers.
>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: Abhinav Kumar <abhinavk@codeaurora.org>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-15-sean@poorly.run #v1
> Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-14-sean@poorly.run #v2
> Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-15-sean@poorly.run #v3
>
> Changes in v2:
> -Squash [1] into this patch with the following changes (Stephen)
> -Update the sc7180 dtsi file
> -Remove resource names and just use index (Stephen)
> Changes in v3:
> -Split out the dtsi change from v2 (Stephen)
> -Fix set-but-unused warning identified by 0-day
> -Fix up a couple of style nits (Stephen)
> -Store HDCP key directly in dp_hdcp struct (Stephen)
> -Remove wmb in HDCP key initialization, move an_seed (Stephen)
> -Use FIELD_PREP for bstatus/bcaps (Stephen)
> -#define read_poll_timeout values (Stephen)
> -Remove unnecessary parentheses in dp_hdcp_store_ksv_fifo (Stephen)
> -Add compatible string for hdcp (Stephen)
> -Rename dp_hdcp_write_* functions (Abhinav)
> -Add 1us delay between An reads (Abhinav)
> -Delete unused dp_hdcp_read_* functions
> Changes in v4:
> -Rebase on Bjorn's multi-dp patchset
>
> [1] https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-14-sean@poorly.run
Looks mostly ok to me. One nit below but otherwise you can have my
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
> diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c
> index da4323556ef3..c16fce17d096 100644
> --- a/drivers/gpu/drm/msm/dp/dp_debug.c
> +++ b/drivers/gpu/drm/msm/dp/dp_debug.c
> @@ -198,6 +201,35 @@ static int dp_test_active_open(struct inode *inode,
> inode->i_private);
> }
>
> +static ssize_t dp_hdcp_key_write(struct file *file, const char __user *ubuf,
> + size_t len, loff_t *offp)
I deem this API through debugfs no good, but I can see that opening the
can of worms that is programming the key other ways is worse, so alright.
> +{
> + char *input_buffer;
> + int ret;
> + struct dp_debug_private *debug = file->private_data;
> +
> + if (len != (DRM_HDCP_KSV_LEN + DP_HDCP_NUM_KEYS * DP_HDCP_KEY_LEN))
> + return -EINVAL;
> +
[....]
> diff --git a/drivers/gpu/drm/msm/dp/dp_hdcp.c b/drivers/gpu/drm/msm/dp/dp_hdcp.c
> new file mode 100644
> index 000000000000..03ea3a974576
> --- /dev/null
> +++ b/drivers/gpu/drm/msm/dp/dp_hdcp.c
> @@ -0,0 +1,462 @@
[...]
> +
> +int dp_hdcp_attach(struct dp_hdcp *hdcp, struct drm_connector *connector)
> +{
> + struct drm_device *dev = connector->dev;
> + struct drm_hdcp_helper_data *helper_data;
> + int ret;
> +
> + /* HDCP is not configured for this device */
> + if (!hdcp->parser->io.dp_controller.hdcp_key.base)
> + return 0;
> +
> + helper_data = drm_hdcp_helper_initialize_dp(connector, hdcp->aux,
> + &dp_hdcp_funcs, false);
> + if (IS_ERR_OR_NULL(helper_data))
Just IS_ERR()?
> + return PTR_ERR(helper_data);
Because PTR_ERR() on NULL is zero. Maybe return PTR_ERR_OR_ZERO() is
supposed to be here? Or I don't understand why
drm_hdcp_helper_initialize_dp() would return NULL.
> +
> + ret = drm_connector_attach_content_protection_property(connector, false);
> + if (ret) {
> + drm_hdcp_helper_destroy(helper_data);
> + drm_err(dev, "Failed to attach content protection prop %d\n", ret);
> + return ret;
> + }
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v4 14/14] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers
2021-11-05 3:04 ` [PATCH v4 14/14] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers Sean Paul
2021-12-09 3:31 ` Stephen Boyd
@ 2022-02-09 21:41 ` Dmitry Baryshkov
1 sibling, 0 replies; 13+ messages in thread
From: Dmitry Baryshkov @ 2022-02-09 21:41 UTC (permalink / raw)
To: Sean Paul, dri-devel, intel-gfx, freedreno
Cc: bjorn.andersson, swboyd, jani.nikula, abhinavk, Sean Paul,
Rob Clark, David Airlie, Daniel Vetter, linux-arm-msm
On 05/11/2021 06:04, Sean Paul wrote:
> From: Sean Paul <seanpaul@chromium.org>
>
> This patch adds HDCP 1.x support to msm DP connectors using the new HDCP
> helpers.
Sean, is this something that you'd like to pursue further?
We have picked up patches 8-11, which were independent from the rest of
the changes. The rest seems to have dependencies on core changes (which
were not acked)
>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: Abhinav Kumar <abhinavk@codeaurora.org>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-15-sean@poorly.run #v1
> Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-14-sean@poorly.run #v2
> Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-15-sean@poorly.run #v3
>
> Changes in v2:
> -Squash [1] into this patch with the following changes (Stephen)
> -Update the sc7180 dtsi file
> -Remove resource names and just use index (Stephen)
> Changes in v3:
> -Split out the dtsi change from v2 (Stephen)
> -Fix set-but-unused warning identified by 0-day
> -Fix up a couple of style nits (Stephen)
> -Store HDCP key directly in dp_hdcp struct (Stephen)
> -Remove wmb in HDCP key initialization, move an_seed (Stephen)
> -Use FIELD_PREP for bstatus/bcaps (Stephen)
> -#define read_poll_timeout values (Stephen)
> -Remove unnecessary parentheses in dp_hdcp_store_ksv_fifo (Stephen)
> -Add compatible string for hdcp (Stephen)
> -Rename dp_hdcp_write_* functions (Abhinav)
> -Add 1us delay between An reads (Abhinav)
> -Delete unused dp_hdcp_read_* functions
> Changes in v4:
> -Rebase on Bjorn's multi-dp patchset
>
> [1] https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-14-sean@poorly.run
> ---
> drivers/gpu/drm/msm/Makefile | 1 +
> drivers/gpu/drm/msm/dp/dp_debug.c | 46 ++-
> drivers/gpu/drm/msm/dp/dp_debug.h | 6 +-
> drivers/gpu/drm/msm/dp/dp_display.c | 46 ++-
> drivers/gpu/drm/msm/dp/dp_display.h | 5 +
> drivers/gpu/drm/msm/dp/dp_drm.c | 68 +++-
> drivers/gpu/drm/msm/dp/dp_drm.h | 5 +
> drivers/gpu/drm/msm/dp/dp_hdcp.c | 462 ++++++++++++++++++++++++++++
> drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 ++
> drivers/gpu/drm/msm/dp/dp_parser.c | 20 +-
> drivers/gpu/drm/msm/dp/dp_parser.h | 4 +
> drivers/gpu/drm/msm/dp/dp_reg.h | 32 +-
> drivers/gpu/drm/msm/msm_atomic.c | 15 +
> 13 files changed, 729 insertions(+), 8 deletions(-)
> create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c
> create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h
>
> diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
> index 40577f8856d8..fb3411a74e61 100644
> --- a/drivers/gpu/drm/msm/Makefile
> +++ b/drivers/gpu/drm/msm/Makefile
> @@ -108,6 +108,7 @@ msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \
> dp/dp_ctrl.o \
> dp/dp_display.o \
> dp/dp_drm.o \
> + dp/dp_hdcp.o \
> dp/dp_hpd.o \
> dp/dp_link.o \
> dp/dp_panel.o \
> diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c
> index da4323556ef3..c16fce17d096 100644
> --- a/drivers/gpu/drm/msm/dp/dp_debug.c
> +++ b/drivers/gpu/drm/msm/dp/dp_debug.c
> @@ -8,6 +8,7 @@
> #include <linux/debugfs.h>
> #include <drm/drm_connector.h>
> #include <drm/drm_file.h>
> +#include <drm/drm_hdcp.h>
>
> #include "dp_parser.h"
> #include "dp_catalog.h"
> @@ -15,6 +16,7 @@
> #include "dp_ctrl.h"
> #include "dp_debug.h"
> #include "dp_display.h"
> +#include "dp_hdcp.h"
>
> #define DEBUG_NAME "msm_dp"
>
> @@ -25,6 +27,7 @@ struct dp_debug_private {
> struct dp_link *link;
> struct dp_panel *panel;
> struct drm_connector *connector;
> + struct dp_hdcp *hdcp;
> struct device *dev;
> struct drm_device *drm_dev;
>
> @@ -198,6 +201,35 @@ static int dp_test_active_open(struct inode *inode,
> inode->i_private);
> }
>
> +static ssize_t dp_hdcp_key_write(struct file *file, const char __user *ubuf,
> + size_t len, loff_t *offp)
> +{
> + char *input_buffer;
> + int ret;
> + struct dp_debug_private *debug = file->private_data;
> +
> + if (len != (DRM_HDCP_KSV_LEN + DP_HDCP_NUM_KEYS * DP_HDCP_KEY_LEN))
> + return -EINVAL;
> +
> + if (!debug->hdcp)
> + return -ENOENT;
> +
> + input_buffer = memdup_user_nul(ubuf, len);
> + if (IS_ERR(input_buffer))
> + return PTR_ERR(input_buffer);
> +
> + ret = dp_hdcp_ingest_key(debug->hdcp, input_buffer, len);
> +
> + kfree(input_buffer);
> + if (ret < 0) {
> + DRM_ERROR("Could not ingest HDCP key, ret=%d\n", ret);
> + return ret;
> + }
> +
> + *offp += len;
> + return len;
> +}
> +
> static const struct file_operations test_active_fops = {
> .owner = THIS_MODULE,
> .open = dp_test_active_open,
> @@ -207,6 +239,12 @@ static const struct file_operations test_active_fops = {
> .write = dp_test_active_write
> };
>
> +static const struct file_operations dp_hdcp_key_fops = {
> + .owner = THIS_MODULE,
> + .open = simple_open,
> + .write = dp_hdcp_key_write,
> +};
> +
> static int dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor)
> {
> int rc = 0;
> @@ -228,6 +266,10 @@ static int dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor)
> minor->debugfs_root,
> debug, &dp_test_type_fops);
>
> + debugfs_create_file("msm_dp_hdcp_key", 0222,
> + minor->debugfs_root,
> + debug, &dp_hdcp_key_fops);
> +
> debug->root = minor->debugfs_root;
>
> return rc;
> @@ -235,7 +277,8 @@ static int dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor)
>
> struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
> struct dp_usbpd *usbpd, struct dp_link *link,
> - struct drm_connector *connector, struct drm_minor *minor)
> + struct dp_hdcp *hdcp, struct drm_connector *connector,
> + struct drm_minor *minor)
> {
> int rc = 0;
> struct dp_debug_private *debug;
> @@ -257,6 +300,7 @@ struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
> debug->usbpd = usbpd;
> debug->link = link;
> debug->panel = panel;
> + debug->hdcp = hdcp;
> debug->dev = dev;
> debug->drm_dev = minor->dev;
> debug->connector = connector;
> diff --git a/drivers/gpu/drm/msm/dp/dp_debug.h b/drivers/gpu/drm/msm/dp/dp_debug.h
> index 8c0d0b5178fd..55ab008876e7 100644
> --- a/drivers/gpu/drm/msm/dp/dp_debug.h
> +++ b/drivers/gpu/drm/msm/dp/dp_debug.h
> @@ -6,6 +6,7 @@
> #ifndef _DP_DEBUG_H_
> #define _DP_DEBUG_H_
>
> +#include "dp_hdcp.h"
> #include "dp_panel.h"
> #include "dp_link.h"
>
> @@ -43,7 +44,7 @@ struct dp_debug {
> */
> struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
> struct dp_usbpd *usbpd, struct dp_link *link,
> - struct drm_connector *connector,
> + struct dp_hdcp *hdcp, struct drm_connector *connector,
> struct drm_minor *minor);
>
> /**
> @@ -60,7 +61,8 @@ void dp_debug_put(struct dp_debug *dp_debug);
> static inline
> struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,
> struct dp_usbpd *usbpd, struct dp_link *link,
> - struct drm_connector *connector, struct drm_minor *minor)
> + struct dp_hdcp *hdcp, struct drm_connector *connector,
> + struct drm_minor *minor)
> {
> return ERR_PTR(-EINVAL);
> }
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
> index 79412a8fbaff..5d8c118e7365 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -27,6 +27,7 @@
> #include "dp_drm.h"
> #include "dp_audio.h"
> #include "dp_debug.h"
> +#include "dp_hdcp.h"
>
> #define HPD_STRING_SIZE 30
>
> @@ -98,6 +99,7 @@ struct dp_display_private {
> struct dp_panel *panel;
> struct dp_ctrl *ctrl;
> struct dp_debug *debug;
> + struct dp_hdcp *hdcp;
>
> struct dp_usbpd_cb usbpd_cb;
> struct dp_display_mode dp_mode;
> @@ -147,6 +149,15 @@ static struct dp_display_private *dev_get_dp_display_private(struct device *dev)
> return container_of(dp, struct dp_display_private, dp_display);
> }
>
> +struct dp_hdcp *dp_display_connector_to_hdcp(struct drm_connector *connector)
> +{
> + struct msm_dp *dp_display = msm_dp_from_connector(connector);
> + struct dp_display_private *dp;
> +
> + dp = container_of(dp_display, struct dp_display_private, dp_display);
> + return dp->hdcp;
> +}
> +
> static int dp_add_event(struct dp_display_private *dp_priv, u32 event,
> u32 data, u32 delay)
> {
> @@ -707,6 +718,7 @@ static int dp_irq_hpd_handle(struct dp_display_private *dp, u32 data)
> static void dp_display_deinit_sub_modules(struct dp_display_private *dp)
> {
> dp_debug_put(dp->debug);
> + dp_hdcp_put(dp->hdcp);
> dp_audio_put(dp->audio);
> dp_panel_put(dp->panel);
> dp_aux_put(dp->aux);
> @@ -803,8 +815,18 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
> goto error_ctrl;
> }
>
> + dp->hdcp = dp_hdcp_get(dp->parser, dp->aux);
> + if (IS_ERR(dp->hdcp)) {
> + rc = PTR_ERR(dp->hdcp);
> + DRM_ERROR("failed to initialize hdcp, rc = %d\n", rc);
> + dp->hdcp = NULL;
> + goto error_hdcp;
> + }
> +
> return rc;
>
> +error_hdcp:
> + dp_audio_put(dp->audio);
> error_ctrl:
> dp_panel_put(dp->panel);
> error_link:
> @@ -919,6 +941,16 @@ int dp_display_set_plugged_cb(struct msm_dp *dp_display,
> return 0;
> }
>
> +void dp_display_hdcp_commit(struct msm_dp *dp, struct drm_atomic_state *state)
> +{
> + struct dp_display_private *dp_display;
> +
> + dp_display = container_of(dp, struct dp_display_private, dp_display);
> +
> + if (dp_display->hdcp)
> + dp_hdcp_commit(dp_display->hdcp, state);
> +}
> +
> int dp_display_validate_mode(struct msm_dp *dp, u32 mode_pclk_khz)
> {
> const u32 num_components = 3, default_bpp = 24;
> @@ -1442,8 +1474,8 @@ void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor)
> dev = &dp->pdev->dev;
>
> dp->debug = dp_debug_get(dev, dp->panel, dp->usbpd,
> - dp->link, dp->dp_display.connector,
> - minor);
> + dp->link, dp->hdcp,
> + dp->dp_display.connector, minor);
> if (IS_ERR(dp->debug)) {
> rc = PTR_ERR(dp->debug);
> DRM_ERROR("failed to initialize debug, rc = %d\n", rc);
> @@ -1454,12 +1486,16 @@ void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor)
> int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
> struct drm_encoder *encoder)
> {
> + struct dp_display_private *dp_display_priv;
> struct msm_drm_private *priv;
> int ret;
>
> if (WARN_ON(!encoder) || WARN_ON(!dp_display) || WARN_ON(!dev))
> return -EINVAL;
>
> + dp_display_priv = container_of(dp_display, struct dp_display_private,
> + dp_display);
> +
> priv = dev->dev_private;
> dp_display->drm_dev = dev;
>
> @@ -1480,6 +1516,12 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
> return ret;
> }
>
> + ret = dp_hdcp_attach(dp_display_priv->hdcp, dp_display->connector);
> + if (ret) {
> + DRM_ERROR("Failed to attach hdcp, ret=%d\n", ret);
> + return ret;
> + }
> +
> priv->connectors[priv->num_connectors++] = dp_display->connector;
> return 0;
> }
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
> index 8e80e3bac394..1d202223593c 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.h
> +++ b/drivers/gpu/drm/msm/dp/dp_display.h
> @@ -29,8 +29,13 @@ struct msm_dp {
> struct dp_audio *dp_audio;
> };
>
> +struct drm_atomic_state;
> +
> int dp_display_set_plugged_cb(struct msm_dp *dp_display,
> hdmi_codec_plugged_cb fn, struct device *codec_dev);
> +struct dp_hdcp *dp_display_connector_to_hdcp(struct drm_connector *connector);
> +void dp_display_hdcp_commit(struct msm_dp *dp_display,
> + struct drm_atomic_state *state);
> int dp_display_validate_mode(struct msm_dp *dp_display, u32 mode_pclk_khz);
> int dp_display_get_modes(struct msm_dp *dp_display,
> struct dp_display_mode *dp_mode);
> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
> index 76856c4ee1d6..f6694ed82169 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.c
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.c
> @@ -6,11 +6,20 @@
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_atomic.h>
> #include <drm/drm_bridge.h>
> +#include <drm/drm_connector.h>
> #include <drm/drm_crtc.h>
> +#include <drm/drm_hdcp.h>
>
> #include "msm_drv.h"
> #include "msm_kms.h"
> #include "dp_drm.h"
> +#include "dp_hdcp.h"
> +
> +struct dp_connector_state {
> + struct drm_connector_state base;
> + bool hdcp_transition;
> +};
> +#define to_dp_connector_state(x) container_of(x, struct dp_connector_state, base)
>
> struct dp_connector {
> struct drm_connector base;
> @@ -18,6 +27,11 @@ struct dp_connector {
> };
> #define to_dp_connector(x) container_of(x, struct dp_connector, base)
>
> +struct msm_dp *msm_dp_from_connector(struct drm_connector *connector)
> +{
> + return to_dp_connector(connector)->dp_display;
> +}
> +
> /**
> * dp_connector_detect - callback to determine if connector is connected
> * @conn: Pointer to drm connector structure
> @@ -115,20 +129,72 @@ static enum drm_mode_status dp_connector_mode_valid(
> return dp_display_validate_mode(dp_disp, mode->clock);
> }
>
> +static int dp_connector_atomic_check(struct drm_connector *connector,
> + struct drm_atomic_state *state)
> +{
> + struct drm_connector_state *conn_state;
> + struct dp_connector_state *dp_state;
> +
> + conn_state = drm_atomic_get_new_connector_state(state, connector);
> + dp_state = to_dp_connector_state(conn_state);
> +
> + dp_state->hdcp_transition = drm_hdcp_atomic_check(connector, state);
> +
> + return 0;
> +}
> +
> +static struct drm_connector_state *
> +dp_connector_atomic_duplicate_state(struct drm_connector *connector)
> +{
> + struct dp_connector_state *state;
> +
> + state = kzalloc(sizeof(*state), GFP_KERNEL);
> + if (!state)
> + return NULL;
> +
> + state->hdcp_transition = false;
> +
> + __drm_atomic_helper_connector_duplicate_state(connector, &state->base);
> + return &state->base;
> +}
> +
> static const struct drm_connector_funcs dp_connector_funcs = {
> .detect = dp_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> .reset = drm_atomic_helper_connector_reset,
> - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> + .atomic_duplicate_state = dp_connector_atomic_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> };
>
> static const struct drm_connector_helper_funcs dp_connector_helper_funcs = {
> .get_modes = dp_connector_get_modes,
> .mode_valid = dp_connector_mode_valid,
> + .atomic_check = dp_connector_atomic_check,
> };
>
> +bool dp_drm_is_connector_msm_dp(struct drm_connector *connector)
> +{
> + return connector->funcs == &dp_connector_funcs;
> +}
> +
> +void dp_drm_atomic_commit(struct drm_connector *connector,
> + struct drm_connector_state *conn_state,
> + struct drm_atomic_state *state)
> +{
> + struct dp_connector_state *dp_state;
> + struct msm_dp *dp_disp;
> +
> + dp_state = to_dp_connector_state(conn_state);
> +
> + if (!dp_state->hdcp_transition)
> + return;
> +
> + dp_disp = msm_dp_from_connector(connector);
> +
> + dp_display_hdcp_commit(dp_disp, state);
> +}
> +
> /* connector initialization */
> struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display)
> {
> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_drm.h
> index c27bfceefdf0..a5d95c6acd67 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.h
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.h
> @@ -14,5 +14,10 @@
> #include "dp_display.h"
>
> struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display);
> +struct msm_dp *msm_dp_from_connector(struct drm_connector *connector);
> +bool dp_drm_is_connector_msm_dp(struct drm_connector *connector);
> +void dp_drm_atomic_commit(struct drm_connector *connector,
> + struct drm_connector_state *conn_state,
> + struct drm_atomic_state *state);
>
> #endif /* _DP_DRM_H_ */
> diff --git a/drivers/gpu/drm/msm/dp/dp_hdcp.c b/drivers/gpu/drm/msm/dp/dp_hdcp.c
> new file mode 100644
> index 000000000000..03ea3a974576
> --- /dev/null
> +++ b/drivers/gpu/drm/msm/dp/dp_hdcp.c
> @@ -0,0 +1,462 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright (C) 2021 Google, Inc.
> + *
> + * Authors:
> + * Sean Paul <seanpaul@chromium.org>
> + */
> +
> +#include "dp_display.h"
> +#include "dp_drm.h"
> +#include "dp_hdcp.h"
> +#include "dp_reg.h"
> +
> +#include <drm/drm_connector.h>
> +#include <drm/drm_device.h>
> +#include <drm/drm_dp_helper.h>
> +#include <drm/drm_hdcp.h>
> +#include <drm/drm_print.h>
> +
> +#include <linux/bitfield.h>
> +#include <linux/bits.h>
> +#include <linux/iopoll.h>
> +#include <linux/mutex.h>
> +#include <linux/random.h>
> +#include <linux/slab.h>
> +
> +/* Offsets based on hdcp_ksv mmio */
> +#define DP_HDCP_KSV_AN_LSB 0x0
> +#define DP_HDCP_KSV_AN_MSB 0x4
> +#define DP_HDCP_KSV_AKSV_MSB 0x1D8
> +#define DP_HDCP_KSV_AKSV_LSB 0x1DC
> +
> +/* Key offsets based on hdcp_key mmio */
> +#define DP_HDCP_KEY_BASE 0x30
> +#define DP_HDCP_KEY_MSB(x) (DP_HDCP_KEY_BASE + (x * 8))
> +#define DP_HDCP_KEY_LSB(x) (DP_HDCP_KEY_MSB(x) + 4)
> +#define DP_HDCP_KEY_VALID 0x170
> +#define DP_HDCP_SW_KEY_VALID BIT(0)
> +
> +/* Timeouts */
> +#define DP_KEYS_VALID_SLEEP_US (20 * 1000)
> +#define DP_KEYS_VALID_TIMEOUT_US (100 * 1000)
> +#define DP_AN_READY_SLEEP_US 100
> +#define DP_AN_READY_TIMEOUT_US (10 * 1000)
> +#define DP_R0_READY_SLEEP_US 100
> +#define DP_R0_READY_TIMEOUT_US (10 * 1000)
> +#define DP_RI_MATCH_SLEEP_US (20 * 1000)
> +#define DP_RI_MATCH_TIMEOUT_US (100 * 1000)
> +#define DP_KSV_WRITTEN_SLEEP_US 100
> +#define DP_KSV_WRITTEN_TIMEOUT_US (100 * 1000)
> +#define DP_SHA_COMPUTATION_SLEEP_US 100
> +#define DP_SHA_COMPUTATION_TIMEOUT_US (100 * 1000)
> +#define DP_AN_READ_DELAY_US 1
> +
> +/*
> + * dp_hdcp_key - structure which contains an HDCP key set
> + * @ksv: The key selection vector
> + * @keys: Contains 40 keys
> + */
> +struct dp_hdcp_key {
> + struct drm_hdcp_ksv ksv;
> + union {
> + u32 words[2];
> + u8 bytes[DP_HDCP_KEY_LEN];
> + } keys[DP_HDCP_NUM_KEYS];
> + bool valid;
> +};
> +
> +struct dp_hdcp {
> + struct drm_device *dev;
> + struct drm_connector *connector;
> +
> + struct drm_dp_aux *aux;
> + struct dp_parser *parser;
> +
> + struct drm_hdcp_helper_data *helper_data;
> +
> + struct mutex key_lock;
> + struct dp_hdcp_key key;
> +};
> +
> +static inline void dp_hdcp_write_ahb(struct dp_hdcp *hdcp, u32 offset, u32 val)
> +{
> + writel(val, hdcp->parser->io.dp_controller.ahb.base + offset);
> +}
> +
> +static inline u32 dp_hdcp_read_ahb(struct dp_hdcp *hdcp, u32 offset)
> +{
> + return readl(hdcp->parser->io.dp_controller.ahb.base + offset);
> +}
> +
> +static inline void dp_hdcp_write_aux(struct dp_hdcp *hdcp, u32 offset, u32 val)
> +{
> + writel(val, hdcp->parser->io.dp_controller.aux.base + offset);
> +}
> +
> +static inline u32 dp_hdcp_read_aux(struct dp_hdcp *hdcp, u32 offset)
> +{
> + return readl(hdcp->parser->io.dp_controller.aux.base + offset);
> +}
> +
> +static inline void dp_hdcp_write_link(struct dp_hdcp *hdcp, u32 offset, u32 val)
> +{
> + writel(val, hdcp->parser->io.dp_controller.link.base + offset);
> +}
> +
> +static inline u32 dp_hdcp_read_link(struct dp_hdcp *hdcp, u32 offset)
> +{
> + return readl(hdcp->parser->io.dp_controller.link.base + offset);
> +}
> +
> +static inline void dp_hdcp_write_key(struct dp_hdcp *hdcp, u32 offset, u32 val)
> +{
> + writel(val, hdcp->parser->io.dp_controller.hdcp_key.base + offset);
> +}
> +
> +static inline void dp_hdcp_write_tz_hlos(struct dp_hdcp *hdcp, u32 offset,
> + u32 val)
> +{
> + writel(val, hdcp->parser->io.dp_controller.hdcp_tz.base + offset);
> +}
> +
> +int dp_hdcp_ingest_key(struct dp_hdcp *hdcp, const u8 *raw_key, int raw_len)
> +{
> + unsigned int ksv_weight;
> + int i, ret = 0;
> +
> + if (raw_len != (DRM_HDCP_KSV_LEN + DP_HDCP_NUM_KEYS * DP_HDCP_KEY_LEN)) {
> + DRM_ERROR("Invalid HDCP key length expected=%d actual=%d\n",
> + (DRM_HDCP_KSV_LEN + DP_HDCP_NUM_KEYS * DP_HDCP_KEY_LEN),
> + raw_len);
> + return -EINVAL;
> + }
> +
> + mutex_lock(&hdcp->key_lock);
> +
> + memcpy(hdcp->key.ksv.bytes, raw_key, DRM_HDCP_KSV_LEN);
> + ksv_weight = hweight32(hdcp->key.ksv.words[0]) +
> + hweight32(hdcp->key.ksv.words[1]);
> + if (ksv_weight != 20) {
> + DRM_ERROR("Invalid ksv weight, expected=20 actual=%d\n",
> + ksv_weight);
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + raw_key += DRM_HDCP_KSV_LEN;
> + for (i = 0; i < DP_HDCP_NUM_KEYS; i++) {
> + memcpy(hdcp->key.keys[i].bytes, raw_key, DP_HDCP_KEY_LEN);
> + raw_key += DP_HDCP_KEY_LEN;
> + }
> +
> + DRM_DEBUG_DRIVER("Successfully ingested HDCP key\n");
> + hdcp->key.valid = true;
> +
> +out:
> + mutex_unlock(&hdcp->key_lock);
> + return ret;
> +}
> +
> +static bool dp_hdcp_are_keys_valid(struct drm_connector *connector)
> +{
> + struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
> + u32 val;
> +
> + val = dp_hdcp_read_ahb(hdcp, DP_HDCP_STATUS);
> + return FIELD_GET(DP_HDCP_KEY_STATUS, val) == DP_HDCP_KEY_STATUS_VALID;
> +}
> +
> +static int dp_hdcp_load_keys(struct drm_connector *connector)
> +{
> + struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
> + int i, ret = 0;
> + u64 an_seed = get_random_u64();
> +
> + mutex_lock(&hdcp->key_lock);
> +
> + if (!hdcp->key.valid) {
> + ret = -ENOENT;
> + goto out;
> + }
> +
> + dp_hdcp_write_aux(hdcp, DP_HDCP_SW_LOWER_AKSV, hdcp->key.ksv.words[0]);
> + dp_hdcp_write_aux(hdcp, DP_HDCP_SW_UPPER_AKSV, hdcp->key.ksv.words[1]);
> +
> + for (i = 0; i < DP_HDCP_NUM_KEYS; i++) {
> + dp_hdcp_write_key(hdcp, DP_HDCP_KEY_LSB(i),
> + hdcp->key.keys[i].words[0]);
> + dp_hdcp_write_key(hdcp, DP_HDCP_KEY_MSB(i),
> + hdcp->key.keys[i].words[1]);
> + }
> +
> + dp_hdcp_write_key(hdcp, DP_HDCP_KEY_VALID, DP_HDCP_SW_KEY_VALID);
> +
> + dp_hdcp_write_link(hdcp, DP_HDCP_ENTROPY_CTRL0,
> + FIELD_GET(GENMASK(31,0), an_seed));
> + dp_hdcp_write_link(hdcp, DP_HDCP_ENTROPY_CTRL1,
> + FIELD_GET(GENMASK_ULL(63,32), an_seed));
> +
> +out:
> + mutex_unlock(&hdcp->key_lock);
> + return ret;
> +}
> +
> +static int dp_hdcp_hdcp2_capable(struct drm_connector *connector, bool *capable)
> +{
> + *capable = false;
> + return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_read_an_aksv(struct drm_connector *connector,
> + u32 *an, u32 *aksv)
> +{
> + struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
> + bool keys_valid;
> + int ret;
> + u32 val;
> +
> + dp_hdcp_write_ahb(hdcp, DP_HDCP_CTRL, 1);
> +
> + ret = read_poll_timeout(dp_hdcp_are_keys_valid, keys_valid, keys_valid,
> + DP_KEYS_VALID_SLEEP_US,
> + DP_KEYS_VALID_TIMEOUT_US, false, connector);
> + if (ret) {
> + drm_err(hdcp->dev, "HDCP keys invalid %d\n", ret);
> + return ret;
> + }
> +
> + /* Clear AInfo */
> + dp_hdcp_write_aux(hdcp, DP_HDCP_RCVPORT_DATA4, 0);
> +
> + aksv[0] = dp_hdcp_read_aux(hdcp, DP_HDCP_RCVPORT_DATA3);
> + aksv[1] = GENMASK(7, 0) & dp_hdcp_read_aux(hdcp, DP_HDCP_RCVPORT_DATA4);
> +
> + ret = read_poll_timeout(dp_hdcp_read_ahb, val,
> + (val & DP_HDCP_AN_READY_MASK) == DP_HDCP_AN_READY_MASK,
> + DP_AN_READY_SLEEP_US, DP_AN_READY_TIMEOUT_US,
> + false, hdcp, DP_HDCP_STATUS);
> + if (ret) {
> + drm_err(hdcp->dev, "AN failed to become ready %x/%d\n", val,
> + ret);
> + return ret;
> + }
> +
> + /*
> + * Get An from hardware, for unknown reasons we need to read the reg
> + * twice to get valid data.
> + */
> + dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA5);
> + an[0] = dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA5);
> +
> + udelay(DP_AN_READ_DELAY_US);
> +
> + dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA6);
> + an[1] = dp_hdcp_read_ahb(hdcp, DP_HDCP_RCVPORT_DATA6);
> +
> + return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_store_receiver_info(struct drm_connector *connector,
> + u32 *ksv, u32 status, u8 bcaps,
> + bool is_repeater)
> +{
> + struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
> + u32 val;
> +
> + dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA0,
> + ksv[0]);
> + dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA1,
> + ksv[1]);
> +
> + val = FIELD_PREP(GENMASK(23, 8), status) |
> + FIELD_PREP(GENMASK(7, 0), bcaps);
> +
> + dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA12,
> + val);
> +
> + return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_enable_encryption(struct drm_connector *connector)
> +{
> + return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_wait_for_r0(struct drm_connector *connector)
> +{
> + struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
> + int ret;
> + u32 val;
> +
> + ret = read_poll_timeout(dp_hdcp_read_ahb, val, (val & DP_HDCP_R0_READY),
> + DP_R0_READY_SLEEP_US, DP_R0_READY_TIMEOUT_US,
> + false, hdcp, DP_HDCP_STATUS);
> + if (ret) {
> + drm_err(hdcp->dev, "HDCP R0 not ready %x/%d\n", val, ret);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_match_ri(struct drm_connector *connector, u32 ri_prime)
> +{
> + struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
> + int ret;
> + u32 val;
> +
> + dp_hdcp_write_ahb(hdcp, DP_HDCP_RCVPORT_DATA2_0, ri_prime);
> +
> + ret = read_poll_timeout(dp_hdcp_read_ahb, val, (val & DP_HDCP_RI_MATCH),
> + DP_RI_MATCH_SLEEP_US, DP_RI_MATCH_TIMEOUT_US,
> + false, hdcp, DP_HDCP_STATUS);
> + if (ret) {
> + drm_err(hdcp->dev, "Failed to match Ri and Ri` (%08x) %08x/%d\n",
> + ri_prime, val, ret);
> + return ret;
> + }
> + return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_store_ksv_fifo(struct drm_connector *connector,
> + u8 *ksv_fifo, u8 num_downstream,
> + u8 *bstatus, u32 *vprime)
> +{
> + struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
> + int num_bytes = num_downstream * DRM_HDCP_KSV_LEN;
> + int ret, i;
> + u32 val;
> +
> + /* Reset the SHA computation block */
> + dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_CTRL,
> + DP_HDCP_SHA_CTRL_RESET);
> + dp_hdcp_write_tz_hlos(hdcp, HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_CTRL, 0);
> +
> + /*
> + * KSV info gets written a byte at a time in the same order it was
> + * received. Every 64 bytes, we need to wait for the SHA_BLOCK_DONE
> + * bit to be set in SHA_CTRL.
> + */
> + for (i = 0; i < num_bytes; i++) {
> + val = FIELD_PREP(DP_HDCP_SHA_DATA_MASK, ksv_fifo[i]);
> +
> + if (i == (num_bytes - 1))
> + val |= DP_HDCP_SHA_DATA_DONE;
> +
> + dp_hdcp_write_tz_hlos(hdcp,
> + HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_DATA,
> + val);
> +
> + if (((i + 1) % 64) != 0)
> + continue;
> +
> + ret = read_poll_timeout(dp_hdcp_read_ahb, val,
> + (val & DP_HDCP_SHA_DONE),
> + DP_KSV_WRITTEN_SLEEP_US,
> + DP_KSV_WRITTEN_TIMEOUT_US, false, hdcp,
> + DP_HDCP_SHA_STATUS);
> + if (ret) {
> + drm_err(hdcp->dev, "SHA block incomplete %d\n", ret);
> + return ret;
> + }
> + }
> +
> + ret = read_poll_timeout(dp_hdcp_read_ahb, val,
> + (val & DP_HDCP_SHA_COMP_DONE),
> + DP_SHA_COMPUTATION_SLEEP_US,
> + DP_SHA_COMPUTATION_TIMEOUT_US,
> + false, hdcp, DP_HDCP_SHA_STATUS);
> + if (ret) {
> + drm_err(hdcp->dev, "SHA computation incomplete %d\n", ret);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static int dp_hdcp_hdcp1_disable(struct drm_connector *connector)
> +{
> + struct dp_hdcp *hdcp = dp_display_connector_to_hdcp(connector);
> + u32 val;
> +
> + val = dp_hdcp_read_ahb(hdcp, REG_DP_SW_RESET);
> + dp_hdcp_write_ahb(hdcp, REG_DP_SW_RESET, val | DP_HDCP_SW_RESET);
> +
> + /* Disable encryption and disable the HDCP block */
> + dp_hdcp_write_ahb(hdcp, DP_HDCP_CTRL, 0);
> +
> + dp_hdcp_write_ahb(hdcp, REG_DP_SW_RESET, val);
> +
> + return 0;
> +}
> +
> +void dp_hdcp_commit(struct dp_hdcp *hdcp, struct drm_atomic_state *state)
> +{
> + drm_hdcp_helper_atomic_commit(hdcp->helper_data, state, NULL);
> +}
> +
> +static const struct drm_hdcp_helper_funcs dp_hdcp_funcs = {
> + .are_keys_valid = dp_hdcp_are_keys_valid,
> + .load_keys = dp_hdcp_load_keys,
> + .hdcp2_capable = dp_hdcp_hdcp2_capable,
> + .hdcp1_read_an_aksv = dp_hdcp_hdcp1_read_an_aksv,
> + .hdcp1_store_receiver_info = dp_hdcp_hdcp1_store_receiver_info,
> + .hdcp1_enable_encryption = dp_hdcp_hdcp1_enable_encryption,
> + .hdcp1_wait_for_r0 = dp_hdcp_hdcp1_wait_for_r0,
> + .hdcp1_match_ri = dp_hdcp_hdcp1_match_ri,
> + .hdcp1_store_ksv_fifo = dp_hdcp_hdcp1_store_ksv_fifo,
> + .hdcp1_disable = dp_hdcp_hdcp1_disable,
> +};
> +
> +int dp_hdcp_attach(struct dp_hdcp *hdcp, struct drm_connector *connector)
> +{
> + struct drm_device *dev = connector->dev;
> + struct drm_hdcp_helper_data *helper_data;
> + int ret;
> +
> + /* HDCP is not configured for this device */
> + if (!hdcp->parser->io.dp_controller.hdcp_key.base)
> + return 0;
> +
> + helper_data = drm_hdcp_helper_initialize_dp(connector, hdcp->aux,
> + &dp_hdcp_funcs, false);
> + if (IS_ERR_OR_NULL(helper_data))
> + return PTR_ERR(helper_data);
> +
> + ret = drm_connector_attach_content_protection_property(connector, false);
> + if (ret) {
> + drm_hdcp_helper_destroy(helper_data);
> + drm_err(dev, "Failed to attach content protection prop %d\n", ret);
> + return ret;
> + }
> +
> + hdcp->dev = connector->dev;
> + hdcp->connector = connector;
> + hdcp->helper_data = helper_data;
> +
> + return 0;
> +}
> +
> +struct dp_hdcp *dp_hdcp_get(struct dp_parser *parser, struct drm_dp_aux *aux)
> +{
> + struct device *dev = &parser->pdev->dev;
> + struct dp_hdcp *hdcp;
> +
> + hdcp = devm_kzalloc(dev, sizeof(*hdcp), GFP_KERNEL);
> + if (!hdcp)
> + return ERR_PTR(-ENOMEM);
> +
> + hdcp->parser = parser;
> + hdcp->aux = aux;
> +
> + mutex_init(&hdcp->key_lock);
> +
> + return hdcp;
> +}
> +
> +void dp_hdcp_put(struct dp_hdcp *hdcp)
> +{
> + if (hdcp)
> + drm_hdcp_helper_destroy(hdcp->helper_data);
> +}
> diff --git a/drivers/gpu/drm/msm/dp/dp_hdcp.h b/drivers/gpu/drm/msm/dp/dp_hdcp.h
> new file mode 100644
> index 000000000000..5637a9b0dea2
> --- /dev/null
> +++ b/drivers/gpu/drm/msm/dp/dp_hdcp.h
> @@ -0,0 +1,27 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright (C) 2021 Google, Inc.
> + *
> + * Authors:
> + * Sean Paul <seanpaul@chromium.org>
> + */
> +
> +#ifndef DP_HDCP_H_
> +#define DP_HDCP_H_
> +
> +#define DP_HDCP_KEY_LEN 7
> +#define DP_HDCP_NUM_KEYS 40
> +
> +struct dp_hdcp;
> +struct dp_parser;
> +struct drm_atomic_state;
> +struct drm_dp_aux;
> +
> +struct dp_hdcp *dp_hdcp_get(struct dp_parser *parser, struct drm_dp_aux *aux);
> +void dp_hdcp_put(struct dp_hdcp *hdcp);
> +
> +int dp_hdcp_attach(struct dp_hdcp *hdcp, struct drm_connector *connector);
> +int dp_hdcp_ingest_key(struct dp_hdcp *hdcp, const u8 *raw_key, int raw_len);
> +void dp_hdcp_commit(struct dp_hdcp *hdcp, struct drm_atomic_state *state);
> +
> +#endif
> diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c
> index a7acc23f742b..5d35ef46120b 100644
> --- a/drivers/gpu/drm/msm/dp/dp_parser.c
> +++ b/drivers/gpu/drm/msm/dp/dp_parser.c
> @@ -66,7 +66,6 @@ static int dp_parser_ctrl_res(struct dp_parser *parser)
> DRM_ERROR("legacy memory region not large enough\n");
> return -EINVAL;
> }
> -
> dss->ahb.len = DP_DEFAULT_AHB_SIZE;
> dss->aux.base = dss->ahb.base + DP_DEFAULT_AUX_OFFSET;
> dss->aux.len = DP_DEFAULT_AUX_SIZE;
> @@ -74,6 +73,10 @@ static int dp_parser_ctrl_res(struct dp_parser *parser)
> dss->link.len = DP_DEFAULT_LINK_SIZE;
> dss->p0.base = dss->ahb.base + DP_DEFAULT_P0_OFFSET;
> dss->p0.len = DP_DEFAULT_P0_SIZE;
> + dss->hdcp_key.base = NULL;
> + dss->hdcp_key.len = 0;
> + dss->hdcp_tz.base = NULL;
> + dss->hdcp_tz.len = 0;
> } else {
> DRM_ERROR("unable to remap aux region: %pe\n", dss->aux.base);
> return PTR_ERR(dss->aux.base);
> @@ -90,6 +93,21 @@ static int dp_parser_ctrl_res(struct dp_parser *parser)
> DRM_ERROR("unable to remap p0 region: %pe\n", dss->p0.base);
> return PTR_ERR(dss->p0.base);
> }
> +
> + dss->hdcp_key.base = dp_ioremap(pdev, 5, &dss->hdcp_key.len);
> + if (!IS_ERR(dss->hdcp_key.base)) {
> + dss->hdcp_tz.base = dp_ioremap(pdev, 6, &dss->hdcp_tz.len);
> + if (IS_ERR(dss->hdcp_tz.base)) {
> + DRM_ERROR("unable to remap hdcp_tz region: %pe\n",
> + dss->hdcp_tz.base);
> + return PTR_ERR(dss->hdcp_tz.base);
> + }
> + } else {
> + dss->hdcp_key.base = NULL;
> + dss->hdcp_key.len = 0;
> + dss->hdcp_tz.base = NULL;
> + dss->hdcp_tz.len = 0;
> + }
> }
>
> io->phy = devm_phy_get(&pdev->dev, "dp");
> diff --git a/drivers/gpu/drm/msm/dp/dp_parser.h b/drivers/gpu/drm/msm/dp/dp_parser.h
> index 3172da089421..4edd499ebaf2 100644
> --- a/drivers/gpu/drm/msm/dp/dp_parser.h
> +++ b/drivers/gpu/drm/msm/dp/dp_parser.h
> @@ -35,6 +35,8 @@ struct dss_io_data {
> struct dss_io_region aux;
> struct dss_io_region link;
> struct dss_io_region p0;
> + struct dss_io_region hdcp_key;
> + struct dss_io_region hdcp_tz;
> };
>
> static inline const char *dp_parser_pm_name(enum dp_pm_type module)
> @@ -69,6 +71,8 @@ struct dp_display_data {
> * struct dp_ctrl_resource - controller's IO related data
> *
> * @dp_controller: Display Port controller mapped memory address
> + * @hdcp_key: mapped memory for HDCP key ingestion
> + * @hdcp_tz: mapped memory for HDCP TZ interaction
> * @phy_io: phy's mapped memory address
> */
> struct dp_io {
> diff --git a/drivers/gpu/drm/msm/dp/dp_reg.h b/drivers/gpu/drm/msm/dp/dp_reg.h
> index 268602803d9a..61ab70850f6b 100644
> --- a/drivers/gpu/drm/msm/dp/dp_reg.h
> +++ b/drivers/gpu/drm/msm/dp/dp_reg.h
> @@ -6,11 +6,14 @@
> #ifndef _DP_REG_H_
> #define _DP_REG_H_
>
> +#include <linux/bits.h>
> +
> /* DP_TX Registers */
> #define REG_DP_HW_VERSION (0x00000000)
>
> #define REG_DP_SW_RESET (0x00000010)
> -#define DP_SW_RESET (0x00000001)
> +#define DP_SW_RESET BIT(0)
> +#define DP_HDCP_SW_RESET BIT(1)
>
> #define REG_DP_PHY_CTRL (0x00000014)
> #define DP_PHY_CTRL_SW_RESET_PLL (0x00000001)
> @@ -283,19 +286,46 @@
> /* DP HDCP 1.3 registers */
> #define DP_HDCP_CTRL (0x0A0)
> #define DP_HDCP_STATUS (0x0A4)
> +#define DP_HDCP_KEY_STATUS GENMASK(18, 16)
> +#define DP_HDCP_KEY_STATUS_NO_KEYS 0
> +#define DP_HDCP_KEY_STATUS_NOT_CHECKED 1
> +#define DP_HDCP_KEY_STATUS_CHECKING 2
> +#define DP_HDCP_KEY_STATUS_VALID 3
> +#define DP_HDCP_KEY_STATUS_INVALID_AKSV 4
> +#define DP_HDCP_KEY_STATUS_BAD_CHECKSUM 5
> +#define DP_HDCP_KEY_STATUS_PROD_AKSV 6
> +#define DP_HDCP_KEY_STATUS_RESV 7
> +#define DP_HDCP_R0_READY BIT(14)
> +#define DP_HDCP_SHA_V_MATCH BIT(13)
> +#define DP_HDCP_RI_MATCH BIT(12)
> +#define DP_HDCP_AN_MSB_READY BIT(9)
> +#define DP_HDCP_AN_LSB_READY BIT(8)
> +#define DP_HDCP_AN_READY_MASK (DP_HDCP_AN_MSB_READY | DP_HDCP_AN_LSB_READY)
> +#define DP_HDCP_AUTH_FAIL_INFO GENMASK(7, 4)
> +#define DP_HDCP_AUTH_FAIL_INVALID_AKSV 3
> +#define DP_HDCP_AUTH_FAIL_INVALID_BKSV 4
> +#define DP_HDCP_AUTH_FAIL_RI_MISMATCH 5
> +#define DP_HDCP_AUTH_FAIL BIT(2)
> +#define DP_HDCP_AUTH_SUCCESS BIT(0)
> #define DP_HDCP_SW_UPPER_AKSV (0x098)
> #define DP_HDCP_SW_LOWER_AKSV (0x09C)
> #define DP_HDCP_ENTROPY_CTRL0 (0x350)
> #define DP_HDCP_ENTROPY_CTRL1 (0x35C)
> #define DP_HDCP_SHA_STATUS (0x0C8)
> +#define DP_HDCP_SHA_COMP_DONE BIT(4)
> +#define DP_HDCP_SHA_DONE BIT(0)
> #define DP_HDCP_RCVPORT_DATA2_0 (0x0B0)
> #define DP_HDCP_RCVPORT_DATA3 (0x0A4)
> #define DP_HDCP_RCVPORT_DATA4 (0x0A8)
> #define DP_HDCP_RCVPORT_DATA5 (0x0C0)
> #define DP_HDCP_RCVPORT_DATA6 (0x0C4)
> +#define DP_HDCP_RCVPORT_DATA7 (0x0C8)
>
> #define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_CTRL (0x024)
> +#define DP_HDCP_SHA_CTRL_RESET BIT(0)
> #define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_SHA_DATA (0x028)
> +#define DP_HDCP_SHA_DATA_MASK GENMASK(23, 16)
> +#define DP_HDCP_SHA_DATA_DONE BIT(0)
> #define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA0 (0x004)
> #define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA1 (0x008)
> #define HDCP_SEC_DP_TZ_HV_HLOS_HDCP_RCVPORT_DATA7 (0x00C)
> diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
> index 27c9ae563f2f..8bcade1c1e6c 100644
> --- a/drivers/gpu/drm/msm/msm_atomic.c
> +++ b/drivers/gpu/drm/msm/msm_atomic.c
> @@ -8,6 +8,7 @@
> #include <drm/drm_gem_atomic_helper.h>
> #include <drm/drm_vblank.h>
>
> +#include "dp_drm.h"
> #include "msm_atomic_trace.h"
> #include "msm_drv.h"
> #include "msm_gem.h"
> @@ -194,6 +195,18 @@ static unsigned get_crtc_mask(struct drm_atomic_state *state)
> return mask;
> }
>
> +static void msm_atomic_commit_connectors(struct drm_atomic_state *state)
> +{
> + struct drm_connector_state *conn_state;
> + struct drm_connector *connector;
> + int i;
> +
> + for_each_new_connector_in_state(state, connector, conn_state, i) {
> + if (dp_drm_is_connector_msm_dp(connector))
> + dp_drm_atomic_commit(connector, conn_state, state);
> + }
> +}
> +
> void msm_atomic_commit_tail(struct drm_atomic_state *state)
> {
> struct drm_device *dev = state->dev;
> @@ -230,6 +243,8 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state)
> drm_atomic_helper_commit_planes(dev, state, 0);
> drm_atomic_helper_commit_modeset_enables(dev, state);
>
> + msm_atomic_commit_connectors(state);
> +
> if (async) {
> struct msm_pending_timer *timer =
> &kms->pending_timers[drm_crtc_index(async_crtc)];
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-02-09 21:41 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20211105030434.2828845-1-sean@poorly.run>
2021-11-05 3:04 ` [PATCH v4 08/14] drm/msm/dpu_kms: Re-order dpu includes Sean Paul
2021-11-05 3:04 ` [PATCH v4 09/14] drm/msm/dpu: Remove useless checks in dpu_encoder Sean Paul
2021-11-05 3:04 ` [PATCH v4 10/14] drm/msm/dpu: Remove encoder->enable() hack Sean Paul
2021-11-05 3:04 ` [PATCH v4 11/14] drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules Sean Paul
2021-11-05 3:04 ` [PATCH v4 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers Sean Paul
2021-11-12 22:06 ` Rob Herring
2021-11-15 20:21 ` [PATCH v4.5 " Sean Paul
2021-11-29 22:03 ` Rob Herring
2021-11-05 3:04 ` [PATCH v4 13/14] arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller Sean Paul
2021-12-08 22:06 ` [Freedreno] " Rob Clark
2021-11-05 3:04 ` [PATCH v4 14/14] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers Sean Paul
2021-12-09 3:31 ` Stephen Boyd
2022-02-09 21:41 ` Dmitry Baryshkov
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).