From patchwork Wed Aug 1 09:48:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10552005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2641813BB for ; Wed, 1 Aug 2018 09:49:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 140882AA2D for ; Wed, 1 Aug 2018 09:49:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 089162AAB9; Wed, 1 Aug 2018 09:49:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B077B2AA2D for ; Wed, 1 Aug 2018 09:49:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=3wh/SIp3lFwAVUpKm5iDbmHOu1L4sQEc5Z7g7Hm3Bck=; b=TMr L7YsxEbyk9EL0b2rW7vin22O7yL++TQ5PHE1Xn6+2TPuBGiqqVeGc+H1PXv4lzNhtH31DaKoKrry+ l9MGxcoP2/HpoIyNM1A+6w0t/XiduoQ69qy5dLvCRM5V87tsnSAKdqSXwYieP4xPk1J/vD9YASz25 GVddNugKcdH6PRSUGaCyNHxf0DunyUwqeBIrK7w2iULNq171lO64X6mVwTPF8aPbgrPT2VqJbAMxn sx+5cttp9u5dtwfeFq5PR40C/xSdp4BymPrSSuLz4ExHH+rkK5SsptnQgrlstPeQdQM1GynTfRmJ6 i+iqu7ta9A0bYrX3OJJHPuQ4tnenwWw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fknkq-0001OC-FB; Wed, 01 Aug 2018 09:49:16 +0000 Received: from mail-ed1-f66.google.com ([209.85.208.66]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fknkT-0000lW-1S for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 09:49:14 +0000 Received: by mail-ed1-f66.google.com with SMTP id r4-v6so6372356edp.9 for ; Wed, 01 Aug 2018 02:48:42 -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; bh=mtPeqKUNhYrd8LC/K4ENYviKEGS3xoHyiDDCyM89zfE=; b=BOjkM7iQAfnaxQpOKV4kCAiAk9xeWXFYx3+D7WTzQWFRRxb6oGPdPNtx53nxC8t/2C LOp/nsvocP0bAdOvNyBkpA/k6cjITVR6axLA7dK25JD8+gYwKG+11VHJREsa5gbrFMA/ zNYdg7/CwTZeOKXXfjLoNTCN3+aUu8kZOiR48= 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; bh=mtPeqKUNhYrd8LC/K4ENYviKEGS3xoHyiDDCyM89zfE=; b=cD265M9moYXGJD1I2K4AC/pU9qiwfQW9AWbzumP7M6ua1w72r20b1yzqrxhGxhYayM yUtf+djUDJa0zeYs6JkI5+JW3qByNZ4Jq9I+EiVeQwnKnbjzAtbJmnl09unjhYEMZOoc VV3txmujFLtxSQnB5LhxbO7q+sq3sBUx+n8ULyh4RANPOH6ayL3GKWpFioyKaKiHz6+d /rqVNZisUsawmxJtJtDdyx/PprJgOBOu+FIyYECFqOgzQQnsZXsDX+ZpMelzWpgyeVOH DbhAJTIXHmVC4hP7RaJ6E+Zm8pyvhRPULF30FnyfwT4KFlPy+v4YhLWViSNojJQXErr/ Wuag== X-Gm-Message-State: AOUpUlFuY6IEwneHW0UWeqL/mfoOaoxvFtZXSmSJH4vc7S1ox6S3M1/M VUqh/a9+6e4+PbRZbCU3ouvTORxluC5sEw== X-Google-Smtp-Source: AAOMgpfrz2AMjTfNA8CnsrwRSbPcQNRaNIGyyMLySmgwJLvuyLa05tMFt5c/WV4Ful4oWgwoaQFXug== X-Received: by 2002:a50:f18c:: with SMTP id x12-v6mr3298896edl.59.1533116920210; Wed, 01 Aug 2018 02:48:40 -0700 (PDT) Received: from rev02.home (b80182.upc-b.chello.nl. [212.83.80.182]) by smtp.gmail.com with ESMTPSA id n46-v6sm6958425edd.6.2018.08.01.02.48.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 02:48:39 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] tee: optee: take DT status property into account Date: Wed, 1 Aug 2018 11:48:33 +0200 Message-Id: <20180801094833.8361-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.18.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_024853_191029_4721C2CA X-CRM114-Status: GOOD ( 13.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sumit.garg@linaro.org, jens.wiklander@linaro.org, jerome.forissier@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/tee/optee/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index e5fd5ed217da..69ea1efbb051 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -696,7 +696,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);