From patchwork Fri Apr 22 22:17:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 8915951 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 54D5B9F1D3 for ; Fri, 22 Apr 2016 22:19:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7EED8200E6 for ; Fri, 22 Apr 2016 22:19:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8411E2015E for ; Fri, 22 Apr 2016 22:19:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753486AbcDVWRd (ORCPT ); Fri, 22 Apr 2016 18:17:33 -0400 Received: from mail-ob0-f178.google.com ([209.85.214.178]:36300 "EHLO mail-ob0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753448AbcDVWRb (ORCPT ); Fri, 22 Apr 2016 18:17:31 -0400 Received: by mail-ob0-f178.google.com with SMTP id j9so55778122obd.3 for ; Fri, 22 Apr 2016 15:17:31 -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:in-reply-to:references; bh=H/uvj2/5sOClQN8MclD4xWBX10uYGRcyJ9KWrW04odQ=; b=IjMgtEToyiUzIMwCfwWCSU/rffcFndd02lfuRh8DpHCXjXooiIY+0H2eenJYp1Aj3C wWhQsFwqyJlDngmomnj6vkk19OYDqcTDBFbgXqg6zisIk70NDyweQPgP7Y0zARthBnzF qqUEjEdkyiWloQul/JRpmod88hfS5W0u5IRgY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=H/uvj2/5sOClQN8MclD4xWBX10uYGRcyJ9KWrW04odQ=; b=XxRrgb16BykZOGDZfZo4aCBLkEILQ5s+OxkU59uYlKlRFLaxPGUk+zdBB2s7I/LulL HPOn+hK+8tNdfzGaZsg5j4OwguRq5cu2hU70H0CkDLrwH35a3J7VIGqYKfZeiEtbrR+2 Stp85+ciI6U0TKQ/44p7rglokzandri1UMXXXHGCb1adkOx3Ply8UImhNJ6QxjCKPvdi 3ArUi2WC1fUWldb7yicbIJSW2RkuWOirIE5Wpsod9pqjKb780B2KstFgqqDeuP1hCGKJ 1UywknThOWpOpTxWgebMegsuoJ90u8MktUlBqaWO1FSMV+KrA6zhBXA5mL+xlEWSJcbp VIug== X-Gm-Message-State: AOPr4FXR9YYYCS+W/ddL8u3+NjBtm4OsTXXMaVU/wCcGj17kMqK0j6P2XwFqGz1VkkPbhA4h X-Received: by 10.182.105.65 with SMTP id gk1mr9670759obb.37.1461363450851; Fri, 22 Apr 2016 15:17:30 -0700 (PDT) Received: from localhost ([2602:306:c558:19b0:a419:15a3:ad7f:f979]) by smtp.gmail.com with ESMTPSA id xt3sm2651996obc.28.2016.04.22.15.17.30 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 22 Apr 2016 15:17:30 -0700 (PDT) From: Andy Gross To: linux-arm-msm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stephen Boyd , devicetree@vger.kernel.org, Bjorn Andersson , jilai wang , Andy Gross Subject: [PATCH 6/8] firmware: qcom: scm: Add memory allocation API Date: Fri, 22 Apr 2016 17:17:10 -0500 Message-Id: <1461363432-5730-7-git-send-email-andy.gross@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461363432-5730-1-git-send-email-andy.gross@linaro.org> References: <1461363432-5730-1-git-send-email-andy.gross@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds APIs for the scm-32 and scm-64 to use for coherent memory allocation. Signed-off-by: Andy Gross --- drivers/firmware/qcom_scm.c | 17 +++++++++++++++++ drivers/firmware/qcom_scm.h | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 7d7b12b..6e3defb 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "qcom_scm.h" @@ -171,6 +172,22 @@ static void qcom_scm_init(void) __qcom_scm_init(); } +void *qcom_scm_alloc_buffer(size_t size, dma_addr_t *dma_addr, + gfp_t gfp) +{ + if (__scm) + return dma_alloc_writecombine(__scm->dev, size, dma_addr, gfp); + else + return ERR_PTR(-ENODEV); +} + +void qcom_scm_free_buffer(size_t size, void *cpu_addr, + dma_addr_t dma_addr) +{ + if (__scm) + dma_free_writecombine(__scm->dev, size, cpu_addr, dma_addr); +} + static int qcom_scm_probe(struct platform_device *pdev) { struct qcom_scm *scm; diff --git a/drivers/firmware/qcom_scm.h b/drivers/firmware/qcom_scm.h index d3f1f0a..33215b4 100644 --- a/drivers/firmware/qcom_scm.h +++ b/drivers/firmware/qcom_scm.h @@ -37,6 +37,10 @@ extern int __qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, u32 *resp); extern void __qcom_scm_init(void); +extern void *qcom_scm_alloc_buffer(size_t size, dma_addr_t *dma_addr, + gfp_t gfp); +extern void qcom_scm_free_buffer(size_t size, void *virt_addr, + dma_addr_t dma_addr); /* common error codes */ #define QCOM_SCM_V2_EBUSY -12 #define QCOM_SCM_ENOMEM -5