[PATCH RESEND, V4, 2/5] media: mtk-jpegenc: Use component framework to manage each hardware
kyrie.wu
kyrie.wu at mediatek.com
Fri Sep 24 02:27:05 PDT 2021
There are two jpeg encoding hardware inside MT8195, uses component
framework to manage each hardware so that the two hardwares can be
used through just one jpeg encoding device node.
In the component framework architecture, for one thing,the component,
represents the each hardware of jpeg encoding. For another, the master,
registering a device node, managed all components through the node.
Signed-off-by: kyrie.wu <kyrie.wu at mediatek.com>
---
V4: new patch
---
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 175 ++++++++++++---
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 55 +++++
drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 258 ++++++++++++++++++++++
3 files changed, 462 insertions(+), 26 deletions(-)
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index 88a23bc..c39be1e 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -7,6 +7,7 @@
*/
#include <linux/clk.h>
+#include <linux/component.h>
#include <linux/err.h>
#include <linux/interrupt.h>
#include <linux/io.h>
@@ -1266,6 +1267,87 @@ static int mtk_jpeg_release(struct file *file)
return 0;
}
+static const struct of_device_id mtk_jpegenc_drv_ids[] = {
+ {
+ .compatible = "mediatek,mt8195-jpgenc0",
+ .data = (void *)MTK_JPEGENC_HW0,
+ },
+ {
+ .compatible = "mediatek,mt8195-jpgenc1",
+ .data = (void *)MTK_JPEGENC_HW1,
+ },
+ {},
+};
+
+static inline int mtk_vdec_compare_of(struct device *dev, void *data)
+{
+ return dev->of_node == data;
+}
+
+static inline void mtk_vdec_release_of(struct device *dev, void *data)
+{
+ of_node_put(data);
+}
+
+static inline int mtk_jpegenc_bind(struct device *dev)
+{
+ struct mtk_jpeg_dev *data = dev_get_drvdata(dev);
+
+ return component_bind_all(dev, data);
+}
+
+static inline void mtk_jpegenc_unbind(struct device *dev)
+{
+ struct mtk_jpeg_dev *data = dev_get_drvdata(dev);
+
+ component_unbind_all(dev, data);
+}
+
+static const struct component_master_ops mtk_jpegenc_ops = {
+ .bind = mtk_jpegenc_bind,
+ .unbind = mtk_jpegenc_unbind,
+};
+
+static struct component_match *mtk_jpegenc_match_add(struct mtk_jpeg_dev *jpeg)
+{
+ struct device *dev = jpeg->dev;
+ struct component_match *match = NULL;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(mtk_jpegenc_drv_ids); i++) {
+ struct device_node *comp_node;
+ enum mtk_jpegenc_hw_id comp_idx;
+ const struct of_device_id *of_id;
+
+ comp_node = of_find_compatible_node(NULL, NULL,
+ mtk_jpegenc_drv_ids[i].compatible);
+ if (!comp_node)
+ continue;
+
+ if (!of_device_is_available(comp_node)) {
+ of_node_put(comp_node);
+ v4l2_err(&jpeg->v4l2_dev, "Fail to get jpeg enc HW node\n");
+ continue;
+ }
+
+ of_id = of_match_node(mtk_jpegenc_drv_ids, comp_node);
+ if (!of_id) {
+ v4l2_err(&jpeg->v4l2_dev, "Failed to get match node\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ comp_idx = (enum mtk_jpegenc_hw_id)of_id->data;
+ v4l2_info(&jpeg->v4l2_dev,
+ "Get component:hw_id(%d),jpeg_dev(0x%p),comp_node(0x%p)\n",
+ comp_idx, jpeg, comp_node);
+ jpeg->component_node[comp_idx] = comp_node;
+ component_match_add_release(dev, &match, mtk_vdec_release_of,
+ mtk_vdec_compare_of, comp_node);
+ }
+
+ return match;
+}
+
static const struct v4l2_file_operations mtk_jpeg_fops = {
.owner = THIS_MODULE,
.open = mtk_jpeg_open,
@@ -1344,6 +1426,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
struct resource *res;
int jpeg_irq;
int ret;
+ struct component_match *match;
jpeg = devm_kzalloc(&pdev->dev, sizeof(*jpeg), GFP_KERNEL);
if (!jpeg)
@@ -1353,33 +1436,40 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
spin_lock_init(&jpeg->hw_lock);
jpeg->dev = &pdev->dev;
jpeg->variant = of_device_get_match_data(jpeg->dev);
- INIT_DELAYED_WORK(&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- jpeg->reg_base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(jpeg->reg_base)) {
- ret = PTR_ERR(jpeg->reg_base);
- return ret;
- }
+ if (!jpeg->variant->is_encoder) {
+ INIT_DELAYED_WORK(&jpeg->job_timeout_work,
+ mtk_jpeg_job_timeout_work);
- jpeg_irq = platform_get_irq(pdev, 0);
- if (jpeg_irq < 0) {
- dev_err(&pdev->dev, "Failed to get jpeg_irq %d.\n", jpeg_irq);
- return jpeg_irq;
- }
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ jpeg->reg_base =
+ devm_platform_ioremap_resource_byname(pdev, pdev->name);
+ if (IS_ERR(jpeg->reg_base)) {
+ ret = PTR_ERR(jpeg->reg_base);
+ return ret;
+ }
- ret = devm_request_irq(&pdev->dev, jpeg_irq,
- jpeg->variant->irq_handler, 0, pdev->name, jpeg);
- if (ret) {
- dev_err(&pdev->dev, "Failed to request jpeg_irq %d (%d)\n",
- jpeg_irq, ret);
- goto err_req_irq;
- }
+ jpeg_irq = platform_get_irq(pdev, 0);
+ if (jpeg_irq < 0) {
+ dev_err(&pdev->dev, "Failed to get jpeg_irq %d.\n",
+ jpeg_irq);
+ return jpeg_irq;
+ }
- ret = mtk_jpeg_clk_init(jpeg);
- if (ret) {
- dev_err(&pdev->dev, "Failed to init clk, err %d\n", ret);
- goto err_clk_init;
+ ret = devm_request_irq(&pdev->dev, jpeg_irq,
+ jpeg->variant->irq_handler,
+ 0, pdev->name, jpeg);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to request jpeg_irq %d (%d)\n",
+ jpeg_irq, ret);
+ goto err_req_irq;
+ }
+
+ ret = mtk_jpeg_clk_init(jpeg);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to init clk\n");
+ goto err_clk_init;
+ }
}
ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev);
@@ -1428,7 +1518,20 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, jpeg);
- pm_runtime_enable(&pdev->dev);
+ if (jpeg->variant->is_encoder) {
+ match = mtk_jpegenc_match_add(jpeg);
+ if (IS_ERR_OR_NULL(match))
+ goto err_vfd_jpeg_register;
+
+ video_set_drvdata(jpeg->vdev, jpeg);
+ platform_set_drvdata(pdev, jpeg);
+ ret = component_master_add_with_match(&pdev->dev,
+ &mtk_jpegenc_ops, match);
+ if (ret < 0)
+ goto err_vfd_jpeg_register;
+ } else {
+ pm_runtime_enable(&pdev->dev);
+ }
return 0;
@@ -1525,6 +1628,7 @@ static const struct mtk_jpeg_variant mt8173_jpeg_drvdata = {
};
static const struct mtk_jpeg_variant mtk_jpeg_drvdata = {
+ .is_encoder = true,
.clks = mtk_jpeg_clocks,
.num_clks = ARRAY_SIZE(mtk_jpeg_clocks),
.formats = mtk_jpeg_enc_formats,
@@ -1539,6 +1643,7 @@ static const struct mtk_jpeg_variant mtk_jpeg_drvdata = {
.cap_q_default_fourcc = V4L2_PIX_FMT_JPEG,
};
+#if defined(CONFIG_OF)
static const struct of_device_id mtk_jpeg_match[] = {
{
.compatible = "mediatek,mt8173-jpgdec",
@@ -1554,8 +1659,8 @@ static const struct of_device_id mtk_jpeg_match[] = {
},
{},
};
-
MODULE_DEVICE_TABLE(of, mtk_jpeg_match);
+#endif
static struct platform_driver mtk_jpeg_driver = {
.probe = mtk_jpeg_probe,
@@ -1567,7 +1672,25 @@ static struct platform_driver mtk_jpeg_driver = {
},
};
-module_platform_driver(mtk_jpeg_driver);
+static struct platform_driver * const mtk_jpeg_source_drivers[] = {
+ &mtk_jpegenc_hw_driver,
+ &mtk_jpeg_driver,
+};
+
+static int __init mtk_jpeg_init(void)
+{
+ return platform_register_drivers(mtk_jpeg_source_drivers,
+ ARRAY_SIZE(mtk_jpeg_source_drivers));
+}
+
+static void __exit mtk_jpeg_exit(void)
+{
+ platform_unregister_drivers(mtk_jpeg_source_drivers,
+ ARRAY_SIZE(mtk_jpeg_source_drivers));
+}
+
+module_init(mtk_jpeg_init);
+module_exit(mtk_jpeg_exit);
MODULE_DESCRIPTION("MediaTek JPEG codec driver");
MODULE_LICENSE("GPL v2");
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
index 595f7f1..9793ccb 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
@@ -60,6 +60,7 @@ enum mtk_jpeg_ctx_state {
* @cap_q_default_fourcc: capture queue default fourcc
*/
struct mtk_jpeg_variant {
+ bool is_encoder;
struct clk_bulk_data *clks;
int num_clks;
struct mtk_jpeg_fmt *formats;
@@ -74,6 +75,53 @@ struct mtk_jpeg_variant {
u32 cap_q_default_fourcc;
};
+enum mtk_jpegenc_hw_id {
+ MTK_JPEGENC_HW0,
+ MTK_JPEGENC_HW1,
+ MTK_JPEGENC_HW_MAX,
+};
+
+/**
+ * struct mtk_jpegenc_clk_info - Structure used to store clock name
+ */
+struct mtk_jpegenc_clk_info {
+ const char *clk_name;
+ struct clk *jpegenc_clk;
+};
+
+/* struct mtk_vcodec_clk - Structure used to store vcodec clock information */
+struct mtk_jpegenc_clk {
+ struct mtk_jpegenc_clk_info *clk_info;
+ int clk_num;
+};
+
+/**
+ * struct mtk_vcodec_pm - Power management data structure
+ */
+struct mtk_jpegenc_pm {
+ struct mtk_jpegenc_clk venc_clk;
+ struct device *dev;
+ struct mtk_jpegenc_comp_dev *mtkdev;
+};
+
+/**
+ * struct mtk_jpegenc_comp_dev - JPEG COREX abstraction
+ * @dev: JPEG device
+ * @plat_dev: platform device data
+ * @reg_base: JPEG registers mapping
+ * @master_dev: mtk_jpeg_dev device
+ * @pm: mtk_jpegenc_pm
+ * @jpegenc_irq: jpeg encode irq num
+ */
+struct mtk_jpegenc_comp_dev {
+ struct device *dev;
+ struct platform_device *plat_dev;
+ void __iomem *reg_base;
+ struct mtk_jpeg_dev *master_dev;
+ struct mtk_jpegenc_pm pm;
+ int jpegenc_irq;
+};
+
/**
* struct mtk_jpeg_dev - JPEG IP abstraction
* @lock: the mutex protecting this structure
@@ -102,6 +150,11 @@ struct mtk_jpeg_dev {
struct device *larb;
struct delayed_work job_timeout_work;
const struct mtk_jpeg_variant *variant;
+
+ void __iomem *reg_encbase[MTK_JPEGENC_HW_MAX];
+ struct mtk_jpegenc_comp_dev *hw_dev[MTK_JPEGENC_HW_MAX];
+ struct device_node *component_node[MTK_JPEGENC_HW_MAX];
+ int comp_idx;
};
/**
@@ -162,4 +215,6 @@ struct mtk_jpeg_ctx {
struct v4l2_ctrl_handler ctrl_hdl;
};
+extern struct platform_driver mtk_jpegenc_hw_driver;
+
#endif /* _MTK_JPEG_CORE_H */
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
index 1cf037b..cf8a706 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
@@ -5,11 +5,29 @@
*
*/
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/io.h>
#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <media/media-device.h>
#include <media/videobuf2-core.h>
#include <media/videobuf2-dma-contig.h>
+#include <media/videobuf2-v4l2.h>
+#include <media/v4l2-mem2mem.h>
+#include <media/v4l2-dev.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-fh.h>
+#include <media/v4l2-event.h>
+
+#include "mtk_jpeg_core.h"
#include "mtk_jpeg_enc_hw.h"
static const struct mtk_jpeg_enc_qlt mtk_jpeg_enc_quality[] = {
@@ -152,3 +170,243 @@ void mtk_jpeg_set_enc_params(struct mtk_jpeg_ctx *ctx, void __iomem *base)
writel(ctx->restart_interval, base + JPEG_ENC_RST_MCU_NUM);
}
+
+static int mtk_jpegenc_hw_bind(struct device *dev,
+ struct device *master, void *data)
+{
+ struct mtk_jpegenc_comp_dev *comp_priv = dev_get_drvdata(dev);
+ struct mtk_jpeg_dev *master_priv = data;
+ int i;
+
+ for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) {
+ if (dev->of_node != master_priv->component_node[i])
+ continue;
+
+ master_priv->hw_dev[i] = comp_priv;
+ master_priv->comp_idx = i;
+ master_priv->reg_encbase[i] =
+ comp_priv->reg_base;
+ comp_priv->master_dev = master_priv;
+ break;
+ }
+
+ if (i == MTK_JPEGENC_HW_MAX) {
+ dev_err(dev, "Failed to get component node\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static void mtk_jpegenc_hw_unbind(struct device *dev,
+ struct device *master, void *data)
+{
+ struct mtk_jpegenc_comp_dev *comp_priv = dev_get_drvdata(dev);
+
+ comp_priv->reg_base = 0;
+
+}
+
+static const struct component_ops mtk_jpegenc_hw_component_ops = {
+ .bind = mtk_jpegenc_hw_bind,
+ .unbind = mtk_jpegenc_hw_unbind,
+};
+
+int mtk_jpegenc_init_pm(struct mtk_jpegenc_comp_dev *mtkdev)
+{
+ struct platform_device *pdev;
+ struct mtk_jpegenc_pm *pm;
+ struct mtk_jpegenc_clk *jpegenc_clk;
+ struct mtk_jpegenc_clk_info *clk_info;
+ int i, ret;
+
+ pdev = mtkdev->plat_dev;
+ pm = &mtkdev->pm;
+ pm->dev = &pdev->dev;
+ pm->mtkdev = mtkdev;
+ jpegenc_clk = &pm->venc_clk;
+
+ jpegenc_clk->clk_num =
+ of_property_count_strings(pdev->dev.of_node, "clock-names");
+ if (!jpegenc_clk->clk_num) {
+ dev_err(&pdev->dev, "Failed to get jpegenc clock count\n");
+ return -EINVAL;
+ }
+
+ jpegenc_clk->clk_info = devm_kcalloc(&pdev->dev,
+ jpegenc_clk->clk_num,
+ sizeof(*clk_info),
+ GFP_KERNEL);
+ if (!jpegenc_clk->clk_info)
+ return -ENOMEM;
+
+ for (i = 0; i < jpegenc_clk->clk_num; i++) {
+ clk_info = &jpegenc_clk->clk_info[i];
+ ret = of_property_read_string_index(pdev->dev.of_node,
+ "clock-names", i,
+ &clk_info->clk_name);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to get jpegenc clock name\n");
+ return ret;
+ }
+
+ clk_info->jpegenc_clk = devm_clk_get(&pdev->dev,
+ clk_info->clk_name);
+ if (IS_ERR(clk_info->jpegenc_clk)) {
+ dev_err(&pdev->dev, "devm_clk_get (%d)%s fail",
+ i, clk_info->clk_name);
+ return PTR_ERR(clk_info->jpegenc_clk);
+ }
+ }
+
+ pm_runtime_enable(&pdev->dev);
+
+ return ret;
+}
+
+void mtk_jpegenc_release_pm(struct mtk_jpegenc_comp_dev *mtkdev)
+{
+ struct platform_device *pdev = mtkdev->plat_dev;
+
+ pm_runtime_disable(&pdev->dev);
+}
+
+static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
+{
+ struct mtk_jpegenc_comp_dev *jpeg = priv;
+ struct mtk_jpeg_dev *master_jpeg = jpeg->master_dev;
+ u32 irq_status;
+ struct mtk_jpeg_ctx *ctx;
+ struct vb2_v4l2_buffer *src_buf, *dst_buf;
+ enum vb2_buffer_state buf_state;
+ u32 result_size;
+
+ irq_status = readl(jpeg->reg_base + JPEG_ENC_INT_STS) &
+ JPEG_ENC_INT_STATUS_MASK_ALLIRQ;
+ if (irq_status)
+ writel(0, jpeg->reg_base + JPEG_ENC_INT_STS);
+
+ if (!(irq_status & JPEG_ENC_INT_STATUS_DONE))
+ return IRQ_NONE;
+
+ ctx = v4l2_m2m_get_curr_priv(master_jpeg->m2m_dev);
+ if (!ctx) {
+ v4l2_err(&master_jpeg->v4l2_dev, "Context is NULL\n");
+ return IRQ_HANDLED;
+ }
+
+ src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
+ dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
+
+ result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base);
+ vb2_set_plane_payload(&dst_buf->vb2_buf, 0, result_size);
+
+ buf_state = VB2_BUF_STATE_DONE;
+
+ v4l2_m2m_buf_done(src_buf, buf_state);
+ v4l2_m2m_buf_done(dst_buf, buf_state);
+ v4l2_m2m_job_finish(master_jpeg->m2m_dev, ctx->fh.m2m_ctx);
+ pm_runtime_put(ctx->jpeg->dev);
+
+ return IRQ_HANDLED;
+}
+
+static int mtk_jpegenc_hw_init_irq(struct mtk_jpegenc_comp_dev *dev)
+{
+ struct platform_device *pdev = dev->plat_dev;
+ int ret;
+
+ dev->jpegenc_irq = platform_get_irq(pdev, 0);
+ if (dev->jpegenc_irq < 0) {
+ dev_err(&pdev->dev, "Failed to get irq resource");
+ return dev->jpegenc_irq;
+ }
+
+ ret = devm_request_irq(&pdev->dev, dev->jpegenc_irq,
+ mtk_jpegenc_hw_irq_handler, 0, pdev->name, dev);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to devm_request_irq %d (%d)",
+ dev->jpegenc_irq, ret);
+ return -ENOENT;
+ }
+
+ return 0;
+}
+
+static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
+{
+ struct mtk_jpegenc_comp_dev *dev;
+ int ret;
+
+ dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
+ if (!dev)
+ return -ENOMEM;
+
+ dev->plat_dev = pdev;
+
+ ret = mtk_jpegenc_init_pm(dev);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to get jpeg enc clock source");
+ return ret;
+ }
+
+ dev->reg_base =
+ devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(dev->reg_base)) {
+ ret = PTR_ERR(dev->reg_base);
+ goto err;
+ }
+
+ ret = mtk_jpegenc_hw_init_irq(dev);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to register JPEGENC irq handler.\n");
+ goto err;
+ }
+
+ platform_set_drvdata(pdev, dev);
+
+ ret = component_add(&pdev->dev, &mtk_jpegenc_hw_component_ops);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to component_add: %d\n", ret);
+ goto err;
+ }
+
+ return 0;
+
+err:
+ mtk_jpegenc_release_pm(dev);
+
+ return ret;
+}
+
+static int mtk_jpegenc_remove(struct platform_device *pdev)
+{
+ struct mtk_jpegenc_comp_dev *dev = platform_get_drvdata(pdev);
+
+ mtk_jpegenc_release_pm(dev);
+
+ return 0;
+}
+
+#if defined(CONFIG_OF)
+static const struct of_device_id mtk_jpegenc_hw_ids[] = {
+ {
+ .compatible = "mediatek,mt8195-jpgenc0",
+ },
+ {
+ .compatible = "mediatek,mt8195-jpgenc1",
+ },
+ {},
+};
+MODULE_DEVICE_TABLE(of, mtk_jpegenc_hw_ids);
+#endif
+
+struct platform_driver mtk_jpegenc_hw_driver = {
+ .probe = mtk_jpegenc_hw_probe,
+ .remove = mtk_jpegenc_remove,
+ .driver = {
+ .name = "mtk-jpegenc-hw",
+ .of_match_table = of_match_ptr(mtk_jpegenc_hw_ids),
+ },
+};
+
--
2.6.4
More information about the linux-arm-kernel
mailing list