drm/xe/vsec: Support BMG devices
Subsystems (3)
PATCH v10 1/1 drm/xe/vsec: Support BMG devices
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.
--- drivers/gpu/drm/xe/Makefile | 1 + drivers/gpu/drm/xe/xe_device.c | 5 + drivers/gpu/drm/xe/xe_device_types.h | 6 + drivers/gpu/drm/xe/xe_vsec.c | 221 +++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_vsec.h | 13 ++ 5 files changed, 246 insertions(+) create mode 100644 drivers/gpu/drm/xe/xe_vsec.c create mode 100644 drivers/gpu/drm/xe/xe_vsec.h
drivers/gpu/drm/xe/Makefile +1 -0
@@ -129,6 +129,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
drivers/gpu/drm/xe/xe_device.c +5 -0
@@ -53,6 +53,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" static int xe_file_open (struct drm_device *dev,struct drm_file *file)
@@ -317,6 +318,8 @@ struct xe_device *xe_device_create(struct pci_dev *pdev, goto err; } +drmm_mutex_init (&xe->drm, &xe->pmt.lock); + err =xe_display_create (xe);if (WARN_ON (err)) goto err;
@@ -692,6 +695,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:
drivers/gpu/drm/xe/xe_device_types.h +6 -0
@@ -451,6 +451,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.
drivers/gpu/drm/xe/xe_vsec.c new file +221 -0
221 lines not on this page · raw message
drivers/gpu/drm/xe/xe_vsec.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright © 2022 - 2024 Intel Corporation +*/ + +#ifndef _XE_VSEC_H_ +#define _XE_VSEC_H_ + +struct xe_device ; + +void xe_vsec_init (struct xe_device *xe); + +#endif
Signature · 1 line
2.44.0
Patchwork
CI✗ CI.Patch_applied: failure for drm/xe/vsec: Support BMG devices
== Series Details ==
== Series Details ==
Series: drm/xe/vsec: Support BMG devices
URL : https://patchwork.freedesktop.org/series/137199/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 4f95bd933f4d drm-tip: 2024y-08m-12d-17h-20m-47s UTC integration manifest === git am output follows ===
error: patch failed: drivers/gpu/drm/xe/xe_device.c:53
error: drivers/gpu/drm/xe/xe_device.c: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Applying: drm/xe/vsec: Support BMG devices
Patch failed at 0001 drm/xe/vsec: Support BMG devices
Hmm,
This is what the commit message looked like when I sent it:
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.
Not sure why it ended up here without the <cr>s?
M
Quoted 330 lines
-----Original Message-----
From: Ruhl, Michael J <[email protected]>
Sent: Monday, August 12, 2024 2:09 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; Brost, Matthew <[email protected]>; [email protected]; [email protected]
Cc: Ruhl, Michael J <[email protected]>; Vivi, Rodrigo <[email protected]>
Subject: [PATCH v10] drm/xe/vsec: Support BMG devicesThe 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 <[email protected]>Reviewed-by Rodrigo Vivi <[email protected]>Signed-off-by Michael J. Ruhl <[email protected]>--- drivers/gpu/drm/xe/Makefile | 1 + drivers/gpu/drm/xe/xe_device.c | 5 + drivers/gpu/drm/xe/xe_device_types.h | 6 + drivers/gpu/drm/xe/xe_vsec.c | 221 +++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_vsec.h | 13 ++ 5 files changed, 246 insertions(+) create mode 100644 drivers/gpu/drm/xe/xe_vsec.c create mode 100644
drivers/gpu/drm/xe/xe_vsec.hdrivers/gpu/drm/xe/Makefile index renamed from drivers/gpu/drm/xe/Makefile +0
-0
628c245c4822..f4c6761dc2e7100644drivers/gpu/drm/xe/Makefile +1
-0@@ -129,6 +129,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.odrivers/gpu/drm/xe/xe_device.c +1
-0@@ -53,6 +53,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" static int xe_file_open(struct drm_device *dev, struct drm_file *file) @@ -317,6 +318,8 @@ struct
xe_device*xe_device_create(structpci_dev*pdev,drivers/gpu/drm/xe/xe_device.c +4
-0goto err; } +drmm_mutex_init (&xe->drm, &xe->pmt.lock); + err =xe_display_create (xe);if (WARN_ON (err)) goto err;@@ -692,6 +695,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:drivers/gpu/drm/xe/xe_device_types.h +6
-0@@ -451,6 +451,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. drivers/gpu/drm/xe/xe_vsec.c new file +138
-0@@ -0,0 +1,221 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright © 2022 - 2024 Intel Corporation */ #include +<linux/bitfield.h> #include <linux/bits.h> #include +<linux/intel_vsec.h> #include <linux/module.h> #include <linux/mutex.h> +#include <linux/pci.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" + +#define SOC_BASE 0x280000 + +#define BMG_PMT_BASE 0xDB000 +#define BMG_DISCOVERY_OFFSET (SOC_BASE + BMG_PMT_BASE) + +#define BMG_TELEMETRY_BASE 0xE0000 +#define BMG_TELEMETRY_OFFSET (SOC_BASE + BMG_TELEMETRY_BASE) + +#define BMG_DEVICE_ID 0xE2F8 + +#define GFX_BAR 0 + +#define SG_REMAP_INDEX1 XE_REG(SOC_BASE + 0x08) +#define SG_REMAP_BITS GENMASK(31, 24) + +static struct intel_vsec_header bmg_telemetry = { + .length =0x10 , + .id =VSEC_ID_TELEMETRY , + .num_entries =2 , + .entry_size =4 , + .tbir =GFX_BAR , + .offset =BMG_DISCOVERY_OFFSET , +}; + +static struct intel_vsec_header *bmg_capabilities[] = { + &bmg_telemetry, +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 , + .headers = bmg_capabilities, + }, + { } +}; + +/* +* The GUID will have the following bits to decode: +* +* X(4bits) - {Telemetry space iteration number (0,1,..)} +* X(4bits) - Segment (SEGMENT_INDEPENDENT-0, Client-1, Server-2) +* X(4bits) - SOC_SKU +* XXXX(16bits)– Device ID – changes for each down bin SKU’s +* X(2bits) - Capability Type (Crashlog-0, Telemetry Aggregator-1, +Watcher-2) +* X(2bits) - 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 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 (record_id >OOBMSM_1 || 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 ; + } + +return 0 ; +} + +static int xe_pmt_telem_read (struct pci_dev *pdev,u32 guid,u64 *data, +u32 count) { +struct xe_device *xe =pdev_to_xe_device (pdev); + void __iomem *telem_addr = xe->mmio.regs +
BMG_TELEMETRY_OFFSET;drivers/gpu/drm/xe/xe_vsec.c new file +18
-0+u32 mem_region; +u32 offset; +int ret; + + ret =guid_decode (guid, &mem_region, &offset); +if (ret) +return ret; + + telem_addr += 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->tiles[0].primary_gt, SG_REMAP_INDEX1,
SG_REMAP_BITS,drivers/gpu/drm/xe/xe_vsec.c new file +58
-0+ FIELD_PREP(SG_REMAP_BITS, mem_region)); + +memcpy_fromio (data, telem_addr, count); + ret = count; +xe_pm_runtime_put (xe); + +return ret; +} + +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 );drivers/gpu/drm/xe/xe_vsec.h new file +12
-1@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright © 2022 - 2024 Intel Corporation */ + +#ifndef _XE_VSEC_H_ +#define _XE_VSEC_H_ + +struct xe_device ; + +void xe_vsec_init (struct xe_device *xe); + +#endif --2.44.0
Quoted 4 lines · Michael J
Hmm,
This is what the commit message looked like when I sent it:
Quoted 8 lines
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.
Not sure why it ended up here without the <cr>s?
Most likely MS Office happened in between and mangled the message.
Signature · 2 lines
With Best Regards, Andy Shevchenko