drm/i915/mchbar: move intel_mchbar_regs.h under include/drm/intel
authorJani Nikula <jani.nikula@intel.com>
Tue, 7 Apr 2026 19:36:28 +0000 (22:36 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 8 Apr 2026 09:29:59 +0000 (12:29 +0300)
Since the mchbar registers are used from both i915 display and core,
move intel_mchbar_regs.h to include/drm/intel/mchbar_regs.h. Drop the
intel_ prefix from the name to reduce tautology.

With this, we can drop the corresponding xe display compat header.

v2: Rebase

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/6c951b2c05db74ea517d52a3912986f7eb886422.1775590536.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
14 files changed:
drivers/gpu/drm/i915/display/intel_mchbar.h
drivers/gpu/drm/i915/gem/i915_gem_stolen.c
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
drivers/gpu/drm/i915/gt/intel_llc.c
drivers/gpu/drm/i915/gt/intel_reset.c
drivers/gpu/drm/i915/gt/intel_rps.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_freq.c
drivers/gpu/drm/i915/i915_hwmon.c
drivers/gpu/drm/i915/intel_clock_gating.c
drivers/gpu/drm/i915/intel_gvt_mmio_table.c
drivers/gpu/drm/i915/intel_mchbar_regs.h [deleted file]
drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h [deleted file]
include/drm/intel/mchbar_regs.h [new file with mode: 0644]

index 51ecd60..fb645c6 100644 (file)
@@ -8,8 +8,9 @@
 
 #include <linux/types.h>
 
+#include <drm/intel/mchbar_regs.h>
+
 #include "i915_reg_defs.h"
-#include "intel_mchbar_regs.h"
 
 struct intel_display;
 
index 77f8535..5838fb3 100644 (file)
@@ -10,6 +10,7 @@
 #include <drm/drm_print.h>
 #include <drm/intel/display_parent_interface.h>
 #include <drm/intel/i915_drm.h>
+#include <drm/intel/mchbar_regs.h>
 
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_region.h"
@@ -23,7 +24,6 @@
 #include "i915_reg.h"
 #include "i915_utils.h"
 #include "i915_vgpu.h"
-#include "intel_mchbar_regs.h"
 #include "intel_pci_config.h"
 
 struct intel_stolen_node {
index ac9aede..6efc1ed 100644 (file)
@@ -7,6 +7,7 @@
 
 #include <drm/drm_print.h>
 #include <drm/intel/intel_gmd_misc_regs.h>
+#include <drm/intel/mchbar_regs.h>
 
 #include "display/intel_display.h"
 #include "i915_drv.h"
@@ -15,7 +16,6 @@
 #include "i915_pvinfo.h"
 #include "i915_vgpu.h"
 #include "intel_gt_regs.h"
-#include "intel_mchbar_regs.h"
 
 /**
  * DOC: fence register handling
index bcd707e..82d9a8e 100644 (file)
@@ -7,12 +7,12 @@
 #include <linux/cpufreq.h>
 
 #include <drm/intel/intel_pcode_regs.h>
+#include <drm/intel/mchbar_regs.h>
 
 #include "i915_drv.h"
 #include "i915_reg.h"
 #include "intel_gt.h"
 #include "intel_llc.h"
-#include "intel_mchbar_regs.h"
 #include "intel_pcode.h"
 #include "intel_rps.h"
 
index 984d005..4d0ea95 100644 (file)
@@ -7,6 +7,8 @@
 #include <linux/stop_machine.h>
 #include <linux/string_helpers.h>
 
+#include <drm/intel/mchbar_regs.h>
+
 #include "display/intel_display_reset.h"
 #include "display/intel_overlay.h"
 #include "gem/i915_gem_context.h"
@@ -27,7 +29,6 @@
 #include "intel_gt_pm.h"
 #include "intel_gt_print.h"
 #include "intel_gt_requests.h"
-#include "intel_mchbar_regs.h"
 #include "intel_pci_config.h"
 #include "intel_reset.h"
 
index 844f271..a33b19c 100644 (file)
@@ -5,9 +5,10 @@
 
 #include <linux/string_helpers.h>
 
-#include <drm/intel/i915_drm.h>
 #include <drm/intel/display_parent_interface.h>
+#include <drm/intel/i915_drm.h>
 #include <drm/intel/intel_pcode_regs.h>
+#include <drm/intel/mchbar_regs.h>
 
 #include "display/intel_display_rps.h"
 #include "display/vlv_clock.h"
@@ -25,7 +26,6 @@
 #include "intel_gt_pm_irq.h"
 #include "intel_gt_print.h"
 #include "intel_gt_regs.h"
-#include "intel_mchbar_regs.h"
 #include "intel_pcode.h"
 #include "intel_rps.h"
 #include "vlv_iosf_sb.h"
index 4778ba6..a3e27f9 100644 (file)
@@ -34,6 +34,7 @@
 #include <drm/drm_debugfs.h>
 #include <drm/drm_print.h>
 #include <drm/intel/intel_gmd_misc_regs.h>
+#include <drm/intel/mchbar_regs.h>
 
 #include "gem/i915_gem_context.h"
 #include "gt/intel_gt.h"
@@ -57,7 +58,6 @@
 #include "i915_reg.h"
 #include "i915_scheduler.h"
 #include "i915_wait_util.h"
-#include "intel_mchbar_regs.h"
 
 static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)
 {
index 9bdaea3..9547d08 100644 (file)
@@ -2,10 +2,10 @@
 /* Copyright © 2025 Intel Corporation */
 
 #include <drm/drm_print.h>
+#include <drm/intel/mchbar_regs.h>
 
 #include "i915_drv.h"
 #include "i915_freq.h"
-#include "intel_mchbar_regs.h"
 
 unsigned int i9xx_fsb_freq(struct drm_i915_private *i915)
 {
index c4a799f..da643b3 100644 (file)
 #include <linux/units.h>
 
 #include <drm/intel/intel_pcode_regs.h>
+#include <drm/intel/mchbar_regs.h>
 
 #include "i915_drv.h"
 #include "i915_hwmon.h"
 #include "i915_reg.h"
-#include "intel_mchbar_regs.h"
 #include "intel_pcode.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_regs.h"
index ee2489a..515f83c 100644 (file)
@@ -26,8 +26,9 @@
  */
 
 #include <drm/drm_print.h>
-#include <drm/intel/intel_gmd_misc_regs.h>
 #include <drm/intel/intel_gmd_interrupt_regs.h>
+#include <drm/intel/intel_gmd_misc_regs.h>
+#include <drm/intel/mchbar_regs.h>
 
 #include "display/i9xx_plane_regs.h"
 #include "display/intel_display.h"
@@ -42,7 +43,6 @@
 #include "i915_drv.h"
 #include "i915_reg.h"
 #include "intel_clock_gating.h"
-#include "intel_mchbar_regs.h"
 #include "vlv_iosf_sb.h"
 
 struct drm_i915_clock_gating_funcs {
index ae42818..de118fa 100644 (file)
@@ -7,6 +7,7 @@
 #include <drm/intel/intel_gmd_misc_regs.h>
 
 #include <drm/intel/intel_gmd_interrupt_regs.h>
+#include <drm/intel/mchbar_regs.h>
 
 #include "display/bxt_dpio_phy_regs.h"
 #include "display/i9xx_plane_regs.h"
@@ -44,7 +45,6 @@
 #include "i915_pvinfo.h"
 #include "i915_reg.h"
 #include "intel_gvt.h"
-#include "intel_mchbar_regs.h"
 
 #define MMIO_F(reg, s) do { \
        int ret; \
diff --git a/drivers/gpu/drm/i915/intel_mchbar_regs.h b/drivers/gpu/drm/i915/intel_mchbar_regs.h
deleted file mode 100644 (file)
index ca0d421..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2022 Intel Corporation
- */
-
-#ifndef __INTEL_MCHBAR_REGS__
-#define __INTEL_MCHBAR_REGS__
-
-#include "i915_reg_defs.h"
-
-/*
- * MCHBAR mirror.
- *
- * This mirrors the MCHBAR MMIO space whose location is determined by
- * device 0 function 0's pci config register 0x44 or 0x48 and matches it in
- * every way.  It is not accessible from the CP register read instructions.
- *
- * Starting from Haswell, you can't write registers using the MCHBAR mirror,
- * just read. On MTL+ the mirror no longer exists.
- */
-
-#define MCHBAR_MIRROR_BASE                     0x10000
-#define MCHBAR_MIRROR_END                      0x13fff
-
-#define MCHBAR_MIRROR_BASE_SNB                 0x140000
-#define MCHBAR_MIRROR_END_SNB                  0x147fff
-#define MCHBAR_MIRROR_END_ICL_RKL              0x14ffff
-#define MCHBAR_MIRROR_END_TGL                  0x15ffff
-
-#define CTG_STOLEN_RESERVED                    _MMIO(MCHBAR_MIRROR_BASE + 0x34)
-#define ELK_STOLEN_RESERVED                    _MMIO(MCHBAR_MIRROR_BASE + 0x48)
-#define   G4X_STOLEN_RESERVED_ADDR1_MASK       (0xFFFF << 16)
-#define   G4X_STOLEN_RESERVED_ADDR2_MASK       (0xFFF << 4)
-#define   G4X_STOLEN_RESERVED_ENABLE           (1 << 0)
-
-/* Pineview MCH register contains DDR3 setting */
-#define CSHRDDR3CTL                            _MMIO(MCHBAR_MIRROR_BASE + 0x1a8)
-#define   CSHRDDR3CTL_DDR3                     (1 << 2)
-
-/* 915-945 and GM965 MCH register controlling DRAM channel access */
-#define DCC                                    _MMIO(MCHBAR_MIRROR_BASE + 0x200)
-#define   DCC_ADDRESSING_MODE_SINGLE_CHANNEL   (0 << 0)
-#define   DCC_ADDRESSING_MODE_DUAL_CHANNEL_ASYMMETRIC  (1 << 0)
-#define   DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED (2 << 0)
-#define   DCC_ADDRESSING_MODE_MASK             (3 << 0)
-#define   DCC_CHANNEL_XOR_DISABLE              (1 << 10)
-#define   DCC_CHANNEL_XOR_BIT_17               (1 << 9)
-#define DCC2                                   _MMIO(MCHBAR_MIRROR_BASE + 0x204)
-#define   DCC2_MODIFIED_ENHANCED_DISABLE       (1 << 20)
-
-/* 965 MCH register controlling DRAM channel configuration */
-#define C0DRB3_BW                              _MMIO(MCHBAR_MIRROR_BASE + 0x206)
-#define C1DRB3_BW                              _MMIO(MCHBAR_MIRROR_BASE + 0x606)
-
-/* Clocking configuration register */
-#define CLKCFG                                 _MMIO(MCHBAR_MIRROR_BASE + 0xc00)
-#define CLKCFG_FSB_400                         (0 << 0)        /* hrawclk 100 */
-#define CLKCFG_FSB_400_ALT                     (5 << 0)        /* hrawclk 100 */
-#define CLKCFG_FSB_533                         (1 << 0)        /* hrawclk 133 */
-#define CLKCFG_FSB_667                         (3 << 0)        /* hrawclk 166 */
-#define CLKCFG_FSB_800                         (2 << 0)        /* hrawclk 200 */
-#define CLKCFG_FSB_1067                                (6 << 0)        /* hrawclk 266 */
-#define CLKCFG_FSB_1067_ALT                    (0 << 0)        /* hrawclk 266 */
-#define CLKCFG_FSB_1333                                (7 << 0)        /* hrawclk 333 */
-#define CLKCFG_FSB_1333_ALT                    (4 << 0)        /* hrawclk 333 */
-#define CLKCFG_FSB_1600_ALT                    (6 << 0)        /* hrawclk 400 */
-#define CLKCFG_FSB_MASK                                (7 << 0)
-#define CLKCFG_MEM_533                         (1 << 4)
-#define CLKCFG_MEM_667                         (2 << 4)
-#define CLKCFG_MEM_800                         (3 << 4)
-#define CLKCFG_MEM_MASK                                (7 << 4)
-
-#define HPLLVCO_MOBILE                         _MMIO(MCHBAR_MIRROR_BASE + 0xc0f)
-#define HPLLVCO                                        _MMIO(MCHBAR_MIRROR_BASE + 0xc38)
-
-#define TSC1                                   _MMIO(MCHBAR_MIRROR_BASE + 0x1001)
-#define   TSE                                  (1 << 0)
-#define TR1                                    _MMIO(MCHBAR_MIRROR_BASE + 0x1006)
-#define TSFS                                   _MMIO(MCHBAR_MIRROR_BASE + 0x1020)
-#define   TSFS_SLOPE_MASK                      0x0000ff00
-#define   TSFS_SLOPE_SHIFT                     8
-#define   TSFS_INTR_MASK                       0x000000ff
-
-/* Memory latency timer register */
-#define MLTR_ILK                               _MMIO(MCHBAR_MIRROR_BASE + 0x1222)
-/* the unit of memory self-refresh latency time is 0.5us */
-#define   MLTR_WM2_MASK                                REG_GENMASK(13, 8)
-#define   MLTR_WM1_MASK                                REG_GENMASK(5, 0)
-
-#define CSIPLL0                                        _MMIO(MCHBAR_MIRROR_BASE + 0x2c10)
-#define DDRMPLL1                               _MMIO(MCHBAR_MIRROR_BASE + 0x2c20)
-
-#define ILK_GDSR                               _MMIO(MCHBAR_MIRROR_BASE + 0x2ca4)
-#define  ILK_GRDOM_FULL                                (0 << 1)
-#define  ILK_GRDOM_RENDER                      (1 << 1)
-#define  ILK_GRDOM_MEDIA                       (3 << 1)
-#define  ILK_GRDOM_MASK                                (3 << 1)
-#define  ILK_GRDOM_RESET_ENABLE                        (1 << 0)
-
-#define BXT_D_CR_DRP0_DUNIT8                   0x1000
-#define BXT_D_CR_DRP0_DUNIT9                   0x1200
-#define   BXT_D_CR_DRP0_DUNIT_START            8
-#define   BXT_D_CR_DRP0_DUNIT_END              11
-#define BXT_D_CR_DRP0_DUNIT(x)                 _MMIO(MCHBAR_MIRROR_BASE_SNB + \
-                                                     _PICK_EVEN((x) - 8, BXT_D_CR_DRP0_DUNIT8,\
-                                                                BXT_D_CR_DRP0_DUNIT9))
-#define   BXT_DRAM_RANK_MASK                   0x3
-#define   BXT_DRAM_RANK_SINGLE                 0x1
-#define   BXT_DRAM_RANK_DUAL                   0x3
-#define   BXT_DRAM_WIDTH_MASK                  (0x3 << 4)
-#define   BXT_DRAM_WIDTH_SHIFT                 4
-#define   BXT_DRAM_WIDTH_X8                    (0x0 << 4)
-#define   BXT_DRAM_WIDTH_X16                   (0x1 << 4)
-#define   BXT_DRAM_WIDTH_X32                   (0x2 << 4)
-#define   BXT_DRAM_WIDTH_X64                   (0x3 << 4)
-#define   BXT_DRAM_SIZE_MASK                   (0x7 << 6)
-#define   BXT_DRAM_SIZE_SHIFT                  6
-#define   BXT_DRAM_SIZE_4GBIT                  (0x0 << 6)
-#define   BXT_DRAM_SIZE_6GBIT                  (0x1 << 6)
-#define   BXT_DRAM_SIZE_8GBIT                  (0x2 << 6)
-#define   BXT_DRAM_SIZE_12GBIT                 (0x3 << 6)
-#define   BXT_DRAM_SIZE_16GBIT                 (0x4 << 6)
-#define   BXT_DRAM_TYPE_MASK                   (0x7 << 22)
-#define   BXT_DRAM_TYPE_SHIFT                  22
-#define   BXT_DRAM_TYPE_DDR3                   (0x0 << 22)
-#define   BXT_DRAM_TYPE_LPDDR3                 (0x1 << 22)
-#define   BXT_DRAM_TYPE_LPDDR4                 (0x2 << 22)
-#define   BXT_DRAM_TYPE_DDR4                   (0x4 << 22)
-
-#define MCHBAR_CH0_CR_TC_PRE_0_0_0_MCHBAR      _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x4000)
-#define   DG1_DRAM_T_RDPRE_MASK                        REG_GENMASK(16, 11)
-#define   DG1_DRAM_T_RP_MASK                   REG_GENMASK(6, 0)
-#define MCHBAR_CH0_CR_TC_PRE_0_0_0_MCHBAR_HIGH _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x4004)
-#define   DG1_DRAM_T_RCD_MASK                  REG_GENMASK(15, 9)
-#define   DG1_DRAM_T_RAS_MASK                  REG_GENMASK(8, 1)
-
-#define SKL_MAD_INTER_CHANNEL_0_0_0_MCHBAR_MCMAIN      _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5000)
-#define   SKL_DRAM_DDR_TYPE_MASK               REG_GENMASK(1, 0)
-#define   SKL_DRAM_DDR_TYPE_DDR4               REG_FIELD_PREP(SKL_DRAM_DDR_TYPE_MASK, 0)
-#define   SKL_DRAM_DDR_TYPE_DDR3               REG_FIELD_PREP(SKL_DRAM_DDR_TYPE_MASK, 1)
-#define   SKL_DRAM_DDR_TYPE_LPDDR3             REG_FIELD_PREP(SKL_DRAM_DDR_TYPE_MASK, 2)
-#define   SKL_DRAM_DDR_TYPE_LPDDR4             REG_FIELD_PREP(SKL_DRAM_DDR_TYPE_MASK, 3)
-
-/* snb MCH registers for reading the DRAM channel configuration */
-#define MAD_DIMM_C0                            _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5004)
-#define MAD_DIMM_C1                            _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5008)
-#define MAD_DIMM_C2                            _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x500C)
-#define   MAD_DIMM_ECC_MASK                    (0x3 << 24)
-#define   MAD_DIMM_ECC_OFF                     (0x0 << 24)
-#define   MAD_DIMM_ECC_IO_ON_LOGIC_OFF         (0x1 << 24)
-#define   MAD_DIMM_ECC_IO_OFF_LOGIC_ON         (0x2 << 24)
-#define   MAD_DIMM_ECC_ON                      (0x3 << 24)
-#define   MAD_DIMM_ENH_INTERLEAVE              (0x1 << 22)
-#define   MAD_DIMM_RANK_INTERLEAVE             (0x1 << 21)
-#define   MAD_DIMM_B_WIDTH_X16                 (0x1 << 20) /* X8 chips if unset */
-#define   MAD_DIMM_A_WIDTH_X16                 (0x1 << 19) /* X8 chips if unset */
-#define   MAD_DIMM_B_DUAL_RANK                 (0x1 << 18)
-#define   MAD_DIMM_A_DUAL_RANK                 (0x1 << 17)
-#define   MAD_DIMM_A_SELECT                    (0x1 << 16)
-/* DIMM sizes are in multiples of 256mb. */
-#define   MAD_DIMM_B_SIZE_SHIFT                        8
-#define   MAD_DIMM_B_SIZE_MASK                 (0xff << MAD_DIMM_B_SIZE_SHIFT)
-#define   MAD_DIMM_A_SIZE_SHIFT                        0
-#define   MAD_DIMM_A_SIZE_MASK                 (0xff << MAD_DIMM_A_SIZE_SHIFT)
-
-#define SKL_MAD_DIMM_CH0_0_0_0_MCHBAR_MCMAIN   _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x500C)
-#define SKL_MAD_DIMM_CH1_0_0_0_MCHBAR_MCMAIN   _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5010)
-#define   SKL_DIMM_S_RANK_MASK                 REG_GENMASK(26, 26)
-#define   SKL_DIMM_S_RANK_1                    REG_FIELD_PREP(SKL_DIMM_S_RANK_MASK, 0)
-#define   SKL_DIMM_S_RANK_2                    REG_FIELD_PREP(SKL_DIMM_S_RANK_MASK, 1)
-#define   SKL_DIMM_S_WIDTH_MASK                        REG_GENMASK(25, 24)
-#define   SKL_DIMM_S_WIDTH_X8                  REG_FIELD_PREP(SKL_DIMM_S_WIDTH_MASK, 0)
-#define   SKL_DIMM_S_WIDTH_X16                 REG_FIELD_PREP(SKL_DIMM_S_WIDTH_MASK, 1)
-#define   SKL_DIMM_S_WIDTH_X32                 REG_FIELD_PREP(SKL_DIMM_S_WIDTH_MASK, 2)
-#define   SKL_DIMM_S_SIZE_MASK                 REG_GENMASK(21, 16)
-#define   SKL_DIMM_L_RANK_MASK                 REG_GENMASK(10, 10)
-#define   SKL_DIMM_L_RANK_1                    REG_FIELD_PREP(SKL_DIMM_L_RANK_MASK, 0)
-#define   SKL_DIMM_L_RANK_2                    REG_FIELD_PREP(SKL_DIMM_L_RANK_MASK, 1)
-#define   SKL_DIMM_L_WIDTH_MASK                        REG_GENMASK(9, 8)
-#define   SKL_DIMM_L_WIDTH_X8                  REG_FIELD_PREP(SKL_DIMM_L_WIDTH_MASK, 0)
-#define   SKL_DIMM_L_WIDTH_X16                 REG_FIELD_PREP(SKL_DIMM_L_WIDTH_MASK, 1)
-#define   SKL_DIMM_L_WIDTH_X32                 REG_FIELD_PREP(SKL_DIMM_L_WIDTH_MASK, 2)
-#define   SKL_DIMM_L_SIZE_MASK                 REG_GENMASK(5, 0)
-#define   ICL_DIMM_S_RANK_MASK                 REG_GENMASK(27, 26)
-#define   ICL_DIMM_S_RANK_1                    REG_FIELD_PREP(ICL_DIMM_S_RANK_MASK, 0)
-#define   ICL_DIMM_S_RANK_2                    REG_FIELD_PREP(ICL_DIMM_S_RANK_MASK, 1)
-#define   ICL_DIMM_S_WIDTH_MASK                        REG_GENMASK(25, 24)
-#define   ICL_DIMM_S_WIDTH_X8                  REG_FIELD_PREP(ICL_DIMM_S_WIDTH_MASK, 0)
-#define   ICL_DIMM_S_WIDTH_X16                 REG_FIELD_PREP(ICL_DIMM_S_WIDTH_MASK, 1)
-#define   ICL_DIMM_S_WIDTH_X32                 REG_FIELD_PREP(ICL_DIMM_S_WIDTH_MASK, 2)
-#define   ICL_DIMM_S_SIZE_MASK                 REG_GENMASK(22, 16)
-#define   ICL_DIMM_L_RANK_MASK                 REG_GENMASK(10, 9)
-#define   ICL_DIMM_L_RANK_1                    REG_FIELD_PREP(ICL_DIMM_L_RANK_MASK, 0)
-#define   ICL_DIMM_L_RANK_2                    REG_FIELD_PREP(ICL_DIMM_L_RANK_MASK, 1)
-#define   ICL_DIMM_L_RANK_3                    REG_FIELD_PREP(ICL_DIMM_L_RANK_MASK, 2)
-#define   ICL_DIMM_L_RANK_4                    REG_FIELD_PREP(ICL_DIMM_L_RANK_MASK, 3)
-#define   ICL_DIMM_L_WIDTH_MASK                        REG_GENMASK(8, 7)
-#define   ICL_DIMM_L_WIDTH_X8                  REG_FIELD_PREP(ICL_DIMM_L_WIDTH_MASK, 0)
-#define   ICL_DIMM_L_WIDTH_X16                 REG_FIELD_PREP(ICL_DIMM_L_WIDTH_MASK, 1)
-#define   ICL_DIMM_L_WIDTH_X32                 REG_FIELD_PREP(ICL_DIMM_L_WIDTH_MASK, 2)
-#define   ICL_DIMM_L_SIZE_MASK                 REG_GENMASK(6, 0)
-
-#define SA_PERF_STATUS_0_0_0_MCHBAR_PC         _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5918)
-#define  DG1_QCLK_RATIO_MASK                   REG_GENMASK(9, 2)
-#define  DG1_QCLK_REFERENCE                    REG_BIT(10)
-
-/*
- * *_PACKAGE_POWER_SKU - SKU power and timing parameters.
- */
-#define PCU_PACKAGE_POWER_SKU                  _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5930)
-#define   PKG_PKG_TDP                          GENMASK_ULL(14, 0)
-#define   PKG_MIN_PWR                          GENMASK_ULL(30, 16)
-#define   PKG_MAX_PWR                          GENMASK_ULL(46, 32)
-#define   PKG_MAX_WIN                          GENMASK_ULL(54, 48)
-#define     PKG_MAX_WIN_X                      GENMASK_ULL(54, 53)
-#define     PKG_MAX_WIN_Y                      GENMASK_ULL(52, 48)
-
-#define PCU_PACKAGE_POWER_SKU_UNIT             _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5938)
-#define   PKG_PWR_UNIT                         REG_GENMASK(3, 0)
-#define   PKG_ENERGY_UNIT                      REG_GENMASK(12, 8)
-#define   PKG_TIME_UNIT                                REG_GENMASK(19, 16)
-#define PCU_PACKAGE_ENERGY_STATUS              _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x593c)
-
-#define GEN6_GT_PERF_STATUS                    _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5948)
-
-#define PCU_PACKAGE_TEMPERATURE                        _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5978)
-#define   TEMP_MASK                            REG_GENMASK(7, 0)
-
-#define GEN6_RP_STATE_LIMITS                   _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5994)
-#define GEN6_RP_STATE_CAP                      _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5998)
-#define   RP0_CAP_MASK                         REG_GENMASK(7, 0)
-#define   RP1_CAP_MASK                         REG_GENMASK(15, 8)
-#define   RPN_CAP_MASK                         REG_GENMASK(23, 16)
-
-#define GEN10_FREQ_INFO_REC                    _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5ef0)
-#define   RPE_MASK                             REG_GENMASK(15, 8)
-#define PCU_PACKAGE_RAPL_LIMIT                 _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x59a0)
-#define   PKG_PWR_LIM_1                                REG_GENMASK(14, 0)
-#define   PKG_PWR_LIM_1_EN                     REG_BIT(15)
-#define   PKG_PWR_LIM_1_TIME                   REG_GENMASK(23, 17)
-#define   PKG_PWR_LIM_1_TIME_X                 REG_GENMASK(23, 22)
-#define   PKG_PWR_LIM_1_TIME_Y                 REG_GENMASK(21, 17)
-
-/* snb MCH registers for priority tuning */
-#define MCH_SSKPD                              _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5d10)
-#define   SSKPD_NEW_WM0_MASK_HSW               REG_GENMASK64(63, 56)
-#define   SSKPD_WM4_MASK_HSW                   REG_GENMASK64(40, 32)
-#define   SSKPD_WM3_MASK_HSW                   REG_GENMASK64(28, 20)
-#define   SSKPD_WM2_MASK_HSW                   REG_GENMASK64(19, 12)
-#define   SSKPD_WM1_MASK_HSW                   REG_GENMASK64(11, 4)
-#define   SSKPD_OLD_WM0_MASK_HSW               REG_GENMASK64(3, 0)
-#define   SSKPD_WM3_MASK_SNB                   REG_GENMASK(29, 24)
-#define   SSKPD_WM2_MASK_SNB                   REG_GENMASK(21, 16)
-#define   SSKPD_WM1_MASK_SNB                   REG_GENMASK(13, 8)
-#define   SSKPD_WM0_MASK_SNB                   REG_GENMASK(5, 0)
-
-/* Memory controller frequency in MCHBAR for Haswell (possible SNB+) */
-#define DCLK                                   _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5e04)
-#define SKL_MC_BIOS_DATA_0_0_0_MCHBAR_PCU      _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5e04)
-#define   DG1_GEAR_TYPE                                REG_BIT(16)
-
-/*
- * Please see hsw_read_dcomp() and hsw_write_dcomp() before using this register,
- * since on HSW we can't write to it using intel_uncore_write.
- */
-#define D_COMP_HSW                             _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5f0c)
-#define  D_COMP_RCOMP_IN_PROGRESS              (1 << 9)
-#define  D_COMP_COMP_FORCE                     (1 << 8)
-#define  D_COMP_COMP_DISABLE                   (1 << 0)
-
-#define BXT_GT_PERF_STATUS                     _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x7070)
-
-#endif /* __INTEL_MCHBAR_REGS */
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h
deleted file mode 100644 (file)
index 55b3169..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#include "../../i915/intel_mchbar_regs.h"
diff --git a/include/drm/intel/mchbar_regs.h b/include/drm/intel/mchbar_regs.h
new file mode 100644 (file)
index 0000000..ca0d421
--- /dev/null
@@ -0,0 +1,273 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __INTEL_MCHBAR_REGS__
+#define __INTEL_MCHBAR_REGS__
+
+#include "i915_reg_defs.h"
+
+/*
+ * MCHBAR mirror.
+ *
+ * This mirrors the MCHBAR MMIO space whose location is determined by
+ * device 0 function 0's pci config register 0x44 or 0x48 and matches it in
+ * every way.  It is not accessible from the CP register read instructions.
+ *
+ * Starting from Haswell, you can't write registers using the MCHBAR mirror,
+ * just read. On MTL+ the mirror no longer exists.
+ */
+
+#define MCHBAR_MIRROR_BASE                     0x10000
+#define MCHBAR_MIRROR_END                      0x13fff
+
+#define MCHBAR_MIRROR_BASE_SNB                 0x140000
+#define MCHBAR_MIRROR_END_SNB                  0x147fff
+#define MCHBAR_MIRROR_END_ICL_RKL              0x14ffff
+#define MCHBAR_MIRROR_END_TGL                  0x15ffff
+
+#define CTG_STOLEN_RESERVED                    _MMIO(MCHBAR_MIRROR_BASE + 0x34)
+#define ELK_STOLEN_RESERVED                    _MMIO(MCHBAR_MIRROR_BASE + 0x48)
+#define   G4X_STOLEN_RESERVED_ADDR1_MASK       (0xFFFF << 16)
+#define   G4X_STOLEN_RESERVED_ADDR2_MASK       (0xFFF << 4)
+#define   G4X_STOLEN_RESERVED_ENABLE           (1 << 0)
+
+/* Pineview MCH register contains DDR3 setting */
+#define CSHRDDR3CTL                            _MMIO(MCHBAR_MIRROR_BASE + 0x1a8)
+#define   CSHRDDR3CTL_DDR3                     (1 << 2)
+
+/* 915-945 and GM965 MCH register controlling DRAM channel access */
+#define DCC                                    _MMIO(MCHBAR_MIRROR_BASE + 0x200)
+#define   DCC_ADDRESSING_MODE_SINGLE_CHANNEL   (0 << 0)
+#define   DCC_ADDRESSING_MODE_DUAL_CHANNEL_ASYMMETRIC  (1 << 0)
+#define   DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED (2 << 0)
+#define   DCC_ADDRESSING_MODE_MASK             (3 << 0)
+#define   DCC_CHANNEL_XOR_DISABLE              (1 << 10)
+#define   DCC_CHANNEL_XOR_BIT_17               (1 << 9)
+#define DCC2                                   _MMIO(MCHBAR_MIRROR_BASE + 0x204)
+#define   DCC2_MODIFIED_ENHANCED_DISABLE       (1 << 20)
+
+/* 965 MCH register controlling DRAM channel configuration */
+#define C0DRB3_BW                              _MMIO(MCHBAR_MIRROR_BASE + 0x206)
+#define C1DRB3_BW                              _MMIO(MCHBAR_MIRROR_BASE + 0x606)
+
+/* Clocking configuration register */
+#define CLKCFG                                 _MMIO(MCHBAR_MIRROR_BASE + 0xc00)
+#define CLKCFG_FSB_400                         (0 << 0)        /* hrawclk 100 */
+#define CLKCFG_FSB_400_ALT                     (5 << 0)        /* hrawclk 100 */
+#define CLKCFG_FSB_533                         (1 << 0)        /* hrawclk 133 */
+#define CLKCFG_FSB_667                         (3 << 0)        /* hrawclk 166 */
+#define CLKCFG_FSB_800                         (2 << 0)        /* hrawclk 200 */
+#define CLKCFG_FSB_1067                                (6 << 0)        /* hrawclk 266 */
+#define CLKCFG_FSB_1067_ALT                    (0 << 0)        /* hrawclk 266 */
+#define CLKCFG_FSB_1333                                (7 << 0)        /* hrawclk 333 */
+#define CLKCFG_FSB_1333_ALT                    (4 << 0)        /* hrawclk 333 */
+#define CLKCFG_FSB_1600_ALT                    (6 << 0)        /* hrawclk 400 */
+#define CLKCFG_FSB_MASK                                (7 << 0)
+#define CLKCFG_MEM_533                         (1 << 4)
+#define CLKCFG_MEM_667                         (2 << 4)
+#define CLKCFG_MEM_800                         (3 << 4)
+#define CLKCFG_MEM_MASK                                (7 << 4)
+
+#define HPLLVCO_MOBILE                         _MMIO(MCHBAR_MIRROR_BASE + 0xc0f)
+#define HPLLVCO                                        _MMIO(MCHBAR_MIRROR_BASE + 0xc38)
+
+#define TSC1                                   _MMIO(MCHBAR_MIRROR_BASE + 0x1001)
+#define   TSE                                  (1 << 0)
+#define TR1                                    _MMIO(MCHBAR_MIRROR_BASE + 0x1006)
+#define TSFS                                   _MMIO(MCHBAR_MIRROR_BASE + 0x1020)
+#define   TSFS_SLOPE_MASK                      0x0000ff00
+#define   TSFS_SLOPE_SHIFT                     8
+#define   TSFS_INTR_MASK                       0x000000ff
+
+/* Memory latency timer register */
+#define MLTR_ILK                               _MMIO(MCHBAR_MIRROR_BASE + 0x1222)
+/* the unit of memory self-refresh latency time is 0.5us */
+#define   MLTR_WM2_MASK                                REG_GENMASK(13, 8)
+#define   MLTR_WM1_MASK                                REG_GENMASK(5, 0)
+
+#define CSIPLL0                                        _MMIO(MCHBAR_MIRROR_BASE + 0x2c10)
+#define DDRMPLL1                               _MMIO(MCHBAR_MIRROR_BASE + 0x2c20)
+
+#define ILK_GDSR                               _MMIO(MCHBAR_MIRROR_BASE + 0x2ca4)
+#define  ILK_GRDOM_FULL                                (0 << 1)
+#define  ILK_GRDOM_RENDER                      (1 << 1)
+#define  ILK_GRDOM_MEDIA                       (3 << 1)
+#define  ILK_GRDOM_MASK                                (3 << 1)
+#define  ILK_GRDOM_RESET_ENABLE                        (1 << 0)
+
+#define BXT_D_CR_DRP0_DUNIT8                   0x1000
+#define BXT_D_CR_DRP0_DUNIT9                   0x1200
+#define   BXT_D_CR_DRP0_DUNIT_START            8
+#define   BXT_D_CR_DRP0_DUNIT_END              11
+#define BXT_D_CR_DRP0_DUNIT(x)                 _MMIO(MCHBAR_MIRROR_BASE_SNB + \
+                                                     _PICK_EVEN((x) - 8, BXT_D_CR_DRP0_DUNIT8,\
+                                                                BXT_D_CR_DRP0_DUNIT9))
+#define   BXT_DRAM_RANK_MASK                   0x3
+#define   BXT_DRAM_RANK_SINGLE                 0x1
+#define   BXT_DRAM_RANK_DUAL                   0x3
+#define   BXT_DRAM_WIDTH_MASK                  (0x3 << 4)
+#define   BXT_DRAM_WIDTH_SHIFT                 4
+#define   BXT_DRAM_WIDTH_X8                    (0x0 << 4)
+#define   BXT_DRAM_WIDTH_X16                   (0x1 << 4)
+#define   BXT_DRAM_WIDTH_X32                   (0x2 << 4)
+#define   BXT_DRAM_WIDTH_X64                   (0x3 << 4)
+#define   BXT_DRAM_SIZE_MASK                   (0x7 << 6)
+#define   BXT_DRAM_SIZE_SHIFT                  6
+#define   BXT_DRAM_SIZE_4GBIT                  (0x0 << 6)
+#define   BXT_DRAM_SIZE_6GBIT                  (0x1 << 6)
+#define   BXT_DRAM_SIZE_8GBIT                  (0x2 << 6)
+#define   BXT_DRAM_SIZE_12GBIT                 (0x3 << 6)
+#define   BXT_DRAM_SIZE_16GBIT                 (0x4 << 6)
+#define   BXT_DRAM_TYPE_MASK                   (0x7 << 22)
+#define   BXT_DRAM_TYPE_SHIFT                  22
+#define   BXT_DRAM_TYPE_DDR3                   (0x0 << 22)
+#define   BXT_DRAM_TYPE_LPDDR3                 (0x1 << 22)
+#define   BXT_DRAM_TYPE_LPDDR4                 (0x2 << 22)
+#define   BXT_DRAM_TYPE_DDR4                   (0x4 << 22)
+
+#define MCHBAR_CH0_CR_TC_PRE_0_0_0_MCHBAR      _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x4000)
+#define   DG1_DRAM_T_RDPRE_MASK                        REG_GENMASK(16, 11)
+#define   DG1_DRAM_T_RP_MASK                   REG_GENMASK(6, 0)
+#define MCHBAR_CH0_CR_TC_PRE_0_0_0_MCHBAR_HIGH _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x4004)
+#define   DG1_DRAM_T_RCD_MASK                  REG_GENMASK(15, 9)
+#define   DG1_DRAM_T_RAS_MASK                  REG_GENMASK(8, 1)
+
+#define SKL_MAD_INTER_CHANNEL_0_0_0_MCHBAR_MCMAIN      _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5000)
+#define   SKL_DRAM_DDR_TYPE_MASK               REG_GENMASK(1, 0)
+#define   SKL_DRAM_DDR_TYPE_DDR4               REG_FIELD_PREP(SKL_DRAM_DDR_TYPE_MASK, 0)
+#define   SKL_DRAM_DDR_TYPE_DDR3               REG_FIELD_PREP(SKL_DRAM_DDR_TYPE_MASK, 1)
+#define   SKL_DRAM_DDR_TYPE_LPDDR3             REG_FIELD_PREP(SKL_DRAM_DDR_TYPE_MASK, 2)
+#define   SKL_DRAM_DDR_TYPE_LPDDR4             REG_FIELD_PREP(SKL_DRAM_DDR_TYPE_MASK, 3)
+
+/* snb MCH registers for reading the DRAM channel configuration */
+#define MAD_DIMM_C0                            _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5004)
+#define MAD_DIMM_C1                            _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5008)
+#define MAD_DIMM_C2                            _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x500C)
+#define   MAD_DIMM_ECC_MASK                    (0x3 << 24)
+#define   MAD_DIMM_ECC_OFF                     (0x0 << 24)
+#define   MAD_DIMM_ECC_IO_ON_LOGIC_OFF         (0x1 << 24)
+#define   MAD_DIMM_ECC_IO_OFF_LOGIC_ON         (0x2 << 24)
+#define   MAD_DIMM_ECC_ON                      (0x3 << 24)
+#define   MAD_DIMM_ENH_INTERLEAVE              (0x1 << 22)
+#define   MAD_DIMM_RANK_INTERLEAVE             (0x1 << 21)
+#define   MAD_DIMM_B_WIDTH_X16                 (0x1 << 20) /* X8 chips if unset */
+#define   MAD_DIMM_A_WIDTH_X16                 (0x1 << 19) /* X8 chips if unset */
+#define   MAD_DIMM_B_DUAL_RANK                 (0x1 << 18)
+#define   MAD_DIMM_A_DUAL_RANK                 (0x1 << 17)
+#define   MAD_DIMM_A_SELECT                    (0x1 << 16)
+/* DIMM sizes are in multiples of 256mb. */
+#define   MAD_DIMM_B_SIZE_SHIFT                        8
+#define   MAD_DIMM_B_SIZE_MASK                 (0xff << MAD_DIMM_B_SIZE_SHIFT)
+#define   MAD_DIMM_A_SIZE_SHIFT                        0
+#define   MAD_DIMM_A_SIZE_MASK                 (0xff << MAD_DIMM_A_SIZE_SHIFT)
+
+#define SKL_MAD_DIMM_CH0_0_0_0_MCHBAR_MCMAIN   _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x500C)
+#define SKL_MAD_DIMM_CH1_0_0_0_MCHBAR_MCMAIN   _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5010)
+#define   SKL_DIMM_S_RANK_MASK                 REG_GENMASK(26, 26)
+#define   SKL_DIMM_S_RANK_1                    REG_FIELD_PREP(SKL_DIMM_S_RANK_MASK, 0)
+#define   SKL_DIMM_S_RANK_2                    REG_FIELD_PREP(SKL_DIMM_S_RANK_MASK, 1)
+#define   SKL_DIMM_S_WIDTH_MASK                        REG_GENMASK(25, 24)
+#define   SKL_DIMM_S_WIDTH_X8                  REG_FIELD_PREP(SKL_DIMM_S_WIDTH_MASK, 0)
+#define   SKL_DIMM_S_WIDTH_X16                 REG_FIELD_PREP(SKL_DIMM_S_WIDTH_MASK, 1)
+#define   SKL_DIMM_S_WIDTH_X32                 REG_FIELD_PREP(SKL_DIMM_S_WIDTH_MASK, 2)
+#define   SKL_DIMM_S_SIZE_MASK                 REG_GENMASK(21, 16)
+#define   SKL_DIMM_L_RANK_MASK                 REG_GENMASK(10, 10)
+#define   SKL_DIMM_L_RANK_1                    REG_FIELD_PREP(SKL_DIMM_L_RANK_MASK, 0)
+#define   SKL_DIMM_L_RANK_2                    REG_FIELD_PREP(SKL_DIMM_L_RANK_MASK, 1)
+#define   SKL_DIMM_L_WIDTH_MASK                        REG_GENMASK(9, 8)
+#define   SKL_DIMM_L_WIDTH_X8                  REG_FIELD_PREP(SKL_DIMM_L_WIDTH_MASK, 0)
+#define   SKL_DIMM_L_WIDTH_X16                 REG_FIELD_PREP(SKL_DIMM_L_WIDTH_MASK, 1)
+#define   SKL_DIMM_L_WIDTH_X32                 REG_FIELD_PREP(SKL_DIMM_L_WIDTH_MASK, 2)
+#define   SKL_DIMM_L_SIZE_MASK                 REG_GENMASK(5, 0)
+#define   ICL_DIMM_S_RANK_MASK                 REG_GENMASK(27, 26)
+#define   ICL_DIMM_S_RANK_1                    REG_FIELD_PREP(ICL_DIMM_S_RANK_MASK, 0)
+#define   ICL_DIMM_S_RANK_2                    REG_FIELD_PREP(ICL_DIMM_S_RANK_MASK, 1)
+#define   ICL_DIMM_S_WIDTH_MASK                        REG_GENMASK(25, 24)
+#define   ICL_DIMM_S_WIDTH_X8                  REG_FIELD_PREP(ICL_DIMM_S_WIDTH_MASK, 0)
+#define   ICL_DIMM_S_WIDTH_X16                 REG_FIELD_PREP(ICL_DIMM_S_WIDTH_MASK, 1)
+#define   ICL_DIMM_S_WIDTH_X32                 REG_FIELD_PREP(ICL_DIMM_S_WIDTH_MASK, 2)
+#define   ICL_DIMM_S_SIZE_MASK                 REG_GENMASK(22, 16)
+#define   ICL_DIMM_L_RANK_MASK                 REG_GENMASK(10, 9)
+#define   ICL_DIMM_L_RANK_1                    REG_FIELD_PREP(ICL_DIMM_L_RANK_MASK, 0)
+#define   ICL_DIMM_L_RANK_2                    REG_FIELD_PREP(ICL_DIMM_L_RANK_MASK, 1)
+#define   ICL_DIMM_L_RANK_3                    REG_FIELD_PREP(ICL_DIMM_L_RANK_MASK, 2)
+#define   ICL_DIMM_L_RANK_4                    REG_FIELD_PREP(ICL_DIMM_L_RANK_MASK, 3)
+#define   ICL_DIMM_L_WIDTH_MASK                        REG_GENMASK(8, 7)
+#define   ICL_DIMM_L_WIDTH_X8                  REG_FIELD_PREP(ICL_DIMM_L_WIDTH_MASK, 0)
+#define   ICL_DIMM_L_WIDTH_X16                 REG_FIELD_PREP(ICL_DIMM_L_WIDTH_MASK, 1)
+#define   ICL_DIMM_L_WIDTH_X32                 REG_FIELD_PREP(ICL_DIMM_L_WIDTH_MASK, 2)
+#define   ICL_DIMM_L_SIZE_MASK                 REG_GENMASK(6, 0)
+
+#define SA_PERF_STATUS_0_0_0_MCHBAR_PC         _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5918)
+#define  DG1_QCLK_RATIO_MASK                   REG_GENMASK(9, 2)
+#define  DG1_QCLK_REFERENCE                    REG_BIT(10)
+
+/*
+ * *_PACKAGE_POWER_SKU - SKU power and timing parameters.
+ */
+#define PCU_PACKAGE_POWER_SKU                  _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5930)
+#define   PKG_PKG_TDP                          GENMASK_ULL(14, 0)
+#define   PKG_MIN_PWR                          GENMASK_ULL(30, 16)
+#define   PKG_MAX_PWR                          GENMASK_ULL(46, 32)
+#define   PKG_MAX_WIN                          GENMASK_ULL(54, 48)
+#define     PKG_MAX_WIN_X                      GENMASK_ULL(54, 53)
+#define     PKG_MAX_WIN_Y                      GENMASK_ULL(52, 48)
+
+#define PCU_PACKAGE_POWER_SKU_UNIT             _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5938)
+#define   PKG_PWR_UNIT                         REG_GENMASK(3, 0)
+#define   PKG_ENERGY_UNIT                      REG_GENMASK(12, 8)
+#define   PKG_TIME_UNIT                                REG_GENMASK(19, 16)
+#define PCU_PACKAGE_ENERGY_STATUS              _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x593c)
+
+#define GEN6_GT_PERF_STATUS                    _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5948)
+
+#define PCU_PACKAGE_TEMPERATURE                        _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5978)
+#define   TEMP_MASK                            REG_GENMASK(7, 0)
+
+#define GEN6_RP_STATE_LIMITS                   _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5994)
+#define GEN6_RP_STATE_CAP                      _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5998)
+#define   RP0_CAP_MASK                         REG_GENMASK(7, 0)
+#define   RP1_CAP_MASK                         REG_GENMASK(15, 8)
+#define   RPN_CAP_MASK                         REG_GENMASK(23, 16)
+
+#define GEN10_FREQ_INFO_REC                    _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5ef0)
+#define   RPE_MASK                             REG_GENMASK(15, 8)
+#define PCU_PACKAGE_RAPL_LIMIT                 _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x59a0)
+#define   PKG_PWR_LIM_1                                REG_GENMASK(14, 0)
+#define   PKG_PWR_LIM_1_EN                     REG_BIT(15)
+#define   PKG_PWR_LIM_1_TIME                   REG_GENMASK(23, 17)
+#define   PKG_PWR_LIM_1_TIME_X                 REG_GENMASK(23, 22)
+#define   PKG_PWR_LIM_1_TIME_Y                 REG_GENMASK(21, 17)
+
+/* snb MCH registers for priority tuning */
+#define MCH_SSKPD                              _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5d10)
+#define   SSKPD_NEW_WM0_MASK_HSW               REG_GENMASK64(63, 56)
+#define   SSKPD_WM4_MASK_HSW                   REG_GENMASK64(40, 32)
+#define   SSKPD_WM3_MASK_HSW                   REG_GENMASK64(28, 20)
+#define   SSKPD_WM2_MASK_HSW                   REG_GENMASK64(19, 12)
+#define   SSKPD_WM1_MASK_HSW                   REG_GENMASK64(11, 4)
+#define   SSKPD_OLD_WM0_MASK_HSW               REG_GENMASK64(3, 0)
+#define   SSKPD_WM3_MASK_SNB                   REG_GENMASK(29, 24)
+#define   SSKPD_WM2_MASK_SNB                   REG_GENMASK(21, 16)
+#define   SSKPD_WM1_MASK_SNB                   REG_GENMASK(13, 8)
+#define   SSKPD_WM0_MASK_SNB                   REG_GENMASK(5, 0)
+
+/* Memory controller frequency in MCHBAR for Haswell (possible SNB+) */
+#define DCLK                                   _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5e04)
+#define SKL_MC_BIOS_DATA_0_0_0_MCHBAR_PCU      _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5e04)
+#define   DG1_GEAR_TYPE                                REG_BIT(16)
+
+/*
+ * Please see hsw_read_dcomp() and hsw_write_dcomp() before using this register,
+ * since on HSW we can't write to it using intel_uncore_write.
+ */
+#define D_COMP_HSW                             _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5f0c)
+#define  D_COMP_RCOMP_IN_PROGRESS              (1 << 9)
+#define  D_COMP_COMP_FORCE                     (1 << 8)
+#define  D_COMP_COMP_DISABLE                   (1 << 0)
+
+#define BXT_GT_PERF_STATUS                     _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x7070)
+
+#endif /* __INTEL_MCHBAR_REGS */