From patchwork Thu Nov 24 23:26:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 25768 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3684859wrr; Thu, 24 Nov 2022 16:34:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf65R4p0E7TW1EJYyBcBQheQG3LfSjyk+LPq9dLCOr+3Va9LTMfHszQMjjJ028miTa6jsxlF X-Received: by 2002:a63:5b0e:0:b0:476:c832:aa74 with SMTP id p14-20020a635b0e000000b00476c832aa74mr23470384pgb.456.1669336478756; Thu, 24 Nov 2022 16:34:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669336478; cv=none; d=google.com; s=arc-20160816; b=aBa3Ve85ygzmDKya3VlEUmmOJGyQtDj7j3il7dk0pCN4c7jhgp7Ve6S7QOXKRKMpCQ 9/4Vv6BzjxAuN64qySRV4bQUqWBYUUQTz+Hs2vB4DI4mHPJiGL+Gsw56l0tF9ZaEBbzJ Y4vfzvNgL+qbdLo7FPdtcuH20FchMiPOlcnAHzd1alS4/vYFMG4nTeQKvh7v7UMdzGej mAWjrDt+3HyAPwnVHP/y9v16UE+cgYcxaeatul8k+Lwu7i0IGdag6H8Plo83ZtDWcUO3 TtDxesw20GTwNunl9sv2JFy42HveDd2GqAeev0DeL9DH2A0mz290NebraQxK311SNkfU pCCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=CU97iv84FfmZ1eouToiGvE/Nlj455v2TtgsBEv4GPyg=; b=j52YMJhKOAToZCD2TfHWob/BsV+6XMDTj03J40PfsoCXBpLY8kIMntdd3Uz9+1VE07 1hMoSAO6V0wEexYJbRtXOWV1mkOZTvRa5NijxJheNgzQfilX5JohyJE4U1qQkixQsb0j edtPvOZ6de3P0AAEJUjv5k12B7A2vYvdD9lmDxPteO/7xGHYDsGVOGhXIShYIpo71LGx luhED6wauKTvWXvEUtbe1hqBEwp+kDNlu5vg+ed0wkWu6cay+iR6eowA+EJ1rjzJHYFZ XEC7Qn1iXpdBWeIHIjXg95P2RgScOJtGvVQW5TzRQ++b7n5iojC/qCUzA3Ng4p67Ro57 9glQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="mEH6I24/"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=4AG3rmFr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 1-20020a621901000000b005734ae5e1b4si1794894pfz.362.2022.11.24.16.34.25; Thu, 24 Nov 2022 16:34:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="mEH6I24/"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=4AG3rmFr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230085AbiKXXay (ORCPT + 99 others); Thu, 24 Nov 2022 18:30:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230008AbiKXXaB (ORCPT ); Thu, 24 Nov 2022 18:30:01 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 717826EB76; Thu, 24 Nov 2022 15:28:02 -0800 (PST) Message-ID: <20221124232327.081482253@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669332395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=CU97iv84FfmZ1eouToiGvE/Nlj455v2TtgsBEv4GPyg=; b=mEH6I24/5JaHzfSu02ohUthSvjaDa/eetOKY9B4TW+htv7TjKS4Zxjnmte2TsmKSs+TgqB Sauyw/ycHxhL8211OkQpJT53dInJ2dJT0iy8mot93OBiaBw+AG6oXfNqK3hO8FVsLLHhPS UXnzHiHZd1r/de8cF/8mcJbNkdVdEqcUYBpAM/P5PObJbS0jnnw+CCqZDfBBPOq+BjpyI0 EKQJGWXSVfdPq7NmEFp0XFit/EQj9MS7n+G8BDZeuVrhs8jR/v3NKZZOjzebaDrDSYGjny +a0VTwOEyGmy0/D9ee3SLPe7fSWP8UqNklpA7rSgIxgeU2KeauCm7iogfLDVkw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669332395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=CU97iv84FfmZ1eouToiGvE/Nlj455v2TtgsBEv4GPyg=; b=4AG3rmFrHnCbABF7YKqqCd5OwwW3P6xrVWc0sBk8qufCuR+dAayM9fy/4QFQcJa2jK0FOi iguQdNqPP2+mJaBw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Joerg Roedel , Will Deacon , linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , Marc Zyngier , Greg Kroah-Hartman , Jason Gunthorpe , Dave Jiang , Alex Williamson , Kevin Tian , Dan Williams , Logan Gunthorpe , Ashok Raj , Jon Mason , Allen Hubbe Subject: [patch V3 31/33] iommu/vt-d: Enable PCI/IMS References: <20221124230505.073418677@linutronix.de> MIME-Version: 1.0 Date: Fri, 25 Nov 2022 00:26:34 +0100 (CET) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750426167857201762?= X-GMAIL-MSGID: =?utf-8?q?1750426167857201762?= PCI/IMS works like PCI/MSI-X in the remapping. Just add the feature flag, but only when on real hardware. Virtualized IOMMUs need additional support, e.g. for PASID. Signed-off-by: Thomas Gleixner --- V3: Only enable on real hardware (Kevin) --- drivers/iommu/intel/irq_remapping.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) --- a/drivers/iommu/intel/irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -82,7 +82,7 @@ static const struct irq_domain_ops intel static void iommu_disable_irq_remapping(struct intel_iommu *iommu); static int __init parse_ioapics_under_ir(void); -static const struct msi_parent_ops dmar_msi_parent_ops; +static const struct msi_parent_ops dmar_msi_parent_ops, virt_dmar_msi_parent_ops; static bool ir_pre_enabled(struct intel_iommu *iommu) { @@ -577,7 +577,11 @@ static int intel_setup_irq_remapping(str irq_domain_update_bus_token(iommu->ir_domain, DOMAIN_BUS_DMAR); iommu->ir_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT; - iommu->ir_domain->msi_parent_ops = &dmar_msi_parent_ops; + + if (cap_caching_mode(iommu->cap)) + iommu->ir_domain->msi_parent_ops = &virt_dmar_msi_parent_ops; + else + iommu->ir_domain->msi_parent_ops = &dmar_msi_parent_ops; ir_table->base = page_address(pages); ir_table->bitmap = bitmap; @@ -1429,11 +1433,20 @@ static const struct irq_domain_ops intel }; static const struct msi_parent_ops dmar_msi_parent_ops = { - .supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED | MSI_FLAG_MULTI_PCI_MSI, + .supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED | + MSI_FLAG_MULTI_PCI_MSI | + MSI_FLAG_PCI_IMS, .prefix = "IR-", .init_dev_msi_info = msi_parent_init_dev_msi_info, }; +static const struct msi_parent_ops virt_dmar_msi_parent_ops = { + .supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED | + MSI_FLAG_MULTI_PCI_MSI, + .prefix = "vIR-", + .init_dev_msi_info = msi_parent_init_dev_msi_info, +}; + /* * Support of Interrupt Remapping Unit Hotplug */