iommu/amd: Fix premature break in init_iommu_one() again
Subsystems (2)
Vasant Hegde
maintainerPATCH 1/1 iommu/amd: Fix premature break in init_iommu_one() again
Commit 283d245468a2 ("iommu/amd: Fix premature break in init_iommu_one()") unintentionally broke older platforms - such as the ASRockRack B550D4-4L - where the BIOS advertises incorrect IOMMU features.
Move the HATDis check ahead of the GASup check, and re-introduce the break inside the GASup check to restore correct behavior on affected platforms.
This is a short-term fix to resolve the regression. Longer term, we should rework how EFRs are tracked and prioritize the MMIO-advertised EFR over the one reported via IVRS. That requires more extensive changes and will be addressed separately.
--- drivers/iommu/amd/init.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/iommu/amd/init.c +6 -5
@@ -1914,19 +1914,20 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h,else iommu->mmio_phys_end =MMIO_CNTR_CONF_OFFSET ; +if (h->efr_attr &BIT (IOMMU_IVHD_ATTR_HATDIS_SHIFT )) { +pr_warn_once ("Host Address Translation is not supported.\n" ); + amd_iommu_hatdis = true; + } +/* XT and GAM require GA mode. */ if ((h->efr_reg & (0x1 <<IOMMU_EFR_GASUP_SHIFT )) ==0 ) { amd_iommu_guest_ir =AMD_IOMMU_GUEST_IR_LEGACY ; +break ; }else {if (h->efr_reg &BIT (IOMMU_EFR_XTSUP_SHIFT )) amd_iommu_xt_mode =IRQ_REMAP_X2APIC_MODE ; } -if (h->efr_attr &BIT (IOMMU_IVHD_ATTR_HATDIS_SHIFT )) { -pr_warn_once ("Host Address Translation is not supported.\n" ); - amd_iommu_hatdis = true; - } -early_iommu_features_init (iommu, h);break ;
Signature · 1 line
2.31.1
Quoted 14 lines · Vasant Hegde
Commit
283d245468a2("iommu/amd: Fix premature break ininit_iommu_one()") unintentionally broke older platforms - such as the ASRockRack B550D4-4L - where the BIOS advertises incorrect IOMMU features.Move the HATDis check ahead of the GASup check, and re-introduce the break inside the GASup check to restore correct behavior on affected platforms.
This is a short-term fix to resolve the regression. Longer term, we should rework how EFRs are tracked and prioritize the MMIO-advertised EFR over the one reported via IVRS. That requires more extensive changes and will be addressed separately.
Quoted 8 lines
Fixes 283d245468a2 ("iommu/amd: Fix premature break in init_iommu_one()")Reported-by Andreas Juch <[email protected]>Tested-by Andreas Juch <[email protected]>Signed-off-by Vasant Hegde <[email protected]>--- drivers/iommu/amd/init.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Queued for -rc, thanks.