From patchwork Tue Nov 19 05:17:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179685 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp164703ilf; Mon, 18 Nov 2019 21:44:52 -0800 (PST) X-Google-Smtp-Source: APXvYqzreLzPeJN8Eq+Vz58D9zMDrgT5aoTC78lV2Edu72otkmdd2BVCz9Z6LgFAAUPG3q4p6zfh X-Received: by 2002:a17:906:4bd7:: with SMTP id x23mr32064535ejv.245.1574142292003; Mon, 18 Nov 2019 21:44:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142291; cv=none; d=google.com; s=arc-20160816; b=utv+WVHoW0CfQPLSFBBHlQL94lSoxUMzEWFvwImGidHGe+EX5DYb4TiX5iAMtlccUy 0Sw7bQJaKWb9PmkT+o2u0SgZGn5loB/nNs1YkLSppKVcvXtC+eMp02wQvO67Snze0nez 1+2PbCkNzJ+1puq8irohQqo/mCBdwz9gG4fxuBrR9zeqBAehyKWLjQIOf0F/SlVlhb4y 6rig2PeY3FfWbALUac9cRB2RmUnFZjsm2rWV4uflfkLey4jPkA5nqcUaibG634MVtOM6 GuwEM5qcO4qt8moe2lnke8sE8+ncp+rBRNwEdDFtLMyWHDsuwy47KCsmLpJxpugy2djy yY3w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rIhR2GAPwdNywvGH3b6KXy9wlRyQMmT0MAsWA5oNoUk=; b=UZ7+3UKuPRCcTsU8ltKUU/ErW9sweWV7JR17OmCkMT1gIdxsSM+NgWHfoKDkelWvNk zfvX7G85uzEsFTEw+v3rsT3t5iBCLzTTmAwAqPPktB8GXScQushANPdsRH1ObmLjAdgk jQ4Yg3JD9+f/Jqzeb2b9xnHz3aiXhDWErneE6YKOlnwbnmJ5+qoj4R42wznLPgcS7Pwx JzgCN2QpxmLoHilyjrV/PqFRHRYqTEa+w9dYxKj7cMy9/FHGBeeCVJlEFgmtcoBDm8V5 GikYCk6l12FncuQcJZO78zYSv1IKzgygxcA3IAEjYzZf4mmQLKaCz8Q2YICPs9tnuczz fDPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=N+xDokeP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r1si14062435edm.57.2019.11.18.21.44.51; Mon, 18 Nov 2019 21:44:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=N+xDokeP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730885AbfKSFos (ORCPT + 26 others); Tue, 19 Nov 2019 00:44:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:40218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730389AbfKSFop (ORCPT ); Tue, 19 Nov 2019 00:44:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 13DB721783; Tue, 19 Nov 2019 05:44:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142285; bh=IMTxs0Vg3w+Hwrt3XgNErfmtrm2IarEi/exW/jkwuQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N+xDokePfH3mNKRFI3uo4SvdTpu+9PChnXsxocEAAdaNbnm4m1AfevJgIwNrLlKsY bo80nKZiZXMhTPNTqoy1+1xbxqL1Fzg41dfEDV7LCvj4H+5jA5Qcqu9vJoIh7NUSkW 9nfK8iLYoGdwJXHWfbjGYwwpYL2ssx3pR5U19GgA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ard Biesheuvel , Jens Wiklander , Sasha Levin Subject: [PATCH 4.14 029/239] tee: optee: take DT status property into account Date: Tue, 19 Nov 2019 06:17:09 +0100 Message-Id: <20191119051303.264037709@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel [ Upstream commit db878f76b9ff7487da9bb0f686153f81829f1230 ] DT nodes may have a 'status' property which, if set to anything other than 'ok' or 'okay', indicates to the OS that the DT node should be treated as if it was not present. So add that missing logic to the OP-TEE driver. Signed-off-by: Ard Biesheuvel Signed-off-by: Jens Wiklander Signed-off-by: Sasha Levin --- drivers/tee/optee/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index edb6e4e9ef3ac..ca79c2ba2ef2a 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -590,7 +590,7 @@ static int __init optee_driver_init(void) return -ENODEV; np = of_find_matching_node(fw_np, optee_match); - if (!np) + if (!np || !of_device_is_available(np)) return -ENODEV; optee = optee_probe(np);