From nobody Wed Dec 17 22:59:35 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 C1A6DC61D92 for ; Tue, 21 Nov 2023 12:19:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234585AbjKUMTB (ORCPT ); Tue, 21 Nov 2023 07:19:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230428AbjKUMS7 (ORCPT ); Tue, 21 Nov 2023 07:18:59 -0500 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82D88183 for ; Tue, 21 Nov 2023 04:18:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1700569135; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gw3SJ//CYccv+LfEcReK3mjikYD+hKyjOkLSU+xz4JM=; b=RDPvXq0i3nNF4Pmw1IKlDunV1rU43IBjJ9yl9xtkGXc4WMtj+peZUzsf XrVR0gfvB6NiOTWUSqdSd4NpZTEPKluPiGrDAJ3lTokHrGuzxJ1MbvCc3 v+vvU61IWn0mifj1FsEt5raFo5jdpfbau1kirBu2IQXj5vH6h7l5zy1lg Q=; X-CSE-ConnectionGUID: FmN2m58OQJ6Gedl0bVHtOw== X-CSE-MsgGUID: 1prvCd9oQ162SCnUiibNeA== Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 4.0 X-MesageID: 131026723 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.159.70 X-Policy: $RELAYED X-ThreatScanner-Verdict: Negative IronPort-Data: A9a23:47AA8aghrZVL9B4zjtlgabxkX161uBAKZh0ujC45NGQN5FlHY01je htvUW/QOK2CNjekL94gYdnk8h8C6pLSnNNhGgA+/ilgE3kb9cadCdqndUqhZCn6wu8v7q5Ex 55HNoSfdpBcolv0/ErF3m3J9CEkvU2wbuOhTraCYmYoHVMMpB4J0XpLg/Q+jpNjne+3CgaMv cKai8DEMRqu1iUc3lg8sspvkzsx+qyu0N8klgZmP6sS5QWHzyB94K83fsldEVOpGuG4IcbiL wrz5OnR1n/U+R4rFuSknt7TGqHdauePVeQmoiM+t5mK2nCulARrukoIHKN0hXNsoyeIh7hMJ OBl7vRcf+uL0prkw4zxWzEAe8130DYvFLXveRBTuuTLp6HKnueFL1yDwyjaMKVBktubD12i+ tQ2LRZXa03ToNuUnp22Ru00jPoDMO70adZ3VnFIlVk1DN4jSJHHBa7L+cVZzHE7gcUm8fT2P pRDL2A1NVKZPkwJZQ9/5JEWxY9EglHWdTFCpU3Tjq0w+2XJlyR60aT3McqTcduPLSlQth/D/ zqcoTujWXn2MvTG0SCb2X79gdaWw3nAc4QvFbyy0PND1Qj7Kms7V0RNCArTTeOCoky5QdV3e 0YF5ic1668o+ySDVcTnVgO1rTifowIcWtlNF/Uz7gCR4qPR70CSAW1sZiFAbNgOt8IsQzEuk FiTkLvBHztlsbvTTG+H7reFhTqoPG4eKmpqTSMbSBRfy9jlrps6gh/GQpBkCqHdptf8HjXth TSXhCw/gagDy88Ny6i/u1vAhlqEp5/MSxMd4gTMQnnj6gJ/eZ7ja4G2gXDf7PBdPMOaQ0OHs XwshceT9qYNAIuLmSjLR/8CdJm5t6itLjLRmxhsEoMn+jDr/GSsFb28+xkneh0vaJxdP2a0M QmM4Wu9+aO/IlOEaIktZt/hLP0Ik4ftGdC9XM70cv1RN80ZmBC8wM1+WaKB9zmyyBBwwP9lY MnzTCq6MZoN5U1aINuKqwQ1i+ZDKtgWnz+7eHwC503PPUCiTHCUU6wZF1CFc/o06qiJyC2Mr I4HapPXkUkGCbKgCsUyzWL1BQpSRZTcLcquw/G7i8bZelY2cI3fI6O5LUwdl3xNwP0Oy7agE oCVUU5E0lvv7UAr2i3TAk2PnIjHBM4lxVpiZHxEALpd8yR7CWpZxPtFJsRfkHhO3LAL8MOYu NFfIp/cXa0fEm+ek9nfBLGkxLFfmN2QrVrmF0KYjPIXJvaMmyShFgfYQzbS IronPort-HdrOrdr: A9a23:CCsZV68zPzvxS5+Ly1puk+DcI+orL9Y04lQ7vn2ZHyYlFvBw9v rPoB1173TJYVoqMk3I+urgBEDjexzhHMVOkOws1N6ZNWHbUQ2TQb2KhrGN/9SPIUHDHkE279 YGT0DTYueAbmSTLKzBkWuFL+o= X-Talos-CUID: 9a23:j9e0G28UUi1SBL7nK+mVv2ARPJogLy369VWODEK0DT5jdp2JbkDFrQ== X-Talos-MUID: =?us-ascii?q?9a23=3AGaz4nQyLmsX8fjhD+VjXWO7UnN+aqP22El4mncQ?= =?us-ascii?q?BgpDabxdbPQqcjT6RT6Zyfw=3D=3D?= X-IronPort-AV: E=Sophos;i="6.04,215,1695700800"; d="scan'208";a="131026723" From: Andrew Cooper To: LKML CC: Andrew Cooper , Joerg Roedel , Suravee Suthikulpanit , Will Deacon , Robin Murphy , David Woodhouse , Lu Baolu , , Subject: x86/apic: Further apic::delivery_mode cleanup Date: Tue, 21 Nov 2023 12:18:49 +0000 Message-ID: <20231121121849.1441264-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@vger.kernel.org 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;