From: Marek Szyprowski <m.szyprowski@samsung.com>
To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
devicetree@vger.kernel.org,
Sylwester Nawrocki <s.nawrocki@samsung.com>,
Kamil Debski <k.debski@samsung.com>,
Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Javier Martinez Canillas <javier@osg.samsung.com>,
Uli Middelberg <uli@middelberg.de>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [PATCH v4 3/7] media: s5p-mfc: replace custom reserved memory handling code with generic one
Date: Tue, 24 May 2016 15:31:26 +0200 [thread overview]
Message-ID: <1464096690-23605-4-git-send-email-m.szyprowski@samsung.com> (raw)
In-Reply-To: <1464096690-23605-1-git-send-email-m.szyprowski@samsung.com>
This patch removes custom code for initialization and handling of
reserved memory regions in s5p-mfc driver and replaces it with generic
reserved memory regions api.
s5p-mfc driver now handles two reserved memory regions defined by
generic reserved memory bindings. Support for non-dt platform has been
removed, because all supported platforms have been already converted to
device tree.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/media/platform/s5p-mfc/s5p_mfc.c | 138 ++++++++++++++-----------------
1 file changed, 63 insertions(+), 75 deletions(-)
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index d1d9d388..fff5f43 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -22,6 +22,7 @@
#include <media/v4l2-event.h>
#include <linux/workqueue.h>
#include <linux/of.h>
+#include <linux/of_reserved_mem.h>
#include <media/videobuf2-v4l2.h>
#include "s5p_mfc_common.h"
#include "s5p_mfc_ctrl.h"
@@ -1043,66 +1044,71 @@ static const struct v4l2_file_operations s5p_mfc_fops = {
.mmap = s5p_mfc_mmap,
};
-static int match_child(struct device *dev, void *data)
-{
- if (!dev_name(dev))
- return 0;
- return !strcmp(dev_name(dev), (char *)data);
-}
-
+/* DMA memory related helper functions */
static void s5p_mfc_memdev_release(struct device *dev)
{
- dma_release_declared_memory(dev);
+ of_reserved_mem_device_release(dev);
}
-static void *mfc_get_drv_data(struct platform_device *pdev);
-
-static int s5p_mfc_alloc_memdevs(struct s5p_mfc_dev *dev)
+static struct device *s5p_mfc_alloc_memdev(struct device *dev,
+ const char *name, unsigned int idx)
{
- unsigned int mem_info[2] = { };
+ struct device *child;
+ int ret;
- dev->mem_dev_l = devm_kzalloc(&dev->plat_dev->dev,
- sizeof(struct device), GFP_KERNEL);
- if (!dev->mem_dev_l) {
- mfc_err("Not enough memory\n");
- return -ENOMEM;
+ child = devm_kzalloc(dev, sizeof(struct device), GFP_KERNEL);
+ if (!child)
+ return NULL;
+
+ device_initialize(child);
+ dev_set_name(child, "%s:%s", dev_name(dev), name);
+ child->parent = dev;
+ child->bus = dev->bus;
+ child->coherent_dma_mask = dev->coherent_dma_mask;
+ child->dma_mask = dev->dma_mask;
+ child->release = s5p_mfc_memdev_release;
+
+ if (device_add(child) == 0) {
+ ret = of_reserved_mem_device_init_by_idx(child, dev->of_node,
+ idx);
+ if (ret == 0)
+ return child;
}
- dev_set_name(dev->mem_dev_l, "%s", "s5p-mfc-l");
- dev->mem_dev_l->release = s5p_mfc_memdev_release;
- device_initialize(dev->mem_dev_l);
- of_property_read_u32_array(dev->plat_dev->dev.of_node,
- "samsung,mfc-l", mem_info, 2);
- if (dma_declare_coherent_memory(dev->mem_dev_l, mem_info[0],
- mem_info[0], mem_info[1],
- DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE) == 0) {
- mfc_err("Failed to declare coherent memory for\n"
- "MFC device\n");
- return -ENOMEM;
- }
+ put_device(child);
+ return NULL;
+}
- dev->mem_dev_r = devm_kzalloc(&dev->plat_dev->dev,
- sizeof(struct device), GFP_KERNEL);
- if (!dev->mem_dev_r) {
- mfc_err("Not enough memory\n");
- return -ENOMEM;
- }
+static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev)
+{
+ struct device *dev = &mfc_dev->plat_dev->dev;
- dev_set_name(dev->mem_dev_r, "%s", "s5p-mfc-r");
- dev->mem_dev_r->release = s5p_mfc_memdev_release;
- device_initialize(dev->mem_dev_r);
- of_property_read_u32_array(dev->plat_dev->dev.of_node,
- "samsung,mfc-r", mem_info, 2);
- if (dma_declare_coherent_memory(dev->mem_dev_r, mem_info[0],
- mem_info[0], mem_info[1],
- DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE) == 0) {
- pr_err("Failed to declare coherent memory for\n"
- "MFC device\n");
- return -ENOMEM;
+ /*
+ * Create and initialize virtual devices for accessing
+ * reserved memory regions.
+ */
+ mfc_dev->mem_dev_l = s5p_mfc_alloc_memdev(dev, "left",
+ MFC_BANK1_ALLOC_CTX);
+ if (!mfc_dev->mem_dev_l)
+ return -ENODEV;
+ mfc_dev->mem_dev_r = s5p_mfc_alloc_memdev(dev, "right",
+ MFC_BANK2_ALLOC_CTX);
+ if (!mfc_dev->mem_dev_r) {
+ device_unregister(mfc_dev->mem_dev_l);
+ return -ENODEV;
}
+
return 0;
}
+static void s5p_mfc_unconfigure_dma_memory(struct s5p_mfc_dev *mfc_dev)
+{
+ device_unregister(mfc_dev->mem_dev_l);
+ device_unregister(mfc_dev->mem_dev_r);
+}
+
+static void *mfc_get_drv_data(struct platform_device *pdev);
+
/* MFC probe function */
static int s5p_mfc_probe(struct platform_device *pdev)
{
@@ -1128,12 +1134,6 @@ static int s5p_mfc_probe(struct platform_device *pdev)
dev->variant = mfc_get_drv_data(pdev);
- ret = s5p_mfc_init_pm(dev);
- if (ret < 0) {
- dev_err(&pdev->dev, "failed to get mfc clock source\n");
- return ret;
- }
-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dev->regs_base = devm_ioremap_resource(&pdev->dev, res);
@@ -1154,25 +1154,16 @@ static int s5p_mfc_probe(struct platform_device *pdev)
goto err_res;
}
- if (pdev->dev.of_node) {
- ret = s5p_mfc_alloc_memdevs(dev);
- if (ret < 0)
- goto err_res;
- } else {
- dev->mem_dev_l = device_find_child(&dev->plat_dev->dev,
- "s5p-mfc-l", match_child);
- if (!dev->mem_dev_l) {
- mfc_err("Mem child (L) device get failed\n");
- ret = -ENODEV;
- goto err_res;
- }
- dev->mem_dev_r = device_find_child(&dev->plat_dev->dev,
- "s5p-mfc-r", match_child);
- if (!dev->mem_dev_r) {
- mfc_err("Mem child (R) device get failed\n");
- ret = -ENODEV;
- goto err_res;
- }
+ ret = s5p_mfc_configure_dma_memory(dev);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "failed to configure DMA memory\n");
+ return ret;
+ }
+
+ ret = s5p_mfc_init_pm(dev);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "failed to get mfc clock source\n");
+ return ret;
}
vb2_dma_contig_set_max_seg_size(dev->mem_dev_l, DMA_BIT_MASK(32));
@@ -1309,12 +1300,9 @@ static int s5p_mfc_remove(struct platform_device *pdev)
s5p_mfc_release_firmware(dev);
vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[0]);
vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[1]);
+ s5p_mfc_unconfigure_dma_memory(dev);
vb2_dma_contig_clear_max_seg_size(dev->mem_dev_l);
vb2_dma_contig_clear_max_seg_size(dev->mem_dev_r);
- if (pdev->dev.of_node) {
- put_device(dev->mem_dev_l);
- put_device(dev->mem_dev_r);
- }
s5p_mfc_final_pm(dev);
return 0;
--
1.9.2
next prev parent reply other threads:[~2016-05-24 13:31 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 13:31 [PATCH v4 0/7] Exynos: MFC driver: reserved memory cleanup and IOMMU support Marek Szyprowski
2016-05-24 13:31 ` [PATCH v4 1/7] of: reserved_mem: add support for using more than one region for given device Marek Szyprowski
2016-05-26 19:08 ` Rob Herring
2016-05-24 13:31 ` [PATCH v4 2/7] media: s5p-mfc: use generic reserved memory bindings Marek Szyprowski
2016-05-25 15:18 ` Javier Martinez Canillas
2016-05-25 17:36 ` Rob Herring
2016-05-27 6:37 ` Marek Szyprowski
2016-05-27 20:41 ` Javier Martinez Canillas
2016-05-25 17:39 ` Rob Herring
2016-05-27 6:19 ` Krzysztof Kozlowski
2016-05-24 13:31 ` Marek Szyprowski [this message]
2016-05-25 15:42 ` [PATCH v4 3/7] media: s5p-mfc: replace custom reserved memory handling code with generic one Javier Martinez Canillas
2016-05-25 16:51 ` Javier Martinez Canillas
2016-06-08 10:36 ` Liviu Dudau
2016-06-08 11:33 ` [PATCH] media: s5p-mfc: fix error path in driver probe Marek Szyprowski
2016-06-08 14:35 ` Liviu Dudau
2016-06-08 21:44 ` Shuah Khan
2016-05-24 13:31 ` [PATCH v4 4/7] media: s5p-mfc: add iommu support Marek Szyprowski
2016-05-25 15:55 ` Javier Martinez Canillas
2016-05-24 13:31 ` [PATCH v4 5/7] ARM: Exynos: remove code for MFC custom reserved memory handling Marek Szyprowski
2016-05-25 15:57 ` Javier Martinez Canillas
2016-05-30 7:28 ` Krzysztof Kozlowski
2016-06-02 15:20 ` Javier Martinez Canillas
2016-06-02 16:31 ` Krzysztof Kozlowski
2016-06-02 17:25 ` Javier Martinez Canillas
2016-06-03 6:57 ` Krzysztof Kozlowski
2016-06-03 9:59 ` [ATTN] " Sylwester Nawrocki
2016-06-06 7:24 ` Krzysztof Kozlowski
2016-06-06 7:40 ` Krzysztof Kozlowski
2016-05-24 13:31 ` [PATCH v4 6/7] ARM: dts: exynos: convert MFC device to generic reserved memory bindings Marek Szyprowski
2016-05-25 11:13 ` Krzysztof Kozlowski
2016-05-25 17:11 ` Javier Martinez Canillas
2016-05-27 11:32 ` Marek Szyprowski
2016-05-27 20:54 ` Javier Martinez Canillas
2016-06-07 12:03 ` [PATCH 1/3] ARM: dts: exynos: replace hardcoded reserved memory ranges with auto-allocated ones Marek Szyprowski
2016-06-07 12:03 ` [PATCH 2/3] ARM: dts: exynos: move MFC reserved memory regions from boards to .dtsi Marek Szyprowski
2016-06-07 22:34 ` Javier Martinez Canillas
2016-06-07 12:03 ` [PATCH 3/3] ARM: dts: exynos: enable MFC device for all boards Marek Szyprowski
2016-06-07 22:34 ` Javier Martinez Canillas
2016-06-07 22:32 ` [PATCH 1/3] ARM: dts: exynos: replace hardcoded reserved memory ranges with auto-allocated ones Javier Martinez Canillas
2016-06-08 7:48 ` Krzysztof Kozlowski
2016-05-24 13:31 ` [PATCH v4 7/7] ARM: dts: exynos4412-odroid*: enable MFC device Marek Szyprowski
2016-05-25 17:13 ` Javier Martinez Canillas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464096690-23605-4-git-send-email-m.szyprowski@samsung.com \
--to=m.szyprowski@samsung.com \
--cc=b.zolnierkie@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=javier@osg.samsung.com \
--cc=k.debski@samsung.com \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=s.nawrocki@samsung.com \
--cc=uli@middelberg.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).