From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org, Jani Nikula <jani.nikula@intel.com>
Subject: [PATCH v2 04/12] drm/i915/mchbar: WARN when accessing non-MCHBAR registers via intel_mchbar_read*()
Date: Tue, 31 Mar 2026 18:42:51 +0300 [thread overview]
Message-ID: <20260331154259.24600-5-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20260331154259.24600-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
The intel_mchbar_read*() functions should only be used for
accessing MCHBAR registers. Warn if someone tries to use
them for other registers.
I suppose we could even have a dedicated type for MCHBAR
registers. But that is true for many other special register
types as well, and so far we haven't bothered adding any
special types apart from i915_mcr_reg_t.
v2: Print the register offset (Jani)
Mention i915_mcr_reg_t (Jani)
Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_mchbar.c | 56 +++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_mchbar.c b/drivers/gpu/drm/i915/display/intel_mchbar.c
index 2636fe60ef37..a404fa38c9bd 100644
--- a/drivers/gpu/drm/i915/display/intel_mchbar.c
+++ b/drivers/gpu/drm/i915/display/intel_mchbar.c
@@ -3,14 +3,66 @@
* Copyright © 2026 Intel Corporation
*/
+#include <linux/minmax.h>
+
+#include <drm/drm_print.h>
+
#include "intel_display_core.h"
#include "intel_mchbar.h"
+#include "intel_mchbar_regs.h"
#include "intel_uncore.h"
+static bool has_mchbar_mirror(struct intel_display *display)
+{
+ return DISPLAY_VER(display) < 14;
+}
+
+static u32 mchbar_mirror_base(struct intel_display *display)
+{
+ if (DISPLAY_VER(display) >= 6)
+ return MCHBAR_MIRROR_BASE_SNB;
+ else
+ return MCHBAR_MIRROR_BASE;
+}
+
+static u32 mchbar_mirror_end(struct intel_display *display)
+{
+ if (DISPLAY_VER(display) >= 12 && !display->platform.rocketlake)
+ return MCHBAR_MIRROR_END_TGL;
+ else if (DISPLAY_VER(display) >= 11)
+ return MCHBAR_MIRROR_END_ICL_RKL;
+ else if (DISPLAY_VER(display) >= 6)
+ return MCHBAR_MIRROR_END_SNB;
+ else
+ return MCHBAR_MIRROR_END;
+}
+
+static u32 mchbar_mirror_len(struct intel_display *display)
+{
+ return mchbar_mirror_end(display) - mchbar_mirror_base(display) + 1;
+}
+
+static bool is_mchbar_reg(struct intel_display *display, i915_reg_t reg)
+{
+ return has_mchbar_mirror(display) &&
+ in_range32(i915_mmio_reg_offset(reg),
+ mchbar_mirror_base(display),
+ mchbar_mirror_len(display));
+}
+
+static void assert_is_mchbar_reg(struct intel_display *display, i915_reg_t reg)
+{
+ drm_WARN(display->drm, !is_mchbar_reg(display, reg),
+ "Reading non-MCHBAR register 0x%x\n",
+ i915_mmio_reg_offset(reg));
+}
+
u16 intel_mchbar_read16(struct intel_display *display, i915_reg_t reg)
{
struct intel_uncore *uncore = to_intel_uncore(display->drm);
+ assert_is_mchbar_reg(display, reg);
+
return intel_uncore_read16(uncore, reg);
}
@@ -18,6 +70,8 @@ u32 intel_mchbar_read(struct intel_display *display, i915_reg_t reg)
{
struct intel_uncore *uncore = to_intel_uncore(display->drm);
+ assert_is_mchbar_reg(display, reg);
+
return intel_uncore_read(uncore, reg);
}
@@ -26,5 +80,7 @@ u64 intel_mchbar_read64_2x32(struct intel_display *display, i915_reg_t reg)
struct intel_uncore *uncore = to_intel_uncore(display->drm);
i915_reg_t upper_reg = _MMIO(i915_mmio_reg_offset(reg) + 4);
+ assert_is_mchbar_reg(display, reg);
+
return intel_uncore_read64_2x32(uncore, reg, upper_reg);
}
--
2.52.0
next prev parent reply other threads:[~2026-03-31 15:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-31 15:42 [PATCH v2 00/12] drm/i915: More uncore nukage from display code Ville Syrjala
2026-03-31 15:42 ` [PATCH v2 01/12] drm/i915/qgv: Use intel_de_read() for MTL_MEM_SS_INFO* reads Ville Syrjala
2026-03-31 15:42 ` [PATCH v2 02/12] drm/i915/mchbar: Provide intel_mchbar_read*() abstraction Ville Syrjala
2026-03-31 15:42 ` [PATCH v2 03/12] drm/i915/mchbar: Define the end of the MCHBAR mirror Ville Syrjala
2026-03-31 15:42 ` Ville Syrjala [this message]
2026-03-31 15:42 ` [PATCH v2 05/12] drm/i915/mchbar: Use intel_mchbar_read() instead of intel_de_read() Ville Syrjala
2026-03-31 15:42 ` [PATCH v2 06/12] drm/i915/mchbar: Use intel_mchbar_read*() instead of intel_uncore_read*() Ville Syrjala
2026-03-31 15:42 ` [PATCH v2 07/12] drm/i915/de: Add intel_de_read16() Ville Syrjala
2026-03-31 15:42 ` [PATCH v2 08/12] drm/i915/de: s/intel_de_read64_2x32()/intel_de_read64_2x32_volatile()/ Ville Syrjala
2026-03-31 15:42 ` [PATCH v2 09/12] drm/i915/de: Add a simple intel_de_read64_2x32() Ville Syrjala
2026-03-31 15:42 ` [PATCH v2 10/12] drm/i915/vrr: Use intel_de_read64_2x32() Ville Syrjala
2026-03-31 15:42 ` [PATCH v2 11/12] drm/i915/mchbar: Use intel_de_read*() for MCHBAR register accesses Ville Syrjala
2026-03-31 15:42 ` [PATCH v2 12/12] drm/i915/rom: Use intel_de for SPI ROM register access Ville Syrjala
2026-03-31 16:41 ` ✗ CI.checkpatch: warning for drm/i915: More uncore nukage from display code (rev3) Patchwork
2026-03-31 16:42 ` ✓ CI.KUnit: success " Patchwork
2026-03-31 17:16 ` ✓ Xe.CI.BAT: " Patchwork
2026-03-31 22:36 ` ✓ Xe.CI.FULL: " Patchwork
2026-04-01 13:16 ` [PATCH v2 00/12] drm/i915: More uncore nukage from display code Jani Nikula
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=20260331154259.24600-5-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.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