]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/xe/gsc: add gsc device support
authorVitaly Lubart <vitaly.lubart@intel.com>
Mon, 28 Aug 2023 16:24:03 +0000 (19:24 +0300)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 21 Dec 2023 16:43:00 +0000 (11:43 -0500)
Create mei-gscfi auxiliary device and configure interrupts
to be consumed by mei-gsc device driver.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Vitaly Lubart <vitaly.lubart@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/xe/Kconfig
drivers/gpu/drm/xe/Makefile
drivers/gpu/drm/xe/xe_device.c
drivers/gpu/drm/xe/xe_device_types.h
drivers/gpu/drm/xe/xe_heci_gsc.c [new file with mode: 0644]
drivers/gpu/drm/xe/xe_heci_gsc.h [new file with mode: 0644]
drivers/gpu/drm/xe/xe_irq.c

index 7bffc039d63f073ca0861a96e4e9b9b8a0565918..cfa6420b9915a2f1ae383b72f3cdf326b5fb550a 100644 (file)
@@ -27,6 +27,7 @@ config DRM_XE
        select DRM_SCHED
        select MMU_NOTIFIER
        select WANT_DEV_COREDUMP
+       select AUXILIARY_BUS
        help
          Experimental driver for Intel Xe series GPUs
 
index a0e7896a4ef7cf52953f10e9277ff439c1f9ce30..32eee57b418467f3b9afbcf1a31c013be3b695bd 100644 (file)
@@ -78,6 +78,7 @@ xe-y += xe_bb.o \
        xe_guc_log.o \
        xe_guc_pc.o \
        xe_guc_submit.o \
+       xe_heci_gsc.o \
        xe_hw_engine.o \
        xe_hw_engine_class_sysfs.o \
        xe_hw_fence.o \
index 283fc5990000e14422700544c2c8cb23eed2f30e..2bbd3aa2809b68a72b639d671ec5750d40e8f939 100644 (file)
@@ -321,6 +321,8 @@ int xe_device_probe(struct xe_device *xe)
                        goto err_irq_shutdown;
        }
 
+       xe_heci_gsc_init(xe);
+
        err = drm_dev_register(&xe->drm, 0);
        if (err)
                goto err_irq_shutdown;
@@ -344,6 +346,8 @@ err_irq_shutdown:
 
 void xe_device_remove(struct xe_device *xe)
 {
+       xe_heci_gsc_fini(xe);
+
        xe_irq_shutdown(xe);
 }
 
index f7822dd9f1e4f2f24b23656770088fd207cd7fc7..4bc668ff8615f6f674878cdeb4bbf11319e26498 100644 (file)
@@ -13,6 +13,7 @@
 #include <drm/ttm/ttm_device.h>
 
 #include "xe_devcoredump_types.h"
+#include "xe_heci_gsc.h"
 #include "xe_gt_types.h"
 #include "xe_platform_types.h"
 #include "xe_pt_types.h"
@@ -384,6 +385,9 @@ struct xe_device {
        /** @hwmon: hwmon subsystem integration */
        struct xe_hwmon *hwmon;
 
+       /** @heci_gsc: graphics security controller */
+       struct xe_heci_gsc heci_gsc;
+
        /* For pcode */
        struct mutex sb_lock;
 
diff --git a/drivers/gpu/drm/xe/xe_heci_gsc.c b/drivers/gpu/drm/xe/xe_heci_gsc.c
new file mode 100644 (file)
index 0000000..3328ddc
--- /dev/null
@@ -0,0 +1,222 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright(c) 2023, Intel Corporation. All rights reserved.
+ */
+
+#include <linux/irq.h>
+#include <linux/mei_aux.h>
+#include <linux/pci.h>
+#include <linux/sizes.h>
+
+#include "regs/xe_regs.h"
+#include "xe_device_types.h"
+#include "xe_drv.h"
+#include "xe_heci_gsc.h"
+#include "xe_platform_types.h"
+
+#define GSC_BAR_LENGTH  0x00000FFC
+
+static void heci_gsc_irq_mask(struct irq_data *d)
+{
+       /* generic irq handling */
+}
+
+static void heci_gsc_irq_unmask(struct irq_data *d)
+{
+       /* generic irq handling */
+}
+
+static struct irq_chip heci_gsc_irq_chip = {
+       .name = "gsc_irq_chip",
+       .irq_mask = heci_gsc_irq_mask,
+       .irq_unmask = heci_gsc_irq_unmask,
+};
+
+static int heci_gsc_irq_init(int irq)
+{
+       irq_set_chip_and_handler_name(irq, &heci_gsc_irq_chip,
+                                     handle_simple_irq, "heci_gsc_irq_handler");
+
+       return irq_set_chip_data(irq, NULL);
+}
+
+/**
+ * struct heci_gsc_def - graphics security controller heci interface definitions
+ *
+ * @name: name of the heci device
+ * @bar: address of the mmio bar
+ * @bar_size: size of the mmio bar
+ * @use_polling: indication of using polling mode for the device
+ * @slow_firmware: indication of whether the device is slow (needs longer timeouts)
+ */
+struct heci_gsc_def {
+       const char *name;
+       unsigned long bar;
+       size_t bar_size;
+       bool use_polling;
+       bool slow_firmware;
+};
+
+/* gsc resources and definitions */
+static const struct heci_gsc_def heci_gsc_def_dg1 = {
+       .name = "mei-gscfi",
+       .bar = DG1_GSC_HECI2_BASE,
+       .bar_size = GSC_BAR_LENGTH,
+};
+
+static const struct heci_gsc_def heci_gsc_def_dg2 = {
+       .name = "mei-gscfi",
+       .bar = DG2_GSC_HECI2_BASE,
+       .bar_size = GSC_BAR_LENGTH,
+};
+
+static void heci_gsc_release_dev(struct device *dev)
+{
+       struct auxiliary_device *aux_dev = to_auxiliary_dev(dev);
+       struct mei_aux_device *adev = auxiliary_dev_to_mei_aux_dev(aux_dev);
+
+       kfree(adev);
+}
+
+void xe_heci_gsc_fini(struct xe_device *xe)
+{
+       struct xe_heci_gsc *heci_gsc = &xe->heci_gsc;
+
+       if (!HAS_HECI_GSCFI(xe))
+               return;
+
+       if (heci_gsc->adev) {
+               struct auxiliary_device *aux_dev = &heci_gsc->adev->aux_dev;
+
+               auxiliary_device_delete(aux_dev);
+               auxiliary_device_uninit(aux_dev);
+               heci_gsc->adev = NULL;
+       }
+
+       if (heci_gsc->irq >= 0)
+               irq_free_desc(heci_gsc->irq);
+       heci_gsc->irq = -1;
+}
+
+static int heci_gsc_irq_setup(struct xe_device *xe)
+{
+       struct xe_heci_gsc *heci_gsc = &xe->heci_gsc;
+       int ret;
+
+       heci_gsc->irq = irq_alloc_desc(0);
+       if (heci_gsc->irq < 0) {
+               drm_err(&xe->drm, "gsc irq error %d\n", heci_gsc->irq);
+               return heci_gsc->irq;
+       }
+
+       ret = heci_gsc_irq_init(heci_gsc->irq);
+       if (ret < 0)
+               drm_err(&xe->drm, "gsc irq init failed %d\n", ret);
+
+       return ret;
+}
+
+static int heci_gsc_add_device(struct xe_device *xe, const struct heci_gsc_def *def)
+{
+       struct xe_heci_gsc *heci_gsc = &xe->heci_gsc;
+       struct pci_dev *pdev = to_pci_dev(xe->drm.dev);
+       struct auxiliary_device *aux_dev;
+       struct mei_aux_device *adev;
+       int ret;
+
+       adev = kzalloc(sizeof(*adev), GFP_KERNEL);
+       if (!adev)
+               return -ENOMEM;
+       adev->irq = heci_gsc->irq;
+       adev->bar.parent = &pdev->resource[0];
+       adev->bar.start = def->bar + pdev->resource[0].start;
+       adev->bar.end = adev->bar.start + def->bar_size - 1;
+       adev->bar.flags = IORESOURCE_MEM;
+       adev->bar.desc = IORES_DESC_NONE;
+       adev->slow_firmware = def->slow_firmware;
+
+       aux_dev = &adev->aux_dev;
+       aux_dev->name = def->name;
+       aux_dev->id = (pci_domain_nr(pdev->bus) << 16) |
+                     PCI_DEVID(pdev->bus->number, pdev->devfn);
+       aux_dev->dev.parent = &pdev->dev;
+       aux_dev->dev.release = heci_gsc_release_dev;
+
+       ret = auxiliary_device_init(aux_dev);
+       if (ret < 0) {
+               drm_err(&xe->drm, "gsc aux init failed %d\n", ret);
+               kfree(adev);
+               return ret;
+       }
+
+       heci_gsc->adev = adev; /* needed by the notifier */
+       ret = auxiliary_device_add(aux_dev);
+       if (ret < 0) {
+               drm_err(&xe->drm, "gsc aux add failed %d\n", ret);
+               heci_gsc->adev = NULL;
+
+               /* adev will be freed with the put_device() and .release sequence */
+               auxiliary_device_uninit(aux_dev);
+       }
+       return ret;
+}
+
+void xe_heci_gsc_init(struct xe_device *xe)
+{
+       struct xe_heci_gsc *heci_gsc = &xe->heci_gsc;
+       const struct heci_gsc_def *def;
+       int ret;
+
+       if (!HAS_HECI_GSCFI(xe))
+               return;
+
+       heci_gsc->irq = -1;
+
+       if (xe->info.platform == XE_DG2) {
+               def = &heci_gsc_def_dg2;
+       } else if (xe->info.platform == XE_DG1) {
+               def = &heci_gsc_def_dg1;
+       } else {
+               drm_warn_once(&xe->drm, "Unknown platform\n");
+               return;
+       }
+
+       if (!def->name) {
+               drm_warn_once(&xe->drm, "HECI is not implemented!\n");
+               return;
+       }
+
+       if (!def->use_polling) {
+               ret = heci_gsc_irq_setup(xe);
+               if (ret)
+                       goto fail;
+       }
+
+       ret = heci_gsc_add_device(xe, def);
+       if (ret)
+               goto fail;
+
+       return;
+fail:
+       xe_heci_gsc_fini(xe);
+}
+
+void xe_heci_gsc_irq_handler(struct xe_device *xe, u32 iir)
+{
+       int ret;
+
+       if ((iir & GSC_IRQ_INTF(1)) == 0)
+               return;
+
+       if (!HAS_HECI_GSCFI(xe)) {
+               drm_warn_once(&xe->drm, "GSC irq: not supported");
+               return;
+       }
+
+       if (xe->heci_gsc.irq < 0)
+               return;
+
+       ret = generic_handle_irq(xe->heci_gsc.irq);
+       if (ret)
+               drm_err_ratelimited(&xe->drm, "error handling GSC irq: %d\n", ret);
+}
diff --git a/drivers/gpu/drm/xe/xe_heci_gsc.h b/drivers/gpu/drm/xe/xe_heci_gsc.h
new file mode 100644 (file)
index 0000000..9db4544
--- /dev/null
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright(c) 2023, Intel Corporation. All rights reserved.
+ */
+#ifndef __XE_HECI_GSC_DEV_H__
+#define __XE_HECI_GSC_DEV_H__
+
+#include <linux/types.h>
+
+struct xe_device;
+struct mei_aux_device;
+
+/*
+ * The HECI1 bit corresponds to bit15 and HECI2 to bit14.
+ * The reason for this is to allow growth for more interfaces in the future.
+ */
+#define GSC_IRQ_INTF(_x)  BIT(15 - (_x))
+
+/**
+ * struct xe_heci_gsc - graphics security controller for xe, HECI interface
+ *
+ * @adev : pointer to mei auxiliary device structure
+ * @irq : irq number
+ *
+ */
+struct xe_heci_gsc {
+       struct mei_aux_device *adev;
+       int irq;
+};
+
+void xe_heci_gsc_init(struct xe_device *xe);
+void xe_heci_gsc_fini(struct xe_device *xe);
+void xe_heci_gsc_irq_handler(struct xe_device *xe, u32 iir);
+
+#endif /* __XE_HECI_GSC_DEV_H__ */
index 4cc5f7086b4ceae6c334c3317563a326f49fe2c4..5631e5e1ea206b5220e0715b40c9fd949ddebff7 100644 (file)
@@ -141,6 +141,7 @@ void xe_irq_enable_hwe(struct xe_gt *gt)
        struct xe_device *xe = gt_to_xe(gt);
        u32 ccs_mask, bcs_mask;
        u32 irqs, dmask, smask;
+       u32 gsc_mask = 0;
 
        if (xe_device_uc_enabled(xe)) {
                irqs = GT_RENDER_USER_INTERRUPT |
@@ -190,9 +191,13 @@ void xe_irq_enable_hwe(struct xe_gt *gt)
                xe_mmio_write32(gt, VCS2_VCS3_INTR_MASK, ~dmask);
                xe_mmio_write32(gt, VECS0_VECS1_INTR_MASK, ~dmask);
 
-               if (xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_OTHER)) {
-                       xe_mmio_write32(gt, GUNIT_GSC_INTR_ENABLE, irqs);
-                       xe_mmio_write32(gt, GUNIT_GSC_INTR_MASK, ~irqs);
+               if (xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_OTHER))
+                       gsc_mask = irqs;
+               else if (HAS_HECI_GSCFI(xe))
+                       gsc_mask = GSC_IRQ_INTF(1);
+               if (gsc_mask) {
+                       xe_mmio_write32(gt, GUNIT_GSC_INTR_ENABLE, gsc_mask);
+                       xe_mmio_write32(gt, GUNIT_GSC_INTR_MASK, ~gsc_mask);
                }
        }
 }
