From patchwork Tue Dec 1 08:53:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 335111 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp5486904ilb; Tue, 1 Dec 2020 01:03:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNYALhLJgUwONn1pjMbKkQTsfPAibTfMj8RzOh6P70JXn3SJNecGuKJBpzzJ4fdFZVtpkL X-Received: by 2002:a17:906:a51:: with SMTP id x17mr59477ejf.97.1606813313574; Tue, 01 Dec 2020 01:01:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606813313; cv=none; d=google.com; s=arc-20160816; b=iJjd+RFoNv/qxPLisu3ycFE63O3ocY1Byi8rRGxfTGl6hzr8tO9hnnIEGRvfdljlaH vwUKnrPDOmLTjMcueHOaShULSAcKKlPJlfZPTXxY+r5CGvNhhANEzTvVirPlsrIRhH3c Ns9g1866trR6xkM1FM8NgViK4Cx6Jj4feNwg45wR/zag1UmTPcuy6ArLqT+lithGOzg/ hygvzL6DIcN8UKqVizUxunIYlupJU/BrzPrMer2Dmh0pLXXLwdLZg0APzPEjrvPJCCZn eMHgXi2kOgzsUdLWjhk/HwKzZ4H1ua67UTIX+NpxpA/bf/1JgcLvrXmWi//B4bJiixKH LLXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ODk7L4ua3rMUJ2ixWCq+glAEuTBYRAapCzXbtLKmz+s=; b=H4e7SOXSP/wpgQ1lWQ158HxKBwgPgYFwxeBiS3Y7FIhg8g+myb0qAkoRSe760IOZ1Q mgmG4PsVkJ36VcBlN5wgJXYvw3329PFm6Kscqzx3hsN5OLqljGobe/GCF+FCbPt3E3ti OGB0qFciRf6EC4MSTqM9ZyLVwQqK/VCRS3AiJQvHVlRBvVd/u7HIDQUSZ1oEtnjx6rGa j9YYDKivQpNHVaSmGYEB6zCISzhP47MFQtJ5T7FcyPUKlps9CmdaSaxF6BUBY6O2kR9V OLcB/EL+72yHreY8L5KlB52KlVJ6fkIQnkvweF9bB8IGG/YfsfCI2RmY4/7HtC+1mFkd QbUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="HlEHmDd/"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mf27si535893ejb.129.2020.12.01.01.01.53; Tue, 01 Dec 2020 01:01:53 -0800 (PST) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b="HlEHmDd/"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729151AbgLAJBh (ORCPT + 14 others); Tue, 1 Dec 2020 04:01:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:36796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727729AbgLAJBd (ORCPT ); Tue, 1 Dec 2020 04:01:33 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A1CEF20671; Tue, 1 Dec 2020 09:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1606813278; bh=Iydk144FX0Xn6424CqCVcybGpfiJwRh5rskHhF/g9gE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HlEHmDd/0oaP5V2H6XRC1hwXm9z94bYfz0a8UTS7DSra1J8idkD27AEegfAJgrqw9 0ExxOW77JfQcGOiJCdm0KaY7VeQIDKWFj5hwrJaQhT9Ie9j3qgJguA83j0KKX5H2ju ANki22v+DucEEZmbZSGL3/BCWarhFCxxSUDwZLek= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rui Miguel Silva , Jens Wiklander , Sasha Levin Subject: [PATCH 4.19 43/57] optee: add writeback to valid memory type Date: Tue, 1 Dec 2020 09:53:48 +0100 Message-Id: <20201201084651.213385348@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201201084647.751612010@linuxfoundation.org> References: <20201201084647.751612010@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rui Miguel Silva [ Upstream commit 853735e404244f5496cdb6188c5ed9a0f9627ee6 ] Only in smp systems the cache policy is setup as write alloc, in single cpu systems the cache policy is set as writeback and it is normal memory, so, it should pass the is_normal_memory check in the share memory registration. Add the right condition to make it work in no smp systems. Fixes: cdbcf83d29c1 ("tee: optee: check type of registered shared memory") Signed-off-by: Rui Miguel Silva Signed-off-by: Jens Wiklander Signed-off-by: Sasha Levin --- drivers/tee/optee/call.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.27.0 diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index a5afbe6dee686..7cb7efe62b011 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -538,7 +538,8 @@ void optee_free_pages_list(void *list, size_t num_entries) static bool is_normal_memory(pgprot_t p) { #if defined(CONFIG_ARM) - return (pgprot_val(p) & L_PTE_MT_MASK) == L_PTE_MT_WRITEALLOC; + return (((pgprot_val(p) & L_PTE_MT_MASK) == L_PTE_MT_WRITEALLOC) || + ((pgprot_val(p) & L_PTE_MT_MASK) == L_PTE_MT_WRITEBACK)); #elif defined(CONFIG_ARM64) return (pgprot_val(p) & PTE_ATTRINDX_MASK) == PTE_ATTRINDX(MT_NORMAL); #else