Skip to content

Commit 54395a3

Browse files
anushasrjlahtine-intel
authored andcommitted
drm/i915/dmc: Add MMIO range restrictions
Bspec has added some steps that check forDMC MMIO range before programming them v2: Fix for CI v3: move register defines to .h (Anusha) - Check MMIO restrictions per pipe - Add MMIO restricton for v1 dmc header as well (Lucas) v4: s/_PICK/_PICK_EVEN and use it only for Pipe DMC scenario. - clean up sanity check logic.(Lucas) - Add MMIO range for RKL as well.(Anusha) v5: Use DISPLAY_VER instead of per platform check (Lucas) BSpec: 49193 Cc: stable@vger.kernel.org Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220511000847.1068302-1-anusha.srivatsa@intel.com (cherry picked from commit 21c4719) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1 parent 42226c9 commit 54395a3

2 files changed

Lines changed: 60 additions & 0 deletions

File tree

drivers/gpu/drm/i915/display/intel_dmc.c

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,44 @@ static void dmc_set_fw_offset(struct intel_dmc *dmc,
367367
}
368368
}
369369

370+
static bool dmc_mmio_addr_sanity_check(struct intel_dmc *dmc,
371+
const u32 *mmioaddr, u32 mmio_count,
372+
int header_ver, u8 dmc_id)
373+
{
374+
struct drm_i915_private *i915 = container_of(dmc, typeof(*i915), dmc);
375+
u32 start_range, end_range;
376+
int i;
377+
378+
if (dmc_id >= DMC_FW_MAX) {
379+
drm_warn(&i915->drm, "Unsupported firmware id %u\n", dmc_id);
380+
return false;
381+
}
382+
383+
if (header_ver == 1) {
384+
start_range = DMC_MMIO_START_RANGE;
385+
end_range = DMC_MMIO_END_RANGE;
386+
} else if (dmc_id == DMC_FW_MAIN) {
387+
start_range = TGL_MAIN_MMIO_START;
388+
end_range = TGL_MAIN_MMIO_END;
389+
} else if (DISPLAY_VER(i915) >= 13) {
390+
start_range = ADLP_PIPE_MMIO_START;
391+
end_range = ADLP_PIPE_MMIO_END;
392+
} else if (DISPLAY_VER(i915) >= 12) {
393+
start_range = TGL_PIPE_MMIO_START(dmc_id);
394+
end_range = TGL_PIPE_MMIO_END(dmc_id);
395+
} else {
396+
drm_warn(&i915->drm, "Unknown mmio range for sanity check");
397+
return false;
398+
}
399+
400+
for (i = 0; i < mmio_count; i++) {
401+
if (mmioaddr[i] < start_range || mmioaddr[i] > end_range)
402+
return false;
403+
}
404+
405+
return true;
406+
}
407+
370408
static u32 parse_dmc_fw_header(struct intel_dmc *dmc,
371409
const struct intel_dmc_header_base *dmc_header,
372410
size_t rem_size, u8 dmc_id)
@@ -436,6 +474,12 @@ static u32 parse_dmc_fw_header(struct intel_dmc *dmc,
436474
return 0;
437475
}
438476

477+
if (!dmc_mmio_addr_sanity_check(dmc, mmioaddr, mmio_count,
478+
dmc_header->header_ver, dmc_id)) {
479+
drm_err(&i915->drm, "DMC firmware has Wrong MMIO Addresses\n");
480+
return 0;
481+
}
482+
439483
for (i = 0; i < mmio_count; i++) {
440484
dmc_info->mmioaddr[i] = _MMIO(mmioaddr[i]);
441485
dmc_info->mmiodata[i] = mmiodata[i];

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5501,6 +5501,22 @@
55015501
/* MMIO address range for DMC program (0x80000 - 0x82FFF) */
55025502
#define DMC_MMIO_START_RANGE 0x80000
55035503
#define DMC_MMIO_END_RANGE 0x8FFFF
5504+
#define DMC_V1_MMIO_START_RANGE 0x80000
5505+
#define TGL_MAIN_MMIO_START 0x8F000
5506+
#define TGL_MAIN_MMIO_END 0x8FFFF
5507+
#define _TGL_PIPEA_MMIO_START 0x92000
5508+
#define _TGL_PIPEA_MMIO_END 0x93FFF
5509+
#define _TGL_PIPEB_MMIO_START 0x96000
5510+
#define _TGL_PIPEB_MMIO_END 0x97FFF
5511+
#define ADLP_PIPE_MMIO_START 0x5F000
5512+
#define ADLP_PIPE_MMIO_END 0x5FFFF
5513+
5514+
#define TGL_PIPE_MMIO_START(dmc_id) _PICK_EVEN(((dmc_id) - 1), _TGL_PIPEA_MMIO_START,\
5515+
_TGL_PIPEB_MMIO_START)
5516+
5517+
#define TGL_PIPE_MMIO_END(dmc_id) _PICK_EVEN(((dmc_id) - 1), _TGL_PIPEA_MMIO_END,\
5518+
_TGL_PIPEB_MMIO_END)
5519+
55045520
#define SKL_DMC_DC3_DC5_COUNT _MMIO(0x80030)
55055521
#define SKL_DMC_DC5_DC6_COUNT _MMIO(0x8002C)
55065522
#define BXT_DMC_DC3_DC5_COUNT _MMIO(0x80038)

0 commit comments

Comments
 (0)