From patchwork Tue Feb 13 01:37:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 128191 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3766514ljc; Mon, 12 Feb 2018 17:37:50 -0800 (PST) X-Google-Smtp-Source: AH8x226xkSbMOFRpAR/KJ/dc65ywfh3Dj8BmHAk6Hrj4JH2t2HhKJlGH/dwrkXvRlVUYIWcVF4kU X-Received: by 10.98.9.138 with SMTP id 10mr3066991pfj.122.1518485869954; Mon, 12 Feb 2018 17:37:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518485869; cv=none; d=google.com; s=arc-20160816; b=FFt11p917GIgT3Bjv1mrTXM1Xc71x+hdw4ofDcHsPj4KHF62aoOCLQ2TwU+494xr4H iTcVjCy3xv2BgzZ39PhpFWFfUt5wtCTlMXxzl591OgO1QVwajHmry186O19XlzVSrKb3 BGlwLg+1ShShth25tzYY8Oz+DGi7Jf7BaPzPoayB3CbP0gGe23eD3/i0L4fzrUOHXKfr ka2xzcqX4uerVH+HLPdzBvBbqJWcmjpA8k2h0YY8BGlSe1+01Ylp7MmEabykXw55g/4F z5i4kbHZMC4OJ+rNOKLM3ZU5pROE8ziCLr24iIqCXwBt49mvdg08+s46S6T/Dhg+uZXm Kp0A== 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=IjMDxV/fqRnFzabR02gKFn+CO6zCBlnQSvHHN0jm6iE=; b=Nd5chKZ4G0n132UeIR8GfTyp0nd2ASx+Z/ZYj7HQFZ9+H9WxGIAFgEciXYrRQoZ1P1 F4jShaqPJDAAnqMg71dijHIbSUfMjMxW1/zoE+Yvc0hr2lJCnfc0BA/qUbp3dU1BzuZC xEbHw92hDDJ+pIMWAwdAMEMi1IsT36Z8YfCe5lGygvCzSUt3K3Lx/vrIoYGL6XRErT0p ek0hvkEg/Tzr9ZJRewtFVkGkNK1sxB0ELVAznDFc3uIxL08h/HH/zaj7dnkVZj5+xuat T0D2RtI2R2RH21GVrvwle1rAwj6bxS4Iz8iOCA/jxjTlivQl1skVJdPei1oi0K5RDhlZ JZqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aPD39wcc; 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; 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 f6-v6si6546478plo.800.2018.02.12.17.37.49; Mon, 12 Feb 2018 17:37:49 -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=@linaro.org header.s=google header.b=aPD39wcc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933223AbeBMBhb (ORCPT + 27 others); Mon, 12 Feb 2018 20:37:31 -0500 Received: from mail-pl0-f65.google.com ([209.85.160.65]:36425 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933157AbeBMBh3 (ORCPT ); Mon, 12 Feb 2018 20:37:29 -0500 Received: by mail-pl0-f65.google.com with SMTP id v3so5886966plg.3 for ; Mon, 12 Feb 2018 17:37:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=IjMDxV/fqRnFzabR02gKFn+CO6zCBlnQSvHHN0jm6iE=; b=aPD39wccxONfOI/GqIzZu5Ci0MtZsBIm3PxgGxjD5z6cOur//Ljxw/ezxI1A/aafy/ Ewg1OdCT3tECZQWOuSy6/TivIKxuyApnqrxKPfRNMM/0O5A75COgA5Pyvqm4yYRHbbOb /VVgVb0WKZzPIoiCbKsdljTlgM5OM+2xBkyh8= 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=IjMDxV/fqRnFzabR02gKFn+CO6zCBlnQSvHHN0jm6iE=; b=Yi028pZWI3h4l0NqOuuIvDr2s0eP/2kgOXA1IEhnr/BgTJxU5wi/wxftLV+O9iVM7D kIyMgXutPf4zY3xdcwgUTH7hmZj0wgtKiP0uVJuuISbqiJ1J42R5tZnaGPhEATsdd22S Yt6Nc1Mgla76Q7adUAzUoSeFLY62Sj6bqVglz5J0C22B/cQ2SWAOFhpIssg7mwZnohM6 Q48Scj9zcjULNdfQ996KWfuGwtmXY50FLR3akL8LurgHXTxC7bStL3y0HeK5rEoOhE4R 52s1AOM67aoo+ict3Vgz0orZ6y8h9TBEVhJs3yjTOCUGYJdpfkP+ArA0PEBfOenGyQTr utwA== X-Gm-Message-State: APf1xPDKOvDhTAXM/FVsRoAFkAgVdhVq1VV9Fsp3nQnwvWCJb7HXNaIN ud9DPtzGrSyowuLeda1SUvnqxQ== X-Received: by 2002:a17:902:b20b:: with SMTP id t11-v6mr12317978plr.348.1518485848579; Mon, 12 Feb 2018 17:37:28 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id u13sm29382979pfd.169.2018.02.12.17.37.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 17:37:27 -0800 (PST) From: Bjorn Andersson To: Andy Gross , David Brown Cc: Rajendra Nayak , Govind Singh , Shon Parate , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] soc: qcom: rmtfs-mem: Add support for assigning memory to remote Date: Mon, 12 Feb 2018 17:37:23 -0800 Message-Id: <20180213013724.3177-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.15.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On some platform the remote processor's memory map is not statically configured in TrustZone, so each memory region that is to be accessed by the remote needs a call into TrustZone to set up the remote's permissions. Implement this for the rmtfs memory driver, to give the modem on 8996 access to the shared file system buffers. Signed-off-by: Bjorn Andersson --- drivers/soc/qcom/Kconfig | 1 + drivers/soc/qcom/rmtfs_mem.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) -- 2.15.0 diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index e050eb83341d..a993d19fa562 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -47,6 +47,7 @@ config QCOM_QMI_HELPERS config QCOM_RMTFS_MEM tristate "Qualcomm Remote Filesystem memory driver" depends on ARCH_QCOM + select QCOM_SCM help The Qualcomm remote filesystem memory driver is used for allocating and exposing regions of shared memory with remote processors for the diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c index 0a43b2e8906f..c8999e38b005 100644 --- a/drivers/soc/qcom/rmtfs_mem.c +++ b/drivers/soc/qcom/rmtfs_mem.c @@ -37,6 +37,8 @@ struct qcom_rmtfs_mem { phys_addr_t size; unsigned int client_id; + + unsigned int perms; }; static ssize_t qcom_rmtfs_mem_show(struct device *dev, @@ -151,9 +153,11 @@ static void qcom_rmtfs_mem_release_device(struct device *dev) static int qcom_rmtfs_mem_probe(struct platform_device *pdev) { struct device_node *node = pdev->dev.of_node; + struct qcom_scm_vmperm perms[2]; struct reserved_mem *rmem; struct qcom_rmtfs_mem *rmtfs_mem; u32 client_id; + u32 vmid; int ret; rmem = of_reserved_mem_lookup(node); @@ -204,10 +208,31 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev) rmtfs_mem->dev.release = qcom_rmtfs_mem_release_device; + ret = of_property_read_u32(node, "qcom,vmid", &vmid); + if (ret < 0 && ret != -EINVAL) { + dev_err(&pdev->dev, "failed to parse qcom,vmid\n"); + goto remove_cdev; + } else if (!ret) { + perms[0].vmid = QCOM_SCM_VMID_HLOS; + perms[0].perm = QCOM_SCM_PERM_RW; + perms[1].vmid = vmid; + perms[1].perm = QCOM_SCM_PERM_RW; + + rmtfs_mem->perms = BIT(QCOM_SCM_VMID_HLOS); + ret = qcom_scm_assign_mem(rmtfs_mem->addr, rmtfs_mem->size, + &rmtfs_mem->perms, perms, 2); + if (ret < 0) { + dev_err(&pdev->dev, "assign memory failed\n"); + goto remove_cdev; + } + } + dev_set_drvdata(&pdev->dev, rmtfs_mem); return 0; +remove_cdev: + cdev_device_del(&rmtfs_mem->cdev, &rmtfs_mem->dev); put_device: put_device(&rmtfs_mem->dev); @@ -217,6 +242,15 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev) static int qcom_rmtfs_mem_remove(struct platform_device *pdev) { struct qcom_rmtfs_mem *rmtfs_mem = dev_get_drvdata(&pdev->dev); + struct qcom_scm_vmperm perm; + + if (rmtfs_mem->perms) { + perm.vmid = QCOM_SCM_VMID_HLOS; + perm.perm = QCOM_SCM_PERM_RW; + + qcom_scm_assign_mem(rmtfs_mem->addr, rmtfs_mem->size, + &rmtfs_mem->perms, &perm, 1); + } cdev_device_del(&rmtfs_mem->cdev, &rmtfs_mem->dev); put_device(&rmtfs_mem->dev); From patchwork Tue Feb 13 01:37:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 128190 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3766393ljc; Mon, 12 Feb 2018 17:37:36 -0800 (PST) X-Google-Smtp-Source: AH8x225Xq8C2065CZt47F7OJYvvayTcKBSyaq+kxnk5EEUugGwEtQskfSEltb2iZ6JQqARiqEaKg X-Received: by 10.98.129.5 with SMTP id t5mr13526578pfd.6.1518485856378; Mon, 12 Feb 2018 17:37:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518485856; cv=none; d=google.com; s=arc-20160816; b=f3EuhjjFDYSFGm02v8eFu2cOS3DhB6sFmGcUP+PrVZ91TTrz4ulbo1pPCCmVq2Ndgl 4lA8n9ffMXmOpJHWUrc9Swn+4KSGJDCtnJzNpgaX192Z5SqQBH3r8+6XxmA4/85oIdqt TyLxTTWYT2G3ZNgbZ9I6oS+9fCh9tamZ4CZMZ4dIy/jtHqKNTQqxoJ4eSqx/bjkS6LXp XhOaSek5yROIRlr9cMnabq3UZpsiw3OQdyRq6FLfcCF3365pShBOTML7gCutrA71AI4y OCZAVD4D2qs/902YwwO4PnjqLk+x/+UqWnGxoyxlOLx9S9baTpCgrsa+Vw9EV6/Wgq8W k5dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=n2nHI2B7SjWO9Lggdpt44YiJNK615wHH8mRd9jpINQw=; b=FDdpbSoP+UbN6ueVSSmpOU/zy8pgY931xJ/RJPmSJ3CdCKDhQbbt1pIREpWm6oF4kH q1Hjj1yS6QNYXiCMoz6MILhmfDbPQ36Kqsl8UMA3IZjir5L0FSwEVDY62cSJ89fDeHca ZkZTg8/mJfAoJzt1gp3L4PzlehMG9daxLMkbVTiH5V2u0IBAV7r5sQKKjEHMaw3fJbg/ ZmdWDIwHB/LWx0lXXd8B5jroWUpfjjfPZzvYaccjtgFiQBXljBbZ+veVn9zd5t4Xvqq9 NurfLjy+K3laI9EfDTjcqvl2/KOetdEhV8W+0lZl2/8G2tD6hNEYnGx1x8hBZEj+j1Yh r6Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BHxNsQAa; 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; 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 x21-v6si3012738pll.229.2018.02.12.17.37.36; Mon, 12 Feb 2018 17:37:36 -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=@linaro.org header.s=google header.b=BHxNsQAa; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933250AbeBMBhc (ORCPT + 27 others); Mon, 12 Feb 2018 20:37:32 -0500 Received: from mail-pl0-f67.google.com ([209.85.160.67]:34621 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933161AbeBMBha (ORCPT ); Mon, 12 Feb 2018 20:37:30 -0500 Received: by mail-pl0-f67.google.com with SMTP id bd10so1040681plb.1 for ; Mon, 12 Feb 2018 17:37:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=n2nHI2B7SjWO9Lggdpt44YiJNK615wHH8mRd9jpINQw=; b=BHxNsQAa073qfo6c3gW+7KqpQcSZTs4zsEHnzOxiec/HNsRmHKFZ66qstLKhe4RnKF o+12GxnhVg7mXsuwrroKCgO6sApKoNiL92Ab5ipu8CdQhE/GoXHe12s8h12gU9pRvf1S Igw9Jx93QW48CCtNlNPVeqjhWc55XIWW6mvtU= 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:in-reply-to :references; bh=n2nHI2B7SjWO9Lggdpt44YiJNK615wHH8mRd9jpINQw=; b=cm2Yfxb4aVy5cEoH0uO0xJPLw4nasE8VJB/CW3GS4jfIhmXOWO0hwrr9th5QIOa4km +6z3GRJKTOU2j7yprFhBB5GmOySmRqrlhl+LGVwiB5YWULs2daGQbiCfMlMdNLn68caF /zA3szwCc7VaWW9ZpKcfD37rhCnGn9Qr7Hb/iR2jFYM29jYB6O9LUpCrV3FLZPTzqlbl eY/rk4TFqB21eHL3Y6gl4byn7TW84Oi4jr5O2jdm+1xFC/bd6MVDb54SjNMTL24zbPnm EMFrm8wHpc+L6JViTWoQcM0IoirBSzKvrkGOn3Sll0kE1WRkt5gjICSDPZBsSTYaKRVq fIiw== X-Gm-Message-State: APf1xPCnxbxjYINhAckPnBscdQtK53J2egIkGN/x/J/w8AD6vwdU9R7p g3rdo0Zg1n1p3WgBkZpDArignQ== X-Received: by 2002:a17:902:678b:: with SMTP id g11-v6mr12562561plk.13.1518485849733; Mon, 12 Feb 2018 17:37:29 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id u13sm29382979pfd.169.2018.02.12.17.37.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 17:37:29 -0800 (PST) From: Bjorn Andersson To: Andy Gross , David Brown Cc: Rajendra Nayak , Govind Singh , Shon Parate , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: msm8996: Add rmtfs sharedmem node Date: Mon, 12 Feb 2018 17:37:24 -0800 Message-Id: <20180213013724.3177-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20180213013724.3177-1-bjorn.andersson@linaro.org> References: <20180213013724.3177-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A 2MB shared memory region is used on MSM8996 for exchanging sector data in rmtfs. Add this chunk of reserved memory now that we have the rmtfs-mem compatible to describe it and its memory protection properties. Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.15.0 diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 4b2afcc4fdf4..d04babb5f526 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -75,6 +75,17 @@ reg = <0x0 0x86200000 0x0 0x2600000>; no-map; }; + + rmtfs@86700000 { + compatible = "qcom,rmtfs-mem"; + + size = <0x0 0x200000>; + alloc-ranges = <0x0 0xa0000000 0x0 0x2000000>; + no-map; + + qcom,client-id = <1>; + qcom,vmid = <15>; + }; }; cpus {