From patchwork Wed Jan 6 00:50:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 12000629 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 AF4F3C433E0 for ; Wed, 6 Jan 2021 00:51:59 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 6945E206C0 for ; Wed, 6 Jan 2021 00:51:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6945E206C0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=xKIZv/UlgXPVafVPj9YgeaQfh9Bxyx+U8RI2aejtMdE=; b=P9ejKhyArvWncJDr5BW9MSX71C iB1g7QpYNrCbYzWsT9z9n6QybJKeIjTpFBAx5n9ROrhGWxMi7OchRWC8hdZf5gV4X1DBZISni7ger LjvFd0iAhXhBtnu3LDMMjFBC8Hk0V3Imp4B08nh9eJnzzA5XqAd7ypyUCVp+6XlEK0RxuUAJ2B0cH d3VRg4JXOX2hQmWkn0h0dubFGLiWGVcbWMmVTw2WXN2FgwWkagDwu2UYF3d/yVNa7nEEoHuhSqbnU JKVqMUJriP9IkQ5nvqGALhQyxcfotIH2o2lr7dl/vHpZjj3EZTX16ABzi+AFeNKA0wu9hF3P4Coqj 7jXQ4vJQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwx1p-0006gl-SR; Wed, 06 Jan 2021 00:50:21 +0000 Received: from mail-oi1-x229.google.com ([2607:f8b0:4864:20::229]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwx1l-0006g3-47 for linux-arm-kernel@lists.infradead.org; Wed, 06 Jan 2021 00:50:19 +0000 Received: by mail-oi1-x229.google.com with SMTP id 9so1715244oiq.3 for ; Tue, 05 Jan 2021 16:50:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MY//pdNJ1jtx+davhWjroAABUbia63fV6QVASGfH/ZU=; b=oCpQ9J6sRS9tagdGMQk9s4DATKdJwjlk3DmHZJHRC2a9b+/fhHiRhB5hmVEJbQizWJ pxRfpXLINKc/hGkmByZrBqVos+6zwTeuBY7c6ecAAYm5CPUavshOp9L3w4Jo2hR6Txq4 kDyIGcPOBMdN7xlskaWqP6rfY0399nyWZnKY6s1MRSOaLbqY4jl3N8utB215yXpeQWFs atXjAIlecflorgcH03w5L3c9Mdc4dJhxomxcQr6Q79ow0pfYVJYlZiNQpoQuAOFvcuzj D4V23muW+fGVoTGgsHpC2yBP8rothR8pA9NFgm+SXHAdHx5VHv5TCvT8kMgnpCrOQ8GM 7rJQ== 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:mime-version :content-transfer-encoding; bh=MY//pdNJ1jtx+davhWjroAABUbia63fV6QVASGfH/ZU=; b=g6+A+AqB9Y8qQzmmTFoFIyrcJj8nmPJxY+r3cHrqvMhIsWeHhqUvJRMrKD6NQPdqu5 GufEYbOYAjOeQZXotz3F4+UIdiwxmDMIk1OiSOKFKcvpco1S5hEfOlil8i23ujtuxuxi 8MV1/p511Bl4RAjdSNwn8daPhTNWc85f1gV359AZ+UohmErRUWSPmaYdgCHiwxcr++pe MMF/WHb1S3DqOen2KLTmtlUDhRQCxJAL1s4kn6NFWdMLJFIVcCDC89zRuZ+EcEYiV37C mhCHzVljMUJd9r1X4bQf/O6L6ndkgD9TvYzVyYkT4IuYsO30BOvIfGpEcUF7vIh2ml3o lDVQ== X-Gm-Message-State: AOAM531FCt3XVXYUQEjbBjr/edDx8lmOD5OZF2njaqp1TItlR+ItqWis 1XrYVtFa59kdDXo5vFutHk5afQ== X-Google-Smtp-Source: ABdhPJyeUxdYzySoOkACZH8a2ASpyGaDSsM6cIg1pK6baaLSMrtCAMOXh3ocIVAnZbnhcBBeInXHSg== X-Received: by 2002:aca:d506:: with SMTP id m6mr1570736oig.113.1609894213201; Tue, 05 Jan 2021 16:50:13 -0800 (PST) Received: from localhost.localdomain (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id t24sm222562oou.4.2021.01.05.16.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 16:50:12 -0800 (PST) From: Bjorn Andersson To: Will Deacon , Robin Murphy , Joerg Roedel Subject: [PATCH] iommu/arm-smmu-qcom: Initialize SCTLR of the bypass context Date: Tue, 5 Jan 2021 16:50:38 -0800 Message-Id: <20210106005038.4152731-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210105_195017_443033_3C9405F0 X-CRM114-Status: GOOD ( 12.97 ) 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-arm-msm@vger.kernel.org, Sai Prakash Ranjan , iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On SM8150 it's occasionally observed that the boot hangs in between the writing of SMEs and context banks in arm_smmu_device_reset(). The problem seems to coincide with a display refresh happening after updating the stream mapping, but before clearing - and there by disabling translation - the context bank picked to emulate translation bypass. Resolve this by explicitly disabling the bypass context already in cfg_probe. Fixes: f9081b8ff593 ("iommu/arm-smmu-qcom: Implement S2CR quirk") Signed-off-by: Bjorn Andersson --- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 5dff7ffbef11..1b83d140742f 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -196,6 +196,8 @@ static int qcom_smmu_cfg_probe(struct arm_smmu_device *smmu) set_bit(qsmmu->bypass_cbndx, smmu->context_map); + arm_smmu_cb_write(smmu, qsmmu->bypass_cbndx, ARM_SMMU_CB_SCTLR, 0); + reg = FIELD_PREP(ARM_SMMU_CBAR_TYPE, CBAR_TYPE_S1_TRANS_S2_BYPASS); arm_smmu_gr1_write(smmu, ARM_SMMU_GR1_CBAR(qsmmu->bypass_cbndx), reg); }