From patchwork Wed Jun 9 10:23:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 456814 Delivered-To: patches@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp5115900jae; Wed, 9 Jun 2021 03:23:38 -0700 (PDT) X-Received: by 2002:a2e:2f07:: with SMTP id v7mr21781350ljv.308.1623234218697; Wed, 09 Jun 2021 03:23:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623234218; cv=none; d=google.com; s=arc-20160816; b=wkYSlHXK3tnWuisGAU9zVH0WBZ76kzaI70R22kmgYJwVRTv+t3P0dGqNkKDGCRdddI 4WRaR8tdZYxwCDm+t+giiYLEkjNmYS7Ek218PU/317oj7QDt+XcSFQRhFPCFgtogEkpJ 5jQ0IXRZqrS2EDg4Qc5rStf9y1D62C6GjGBdBVGqHzheG+wFqTP9ehlEk2/7S5okapFW eBlytSb14hbid+IVySpSpD2bpdlaI7p1p3+Tp8GtBaxaoc/Me4IXEXmOesg13BITldXa N5axmtgGW4WFiGpcZa7LKjmbQEO/Bxlnmz0T5MAG3XNdLpXzhAsuQAda4YBr/6DQhIOX TarA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=S9L1UST91CNAHLkSPICX3VPuq32tNYAEanaTNNZO0q8=; b=b/0U6ezHQUTGQoFz5favns2beHpVWswT8iHviyRVeh1oW4P3weArqtqut3J2viP0tk Lia4aP3mLfpkruhYltNBCY5rf/u6ENPjENZdVZmM8crl/mYRr4ESMq3psfDcZ3HIhn38 0gamonViULNirMt8kJRIEkuTcJCFVVKxI1BRZwOC/BIqRbUCcxIzlerYXoFFLRBrNSl2 KQtQ/DQy2/J6tWSscmpWQAzs9kQGsUD6xTsGo/rMvvmnkbwIt8G2XnoId4qMXh4wMBLi c6bbgQkyfiVbvgdIrsXp0iBDnjtVscbuRgwheruCW2kNlr76SLO1X6Yqgx+JOHyMzOxz w6BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IYOk8I54; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id x8sor630071lfe.44.2021.06.09.03.23.38 for (Google Transport Security); Wed, 09 Jun 2021 03:23:38 -0700 (PDT) Received-SPF: pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IYOk8I54; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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 :mime-version:content-transfer-encoding; bh=S9L1UST91CNAHLkSPICX3VPuq32tNYAEanaTNNZO0q8=; b=IYOk8I54rWLZ5Np2R1bzEFwVy5KwKmcdQ4BTvvnwJbTEsg6OiNsdY2CBZoYILdQfXx VLbfJxVpa66mnOx2V4bYHwexFzVqSD2UJGHdrWCJq9QbmwwI4d5aCOBk4JF2Ad11zEjm IjMcAVXyZVai5sdwgeKdfmWyTmzP6iwafOBPLyjsPlcZ30LrDMsZKJMy26zYNBUntUbO rfk8FwfoyHkiV4TDwAsiwv4ij4C0pJ1JZ3PKTCJjzxLQyPiLBeSOdK3bC2DlCDN4U2/f ySkUMzcFYkYlffC0o+Mp1osFIWtaYtSfD21GYwgC4VB0Hy6kKq1Y+vqsVZrNnWO/zzzs XuWQ== 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=S9L1UST91CNAHLkSPICX3VPuq32tNYAEanaTNNZO0q8=; b=Y8aaceFv3FoqMeFPVMnUzxiyEk2EwGR8edoKqoRhCiFkiBHzb43w/1yls5yzbK57PR L2lViWCK299063BKgo++66ynuu6A+nm5WDzyBEmLca4kZiqKl9h+oJF1mti9f3o1A4eg SdM2moMr6/IKvdPiMV5CN5O3IMbrcJ7nrJ10T9gBd20yaMLKlX64QVHn1lTuzJTehOG2 i58vV+15wdUe5mka0TrkCNA7FRcVDx2nx9x4EPctQdMYAjQjLheR7nDpewsl09Q9OPKT 9b/xJsObT1qSzgw1LyS43T4zS7lfQ569d1R4xWb/JJnHwwRyVNL0/UlZ42RmhruwfO2f jN4A== X-Gm-Message-State: AOAM530cltplp1b8BqGITlees6fgg0HID5QT5/eshbjbLPxHEpAGEFGt 2qI9aWPXGESa/B60EVbFu8HoeGoJ X-Google-Smtp-Source: ABdhPJyq82dDCmEPp1H3l89ON8o2eLljF8JtSjMCVEN2Y9jxHB/b7oKBppGWd3jdmwYwhqXem/TJsg== X-Received: by 2002:a05:6512:3146:: with SMTP id s6mr18254687lfi.173.1623234218296; Wed, 09 Jun 2021 03:23:38 -0700 (PDT) Return-Path: Received: from jade.urgonet (h-79-136-85-3.A175.priv.bahnhof.se. [79.136.85.3]) by smtp.gmail.com with ESMTPSA id m4sm302966ljp.9.2021.06.09.03.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 03:23:38 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, op-tee@lists.trustedfirmware.org Cc: Sumit Garg , Herbert Xu , Sakkinen , Sasha Levin , Thirupathaiah Annapureddy , Vikas Gupta , "David S . Miller" , Tyler Hicks , Jens Wiklander Subject: [PATCH 1/7] tee: remove unused tee_shm_pool_alloc_res_mem() Date: Wed, 9 Jun 2021 12:23:18 +0200 Message-Id: <20210609102324.2222332-2-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210609102324.2222332-1-jens.wiklander@linaro.org> References: <20210609102324.2222332-1-jens.wiklander@linaro.org> MIME-Version: 1.0 None of the drivers in the TEE subsystem uses tee_shm_pool_alloc_res_mem() so remove the function. Signed-off-by: Jens Wiklander --- drivers/tee/tee_shm_pool.c | 56 -------------------------------------- include/linux/tee_drv.h | 30 -------------------- 2 files changed, 86 deletions(-) -- 2.31.1 diff --git a/drivers/tee/tee_shm_pool.c b/drivers/tee/tee_shm_pool.c index fcbb461fc59c..a9f9d50fd181 100644 --- a/drivers/tee/tee_shm_pool.c +++ b/drivers/tee/tee_shm_pool.c @@ -47,62 +47,6 @@ static const struct tee_shm_pool_mgr_ops pool_ops_generic = { .destroy_poolmgr = pool_op_gen_destroy_poolmgr, }; -/** - * tee_shm_pool_alloc_res_mem() - Create a shared memory pool from reserved - * memory range - * @priv_info: Information for driver private shared memory pool - * @dmabuf_info: Information for dma-buf shared memory pool - * - * Start and end of pools will must be page aligned. - * - * Allocation with the flag TEE_SHM_DMA_BUF set will use the range supplied - * in @dmabuf, others will use the range provided by @priv. - * - * @returns pointer to a 'struct tee_shm_pool' or an ERR_PTR on failure. - */ -struct tee_shm_pool * -tee_shm_pool_alloc_res_mem(struct tee_shm_pool_mem_info *priv_info, - struct tee_shm_pool_mem_info *dmabuf_info) -{ - struct tee_shm_pool_mgr *priv_mgr; - struct tee_shm_pool_mgr *dmabuf_mgr; - void *rc; - - /* - * Create the pool for driver private shared memory - */ - rc = tee_shm_pool_mgr_alloc_res_mem(priv_info->vaddr, priv_info->paddr, - priv_info->size, - 3 /* 8 byte aligned */); - if (IS_ERR(rc)) - return rc; - priv_mgr = rc; - - /* - * Create the pool for dma_buf shared memory - */ - rc = tee_shm_pool_mgr_alloc_res_mem(dmabuf_info->vaddr, - dmabuf_info->paddr, - dmabuf_info->size, PAGE_SHIFT); - if (IS_ERR(rc)) - goto err_free_priv_mgr; - dmabuf_mgr = rc; - - rc = tee_shm_pool_alloc(priv_mgr, dmabuf_mgr); - if (IS_ERR(rc)) - goto err_free_dmabuf_mgr; - - return rc; - -err_free_dmabuf_mgr: - tee_shm_pool_mgr_destroy(dmabuf_mgr); -err_free_priv_mgr: - tee_shm_pool_mgr_destroy(priv_mgr); - - return rc; -} -EXPORT_SYMBOL_GPL(tee_shm_pool_alloc_res_mem); - struct tee_shm_pool_mgr *tee_shm_pool_mgr_alloc_res_mem(unsigned long vaddr, phys_addr_t paddr, size_t size, diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 54269e47ac9a..53b9b2a13a87 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -272,36 +272,6 @@ static inline void tee_shm_pool_mgr_destroy(struct tee_shm_pool_mgr *poolm) poolm->ops->destroy_poolmgr(poolm); } -/** - * struct tee_shm_pool_mem_info - holds information needed to create a shared - * memory pool - * @vaddr: Virtual address of start of pool - * @paddr: Physical address of start of pool - * @size: Size in bytes of the pool - */ -struct tee_shm_pool_mem_info { - unsigned long vaddr; - phys_addr_t paddr; - size_t size; -}; - -/** - * tee_shm_pool_alloc_res_mem() - Create a shared memory pool from reserved - * memory range - * @priv_info: Information for driver private shared memory pool - * @dmabuf_info: Information for dma-buf shared memory pool - * - * Start and end of pools will must be page aligned. - * - * Allocation with the flag TEE_SHM_DMA_BUF set will use the range supplied - * in @dmabuf, others will use the range provided by @priv. - * - * @returns pointer to a 'struct tee_shm_pool' or an ERR_PTR on failure. - */ -struct tee_shm_pool * -tee_shm_pool_alloc_res_mem(struct tee_shm_pool_mem_info *priv_info, - struct tee_shm_pool_mem_info *dmabuf_info); - /** * tee_shm_pool_free() - Free a shared memory pool * @pool: The shared memory pool to free