From patchwork Thu Jul 9 05:01:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 235121 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1067601ilg; Wed, 8 Jul 2020 22:01:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfWP12VGmn7Bn7ya9SFSLwFFxvDltMS7R6yECU68bltOwC3W1sPBOWUDY+BZNfh1GbMW8h X-Received: by 2002:a17:906:4bc1:: with SMTP id x1mr45234949ejv.377.1594270912586; Wed, 08 Jul 2020 22:01:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594270912; cv=none; d=google.com; s=arc-20160816; b=E2E3626EOUkNMziPN+xqxKq5Vf7Vx/tPgO7lg4uP02jSXFfXBc2IPOVooDex39P+x0 2jj2XYNstmwgYCM48RxleyTOACQ9PRsivqXfnwuE56VvLrg6hRFxlJ75sQp5x+BjJEBs +/m69FexCac3rb6xYE047tJDBAH4zss/PzzXPD89tvTnN00LJuor4f/awWUnJQAYNOBh VJ3e35V8h+JG5JjDOIZNysWcz9j7/EQgK7FcG7+lpdCD+XwGoA13tTyCSUJsc91eURpv Fi+N8AvbBsJBP+6SU9CzILSFYU8AMoq0cB0ZboWtnd9gYge99U1g6kw2cl+bRpRHATu2 ueNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=410aRxR/jUVzarYYA7FRja4VMLxxjmJi5LB1naX7CXw=; b=dty/bvpPB5ajOTWaL+hVqzVijVTMLv8QVDAeTZz8RcdxDBoAhL2GTAiPY9r2Qi5/5b gVhqOSHTmK9Dr69oMqBTTTQa3CGSi9fFZf8PvUoJFggVRtfJL7odrU5KvayrtK076jvj F9ivQ+CT2yR0YRQDtVxfhfcODgaPStZJjCMu25GgpzhIculo9aMlfNe47DmRPtODmpL/ mlmLqkW8t4a9MgJA6M3cd/6oo+yeu2nLFBYKOi83+J4RdJfj0w6u9gtqebBcUXeMddaS ILX0O6w9ZB+3WnyUuDdTO4BTj0kWpukDexDfj9Zb9urT8kRZ8WiV3hzL7IjUvLbwBzLl 1ESw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pMadG799; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j4si1409749edt.73.2020.07.08.22.01.52; Wed, 08 Jul 2020 22:01:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pMadG799; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726319AbgGIFBs (ORCPT + 15 others); Thu, 9 Jul 2020 01:01:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726281AbgGIFBq (ORCPT ); Thu, 9 Jul 2020 01:01:46 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99D29C061A0B for ; Wed, 8 Jul 2020 22:01:46 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id cm21so555784pjb.3 for ; Wed, 08 Jul 2020 22:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=410aRxR/jUVzarYYA7FRja4VMLxxjmJi5LB1naX7CXw=; b=pMadG799IDnLhFVn72xi9qEswo6WriD7WzmvA0YSRVBHLDFdlJlXUWOhI85zGWE8FF BQpX3w8cQhZAmZfj5SzYtuZ734FjH2WvmZuKI3lZTJVr6CXkYaV7PrTLtqTZkMoa3lmq CxOcLRZwzcJUyfNbB93hH9X/KNrEazeClJ1ZzP8aaS/IUKWoyoiYyriWoQwwQ1Gl52ZT bJ6Cv247hS8zFF0YMuarBnAPXKnxQCnfyxx77xzqpbRxFJk4VeCGkPl+gaqr/Kl6U0XB 62aQwYZwvjXo6u+BMOvoipMHZAafGfKkF15TIOrygpjRcjZIZV67V09shv5RSRulIOLZ QHJw== 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=410aRxR/jUVzarYYA7FRja4VMLxxjmJi5LB1naX7CXw=; b=DsI84CJeG4unyWlNp8w9OQmd6EZGlJqTJogQTpCTuydhHCh+L37eA/Vrc/u/SRdzLX KG1QWJdMjWI+jQi/gkr38Ii5xem3J1P8vEdFGHUHhXk8l/ObLq6vcAH40d9lf3CzAZ30 phw33HUrLEddrpbDafO19/etYcQT2NLaCBWrBkLSfobVEak1zAYBb1svZYDzwSTSw77h dCUWV9FMDSTmRMRtZ1imQmMhWFx2gTMynODTETIpl69vtJ/D4H8WnjbAyRpJKqh7O4Zc RcLVE+ymcKc1SCNOEZv/eFaoMR749rubfVlDM8KvOsiSTxrG+pcZFtcqFjif1m2Rw1E4 XMWQ== X-Gm-Message-State: AOAM532HVihYiAt9QqTOWpkjJFtlrlmSP4nsgzDbOlgo4m4uuQLhiO06 FofAvwGokZFqdLxiXx0ZOrN1bw== X-Received: by 2002:a17:90b:30c4:: with SMTP id hi4mr12329792pjb.166.1594270906127; Wed, 08 Jul 2020 22:01:46 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id h15sm999974pjc.14.2020.07.08.22.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2020 22:01:45 -0700 (PDT) From: Bjorn Andersson To: Will Deacon , Robin Murphy , Joerg Roedel , Thierry Reding , Laurentiu Tudor Cc: linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Jonathan Marek , linux-arm-msm@vger.kernel.org Subject: [PATCH 4/5] iommu/arm-smmu-qcom: Consstently initialize stream mappings Date: Wed, 8 Jul 2020 22:01:44 -0700 Message-Id: <20200709050145.3520931-5-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200709050145.3520931-1-bjorn.andersson@linaro.org> References: <20200709050145.3520931-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Firmware that traps writes to S2CR to translate BYPASS into FAULT also ignores writes of type FAULT. As such booting with "disable_bypass" set will result in all S2CR registers left as configured by the bootloader. This has been seen to result in indeterministic results, as these mappings might linger and reference context banks that Linux is reconfiguring. Use the fact that BYPASS writes result in FAULT type to force all stream mappings to FAULT. Signed-off-by: Bjorn Andersson --- drivers/iommu/arm-smmu-qcom.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) -- 2.26.2 diff --git a/drivers/iommu/arm-smmu-qcom.c b/drivers/iommu/arm-smmu-qcom.c index e8a36054e912..86b1917459a4 100644 --- a/drivers/iommu/arm-smmu-qcom.c +++ b/drivers/iommu/arm-smmu-qcom.c @@ -27,6 +27,7 @@ static int qcom_smmu_cfg_probe(struct arm_smmu_device *smmu) { unsigned int last_s2cr = ARM_SMMU_GR0_S2CR(smmu->num_mapping_groups - 1); u32 reg; + int i; /* * With some firmware writes to S2CR of type FAULT are ignored, and @@ -37,9 +38,24 @@ static int qcom_smmu_cfg_probe(struct arm_smmu_device *smmu) FIELD_PREP(ARM_SMMU_S2CR_CBNDX, 0xff) | FIELD_PREP(ARM_SMMU_S2CR_PRIVCFG, S2CR_PRIVCFG_DEFAULT)); reg = arm_smmu_gr0_read(smmu, last_s2cr); - if (FIELD_GET(ARM_SMMU_S2CR_TYPE, reg) != S2CR_TYPE_BYPASS) + if (FIELD_GET(ARM_SMMU_S2CR_TYPE, reg) != S2CR_TYPE_BYPASS) { smmu->qcom_bypass_quirk = true; + /* + * With firmware ignoring writes of type FAULT, booting the + * Linux kernel with disable_bypass disabled (i.e. "enable + * bypass") the initialization during probe will leave mappings + * in an inconsistent state. Avoid this by configuring all + * S2CRs to BYPASS. + */ + for (i = 0; i < smmu->num_mapping_groups; i++) { + smmu->s2crs[i].type = S2CR_TYPE_BYPASS; + smmu->s2crs[i].privcfg = S2CR_PRIVCFG_DEFAULT; + smmu->s2crs[i].cbndx = 0xff; + smmu->s2crs[i].count = 0; + } + } + return 0; }