From patchwork Tue Aug 28 05:05:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 145286 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp745893ljw; Mon, 27 Aug 2018 22:04:14 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYLufgwVltuj6uwExFI6faiUHgX1Eh+6ujFp5Uys3sYcu96q2Olv9yHex5uJFu3JCGUgsg9 X-Received: by 2002:a63:e001:: with SMTP id e1-v6mr15157105pgh.380.1535432653959; Mon, 27 Aug 2018 22:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535432653; cv=none; d=google.com; s=arc-20160816; b=DNsve4234fnAYddFPEnFSikYER8a72fmWWdBsvlKfww3AW5PU6fvX1cBK2QeaY2sRK fG9bJMcyktL5tfsGTg7zvGwnqslflI5OtdH88X0mc488nq6YRq8FcXIxIfI+6tvFwyJZ ev6XglHj/4gTPznD/gsakS1LaSlzhJsL1ARyZq2ElTlsrtt3ahCK4ZTLyrkyMJNqXp7q L3GcjYhEgOcGFN+Wnq70HAP39/R/0xP7Ffcnuu1UJ7y0F8vwo97hLVw0QSvJh3SR/0Zj nz1m5iexnPGbQpbUGGQFRo7y4YhfiybPEF16w6mktMZcbI0pB6Ha84QrPEdD7HOZrVzM 97cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=VCgU+/yDuu4VQ9VhH+ONTtDXvBFJpH7AlkV7NWEQW4w=; b=kZM0vr1dCQhpjiCm9Zat+20zf7mXKQcGlkMhD5aBSkBDX1FCzTUYYumGqEu7ff+sfi 1oF3U57uw4MAF34T1HOT7ogOAnfoJPpFkS6CK+JMKhL31TOWqQH/FqUZV5LVRFuXhdZP wsDWOahZcV7WP7U7doIF1Ah70LQi3OOatnp7HLBpoiPZcVpdFViZSuYryqvAfcZPR0zF OX9ONG2ri7jbms8o89f7oF/lkGecqQfqa8O3zz2JMw59DdMb6QFPT6k5vGl4GwQUcNDW mAW393MwhiGkwXvj1dNXBRXdpkKUSr4cf4PPtLBlKyYBl0cyETVRcd0xnPa7IJcQOfxO 5X0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="DyY8Fs/Y"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s13-v6si32821pgo.505.2018.08.27.22.04.13; Mon, 27 Aug 2018 22:04:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=@linaro.org header.s=google header.b="DyY8Fs/Y"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726669AbeH1IyD (ORCPT + 13 others); Tue, 28 Aug 2018 04:54:03 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:37155 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726120AbeH1IyD (ORCPT ); Tue, 28 Aug 2018 04:54:03 -0400 Received: by mail-pf1-f195.google.com with SMTP id h69-v6so194041pfd.4 for ; Mon, 27 Aug 2018 22:04:12 -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=VCgU+/yDuu4VQ9VhH+ONTtDXvBFJpH7AlkV7NWEQW4w=; b=DyY8Fs/YVYf/DOtPUAJTbyN2nX9bROf+CcMs4eAe800pUzLcUJHOGiPLCxi1ToiKsT oXr3Aq08Z3FH8rwac8uFA0HY1hMZvPtgp48eDimLfQ7FaFZPmL7kVGM3E7WvfrS4ZG1Z GxKMQgkmeA7sVoiNuDZ/zFZAsyPZvW6LCCV3c= 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=VCgU+/yDuu4VQ9VhH+ONTtDXvBFJpH7AlkV7NWEQW4w=; b=gnhdoayhxEiTS5DJYkVYNYaI/B2ZTwZJ4b3/CIG4fTABLvhrkP4N0DP8apN6dvjL/a KBw8622UNlVWP4zUmPH2bYCPZXS07ycXhg6AAPWfEyHfZD26CIe2fh8lyojBnrqDFskz q5R3VUM3QJCzzPUQ9tv2VTbu+8qXVyIN+8gEneBV9lwg1dKPPuHQQVa590hEFJXK3zl/ cEMileDLh3Y7NCYGBCL7PW5xtqEoIslyQc6vxrGbIBYiZOKdLAqt0aUhK5Yywmbu82bT Z0OLI++M8b2EqQhDGlQDEweCfF9F0bLq0pDuRFQNyzUN6oI10hLUOOi+AhYZ8qFKQzBe LnGg== X-Gm-Message-State: APzg51B0Nvm3ZApi2KaRHLcn0NjSXlwVK8mloAoP/nIgqZkDxxqDzhhf Y22ULcJfE3UCZHfAVMXKPy0JUw== X-Received: by 2002:a63:40c7:: with SMTP id n190-v6mr13127976pga.116.1535432651731; Mon, 27 Aug 2018 22:04:11 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id u11-v6sm46064pfd.117.2018.08.27.22.04.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 22:04:10 -0700 (PDT) From: Bjorn Andersson To: Andy Gross , David Brown Cc: linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] soc: qcom: rmtfs-mem: Validate that scm is available Date: Mon, 27 Aug 2018 22:05:48 -0700 Message-Id: <20180828050548.15796-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The scm device must be present in order for the rmtfs driver to configure memory permissions for the rmtfs memory region, so check that it is probed before continuing. Cc: stable@vger.kernel.org Fixes: fa65f8045137 ("soc: qcom: rmtfs-mem: Add support for assigning memory to remote") Signed-off-by: Bjorn Andersson --- drivers/soc/qcom/rmtfs_mem.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.18.0 diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c index 8a3678c2e83c..97bb5989aa21 100644 --- a/drivers/soc/qcom/rmtfs_mem.c +++ b/drivers/soc/qcom/rmtfs_mem.c @@ -212,6 +212,11 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev) dev_err(&pdev->dev, "failed to parse qcom,vmid\n"); goto remove_cdev; } else if (!ret) { + if (!qcom_scm_is_available()) { + ret = -EPROBE_DEFER; + goto remove_cdev; + } + perms[0].vmid = QCOM_SCM_VMID_HLOS; perms[0].perm = QCOM_SCM_PERM_RW; perms[1].vmid = vmid;