tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/xe/mmio: Avoid double-adjust in 64-bit reads

xe_mmio_read64_2x32() was adjusting register addresses and then
calling xe_mmio_read32(), which applies the adjustment again.
This may shift accesses twice if adj_offset < adj_limit. There is
no issue currently, as for media gt, adj_offset > adj_limit, so
the 2nd adjust will be a no-op. But it may not work in future.

To fix it, replace the adjusted-address comparison with a direct
sanity check that ensures the MMIO address adjustment cutoff never
falls within the 8-byte range of a 64-bit register. And let
xe_mmio_read32() handle address translation.

v2: rewrite the sanity check in a more natural way. (Matt)
v3: Add Fixes tag. (Jani)

Fixes: 07431945d8ae ("drm/xe: Avoid 64-bit register reads")
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
Link: https://patch.msgid.link/20260130165621.471408-2-shuicheng.lin@intel.com
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
(cherry picked from commit a30f999681126b128a43137793ac84b6a5b7443f)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

authored by

Shuicheng Lin and committed by
Rodrigo Vivi 4a9b4e1f fbbe3261

+5 -5
+5 -5
drivers/gpu/drm/xe/xe_mmio.c
··· 256 256 struct xe_reg reg_udw = { .addr = reg.addr + 0x4 }; 257 257 u32 ldw, udw, oldudw, retries; 258 258 259 - reg.addr = xe_mmio_adjusted_addr(mmio, reg.addr); 260 - reg_udw.addr = xe_mmio_adjusted_addr(mmio, reg_udw.addr); 261 - 262 - /* we shouldn't adjust just one register address */ 263 - xe_tile_assert(mmio->tile, reg_udw.addr == reg.addr + 0x4); 259 + /* 260 + * The two dwords of a 64-bit register can never straddle the offset 261 + * adjustment cutoff. 262 + */ 263 + xe_tile_assert(mmio->tile, !in_range(mmio->adj_limit, reg.addr + 1, 7)); 264 264 265 265 oldudw = xe_mmio_read32(mmio, reg_udw); 266 266 for (retries = 5; retries; --retries) {