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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 6A89BC3524D for ; Mon, 3 Feb 2020 16:40:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3893D2082E for ; Mon, 3 Feb 2020 16:40:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580748020; bh=OMcloxsntVoIZu1MIUy7FA6ZpCV7IFVY1OTmbMPJnKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=s814qeSpQf5PFUpLgl+DLKqS16/etDHv+HXDhqhe21PnLNT6DZSkTrzfNKDUAMmO+ pgo9ngMX2ehTB/dZ7k7Vl8AWF632Qlj2mO4EzsiEAO7qAqxwqKUMWzJ6PPRnPSlbhR oXrDAc7twKoyTW5p29Cawbf0lLHk8hP6VL4edx5U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731033AbgBCQgj (ORCPT ); Mon, 3 Feb 2020 11:36:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:51942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730978AbgBCQgf (ORCPT ); Mon, 3 Feb 2020 11:36:35 -0500 Received: from localhost (unknown [104.132.45.99]) (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 6DD5D20CC7; Mon, 3 Feb 2020 16:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580747794; bh=OMcloxsntVoIZu1MIUy7FA6ZpCV7IFVY1OTmbMPJnKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0rluMNId1oBPaj7oT1CSKYkdASEDt0IVUSKLSp7Mu/vYlQaBGSM6zpdqI/fH65PHm UNzA4TnZ3v9uCDRHrANcoNFrCKGz5eh6swfZw+0/cEMA/34jpb24PUGkYRZOZ467sM DCxtZj16JlIp9xPSabdlrxW4RDSHfQ5u0pXQ2YLk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vincenzo Frascino , Jens Wiklander , Sasha Levin Subject: [PATCH 5.4 74/90] tee: optee: Fix compilation issue with nommu Date: Mon, 3 Feb 2020 16:20:17 +0000 Message-Id: <20200203161926.370960124@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200203161917.612554987@linuxfoundation.org> References: <20200203161917.612554987@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vincenzo Frascino [ Upstream commit 9e0caab8e0f96f0af7d1dd388e62f44184a75372 ] The optee driver uses specific page table types to verify if a memory region is normal. These types are not defined in nommu systems. Trying to compile the driver in these systems results in a build error: linux/drivers/tee/optee/call.c: In function ‘is_normal_memory’: linux/drivers/tee/optee/call.c:533:26: error: ‘L_PTE_MT_MASK’ undeclared (first use in this function); did you mean ‘PREEMPT_MASK’? return (pgprot_val(p) & L_PTE_MT_MASK) == L_PTE_MT_WRITEALLOC; ^~~~~~~~~~~~~ PREEMPT_MASK linux/drivers/tee/optee/call.c:533:26: note: each undeclared identifier is reported only once for each function it appears in linux/drivers/tee/optee/call.c:533:44: error: ‘L_PTE_MT_WRITEALLOC’ undeclared (first use in this function) return (pgprot_val(p) & L_PTE_MT_MASK) == L_PTE_MT_WRITEALLOC; ^~~~~~~~~~~~~~~~~~~ Make the optee driver depend on MMU to fix the compilation issue. Signed-off-by: Vincenzo Frascino [jw: update commit title] Signed-off-by: Jens Wiklander Signed-off-by: Sasha Levin --- drivers/tee/optee/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/tee/optee/Kconfig b/drivers/tee/optee/Kconfig index d1ad512e17089..3ca71e3812ed4 100644 --- a/drivers/tee/optee/Kconfig +++ b/drivers/tee/optee/Kconfig @@ -3,6 +3,7 @@ config OPTEE tristate "OP-TEE" depends on HAVE_ARM_SMCCC + depends on MMU help This implements the OP-TEE Trusted Execution Environment (TEE) driver. -- 2.20.1