From nobody Wed Dec 17 22:42:44 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 636E1C61D92 for ; Tue, 21 Nov 2023 12:30:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234658AbjKUMar (ORCPT ); Tue, 21 Nov 2023 07:30:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231360AbjKUMap (ORCPT ); Tue, 21 Nov 2023 07:30:45 -0500 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84D20110 for ; Tue, 21 Nov 2023 04:30:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1700569841; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OfoVueAJlT4dRW0E9lJhs8DFNbsX126SwsKVxUZs1vM=; b=Hw+QBC64h14vVso/YFbot4/5HQqugvyceaaSdd79WsIsk8IPdXQ6yQi/ TzuXKJeZ/2jPG2uHrM5JtM7NR04PbgMUH2EQtYdXAiZPto+s3iT7YyzPB bgCLHmoyqyfJGfoJozvQqaWZlFu4FweXPgKbGG7kc+Sz2/Tl49hFugN9F Q=; X-CSE-ConnectionGUID: cz63FxWPTwKsGv/+JsD3aw== X-CSE-MsgGUID: AlsNrc4xQm26dA3J7Mc9YQ== Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 4.0 X-MesageID: 126809421 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.159.70 X-Policy: $RELAYED X-ThreatScanner-Verdict: Negative IronPort-Data: A9a23:5Apvj6zl1a/4qeD0xe96t+fIxirEfRIJ4+MujC+fZmUNrF6WrkUGy GIfDGqCbvyNamPyf9AlOtni804C6pKDytdlTgQ/+CAxQypGp/SeCIXCJC8cHc8wwu7rFxs7s ppEOrEsCOhuExcwcz/0auCJQUFUjPzOHvykTrecZkidfCc8IA85kxVvhuUltYBhhNm9Emult Mj75sbSIzdJ4RYtWo4vw/zF8E8HUMja4mtC5QVnP6kT5TcyqlFOZH4hDfDpR5fHatE88t6SH 47r0Ly/92XFyBYhYvvNfmHTKxBirhb6ZGBiu1IOM0SQqkEqSh8ai87XAME0e0ZP4whlqvgqo Dl7WT5cfi9yVkHEsLx1vxC1iEiSN4UekFPMCSDXXcB+UyQq2pYjqhljJBheAGEWxgp4KWpcq 6c2OA81Ug+gnM2oh/GZUcU3j9t2eaEHPKtH0p1h5TTQDPJgSpHfWaTao9Rf2V/chOgXQ6yYP ZBAL2MyPVKfO3WjOX9OYH46tM6uimPybHtzr1WNqLBsy2PS0BZwwP7mN9+9ltmiHJ8Lzh7J+ jifl4j/KjgeL/qFwmaVy3f22OPmxgGkfYlDJYTto5aGh3XMnzdOWXX6T2CTpfi/l177WN9FL UEQ0jQhoLJ090GxSNT5GRqirxasvBkGXPIAGfwm5RrLzbDbiy6CG3INUDNMLsc7qM83RiEuz laPns/BDDlj9raSTBq17LCerDX0PDUPNW8TTSYeSE0O5NyLiI0siw2VZtdlHrS8gtD8FXf32 T/ihCI3gLEOy8oW/6G6+03XxTOqupXNCAUy423/X2Wg6x5RYI++e5fu7Vnd8OYGIIuHJnGev XwAs8uT9uYDCdeKjiPlaPVdQpmq6uyDPTmahkRgd7Er7xyk/3+ue9AW7DwWDFtmNtYsfT7vf VPJvgVQ9NlfMROXgbRfOtzrTZ5wlO65SIWjCai8gsdyjoZZfx3Zpw9+WnaswEP2v1Zr0oMkF cySbpP5ZZoFMpiL3AZaVs9EjudzmnFgnzqNLa0X2ShLxlZ3WZJ0dVvmGAHXBgzBxPnYyDg5C v4GXydw9z1RUfflfg7c+pMJIFYBIBATXM+u85EPK7Tfe1M5RgnN7sM9J5t7I+SJeIwPzo/1E oyVABcEmDITe1WbQel1VpyTQOy2BssuxZ7KFSctIUypyxAejXWHtc8im28MVeB/roRLlKckJ 8Tpju3cWpyjvByboWVCBXQ8xaQ+HCmWafWmZXP/PGdmL8Y7HmQkOLbMJ2PSycXHNQLv3eNWn lFq/lqzrUYrL+i6MPvrVQ== IronPort-HdrOrdr: A9a23:piF0vatRZjd5HolJTVmXdofB7skDTtV00zEX/kB9WHVpmszxra 6TdZMgpHnJYVcqKQkdcL+7WJVoLUmxyXcx2/h1AV7AZniAhILLFvAA0WKK+VSJcEeSygce79 YFT0EXMqyIMbEQt6fHCWeDfOrIuOP3kpyVuQ== X-Talos-CUID: 9a23:I71WkG400JmlZUQbNdss/1xKQe41TUXh01TLDFH/SkRyZOacVgrF X-Talos-MUID: =?us-ascii?q?9a23=3A6t1vTwzSTP0z8QrzsxJjyRO3wdmaqI2qE2YXmsk?= =?us-ascii?q?WgszeayBZYBXCqT/mc7Zyfw=3D=3D?= X-IronPort-AV: E=Sophos;i="6.04,215,1695700800"; d="scan'208";a="126809421" From: Andrew Cooper To: LKML CC: Andrew Cooper , Joerg Roedel , Suravee Suthikulpanit , Will Deacon , Robin Murphy , David Woodhouse , Lu Baolu , , , Borislav Petkov , Thomas Gleixner Subject: [PATCH RESEND] x86/apic: Further apic::delivery_mode cleanup Date: Tue, 21 Nov 2023 12:30:34 +0000 Message-ID: <20231121123034.1442059-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231121120411.GDZVycu2OPzz8Jqq4Z@fat_crate.local> References: <20231121120411.GDZVycu2OPzz8Jqq4Z@fat_crate.local> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fold the APIC_DELIVERY_MODE_FIXED constant in more cases now that the apic field has disappeared. Signed-off-by: Andrew Cooper --- CC: Joerg Roedel CC: Suravee Suthikulpanit CC: Will Deacon CC: Robin Murphy CC: David Woodhouse CC: Lu Baolu CC: iommu@lists.linux.dev CC: linux-kernel@vger.kernel.org CC: x86@kernel.org CC: Borislav Petkov CC: Thomas Gleixner 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, =20 data->irq_2_irte.devid =3D devid; data->irq_2_irte.index =3D 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); =20 @@ -3588,7 +3588,7 @@ int amd_iommu_deactivate_guest_mode(void *data) =20 entry->lo.fields_remap.valid =3D valid; entry->lo.fields_remap.dm =3D apic->dest_mode_logical; - entry->lo.fields_remap.int_type =3D apic->delivery_mode; + entry->lo.fields_remap.int_type =3D APIC_DELIVERY_MODE_FIXED; entry->hi.fields.vector =3D cfg->vector; entry->lo.fields_remap.destination =3D 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 vecto= r, unsigned int dest) * irq migration in the presence of interrupt-remapping. */ irte->trigger_mode =3D 0; - irte->dlvry_mode =3D apic->delivery_mode; + irte->dlvry_mode =3D APIC_DELIVERY_MODE_FIXED; irte->vector =3D vector; irte->dest_id =3D IRTE_DEST(dest); irte->redir_hint =3D 1;