drm/i915/pxp: Introduce Intel PXP component
Subsystems (6)
PATCH v6 1/27 drm/i915/pxp: Introduce Intel PXP component
From: "Huang, Sean Z" <[email protected]>
PXP (Protected Xe Path) is an i915 componment, that helps ring3 to establish the hardware protected session and manage the status of each alive software session, as well as the life cycle of each session.
By design PXP will expose ioctl so allow ring3 to create, set, and destroy each session. It will also provide the communication chanel to TEE (Trusted Execution Environment) for the protected hardware session creation.
--- drivers/gpu/drm/i915/Makefile | 4 ++++ drivers/gpu/drm/i915/i915_drv.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/pxp/intel_pxp.c | 20 ++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 22 ++++++++++++++++++++++ include/uapi/drm/i915_drm.h | 5 +++++ 6 files changed, 59 insertions(+) create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.h
drivers/gpu/drm/i915/Makefile +4 -0
@@ -254,6 +254,10 @@ i915-y += \ i915-y += i915_perf.o +# Protected execution platform (PXP) support +i915-y += \ + pxp/intel_pxp.o + # Post-mortem debug and GPU hang state capture i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o i915-$(CONFIG_DRM_I915_SELFTEST) += \
drivers/gpu/drm/i915/i915_drv.c +4 -0
@@ -889,6 +889,8 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto out_cleanup_gem; +intel_pxp_init (i915); +i915_driver_register (i915);enable_rpm_wakeref_asserts (&i915->runtime_pm);
@@ -938,6 +940,8 @@ void i915_driver_remove(struct drm_i915_private *i915)/* Flush any external code that still may be under the RCU lock */ synchronize_rcu (); +intel_pxp_uninit (i915); +i915_gem_suspend (i915);drm_atomic_helper_shutdown (&i915->drm);
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -105,6 +105,8 @@#include "intel_region_lmem.h" +#include "pxp/intel_pxp.h" +/* General customization: */
@@ -1215,6 +1217,8 @@ struct drm_i915_private {/* Mutex to protect the above hdcp component related values. */ struct mutex hdcp_comp_mutex; +struct intel_pxp pxp; + I915_SELFTEST_DECLARE(struct i915_selftest_stash selftest;)/*
drivers/gpu/drm/i915/pxp/intel_pxp.c new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright(c) 2020 Intel Corporation. +*/ + +#include "i915_drv.h" +#include "intel_pxp.h" + +int intel_pxp_init (struct drm_i915_private *i915) +{ +int ret; + +drm_info (&i915->drm,"i915_pxp_init\n" ); + +return ret; +} + +void intel_pxp_uninit (struct drm_i915_private *i915) +{ +}
drivers/gpu/drm/i915/pxp/intel_pxp.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright(c) 2020, Intel Corporation. All rights reserved. +*/ + +#ifndef __INTEL_PXP_H__ +#define __INTEL_PXP_H__ + +#include <drm/drm_file.h> + +struct pxp_context ; + +struct intel_pxp { +struct pxp_context *r0ctx; +}; + +struct drm_i915_private ; + +int intel_pxp_init (struct drm_i915_private *i915); +void intel_pxp_uninit (struct drm_i915_private *i915); + +#endif
include/uapi/drm/i915_drm.h +5 -0
@@ -1898,6 +1898,11 @@ struct drm_i915_gem_vm_control {__u32 vm_id; }; +struct drm_i915_pxp_ops { +__u64 pxp_info_ptr; +__u32 pxp_info_size; +}; +struct drm_i915_reg_read {/* * Register offset.
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 2/27 drm/i915/pxp: Enable PXP irq worker and callback stub
From: "Huang, Sean Z" <[email protected]>
Create the irq worker that serves as callback handler, those callback stubs should be called while the hardware key teardown occurs.
--- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 4 ++ drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/pxp/intel_pxp.c | 95 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 22 ++++++ 4 files changed, 122 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_irq.c +4 -0
@@ -13,6 +13,7 @@#include "intel_gt_irq.h" #include "intel_uncore.h" #include "intel_rps.h" +#include "pxp/intel_pxp.h" static void guc_irq_handler (struct intel_guc *guc,u16 iir) {
@@ -106,6 +107,9 @@ gen11_other_irq_handler(struct intel_gt *gt, const u8 instance,if (instance ==OTHER_GTPM_INSTANCE )return gen11_rps_irq_handler (>->rps, iir); +if (instance ==OTHER_KCR_INSTANCE ) +return intel_pxp_irq_handler (gt, iir); +WARN_ONCE (1 ,"unhandled other interrupt instance=0x%x, iir=0x%x\n" , instance, iir); }
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -7941,6 +7941,7 @@ enum {/* irq instances for OTHER_CLASS */ #define OTHER_GUC_INSTANCE 0#define OTHER_GTPM_INSTANCE 1 +#define OTHER_KCR_INSTANCE 4#define GEN11_INTR_IDENTITY_REG (x) _MMIO(0x190060 + ((x) * 4))
drivers/gpu/drm/i915/pxp/intel_pxp.c +95 -0
110 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp.h +22 -0
@@ -8,14 +8,36 @@#include <drm/drm_file.h> +#define PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED BIT(1) +#define PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ BIT(2) +#define PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE BIT(3) + +enum pxp_sm_session_req { +/* Request KMD to allocate session id and move it to IN INIT */ +PXP_SM_REQ_SESSION_ID_INIT =0x0 , +/* Inform KMD that UMD has completed the initialization */ +PXP_SM_REQ_SESSION_IN_PLAY , +/* Request KMD to terminate the session */ +PXP_SM_REQ_SESSION_TERMINATE +}; +struct pxp_context ;struct intel_pxp { +struct work_struct irq_work; +u32 handled_irr; +u32 current_events; +struct pxp_context *r0ctx; }; +struct intel_gt ;struct drm_i915_private ; +void intel_pxp_irq_handler (struct intel_gt *gt,u16 iir); +int i915_pxp_teardown_required_callback (struct drm_i915_private *i915); +int i915_pxp_global_terminate_complete_callback (struct drm_i915_private *i915); +int intel_pxp_init (struct drm_i915_private *i915);void intel_pxp_uninit (struct drm_i915_private *i915);
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PXP CLEAN PATCH v06 02/27] drm/i915/pxp: Enable PXP irq worker and callback stub
Quoted 71 lines · Sean Z Huang
From: "Huang, Sean Z" <[email protected]>
Create the irq worker that serves as callback handler, those callback stubs should be called while the hardware key teardown occurs.
Signed-off-by Huang, Sean Z <[email protected]>---
drivers/gpu/drm/i915/gt/intel_gt_irq.c | 4 ++ drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/pxp/intel_pxp.c | 95 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 22 ++++++ 4 files changed, 122 insertions(+)drivers/gpu/drm/i915/gt/intel_gt_irq.c +1
-0@@ -13,6 +13,7 @@ #include "intel_gt_irq.h" #include "intel_uncore.h" #include "intel_rps.h" +#include "pxp/intel_pxp.h" static void
guc_irq_handler(struct intel_guc *guc, u16 iir){drivers/gpu/drm/i915/gt/intel_gt_irq.c +0
-0@@ -106,6 +107,9 @@ gen11_other_irq_handler(struct intel_gt *gt, const u8 instance, if (instance == OTHER_GTPM_INSTANCE) return gen11_rps_irq_handler(>->rps, iir);drivers/gpu/drm/i915/gt/intel_gt_irq.c +3
-0+if (instance ==OTHER_KCR_INSTANCE ) +return intel_pxp_irq_handler (gt, iir); +
WARN_ONCE(1, "unhandled other interrupt instance=0x%x, iir=0x%x\n", instance, iir);
}drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -7941,6 +7941,7 @@ enum { /* irq instances for OTHER_CLASS */ #define OTHER_GUC_INSTANCE 0 #define OTHER_GTPM_INSTANCE 1 +#define OTHER_KCR_INSTANCE 4#define
GEN11_INTR_IDENTITY_REG(x)_MMIO(0x190060 + ((x) * 4))drivers/gpu/drm/i915/pxp/intel_pxp.c +0
-0@@ -6,15 +6,110 @@ #include "i915_drv.h" #include "intel_pxp.h"
drivers/gpu/drm/i915/pxp/intel_pxp.c line 11
Quoted 3 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +3
-0+static void intel_pxp_write_irq_mask_reg (struct drm_i915_private *i915,u32 mask) +{ +WARN_ON (INTEL_GEN (i915) <11 );
should be drm_warn_on(), also I don't see any value in this warning.
Quoted 12 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +12
-0+ +/* crypto mask is in bit31-16 (Engine1 Interrupt Mask) */ +intel_uncore_write (&i915->uncore,GEN11_CRYPTO_RSVD_INTR_MASK , mask <<16 ); +} + +static void intel_pxp_unmask_irq (struct intel_gt *gt) +{ +lockdep_assert_held (>->irq_lock); + +intel_pxp_write_irq_mask_reg (gt->i915,0 ); +} +
drivers/gpu/drm/i915/pxp/intel_pxp.c line 33
Quoted 10 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +10
-0+static void intel_pxp_mask_irq (struct intel_gt *gt,u32 mask) +{ +lockdep_assert_held (>->irq_lock); + +intel_pxp_write_irq_mask_reg (gt->i915, mask); +} + +static int intel_pxp_teardown_required_callback (struct drm_i915_private *i915) +{ +drm_dbg (&i915->drm,"%s was called\n" , __func__);
Looks like something used for debug, should not be in the upstream version. Saw a lot more of debug like this that should be removed.
Quoted 176 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +35
-0+ +return 0 ; +} + +static int intel_pxp_global_terminate_complete_callback (struct drm_i915_private *i915) +{ +drm_dbg (&i915->drm,">>> %s\n" , __func__); + +return 0 ; +} + +static void intel_pxp_irq_work (struct work_struct *work) +{ +struct intel_pxp *pxp_ptr =container_of (work,typeof (*pxp_ptr), irq_work); +struct drm_i915_private *i915 =container_of (pxp_ptr,typeof (*i915), pxp); +u32 events =0 ; + +spin_lock_irq (&i915->gt.irq_lock); + events =fetch_and_zero (&pxp_ptr->current_events); +spin_unlock_irq (&i915->gt.irq_lock); + +drm_dbg (&i915->drm,"%s was called with events=[%d]\n" , __func__, events); + +if (events &PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED || + events &PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ ) +intel_pxp_teardown_required_callback (i915); + +if (events &PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE ) +intel_pxp_global_terminate_complete_callback (i915); + +spin_lock_irq (&i915->gt.irq_lock); +intel_pxp_unmask_irq (&i915->gt); +spin_unlock_irq (&i915->gt.irq_lock); +} +int
intel_pxp_init(struct drm_i915_private *i915){
int ret;
drm_info(&i915->drm, "i915_pxp_init\n");drivers/gpu/drm/i915/pxp/intel_pxp.c +6
-0+INIT_WORK (&i915->pxp.irq_work, intel_pxp_irq_work); + + i915->pxp.handled_irr = (PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED | +PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ | +PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE ); +return ret;
}void
intel_pxp_uninit(struct drm_i915_private *i915){
}drivers/gpu/drm/i915/pxp/intel_pxp.c +29
-0+ +/** +* intel_pxp_irq_handler - Proxies KCR interrupts to PXP. +* @gt: valid GT instance +* @iir: GT interrupt vector associated with the interrupt +* +* Dispatches each vector element into an IRQ to PXP. +*/ +void intel_pxp_irq_handler (struct intel_gt *gt,u16 iir) +{ +struct drm_i915_private *i915 = gt->i915; +const u32 events = iir & i915->pxp.handled_irr; + +drm_dbg (&i915->drm,"%s was called with iir=[0x%04x]\n" , __func__, iir); + +lockdep_assert_held (>->irq_lock); + +if (unlikely (!events)) { +drm_dbg (&i915->drm,"%s returned due to iir=[0x%04x]\n" , __func__, iir); + goto end; + } + +intel_pxp_mask_irq (gt, i915->pxp.handled_irr); + + i915->pxp.current_events |= events; +schedule_work (&i915->pxp.irq_work); +end: +return ; +}drivers/gpu/drm/i915/pxp/intel_pxp.h +0
-0@@ -8,14 +8,36 @@#include <
drm/drm_file.h>drivers/gpu/drm/i915/pxp/intel_pxp.h +13
-0+#define PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED BIT(1) +#define PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ BIT(2) +#define PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE BIT(3) + +enum pxp_sm_session_req { +/* Request KMD to allocate session id and move it to IN INIT */ +PXP_SM_REQ_SESSION_ID_INIT =0x0 , +/* Inform KMD that UMD has completed the initialization */ +PXP_SM_REQ_SESSION_IN_PLAY , +/* Request KMD to terminate the session */ +PXP_SM_REQ_SESSION_TERMINATE +}; +struct
pxp_context;struct
intel_pxp{drivers/gpu/drm/i915/pxp/intel_pxp.h +4
-0+struct work_struct irq_work; +u32 handled_irr; +u32 current_events; +struct
pxp_context*r0ctx;
};+struct
intel_gt;
structdrm_i915_private;drivers/gpu/drm/i915/pxp/intel_pxp.h +4
-0+void intel_pxp_irq_handler (struct intel_gt *gt,u16 iir); +int i915_pxp_teardown_required_callback (struct drm_i915_private *i915); +int i915_pxp_global_terminate_complete_callback (struct drm_i915_private *i915); +
Quoted 10 lines
int
intel_pxp_init(struct drm_i915_private *i915); voidintel_pxp_uninit(struct drm_i915_private *i915);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [Intel-gfx] [PXP CLEAN PATCH v06 02/27] drm/i915/pxp: Enable PXP irq worker and callback stub
Quoted 96 lines · Jose
Quoted 71 lines · Sean Z Huang
From: "Huang, Sean Z" <[email protected]>
Create the irq worker that serves as callback handler, those callback stubs should be called while the hardware key teardown occurs.
Signed-off-by Huang, Sean Z <[email protected]>---
drivers/gpu/drm/i915/gt/intel_gt_irq.c | 4 ++ drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/pxp/intel_pxp.c | 95 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 22 ++++++ 4 files changed, 122 insertions(+)drivers/gpu/drm/i915/gt/intel_gt_irq.c +1
-0@@ -13,6 +13,7 @@ #include "intel_gt_irq.h" #include "intel_uncore.h" #include "intel_rps.h" +#include "pxp/intel_pxp.h" static void
guc_irq_handler(struct intel_guc *guc, u16 iir){drivers/gpu/drm/i915/gt/intel_gt_irq.c +0
-0@@ -106,6 +107,9 @@ gen11_other_irq_handler(struct intel_gt *gt, const u8 instance, if (instance == OTHER_GTPM_INSTANCE) return gen11_rps_irq_handler(>->rps, iir);drivers/gpu/drm/i915/gt/intel_gt_irq.c +3
-0+if (instance ==OTHER_KCR_INSTANCE ) +return intel_pxp_irq_handler (gt, iir); +
WARN_ONCE(1, "unhandled other interrupt instance=0x%x, iir=0x%x\n", instance, iir);
}drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -7941,6 +7941,7 @@ enum { /* irq instances for OTHER_CLASS */ #define OTHER_GUC_INSTANCE 0 #define OTHER_GTPM_INSTANCE 1 +#define OTHER_KCR_INSTANCE 4#define
GEN11_INTR_IDENTITY_REG(x)_MMIO(0x190060 + ((x) * 4))drivers/gpu/drm/i915/pxp/intel_pxp.c +0
-0@@ -6,15 +6,110 @@ #include "i915_drv.h" #include "intel_pxp.h"drivers/gpu/drm/i915/pxp/intel_pxp.c line 11
Quoted 3 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +3
-0+static void intel_pxp_write_irq_mask_reg (struct drm_i915_private *i915,u32 mask) +{ +WARN_ON (INTEL_GEN (i915) <11 );should be
drm_warn_on(), also I don't see any value in this warning.Quoted 17 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +17
-0+ +/* crypto mask is in bit31-16 (Engine1 Interrupt Mask) */ +intel_uncore_write (&i915->uncore,GEN11_CRYPTO_RSVD_INTR_MASK , mask <<16 ); +} + +static void intel_pxp_unmask_irq (struct intel_gt *gt) +{ +lockdep_assert_held (>->irq_lock); + +intel_pxp_write_irq_mask_reg (gt->i915,0 ); +} + +static void intel_pxp_mask_irq (struct intel_gt *gt,u32 mask) +{ +lockdep_assert_held (>->irq_lock); + +intel_pxp_write_irq_mask_reg (gt->i915, mask);
Quoted 8 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c line 33
Quoted 5 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +5
-0+} + +static int intel_pxp_teardown_required_callback (struct drm_i915_private *i915) +{ +drm_dbg (&i915->drm,"%s was called\n" , __func__);Looks like something used for debug, should not be in the upstream version. Saw a lot more of debug like this that should be removed.
Absolutely!
Quoted 87 lines
Quoted 87 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +35
-0+ +return 0 ; +} + +static int intel_pxp_global_terminate_complete_callback (struct drm_i915_private *i915) +{ +drm_dbg (&i915->drm,">>> %s\n" , __func__); + +return 0 ; +} + +static void intel_pxp_irq_work (struct work_struct *work) +{ +struct intel_pxp *pxp_ptr =container_of (work,typeof (*pxp_ptr), irq_work); +struct drm_i915_private *i915 =container_of (pxp_ptr,typeof (*i915), pxp); +u32 events =0 ; + +spin_lock_irq (&i915->gt.irq_lock); + events =fetch_and_zero (&pxp_ptr->current_events); +spin_unlock_irq (&i915->gt.irq_lock); + +drm_dbg (&i915->drm,"%s was called with events=[%d]\n" , __func__, events); + +if (events &PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED || + events &PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ ) +intel_pxp_teardown_required_callback (i915); + +if (events &PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE ) +intel_pxp_global_terminate_complete_callback (i915); + +spin_lock_irq (&i915->gt.irq_lock); +intel_pxp_unmask_irq (&i915->gt); +spin_unlock_irq (&i915->gt.irq_lock); +} +int
intel_pxp_init(struct drm_i915_private *i915){
int ret;
drm_info(&i915->drm, "i915_pxp_init\n");drivers/gpu/drm/i915/pxp/intel_pxp.c +6
-0+INIT_WORK (&i915->pxp.irq_work, intel_pxp_irq_work); + + i915->pxp.handled_irr = (PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED | +PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ | +PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE ); +return ret;
}void
intel_pxp_uninit(struct drm_i915_private *i915){
}drivers/gpu/drm/i915/pxp/intel_pxp.c +12
-0+ +/** +* intel_pxp_irq_handler - Proxies KCR interrupts to PXP. +* @gt: valid GT instance +* @iir: GT interrupt vector associated with the interrupt +* +* Dispatches each vector element into an IRQ to PXP. +*/ +void intel_pxp_irq_handler (struct intel_gt *gt,u16 iir) +{ +struct drm_i915_private *i915 = gt->i915; +const u32 events = iir & i915->pxp.handled_irr;
Quoted 8 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c line 106
Quoted 8 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +8
-0+ +drm_dbg (&i915->drm,"%s was called with iir=[0x%04x]\n" , __func__, iir); + +lockdep_assert_held (>->irq_lock); + +if (unlikely (!events)) { +drm_dbg (&i915->drm,"%s returned due to iir=[0x%04x]\n" , __func__, iir); + goto end;
Please just return instead of goto.
Quoted 8 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c line 114
Quoted 8 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +8
-0+ } + +intel_pxp_mask_irq (gt, i915->pxp.handled_irr); + + i915->pxp.current_events |= events; +schedule_work (&i915->pxp.irq_work); +end: +return ;
No need for return in the end of void functions.
Quoted 89 lines
Quoted 74 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c +1
-0+}drivers/gpu/drm/i915/pxp/intel_pxp.h +0
-0@@ -8,14 +8,36 @@#include <
drm/drm_file.h>drivers/gpu/drm/i915/pxp/intel_pxp.h +13
-0+#define PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED BIT(1) +#define PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ BIT(2) +#define PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE BIT(3) + +enum pxp_sm_session_req { +/* Request KMD to allocate session id and move it to IN INIT */ +PXP_SM_REQ_SESSION_ID_INIT =0x0 , +/* Inform KMD that UMD has completed the initialization */ +PXP_SM_REQ_SESSION_IN_PLAY , +/* Request KMD to terminate the session */ +PXP_SM_REQ_SESSION_TERMINATE +}; +struct
pxp_context;struct
intel_pxp{drivers/gpu/drm/i915/pxp/intel_pxp.h +4
-0+struct work_struct irq_work; +u32 handled_irr; +u32 current_events; +struct
pxp_context*r0ctx;
};+struct
intel_gt;
structdrm_i915_private;drivers/gpu/drm/i915/pxp/intel_pxp.h +4
-0+void intel_pxp_irq_handler (struct intel_gt *gt,u16 iir); +int i915_pxp_teardown_required_callback (struct drm_i915_private *i915); +int i915_pxp_global_terminate_complete_callback (struct drm_i915_private *i915); +Quoted 10 lines
int
intel_pxp_init(struct drm_i915_private *i915); voidintel_pxp_uninit(struct drm_i915_private *i915);_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 3/27 drm/i915/pxp: Add PXP context for logical hardware states.
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Add PXP context which represents combined view
of driver and logical HW states.
--- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/pxp/intel_pxp.c | 32 ++++++++++-- drivers/gpu/drm/i915/pxp/intel_pxp.h | 3 ++ drivers/gpu/drm/i915/pxp/intel_pxp_context.c | 52 ++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_context.h | 42 ++++++++++++++++ 5 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_context.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_context.h
drivers/gpu/drm/i915/Makefile +2 -1
@@ -256,7 +256,8 @@ i915-y += i915_perf.o # Protected execution platform (PXP) support i915-y += \ - pxp/intel_pxp.o + pxp/intel_pxp.o \ + pxp/intel_pxp_context.o \ # Post-mortem debug and GPU hang state capture i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
drivers/gpu/drm/i915/pxp/intel_pxp.c +28 -4
@@ -5,6 +5,7 @@#include "i915_drv.h" #include "intel_pxp.h" +#include "intel_pxp_context.h" static void intel_pxp_write_irq_mask_reg (struct drm_i915_private *i915,u32 mask) {
@@ -32,14 +33,32 @@ static int intel_pxp_teardown_required_callback(struct drm_i915_private *i915) {drm_dbg (&i915->drm,"%s was called\n" , __func__); +mutex_lock (&i915->pxp.r0ctx->ctx_mutex); + + i915->pxp.r0ctx->global_state_attacked = true; + i915->pxp.r0ctx->flag_display_hm_surface_keys = false; + +mutex_unlock (&i915->pxp.r0ctx->ctx_mutex); +return 0 ; }static int intel_pxp_global_terminate_complete_callback (struct drm_i915_private *i915) { +int ret =0 ; +drm_dbg (&i915->drm,">>> %s\n" , __func__); -return 0 ; +mutex_lock (&i915->pxp.r0ctx->ctx_mutex); + +if (i915->pxp.r0ctx->global_state_attacked) + i915->pxp.r0ctx->global_state_attacked = false; + +mutex_unlock (&i915->pxp.r0ctx->ctx_mutex); + +drm_dbg (&i915->drm,"<<< %s ret=[%d]\n" , __func__, ret); + +return ret; }static void intel_pxp_irq_work (struct work_struct *work)
@@ -68,21 +87,26 @@ static void intel_pxp_irq_work(struct work_struct *work)int intel_pxp_init (struct drm_i915_private *i915) { -int ret; -drm_info (&i915->drm,"i915_pxp_init\n" ); + i915->pxp.r0ctx =intel_pxp_create_r0ctx (i915); +if (!i915->pxp.r0ctx) { +drm_dbg (&i915->drm,"Failed to create pxp ctx\n" ); +return -EFAULT ; + } +INIT_WORK (&i915->pxp.irq_work, intel_pxp_irq_work); i915->pxp.handled_irr = (PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED |PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ |PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE ); -return ret; +return 0 ; }void intel_pxp_uninit (struct drm_i915_private *i915) { +intel_pxp_destroy_r0ctx (i915); }/**
drivers/gpu/drm/i915/pxp/intel_pxp.h +3 -0
@@ -12,6 +12,9 @@#define PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ BIT(2)#define PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE BIT(3) +#define MAX_TYPE0_SESSIONS 16 +#define MAX_TYPE1_SESSIONS 6 +enum pxp_sm_session_req {/* Request KMD to allocate session id and move it to IN INIT */ PXP_SM_REQ_SESSION_ID_INIT =0x0 ,
drivers/gpu/drm/i915/pxp/intel_pxp_context.c new file +52 -0
52 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp_context.h new file +42 -0
42 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 4/27 drm/i915/pxp: set KCR reg init during the boot time
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Set the KCR init during the boot time, which is required by hardware, to allow us doing further protection operation such as sending commands to GPU or TEE
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/pxp/intel_pxp.c | 11 +++++- drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 48 +++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 19 ++++++++++ 4 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_sm.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_sm.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -258,6 +258,7 @@ i915-y += i915_perf.o i915-y += \ pxp/intel_pxp.o \ pxp/intel_pxp_context.o \ + pxp/intel_pxp_sm.o # Post-mortem debug and GPU hang state capture i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
drivers/gpu/drm/i915/pxp/intel_pxp.c +10 -1
@@ -6,6 +6,7 @@#include "i915_drv.h" #include "intel_pxp.h" #include "intel_pxp_context.h" +#include "intel_pxp_sm.h" static void intel_pxp_write_irq_mask_reg (struct drm_i915_private *i915,u32 mask) {
@@ -87,6 +88,8 @@ static void intel_pxp_irq_work(struct work_struct *work)int intel_pxp_init (struct drm_i915_private *i915) { +int ret; +drm_info (&i915->drm,"i915_pxp_init\n" ); i915->pxp.r0ctx =intel_pxp_create_r0ctx (i915);
@@ -95,13 +98,19 @@ int intel_pxp_init(struct drm_i915_private *i915)return -EFAULT ; } + ret =pxp_sm_set_kcr_init_reg (i915); +if (ret) { +drm_dbg (&i915->drm,"Failed to set kcr init reg\n" ); +return ret; + } +INIT_WORK (&i915->pxp.irq_work, intel_pxp_irq_work); i915->pxp.handled_irr = (PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED |PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ |PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE ); -return 0 ; +return ret; }void intel_pxp_uninit (struct drm_i915_private *i915)
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c new file +48 -0
48 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright(c) 2020, Intel Corporation. All rights reserved. +*/ + +#ifndef __INTEL_PXP_SM_H__ +#define __INTEL_PXP_SM_H__ + +#include "i915_reg.h" + +/* KCR register definitions */ +#define KCR_INIT _MMIO(0x320f0) +#define KCR_INIT_MASK_SHIFT (16) +/* Setting KCR Init bit is required after system boot */ +#define KCR_INIT_ALLOW_DISPLAY_ME_WRITES (BIT(14) | (BIT(14) << KCR_INIT_MASK_SHIFT)) + +int pxp_sm_set_kcr_init_reg (struct drm_i915_private *i915); + +#endif /* __INTEL_PXP_SM_H__ */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 5/27 drm/i915/pxp: Enable ioctl action to set the ring3 context
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Enable one ioctl action to allow ring3 driver to set its ring3 context, so ring0 PXP can track the context id through this ring3 context list.
--- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/pxp/intel_pxp.c | 66 ++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 16 +++++ drivers/gpu/drm/i915/pxp/intel_pxp_context.c | 34 ++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_context.h | 3 + include/uapi/drm/i915_drm.h | 2 + 6 files changed, 122 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -1761,6 +1761,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_QUERY , i915_query_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_VM_CREATE , i915_gem_vm_create_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_VM_DESTROY , i915_gem_vm_destroy_ioctl,DRM_RENDER_ALLOW ), + DRM_IOCTL_DEF_DRV(I915_PXP_OPS, i915_pxp_ops_ioctl, DRM_RENDER_ALLOW), }; static const struct drm_driver driver = {
drivers/gpu/drm/i915/pxp/intel_pxp.c +66 -0
78 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp.h +16 -0
@@ -24,6 +24,21 @@ enum pxp_sm_session_req {PXP_SM_REQ_SESSION_TERMINATE }; +#define PXP_ACTION_SET_R3_CONTEXT 5 + +enum pxp_sm_status { +PXP_SM_STATUS_SUCCESS , +PXP_SM_STATUS_RETRY_REQUIRED , +PXP_SM_STATUS_SESSION_NOT_AVAILABLE , +PXP_SM_STATUS_ERROR_UNKNOWN +}; + +struct pxp_info { +u32 action; +u32 sm_status; +u32 set_r3ctx; +} __packed; +struct pxp_context ;struct intel_pxp {
@@ -37,6 +52,7 @@ struct intel_pxp {struct intel_gt ;struct drm_i915_private ; +int i915_pxp_ops_ioctl (struct drm_device *dev,void *data,struct drm_file *drmfile);void intel_pxp_irq_handler (struct intel_gt *gt,u16 iir);int i915_pxp_teardown_required_callback (struct drm_i915_private *i915);int i915_pxp_global_terminate_complete_callback (struct drm_i915_private *i915);
drivers/gpu/drm/i915/pxp/intel_pxp_context.c +34 -0
@@ -50,3 +50,37 @@ void intel_pxp_destroy_r0ctx(struct drm_i915_private *i915)kfree (i915->pxp.r0ctx); i915->pxp.r0ctx =NULL ; } + +int intel_pxp_set_r3ctx (struct drm_i915_private *i915,u32 r3ctx_in) +{ +struct pxp_r3ctx *r3ctx; + +drm_dbg (&i915->drm,">>> %s u3ctx_in=[%d]\n" , __func__, r3ctx_in); + + r3ctx =kzalloc (sizeof (*r3ctx),GFP_KERNEL ); +if (!r3ctx) { +drm_dbg (&i915->drm,"Failed to kzalloc()\n" ); +return -ENOMEM ; + } + + r3ctx->r3ctx = r3ctx_in; + +list_add (&r3ctx->listhead, &i915->pxp.r0ctx->r3ctx_list); +return 0 ; +} + +void intel_pxp_destroy_r3ctx_list (struct drm_i915_private *i915) +{ +struct pxp_r3ctx *r3ctx, *n; + +drm_dbg (&i915->drm,">>> %s\n" , __func__); + +list_for_each_entry_safe (r3ctx, n, &i915->pxp.r0ctx->r3ctx_list, listhead) { +drm_dbg (&i915->drm,"Destroy r3ctx_list u3ctx->r3ctx=[%d]\n" , r3ctx->r3ctx); + +list_del (&r3ctx->listhead); +kfree (r3ctx); + } + +drm_dbg (&i915->drm,"<<< %s\n" , __func__); +}
drivers/gpu/drm/i915/pxp/intel_pxp_context.h +3 -0
@@ -39,4 +39,7 @@ struct pxp_r3ctx {struct pxp_context *intel_pxp_create_r0ctx (struct drm_i915_private *i915);void intel_pxp_destroy_r0ctx (struct drm_i915_private *i915); +int intel_pxp_set_r3ctx (struct drm_i915_private *i915,u32 r3ctx); +void intel_pxp_destroy_r3ctx_list (struct drm_i915_private *i915); +#endif /* __INTEL_PXP_CONTEXT_H__ */
include/uapi/drm/i915_drm.h +2 -0
@@ -359,6 +359,7 @@ typedef struct _drm_i915_sarea {#define DRM_I915_QUERY 0x39#define DRM_I915_GEM_VM_CREATE 0x3a#define DRM_I915_GEM_VM_DESTROY 0x3b +#define DRM_I915_PXP_OPS 0x3c/* Must be kept compact -- no holes */ #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
@@ -422,6 +423,7 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_QUERY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_QUERY, struct drm_i915_query)#define DRM_IOCTL_I915_GEM_VM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_VM_CREATE, struct drm_i915_gem_vm_control)#define DRM_IOCTL_I915_GEM_VM_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_VM_DESTROY, struct drm_i915_gem_vm_control) +#define DRM_IOCTL_I915_PXP_OPS DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_PXP_OPS, struct drm_i915_pxp_ops)/* Allow drivers to submit batchbuffers directly to hardware, relying * on the security mechanisms provided by hardware.
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 6/27 drm/i915: Rename the whitelist to allowlist
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Rename the whitelist to allowlist as suggested
--- drivers/gpu/drm/i915/intel_uncore.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +5 -5
@@ -1989,12 +1989,12 @@ void intel_uncore_fini_mmio(struct intel_uncore *uncore)uncore_mmio_cleanup (uncore); } -static const struct reg_whitelist { +static const struct reg_allowlist {i915_reg_t offset_ldw;i915_reg_t offset_udw;u16 gen_mask;u8 size; -} reg_read_whitelist[] = { { +} reg_read_allowlist[] = { { .offset_ldw =RING_TIMESTAMP (RENDER_RING_BASE ), .offset_udw =RING_TIMESTAMP_UDW (RENDER_RING_BASE ), .gen_mask =INTEL_GEN_MASK (4 ,12 ),
@@ -2007,14 +2007,14 @@ int i915_reg_read_ioctl(struct drm_device *dev,struct drm_i915_private *i915 =to_i915 (dev);struct intel_uncore *uncore = &i915->uncore;struct drm_i915_reg_read *reg = data; -struct reg_whitelist const *entry; +struct reg_allowlist const *entry;intel_wakeref_t wakeref;unsigned int flags;int remain;int ret =0 ; - entry = reg_read_whitelist; - remain =ARRAY_SIZE (reg_read_whitelist); + entry = reg_read_allowlist; + remain =ARRAY_SIZE (reg_read_allowlist);while (remain) {u32 entry_offset =i915_mmio_reg_offset (entry->offset_ldw);
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [Intel-gfx] [PXP CLEAN PATCH v06 06/27] drm/i915: Rename the whitelist to allowlist
Quoted 3 lines · Sean Z Huang
From: "Huang, Sean Z" <[email protected]>
Rename the whitelist to allowlist as suggested
Please post this separately and we can merge this while the rest of the series is still being reviewed.
BR,
Jani.
Quoted 42 lines
Signed-off-by Huang, Sean Z <[email protected]>--- drivers/gpu/drm/i915/intel_uncore.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_uncore.c +5
-5@@ -1989,12 +1989,12 @@ void intel_uncore_fini_mmio(struct intel_uncore *uncore)uncore_mmio_cleanup (uncore); } -static const struct reg_whitelist { +static const struct reg_allowlist {i915_reg_t offset_ldw;i915_reg_t offset_udw;u16 gen_mask;u8 size; -} reg_read_whitelist[] = { { +} reg_read_allowlist[] = { { .offset_ldw =RING_TIMESTAMP (RENDER_RING_BASE ), .offset_udw =RING_TIMESTAMP_UDW (RENDER_RING_BASE ), .gen_mask =INTEL_GEN_MASK (4 ,12 ),@@ -2007,14 +2007,14 @@ int i915_reg_read_ioctl(struct drm_device *dev,struct drm_i915_private *i915 =to_i915 (dev);struct intel_uncore *uncore = &i915->uncore;struct drm_i915_reg_read *reg = data; -struct reg_whitelist const *entry; +struct reg_allowlist const *entry;intel_wakeref_t wakeref;unsigned int flags;int remain;int ret =0 ; - entry = reg_read_whitelist; - remain =ARRAY_SIZE (reg_read_whitelist); + entry = reg_read_allowlist; + remain =ARRAY_SIZE (reg_read_allowlist);while (remain) {u32 entry_offset =i915_mmio_reg_offset (entry->offset_ldw);
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 7/27 drm/i915/pxp: Add PXP-related registers into allowlist
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Add several PXP-related reg into allowlist to allow ring3 driver to read the those register values.
--- drivers/gpu/drm/i915/i915_reg.h | 8 ++++ drivers/gpu/drm/i915/intel_uncore.c | 57 +++++++++++++++++++++-------- 2 files changed, 50 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +8 -0
@@ -12419,4 +12419,12 @@ enum skl_power_gate {#define TGL_ROOT_DEVICE_SKU_ULX 0x2#define TGL_ROOT_DEVICE_SKU_ULT 0x4 +/* Registers for passlist check */ +#define PXP_REG_01_LOWERBOUND _MMIO(0x32260) +#define PXP_REG_01_UPPERBOUND _MMIO(0x32268) +#define PXP_REG_02_LOWERBOUND _MMIO(0x32670) +#define PXP_REG_02_UPPERBOUND _MMIO(0x32678) +#define PXP_REG_03_LOWERBOUND _MMIO(0x32860) +#define PXP_REG_03_UPPERBOUND _MMIO(0x32c7c) +#endif /* _I915_REG_H_ */
drivers/gpu/drm/i915/intel_uncore.c +42 -15
99 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [Intel-gfx] [PXP CLEAN PATCH v06 07/27] drm/i915/pxp: Add PXP-related registers into allowlist
Quoted 16 lines · Sean Z Huang
From: "Huang, Sean Z" <[email protected]>
Add several PXP-related reg into allowlist to allow ring3 driver to read the those register values.
Signed-off-by Huang, Sean Z <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 8 ++++ drivers/gpu/drm/i915/intel_uncore.c | 57 +++++++++++++++++++++-------- 2 files changed, 50 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h enum skl_power_gate { · line 12422
Quoted 4 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -12419,4 +12419,12 @@ enum skl_power_gate {#define TGL_ROOT_DEVICE_SKU_ULX 0x2#define TGL_ROOT_DEVICE_SKU_ULT 0x4 +/* Registers for passlist check */
allowlist
Quoted 114 lines
drivers/gpu/drm/i915/i915_reg.h +7
-0+#define PXP_REG_01_LOWERBOUND _MMIO(0x32260) +#define PXP_REG_01_UPPERBOUND _MMIO(0x32268) +#define PXP_REG_02_LOWERBOUND _MMIO(0x32670) +#define PXP_REG_02_UPPERBOUND _MMIO(0x32678) +#define PXP_REG_03_LOWERBOUND _MMIO(0x32860) +#define PXP_REG_03_UPPERBOUND _MMIO(0x32c7c) +#endif /* _I915_REG_H_ */ drivers/gpu/drm/i915/intel_uncore.c +42
-15@@ -1990,16 +1990,41 @@ void intel_uncore_fini_mmio(struct intel_uncore *uncore) }static const struct reg_allowlist { -i915_reg_t offset_ldw; +i915_reg_t offset_ldw_lowerbound; +i915_reg_t offset_ldw_upperbound;i915_reg_t offset_udw;u16 gen_mask;u8 size; -} reg_read_allowlist[] = { { - .offset_ldw =RING_TIMESTAMP (RENDER_RING_BASE ), +} reg_read_allowlist[] = { + { + .offset_ldw_lowerbound =RING_TIMESTAMP (RENDER_RING_BASE ), + .offset_ldw_upperbound =RING_TIMESTAMP (RENDER_RING_BASE ), .offset_udw =RING_TIMESTAMP_UDW (RENDER_RING_BASE ), .gen_mask =INTEL_GEN_MASK (4 ,12 ), .size =8 -} }; + }, + { + .offset_ldw_lowerbound =PXP_REG_01_LOWERBOUND , + .offset_ldw_upperbound =PXP_REG_01_UPPERBOUND , + .offset_udw = {0 }, + .gen_mask =INTEL_GEN_MASK (4 ,12 ), + .size =4 + }, + { + .offset_ldw_lowerbound =PXP_REG_02_LOWERBOUND , + .offset_ldw_upperbound =PXP_REG_02_UPPERBOUND , + .offset_udw = {0 }, + .gen_mask =INTEL_GEN_MASK (4 ,12 ), + .size =4 + }, + { + .offset_ldw_lowerbound =PXP_REG_03_LOWERBOUND , + .offset_ldw_upperbound =PXP_REG_03_UPPERBOUND , + .offset_udw = {0 }, + .gen_mask =INTEL_GEN_MASK (4 ,12 ), + .size =4 + } +};int i915_reg_read_ioctl (struct drm_device *dev,void *data,struct drm_file *file)@@ -2012,18 +2037,22 @@ int i915_reg_read_ioctl(struct drm_device *dev,unsigned int flags;int remain;int ret =0 ; +i915_reg_t offset_ldw; entry = reg_read_allowlist; remain =ARRAY_SIZE (reg_read_allowlist);while (remain) { -u32 entry_offset =i915_mmio_reg_offset (entry->offset_ldw); +u32 entry_offset_lb =i915_mmio_reg_offset (entry->offset_ldw_lowerbound); +u32 entry_offset_ub =i915_mmio_reg_offset (entry->offset_ldw_upperbound);GEM_BUG_ON (!is_power_of_2 (entry->size));GEM_BUG_ON (entry->size >8 ); -GEM_BUG_ON (entry_offset & (entry->size -1 )); +GEM_BUG_ON (entry_offset_lb & (entry->size -1 )); +GEM_BUG_ON (entry_offset_ub & (entry->size -1 ));if (INTEL_INFO (i915)->gen_mask & entry->gen_mask && - entry_offset == (reg->offset & -entry->size)) + entry_offset_lb <= (reg->offset & -entry->size) && + (reg->offset & -entry->size) <= entry_offset_ub)break ; entry++; remain--;@@ -2033,23 +2062,21 @@ int i915_reg_read_ioctl(struct drm_device *dev,return -EINVAL ; flags = reg->offset & (entry->size -1 ); + offset_ldw =_MMIO (reg->offset - flags); with_intel_runtime_pm(&i915->runtime_pm, wakeref) {if (entry->size ==8 && flags ==I915_REG_READ_8B_WA ) reg->val =intel_uncore_read64_2x32 (uncore, - entry->offset_ldw, + offset_ldw, entry->offset_udw);else if (entry->size ==8 && flags ==0 ) - reg->val =intel_uncore_read64 (uncore, - entry->offset_ldw); + reg->val =intel_uncore_read64 (uncore, offset_ldw);else if (entry->size ==4 && flags ==0 ) - reg->val =intel_uncore_read (uncore, entry->offset_ldw); + reg->val =intel_uncore_read (uncore, offset_ldw);else if (entry->size ==2 && flags ==0 ) - reg->val =intel_uncore_read16 (uncore, - entry->offset_ldw); + reg->val =intel_uncore_read16 (uncore, offset_ldw);else if (entry->size ==1 && flags ==0 ) - reg->val =intel_uncore_read8 (uncore, - entry->offset_ldw); + reg->val =intel_uncore_read8 (uncore, offset_ldw);else ret = -EINVAL ; }
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 8/27 drm/i915/pxp: Read register to check hardware session state
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Implement the functions to check the hardware protected session state via reading the hardware register session in play.
--- drivers/gpu/drm/i915/pxp/intel_pxp.h | 3 + drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 189 ++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 51 +++++++ 3 files changed, 243 insertions(+)
drivers/gpu/drm/i915/pxp/intel_pxp.h +3 -0
@@ -12,6 +12,9 @@#define PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ BIT(2)#define PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE BIT(3) +#define pxp_session_list (i915, session_type) (((session_type) == SESSION_TYPE_TYPE0) ? \ + &(i915)->pxp.r0ctx->active_pxp_type0_sessions : &(i915)->pxp.r0ctx->active_pxp_type1_sessions) +#define MAX_TYPE0_SESSIONS 16#define MAX_TYPE1_SESSIONS 6
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +189 -0
201 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +51 -0
57 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kernel test robot
build botRe: [Intel-gfx] [PXP CLEAN PATCH v06 08/27] drm/i915/pxp: Read register to check hardware session state
Thank you for the patch! Perhaps something to improve:
Hi Sean,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on next-20201113]
[also build test WARNING on v5.10-rc3]
[cannot apply to drm-intel/for-linux-next char-misc/char-misc-testing v5.10-rc3 v5.10-rc2 v5.10-rc1] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Sean-Z-Huang/drm-i915-pxp-Introduce-Intel-PXP-component/20201114-084506 base: 92edc4aef86780a8ad01b092c6d6630bb3cb423d config: x86_64-allyesconfig (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce (this is a W=1 build): # https://github.com/0day-ci/linux/commit/a8b258b463bb1fd193cf33be15a5909bc428d52b git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Sean-Z-Huang/drm-i915-pxp-Introduce-Intel-PXP-component/20201114-084506 git checkout a8b258b463bb1fd193cf33be15a5909bc428d52b # save the attached .config to linux build tree make W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/pxp/intel_pxp_sm.c:13:5: warning: no previous prototype for 'pxp_sm_reg_read' [-Wmissing-prototypes]
13 | int pxp_sm_reg_read(struct drm_i915_private *i915, u32 offset, u32 *regval)
| ^~~~~~~~~~~~~~~ drivers/gpu/drm/i915/pxp/intel_pxp_sm.c:195:13: warning: 'check_if_protected_type0_sessions_are_attacked' defined but not used [-Wunused-function]
195 | static bool check_if_protected_type0_sessions_are_attacked(struct drm_i915_private *i915)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c:162:12: warning: 'sync_hw_sw_state' defined but not used [-Wunused-function]
162 | static int sync_hw_sw_state(struct drm_i915_private *i915, int session_index, int session_type)
| ^~~~~~~~~~~~~~~~
vim +/pxp_sm_reg_read +13 drivers/gpu/drm/i915/pxp/intel_pxp_sm.c
12
> 13 int pxp_sm_reg_read(struct drm_i915_private *i915, u32 offset, u32 *regval)
14 {
15 intel_wakeref_t wakeref;
16 int err = 0;
17
18 if (!i915 || !regval) {
19 err = -EINVAL;
20 drm_dbg(&i915->drm, "Failed to %s bad params\n", __func__);
21 goto end;
22 }
23
24 with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
25 i915_reg_t reg_offset = {offset};
26 *regval = intel_uncore_read(&i915->uncore, reg_offset);
27 }
28 end:
29 return err;
30 }
31 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v6 9/27 drm/i915/pxp: Implement funcs to get/set PXP tag
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Implement the functions to get/set the PXP tag, which is 32-bit bitwise value containing the hardware session info, such as its session id, protection mode or whether it's enabled.
--- drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 105 ++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 18 ++++ 2 files changed, 123 insertions(+)
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +105 -0
@@ -49,6 +49,16 @@ static int pxp_reg_write(struct drm_i915_private *i915, u32 offset, u32 regval)return err; } +static u8 pxp_get_session_id (int session_index,int session_type) +{ +u8 session_id = session_index &SESSION_ID_MASK ; + +if (session_type ==SESSION_TYPE_TYPE1 ) + session_id |=SESSION_TYPE_MASK ; + +return session_id; +} +/** * is_sw_session_active - Check if the given sw session id is active. * @i915: i915 device handle.
@@ -86,6 +96,101 @@ static bool is_sw_session_active(struct drm_i915_private *i915, int session_typereturn false; } +static int pxp_set_pxp_tag (struct drm_i915_private *i915,int session_type, +int session_idx,int protection_mode) +{ +struct pxp_tag *pxp_tag; +int ret; + +if (!i915 || session_type >=SESSION_TYPE_MAX ) { + ret = -EINVAL ; +drm_dbg (&i915->drm,"Failed to %s, bad params\n" , __func__); + goto end; + } + +if (session_type ==SESSION_TYPE_TYPE0 && session_idx <MAX_TYPE0_SESSIONS ) { + pxp_tag = (struct pxp_tag *)&i915->pxp.r0ctx->type0_session_pxp_tag[session_idx]; + }else if (session_type ==SESSION_TYPE_TYPE1 && session_idx <MAX_TYPE1_SESSIONS ) { + pxp_tag = (struct pxp_tag *)&i915->pxp.r0ctx->type1_session_pxp_tag[session_idx]; + }else { + ret = -EINVAL ; +drm_dbg (&i915->drm,"Failed to %s, bad params session_type=[%d], session_idx=[%d]\n" , + __func__, session_type, session_idx); + goto end; + } + +switch (protection_mode) { +case PROTECTION_MODE_NONE : + { + pxp_tag->enable = false; + pxp_tag->hm = false; + pxp_tag->sm = false; +break ; + } +case PROTECTION_MODE_LM : + { + pxp_tag->enable = true; + pxp_tag->hm = false; + pxp_tag->sm = false; + pxp_tag->instance_id++; +break ; + } +case PROTECTION_MODE_HM : + { + pxp_tag->enable = true; + pxp_tag->hm = true; + pxp_tag->sm = false; + pxp_tag->instance_id++; +break ; + } +case PROTECTION_MODE_SM : + { + pxp_tag->enable = true; + pxp_tag->hm = true; + pxp_tag->sm = true; + pxp_tag->instance_id++; +break ; + } +default : + ret = -EINVAL ; +drm_dbg (&i915->drm,"Failed to %s, bad params protection_mode=[%d]\n" , + __func__, protection_mode); + goto end; + } + + pxp_tag->session_id =pxp_get_session_id (session_idx, session_type); + + ret =0 ; +end: +return ret; +} + +u32 intel_pxp_get_pxp_tag (struct drm_i915_private *i915,int session_idx, +int session_type,u32 *session_is_alive) +{ +struct pxp_tag *pxp_tag; + +if (!i915 || session_type >=SESSION_TYPE_MAX ) { +drm_dbg (&i915->drm,"Failed to %s, bad params\n" , __func__); +return -EINVAL ; + } + +if (session_type ==SESSION_TYPE_TYPE0 && session_idx <MAX_TYPE0_SESSIONS ) { + pxp_tag = (struct pxp_tag *)&i915->pxp.r0ctx->type0_session_pxp_tag[session_idx]; + }else if (session_type ==SESSION_TYPE_TYPE1 && session_idx <MAX_TYPE1_SESSIONS ) { + pxp_tag = (struct pxp_tag *)&i915->pxp.r0ctx->type1_session_pxp_tag[session_idx]; + }else { +drm_dbg (&i915->drm,"Failed to %s, bad params session_type=[%d], session_idx=[%d]\n" , + __func__, session_type, session_idx); +return -EINVAL ; + } + +if (session_is_alive) + *session_is_alive = pxp_tag->enable; + +return pxp_tag->value; +} +static bool is_hw_type0_session_in_play (struct drm_i915_private *i915,int session_index) {u32 regval_sip =0 ;
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +18 -0
@@ -19,6 +19,9 @@#define GEN12_KCR_TSIP_LOW _MMIO(0x32264)/* KCR type1 session in play 0-31 */ #define GEN12_KCR_TSIP_HIGH _MMIO(0x32268)/* KCR type1 session in play 32-63 */ +#define SESSION_TYPE_MASK BIT(7) +#define SESSION_ID_MASK (BIT(7) - 1) +enum pxp_session_types {SESSION_TYPE_TYPE0 =0 ,SESSION_TYPE_TYPE1 =1 ,
@@ -35,6 +38,21 @@ enum pxp_protection_modes { PROTECTION_MODE_ALL }; +struct pxp_tag { +union { +u32 value; +struct { +u32 session_id :8 ; +u32 instance_id :8 ; +u32 enable :1 ; +u32 hm :1 ; +u32 reserved_1 :1 ; +u32 sm :1 ; +u32 reserved_2 :12 ; + }; + }; +}; +/** * struct pxp_protected_session - linked list to track all active sessions. */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 10/27 drm/i915/pxp: Enable ioctl action to reserve session slot
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
With this ioctl action, ring3 driver can reserve a specific session slot/id assigned by ring0 PXP, as the first step of PXP session establishment flow. Ring3 PXP stores the session info in the session list structure.
--- drivers/gpu/drm/i915/pxp/intel_pxp.c | 20 +++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 24 +++- drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 168 ++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 3 + 4 files changed, 213 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/pxp/intel_pxp.c +20 -0
@@ -47,6 +47,26 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmf }switch (pxp_info.action) { +case PXP_ACTION_SET_SESSION_STATUS : + { +struct pxp_sm_set_session_status_params *params = &pxp_info.set_session_status; + +if (params->req_session_state ==PXP_SM_REQ_SESSION_ID_INIT ) { + ret =intel_pxp_sm_reserve_session (i915, drmfile,0 , + params->session_type, + params->session_mode, + ¶ms->pxp_tag); +if (ret ==PXP_SM_STATUS_RETRY_REQUIRED || + ret ==PXP_SM_STATUS_SESSION_NOT_AVAILABLE ) { + pxp_info.sm_status = ret; + ret =0 ; + } + }else { + ret = -EINVAL ; + goto end; + } +break ; + }case PXP_ACTION_SET_R3_CONTEXT : { ret =intel_pxp_set_r3ctx (i915, pxp_info.set_r3ctx);
drivers/gpu/drm/i915/pxp/intel_pxp.h +22 -2
@@ -15,6 +15,9 @@#define pxp_session_list (i915, session_type) (((session_type) == SESSION_TYPE_TYPE0) ? \ &(i915)->pxp.r0ctx->active_pxp_type0_sessions : &(i915)->pxp.r0ctx->active_pxp_type1_sessions) +#define pxp_session_max (session_type) (((session_type) == SESSION_TYPE_TYPE0) ? \ + MAX_TYPE0_SESSIONS : MAX_TYPE1_SESSIONS) +#define MAX_TYPE0_SESSIONS 16#define MAX_TYPE1_SESSIONS 6
@@ -27,7 +30,10 @@ enum pxp_sm_session_req {PXP_SM_REQ_SESSION_TERMINATE }; -#define PXP_ACTION_SET_R3_CONTEXT 5 +enum pxp_ioctl_action { +PXP_ACTION_SET_SESSION_STATUS =1 , +PXP_ACTION_SET_R3_CONTEXT =5 , +};enum pxp_sm_status {PXP_SM_STATUS_SUCCESS ,
@@ -36,10 +42,24 @@ enum pxp_sm_status { PXP_SM_STATUS_ERROR_UNKNOWN }; +struct pxp_sm_set_session_status_params { +/** @pxp_tag: in [optional], for Arbitrator session, out pxp tag */ +u32 pxp_tag; +/** @session_type: in, session type */ +u32 session_type; +/** @session_mode: in, session mode */ +u32 session_mode; +/** @req_session_state: in, new session state */ +u32 req_session_state; +}; +struct pxp_info {u32 action;u32 sm_status; -u32 set_r3ctx; +union { +struct pxp_sm_set_session_status_params set_session_status; +u32 set_r3ctx; + }; } __packed;struct pxp_context ;
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +168 -0
174 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +3 -0
@@ -83,6 +83,9 @@ struct pxp_protected_session { bool session_is_in_play; }; +int intel_pxp_sm_reserve_session (struct drm_i915_private *i915,struct drm_file *drmfile, +int context_id,int session_type,int protection_mode, +u32 *pxp_tag);int pxp_sm_set_kcr_init_reg (struct drm_i915_private *i915);#endif /* __INTEL_PXP_SM_H__ */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 11/27 drm/i915/pxp: Enable ioctl action to set session in play
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
With this ioctl action, ring3 driver can set the session in state "session in play", after ring3 reserved the session slot/id from ring3 PXP, and sent the TEE commands to activate the corresponding hardware session. Session state "session in play" means this session is ready for secure playback.
--- drivers/gpu/drm/i915/pxp/intel_pxp.c | 4 ++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 92 +++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 2 + 3 files changed, 98 insertions(+)
drivers/gpu/drm/i915/pxp/intel_pxp.c +4 -0
@@ -61,6 +61,10 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmf pxp_info.sm_status = ret; ret =0 ; } + }else if (params->req_session_state ==PXP_SM_REQ_SESSION_IN_PLAY ) { + ret =pxp_sm_mark_protected_session_in_play (i915, params->session_type, + params->pxp_tag); + }else { ret = -EINVAL ; goto end;
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +92 -0
104 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +2 -0
@@ -86,6 +86,8 @@ struct pxp_protected_session {int intel_pxp_sm_reserve_session (struct drm_i915_private *i915,struct drm_file *drmfile,int context_id,int session_type,int protection_mode,u32 *pxp_tag); +int pxp_sm_mark_protected_session_in_play (struct drm_i915_private *i915,int session_type, +u32 session_id);int pxp_sm_set_kcr_init_reg (struct drm_i915_private *i915);#endif /* __INTEL_PXP_SM_H__ */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 12/27 drm/i915/pxp: Func to send hardware session termination
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Implement the functions to allow ring0 PXP to send a GPU command in order to terminate the hardware session, so hardware can recycle this session slot for the next usage.
--- drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 309 ++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 16 ++ 2 files changed, 325 insertions(+)
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +309 -0
@@ -3,13 +3,175 @@* Copyright(c) 2020, Intel Corporation. All rights reserved. */ +#include "gt/intel_gpu_commands.h" +#include "gt/intel_gt.h" #include "gt/intel_context.h" +#include "gt/intel_gt_buffer_pool.h" #include "gt/intel_engine_pm.h" #include "intel_pxp.h" #include "intel_pxp_sm.h" #include "intel_pxp_context.h" +static struct i915_vma *pxp_get_batch (struct drm_i915_private *i915, +struct intel_context *ce, +struct intel_gt_buffer_pool_node *pool, +u32 *cmd_buf,int cmd_size_in_dw) +{ +struct i915_vma *batch =ERR_PTR (-EINVAL ); +u32 *cmd; + +drm_dbg (&i915->drm,">>> %s cmd_buf=[%p] cmd_size_in_dw=[%d]\n" , __func__, cmd_buf, cmd_size_in_dw); + +if (!ce || !ce->engine || !cmd_buf) { +drm_dbg (&i915->drm,"Failed to %s due to nullptr\n" , __func__); + goto end; + } + +if (cmd_size_in_dw *4 >PAGE_SIZE ) { +drm_dbg (&i915->drm,"Failed to %s, invalid cmd_size_id_dw=[%d]\n" , + __func__, cmd_size_in_dw); + goto end; + } + + cmd =i915_gem_object_pin_map (pool->obj,I915_MAP_FORCE_WC ); +if (IS_ERR (cmd)) { +drm_dbg (&i915->drm,"Failed to i915_gem_object_pin_map()\n " ); + goto end; + } + +memcpy (cmd, cmd_buf, cmd_size_in_dw *4 ); + +if (drm_debug_enabled (DRM_UT_DRIVER )) { +print_hex_dump (KERN_DEBUG ,"cmd binaries:" , +DUMP_PREFIX_OFFSET ,4 ,4 , cmd, cmd_size_in_dw *4 , true); + } + +i915_gem_object_unpin_map (pool->obj); + + batch =i915_vma_instance (pool->obj, ce->vm,NULL ); +if (IS_ERR (batch)) { +drm_dbg (&i915->drm,"Failed to i915_vma_instance()\n " ); + goto end; + } + +end: +drm_dbg (&i915->drm,"<<< %s: batch=[%p]\n" , __func__, batch); +return batch; +} + +static int pxp_submit_cmd (struct drm_i915_private *i915,u32 *cmd,int cmd_size_in_dw) +{ +int err = -EINVAL ; +struct i915_vma *batch; +struct i915_request *rq; +struct intel_context *ce =NULL ; +bool is_engine_pm_get = false; +bool is_batch_vma_pin = false; +bool is_skip_req_on_err = false; +bool is_engine_get_pool = false; +struct intel_gt_buffer_pool_node *pool =NULL ; +struct intel_gt *gt =NULL ; + +drm_dbg (&i915->drm,">>> %s: cmd=[%p] cmd_size_in_dw=[%d]\n" , + __func__, cmd, cmd_size_in_dw); + +if (!i915 || !HAS_ENGINE (&i915->gt,VCS0 ) || + !i915->gt.engine[VCS0 ]->kernel_context) { + err = -EINVAL ; +drm_dbg (&i915->drm,"Failed to %s bad params\n" , __func__); + goto end; + } + +if (!cmd || (cmd_size_in_dw *4 ) >PAGE_SIZE ) { + err = -EINVAL ; +drm_dbg (&i915->drm,"Failed to %s bad params\n" , __func__); + goto end; + } + + gt = &i915->gt; + ce = i915->gt.engine[VCS0 ]->kernel_context; + +intel_engine_pm_get (ce->engine); + is_engine_pm_get = true; + + pool =intel_gt_get_buffer_pool (gt,PAGE_SIZE ); +if (IS_ERR (pool)) { +drm_dbg (&i915->drm,"Failed to intel_engine_get_pool()\n" ); + goto end; + } + is_engine_get_pool = true; + + batch =pxp_get_batch (i915, ce, pool, cmd, cmd_size_in_dw); +if (IS_ERR (batch)) { +drm_dbg (&i915->drm,"Failed to pxp_get_batch()\n" ); + goto end; + } + + err =i915_vma_pin (batch,0 ,0 ,PIN_USER ); +if (err) { +drm_dbg (&i915->drm,"Failed to i915_vma_pin()\n" ); + goto end; + } + is_batch_vma_pin = true; + + rq =intel_context_create_request (ce); +if (IS_ERR (rq)) { +drm_dbg (&i915->drm,"Failed to intel_context_create_request()\n" ); + goto end; + } + is_skip_req_on_err = true; + + err =intel_gt_buffer_pool_mark_active (pool, rq); +if (err) { +drm_dbg (&i915->drm,"Failed to intel_engine_pool_mark_active()\n" ); + goto end; + } + +i915_vma_lock (batch); + err =i915_request_await_object (rq, batch->obj, false); +if (!err) + err =i915_vma_move_to_active (batch, rq,0 ); +i915_vma_unlock (batch); +if (err) { +drm_dbg (&i915->drm,"Failed to i915_request_await_object()\n" ); + goto end; + } + +if (ce->engine->emit_init_breadcrumb) { + err = ce->engine->emit_init_breadcrumb (rq); +if (err) { +drm_dbg (&i915->drm,"Failed to emit_init_breadcrumb()\n" ); + goto end; + } + } + + err = ce->engine->emit_bb_start (rq, batch->node.start, + batch->node.size,0 ); +if (err) { +drm_dbg (&i915->drm,"Failed to emit_bb_start()\n" ); + goto end; + } + +i915_request_add (rq); + +end: +if (unlikely (err) && is_skip_req_on_err) +i915_request_set_error_once (rq, err); + +if (is_batch_vma_pin) +i915_vma_unpin (batch); + +if (is_engine_get_pool) +intel_gt_buffer_pool_put (pool); + +if (is_engine_pm_get) +intel_engine_pm_put (ce->engine); + +drm_dbg (&i915->drm,"<<< %s: err=[%d]\n" , __func__, err); +return err; +} +int pxp_sm_reg_read (struct drm_i915_private *i915,u32 offset,u32 *regval) {intel_wakeref_t wakeref;
@@ -584,6 +746,153 @@ int pxp_sm_mark_protected_session_in_play(struct drm_i915_private *i915, int sesreturn ret; } +static int add_pxp_prolog (struct drm_i915_private *i915,u32 *cmd,int session_type,int session_index) +{ +u32 increased_size_in_dw =0 ; +u32 *cmd_prolog = cmd; +const int cmd_prolog_size_in_dw =10 ; + +if (!cmd) +return cmd_prolog_size_in_dw; + +/* MFX_WAIT - stall until prior PXP and MFX/HCP/HUC objects are cmopleted */ + *cmd_prolog++ = (MFX_WAIT |MFX_WAIT_DW0_PXP_SYNC_CONTROL_FLAG |MFX_WAIT_DW0_MFX_SYNC_CONTROL_FLAG ); + +/* MI_FLUSH_DW - pxp off */ + *cmd_prolog++ =MI_FLUSH_DW ;/* DW0 */ + *cmd_prolog++ =0 ;/* DW1 */ + *cmd_prolog++ =0 ;/* DW2 */ + +/* MI_SET_APPID */ +if (session_type ==SESSION_TYPE_TYPE1 ) { +if (session_index >=MAX_TYPE1_SESSIONS ) { +drm_dbg (&i915->drm,"Failed to %s invalid session_index\n" , __func__); + goto end; + } + + *cmd_prolog++ = (MI_SET_APPID |MI_SET_APPID_TYPE1_APP |MI_SET_APPID_SESSION_ID (session_index)); + }else { +if (session_index >=MAX_TYPE0_SESSIONS ) { +drm_dbg (&i915->drm,"Failed to %s invalid session_index\n" , __func__); + goto end; + } + + *cmd_prolog++ = (MI_SET_APPID |MI_SET_APPID_SESSION_ID (session_index)); + } + +/* MFX_WAIT */ + *cmd_prolog++ = (MFX_WAIT |MFX_WAIT_DW0_PXP_SYNC_CONTROL_FLAG |MFX_WAIT_DW0_MFX_SYNC_CONTROL_FLAG ); + +/* MI_FLUSH_DW - pxp on */ + *cmd_prolog++ = (MI_FLUSH_DW |MI_FLUSH_DW_DW0_PROTECTED_MEMORY_ENABLE );/* DW0 */ + *cmd_prolog++ =0 ;/* DW1 */ + *cmd_prolog++ =0 ;/* DW2 */ + +/* MFX_WAIT */ + *cmd_prolog++ = (MFX_WAIT |MFX_WAIT_DW0_PXP_SYNC_CONTROL_FLAG |MFX_WAIT_DW0_MFX_SYNC_CONTROL_FLAG ); + + increased_size_in_dw = (cmd_prolog - cmd); +end: +return increased_size_in_dw; +} + +static int add_pxp_epilog (u32 *cmd) +{ +u32 increased_size_in_dw =0 ; +u32 *cmd_epilog = cmd; +const int cmd_epilog_size_in_dw =5 ; + +if (!cmd) +return cmd_epilog_size_in_dw; + +/* MI_FLUSH_DW - pxp off */ + *cmd_epilog++ =MI_FLUSH_DW ;/* DW0 */ + *cmd_epilog++ =0 ;/* DW1 */ + *cmd_epilog++ =0 ;/* DW2 */ + +/* MFX_WAIT - stall until prior PXP and MFX/HCP/HUC objects are cmopleted */ + *cmd_epilog++ = (MFX_WAIT |MFX_WAIT_DW0_PXP_SYNC_CONTROL_FLAG |MFX_WAIT_DW0_MFX_SYNC_CONTROL_FLAG ); + +/* MI_BATCH_BUFFER_END */ + *cmd_epilog++ =MI_BATCH_BUFFER_END ; + + increased_size_in_dw = (cmd_epilog - cmd); +return increased_size_in_dw; +} + +static int add_pxp_inline_termination (u32 *cmd) +{ +u32 increased_size_in_dw =0 ; +u32 *cmd_termin = cmd; +const int cmd_termin_size_in_dw =2 ; + +if (!cmd) +return cmd_termin_size_in_dw; + +/* CRYPTO_KEY_EXCHANGE - session inline termination */ + *cmd_termin++ =CRYPTO_KEY_EXCHANGE ;/* DW0 */ + *cmd_termin++ =0 ;/* DW1 */ + + increased_size_in_dw = (cmd_termin - cmd); +return increased_size_in_dw; +} + +static int issue_hw_terminate_for_session (struct drm_i915_private *i915,int session_type, +int session_index) +{ +u32 *cmd =NULL ; +u32 *cmd_ptr =NULL ; +int cmd_size_in_dw =0 ; +int ret; + +drm_dbg (&i915->drm,">>> %s session_type=[%d] session_index=[%d]\n" , __func__, + session_type, session_index); + +if (!i915) { + ret = -EINVAL ; +drm_dbg (&i915->drm,"Failed to %s due to bad params\n" , __func__); + goto end; + } + + cmd_size_in_dw +=add_pxp_prolog (i915,NULL , session_type, session_index); + cmd_size_in_dw +=add_pxp_inline_termination (NULL ); + cmd_size_in_dw +=add_pxp_epilog (NULL ); + + cmd =kzalloc (cmd_size_in_dw *4 ,GFP_KERNEL ); +if (!cmd) { + ret = -ENOMEM ; +drm_dbg (&i915->drm,"Failed to kzalloc()\n" ); + goto end; + } + + cmd_ptr = cmd; + cmd_ptr +=add_pxp_prolog (i915, cmd_ptr, session_type, session_index); + cmd_ptr +=add_pxp_inline_termination (cmd_ptr); + cmd_ptr +=add_pxp_epilog (cmd_ptr); + +if (cmd_size_in_dw != (cmd_ptr - cmd)) { + ret = -EINVAL ; +drm_dbg (&i915->drm,"Failed to %s\n" , __func__); + goto end; + } + +if (drm_debug_enabled (DRM_UT_DRIVER )) { +print_hex_dump (KERN_DEBUG ,"cmd binaries:" , +DUMP_PREFIX_OFFSET ,4 ,4 , cmd, cmd_size_in_dw *4 , true); + } + + ret =pxp_submit_cmd (i915, cmd, cmd_size_in_dw); +if (ret) { +drm_dbg (&i915->drm,"Failed to pxp_submit_cmd()\n" ); + goto end; + } + +end: +kfree (cmd); +drm_dbg (&i915->drm,"<<< %s ret=[%d]\n" , __func__, ret); +return ret; +} +int pxp_sm_set_kcr_init_reg (struct drm_i915_private *i915) {int ret;
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +16 -0
@@ -22,6 +22,22 @@#define SESSION_TYPE_MASK BIT(7)#define SESSION_ID_MASK (BIT(7) - 1) +/* PXP GPU command definitions */ + +/* MI_SET_APPID */ +#define MI_SET_APPID_TYPE1_APP BIT(7) +#define MI_SET_APPID_SESSION_ID (x) ((x) << 0) + +/* MI_FLUSH_DW */ +#define MI_FLUSH_DW_DW0_PROTECTED_MEMORY_ENABLE BIT(22) + +/* MI_WAIT */ +#define MFX_WAIT_DW0_PXP_SYNC_CONTROL_FLAG BIT(9) +#define MFX_WAIT_DW0_MFX_SYNC_CONTROL_FLAG BIT(8) + +/* CRYPTO_KEY_EXCHANGE */ +#define CRYPTO_KEY_EXCHANGE ((0x3 << 29) | (0x01609 << 16)) +enum pxp_session_types {SESSION_TYPE_TYPE0 =0 ,SESSION_TYPE_TYPE1 =1 ,
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 13/27 drm/i915/pxp: Enable ioctl action to terminate the session
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Enable the PXP ioctl action to allow ring3 PXP to terminate the hardware session and cleanup its software session state. Ring0 PXP sends the session termination command to GPU once receves this ioctl action.
--- drivers/gpu/drm/i915/pxp/intel_pxp.c | 7 + drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 205 ++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 5 + 3 files changed, 217 insertions(+)
drivers/gpu/drm/i915/pxp/intel_pxp.c +7 -0
@@ -65,6 +65,13 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmf ret =pxp_sm_mark_protected_session_in_play (i915, params->session_type, params->pxp_tag); + }else if (params->req_session_state ==PXP_SM_REQ_SESSION_TERMINATE ) { + ret =pxp_sm_terminate_protected_session_safe (i915,0 , + params->session_type, + params->pxp_tag); + +if (!intel_pxp_sm_is_any_type0_session_in_play (i915,PROTECTION_MODE_ALL )) +intel_pxp_destroy_r3ctx_list (i915); }else { ret = -EINVAL ; goto end;
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +205 -0
214 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +5 -0
@@ -104,6 +104,11 @@ int intel_pxp_sm_reserve_session(struct drm_i915_private *i915, struct drm_file u32 *pxp_tag);int pxp_sm_mark_protected_session_in_play (struct drm_i915_private *i915,int session_type,u32 session_id); +int pxp_sm_terminate_protected_session_safe (struct drm_i915_private *i915,int context_id, +int session_type,int session_id); +int pxp_sm_terminate_protected_session_unsafe (struct drm_i915_private *i915,int session_type, +int session_id);int pxp_sm_set_kcr_init_reg (struct drm_i915_private *i915); +bool intel_pxp_sm_is_any_type0_session_in_play (struct drm_i915_private *i915,int protection_mode);#endif /* __INTEL_PXP_SM_H__ */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 14/27 drm/i915/pxp: Enable ioctl action to query PXP tag
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Enable the PXP ioctl action to allow ring3 PXP to query the PXP tag, which is a 32-bit bitwise value indicating the current session info, including protection type, session id, and whether the session is enabled.
--- drivers/gpu/drm/i915/pxp/intel_pxp.c | 7 +++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 7 +++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 28 +++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 3 +++ 4 files changed, 45 insertions(+)
drivers/gpu/drm/i915/pxp/intel_pxp.c +7 -0
@@ -78,6 +78,13 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmf }break ; } +case PXP_ACTION_QUERY_PXP_TAG : + { +struct pxp_sm_query_pxp_tag *params = &pxp_info.query_pxp_tag; + + ret =pxp_sm_ioctl_query_pxp_tag (i915, ¶ms->session_is_alive, ¶ms->pxp_tag); +break ; + }case PXP_ACTION_SET_R3_CONTEXT : { ret =intel_pxp_set_r3ctx (i915, pxp_info.set_r3ctx);
drivers/gpu/drm/i915/pxp/intel_pxp.h +7 -0
@@ -31,6 +31,7 @@ enum pxp_sm_session_req { };enum pxp_ioctl_action { +PXP_ACTION_QUERY_PXP_TAG =0 ,PXP_ACTION_SET_SESSION_STATUS =1 ,PXP_ACTION_SET_R3_CONTEXT =5 , };
@@ -42,6 +43,11 @@ enum pxp_sm_status {PXP_SM_STATUS_ERROR_UNKNOWN }; +struct pxp_sm_query_pxp_tag { +u32 session_is_alive; +u32 pxp_tag;/* in - Session ID, out pxp tag */ +}; +struct pxp_sm_set_session_status_params {/** @pxp_tag: in [optional], for Arbitrator session, out pxp tag */ u32 pxp_tag;
@@ -57,6 +63,7 @@ struct pxp_info {u32 action;u32 sm_status;union { +struct pxp_sm_query_pxp_tag query_pxp_tag;struct pxp_sm_set_session_status_params set_session_status;u32 set_r3ctx; };
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +28 -0
@@ -1076,6 +1076,34 @@ int pxp_sm_terminate_protected_session_unsafe(struct drm_i915_private *i915, intreturn ret; } +int pxp_sm_ioctl_query_pxp_tag (struct drm_i915_private *i915,u32 *session_is_alive,u32 *pxp_tag) +{ +int session_type =0 ; +int session_index =0 ; +int ret; + +drm_dbg (&i915->drm,">>> %s\n" , __func__); + +if (!session_is_alive || !pxp_tag) { + ret = -EINVAL ; +drm_dbg (&i915->drm,"Failed to %s, bad param\n" , __func__); + goto end; + } + + ret =pxp_get_session_index (i915, *pxp_tag, &session_index, &session_type); +if (ret) { +drm_dbg (&i915->drm,"Failed to __pxpsessionid_to_sessionid\n" ); + goto end; + } + + *pxp_tag =intel_pxp_get_pxp_tag (i915, session_index, session_type, session_is_alive); + + ret =0 ; +end: +drm_dbg (&i915->drm,"<<< %s ret=[%d]\n" , __func__, ret); +return ret; +} +int pxp_sm_set_kcr_init_reg (struct drm_i915_private *i915) {int ret;
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +3 -0
@@ -108,7 +108,10 @@ int pxp_sm_terminate_protected_session_safe(struct drm_i915_private *i915, int c int session_type, int session_id);int pxp_sm_terminate_protected_session_unsafe (struct drm_i915_private *i915,int session_type,int session_id); +int pxp_sm_ioctl_query_pxp_tag (struct drm_i915_private *i915,u32 *session_is_alive,u32 *pxp_tag);int pxp_sm_set_kcr_init_reg (struct drm_i915_private *i915); +u32 intel_pxp_get_pxp_tag (struct drm_i915_private *i915,int session_idx, +int session_type,u32 *session_is_alive);bool intel_pxp_sm_is_any_type0_session_in_play (struct drm_i915_private *i915,int protection_mode);#endif /* __INTEL_PXP_SM_H__ */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 15/27 drm/i915/pxp: Destroy all type0 sessions upon teardown
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Teardown is triggered when the display topology changes and no long meets the secure playback requirement, and hardware trashes all the encryption keys for display. So as a result, ring0 PXP should handle such case and terminate all the type0 sessions.
--- drivers/gpu/drm/i915/pxp/intel_pxp.c | 6 +- drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 118 ++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 1 + 3 files changed, 124 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/pxp/intel_pxp.c +5 -1
@@ -134,6 +134,8 @@ static void intel_pxp_mask_irq(struct intel_gt *gt, u32 mask)static int intel_pxp_teardown_required_callback (struct drm_i915_private *i915) { +int ret; +drm_dbg (&i915->drm,"%s was called\n" , __func__);mutex_lock (&i915->pxp.r0ctx->ctx_mutex);
@@ -141,11 +143,13 @@ static int intel_pxp_teardown_required_callback(struct drm_i915_private *i915) i915->pxp.r0ctx->global_state_attacked = true; i915->pxp.r0ctx->flag_display_hm_surface_keys = false; + ret =intel_pxp_sm_terminate_all_active_sessions (i915,SESSION_TYPE_TYPE0 ); +intel_pxp_destroy_r3ctx_list (i915);mutex_unlock (&i915->pxp.r0ctx->ctx_mutex); -return 0 ; +return ret; }static int intel_pxp_global_terminate_complete_callback (struct drm_i915_private *i915)
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +118 -0
130 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +1 -0
@@ -108,6 +108,7 @@ int pxp_sm_terminate_protected_session_safe(struct drm_i915_private *i915, int c int session_type, int session_id);int pxp_sm_terminate_protected_session_unsafe (struct drm_i915_private *i915,int session_type,int session_id); +int intel_pxp_sm_terminate_all_active_sessions (struct drm_i915_private *i915,int session_type);int pxp_sm_ioctl_query_pxp_tag (struct drm_i915_private *i915,u32 *session_is_alive,u32 *pxp_tag);int pxp_sm_set_kcr_init_reg (struct drm_i915_private *i915); u32 intel_pxp_get_pxp_tag(struct drm_i915_private *i915, int session_idx,
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 16/27 drm/i915/pxp: Termiante the session upon app crash
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Ring0 PXP should terminate the hardware session and cleanup the software state gracefully when the application has established the protection session, but doesn't close the session correctly due to some cases like application crash.
--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/pxp/intel_pxp.c | 15 +++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 1 + drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 21 +++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 1 + 5 files changed, 40 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -1028,6 +1028,8 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)/* Catch up with all the deferred frees from "this" client */ i915_gem_flush_free_objects (to_i915 (dev)); + +intel_pxp_close (to_i915 (dev), file); }static void intel_suspend_encoders (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/pxp/intel_pxp.c +15 -0
@@ -110,6 +110,21 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmfreturn ret; } +int intel_pxp_close (struct drm_i915_private *i915,struct drm_file *drmfile) +{ +int ret; + +drm_dbg (&i915->drm,">>> %s i915=[%p] drmfile=[%p] pid=[%d]\n" , __func__, + i915, drmfile,pid_nr (drmfile->pid)); + +mutex_lock (&i915->pxp.r0ctx->ctx_mutex); + ret =intel_pxp_sm_close (i915, drmfile); +mutex_unlock (&i915->pxp.r0ctx->ctx_mutex); + +drm_dbg (&i915->drm,"<<< %s ret=[%d]\n" , __func__, ret); +return ret; +} +static void intel_pxp_write_irq_mask_reg (struct drm_i915_private *i915,u32 mask) {WARN_ON (INTEL_GEN (i915) <11 );
drivers/gpu/drm/i915/pxp/intel_pxp.h +1 -0
@@ -83,6 +83,7 @@ struct intel_gt;struct drm_i915_private ;int i915_pxp_ops_ioctl (struct drm_device *dev,void *data,struct drm_file *drmfile); +int intel_pxp_close (struct drm_i915_private *i915,struct drm_file *drmfile);void intel_pxp_irq_handler (struct intel_gt *gt,u16 iir);int i915_pxp_teardown_required_callback (struct drm_i915_private *i915);int i915_pxp_global_terminate_complete_callback (struct drm_i915_private *i915);
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +21 -0
@@ -1260,3 +1260,24 @@ bool intel_pxp_sm_is_any_type0_session_in_play(struct drm_i915_private *i915, inreturn false; } + +int intel_pxp_sm_close (struct drm_i915_private *i915,struct drm_file *drmfile) +{ +struct pxp_protected_session *s, *n; +int ret =0 ; + +drm_dbg (&i915->drm,">>> %s\n" , __func__); + +list_for_each_entry_safe (s, n,pxp_session_list (i915,SESSION_TYPE_TYPE0 ), session_list) { +if (s->drmfile && s->drmfile == drmfile && s->pid ==pid_nr (drmfile->pid)) { + ret =terminate_protected_session (i915,0 , s->session_type, s->session_index, false); +if (ret) { +drm_dbg (&i915->drm,"Failed to terminate_protected_session()\n" ); +return ret; + } + } + } + +drm_dbg (&i915->drm,"<<< %s ret=[%d]\n" , __func__, ret); +return ret; +}
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +1 -0
@@ -114,5 +114,6 @@ int pxp_sm_set_kcr_init_reg(struct drm_i915_private *i915);u32 intel_pxp_get_pxp_tag (struct drm_i915_private *i915,int session_idx,int session_type,u32 *session_is_alive);bool intel_pxp_sm_is_any_type0_session_in_play (struct drm_i915_private *i915,int protection_mode); +int intel_pxp_sm_close (struct drm_i915_private *i915,struct drm_file *drmfile);#endif /* __INTEL_PXP_SM_H__ */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 17/27 drm/i915/pxp: Enable PXP power management
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
During the power event S3+ sleep/resume, hardware will lose all the encryption keys for every hardware session, even though the software session state was marked as alive after resume. So to handle such case, ring0 PXP should terminate all the hardware sessions and cleanup all the software states after the power cycle.
--- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_drv.c | 8 +++ drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 83 +++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_pm.h | 14 +++++ 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.h
drivers/gpu/drm/i915/Makefile +2 -1
@@ -258,7 +258,8 @@ i915-y += i915_perf.o i915-y += \ pxp/intel_pxp.o \ pxp/intel_pxp_context.o \ - pxp/intel_pxp_sm.o + pxp/intel_pxp_sm.o \ + pxp/intel_pxp_pm.o # Post-mortem debug and GPU hang state capture i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
drivers/gpu/drm/i915/i915_drv.c +8 -0
@@ -68,6 +68,8 @@#include "gt/intel_gt_pm.h" #include "gt/intel_rc6.h" +#include "pxp/intel_pxp_pm.h" +#include "i915_debugfs.h" #include "i915_drv.h" #include "i915_ioc32.h"
@@ -1094,6 +1096,8 @@ static int i915_drm_prepare(struct drm_device *dev)*/ i915_gem_suspend (i915); +intel_pxp_pm_prepare_suspend (i915); +return 0 ; }
@@ -1277,6 +1281,8 @@ static int i915_drm_resume(struct drm_device *dev)intel_power_domains_enable (dev_priv); +intel_pxp_pm_resume (dev_priv); +enable_rpm_wakeref_asserts (&dev_priv->runtime_pm);return 0 ;
@@ -1348,6 +1354,8 @@ static int i915_drm_resume_early(struct drm_device *dev)intel_power_domains_resume (dev_priv); +intel_pxp_pm_resume_early (dev_priv); +enable_rpm_wakeref_asserts (&dev_priv->runtime_pm);return ret;
drivers/gpu/drm/i915/pxp/intel_pxp_pm.c new file +83 -0
83 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp_pm.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright(c) 2020, Intel Corporation. All rights reserved. +*/ + +#ifndef __INTEL_PXP_PM_H__ +#define __INTEL_PXP_PM_H__ + +void intel_pxp_pm_prepare_suspend (struct drm_i915_private *i915); + +void intel_pxp_pm_resume_early (struct drm_i915_private *i915); +int intel_pxp_pm_resume (struct drm_i915_private *i915); + +#endif
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [Intel-gfx] [PXP CLEAN PATCH v06 17/27] drm/i915/pxp: Enable PXP power management
Quoted 23 lines · Sean Z Huang
From: "Huang, Sean Z" <[email protected]>
During the power event S3+ sleep/resume, hardware will lose all the encryption keys for every hardware session, even though the software session state was marked as alive after resume. So to handle such case, ring0 PXP should terminate all the hardware sessions and cleanup all the software states after the power cycle.
Signed-off-by Huang, Sean Z <[email protected]>--- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_drv.c | 8 +++ drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 83 +++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_pm.h | 14 +++++ 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.hdrivers/gpu/drm/i915/Makefile +0
-0
drivers/gpu/drm/i915/Makefile i915-y += i915_perf.o · line 262
Quoted 6 lines
drivers/gpu/drm/i915/Makefile +2
-1@@ -258,7 +258,8 @@ i915-y += i915_perf.o i915-y += \ pxp/intel_pxp.o \ pxp/intel_pxp_context.o \ - pxp/intel_pxp_sm.o + pxp/intel_pxp_sm.o \ + pxp/intel_pxp_pm.o
Alphabetical order, please.
Quoted 140 lines
drivers/gpu/drm/i915/Makefile +0
-0# Post-mortem debug and GPU hang state capture i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.odrivers/gpu/drm/i915/i915_drv.c +8
-0@@ -68,6 +68,8 @@#include "gt/intel_gt_pm.h" #include "gt/intel_rc6.h" +#include "pxp/intel_pxp_pm.h" +#include "i915_debugfs.h" #include "i915_drv.h" #include "i915_ioc32.h" @@ -1094,6 +1096,8 @@ static int i915_drm_prepare(struct drm_device *dev)*/ i915_gem_suspend (i915); +intel_pxp_pm_prepare_suspend (i915); +return 0 ; }@@ -1277,6 +1281,8 @@ static int i915_drm_resume(struct drm_device *dev)intel_power_domains_enable (dev_priv); +intel_pxp_pm_resume (dev_priv); +enable_rpm_wakeref_asserts (&dev_priv->runtime_pm);return 0 ;@@ -1348,6 +1354,8 @@ static int i915_drm_resume_early(struct drm_device *dev)intel_power_domains_resume (dev_priv); +intel_pxp_pm_resume_early (dev_priv); +enable_rpm_wakeref_asserts (&dev_priv->runtime_pm);return ret;drivers/gpu/drm/i915/pxp/intel_pxp_pm.c new file +83
-0@@ -0,0 +1,83 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright(c) 2020 Intel Corporation. +*/ + +#include "i915_drv.h" +#include "intel_pxp_context.h" +#include "intel_pxp_sm.h" +#include "intel_pxp_pm.h" + +void intel_pxp_pm_prepare_suspend (struct drm_i915_private *i915) +{ +drm_dbg (&i915->drm,">>> %s\n" , __func__); + +if (!i915->pxp.r0ctx) +return ; + +mutex_lock (&i915->pxp.r0ctx->ctx_mutex); + +/* Disable PXP-IOCTLs */ + i915->pxp.r0ctx->global_state_in_suspend = true; + +mutex_unlock (&i915->pxp.r0ctx->ctx_mutex); + +drm_dbg (&i915->drm,"<<< %s\n" , __func__); +} + +void intel_pxp_pm_resume_early (struct drm_i915_private *i915) +{ +drm_dbg (&i915->drm,">>> %s\n" , __func__); + +if (!i915->pxp.r0ctx) +return ; + +mutex_lock (&i915->pxp.r0ctx->ctx_mutex); + +if (i915->pxp.r0ctx->global_state_in_suspend) { +/* reset the attacked flag even there was a pending */ + i915->pxp.r0ctx->global_state_attacked = false; + + i915->pxp.r0ctx->flag_display_hm_surface_keys = false; + } + +mutex_unlock (&i915->pxp.r0ctx->ctx_mutex); +drm_dbg (&i915->drm,"<<< %s\n" , __func__); +} + +int intel_pxp_pm_resume (struct drm_i915_private *i915) +{ +int ret =0 ; + +drm_dbg (&i915->drm,">>> %s\n" , __func__); + +if (!i915->pxp.r0ctx) +return 0 ; + +mutex_lock (&i915->pxp.r0ctx->ctx_mutex); + +/* Re-enable PXP-IOCTLs */ +if (i915->pxp.r0ctx->global_state_in_suspend) { +intel_pxp_destroy_r3ctx_list (i915); + + ret =intel_pxp_sm_terminate_all_active_sessions (i915,SESSION_TYPE_TYPE0 ); +if (ret) { +drm_dbg (&i915->drm,"Failed to intel_pxp_sm_terminate_all_active_sessions with type0\n" ); + goto end; + } + + ret =intel_pxp_sm_terminate_all_active_sessions (i915,SESSION_TYPE_TYPE1 ); +if (ret) { +drm_dbg (&i915->drm,"Failed to intel_pxp_sm_terminate_all_active_sessions with type1\n" ); + goto end; + } + + i915->pxp.r0ctx->global_state_in_suspend = false; + } + +end: +mutex_unlock (&i915->pxp.r0ctx->ctx_mutex); +drm_dbg (&i915->drm,"<<< %s ret=[%d]\n" , __func__, ret); + +return ret; +}drivers/gpu/drm/i915/pxp/intel_pxp_pm.h new file +2
-0@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: MIT */ +/*
drivers/gpu/drm/i915/pxp/intel_pxp_pm.h line 12
Quoted 10 lines
drivers/gpu/drm/i915/pxp/intel_pxp_pm.h new file +10
-0+* Copyright(c) 2020, Intel Corporation. All rights reserved. +*/ + +#ifndef __INTEL_PXP_PM_H__ +#define __INTEL_PXP_PM_H__ + +void intel_pxp_pm_prepare_suspend (struct drm_i915_private *i915); + +void intel_pxp_pm_resume_early (struct drm_i915_private *i915); +int intel_pxp_pm_resume (struct drm_i915_private *i915);
This will fail with DRM_I915_WERROR=y, which enables some more pedantic header tests. Please use that config option while developing.
BR,
Jani.
Quoted 2 lines
drivers/gpu/drm/i915/pxp/intel_pxp_pm.h new file +2
-0+ +#endif
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 18/27 drm/i915/pxp: Implement funcs to create the TEE channel
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Currently ring3 driver sends the TEE commands directly to TEE, but later, as our design, we would like to make ring3 sending the TEE commands via the ring0 PXP ioctl action instead of TEE ioctl, so we can centralize those protection operations at ring0 PXP.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 6 + drivers/gpu/drm/i915/pxp/intel_pxp.c | 4 + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 140 +++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_tee.h | 14 +++ include/drm/i915_component.h | 1 + include/drm/i915_pxp_tee_interface.h | 45 ++++++++ 8 files changed, 212 insertions(+) create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.h create mode 100644 include/drm/i915_pxp_tee_interface.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -259,6 +259,7 @@ i915-y += \ pxp/intel_pxp.o \ pxp/intel_pxp_context.o \ pxp/intel_pxp_sm.o \ + pxp/intel_pxp_tee.o \ pxp/intel_pxp_pm.o # Post-mortem debug and GPU hang state capture
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -324,6 +324,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)mutex_init (&dev_priv->wm.wm_mutex);mutex_init (&dev_priv->pps_mutex);mutex_init (&dev_priv->hdcp_comp_mutex); +mutex_init (&dev_priv->pxp_tee_comp_mutex);i915_memcpy_init_early (dev_priv);intel_runtime_pm_init_early (&dev_priv->runtime_pm);
drivers/gpu/drm/i915/i915_drv.h +6 -0
@@ -1219,6 +1219,12 @@ struct drm_i915_private {struct intel_pxp pxp; +struct i915_pxp_comp_master *pxp_tee_master; +bool pxp_tee_comp_added; + +/* Mutex to protect the above pxp_tee component related values. */ +struct mutex pxp_tee_comp_mutex; + I915_SELFTEST_DECLARE(struct i915_selftest_stash selftest;)/*
drivers/gpu/drm/i915/pxp/intel_pxp.c +4 -0
@@ -227,6 +227,8 @@ int intel_pxp_init(struct drm_i915_private *i915)return ret; } +intel_pxp_tee_component_init (i915); +INIT_WORK (&i915->pxp.irq_work, intel_pxp_irq_work); i915->pxp.handled_irr = (PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED |
@@ -238,6 +240,8 @@ int intel_pxp_init(struct drm_i915_private *i915)void intel_pxp_uninit (struct drm_i915_private *i915) { +intel_pxp_tee_component_fini (i915); +intel_pxp_destroy_r0ctx (i915); }
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c new file +140 -0
140 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp_tee.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright(c) 2020, Intel Corporation. All rights reserved. +*/ + +#ifndef __INTEL_PXP_TEE_H__ +#define __INTEL_PXP_TEE_H__ + +#include "drm/i915_pxp_tee_interface.h" + +void intel_pxp_tee_component_init (struct drm_i915_private *i915); +void intel_pxp_tee_component_fini (struct drm_i915_private *i915); + +#endif /* __INTEL_PXP_TEE_H__ */
include/drm/i915_component.h +1 -0
@@ -29,6 +29,7 @@enum i915_component_type {I915_COMPONENT_AUDIO =1 ,I915_COMPONENT_HDCP , +I915_COMPONENT_PXP };/* MAX_PORT is the number of port
include/drm/i915_pxp_tee_interface.h new file +45 -0
45 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 19/27 drm/i915/pxp: Enable ioctl action to send TEE commands
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Enable the ioctl action to allow ring3 driver sends TEE commands via ring0 PXP ioctl, instead of TEE iotcl. So we can centralize those protection operations at ring0 PXP.
--- drivers/gpu/drm/i915/pxp/intel_pxp.c | 15 ++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 18 +++++++ drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 65 ++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_tee.h | 5 ++ 4 files changed, 103 insertions(+)
drivers/gpu/drm/i915/pxp/intel_pxp.c +15 -0
@@ -7,6 +7,7 @@#include "intel_pxp.h" #include "intel_pxp_context.h" #include "intel_pxp_sm.h" +#include "intel_pxp_tee.h" int i915_pxp_ops_ioctl (struct drm_device *dev,void *data,struct drm_file *drmfile) {
@@ -85,6 +86,20 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmf ret =pxp_sm_ioctl_query_pxp_tag (i915, ¶ms->session_is_alive, ¶ms->pxp_tag);break ; } +case PXP_ACTION_TEE_IO_MESSAGE : + { +struct pxp_tee_io_message_params *params = &pxp_info.tee_io_message; + + ret =pxp_tee_ioctl_io_message (i915, + params->msg_in, params->msg_in_size, + params->msg_out, ¶ms->msg_out_size, + params->msg_out_buf_size); +if (ret) { +drm_dbg (&i915->drm,"Failed to send TEE IO message\n" ); + ret = -EFAULT ; + } +break ; + }case PXP_ACTION_SET_R3_CONTEXT : { ret =intel_pxp_set_r3ctx (i915, pxp_info.set_r3ctx);
drivers/gpu/drm/i915/pxp/intel_pxp.h +18 -0
@@ -33,6 +33,7 @@ enum pxp_sm_session_req {enum pxp_ioctl_action {PXP_ACTION_QUERY_PXP_TAG =0 ,PXP_ACTION_SET_SESSION_STATUS =1 , +PXP_ACTION_TEE_IO_MESSAGE =4 ,PXP_ACTION_SET_R3_CONTEXT =5 , };
@@ -59,12 +60,29 @@ struct pxp_sm_set_session_status_params {u32 req_session_state; }; +/** +* struct pxp_tee_io_message_params - Params to send/receive message to/from TEE. +*/ +struct pxp_tee_io_message_params { +/** @msg_in: in - message input from UMD */ +u8 __user *msg_in; +/** @msg_in_size: in - message input size from UMD */ +u32 msg_in_size; +/** @msg_out: in - message output buffer from UMD */ +u8 __user *msg_out; +/** @msg_out_size: out- message output size from TEE */ +u32 msg_out_size; +/** @msg_out_buf_size: in - message output buffer size from UMD */ +u32 msg_out_buf_size; +}; +struct pxp_info {u32 action;u32 sm_status;union {struct pxp_sm_query_pxp_tag query_pxp_tag;struct pxp_sm_set_session_status_params set_session_status; +struct pxp_tee_io_message_params tee_io_message;u32 set_r3ctx; }; } __packed;
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c +65 -0
71 lines not on this page · raw message
drivers/gpu/drm/i915/pxp/intel_pxp_tee.h +5 -0
@@ -11,4 +11,9 @@void intel_pxp_tee_component_init (struct drm_i915_private *i915);void intel_pxp_tee_component_fini (struct drm_i915_private *i915); +int pxp_tee_ioctl_io_message (struct drm_i915_private *i915, +void __user *msg_in_user_ptr,u32 msg_in_size, +void __user *msg_out_user_ptr,u32 *msg_out_size_ptr, +u32 msg_out_buf_size); +#endif /* __INTEL_PXP_TEE_H__ */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 20/27 drm/i915/pxp: Create the arbitrary session after boot
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Create the arbitrary session, with the fixed session id 0xf, after system boot, for the case that application allocates the protected buffer without establishing any protection session. Because the hardware requires at least one alive session for protected buffer creation. This arbitrary session needs to be re-created after teardown or power event because hardware encryption key won't be valid after such cases.
--- drivers/gpu/drm/i915/pxp/intel_pxp.c | 50 +++++++++++++++++++++++- drivers/gpu/drm/i915/pxp/intel_pxp.h | 2 + drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 33 ++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 6 +++ drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 34 ++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_tee.h | 6 +++ 6 files changed, 130 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/pxp/intel_pxp.c +49 -1
@@ -140,6 +140,46 @@ int intel_pxp_close(struct drm_i915_private *i915, struct drm_file *drmfile)return ret; } +int intel_pxp_create_arb_session (struct drm_i915_private *i915) +{ +struct pxp_tag pxptag; +int ret; + +drm_dbg (&i915->drm,">>> %s\n" , __func__); + +lockdep_assert_held (&i915->pxp.r0ctx->ctx_mutex); + +if (i915->pxp.r0ctx->flag_display_hm_surface_keys) { +drm_dbg (&i915->drm,"%s: arb session is alive so skipping the creation\n" , + __func__); +return 0 ; + } + + ret =intel_pxp_sm_reserve_arb_session (i915, &pxptag.value); +if (ret) { +drm_dbg (&i915->drm,"Failed to reserve session\n" ); + goto end; + } + + ret =intel_pxp_tee_cmd_create_arb_session (i915); +if (ret) { +drm_dbg (&i915->drm,"Failed to send tee cmd for arb session creation\n" ); + goto end; + } + + ret =pxp_sm_mark_protected_session_in_play (i915,ARB_SESSION_TYPE , pxptag.session_id); +if (ret) { +drm_dbg (&i915->drm,"Failed to mark session status in play\n" ); + goto end; + } + + i915->pxp.r0ctx->flag_display_hm_surface_keys = true; + +end: +drm_dbg (&i915->drm,"<<< %s ret=[%d]\n" , __func__, ret); +return ret; +} +static void intel_pxp_write_irq_mask_reg (struct drm_i915_private *i915,u32 mask) {WARN_ON (INTEL_GEN (i915) <11 );
@@ -190,9 +230,17 @@ static int intel_pxp_global_terminate_complete_callback(struct drm_i915_privatemutex_lock (&i915->pxp.r0ctx->ctx_mutex); -if (i915->pxp.r0ctx->global_state_attacked) +if (i915->pxp.r0ctx->global_state_attacked) { i915->pxp.r0ctx->global_state_attacked = false; +/* Re-create the arb session after teardown handle complete */ + ret =intel_pxp_create_arb_session (i915); +if (ret) { +drm_dbg (&i915->drm,"Failed to create arb session\n" ); + goto end; + } + } +end:mutex_unlock (&i915->pxp.r0ctx->ctx_mutex);drm_dbg (&i915->drm,"<<< %s ret=[%d]\n" , __func__, ret);
drivers/gpu/drm/i915/pxp/intel_pxp.h +2 -0
@@ -102,6 +102,8 @@ struct drm_i915_private;int i915_pxp_ops_ioctl (struct drm_device *dev,void *data,struct drm_file *drmfile);int intel_pxp_close (struct drm_i915_private *i915,struct drm_file *drmfile); +int intel_pxp_create_arb_session (struct drm_i915_private *i915); +void intel_pxp_irq_handler (struct intel_gt *gt,u16 iir);int i915_pxp_teardown_required_callback (struct drm_i915_private *i915);int i915_pxp_global_terminate_complete_callback (struct drm_i915_private *i915);
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +33 -0
@@ -673,6 +673,39 @@ int intel_pxp_sm_reserve_session(struct drm_i915_private *i915, struct drm_filereturn ret; } +int intel_pxp_sm_reserve_arb_session (struct drm_i915_private *i915,u32 *pxp_tag) +{ +int ret; + +drm_dbg (&i915->drm,">>> %s\n" , __func__); + +lockdep_assert_held (&i915->pxp.r0ctx->ctx_mutex); + +if (!pxp_tag || !i915) { + ret = -EINVAL ; +drm_dbg (&i915->drm,"Failed to %s, bad params\n" , __func__); + goto end; + } + + ret =sync_hw_sw_state (i915,ARB_SESSION_INDEX ,ARB_SESSION_TYPE ); +if (unlikely (ret)) + goto end; + + ret =create_new_session_entry (i915,NULL ,0 ,ARB_SESSION_TYPE , +ARB_PROTECTION_MODE ,ARB_SESSION_INDEX ); +if (unlikely (ret)) + goto end; + + ret =pxp_set_pxp_tag (i915,ARB_SESSION_TYPE ,ARB_SESSION_INDEX ,ARB_PROTECTION_MODE ); + +end: +if (ret ==0 ) + *pxp_tag =intel_pxp_get_pxp_tag (i915,ARB_SESSION_INDEX ,ARB_SESSION_TYPE ,NULL ); + +drm_dbg (&i915->drm,"<<< %s ret=[%d]\n" , __func__, ret); +return ret; +} +/** * pxp_sm_mark_protected_session_in_play - To put an reserved protected session to "in_play" state * @i915: i915 device handle.
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +6 -0
@@ -38,6 +38,11 @@/* CRYPTO_KEY_EXCHANGE */ #define CRYPTO_KEY_EXCHANGE ((0x3 << 29) | (0x01609 << 16)) +/* Arbitrary session */ +#define ARB_SESSION_INDEX 0xf +#define ARB_SESSION_TYPE SESSION_TYPE_TYPE0 +#define ARB_PROTECTION_MODE PROTECTION_MODE_HM +enum pxp_session_types {SESSION_TYPE_TYPE0 =0 ,SESSION_TYPE_TYPE1 =1 ,
@@ -102,6 +107,7 @@ struct pxp_protected_session {int intel_pxp_sm_reserve_session (struct drm_i915_private *i915,struct drm_file *drmfile,int context_id,int session_type,int protection_mode,u32 *pxp_tag); +int intel_pxp_sm_reserve_arb_session (struct drm_i915_private *i915,u32 *pxp_tag);int pxp_sm_mark_protected_session_in_play (struct drm_i915_private *i915,int session_type,u32 session_id); int pxp_sm_terminate_protected_session_safe(struct drm_i915_private *i915, int context_id,
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c +34 -0
@@ -138,6 +138,7 @@ int pxp_tee_ioctl_io_message(struct drm_i915_private *i915,static int i915_pxp_tee_component_bind (struct device *i915_kdev,struct device *tee_kdev,void *data) { +int ret;struct drm_i915_private *i915 =kdev_to_i915 (i915_kdev);drm_dbg (&i915->drm,"i915 PXP TEE component bind\n" );
@@ -152,6 +153,16 @@ static int i915_pxp_tee_component_bind(struct device *i915_kdev, i915->pxp_tee_master->tee_dev = tee_kdev;mutex_unlock (&i915->pxp_tee_comp_mutex); +mutex_lock (&i915->pxp.r0ctx->ctx_mutex); +/* Create arb session only if tee is ready, during system boot or sleep/resume */ + ret =intel_pxp_create_arb_session (i915); +mutex_unlock (&i915->pxp.r0ctx->ctx_mutex); + +if (ret) { +drm_dbg (&i915->drm,"Failed to create arb session ret=[%d]\n" , ret); +return ret; + } +return 0 ; }
@@ -203,3 +214,26 @@ void intel_pxp_tee_component_fini(struct drm_i915_private *i915)component_del (i915->drm.dev, &i915_pxp_tee_component_ops); } + +int intel_pxp_tee_cmd_create_arb_session (struct drm_i915_private *i915) +{ +int ret; +u32 msg_out_size_received =0 ; +u32 msg_in[PXP_TEE_ARB_CMD_DW_LEN ] =PXP_TEE_ARB_CMD_BIN ; +u32 msg_out[PXP_TEE_ARB_CMD_DW_LEN ] = {0 }; + +mutex_lock (&i915->pxp_tee_comp_mutex); + + ret =intel_pxp_tee_io_message (i915, + &msg_in, +sizeof (msg_in), + &msg_out, &msg_out_size_received, +sizeof (msg_out)); + +mutex_unlock (&i915->pxp_tee_comp_mutex); + +if (ret) +drm_dbg (&i915->drm,"Failed to send/receive tee message\n" ); + +return ret; +}
drivers/gpu/drm/i915/pxp/intel_pxp_tee.h +6 -0
@@ -16,4 +16,10 @@ int pxp_tee_ioctl_io_message(struct drm_i915_private *i915, void __user *msg_out_user_ptr, u32 *msg_out_size_ptr, u32 msg_out_buf_size); +int intel_pxp_tee_cmd_create_arb_session (struct drm_i915_private *i915); + +/* TEE command to create the arbitrary session */ +#define PXP_TEE_ARB_CMD_BIN {0x00040000, 0x0000001e, 0x00000000, 0x00000008, 0x00000002, 0x0000000f} +#define PXP_TEE_ARB_CMD_DW_LEN (6) +#endif /* __INTEL_PXP_TEE_H__ */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 21/27 drm/i915/pxp: Add i915 trace logs for PXP operations
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Add several i915 trace logs for PXP calls for debugging or performance measurement, including:
(1) PXP ioctl
(2) PXP teardown callbacks
To trun on this feature, we need to set "CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS=y" in .config for compiling the Linux kernel.
--- drivers/gpu/drm/i915/i915_trace.h | 44 ++++++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp.c | 5 ++++ 2 files changed, 49 insertions(+)
drivers/gpu/drm/i915/i915_trace.h +44 -0
@@ -1031,6 +1031,50 @@ DEFINE_EVENT(i915_context, i915_context_free,TP_ARGS (ctx) ); +TRACE_EVENT (i915_pxp_ops_ioctl, + TP_PROTO(struct drm_device *dev, void *data, struct drm_file *file, u32 action), +TP_ARGS (dev, data, file, action), + +TP_STRUCT__entry ( + __field(struct drm_device *, dev) + __field(void *, data) + __field(struct drm_file *, file) +__field (u32, action) + ), + +TP_fast_assign ( + __entry->dev = dev; + __entry->data = data; + __entry->file = file; + __entry->action = action; + ), + +TP_printk ("dev=%p, data=%p, file=%p, action=%u" , + __entry->dev, __entry->data, __entry->file, __entry->action) +); + +TRACE_EVENT (i915_pxp_teardown_required_callback, + TP_PROTO(bool global_state_attacked), +TP_ARGS (global_state_attacked), + +TP_STRUCT__entry (__field (bool, global_state_attacked)), + + TP_fast_assign(__entry->global_state_attacked = global_state_attacked;), + +TP_printk ("global_state_attacked=%s" ,yesno (__entry->global_state_attacked)) +); + +TRACE_EVENT (i915_pxp_global_terminate_complete_callback, + TP_PROTO(bool global_state_attacked), +TP_ARGS (global_state_attacked), + +TP_STRUCT__entry (__field (bool, global_state_attacked)), + + TP_fast_assign(__entry->global_state_attacked = global_state_attacked;), + +TP_printk ("global_state_attacked=%s" ,yesno (__entry->global_state_attacked)) +); +#endif /* _I915_TRACE_H_ */ /* This part must be outside protection */
drivers/gpu/drm/i915/pxp/intel_pxp.c +5 -0
@@ -8,6 +8,7 @@#include "intel_pxp_context.h" #include "intel_pxp_sm.h" #include "intel_pxp_tee.h" +#include "i915_trace.h" int i915_pxp_ops_ioctl (struct drm_device *dev,void *data,struct drm_file *drmfile) {
@@ -30,6 +31,7 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmf }drm_dbg (&i915->drm,"i915 pxp ioctl call with action=[%d]\n" , pxp_info.action); +trace_i915_pxp_ops_ioctl (dev, data, drmfile, pxp_info.action);mutex_lock (&i915->pxp.r0ctx->ctx_mutex);
@@ -219,6 +221,8 @@ static int intel_pxp_teardown_required_callback(struct drm_i915_private *i915)mutex_unlock (&i915->pxp.r0ctx->ctx_mutex); +trace_i915_pxp_teardown_required_callback (i915->pxp.r0ctx->global_state_attacked); +return ret; }
@@ -243,6 +247,7 @@ static int intel_pxp_global_terminate_complete_callback(struct drm_i915_private end:mutex_unlock (&i915->pxp.r0ctx->ctx_mutex); +trace_i915_pxp_global_terminate_complete_callback (i915->pxp.r0ctx->global_state_attacked);drm_dbg (&i915->drm,"<<< %s ret=[%d]\n" , __func__, ret);return ret;
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 22/27 drm/i915/pxp: Expose session state for display protection flip
In reply to Sean Z HuangFrom: "Huang, Sean Z" <[email protected]>
Implement the intel_pxp_gem_object_status() to allow ring0 i915 display querying the current PXP session state. In the design, ring0 display should not perform protection flip on the protected buffers if there is no PXP session alive.
--- drivers/gpu/drm/i915/pxp/intel_pxp.c | 8 ++++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 2 ++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/pxp/intel_pxp.c +8 -0
@@ -341,3 +341,11 @@ void intel_pxp_irq_handler(struct intel_gt *gt, u16 iir) end:return ; } + +bool intel_pxp_gem_object_status (struct drm_i915_private *i915,u64 gem_object_metadata) +{ +if (i915->pxp.r0ctx && i915->pxp.r0ctx->flag_display_hm_surface_keys) +return true; +else +return false; +}
drivers/gpu/drm/i915/pxp/intel_pxp.h +2 -0
@@ -111,4 +111,6 @@ int i915_pxp_global_terminate_complete_callback(struct drm_i915_private *i915);int intel_pxp_init (struct drm_i915_private *i915);void intel_pxp_uninit (struct drm_i915_private *i915); +bool intel_pxp_gem_object_status (struct drm_i915_private *i915,u64 gem_object_metadata); +#endif
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 23/27 mei: bus: enable pavp device.
In reply to Sean Z HuangFrom: Tomas Winkler <[email protected]>
Enable protected audio video path client on mei client bus.
--- drivers/misc/mei/bus-fixup.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/misc/mei/bus-fixup.c +4 -0
@@ -33,6 +33,9 @@ static const uuid_le mei_nfc_info_guid = MEI_UUID_NFC_INFO;#define MEI_UUID_HDCP UUID_LE(0xB638AB7E, 0x94E2, 0x4EA2, \ 0xA5, 0x52, 0xD1, 0xC5, 0x4B, 0x62, 0x7F, 0x04) +#define MEI_UUID_PAVP UUID_LE(0xfbf6fcf1, 0x96cf, 0x4e2e, 0xA6, \ + 0xa6, 0x1b, 0xab, 0x8c, 0xbe, 0x36, 0xb1) +#define MEI_UUID_ANY NULL_UUID_LE/**
@@ -488,6 +491,7 @@ static struct mei_fixup {MEI_FIXUP (MEI_UUID_MKHIF_FIX , mei_mkhi_fix),MEI_FIXUP (MEI_UUID_HDCP , whitelist),MEI_FIXUP (MEI_UUID_ANY , vt_support), + MEI_FIXUP(MEI_UUID_PAVP, whitelist), };/**
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 24/27 mei: pxp: export pavp client to me client bus
In reply to Sean Z HuangFrom: Vitaly Lubart <[email protected]>
Export PAVP client to work with i915_cp driver,
for binding it uses kernel component framework.
--- drivers/misc/mei/Kconfig | 2 + drivers/misc/mei/Makefile | 1 + drivers/misc/mei/pxp/Kconfig | 13 ++ drivers/misc/mei/pxp/Makefile | 7 + drivers/misc/mei/pxp/mei_pxp.c | 230 +++++++++++++++++++++++++++++++++ drivers/misc/mei/pxp/mei_pxp.h | 18 +++ 6 files changed, 271 insertions(+) create mode 100644 drivers/misc/mei/pxp/Kconfig create mode 100644 drivers/misc/mei/pxp/Makefile create mode 100644 drivers/misc/mei/pxp/mei_pxp.c create mode 100644 drivers/misc/mei/pxp/mei_pxp.h
drivers/misc/mei/Kconfig +2 -0
@@ -57,3 +57,5 @@ config INTEL_MEI_VIRTIO device over virtio. source "drivers/misc/mei/hdcp/Kconfig" +source "drivers/misc/mei/pxp/Kconfig" +
drivers/misc/mei/Makefile +1 -0
@@ -29,3 +29,4 @@ mei-$(CONFIG_EVENT_TRACING) += mei-trace.o CFLAGS_mei-trace.o = -I$(src) obj-$(CONFIG_INTEL_MEI_HDCP) += hdcp/ +obj-$(CONFIG_INTEL_MEI_PXP) += pxp/
drivers/misc/mei/pxp/Kconfig new file +13 -0
@@ -0,0 +1,13 @@ + +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020, Intel Corporation. All rights reserved. +# +config INTEL_MEI_PXP + tristate "Intel PXP services of ME Interface" + select INTEL_MEI_ME + depends on DRM_I915 + help + MEI Support for PXP Services on Intel platforms. + + Enables the ME FW services required for PXP support through + I915 display driver of Intel.
drivers/misc/mei/pxp/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (c) 2020, Intel Corporation. All rights reserved. +# +# Makefile - PXP client driver for Intel MEI Bus Driver. + +obj-$(CONFIG_INTEL_MEI_PXP) += mei_pxp.o
drivers/misc/mei/pxp/mei_pxp.c new file +230 -0
230 lines not on this page · raw message
drivers/misc/mei/pxp/mei_pxp.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright © 2020 Intel Corporation +* +* Authors: +* Vitaly Lubart <[email protected]> +*/ + +#ifndef __MEI_PXP_H__ +#define __MEI_PXP_H__ + +/* me_pxp_status: Enumeration of all PXP Status Codes */ +enum me_pxp_status { +ME_PXP_STATUS_SUCCESS =0x0000 , + +}; + +#endif /* __MEI_PXP_H__ */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 25/27 drm/i915/uapi: introduce drm_i915_gem_create_ext for TGL
In reply to Sean Z HuangFrom: Bommu Krishnaiah <[email protected]>
Same old gem_create but with now with extensions support. This is needed to support various upcoming usecases. For now we use the extensions mechanism to support PAVP.
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_gem.c | 42 ++++++++++++++++++++++++++++- include/uapi/drm/i915_drm.h | 47 +++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -1742,7 +1742,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_THROTTLE , i915_gem_throttle_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_ENTERVT , drm_noop,DRM_AUTH |DRM_MASTER |DRM_ROOT_ONLY ),DRM_IOCTL_DEF_DRV (I915_GEM_LEAVEVT , drm_noop,DRM_AUTH |DRM_MASTER |DRM_ROOT_ONLY ), -DRM_IOCTL_DEF_DRV (I915_GEM_CREATE , i915_gem_create_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_GEM_CREATE_EXT , i915_gem_create_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_PREAD , i915_gem_pread_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_PWRITE , i915_gem_pwrite_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_GEM_MMAP, i915_gem_mmap_ioctl, DRM_RENDER_ALLOW),
drivers/gpu/drm/i915/i915_gem.c +41 -1
63 lines not on this page · raw message
include/uapi/drm/i915_drm.h +47 -0
65 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 26/27 drm/i915/pavp: User interface for Protected buffer
In reply to Sean Z HuangFrom: Bommu Krishnaiah <[email protected]>
This api allow user mode to create Protected buffer and context creation.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 15 ++++++++++-- drivers/gpu/drm/i915/gem/i915_gem_context.h | 10 ++++++++ .../gpu/drm/i915/gem/i915_gem_context_types.h | 2 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 5 ++++ drivers/gpu/drm/i915/i915_gem.c | 23 +++++++++++++++---- include/uapi/drm/i915_drm.h | 19 +++++++++++++++ 6 files changed, 67 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +13 -2
@@ -2063,12 +2063,23 @@ static int ctx_setparam(struct drm_i915_file_private *fpriv,case I915_CONTEXT_PARAM_RECOVERABLE :if (args->size) ret = -EINVAL ; -else if (args->value) -i915_gem_context_set_recoverable (ctx); +else if (args->value) { +if (!i915_gem_context_is_protected (ctx)) +i915_gem_context_set_recoverable (ctx); +else + ret = -EPERM ; + }else i915_gem_context_clear_recoverable (ctx);break ; +case I915_CONTEXT_PARAM_PROTECTED_CONTENT : +if (args->size) + ret = -EINVAL ; +else if (args->value) +i915_gem_context_set_protected (ctx); +break ; +case I915_CONTEXT_PARAM_PRIORITY : ret =set_priority (ctx, args);break ;
drivers/gpu/drm/i915/gem/i915_gem_context.h +10 -0
@@ -70,6 +70,16 @@ static inline void i915_gem_context_set_recoverable(struct i915_gem_context *ctxset_bit (UCONTEXT_RECOVERABLE , &ctx->user_flags); } +static inline void i915_gem_context_set_protected (struct i915_gem_context *ctx) +{ +set_bit (UCONTEXT_PROTECTED , &ctx->user_flags); +} + +static inline bool i915_gem_context_is_protected (struct i915_gem_context *ctx) +{ +return test_bit (UCONTEXT_PROTECTED , &ctx->user_flags); +} +static inline void i915_gem_context_clear_recoverable (struct i915_gem_context *ctx) {clear_bit (UCONTEXT_RECOVERABLE , &ctx->user_flags);
drivers/gpu/drm/i915/gem/i915_gem_context_types.h +1 -1
@@ -135,7 +135,7 @@ struct i915_gem_context {#define UCONTEXT_BANNABLE 2#define UCONTEXT_RECOVERABLE 3#define UCONTEXT_PERSISTENCE 4 - +#define UCONTEXT_PROTECTED 5/** * @flags: small set of booleans */
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +5 -0
@@ -161,6 +161,11 @@ struct drm_i915_gem_object { } mmo; I915_SELFTEST_DECLARE(struct list_head st_link); +/** +* @user_flags: small set of booleans set by the user +*/ +unsigned long user_flags; +#define I915_BO_PROTECTED BIT(0)unsigned long flags;#define I915_BO_ALLOC_CONTIGUOUS BIT(0)
drivers/gpu/drm/i915/i915_gem.c +19 -4
@@ -184,7 +184,8 @@ static int i915_gem_create(struct drm_file *file, struct intel_memory_region *mr, u64 *size_p, - u32 *handle_p) + u32 *handle_p, + u64 user_flags) { struct drm_i915_gem_object *obj;u32 handle;
@@ -204,6 +205,8 @@ i915_gem_create(struct drm_file *file,if (IS_ERR (obj))return PTR_ERR (obj); + obj->user_flags = user_flags; + ret =drm_gem_handle_create (file, &obj->base, &handle);/* drop reference from allocate - handle holds it now */ i915_gem_object_put (obj);
@@ -258,11 +261,12 @@ i915_gem_dumb_create(struct drm_file *file,return i915_gem_create (file,intel_memory_region_by_type (to_i915 (dev), mem_type), - &args->size, &args->handle); + &args->size, &args->handle,0 ); }struct create_ext { -struct drm_i915_private *i915; +struct drm_i915_private *i915; +unsigned long user_flags; }; static int __create_setparam(struct drm_i915_gem_object_param *args,
@@ -273,6 +277,17 @@ static int __create_setparam(struct drm_i915_gem_object_param *args,return -EINVAL ; } +switch (lower_32_bits (args->param)) { +case I915_PARAM_PROTECTED_CONTENT : +if (args->size) { +return -EINVAL ; + }else if (args->data) { + ext_data->user_flags = args->data; +return 0 ; + } +break ; + } +return -EINVAL ; }
@@ -318,7 +333,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,return i915_gem_create (file,intel_memory_region_by_type (i915,INTEL_MEMORY_SYSTEM ), - &args->size, &args->handle); + &args->size, &args->handle, ext_data.user_flags); } static int
include/uapi/drm/i915_drm.h +19 -0
@@ -1717,6 +1717,15 @@ struct drm_i915_gem_context_param {* Default is 16 KiB. */ #define I915_CONTEXT_PARAM_RINGSIZE 0xc + +/* +* I915_CONTEXT_PARAM_PROTECTED_CONTENT: +* +* If set to true (1) PAVP content protection is enabled. +* When enabled, the context is marked unrecoverable and may +* become invalid due to PAVP teardown event or other error. +*/ +#define I915_CONTEXT_PARAM_PROTECTED_CONTENT 0xd/* Must be kept compact -- no holes and well documented */ __u64 value;
@@ -1736,6 +1745,16 @@ struct drm_i915_gem_object_param {*/ #define I915_OBJECT_PARAM (1ull<<32) +/* +* I915_PARAM_PROTECTED_CONTENT: +* +* If set to true (1) buffer contents is expected to be protected by +* PAVP encryption and requires decryption for scan out and processing. +* Protected buffers can only be used in PAVP protected contexts. +* A protected buffer may become invalid as a result of PAVP teardown. +*/ +#define I915_PARAM_PROTECTED_CONTENT 0x1 +__u64 param;/* Data value or pointer */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 27/27 drm/i915/pxp: Add plane decryption support
In reply to Sean Z HuangFrom: Anshuman Gupta <[email protected]>
Add support to enable/disable PLANE_SURF Decryption Request bit. It requires only to enable plane decryption support when following condition met.
1. PAVP session is enabled.
2. Buffer object is protected.
v2:
- Rebased to libva_cp-drm-tip_tgl_cp tree.
- Used gen fb obj user_flags instead gem_object_metadata. [Krishna]
--- drivers/gpu/drm/i915/display/intel_sprite.c | 21 ++++++++++++++++++--- drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 19 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_sprite.c +18 -3
@@ -39,6 +39,8 @@#include <drm/drm_plane_helper.h> #include <drm/drm_rect.h> +#include "pxp/intel_pxp.h" +#include "i915_drv.h" #include "i915_trace.h" #include "i915_vgpu.h"
@@ -752,6 +754,11 @@ icl_program_input_csc(struct intel_plane *plane, PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 2), 0x0); } +static bool intel_fb_obj_protected (const struct drm_i915_gem_object *obj) +{ +return obj->user_flags &I915_BO_PROTECTED ? true : false; +} + static void skl_plane_async_flip(struct intel_plane *plane, const struct intel_crtc_state *crtc_state,
@@ -788,6 +795,7 @@ skl_program_plane(struct intel_plane *plane,u32 surf_addr = plane_state->color_plane[color_plane].offset;u32 stride =skl_plane_stride (plane_state, color_plane);const struct drm_framebuffer *fb = plane_state->hw.fb; +const struct drm_i915_gem_object *obj =intel_fb_obj (fb);int aux_plane =intel_main_to_aux_plane (fb, color_plane);int crtc_x = plane_state->uapi.dst.x1;int crtc_y = plane_state->uapi.dst.y1;
@@ -798,7 +806,7 @@ skl_program_plane(struct intel_plane *plane,u8 alpha = plane_state->hw.alpha >>8 ;u32 plane_color_ctl =0 , aux_dist =0 ;unsigned long irqflags; -u32 keymsk, keymax; +u32 keymsk, keymax, plane_surf;u32 plane_ctl = plane_state->ctl; plane_ctl |=skl_plane_ctl_crtc (crtc_state);
@@ -874,8 +882,15 @@ skl_program_plane(struct intel_plane *plane,* the control register just before the surface register. */ intel_de_write_fw (dev_priv,PLANE_CTL (pipe, plane_id), plane_ctl); -intel_de_write_fw (dev_priv,PLANE_SURF (pipe, plane_id), -intel_plane_ggtt_offset (plane_state) + surf_addr); + plane_surf =intel_plane_ggtt_offset (plane_state) + surf_addr; + +if (intel_pxp_gem_object_status (dev_priv, obj->user_flags) && +intel_fb_obj_protected (obj)) + plane_surf |=PLANE_SURF_DECRYPTION_ENABLED ; +else + plane_surf &= ~PLANE_SURF_DECRYPTION_ENABLED ; + +intel_de_write_fw (dev_priv,PLANE_SURF (pipe, plane_id), plane_surf);if (plane_state->scaler_id >=0 )skl_program_scaler (plane, crtc_state, plane_state);
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -7206,6 +7206,7 @@ enum {#define _PLANE_SURF_3 (pipe) _PIPE(pipe, _PLANE_SURF_3_A, _PLANE_SURF_3_B)#define PLANE_SURF (pipe, plane) \ _MMIO_PLANE(plane, _PLANE_SURF_1(pipe), _PLANE_SURF_2(pipe)) +#define PLANE_SURF_DECRYPTION_ENABLED REG_BIT(2)#define _PLANE_OFFSET_1_B 0x711a4#define _PLANE_OFFSET_2_B 0x712a4
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [PXP,CLEAN,v06,01/27] drm/i915/pxp: Introduce Intel PXP component
In reply to Sean Z Huang== Series Details ==
== Series Details ==
Series: series starting with [PXP,CLEAN,v06,01/27] drm/i915/pxp: Introduce Intel PXP component
URL : https://patchwork.freedesktop.org/series/83843/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
HDRTEST drivers/gpu/drm/i915/pxp/intel_pxp_context.h
In file included from <command-line>:./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:14:15: error: field ‘ctx_mutex’ has incomplete type
struct mutex ctx_mutex;
^~~~~~~~~
./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:21:28: error: ‘MAX_TYPE0_SESSIONS’ undeclared here (not in a function)
u32 type0_session_pxp_tag[MAX_TYPE0_SESSIONS];
^~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:22:28: error: ‘MAX_TYPE1_SESSIONS’ undeclared here (not in a function)
u32 type1_session_pxp_tag[MAX_TYPE1_SESSIONS];
^~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:39:51: error: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
struct pxp_context *intel_pxp_create_r0ctx(struct drm_i915_private *i915);
^~~~~~~~~~~~~~~~
./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:40:37: error: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
void intel_pxp_destroy_r0ctx(struct drm_i915_private *i915);
^~~~~~~~~~~~~~~~
./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:42:32: error: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
int intel_pxp_set_r3ctx(struct drm_i915_private *i915, u32 r3ctx);
^~~~~~~~~~~~~~~~
./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:43:42: error: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
void intel_pxp_destroy_r3ctx_list(struct drm_i915_private *i915);
^~~~~~~~~~~~~~~~cc1: all warnings being treated as errorsdrivers/gpu/drm/i915/Makefile:312: recipe for target 'drivers/gpu/drm/i915/pxp/intel_pxp_context.hdrtest' failed make[4]: *** [drivers/gpu/drm/i915/pxp/intel_pxp_context.hdrtest] Error 1 scripts/Makefile.build:500: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:500: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:500: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1799: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [PXP,CLEAN,v06,01/27] drm/i915/pxp: Introduce Intel PXP component
Quoted 35 lines · Patchwork
== Series Details ==
Series: series starting with [PXP,CLEAN,v06,01/27] drm/i915/pxp: Introduce Intel PXP component
URL : https://patchwork.freedesktop.org/series/83843/
State : failure== Summary ==
CALL
scripts/checksyscalls.sh
CALLscripts/atomic/check-atomics.sh
DESCEND objtool
CHKinclude/generated/compile.h
HDRTESTdrivers/gpu/drm/i915/pxp/intel_pxp_context.h
In file included from <command-line>:./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:14:15: error: field ‘ctx_mutex’ has incomplete typestruct mutex ctx_mutex; ^~~~~~~~~ ./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:21:28: error: ‘MAX_TYPE0_SESSIONS’ undeclared here (not in a function) u32 type0_session_pxp_tag[MAX_TYPE0_SESSIONS]; ^~~~~~~~~~~~~~~~~~ ./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:22:28: error: ‘MAX_TYPE1_SESSIONS’ undeclared here (not in a function) u32 type1_session_pxp_tag[MAX_TYPE1_SESSIONS]; ^~~~~~~~~~~~~~~~~~ ./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:39:51: error: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror] struct pxp_context *intel_pxp_create_r0ctx(struct drm_i915_private *i915); ^~~~~~~~~~~~~~~~ ./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:40:37: error: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror] void intel_pxp_destroy_r0ctx(struct drm_i915_private *i915); ^~~~~~~~~~~~~~~~ ./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:42:32: error: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror] int intel_pxp_set_r3ctx(struct drm_i915_private *i915, u32 r3ctx); ^~~~~~~~~~~~~~~~ ./drivers/gpu/drm/i915/pxp/intel_pxp_context.h:43:42: error: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror] void intel_pxp_destroy_r3ctx_list(struct drm_i915_private *i915); ^~~~~~~~~~~~~~~~
Quoted 11 lines
cc1: all warnings being treated as errors
drivers/gpu/drm/i915/Makefile:312: recipe for target 'drivers/gpu/drm/i915/pxp/intel_pxp_context.hdrtest' failed make[4]: *** [drivers/gpu/drm/i915/pxp/intel_pxp_context.hdrtest] Error 1scripts/Makefile.build:500: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:500: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:500: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1799: recipe for target 'drivers' failed
make: *** [drivers] Error 2
Please enable DRM_I915_WERROR=y locally, and fix this stuff.
BR,
Jani.
Quoted 6 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 169 lines · Sean Z Huang
From: "Huang, Sean Z" <[email protected]>
PXP (Protected Xe Path) is an i915 componment, that helps ring3 to establish the hardware protected session and manage the status of each alive software session, as well as the life cycle of each session.
By design PXP will expose ioctl so allow ring3 to create, set, and destroy each session. It will also provide the communication chanel to TEE (Trusted Execution Environment) for the protected hardware session creation.
Signed-off-by Huang, Sean Z <[email protected]>---
drivers/gpu/drm/i915/Makefile | 4 ++++ drivers/gpu/drm/i915/i915_drv.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/pxp/intel_pxp.c | 20 ++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 22 ++++++++++++++++++++++ include/uapi/drm/i915_drm.h | 5 +++++ 6 files changed, 59 insertions(+)create mode 100644
drivers/gpu/drm/i915/pxp/intel_pxp.ccreate mode 100644drivers/gpu/drm/i915/pxp/intel_pxp.hdrivers/gpu/drm/i915/Makefile +0
-0@@ -254,6 +254,10 @@ i915-y += \i915-y += i915_perf.o
drivers/gpu/drm/i915/Makefile +4
-0+# Protected execution platform (PXP) support +i915-y += \ + pxp/intel_pxp.o +# Post-mortem debug and GPU hang state capture i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o i915-$(CONFIG_DRM_I915_SELFTEST) += \
drivers/gpu/drm/i915/i915_drv.c +0
-0@@ -889,6 +889,8 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret) goto out_cleanup_gem;drivers/gpu/drm/i915/i915_drv.c +2
-0+intel_pxp_init (i915); +
i915_driver_register(i915);
enable_rpm_wakeref_asserts(&i915->runtime_pm);drivers/gpu/drm/i915/i915_drv.c +0
-0@@ -938,6 +940,8 @@ void i915_driver_remove(struct drm_i915_private *i915) /* Flush any external code that still may be under the RCU lock */ synchronize_rcu();drivers/gpu/drm/i915/i915_drv.c +2
-0+intel_pxp_uninit (i915); +
i915_gem_suspend(i915);
drm_atomic_helper_shutdown(&i915->drm);drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -105,6 +105,8 @@#include "
intel_region_lmem.h"drivers/gpu/drm/i915/i915_drv.h +2
-0+#include "pxp/intel_pxp.h" +/* General customization:
*/drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -1215,6 +1217,8 @@ struct drm_i915_private { /* Mutex to protect the above hdcp component related values. */ struct mutex hdcp_comp_mutex;drivers/gpu/drm/i915/i915_drv.h +2
-0+struct intel_pxp pxp; +
I915_SELFTEST_DECLARE(struct i915_selftest_stash selftest;)/*
drivers/gpu/drm/i915/pxp/intel_pxp.c new file +3
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright(c) 2020 Intel Corporation.
drivers/gpu/drm/i915/pxp/intel_pxp.c line 13
Quoted 10 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c new file +10
-0+*/ + +#include "i915_drv.h" +#include "intel_pxp.h" + +int intel_pxp_init (struct drm_i915_private *i915) +{ +int ret; + +drm_info (&i915->drm,"i915_pxp_init\n" );
why info? this should be debug in my opinion, we don't print info for every component initialized.
drivers/gpu/drm/i915/pxp/intel_pxp.c line 15
Quoted 2 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c new file +2
-0+ +return ret;
Returning not initialized variable.
Quoted 48 lines
drivers/gpu/drm/i915/pxp/intel_pxp.c new file +5
-0+} + +void intel_pxp_uninit (struct drm_i915_private *i915) +{ +}drivers/gpu/drm/i915/pxp/intel_pxp.h new file +22
-0@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright(c) 2020, Intel Corporation. All rights reserved. +*/ + +#ifndef __INTEL_PXP_H__ +#define __INTEL_PXP_H__ + +#include <drm/drm_file.h> + +struct pxp_context ; + +struct intel_pxp { +struct pxp_context *r0ctx; +}; + +struct drm_i915_private ; + +int intel_pxp_init (struct drm_i915_private *i915); +void intel_pxp_uninit (struct drm_i915_private *i915); + +#endif include/uapi/drm/i915_drm.h +0
-0@@ -1898,6 +1898,11 @@ struct drm_i915_gem_vm_control { __u32 vm_id; };
include/uapi/drm/i915_drm.h struct drm_i915_gem_vm_control { · line 1903
Quoted 3 lines
include/uapi/drm/i915_drm.h +3
-0+struct drm_i915_pxp_ops { +__u64 pxp_info_ptr; +__u32 pxp_info_size;
new users should use only "u64", "u32"...
Quoted 5 lines
include/uapi/drm/i915_drm.h +2
-0+}; +struct
drm_i915_reg_read{
/*
* Register offset.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx