]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/xe/vsec: Support BMG devices
authorMichael J. Ruhl <michael.j.ruhl@intel.com>
Tue, 3 Dec 2024 15:36:39 +0000 (10:36 -0500)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 3 Dec 2024 20:02:55 +0000 (15:02 -0500)
The Battlemage (BMG) discrete graphics card supports the Platform,
Monitoring Technology (PMT) feature directly on the primary PCI device.

Utilize the PMT callback API to add support for the BMG devices.

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241203153639.2982162-1-michael.j.ruhl@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/xe/Makefile
drivers/gpu/drm/xe/regs/xe_pmt.h [new file with mode: 0644]
drivers/gpu/drm/xe/xe_device.c
drivers/gpu/drm/xe/xe_device_types.h
drivers/gpu/drm/xe/xe_vsec.c [new file with mode: 0644]
drivers/gpu/drm/xe/xe_vsec.h [new file with mode: 0644]

index a93e6fcc0ad9845425cd890c71ceb1261bf948dc..7730e0596299e2b93c355897a7b2314e2e3dc265 100644 (file)
@@ -111,6 +111,7 @@ xe-y += xe_bb.o \
        xe_vm.o \
        xe_vram.o \
        xe_vram_freq.o \
+       xe_vsec.o \
        xe_wait_user_fence.o \
        xe_wa.o \
        xe_wopcm.o
diff --git a/drivers/gpu/drm/xe/regs/xe_pmt.h b/drivers/gpu/drm/xe/regs/xe_pmt.h
new file mode 100644 (file)
index 0000000..f45abcd
--- /dev/null
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2024 Intel Corporation
+ */
+#ifndef _XE_PMT_H_
+#define _XE_PMT_H_
+
+#define SOC_BASE                       0x280000
+
+#define BMG_PMT_BASE_OFFSET            0xDB000
+#define BMG_DISCOVERY_OFFSET           (SOC_BASE + BMG_PMT_BASE_OFFSET)
+
+#define BMG_TELEMETRY_BASE_OFFSET      0xE0000
+#define BMG_TELEMETRY_OFFSET           (SOC_BASE + BMG_TELEMETRY_BASE_OFFSET)
+
+#define SG_REMAP_INDEX1                        XE_REG(SOC_BASE + 0x08)
+#define   SG_REMAP_BITS                        REG_GENMASK(31, 24)
+
+#endif
index 930bb2750e2e4443f8a031025736715ac13b99fd..d6fccea1e08307af7f2a9afdaa09ef3d4f337f75 100644 (file)
@@ -56,6 +56,7 @@
 #include "xe_ttm_sys_mgr.h"
 #include "xe_vm.h"
 #include "xe_vram.h"
+#include "xe_vsec.h"
 #include "xe_wait_user_fence.h"
 #include "xe_wa.h"
 
@@ -367,6 +368,10 @@ struct xe_device *xe_device_create(struct pci_dev *pdev,
                goto err;
        }
 
+       err = drmm_mutex_init(&xe->drm, &xe->pmt.lock);
+       if (err)
+               goto err;
+
        err = xe_display_create(xe);
        if (WARN_ON(err))
                goto err;
@@ -761,6 +766,8 @@ int xe_device_probe(struct xe_device *xe)
        for_each_gt(gt, xe, id)
                xe_gt_sanitize_freq(gt);
 
+       xe_vsec_init(xe);
+
        return devm_add_action_or_reset(xe->drm.dev, xe_device_sanitize, xe);
 
 err_fini_display:
index 6a04f975ec16a1a395b1c85d7e4cc8a2b457a4c5..1373a222f5a5ca41e27389264b3400f69393655a 100644 (file)
@@ -485,6 +485,12 @@ struct xe_device {
                struct mutex lock;
        } d3cold;
 
