From patchwork Thu Aug 31 08:20:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xie Yisheng X-Patchwork-Id: 9931571 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6D4A1602F0 for ; Thu, 31 Aug 2017 08:31:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CA7A2889C for ; Thu, 31 Aug 2017 08:31:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 502E7288A2; Thu, 31 Aug 2017 08:31:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BE9792889C for ; Thu, 31 Aug 2017 08:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YeWleT87EylxTvo2qqyLH8Ena+5+VbwvtNGaP4Taiac=; b=ZguRRcIrctMk4M dvwh7qG1Jp6yydnOLRqSFT2ZfUMhnDnwCzafuoRvo+TmZWYgJBPvODeHBGMtJ/lLpMnICT5XJCy1y WFnrl65J8dcSyG6oOewA5NAt+INRNaZxmdj6nO3gMXMz/xKVKBjifxP1jqYkFzc6PnMPUvAJcb2LU 8Ap+qmAxJWhpD8IU1f5aRi+U/6UM1059B1tmx2gE7pDcPJkpqs+gBB/5T7C4kUOvBsJaMsD7BFUT2 PUWaGg6R/XOhyzPrVvmsfhYQwNh4oqsok35zAMl/L+RwtZqissV0hIXSTZDDuOpn2bYqxFrNfPudC EAjEkoqDuRfq4u1On5Gw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dnKsa-00047E-Lh; Thu, 31 Aug 2017 08:31:12 +0000 Received: from szxga04-in.huawei.com ([45.249.212.190]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dnKrO-0002EE-Jn for linux-arm-kernel@lists.infradead.org; Thu, 31 Aug 2017 08:30:02 +0000 Received: from 172.30.72.59 (EHLO DGGEMS402-HUB.china.huawei.com) ([172.30.72.59]) by dggrg04-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DGG21828; Thu, 31 Aug 2017 16:29:12 +0800 (CST) Received: from linux-ibm.site (10.175.102.37) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.301.0; Thu, 31 Aug 2017 16:29:01 +0800 From: Yisheng Xie To: Subject: [RFC PATCH 2/6] iommu/of: Add stall and pasid properties to iommu_fwspec Date: Thu, 31 Aug 2017 16:20:38 +0800 Message-ID: <1504167642-14922-3-git-send-email-xieyisheng1@huawei.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1504167642-14922-1-git-send-email-xieyisheng1@huawei.com> References: <1504167642-14922-1-git-send-email-xieyisheng1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A010206.59A7C8DB.004E, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: dbe049d9f6b340647d01f6f9f738850d X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170831_012959_067953_F8AC7587 X-CRM114-Status: UNSURE ( 9.10 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, lorenzo.pieralisi@arm.com, lv.zheng@intel.com, will.deacon@arm.com, joro@8bytes.org, liubo95@huawei.com, rjw@rjwysocki.net, robert.moore@intel.com, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, robh+dt@kernel.org, hanjun.guo@linaro.org, xieyisheng@huawei.com, sudeep.holla@arm.com, chenjiankang1@huawei.com, devel@acpica.org, robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org, lenb@kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jean-Philippe Brucker Add stall and pasid properties to iommu_fwspec. Signed-off-by: Jean-Philippe Brucker --- drivers/iommu/of_iommu.c | 11 +++++++++++ include/linux/iommu.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 84fa6b4..b926276 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -209,6 +209,16 @@ static bool of_pci_rc_supports_ats(struct device_node *rc_node) break; } + if (dev->iommu_fwspec) { + const __be32 *prop; + + if (of_get_property(np, "dma-can-stall", NULL)) + dev->iommu_fwspec->can_stall = true; + + prop = of_get_property(np, "pasid-bits", NULL); + if (prop) + dev->iommu_fwspec->num_pasid_bits = be32_to_cpu(*prop); + } + return ops; } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 1c5a216..5f580de 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -387,6 +387,8 @@ struct iommu_fwspec { void *iommu_priv; u32 flags; unsigned int num_ids; + unsigned long num_pasid_bits; + bool can_stall; u32 ids[1]; };