Skip to content

Commit c473761

Browse files
ausyskinThomas Hellström
authored andcommitted
drm/xe/nvm: fix writable override for CRI
The witable override should be set when FDO_MODE bit is enabled. Fix the comparison to distingush this case from legacy systems where bit should be disabled to have override. Cc: stable@vger.kernel.org Fixes: 9dde74f ("drm/xe/nvm: enable cri platform") Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patch.msgid.link/20260714-cri_nvm_fdo_flip-v2-1-14580e71b58e@intel.com Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> (cherry picked from commit 2007be1) Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
1 parent 6277552 commit c473761

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

drivers/gpu/drm/xe/xe_nvm.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,35 +60,40 @@ static bool xe_nvm_writable_override(struct xe_device *xe)
6060
struct xe_mmio *mmio = xe_root_tile_mmio(xe);
6161
bool writable_override;
6262
struct xe_reg reg;
63-
u32 test_bit;
63+
u32 test_bit, test_val;
6464

6565
switch (xe->info.platform) {
6666
case XE_CRESCENTISLAND:
6767
reg = PCODE_SCRATCH(0);
6868
test_bit = FDO_MODE;
69+
test_val = FDO_MODE;
6970
break;
7071
case XE_BATTLEMAGE:
7172
reg = HECI_FWSTS2(DG2_GSC_HECI2_BASE);
7273
test_bit = HECI_FW_STATUS_2_NVM_ACCESS_MODE;
74+
test_val = 0;
7375
break;
7476
case XE_PVC:
7577
reg = HECI_FWSTS2(PVC_GSC_HECI2_BASE);
7678
test_bit = HECI_FW_STATUS_2_NVM_ACCESS_MODE;
79+
test_val = 0;
7780
break;
7881
case XE_DG2:
7982
reg = HECI_FWSTS2(DG2_GSC_HECI2_BASE);
8083
test_bit = HECI_FW_STATUS_2_NVM_ACCESS_MODE;
84+
test_val = 0;
8185
break;
8286
case XE_DG1:
8387
reg = HECI_FWSTS2(DG1_GSC_HECI2_BASE);
8488
test_bit = HECI_FW_STATUS_2_NVM_ACCESS_MODE;
89+
test_val = 0;
8590
break;
8691
default:
8792
drm_err(&xe->drm, "Unknown platform\n");
8893
return true;
8994
}
9095

91-
writable_override = !(xe_mmio_read32(mmio, reg) & test_bit);
96+
writable_override = (xe_mmio_read32(mmio, reg) & test_bit) == test_val;
9297
if (writable_override)
9398
drm_info(&xe->drm, "NVM access overridden by jumper\n");
9499
return writable_override;

0 commit comments

Comments
 (0)