+       /** @pmt: Support the PMT driver callback interface */
+       struct {
+               /** @pmt.lock: protect access for telemetry data */
+               struct mutex lock;
+       } pmt;
+
        /**
         * @pm_callback_task: Track the active task that is running in either
         * the runtime_suspend or runtime_resume callbacks.
diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c
new file mode 100644 (file)
index 0000000..17ebc3f
--- /dev/null
@@ -0,0 +1,233 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright © 2024 Intel Corporation */
+#include <linux/bitfield.h>
+#include <linux/bits.h>
+#include <linux/cleanup.h>
+#include <linux/errno.h>
+#include <linux/intel_vsec.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/pci.h>
+#include <linux/types.h>
+
+#include "xe_device.h"
+#include "xe_device_types.h"
+#include "xe_drv.h"
+#include "xe_mmio.h"
+#include "xe_platform_types.h"
+#include "xe_pm.h"
+#include "xe_vsec.h"
+
+#include "regs/xe_pmt.h"
+
+/* PMT GUID value for BMG devices.  NOTE: this is NOT a PCI id */
+#define BMG_DEVICE_ID 0xE2F8
+
+static struct intel_vsec_header bmg_telemetry = {
+       .length = 0x10,
+       .id = VSEC_ID_TELEMETRY,
+       .num_entries = 2,
+       .entry_size = 4,
+       .tbir = 0,
+       .offset = BMG_DISCOVERY_OFFSET,
+};
+
+static struct intel_vsec_header bmg_punit_crashlog = {
+       .length = 0x10,
+       .id = VSEC_ID_CRASHLOG,
+       .num_entries = 1,
+       .entry_size = 4,
+       .tbir = 0,
+       .offset = BMG_DISCOVERY_OFFSET + 0x60,
+};
+
+static struct intel_vsec_header bmg_oobmsm_crashlog = {
+       .length = 0x10,
+       .id = VSEC_ID_CRASHLOG,
+       .num_entries = 1,
+       .entry_size = 4,
+       .tbir = 0,
+       .offset = BMG_DISCOVERY_OFFSET + 0x78,
+};
+
+static struct intel_vsec_header *bmg_capabilities[] = {
+       &bmg_telemetry,
+       &bmg_punit_crashlog,
+       &bmg_oobmsm_crashlog,
+       NULL
+};
+
+enum xe_vsec {
+       XE_VSEC_UNKNOWN = 0,
+       XE_VSEC_BMG,
+};
+
+static struct intel_vsec_platform_info xe_vsec_info[] = {
+       [XE_VSEC_BMG] = {
+               .caps = VSEC_CAP_TELEMETRY | VSEC_CAP_CRASHLOG,
+               .headers = bmg_capabilities,
+       },
+       { }
+};
+
+/*
+ * The GUID will have the following bits to decode:
+ *   [0:3]   - {Telemetry space iteration number (0,1,..)}
+ *   [4:7]   - Segment (SEGMENT_INDEPENDENT-0, Client-1, Server-2)
+ *   [8:11]  - SOC_SKU
+ *   [12:27] – Device ID – changes for each down bin SKU’s
+ *   [28:29] - Capability Type (Crashlog-0, Telemetry Aggregator-1, Watcher-2)
+ *   [30:31] - Record-ID (0-PUNIT, 1-OOBMSM_0, 2-OOBMSM_1)
+ */
+#define GUID_TELEM_ITERATION   GENMASK(3, 0)
+#define GUID_SEGMENT           GENMASK(7, 4)
+#define GUID_SOC_SKU           GENMASK(11, 8)
+#define GUID_DEVICE_ID         GENMASK(27, 12)
+#define GUID_CAP_TYPE          GENMASK(29, 28)
+#define GUID_RECORD_ID         GENMASK(31, 30)
+
+#define PUNIT_TELEMETRY_OFFSET         0x0200
+#define PUNIT_WATCHER_OFFSET           0x14A0
+#define OOBMSM_0_WATCHER_OFFSET                0x18D8
+#define OOBMSM_1_TELEMETRY_OFFSET      0x1000
+
+enum record_id {
+       PUNIT,
+       OOBMSM_0,
+       OOBMSM_1,
+};
+
+enum capability {
+       CRASHLOG,
+       TELEMETRY,
+       WATCHER,
+};
+
+static int xe_guid_decode(u32 guid, int *index, u32 *offset)
+{
+       u32 record_id = FIELD_GET(GUID_RECORD_ID, guid);
+       u32 cap_type  = FIELD_GET(GUID_CAP_TYPE, guid);
+       u32 device_id = FIELD_GET(GUID_DEVICE_ID, guid);
+
+       if (device_id != BMG_DEVICE_ID)
+               return -ENODEV;
+
+       if (cap_type > WATCHER)
+               return -EINVAL;
+
+       *offset = 0;
+
+       if (cap_type == CRASHLOG) {
+               *index = record_id == PUNIT ? 2 : 4;
+               return 0;
+       }
+
+       switch (record_id) {
+       case PUNIT:
+               *index = 0;
+               if (cap_type == TELEMETRY)
+                       *offset = PUNIT_TELEMETRY_OFFSET;
+               else
+                       *offset = PUNIT_WATCHER_OFFSET;
+               break;
+
+       case OOBMSM_0:
+               *index = 1;
+               if (cap_type == WATCHER)
+                       *offset = OOBMSM_0_WATCHER_OFFSET;
+               break;
+
+       case OOBMSM_1:
+               *index = 1;
+               if (cap_type == TELEMETRY)
+                       *offset = OOBMSM_1_TELEMETRY_OFFSET;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int xe_pmt_telem_read(struct pci_dev *pdev, u32 guid, u64 *data, loff_t user_offset,
+                            u32 count)
+{
+       struct xe_device *xe = pdev_to_xe_device(pdev);
+       void __iomem *telem_addr = xe->mmio.regs + BMG_TELEMETRY_OFFSET;
+       u32 mem_region;
+       u32 offset;
+       int ret;
+
+       ret = xe_guid_decode(guid, &mem_region, &offset);
+       if (ret)
+               return ret;
+
+       telem_addr += offset + user_offset;
+
+       guard(mutex)(&xe->pmt.lock);
+
+       /* indicate that we are not at an appropriate power level */
+       if (!xe_pm_runtime_get_if_active(xe))
+               return -ENODATA;
+
+       /* set SoC re-mapper index register based on GUID memory region */
+       xe_mmio_rmw32(xe_root_tile_mmio(xe), SG_REMAP_INDEX1, SG_REMAP_BITS,
+                     REG_FIELD_PREP(SG_REMAP_BITS, mem_region));
+
+       memcpy_fromio(data, telem_addr, count);
+       xe_pm_runtime_put(xe);
+
+       return count;
+}
+
+struct pmt_callbacks xe_pmt_cb = {
+       .read_telem = xe_pmt_telem_read,
+};
+
+static const int vsec_platforms[] = {
+       [XE_BATTLEMAGE] = XE_VSEC_BMG,
+};
+
+static enum xe_vsec get_platform_info(struct xe_device *xe)
+{
+       if (xe->info.platform > XE_BATTLEMAGE)
+               return XE_VSEC_UNKNOWN;
+
+       return vsec_platforms[xe->info.platform];
+}
+
+/**
+ * xe_vsec_init - Initialize resources and add intel_vsec auxiliary
+ * interface
+ * @xe: valid xe instance
+ */
+void xe_vsec_init(struct xe_device *xe)
+{
+       struct intel_vsec_platform_info *info;
+       struct device *dev = xe->drm.dev;
+       struct pci_dev *pdev = to_pci_dev(dev);
+       enum xe_vsec platform;
+
+       platform = get_platform_info(xe);
+       if (platform == XE_VSEC_UNKNOWN)
+               return;
+
+       info = &xe_vsec_info[platform];
+       if (!info->headers)
+               return;
+
+       switch (platform) {
+       case XE_VSEC_BMG:
+               info->priv_data = &xe_pmt_cb;
+               break;
+       default:
+               break;
+       }
+
+       /*
+        * Register a VSEC. Cleanup is handled using device managed
+        * resources.
+        */
+       intel_vsec_register(pdev, info);
+}
+MODULE_IMPORT_NS(INTEL_VSEC);
diff --git a/drivers/gpu/drm/xe/xe_vsec.h b/drivers/gpu/drm/xe/xe_vsec.h
new file mode 100644 (file)
index 0000000..5777c53
--- /dev/null
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright © 2024 Intel Corporation */
+
+#ifndef _XE_VSEC_H_
+#define _XE_VSEC_H_
+
+struct xe_device;
+
+void xe_vsec_init(struct xe_device *xe);
+
+#endif