From: Alex Deucher <alexander.deucher@amd.com>
To: <amd-gfx@lists.freedesktop.org>
Cc: Hawking Zhang <Hawking.Zhang@amd.com>, Le Ma <le.ma@amd.com>,
Alex Deucher <alexander.deucher@amd.com>
Subject: [PATCH 2/4] drm/amdgpu: Add smuio v14_0_3 support v4
Date: Wed, 29 Oct 2025 13:53:51 -0400 [thread overview]
Message-ID: <20251029175353.2861924-2-alexander.deucher@amd.com> (raw)
In-Reply-To: <20251029175353.2861924-1-alexander.deucher@amd.com>
From: Hawking Zhang <Hawking.Zhang@amd.com>
v14_0_3 is a new generation smuio ip block
v2: Add smuio callbacks for interface id
v3: Add smuio callback to identify custom hbm
v4: comment out unused functions (Alex)
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Le Ma <le.ma@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 3 +
drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.c | 193 +++++++++++++++++++++
drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.h | 30 ++++
4 files changed, 228 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.h
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
index ebe08947c5a32..b408a981f4b03 100644
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -244,7 +244,8 @@ amdgpu-y += \
smuio_v13_0.o \
smuio_v13_0_3.o \
smuio_v13_0_6.o \
- smuio_v14_0_2.o
+ smuio_v14_0_2.o \
+ smuio_v14_0_3.o
# add reset block
amdgpu-y += \
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h
index ec9d12f85f39f..124b13a68f3f3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h
@@ -27,6 +27,7 @@ enum amdgpu_pkg_type {
AMDGPU_PKG_TYPE_APU = 2,
AMDGPU_PKG_TYPE_CEM = 3,
AMDGPU_PKG_TYPE_OAM = 4,
+ AMDGPU_PKG_TYPE_BB = 5,
AMDGPU_PKG_TYPE_UNKNOWN,
};
@@ -44,6 +45,8 @@ struct amdgpu_smuio_funcs {
u32 (*get_socket_id)(struct amdgpu_device *adev);
enum amdgpu_pkg_type (*get_pkg_type)(struct amdgpu_device *adev);
bool (*is_host_gpu_xgmi_supported)(struct amdgpu_device *adev);
+ bool (*is_connected_with_ethernet_switch)(struct amdgpu_device *adev);
+ bool (*is_custom_hbm_supported)(struct amdgpu_device *adev);
u64 (*get_gpu_clock_counter)(struct amdgpu_device *adev);
};
diff --git a/drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.c b/drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.c
new file mode 100644
index 0000000000000..804b7458b0661
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.c
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2025 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#include "amdgpu.h"
+#include "smuio_v14_0_3.h"
+#include "smuio/smuio_14_0_3_offset.h"
+#include "smuio/smuio_14_0_3_sh_mask.h"
+
+#define SMUIO_MCM_CONFIG__HOST_GPU_XGMI_MASK 0x00000001L
+#define SMUIO_MCM_CONFIG__ETHERNET_SWITCH_MASK 0x00000008L
+#define SMUIO_MCM_CONFIG__CUSTOM_HBM_MASK 0x00000001L
+
+static u32 smuio_v14_0_3_get_rom_index_offset(struct amdgpu_device *adev)
+{
+ return SOC15_REG_OFFSET(SMUIO, 0, regROM_INDEX);
+}
+
+static u32 smuio_v14_0_3_get_rom_data_offset(struct amdgpu_device *adev)
+{
+ return SOC15_REG_OFFSET(SMUIO, 0, regROM_DATA);
+}
+
+static void smuio_v14_0_3_update_rom_clock_gating(struct amdgpu_device *adev, bool enable)
+{
+ return;
+}
+
+static void smuio_v14_0_3_get_clock_gating_state(struct amdgpu_device *adev, u64 *flags)
+{
+ u32 data;
+
+ /* CGTT_ROM_CLK_CTRL0 is not available for APU */
+ if (adev->flags & AMD_IS_APU)
+ return;
+
+ data = RREG32_SOC15(SMUIO, 0, regCGTT_ROM_CLK_CTRL0);
+ if (!(data & CGTT_ROM_CLK_CTRL0__SOFT_OVERRIDE0_MASK))
+ *flags |= AMD_CG_SUPPORT_ROM_MGCG;
+}
+
+/**
+ * smuio_v14_0_3_get_die_id - query die id from FCH.
+ *
+ * @adev: amdgpu device pointer
+ *
+ * Returns die id
+ */
+static u32 smuio_v14_0_3_get_die_id(struct amdgpu_device *adev)
+{
+ u32 data, die_id;
+
+ data = RREG32_SOC15(SMUIO, 0, regSMUIO_MCM_CONFIG);
+ die_id = REG_GET_FIELD(data, SMUIO_MCM_CONFIG, DIE_ID);
+
+ return die_id;
+}
+
+/**
+ * smuio_v14_0_3_get_socket_id - query socket id from FCH
+ *
+ * @adev: amdgpu device pointer
+ *
+ * Returns socket id
+ */
+static u32 smuio_v14_0_3_get_socket_id(struct amdgpu_device *adev)
+{
+ u32 data, socket_id;
+
+ data = RREG32_SOC15(SMUIO, 0, regSMUIO_MCM_CONFIG);
+ socket_id = REG_GET_FIELD(data, SMUIO_MCM_CONFIG, SOCKET_ID);
+
+ return socket_id;
+}
+
+/**
+ * smuio_v14_0_3_is_host_gpu_xgmi_supported - detect xgmi interface between cpu and gpu/s.
+ *
+ * @adev: amdgpu device pointer
+ *
+ * Returns true on success or false otherwise.
+ */
+static bool smuio_v14_0_3_is_host_gpu_xgmi_supported(struct amdgpu_device *adev)
+{
+ u32 data;
+
+ data = RREG32_SOC15(SMUIO, 0, regSMUIO_MCM_CONFIG);
+ data = REG_GET_FIELD(data, SMUIO_MCM_CONFIG, TOPOLOGY_ID);
+ /* data[4:0]
+ * bit 0 == 0 host-gpu interface is PCIE
+ * bit 0 == 1 host-gpu interface is Alternate Protocal
+ * for AMD, this is XGMI
+ */
+ data &= SMUIO_MCM_CONFIG__HOST_GPU_XGMI_MASK;
+
+ return data ? true : false;
+}
+
+#if 0
+/*
+ * smuio_v14_0_3_is_connected_with_ethernet_switch - detect systems connected with ethernet switch
+ *
+ * @adev: amdgpu device pointer
+ *
+ * Returns true on success or false otherwise.
+ */
+static bool smuio_v14_0_3_is_connected_with_ethernet_switch(struct amdgpu_device *adev)
+{
+ u32 data;
+
+ if (!(adev->flags & AMD_IS_APU))
+ return false;
+
+ data = RREG32_SOC15(SMUIO, 0, regSMUIO_MCM_CONFIG);
+ data = REG_GET_FIELD(data, SMUIO_MCM_CONFIG, TOPOLOGY_ID);
+ /* data[4:0]
+ * bit 3 == 0 systems connected with ethernet switch
+ */
+ data &= SMUIO_MCM_CONFIG__ETHERNET_SWITCH_MASK;
+
+ return data ? false : true;
+}
+#endif
+
+static enum amdgpu_pkg_type smuio_v14_0_3_get_pkg_type(struct amdgpu_device *adev)
+{
+ enum amdgpu_pkg_type pkg_type;
+ u32 data;
+
+ data = RREG32_SOC15(SMUIO, 0, regSMUIO_MCM_CONFIG);
+ data = REG_GET_FIELD(data, SMUIO_MCM_CONFIG, PKG_TYPE);
+
+ /* data [3:0]
+ bit 2 and bit 3 identifies the pkg type */
+ switch (data & 0xC) {
+ case 0x0:
+ pkg_type = AMDGPU_PKG_TYPE_BB;
+ break;
+ case 0x8:
+ pkg_type = AMDGPU_PKG_TYPE_CEM;
+ break;
+ default:
+ pkg_type = AMDGPU_PKG_TYPE_UNKNOWN;
+ break;
+ }
+
+ return pkg_type;
+}
+
+#if 0
+static bool smuio_v14_0_3_is_custom_hbm_supported(struct amdgpu_device *adev)
+{
+ u32 data;
+
+ data = RREG32_SOC15(SMUIO, 0, regSMUIO_MCM_CONFIG);
+ data = REG_GET_FIELD(data, SMUIO_MCM_CONFIG, PKG_TYPE);
+
+ /* data [3:0]
+ * bit 0 identifies custom HBM module */
+ data &= SMUIO_MCM_CONFIG__CUSTOM_HBM_MASK;
+
+ return data ? true : false;
+}
+#endif
+
+const struct amdgpu_smuio_funcs smuio_v14_0_3_funcs = {
+ .get_rom_index_offset = smuio_v14_0_3_get_rom_index_offset,
+ .get_rom_data_offset = smuio_v14_0_3_get_rom_data_offset,
+ .get_die_id = smuio_v14_0_3_get_die_id,
+ .get_socket_id = smuio_v14_0_3_get_socket_id,
+ .is_host_gpu_xgmi_supported = smuio_v14_0_3_is_host_gpu_xgmi_supported,
+ .update_rom_clock_gating = smuio_v14_0_3_update_rom_clock_gating,
+ .get_clock_gating_state = smuio_v14_0_3_get_clock_gating_state,
+ .get_pkg_type = smuio_v14_0_3_get_pkg_type,
+};
diff --git a/drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.h b/drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.h
new file mode 100644
index 0000000000000..7387f8d4a61db
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2025 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#ifndef __SMUIO_V14_0_3_H__
+#define __SMUIO_V14_0_3_H__
+
+#include "soc15_common.h"
+
+extern const struct amdgpu_smuio_funcs smuio_v14_0_3_funcs;
+
+#endif /* __SMUIO_V14_0_3_H__ */
--
2.51.0
next prev parent reply other threads:[~2025-10-29 17:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-29 17:53 [PATCH 1/4] drm/amdgpu: Add smuio v14_0_3 ip headers v3 Alex Deucher
2025-10-29 17:53 ` Alex Deucher [this message]
2025-10-29 17:53 ` [PATCH 3/4] drm/amdgpu: add get_gpu_clock_counter to smuio v14_0_3 Alex Deucher
2025-10-29 17:53 ` [PATCH 4/4] drm/amdgpu: add support for " Alex Deucher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251029175353.2861924-2-alexander.deucher@amd.com \
--to=alexander.deucher@amd.com \
--cc=Hawking.Zhang@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=le.ma@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox