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=-10.0 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=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 2B9DEC4CEC5 for ; Fri, 13 Sep 2019 13:12:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 016C9208C2 for ; Fri, 13 Sep 2019 13:12:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568380359; bh=npITvHoRuo/dc7q/atfoPZwYGNwMxYGXtDpExq3wcWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dL1WNcFK6KqZcrcsXcmD+2Pob2bWs6C/XcAfnSeORUkxiteonNGszBshWhXiHeyIw mAw5Fio6cF61rckuOtBPiq36Wr6LqFDWfsVgUWatwAJD/XVu8rM/pAKmcmp/Bb5fEk C9iQBGZ89K3bBO248wRn/P68yVaZMN2GFAWpGfLo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389178AbfIMNMg (ORCPT ); Fri, 13 Sep 2019 09:12:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:38078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389173AbfIMNMe (ORCPT ); Fri, 13 Sep 2019 09:12:34 -0400 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 0E9B3214AF; Fri, 13 Sep 2019 13:12:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568380353; bh=npITvHoRuo/dc7q/atfoPZwYGNwMxYGXtDpExq3wcWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ymyzn/7oWeQKIvsiISpx3ATNr9m7unCwLxQTNnrlc4BGC5a4RGgj48hTNRjy82IkK z1D671XGVzzqPmBMZjqNCEADD5zDAIZqfjmwDTcSZOp9CSWWzRN+NcEjDLWoS/ZmOB grBlOfTEzivIBPH6gSHDC680fw1u+c+t7wJygwiU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brian Norris , Bjorn Andersson , Sasha Levin Subject: [PATCH 4.19 037/190] remoteproc: qcom: q6v5-mss: add SCM probe dependency Date: Fri, 13 Sep 2019 14:04:52 +0100 Message-Id: <20190913130602.656270150@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190913130559.669563815@linuxfoundation.org> References: <20190913130559.669563815@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 [ Upstream commit bbcda30271752bb7490f2e2aef5411dbcae69116 ] The memory ownership transfer request is performed using SCM, ensure that SCM is available before we probe the driver if memory protection is needed by the subsystem. Fixes: 6c5a9dc2481b ("remoteproc: qcom: Make secure world call for mem ownership switch") Cc: stable@vger.kernel.org Signed-off-by: Brian Norris [bjorn: Added condition for need_mem_protection, updated commit message] Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/remoteproc/qcom_q6v5_pil.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c index d7a4b9eca5d25..6a84b6372897d 100644 --- a/drivers/remoteproc/qcom_q6v5_pil.c +++ b/drivers/remoteproc/qcom_q6v5_pil.c @@ -1132,6 +1132,9 @@ static int q6v5_probe(struct platform_device *pdev) if (!desc) return -EINVAL; + if (desc->need_mem_protection && !qcom_scm_is_available()) + return -EPROBE_DEFER; + rproc = rproc_alloc(&pdev->dev, pdev->name, &q6v5_ops, desc->hexagon_mba_image, sizeof(*qproc)); if (!rproc) { -- 2.20.1