From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62556C433ED for ; Tue, 20 Apr 2021 17:28:48 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 BCE20613CD for ; Tue, 20 Apr 2021 17:28:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCE20613CD 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=/APEfV1td4KKQv4NKeiHn+qk5DKrGLgXt2Wk+nVZGxY=; b=UkS9cvwfuFcD6ri009WBnKQO6 KaRQpljwAvML33mTbh9QtWCT3oHFSgNShr35DsTVrUz0ctnCFWmJ9E26NP9EQ50TvfVYZ9fP5FnJN Z4K5oP7NtBZZ6VVAa0DLLRrdKvcayaeLrAGCjkyet6ird4/2sfpdnI9I2u98f71XiTj5SHg1eO83H uK06Ge1vMrWUVCa28Fe/Pq9mjOYjZKb19LBH1YoO/tj8+Bg9RSZEqpN29s+tSU4nc8mI4BMLeGh+X SIJjAB6E6aC9eD8yiife40DLT8DEf98W0D5Hacu/mk80aCDozcD/ILLKLLzQFBumuzDxNKBS7N+/B 0V9Lj1Vbw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lYu8K-00CiZM-Pe; Tue, 20 Apr 2021 17:25:56 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lYu87-00CiWV-B9 for linux-arm-kernel@desiato.infradead.org; Tue, 20 Apr 2021 17:25:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=mZ//zvH1oExXC6NdRY4vaLjjFNQjXYZUU6cfp2n03+o=; b=zbYmXCtfTkYTIoUhf9zKeVxosA MxG3fEEv7hPDZa9jj8XfQm7V/6H4od2DQKXaTl/sUiYqHFfR74/0gn3aOlJvxbhkeWyrgmEQfIHlf f5Ac0Kg/57V0Nxl1IqBotkLCn4RmyN6uFwyc+9L/ikLok5+Xjq+rI9vMdregsbXmeCjN9mlTWXqrn wuJ5jGD5YkmFJ6C8nTqPi6sWqaOV+B+V0cYwmPzmZWeZUJan3aWbAc8un6Yc4sypuvUay9ksZ2wdX TI54bxuTzpDBTJsgm6nUkuKV8vXV2f37zOWPBxc7Ebt0FU+4x4twm1Z39bRwkJa3tG2dZsP5JMpkJ vt6k8auA==; Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lYu84-00CJKC-Kw for linux-arm-kernel@lists.infradead.org; Tue, 20 Apr 2021 17:25:42 +0000 Received: by mail-ed1-x52b.google.com with SMTP id bx20so44919042edb.12 for ; Tue, 20 Apr 2021 10:25:39 -0700 (PDT) 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=mZ//zvH1oExXC6NdRY4vaLjjFNQjXYZUU6cfp2n03+o=; b=rHn9GWVDRBb1kZKubWm/JU/UY+T8xtm4x/5LVGd5faKtfkrZhEfEP4rvxe2MqMin9v v2w7U8+WXW8blyIQeGUcjVJgLkFi4NVhZi/Y1mimDfeMR0/ObbChTQVhCx+OMx3z31kU U4cgANwhPcMKff756I/V12R33kXgPpsslVPfNB/QpZzLsefVnO7kVySL8d8SubfbMIWM mj9S7u353nPlriS36GbyeXDcUNfxijiXf0o9L8ZqIENmzwzAAQLCOXobKtjfXS+FeYfB +ePfSYBnRExFZ3/sLE5MyKSN6RyD3aE82mHQnRBe+Ad1TWOKi+xQNw7Kcdfp7tX1sajL feLA== 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=mZ//zvH1oExXC6NdRY4vaLjjFNQjXYZUU6cfp2n03+o=; b=PBf166PtbHAoBxzSabVb6Cqywc81D6yS/bmprL6LbfkMewKSmyJ6ZvqvfTj+YghI5+ FUxLYeh23d1+zeZ2O+g9uASgSa1A/NBtjkNqi2tAUnDdS76VguUxTjta8Mgv1fsVuLp/ sHuiBIXd0v/VLAlPjE/08uolQb2TcyqBP4hsFZSXT1QG3f3kwVjj2I7rswdBW1ephEhk beGuuOsYBLD0zr7fiGA3Cxb95OXr60jBOXQgONOAfJbtSu9W0vSC96QCPR9UuUj6VrG/ 5R9NamaY+Mxp+BQSNt4CVkzUu0UmZhXB5AND6nL7A1UeswEn2LknNKZECpRmZkhErc+w 3sqw== X-Gm-Message-State: AOAM533UdojMoS4wIGfkdABe5tkLdTmGPz8pXOQtfzRrbDy1xEvPy5wj ZtSByIAQIzVRyfMBEJ6nTxg= X-Google-Smtp-Source: ABdhPJxYnkX2BWyNbe8kR/8FB4ZlUdVx7Ru01wQwcu9ekn3l/FpJ+2uW7CZeNSw3bKZ9nEoitl9XXw== X-Received: by 2002:a05:6402:cb3:: with SMTP id cn19mr25892145edb.206.1618939538855; Tue, 20 Apr 2021 10:25:38 -0700 (PDT) Received: from localhost ([62.96.65.119]) by smtp.gmail.com with ESMTPSA id c12sm13436079eja.12.2021.04.20.10.25.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 10:25:37 -0700 (PDT) From: Thierry Reding To: Thierry Reding , Will Deacon , Robin Murphy , Joerg Roedel , Krzysztof Kozlowski Subject: [PATCH v2 01/10] memory: tegra: Implement SID override programming Date: Tue, 20 Apr 2021 19:26:10 +0200 Message-Id: <20210420172619.3782831-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210420172619.3782831-1-thierry.reding@gmail.com> References: <20210420172619.3782831-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-20210420_102540_711660_C4354119 X-CRM114-Status: GOOD ( 24.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: iommu@lists.linux-foundation.org, Jon Hunter , Nicolin Chen , linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Thierry Reding Instead of programming all SID overrides during early boot, perform the operation on-demand after the SMMU translations have been set up for a device. This reuses data from device tree to match memory clients for a device and programs the SID specified in device tree, which corresponds to the SID used for the SMMU context banks for the device. Signed-off-by: Thierry Reding --- drivers/memory/tegra/mc.c | 9 +++++ drivers/memory/tegra/tegra186.c | 72 +++++++++++++++++++++++++++++++++ include/soc/tegra/mc.h | 3 ++ 3 files changed, 84 insertions(+) diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index c854639cf30c..bace5ecfe770 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -97,6 +97,15 @@ struct tegra_mc *devm_tegra_memory_controller_get(struct device *dev) } EXPORT_SYMBOL_GPL(devm_tegra_memory_controller_get); +int tegra_mc_probe_device(struct tegra_mc *mc, struct device *dev) +{ + if (mc->soc->ops && mc->soc->ops->probe_device) + return mc->soc->ops->probe_device(mc, dev); + + return 0; +} +EXPORT_SYMBOL_GPL(tegra_mc_probe_device); + static int tegra_mc_block_dma_common(struct tegra_mc *mc, const struct tegra_mc_reset *rst) { diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c index 1f87915ccd62..e65eac5764d4 100644 --- a/drivers/memory/tegra/tegra186.c +++ b/drivers/memory/tegra/tegra186.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -15,6 +16,10 @@ #include #endif +#define MC_SID_STREAMID_OVERRIDE_MASK GENMASK(7, 0) +#define MC_SID_STREAMID_SECURITY_WRITE_ACCESS_DISABLED BIT(16) +#define MC_SID_STREAMID_SECURITY_OVERRIDE BIT(8) + static void tegra186_mc_program_sid(struct tegra_mc *mc) { unsigned int i; @@ -66,10 +71,77 @@ static int tegra186_mc_resume(struct tegra_mc *mc) return 0; } +static void tegra186_mc_client_sid_override(struct tegra_mc *mc, + const struct tegra_mc_client *client, + unsigned int sid) +{ + u32 value, old; + + value = readl(mc->regs + client->regs.sid.security); + if ((value & MC_SID_STREAMID_SECURITY_OVERRIDE) == 0) { + /* + * If the secure firmware has locked this down the override + * for this memory client, there's nothing we can do here. + */ + if (value & MC_SID_STREAMID_SECURITY_WRITE_ACCESS_DISABLED) + return; + + /* + * Otherwise, try to set the override itself. Typically the + * secure firmware will never have set this configuration. + * Instead, it will either have disabled write access to + * this field, or it will already have set an explicit + * override itself. + */ + WARN_ON((value & MC_SID_STREAMID_SECURITY_OVERRIDE) == 0); + + value |= MC_SID_STREAMID_SECURITY_OVERRIDE; + writel(value, mc->regs + client->regs.sid.security); + } + + value = readl(mc->regs + client->regs.sid.override); + old = value & MC_SID_STREAMID_OVERRIDE_MASK; + + if (old != sid) { + dev_dbg(mc->dev, "overriding SID %x for %s with %x\n", old, + client->name, sid); + writel(sid, mc->regs + client->regs.sid.override); + } +} + +static int tegra186_mc_probe_device(struct tegra_mc *mc, struct device *dev) +{ +#if IS_ENABLED(CONFIG_IOMMU_API) + struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + struct of_phandle_args args; + unsigned int i, index = 0; + + while (!of_parse_phandle_with_args(dev->of_node, "interconnects", "#interconnect-cells", + index, &args)) { + if (args.np == mc->dev->of_node && args.args_count != 0) { + for (i = 0; i < mc->soc->num_clients; i++) { + const struct tegra_mc_client *client = &mc->soc->clients[i]; + + if (client->id == args.args[0]) { + u32 sid = fwspec->ids[0] & MC_SID_STREAMID_OVERRIDE_MASK; + + tegra186_mc_client_sid_override(mc, client, sid); + } + } + } + + index++; + } +#endif + + return 0; +} + const struct tegra_mc_ops tegra186_mc_ops = { .probe = tegra186_mc_probe, .remove = tegra186_mc_remove, .resume = tegra186_mc_resume, + .probe_device = tegra186_mc_probe_device, }; #if defined(CONFIG_ARCH_TEGRA_186_SOC) diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h index 1387747d574b..bbad6330008b 100644 --- a/include/soc/tegra/mc.h +++ b/include/soc/tegra/mc.h @@ -176,6 +176,7 @@ struct tegra_mc_ops { int (*suspend)(struct tegra_mc *mc); int (*resume)(struct tegra_mc *mc); irqreturn_t (*handle_irq)(int irq, void *data); + int (*probe_device)(struct tegra_mc *mc, struct device *dev); }; struct tegra_mc_soc { @@ -240,4 +241,6 @@ devm_tegra_memory_controller_get(struct device *dev) } #endif +int tegra_mc_probe_device(struct tegra_mc *mc, struct device *dev); + #endif /* __SOC_TEGRA_MC_H__ */ -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel