From patchwork Wed Jul 19 11:51:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 108277 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp753928obm; Wed, 19 Jul 2017 04:52:12 -0700 (PDT) X-Received: by 10.98.218.80 with SMTP id w16mr2633403pfl.74.1500465132309; Wed, 19 Jul 2017 04:52:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500465132; cv=none; d=google.com; s=arc-20160816; b=rhFxOdbSBzBTTw/MXaB+QIz2DcACQ9FcHVV7MZ3B/9OT8IKpj6TbEOHpoROJoEOdJu sTftd1sgB7DtTykDsBfhmqIydCU3WA3J8MtdyVVuBxYq5U57SG/wl4UUxjKnyp1g89dL khYLusgwCdK69WRzGsJv4JPRqKRClzAKkRmPAfbJjvFWYtEOuCpArW4TVdL38aLUs25H +Z0qu5Ay8z4NL9S0tD7q+9xvnx2G+p8bdA2mTs5b8mfhI2AXTaJy8zaQ1B8S/RCEweoy 3P+/gpFTow464TN5hfA1VDX0V/lcTAXONm5r95raT+soDI+f3+Q40mT1MnNPlem/7grh +Ahg== 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=H45s7FmUeHP22qbvNqC7xg+La0i8j7wXWw3qvkSMHQM=; b=NWhoAsRkW3l1C6ke/GwvpOQCAOYmTgvLvvpFDq/7uMogDEGuS5QuSgbP0R2Y1xEsBu yeQovoeyDDByrnna8l3v2wRp37u7yBVWYS6LJorbEzXA4vIYbMLN80VHrg6uxMatp5qG rjldqLuK4b4vDVM9FRs6VKE8gDoW0S3pwDnHuxVkLblSH6UrI7qjzG7WNSnKr9lKKZsT QVa0BCUcyQQMo/5hZpBkqDJ/dRJ+CfRby0Z/2jsq8qQZSYmU65F9PKb5nxIjlENPQlCO QD5AF4ZLKh7pVWpi46HI7TYrmDvxhbIfBqxw8ukHX5RVg7xPV4g5SSDwNIC1Rxhnt0So BinA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=V0f6mmsn; 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 7si96294pft.626.2017.07.19.04.52.12; Wed, 19 Jul 2017 04:52:12 -0700 (PDT) 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.b=V0f6mmsn; 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 S1754390AbdGSLwJ (ORCPT + 25 others); Wed, 19 Jul 2017 07:52:09 -0400 Received: from mail-wr0-f176.google.com ([209.85.128.176]:33997 "EHLO mail-wr0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754355AbdGSLwE (ORCPT ); Wed, 19 Jul 2017 07:52:04 -0400 Received: by mail-wr0-f176.google.com with SMTP id 12so57686269wrb.1 for ; Wed, 19 Jul 2017 04:52:04 -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=H45s7FmUeHP22qbvNqC7xg+La0i8j7wXWw3qvkSMHQM=; b=V0f6mmsnDE6iFbIZhzztk8xaWAkITpamecO1UfdSxQpqtTuxiOxN2MBE0uJS8NeG4M 6A5OU9c28FdOqr8bqV9YzDREgQ9JDfNJQX4YcvJJ8gIbD5LuCLWxGq/f+IdrfFKWfj8h vCsjvNxIfl5ocMJ/nyuMON/kTiR5mmuw5Uu4g= 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=H45s7FmUeHP22qbvNqC7xg+La0i8j7wXWw3qvkSMHQM=; b=WZ3pilO+WBp7Vd2fBIltTk+12ZEyfl7Jjw70ygtuDihKUKK56ZlbM+9F3HI8H55tGk 5U63sBcrdCX69NAxU9Esw4O1W/R60IWfKV75x/CQYmLAAtOp5TWsx3rFy5PHryLFCgvM 9OZZK6Rd9JLuQmf/s69uucB5XdmCaPHCugwhiV49e1LhM8zogJt3QaPZuBoEuA7hzQeZ RQkg5kicIr7ZkPOwipXPBBbKT7ec0Bsu5hQuBxRJRKnjbfLAL7+1gfBgmfLPLK67uAr8 edQzoaz8Di6rd2yFrgJXN11yOWSTPYiXgGjE9hqGKDA5LE+HSJO8zF+E4vYm7I1JEFOq m+JQ== X-Gm-Message-State: AIVw112X63gL4VoZxqzVOsjUy3hgESyt+CC9DiHCPd/bJXC0G3nnPGCl kFpKUZLuGJ5UhjRQ X-Received: by 10.223.154.105 with SMTP id z96mr3714656wrb.73.1500465123454; Wed, 19 Jul 2017 04:52:03 -0700 (PDT) Received: from localhost.localdomain ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id p27sm173580wmf.23.2017.07.19.04.52.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 04:52:02 -0700 (PDT) From: Stanimir Varbanov To: Hans Verkuil Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Stanimir Varbanov Subject: [PATCH v2] media: venus: don't abuse dma_alloc for non-DMA allocations Date: Wed, 19 Jul 2017 14:51:37 +0300 Message-Id: <20170719115137.2756-1-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In venus_boot(), we pass a pointer to a phys_addr_t into dmam_alloc_coherent, which the compiler warns about: platform/qcom/venus/firmware.c: In function 'venus_boot': platform/qcom/venus/firmware.c:63:49: error: passing argument 3 of 'dmam_alloc_coherent' from incompatible pointer type [-Werror=incompatible-pointer-types] To avoid the error refactor venus_boot function by discard dma_alloc_coherent invocation because we don't want to map the memory for the device. Something more, the usage of DMA mapping API is actually wrong and the current implementation relies on several bugs in DMA mapping code. When these bugs are fixed that will break firmware loading, so fix this now to avoid future troubles. The meaning of venus_boot is to copy the content of the firmware buffer into reserved (and memblock removed) block of memory and pass that physical address to the trusted zone for authentication and mapping through iommu form the secure world. After iommu mapping is done the iova is passed as ane entry point to the remote processor. After this change memory-region property is parsed manually and the physical address is memremap to CPU, call mdt_load to load firmware segments into proper places and unmap reserved memory. Fixes: af2c3834c8ca ("[media] media: venus: adding core part and helper functions") Signed-off-by: Stanimir Varbanov --- this is v2 of the patch 2/4 form this [1] patchset. The only change is rewording in the patch description. [1] http://www.mail-archive.com/linux-media@vger.kernel.org/msg115717.html drivers/media/platform/qcom/venus/core.c | 10 ++-- drivers/media/platform/qcom/venus/core.h | 1 - drivers/media/platform/qcom/venus/firmware.c | 74 ++++++++++++---------------- drivers/media/platform/qcom/venus/firmware.h | 5 +- 4 files changed, 39 insertions(+), 51 deletions(-) -- 2.11.0 Reviewed-by: Arnd Bergmann diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 694f57a78288..a70368cb713f 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -76,7 +76,7 @@ static void venus_sys_error_handler(struct work_struct *work) hfi_core_deinit(core, true); hfi_destroy(core); mutex_lock(&core->lock); - venus_shutdown(&core->dev_fw); + venus_shutdown(core->dev); pm_runtime_put_sync(core->dev); @@ -84,7 +84,7 @@ static void venus_sys_error_handler(struct work_struct *work) pm_runtime_get_sync(core->dev); - ret |= venus_boot(core->dev, &core->dev_fw, core->res->fwname); + ret |= venus_boot(core->dev, core->res->fwname); ret |= hfi_core_resume(core, true); @@ -207,7 +207,7 @@ static int venus_probe(struct platform_device *pdev) if (ret < 0) goto err_runtime_disable; - ret = venus_boot(dev, &core->dev_fw, core->res->fwname); + ret = venus_boot(dev, core->res->fwname); if (ret) goto err_runtime_disable; @@ -238,7 +238,7 @@ static int venus_probe(struct platform_device *pdev) err_core_deinit: hfi_core_deinit(core, false); err_venus_shutdown: - venus_shutdown(&core->dev_fw); + venus_shutdown(dev); err_runtime_disable: pm_runtime_set_suspended(dev); pm_runtime_disable(dev); @@ -259,7 +259,7 @@ static int venus_remove(struct platform_device *pdev) WARN_ON(ret); hfi_destroy(core); - venus_shutdown(&core->dev_fw); + venus_shutdown(dev); of_platform_depopulate(dev); pm_runtime_put_sync(dev); diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index e542700eee32..cba092bcb76d 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -101,7 +101,6 @@ struct venus_core { struct device *dev; struct device *dev_dec; struct device *dev_enc; - struct device dev_fw; struct mutex lock; struct list_head instances; atomic_t insts_count; diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index 1b1a4f355918..d6d9560c1c19 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -12,29 +12,27 @@ * */ -#include +#include #include #include +#include #include -#include -#include +#include #include +#include #include #include "firmware.h" #define VENUS_PAS_ID 9 -#define VENUS_FW_MEM_SIZE SZ_8M +#define VENUS_FW_MEM_SIZE (6 * SZ_1M) -static void device_release_dummy(struct device *dev) -{ - of_reserved_mem_device_release(dev); -} - -int venus_boot(struct device *parent, struct device *fw_dev, const char *fwname) +int venus_boot(struct device *dev, const char *fwname) { const struct firmware *mdt; + struct device_node *node; phys_addr_t mem_phys; + struct resource r; ssize_t fw_size; size_t mem_size; void *mem_va; @@ -43,66 +41,58 @@ int venus_boot(struct device *parent, struct device *fw_dev, const char *fwname) if (!qcom_scm_is_available()) return -EPROBE_DEFER; - fw_dev->parent = parent; - fw_dev->release = device_release_dummy; + node = of_parse_phandle(dev->of_node, "memory-region", 0); + if (!node) { + dev_err(dev, "no memory-region specified\n"); + return -EINVAL; + } - ret = dev_set_name(fw_dev, "%s:%s", dev_name(parent), "firmware"); + ret = of_address_to_resource(node, 0, &r); if (ret) return ret; - ret = device_register(fw_dev); - if (ret < 0) - return ret; + mem_phys = r.start; + mem_size = resource_size(&r); - ret = of_reserved_mem_device_init_by_idx(fw_dev, parent->of_node, 0); - if (ret) - goto err_unreg_device; + if (mem_size < VENUS_FW_MEM_SIZE) + return -EINVAL; - mem_size = VENUS_FW_MEM_SIZE; - - mem_va = dmam_alloc_coherent(fw_dev, mem_size, &mem_phys, GFP_KERNEL); + mem_va = memremap(r.start, mem_size, MEMREMAP_WC); if (!mem_va) { - ret = -ENOMEM; - goto err_unreg_device; + dev_err(dev, "unable to map memory region: %pa+%zx\n", + &r.start, mem_size); + return -ENOMEM; } - ret = request_firmware(&mdt, fwname, fw_dev); + ret = request_firmware(&mdt, fwname, dev); if (ret < 0) - goto err_unreg_device; + goto err_unmap; fw_size = qcom_mdt_get_size(mdt); if (fw_size < 0) { ret = fw_size; release_firmware(mdt); - goto err_unreg_device; + goto err_unmap; } - ret = qcom_mdt_load(fw_dev, mdt, fwname, VENUS_PAS_ID, mem_va, mem_phys, + ret = qcom_mdt_load(dev, mdt, fwname, VENUS_PAS_ID, mem_va, mem_phys, mem_size); release_firmware(mdt); if (ret) - goto err_unreg_device; + goto err_unmap; ret = qcom_scm_pas_auth_and_reset(VENUS_PAS_ID); if (ret) - goto err_unreg_device; - - return 0; + goto err_unmap; -err_unreg_device: - device_unregister(fw_dev); +err_unmap: + memunmap(mem_va); return ret; } -int venus_shutdown(struct device *fw_dev) +int venus_shutdown(struct device *dev) { - int ret; - - ret = qcom_scm_pas_shutdown(VENUS_PAS_ID); - device_unregister(fw_dev); - memset(fw_dev, 0, sizeof(*fw_dev)); - - return ret; + return qcom_scm_pas_shutdown(VENUS_PAS_ID); } diff --git a/drivers/media/platform/qcom/venus/firmware.h b/drivers/media/platform/qcom/venus/firmware.h index f81a98979798..428efb56d339 100644 --- a/drivers/media/platform/qcom/venus/firmware.h +++ b/drivers/media/platform/qcom/venus/firmware.h @@ -16,8 +16,7 @@ struct device; -int venus_boot(struct device *parent, struct device *fw_dev, - const char *fwname); -int venus_shutdown(struct device *fw_dev); +int venus_boot(struct device *dev, const char *fwname); +int venus_shutdown(struct device *dev); #endif