From patchwork Tue Sep 8 13:10:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 11764091 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0062913B1 for ; Tue, 8 Sep 2020 19:43:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7A732166E for ; Tue, 8 Sep 2020 19:43:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=marek-ca.20150623.gappssmtp.com header.i=@marek-ca.20150623.gappssmtp.com header.b="Btgln1Dz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732388AbgIHTn0 (ORCPT ); Tue, 8 Sep 2020 15:43:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730879AbgIHPwh (ORCPT ); Tue, 8 Sep 2020 11:52:37 -0400 Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2223CC061243 for ; Tue, 8 Sep 2020 06:11:33 -0700 (PDT) Received: by mail-qt1-x833.google.com with SMTP id h6so4008896qtd.6 for ; Tue, 08 Sep 2020 06:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hUrb8SCFg6HulXICTWjB5J3dJa3WsyRvIUrd/Gj8E1A=; b=Btgln1DzqOK0Ky5OmfZSVznH+IIFskFJhEUd/6L+2EzexX2xFdtpBjfG38nIjkpQK2 pmnstu3GxKex83ZqJBTGKEoxQOsaa9ej1y1DmAcjfKwb+0/WbK2LcBN7TCMlSvkpWo6l 4QtbYzWr29/ZV+fKFkKIj68KD1so+1Scelu9baU+Kvw3HAAudlLQf80AutQ5xanEeCsL R4JT/89nxaVd+kfU/AIPwxL7uteIXQwOK3LtJdgLl82r3LjSyfuC3lv9Lh8VmS1z8q7H +QwBvwk4vlWlHa85UZOoF69Ob9wSq9wKPzlP8O+GJkTsnX4Bf2jVdcigwybNlpnWXA/V MdGQ== 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:mime-version:content-transfer-encoding; bh=hUrb8SCFg6HulXICTWjB5J3dJa3WsyRvIUrd/Gj8E1A=; b=eH+lZkartg38+XrZ2tYmoyH96+Cl79eh8mI6LUO0Grq9CXQ7nuo0RhbRpCOyUa3KSY fCK2T/vHJt2UHvaIEOGoFUfI2iIQkzPZQSARipWOgHq5eGCBoKcaREv0HYrkqghtQQkg TaofQ+4dsr5OWXVZ8xDDUIzPsw0Tb5OSB68XrEj5ZJiXpI9rONvsqDNy6N4awHKmaZue +Dqv99Ng6sTuuJf4kjurlY805vUmfvLajS1oHZ+GFONn9+7TfSFR818ZjoONi6RuWxHJ lxQI4Ng7CDa9e1trfwpbpqSCcF0ASIXIM2rwTUqCYMHhRHjMEsgycoHfc6Sb9/tqxucr MYlQ== X-Gm-Message-State: AOAM5303x8qObV7jdYP7FxvTm+0gE6sPHh0vFBZaaoAOkrHJIusTpjoe NYECwSkqnVKNqD5DI3gC4qfXF4xNQTBXsHcl/9o= X-Google-Smtp-Source: ABdhPJx3qjKvLLDxptFWyk2taGV4q+N24WetF6P4vAorl5llo7bW4K8NDUDihiwxftcYS6HUZPP72g== X-Received: by 2002:aed:39a1:: with SMTP id m30mr25310181qte.39.1599570690288; Tue, 08 Sep 2020 06:11:30 -0700 (PDT) Received: from localhost.localdomain ([147.253.86.153]) by smtp.gmail.com with ESMTPSA id m196sm13394069qke.87.2020.09.08.06.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 06:11:29 -0700 (PDT) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: Srinivas Kandagatla , Jorge Ramirez-Ortiz , Greg Kroah-Hartman , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 1/3] misc: fastrpc: fix indentation error in uapi header Date: Tue, 8 Sep 2020 09:10:09 -0400 Message-Id: <20200908131013.19630-2-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200908131013.19630-1-jonathan@marek.ca> References: <20200908131013.19630-1-jonathan@marek.ca> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Use tabs instead of spaces. Fixes: 2419e55e532d ("misc: fastrpc: add mmap/unmap support") Signed-off-by: Jonathan Marek --- include/uapi/misc/fastrpc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uapi/misc/fastrpc.h b/include/uapi/misc/fastrpc.h index 07de2b7aac85..de31f0bd4779 100644 --- a/include/uapi/misc/fastrpc.h +++ b/include/uapi/misc/fastrpc.h @@ -10,8 +10,8 @@ #define FASTRPC_IOCTL_INVOKE _IOWR('R', 3, struct fastrpc_invoke) #define FASTRPC_IOCTL_INIT_ATTACH _IO('R', 4) #define FASTRPC_IOCTL_INIT_CREATE _IOWR('R', 5, struct fastrpc_init_create) -#define FASTRPC_IOCTL_MMAP _IOWR('R', 6, struct fastrpc_req_mmap) -#define FASTRPC_IOCTL_MUNMAP _IOWR('R', 7, struct fastrpc_req_munmap) +#define FASTRPC_IOCTL_MMAP _IOWR('R', 6, struct fastrpc_req_mmap) +#define FASTRPC_IOCTL_MUNMAP _IOWR('R', 7, struct fastrpc_req_munmap) struct fastrpc_invoke_args { __u64 ptr; From patchwork Tue Sep 8 13:10:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 11764071 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D3D5B13B1 for ; Tue, 8 Sep 2020 19:39:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B88F92098B for ; Tue, 8 Sep 2020 19:39:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=marek-ca.20150623.gappssmtp.com header.i=@marek-ca.20150623.gappssmtp.com header.b="Mr9PlJQE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731260AbgIHTjZ (ORCPT ); Tue, 8 Sep 2020 15:39:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730953AbgIHPzg (ORCPT ); Tue, 8 Sep 2020 11:55:36 -0400 Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F5BEC061240 for ; Tue, 8 Sep 2020 06:11:32 -0700 (PDT) Received: by mail-qt1-x843.google.com with SMTP id c18so944586qtw.5 for ; Tue, 08 Sep 2020 06:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=234lHPOkmRtRf38tY/dBUtuiJiCNT+A1HGusExETXW8=; b=Mr9PlJQE8npLe+p4mJ2C+cdVwblHUugaVSN0/1HpRNKDtU2yAgDDTRwo31DxGctwUT olHRgrKSDFjj7TvrvMkScApWdYiLUEko63sQQvNnR72Ko7jxmlBVe/qlpcADv3rpJCJc /x1XGudl2dNlAK5wMVg63lvoO4CKTr1zSXLdQ1vp1mqThpBX4k9XcBdyn2Y6JzM6m2qT b0yxgO+pavHTR05Fn7jlVEmxIs4NSgQ3oiVpbF2IknhHKK6n6TBjDEbQIsYuPgKL2KHH nXCJxmGj2PYyduIFg67o7M1b8J+e1v3aUQYhJ0MHWDCGyxy7mJ20Uhx6lHrUEgZzOR7N 44WQ== 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:mime-version:content-transfer-encoding; bh=234lHPOkmRtRf38tY/dBUtuiJiCNT+A1HGusExETXW8=; b=TINq+c6wzg8xGjhPQsO94kc14dLGon0xaxiASY1f+kdCCMgIeF5uNAz7RkJpNJW3tp e4JRWELcPoUsDCbIuAXKoYBTMWrwP2QfzbyI6cnZUDmbZb5weyU22kRcT38zsAnEZ/FD rhghQW2PUKkzfuB0bw8zXus422e7LgQnNGpU6/ouJ7xcp6XnfzXVtwI2xnhrKmwHajfg wKbo0P20FqlEJ5ZE13xfdhN3mHUoRozNIsvAQziVEWvsUMmxuvK8ntPyI5EVXG8q2MPq BF2Uxe0pqcpEBFcZyv6ZngiSmliu3gefY1IjrpE+GPG2UzqeZabgSe1wXk2ccfFh+w+C 1WGw== X-Gm-Message-State: AOAM53040dVbICFbhObcURHTQVypN/5Do6kzjERvw2TGfkpm1R5T8vSi mIwCcd3H0TjrOfpJzZdUi7oGMpqo137m3N4D2jk= X-Google-Smtp-Source: ABdhPJxOq4dOIR8XqBJjvM4awnVR21mm14rvL4wSXqdtAGU3DDotuiXdbCGUT+4KfYnvHEJ+gOu8qA== X-Received: by 2002:ac8:498d:: with SMTP id f13mr11909985qtq.35.1599570691197; Tue, 08 Sep 2020 06:11:31 -0700 (PDT) Received: from localhost.localdomain ([147.253.86.153]) by smtp.gmail.com with ESMTPSA id m196sm13394069qke.87.2020.09.08.06.11.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 06:11:30 -0700 (PDT) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: Arnd Bergmann , Greg Kroah-Hartman , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 2/3] misc: fastrpc: define names for protection domain ids Date: Tue, 8 Sep 2020 09:10:10 -0400 Message-Id: <20200908131013.19630-3-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200908131013.19630-1-jonathan@marek.ca> References: <20200908131013.19630-1-jonathan@marek.ca> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Define SENSORS_PD for the next patch, to void using magic values for these. Signed-off-by: Jonathan Marek --- drivers/misc/fastrpc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 7939c55daceb..07b381c042cd 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -73,6 +73,11 @@ #define FASTRPC_RMID_INIT_CREATE_ATTR 7 #define FASTRPC_RMID_INIT_CREATE_STATIC 8 +/* Protection Domain(PD) ids */ +#define AUDIO_PD (0) /* also GUEST_OS PD? */ +#define USER_PD (1) +#define SENSORS_PD (2) + #define miscdev_to_cctx(d) container_of(d, struct fastrpc_channel_ctx, miscdev) static const char *domains[FASTRPC_DEV_MAX] = { "adsp", "mdsp", @@ -1037,7 +1042,7 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl, inbuf.pageslen = 1; inbuf.attrs = init.attrs; inbuf.siglen = init.siglen; - fl->pd = 1; + fl->pd = USER_PD; if (init.filelen && init.filefd) { err = fastrpc_map_create(fl, init.filefd, init.filelen, &map); @@ -1287,7 +1292,7 @@ static int fastrpc_init_attach(struct fastrpc_user *fl) args[0].fd = -1; args[0].reserved = 0; sc = FASTRPC_SCALARS(FASTRPC_RMID_INIT_ATTACH, 1, 0); - fl->pd = 0; + fl->pd = AUDIO_PD; return fastrpc_internal_invoke(fl, true, FASTRPC_INIT_HANDLE, sc, &args[0]); From patchwork Tue Sep 8 13:10:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 11764089 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7B47D1599 for ; Tue, 8 Sep 2020 19:43:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E2BE2166E for ; Tue, 8 Sep 2020 19:43:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=marek-ca.20150623.gappssmtp.com header.i=@marek-ca.20150623.gappssmtp.com header.b="AvXioZY1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731830AbgIHTnP (ORCPT ); Tue, 8 Sep 2020 15:43:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730870AbgIHPwh (ORCPT ); Tue, 8 Sep 2020 11:52:37 -0400 Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88D56C061245 for ; Tue, 8 Sep 2020 06:11:34 -0700 (PDT) Received: by mail-qt1-x841.google.com with SMTP id h6so4009030qtd.6 for ; Tue, 08 Sep 2020 06:11:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lTBu5eojvtH3Cg+6qbTtorcKtib9FdmKFYP+6u1ZlTM=; b=AvXioZY1lrRFV29Rd2bQ+oc4u+i4TYWLNkpUwEfCglPKplw2Peh96WxLh8HLEfOPwl 3eKVoXUefH+2pse10GxAwhD8vKo1iM5YDgnqKsOJnVJ511Hs6Ka4cd6ckiexxEbOmz7+ EJVN/uvWsKXCp3mcPPOQFFQFc/aIYAj8sV/0u/XW9oCCRuJ02rcWOuLm4KCY/UorBWxV ii+HldpZFmE1g9k5anDMfc/Xn5Rfb30DchkgRbcEHLcj+JJllzamtml4CtPTYV07O0W4 sDSCvDlJXmQtA8HEbcn9CkRhgVPrWwIfoeQ4GQBFejCbKgm9VagHSYYaOTzfC9mTRr9U G3Zg== 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:mime-version:content-transfer-encoding; bh=lTBu5eojvtH3Cg+6qbTtorcKtib9FdmKFYP+6u1ZlTM=; b=qq3zXZZsAjiXbiqsC3sNGmQmaiPb9B+wzTH6o0QVBLv35QkDbb7Ld0ZaTCHSy8Lxnr wpwP1IAfblf22jRSQ81D2R070nD362zefQtwINsdDhB28/6c4GRnm4ohDGXcQ1xzy6pI 6IlFO899K6CMhtfqCbqH0mlkNBiOe/0xqe4jETeNdeLNhv7J4PF2j24eOZYJQ3duKeoL lm6hyayTXD0NMZtbkUrrNTRLs0wBXCgjferqAK9XOm5m8TBK0uf5MGkGs2olWauzw+5U /jYXxBKioV4yXtPRJDVo09nxC2paMcq6Efkb3FtyaO+sfov+Sue1T0tqs3aAQUze+JlX xK6g== X-Gm-Message-State: AOAM5309+2/xtrRyLRFdBxoWxU4s/vsABWJV5Zxe3SUOFTNMduV7UtxN u4l+A2AOh98RxUPWOuS5TBpzbGE6dM/OAulfcDw= X-Google-Smtp-Source: ABdhPJwWqntjWp9qEhGaNDY0DcpRw1SyTeDt4rha85EL0qldShYjZZny052WkxQuiCgVT8FP4un+Vg== X-Received: by 2002:ac8:4d05:: with SMTP id w5mr16846175qtv.339.1599570693504; Tue, 08 Sep 2020 06:11:33 -0700 (PDT) Received: from localhost.localdomain ([147.253.86.153]) by smtp.gmail.com with ESMTPSA id m196sm13394069qke.87.2020.09.08.06.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 06:11:32 -0700 (PDT) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: Arnd Bergmann , Greg Kroah-Hartman , Srinivas Kandagatla , Jorge Ramirez-Ortiz , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 3/3] misc: fastrpc: add ioctl for attaching to sensors pd Date: Tue, 8 Sep 2020 09:10:11 -0400 Message-Id: <20200908131013.19630-4-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200908131013.19630-1-jonathan@marek.ca> References: <20200908131013.19630-1-jonathan@marek.ca> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Initializing sensors requires attaching to pd 2. Add an ioctl for that. This corresponds to FASTRPC_INIT_ATTACH_SENSORS in the downstream driver. Signed-off-by: Jonathan Marek --- drivers/misc/fastrpc.c | 9 ++++++--- include/uapi/misc/fastrpc.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 07b381c042cd..f05f4b5934bd 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -1281,7 +1281,7 @@ static int fastrpc_dmabuf_alloc(struct fastrpc_user *fl, char __user *argp) return 0; } -static int fastrpc_init_attach(struct fastrpc_user *fl) +static int fastrpc_init_attach(struct fastrpc_user *fl, int pd) { struct fastrpc_invoke_args args[1]; int tgid = fl->tgid; @@ -1292,7 +1292,7 @@ static int fastrpc_init_attach(struct fastrpc_user *fl) args[0].fd = -1; args[0].reserved = 0; sc = FASTRPC_SCALARS(FASTRPC_RMID_INIT_ATTACH, 1, 0); - fl->pd = AUDIO_PD; + fl->pd = pd; return fastrpc_internal_invoke(fl, true, FASTRPC_INIT_HANDLE, sc, &args[0]); @@ -1482,7 +1482,10 @@ static long fastrpc_device_ioctl(struct file *file, unsigned int cmd, err = fastrpc_invoke(fl, argp); break; case FASTRPC_IOCTL_INIT_ATTACH: - err = fastrpc_init_attach(fl); + err = fastrpc_init_attach(fl, AUDIO_PD); + break; + case FASTRPC_IOCTL_INIT_ATTACH_SNS: + err = fastrpc_init_attach(fl, SENSORS_PD); break; case FASTRPC_IOCTL_INIT_CREATE: err = fastrpc_init_create_process(fl, argp); diff --git a/include/uapi/misc/fastrpc.h b/include/uapi/misc/fastrpc.h index de31f0bd4779..0a89f95463f6 100644 --- a/include/uapi/misc/fastrpc.h +++ b/include/uapi/misc/fastrpc.h @@ -12,6 +12,7 @@ #define FASTRPC_IOCTL_INIT_CREATE _IOWR('R', 5, struct fastrpc_init_create) #define FASTRPC_IOCTL_MMAP _IOWR('R', 6, struct fastrpc_req_mmap) #define FASTRPC_IOCTL_MUNMAP _IOWR('R', 7, struct fastrpc_req_munmap) +#define FASTRPC_IOCTL_INIT_ATTACH_SNS _IO('R', 8) struct fastrpc_invoke_args { __u64 ptr;