Messages in this thread Patch in this message | | | From | Andrew Cooper <> | Subject | [PATCH RESEND] x86/apic: Further apic::delivery_mode cleanup | Date | Tue, 21 Nov 2023 12:30:34 +0000 |
| |
Fold the APIC_DELIVERY_MODE_FIXED constant in more cases now that the apic field has disappeared.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Joerg Roedel <joro@8bytes.org> CC: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> CC: Will Deacon <will@kernel.org> CC: Robin Murphy <robin.murphy@arm.com> CC: David Woodhouse <dwmw2@infradead.org> CC: Lu Baolu <baolu.lu@linux.intel.com> CC: iommu@lists.linux.dev CC: linux-kernel@vger.kernel.org CC: x86@kernel.org CC: Borislav Petkov <bp@alien8.de> CC: Thomas Gleixner <tglx@linutronix.de>
RESEND, this time with working x86 maintainer emails.
Does this want a fixes tag? If so,
Fixes: b5148dfe66f5 ("x86/apic: Drop apic::delivery_mode")
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 95bd7c25ba6f..542b823f9827 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -3311,7 +3311,7 @@ static void irq_remapping_prepare_irte(struct amd_ir_data *data, data->irq_2_irte.devid = devid; data->irq_2_irte.index = index + sub_handle; - iommu->irte_ops->prepare(data->entry, apic->delivery_mode, + iommu->irte_ops->prepare(data->entry, APIC_DELIVERY_MODE_FIXED, apic->dest_mode_logical, irq_cfg->vector, irq_cfg->dest_apicid, devid); @@ -3588,7 +3588,7 @@ int amd_iommu_deactivate_guest_mode(void *data) entry->lo.fields_remap.valid = valid; entry->lo.fields_remap.dm = apic->dest_mode_logical; - entry->lo.fields_remap.int_type = apic->delivery_mode; + entry->lo.fields_remap.int_type = APIC_DELIVERY_MODE_FIXED; entry->hi.fields.vector = cfg->vector; entry->lo.fields_remap.destination = APICID_TO_IRTE_DEST_LO(cfg->dest_apicid); diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c index 29b9e55dcf26..566297bc87dd 100644 --- a/drivers/iommu/intel/irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -1112,7 +1112,7 @@ static void prepare_irte(struct irte *irte, int vector, unsigned int dest) * irq migration in the presence of interrupt-remapping. */ irte->trigger_mode = 0; - irte->dlvry_mode = apic->delivery_mode; + irte->dlvry_mode = APIC_DELIVERY_MODE_FIXED; irte->vector = vector; irte->dest_id = IRTE_DEST(dest); irte->redir_hint = 1;
| |