From patchwork Mon Dec 9 15:07:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 11279579 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 445B41575 for ; Mon, 9 Dec 2019 15:08:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1D7C02077B for ; Mon, 9 Dec 2019 15:08:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WWXbi1pm"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RCFZsnYA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D7C02077B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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=WjDPyrC0JN4EXcGbOkubvTNV8kzh4BpYaf/ysXAlYfA=; b=WWXbi1pmVeWd3l XPGQOXENJOghyZ72RIPvSKJCu0YhqA46VzIyqm7glkGbHMPLCtcJ4nMbZsUVD3bowYtP4W5LPfvjb /3h2KKOQIzYkPNXzWzw9PtfZHjPTlHySCPA1m9VEs8PVO4nX52aMdXA/AezC9mWZl6Oc3yz4r1W3x q8rzM22Ckgrggl7OHF/TMBx4eGmHkiiWdDAQH5VALPQwsVoJQQF/k9o4TdbzhiYF5ukg5fxDOJRKG +ioTNudBCkAUIdAWWVSTBEaHShbklKImSjccn77EC3W6uVL3wUtUW+zFpfYF2afIPXEv88pxcMBiy XQHxWMws6hmJ8+mA/LkA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ieKe3-0007H0-7Q; Mon, 09 Dec 2019 15:08:19 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ieKdk-00076X-D1 for linux-arm-kernel@lists.infradead.org; Mon, 09 Dec 2019 15:08:05 +0000 Received: by mail-wm1-x341.google.com with SMTP id s14so15306637wmh.4 for ; Mon, 09 Dec 2019 07:08:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SCh0DvmuPvNnvwyZrUn1Yxeo2DKZuHbBZB63XGCCkS0=; b=RCFZsnYA0ah3RgaH4YcQ8lshQjU7h/V8oku0vGmhP4oE9Wtew3Cf9yl2hieQG5wrK6 Ix2xPTip9Dd4NRjiWUdsWMp61s5znz2sevxNPEMTWQxZyd3pq8l77DoTAHRRhmp85Uy+ iZCodqQIhd+4nvvloniqdKNiV+iuR0PKJabToorhlsWVZi9BzSg1EqvtudbeqB0RAwja T+sdZ2DJRdFhDap4NVifzs3S4ANB8VN1e32SPvQ5xJj7Wza5fCalFMyYIlsvBm6aleBN L0hAyV5gu3bi8DdTiU+RSIPy+Yb1Z7X3/j54c4/9x3aMMtnsjxLc3qt5MBZq+IenwAia 7VKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SCh0DvmuPvNnvwyZrUn1Yxeo2DKZuHbBZB63XGCCkS0=; b=GV9F/mDm09UsrXO3jPD9BvZxb/pKkPN6/FpN7H9ZdNsxNl3ndXRvkIEt528jCEALVZ p7m94I2CEDeVdPtq/YusRS8xtPCvp+LDbwZu0ALm5XZJ4jfDVlOkv/6BcVW4FsGGBC/0 Ir2F4ekdoNEKXbk6UrYedSEz4vpiQNpevTSXET7vBF7x9MVzaiMJAT2cCkT1OrqmuT44 CjZV0fjaxALkwS8cySaBDbsWjev/+7aZLzFXStvqnsY4xGcJjI/miuw4JpOSCJ1Al4/7 xj7zgDDrnsLushVUquuybVV4nEEFDMWG1cyhzYxwMUn2nQU87fe2RzCycWAO1A7gEenB NzCw== X-Gm-Message-State: APjAAAVzWURihPIMNzcbIvn2dSXYl88WhQlMejJRz6AkwbnguezUEMPf NObjPzuRlLEqkCN1+DeQq7AvL+8R X-Google-Smtp-Source: APXvYqxl2jgGeV/nQbJT4WcN79CWmM1WA8NXKH9i0hXyR/42inKaAVju+sJOobjHc7cEOfabhQZ6KA== X-Received: by 2002:a1c:c90e:: with SMTP id f14mr25155761wmb.47.1575904079019; Mon, 09 Dec 2019 07:07:59 -0800 (PST) Received: from localhost (pD9E518ED.dip0.t-ipconnect.de. [217.229.24.237]) by smtp.gmail.com with ESMTPSA id 4sm41628wmg.22.2019.12.09.07.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 07:07:58 -0800 (PST) From: Thierry Reding To: Joerg Roedel Subject: [RFC 1/2] iommu: arm-smmu: Extract arm_smmu_of_parse() Date: Mon, 9 Dec 2019 16:07:47 +0100 Message-Id: <20191209150748.2471814-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191209150748.2471814-1-thierry.reding@gmail.com> References: <20191209150748.2471814-1-thierry.reding@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191209_070804_352969_7AA46C4D X-CRM114-Status: GOOD ( 11.34 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (thierry.reding[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, Robin Murphy , iommu@lists.linux-foundation.org, Will Deacon , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Thierry Reding This function will be subsequently used to extract stream ID information early, before a struct device is available. Signed-off-by: Thierry Reding --- drivers/iommu/arm-smmu.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index d1aef07bb784..5c5cf942077e 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1545,18 +1545,28 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain, return ret; } -static int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args) +static u32 arm_smmu_of_parse(struct device_node *np, const u32 *args, + unsigned int count) { - u32 mask, fwid = 0; + u32 fwid = 0, mask; - if (args->args_count > 0) - fwid |= FIELD_PREP(SMR_ID, args->args[0]); + if (count > 0) + fwid |= FIELD_PREP(SMR_ID, args[0]); - if (args->args_count > 1) - fwid |= FIELD_PREP(SMR_MASK, args->args[1]); - else if (!of_property_read_u32(args->np, "stream-match-mask", &mask)) + if (count > 1) + fwid |= FIELD_PREP(SMR_MASK, args[1]); + else if (!of_property_read_u32(np, "stream-match-mask", &mask)) fwid |= FIELD_PREP(SMR_MASK, mask); + return fwid; +} + +static int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args) +{ + u32 fwid; + + fwid = arm_smmu_of_parse(args->np, args->args, args->args_count); + return iommu_fwspec_add_ids(dev, &fwid, 1); } From patchwork Mon Dec 9 15:07:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 11279581 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E82DC1575 for ; Mon, 9 Dec 2019 15:08:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C65692077B for ; Mon, 9 Dec 2019 15:08:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sKI2PmkQ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Fa4RXbBA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C65692077B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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=hdKAMARBUjfN7Ye/Nh74gpo/pem0+shDMtUGE9RgTxY=; b=sKI2PmkQpYArcZ 3L8gCNLrAc8D9R73MylaXdgxDHojW+0NvkKu4t8MpSHQMhMrH1af0YlAA9DFnPA19cUFROa8rDAge 5LJJWPm43mLDWiHLf6I5tL51yfmXrLtf74V/o9gVf1xGH/AqguTPJFG1UIncBwnUHllau2u46wmXb 2UA/qTqC/uFvLvo/0Wa22X5DJgDTNAxR6W83q0e6TjXcU3m+sCinWePYux+cvRDz9ZqNDD+fJcuPG wOKK/swsQA69CIf9gyftXmOUzj89dXfENL5yZUz/S+PDr24ROIriNPAoIMEF/6uv6KOT3nH71uGez J1ZVxoyCC1a82ezu504Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ieKeK-0007W3-QR; Mon, 09 Dec 2019 15:08:36 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ieKdm-00076c-F3 for linux-arm-kernel@lists.infradead.org; Mon, 09 Dec 2019 15:08:07 +0000 Received: by mail-wr1-x443.google.com with SMTP id a15so16554956wrf.9 for ; Mon, 09 Dec 2019 07:08:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+0yDUeTD5IG+4BWjUfB/nA7nMy0gk8KKKoJnAfbpkus=; b=Fa4RXbBA/dzpqqE7Q2X1QZuaSda6lHr6K3iDmfK3kVD1hPE1flW+yfRP6fTlCIvJEM XlmirpMaq5nBLXSu3u+vIYsNQJqTBfBQpXqCNUh+rYc3vB7qpW7vg8wPYsj2IKTRzwpc FtcfCQmvngK/+/S3tzwzPc2MASbMSUBymnTKJlsd6QdarWt2+hKre5ydqf1RrCzN6Bfg IL332IaEYIPG0GyOiudYoCRLdvoi0IWlEwCjVz2floFlYMPOCvnHvVlsBpgYx5Xmw7mq n0LLxMNEAQ73L0w1detei3RljY3E5WC3P/RVM27wm013ooIEcsbhAwxwPQabqKHEPU+8 D/2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+0yDUeTD5IG+4BWjUfB/nA7nMy0gk8KKKoJnAfbpkus=; b=O6RzGEm/yTzYZYY495rFfTRpIt8Oq+qGOG/CFlVoxpNQwY8cNj+aIDVMDKwfHtUNsU St5qMi0kCuvwm+LX/e0utRsvccsQlb1Mwpre3iYuESHQkqQuDLcbeaaMrUscXWkIqM6t caCspUjcKbSAq9tL42PxXE2blwa1RF0sAvuPlsZSXWk78o926JURvxOMdBujqV3nrat6 A+NVwhIf8utASyTePTPhCA6FjWUDfLYfwgclr5rsVbnR5TXMYJsYvGlA1qeISNc1cgJs JeOEd/lfyxk4NQroD/iQ3433HMfOw1KRIpffKAS9HK2EkNYWaQW69OXHdyhgbIjxBDJa xPCw== X-Gm-Message-State: APjAAAXhiOUkAGHE2F9O9zu37i2FnNS1YLNLm4siGPz3mq4WhvxDwxo3 wRisryGtV4yeMGoG2qLbA2U= X-Google-Smtp-Source: APXvYqzKYBI5tUvQ+voqNbricq/0CHkIRnXizQUPgmkqDJFCfbRD3puqfAuoDUQ9fm7svXx3n/8XSA== X-Received: by 2002:a5d:4392:: with SMTP id i18mr2794732wrq.199.1575904081099; Mon, 09 Dec 2019 07:08:01 -0800 (PST) Received: from localhost (pD9E518ED.dip0.t-ipconnect.de. [217.229.24.237]) by smtp.gmail.com with ESMTPSA id z189sm80287wmc.2.2019.12.09.07.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 07:08:00 -0800 (PST) From: Thierry Reding To: Joerg Roedel Subject: [RFC 2/2] iommu: arm-smmu: Add support for early direct mappings Date: Mon, 9 Dec 2019 16:07:48 +0100 Message-Id: <20191209150748.2471814-3-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191209150748.2471814-1-thierry.reding@gmail.com> References: <20191209150748.2471814-1-thierry.reding@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191209_070804_353725_DFD4FEA9 X-CRM114-Status: GOOD ( 21.29 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (thierry.reding[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, Robin Murphy , iommu@lists.linux-foundation.org, Will Deacon , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Thierry Reding On platforms, the firmware will setup hardware to read from a given region of memory. One such example is a display controller that is scanning out a splash screen from physical memory. During Linux's boot process, the ARM SMMU will configure all contexts to fault by default. This means that memory accesses that happen by an SMMU master before its driver has had a chance to properly set up the IOMMU will cause a fault. This is especially annoying for something like the display controller scanning out a splash screen because the faults will result in the display controller getting bogus data (all-ones on Tegra) and since it repeatedly scans that framebuffer, it will keep triggering such faults and spam the boot log with them. In order to work around such problems, scan the device tree for IOMMU masters and set up a special identity domain that will map 1:1 all of the reserved regions associated with them. This happens before the SMMU is enabled, so that the mappings are already set up before translations begin. TODO: remove identity domain when no longer in use Signed-off-by: Thierry Reding --- drivers/iommu/arm-smmu.c | 171 ++++++++++++++++++++++++++++++++++++++- drivers/iommu/arm-smmu.h | 2 + 2 files changed, 172 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 5c5cf942077e..fe0c0975d4e2 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1887,6 +1887,171 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) return 0; } +static int arm_smmu_identity_map_regions(struct arm_smmu_device *smmu, + struct device_node *np) +{ + struct device *dev = smmu->dev; + struct of_phandle_iterator it; + unsigned long page_size; + unsigned int count = 0; + int ret; + + page_size = 1UL << __ffs(smmu->identity->pgsize_bitmap); + + /* parse memory regions and add them to the identity mapping */ + of_for_each_phandle(&it, ret, np, "memory-region", NULL, 0) { + int prot = IOMMU_READ | IOMMU_WRITE; + dma_addr_t start, limit, iova; + struct resource res; + + ret = of_address_to_resource(it.node, 0, &res); + if (ret < 0) { + dev_err(dev, "failed to parse memory region %pOF: %d\n", + it.node, ret); + continue; + } + + /* check that region is not empty */ + if (resource_size(&res) == 0) { + dev_dbg(dev, "skipping empty memory region %pOF\n", + it.node); + continue; + } + + start = ALIGN(res.start, page_size); + limit = ALIGN(res.start + resource_size(&res), page_size); + + for (iova = start; iova < limit; iova += page_size) { + phys_addr_t phys; + + /* check that this IOVA isn't already mapped */ + phys = iommu_iova_to_phys(smmu->identity, iova); + if (phys) + continue; + + ret = iommu_map(smmu->identity, iova, iova, page_size, + prot); + if (ret < 0) { + dev_err(dev, "failed to map %pad for %pOF: %d\n", + &iova, it.node, ret); + continue; + } + } + + dev_dbg(dev, "identity mapped memory region %pR\n", &res); + count++; + } + + return count; +} + +static int arm_smmu_identity_add_master(struct arm_smmu_device *smmu, + struct of_phandle_args *args) +{ + struct arm_smmu_domain *identity = to_smmu_domain(smmu->identity); + struct arm_smmu_smr *smrs = smmu->smrs; + struct device *dev = smmu->dev; + unsigned int index; + u16 sid, mask; + u32 fwid; + int ret; + + /* skip masters that aren't ours */ + if (args->np != dev->of_node) + return 0; + + fwid = arm_smmu_of_parse(args->np, args->args, args->args_count); + sid = FIELD_GET(SMR_ID, fwid); + mask = FIELD_GET(SMR_MASK, fwid); + + ret = arm_smmu_find_sme(smmu, sid, mask); + if (ret < 0) { + dev_err(dev, "failed to find SME: %d\n", ret); + return ret; + } + + index = ret; + + if (smrs && smmu->s2crs[index].count == 0) { + smrs[index].id = sid; + smrs[index].mask = mask; + smrs[index].valid = true; + } + + smmu->s2crs[index].type = S2CR_TYPE_TRANS; + smmu->s2crs[index].privcfg = S2CR_PRIVCFG_DEFAULT; + smmu->s2crs[index].cbndx = identity->cfg.cbndx; + smmu->s2crs[index].count++; + + return 0; +} + +static int arm_smmu_identity_add_device(struct arm_smmu_device *smmu, + struct device_node *np) +{ + struct of_phandle_args args; + unsigned int index = 0; + int ret; + + /* add stream IDs to the identity mapping */ + while (!of_parse_phandle_with_args(np, "iommus", "#iommu-cells", + index, &args)) { + ret = arm_smmu_identity_add_master(smmu, &args); + if (ret < 0) + return ret; + + index++; + } + + return 0; +} + +static int arm_smmu_setup_identity(struct arm_smmu_device *smmu) +{ + struct arm_smmu_domain *identity; + struct device *dev = smmu->dev; + struct device_node *np; + int ret; + + /* create early identity mapping */ + smmu->identity = arm_smmu_domain_alloc(IOMMU_DOMAIN_UNMANAGED); + if (!smmu->identity) { + dev_err(dev, "failed to create identity domain\n"); + return -ENOMEM; + } + + smmu->identity->pgsize_bitmap = smmu->pgsize_bitmap; + smmu->identity->type = IOMMU_DOMAIN_UNMANAGED; + smmu->identity->ops = &arm_smmu_ops; + + ret = arm_smmu_init_domain_context(smmu->identity, smmu); + if (ret < 0) { + dev_err(dev, "failed to initialize identity domain: %d\n", ret); + return ret; + } + + identity = to_smmu_domain(smmu->identity); + + for_each_node_with_property(np, "iommus") { + ret = arm_smmu_identity_map_regions(smmu, np); + if (ret < 0) + continue; + + /* + * Do not add devices to the early identity mapping if they + * do not define any memory-regions. + */ + if (ret == 0) + continue; + + ret = arm_smmu_identity_add_device(smmu, np); + if (ret < 0) + continue; + } + + return 0; +} + struct arm_smmu_match_data { enum arm_smmu_arch_version version; enum arm_smmu_implementation model; @@ -2127,6 +2292,10 @@ static int arm_smmu_device_probe(struct platform_device *pdev) if (err) return err; + err = arm_smmu_setup_identity(smmu); + if (err) + return err; + if (smmu->version == ARM_SMMU_V2) { if (smmu->num_context_banks > smmu->num_context_irqs) { dev_err(dev, @@ -2169,8 +2338,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, smmu); - arm_smmu_device_reset(smmu); arm_smmu_test_smr_masks(smmu); + arm_smmu_device_reset(smmu); /* * We want to avoid touching dev->power.lock in fastpaths unless diff --git a/drivers/iommu/arm-smmu.h b/drivers/iommu/arm-smmu.h index 6b6b877135de..001e60a3d18c 100644 --- a/drivers/iommu/arm-smmu.h +++ b/drivers/iommu/arm-smmu.h @@ -280,6 +280,8 @@ struct arm_smmu_device { /* IOMMU core code handle */ struct iommu_device iommu; + + struct iommu_domain *identity; }; enum arm_smmu_context_fmt {