@@ -306,7 +311,11 @@ static void gt_irq_handler(struct xe_tile *tile,
                        }
 
                        if (class == XE_ENGINE_CLASS_OTHER) {
-                               gt_other_irq_handler(engine_gt, instance, intr_vec);
+                               /* HECI GSCFI interrupts come from outside of GT */
+                               if (HAS_HECI_GSCFI(xe) && instance == OTHER_GSC_INSTANCE)
+                                       xe_heci_gsc_irq_handler(xe, intr_vec);
+                               else
+                                       gt_other_irq_handler(engine_gt, instance, intr_vec);
                                continue;
                        }
                }
@@ -480,8 +489,9 @@ static void gt_irq_reset(struct xe_tile *tile)
        if (ccs_mask & (BIT(2)|BIT(3)))
                xe_mmio_write32(mmio,  CCS2_CCS3_INTR_MASK, ~0);
 
-       if (tile->media_gt &&
-           xe_hw_engine_mask_per_class(tile->media_gt, XE_ENGINE_CLASS_OTHER)) {
+       if ((tile->media_gt &&
+            xe_hw_engine_mask_per_class(tile->media_gt, XE_ENGINE_CLASS_OTHER)) ||
+           HAS_HECI_GSCFI(tile_to_xe(tile))) {
                xe_mmio_write32(mmio, GUNIT_GSC_INTR_ENABLE, 0);
                xe_mmio_write32(mmio, GUNIT_GSC_INTR_MASK, ~0);
        }