Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7119903rwi; Mon, 24 Oct 2022 10:03:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6O3crkSgs7eK/2aaIvbLT+bo5xenKo4xR1PLxJSNGajOYgc9wXV6QglSGc9ouGdiByGPbZ X-Received: by 2002:a17:907:75fc:b0:7aa:e0b3:270 with SMTP id jz28-20020a17090775fc00b007aae0b30270mr1927059ejc.680.1666631028578; Mon, 24 Oct 2022 10:03:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666631028; cv=none; d=google.com; s=arc-20160816; b=bfSbIT1Y0B26lwEq8J+Z5maYKdpkA5JZV7F1PKmQjqmCB1od/RXslja58MsC/TI+w5 G7TyhA1oAKQLYnjR/HbWoqTBbaIb7+XBaTGQ4MeceSir6T4txNpnyREg4sA4h0xae2Tl ZMch6XaooP0DdJFlBofKa80+AfVTeBd/yrCa1zrF5NXjZ43PyQwF/aWY3gghRJ0SnL4d wpuLCWiQv0+XIaWL7arwUazsSUwoL6G/MMM11k37yz0cqtBRQFN1ue/udKWEHCyg6FPL 3eOlEAQnBcRxvLMLMwj3QIqK5a8lA9oiP1iCDGiwC8S15xqXsqtw1BmdHP5k1HK8kdVj kOIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=05PKpB6rwQMFfF9X7Ty7Jiv60lkaHGmM1w042ME+exk=; b=i6CWtWPbBINe6l3QgODIpF4Eo5Fp2KrVAH2onSr9kBAhHPBymL7/2vbzexgysJlEUR johwJzmyjvVUyHat9cbZQ5V27BXfKnehh1PxpgyX1IJIzYbvG4qVH1S2z2fsBNJj7use Zk6bKoBdJjdjvW3riymamIcnXaHO4YIoPtkAPUeubHPJCqsDeczd6+/DjKAEg+UxWaQc bpnk7Akl8CcCL/v/kUl/W+wc51dRlYY+AubZJ33MYIyIwxaKTTIVHho0fyT3cZEqtAzD LX4NtgUkirh/VMgTacyx+/6/zlmyagbrtpZOB9x7nMD8jtfl7049EVesX7A0Snx1Qqqn 1ZHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Zcle5CKP; 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=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l4-20020a170906230400b0078c25fb3842si201770eja.370.2022.10.24.10.03.22; Mon, 24 Oct 2022 10:03:48 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=Zcle5CKP; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235636AbiJXQyt (ORCPT + 99 others); Mon, 24 Oct 2022 12:54:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235529AbiJXQts (ORCPT ); Mon, 24 Oct 2022 12:49:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64D67DA0; Mon, 24 Oct 2022 08:33:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0428DB819F7; Mon, 24 Oct 2022 12:54:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C56EC433D7; Mon, 24 Oct 2022 12:54:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666616059; bh=xqu7Y1D0nbdqkEbtGEB1friyJ8u0gdnTjIHUhQCEvsU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zcle5CKPsmPCj3A+fcX6vn4JQ4LlkJLXSldiz915d1kViS8dK2EXEXQqVLLQukh3t b8/lrcNEcFN13P+FZqEcJGazThjjQKWUAw/vzWM7FFpFw2XvAD+SHQKviKfKLO/QFe c/QSvP5DeZq8EomfiD+6anBhHNb1AmTdx9Mo1Txs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Will Deacon , Yicong Yang , John Garry , Mathieu Poirier , Sasha Levin Subject: [PATCH 5.15 485/530] iommu/arm-smmu-v3: Make default domain type of HiSilicon PTT device to identity Date: Mon, 24 Oct 2022 13:33:49 +0200 Message-Id: <20221024113107.007187033@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 From: Yicong Yang [ Upstream commit 24b6c7798a0122012ca848ea0d25e973334266b0 ] The DMA operations of HiSilicon PTT device can only work properly with identical mappings. So add a quirk for the device to force the domain as passthrough. Acked-by: Will Deacon Signed-off-by: Yicong Yang Reviewed-by: John Garry Link: https://lore.kernel.org/r/20220816114414.4092-2-yangyicong@huawei.com Signed-off-by: Mathieu Poirier Signed-off-by: Sasha Levin --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 79edfdca6607..e7da4a47ce52 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2832,6 +2832,26 @@ static int arm_smmu_dev_disable_feature(struct device *dev, } } +/* + * HiSilicon PCIe tune and trace device can be used to trace TLP headers on the + * PCIe link and save the data to memory by DMA. The hardware is restricted to + * use identity mapping only. + */ +#define IS_HISI_PTT_DEVICE(pdev) ((pdev)->vendor == PCI_VENDOR_ID_HUAWEI && \ + (pdev)->device == 0xa12e) + +static int arm_smmu_def_domain_type(struct device *dev) +{ + if (dev_is_pci(dev)) { + struct pci_dev *pdev = to_pci_dev(dev); + + if (IS_HISI_PTT_DEVICE(pdev)) + return IOMMU_DOMAIN_IDENTITY; + } + + return 0; +} + static struct iommu_ops arm_smmu_ops = { .capable = arm_smmu_capable, .domain_alloc = arm_smmu_domain_alloc, @@ -2857,6 +2877,7 @@ static struct iommu_ops arm_smmu_ops = { .sva_unbind = arm_smmu_sva_unbind, .sva_get_pasid = arm_smmu_sva_get_pasid, .page_response = arm_smmu_page_response, + .def_domain_type = arm_smmu_def_domain_type, .pgsize_bitmap = -1UL, /* Restricted during device attach */ .owner = THIS_MODULE, }; -- 2.35.1