* [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-19 21:05 ` Nicolas Dufresne
2021-02-20 18:44 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 02/22] media: camss: Fix vfe_isr comment typo Robert Foss
` (19 subsequent siblings)
20 siblings, 2 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Function name is comment is wrong, and was changed to be
the same as the actual function name.
The comment was changed to kerneldoc format.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
Changes since v1
- Bjorn: Fix function doc name & use kerneldoc format
drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index fae2b513b2f9..94c9ca7d5cbb 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -1076,8 +1076,8 @@ static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
spin_unlock_irqrestore(&vfe->output_lock, flags);
}
-/*
- * vfe_isr_wm_done - Process composite image done interrupt
+/**
+ * vfe_isr_comp_done() - Process composite image done interrupt
* @vfe: VFE Device
* @comp: Composite image id
*/
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation
2021-02-17 11:21 ` [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation Robert Foss
@ 2021-02-19 21:05 ` Nicolas Dufresne
2021-02-22 10:51 ` Robert Foss
2021-02-20 18:44 ` Andrey Konovalov
1 sibling, 1 reply; 48+ messages in thread
From: Nicolas Dufresne @ 2021-02-19 21:05 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
not really a review, but I noticed ....
Le mercredi 17 février 2021 à 12:21 +0100, Robert Foss a écrit :
> Function name is comment is wrong, and was changed to be
in
> the same as the actual function name.
>
> The comment was changed to kerneldoc format.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
>
> Changes since v1
> - Bjorn: Fix function doc name & use kerneldoc format
>
>
> drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c
> b/drivers/media/platform/qcom/camss/camss-vfe.c
> index fae2b513b2f9..94c9ca7d5cbb 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> @@ -1076,8 +1076,8 @@ static void vfe_isr_wm_done(struct vfe_device *vfe, u8
> wm)
> spin_unlock_irqrestore(&vfe->output_lock, flags);
> }
>
> -/*
> - * vfe_isr_wm_done - Process composite image done interrupt
> +/**
> + * vfe_isr_comp_done() - Process composite image done interrupt
> * @vfe: VFE Device
> * @comp: Composite image id
> */
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation
2021-02-19 21:05 ` Nicolas Dufresne
@ 2021-02-22 10:51 ` Robert Foss
0 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-22 10:51 UTC (permalink / raw)
To: Nicolas Dufresne
Cc: Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab,
Rob Herring, angelogioacchino.delregno, MSM, linux-media,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, AngeloGioacchino Del Regno, Sakari Ailus,
Andrey Konovalov, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
On Fri, 19 Feb 2021 at 22:05, Nicolas Dufresne <nicolas@ndufresne.ca> wrote:
>
> Hi Robert,
>
> not really a review, but I noticed ....
>
> Le mercredi 17 février 2021 à 12:21 +0100, Robert Foss a écrit :
> > Function name is comment is wrong, and was changed to be
>
> in
Thanks bud!
>
> > the same as the actual function name.
> >
> > The comment was changed to kerneldoc format.
> >
> > Signed-off-by: Robert Foss <robert.foss@linaro.org>
> > ---
> >
> > Changes since v1
> > - Bjorn: Fix function doc name & use kerneldoc format
> >
> >
> > drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c
> > b/drivers/media/platform/qcom/camss/camss-vfe.c
> > index fae2b513b2f9..94c9ca7d5cbb 100644
> > --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> > +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> > @@ -1076,8 +1076,8 @@ static void vfe_isr_wm_done(struct vfe_device *vfe, u8
> > wm)
> > spin_unlock_irqrestore(&vfe->output_lock, flags);
> > }
> >
> > -/*
> > - * vfe_isr_wm_done - Process composite image done interrupt
> > +/**
> > + * vfe_isr_comp_done() - Process composite image done interrupt
> > * @vfe: VFE Device
> > * @comp: Composite image id
> > */
>
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation
2021-02-17 11:21 ` [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation Robert Foss
2021-02-19 21:05 ` Nicolas Dufresne
@ 2021-02-20 18:44 ` Andrey Konovalov
1 sibling, 0 replies; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-20 18:44 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Thanks,
Andrey
On 17.02.2021 14:21, Robert Foss wrote:
> Function name is comment is wrong, and was changed to be
> the same as the actual function name.
>
> The comment was changed to kerneldoc format.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
>
> Changes since v1
> - Bjorn: Fix function doc name & use kerneldoc format
>
>
> drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
> index fae2b513b2f9..94c9ca7d5cbb 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> @@ -1076,8 +1076,8 @@ static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
> spin_unlock_irqrestore(&vfe->output_lock, flags);
> }
>
> -/*
> - * vfe_isr_wm_done - Process composite image done interrupt
> +/**
> + * vfe_isr_comp_done() - Process composite image done interrupt
> * @vfe: VFE Device
> * @comp: Composite image id
> */
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 02/22] media: camss: Fix vfe_isr comment typo
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
2021-02-17 11:21 ` [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-17 11:21 ` [PATCH v5 03/22] media: camss: Replace trace_printk() with dev_dbg() Robert Foss
` (18 subsequent siblings)
20 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Comment refers to ISPIF, but this is incorrect. Only
the VFE interrupts are handled by this function.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
Changes since v1
- Bjorn: Add r-b
drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 2 +-
drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
index 174a36be6f5d..a1b56b89130d 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
@@ -922,7 +922,7 @@ static void vfe_violation_read(struct vfe_device *vfe)
}
/*
- * vfe_isr - ISPIF module interrupt handler
+ * vfe_isr - VFE module interrupt handler
* @irq: Interrupt line
* @dev: VFE device
*
diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
index b5704a2f119b..84c33b8f9fe3 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
@@ -1055,7 +1055,7 @@ static void vfe_violation_read(struct vfe_device *vfe)
}
/*
- * vfe_isr - ISPIF module interrupt handler
+ * vfe_isr - VFE module interrupt handler
* @irq: Interrupt line
* @dev: VFE device
*
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v5 03/22] media: camss: Replace trace_printk() with dev_dbg()
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
2021-02-17 11:21 ` [PATCH v5 01/22] media: camss: Fix vfe_isr_comp_done() documentation Robert Foss
2021-02-17 11:21 ` [PATCH v5 02/22] media: camss: Fix vfe_isr comment typo Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-17 11:21 ` [PATCH v5 04/22] media: camss: Add CAMSS_845 camss version Robert Foss
` (17 subsequent siblings)
20 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
trace_printk() should not be used in production code,
since extra memory is used for special buffers whenever
trace_puts() is used.
Replace it with dev_dbg() which provides all of the desired
debugging functionality.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Suggested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
---
Changes since v3:
- Nicolas: Create this patch
Changes since v4:
- Nicolas: Added r-b
drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 5 +++--
drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
index a1b56b89130d..85b9bcbc7321 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
@@ -12,6 +12,7 @@
#include <linux/io.h>
#include <linux/iopoll.h>
+#include "camss.h"
#include "camss-vfe.h"
#define VFE_0_HW_VERSION 0x000
@@ -936,8 +937,8 @@ static irqreturn_t vfe_isr(int irq, void *dev)
vfe->ops->isr_read(vfe, &value0, &value1);
- trace_printk("VFE: status0 = 0x%08x, status1 = 0x%08x\n",
- value0, value1);
+ dev_dbg(vfe->camss->dev, "VFE: status0 = 0x%08x, status1 = 0x%08x\n",
+ value0, value1);
if (value0 & VFE_0_IRQ_STATUS_0_RESET_ACK)
vfe->isr_ops.reset_ack(vfe);
diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
index 84c33b8f9fe3..f7e00a2de393 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
@@ -12,6 +12,7 @@
#include <linux/io.h>
#include <linux/iopoll.h>
+#include "camss.h"
#include "camss-vfe.h"
#define VFE_0_HW_VERSION 0x000
@@ -1069,8 +1070,8 @@ static irqreturn_t vfe_isr(int irq, void *dev)
vfe->ops->isr_read(vfe, &value0, &value1);
- trace_printk("VFE: status0 = 0x%08x, status1 = 0x%08x\n",
- value0, value1);
+ dev_dbg(vfe->camss->dev, "VFE: status0 = 0x%08x, status1 = 0x%08x\n",
+ value0, value1);
if (value0 & VFE_0_IRQ_STATUS_0_RESET_ACK)
vfe->isr_ops.reset_ack(vfe);
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v5 04/22] media: camss: Add CAMSS_845 camss version
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (2 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 03/22] media: camss: Replace trace_printk() with dev_dbg() Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-20 18:42 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 05/22] media: camss: Make ISPIF subdevice optional Robert Foss
` (16 subsequent siblings)
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Add enum representing the SDM845 SOC, which incorporates version
170 of the Titan architecture ISP.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
drivers/media/platform/qcom/camss/camss.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
index 3a0484683cd6..46e986452824 100644
--- a/drivers/media/platform/qcom/camss/camss.h
+++ b/drivers/media/platform/qcom/camss/camss.h
@@ -66,6 +66,7 @@ enum camss_version {
CAMSS_8x16,
CAMSS_8x96,
CAMSS_660,
+ CAMSS_845,
};
struct camss {
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 04/22] media: camss: Add CAMSS_845 camss version
2021-02-17 11:21 ` [PATCH v5 04/22] media: camss: Add CAMSS_845 camss version Robert Foss
@ 2021-02-20 18:42 ` Andrey Konovalov
0 siblings, 0 replies; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-20 18:42 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Thanks,
Andrey
On 17.02.2021 14:21, Robert Foss wrote:
> Add enum representing the SDM845 SOC, which incorporates version
> 170 of the Titan architecture ISP.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
> drivers/media/platform/qcom/camss/camss.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
> index 3a0484683cd6..46e986452824 100644
> --- a/drivers/media/platform/qcom/camss/camss.h
> +++ b/drivers/media/platform/qcom/camss/camss.h
> @@ -66,6 +66,7 @@ enum camss_version {
> CAMSS_8x16,
> CAMSS_8x96,
> CAMSS_660,
> + CAMSS_845,
> };
>
> struct camss {
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 05/22] media: camss: Make ISPIF subdevice optional
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (3 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 04/22] media: camss: Add CAMSS_845 camss version Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-18 19:49 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170 Robert Foss
` (15 subsequent siblings)
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
This driver supports multiple architecture versions of the Qualcomm ISP.
The CAMSS architecure which this driver is name after, and with the
introduction of this series, the Titan architecture.
The ISPIF is an IP-block that is only present in the CAMSS generation of
the architecture. In order to support the Titan generation, make the
ISPIF an optional subdevice.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
Changes since v1:
- Björn: Improved commit message
- Björn: Use local 'dev' ptr instead of 'camss->dev'
- Björn: Remove res/ispif NULL checks
- Björn: Remove ispif NULL checks before calling
msm_ispif_unregister_entities()
- Andrey: Fixed incorrect allocation size
Changes since v4:
- Andrey: Remove !camss->ispif conditional from camss.c
- Andrey: Fix !camss->ispif in camss-ispif.c
- Move !camss->ispif check to msm_ispif_subdev_init()
.../media/platform/qcom/camss/camss-ispif.c | 119 +++++++++++-------
.../media/platform/qcom/camss/camss-ispif.h | 3 +-
drivers/media/platform/qcom/camss/camss.c | 99 ++++++++++-----
drivers/media/platform/qcom/camss/camss.h | 2 +-
4 files changed, 139 insertions(+), 84 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
index adeb92808998..fc121da4ab0c 100644
--- a/drivers/media/platform/qcom/camss/camss-ispif.c
+++ b/drivers/media/platform/qcom/camss/camss-ispif.c
@@ -161,6 +161,7 @@ static const u32 ispif_formats_8x96[] = {
static irqreturn_t ispif_isr_8x96(int irq, void *dev)
{
struct ispif_device *ispif = dev;
+ struct camss *camss = ispif->camss;
u32 value0, value1, value2, value3, value4, value5;
value0 = readl_relaxed(ispif->base + ISPIF_VFE_m_IRQ_STATUS_0(0));
@@ -186,34 +187,34 @@ static irqreturn_t ispif_isr_8x96(int irq, void *dev)
complete(&ispif->reset_complete[1]);
if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE0 pix0 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE0 pix0 overflow\n");
if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE0 rdi0 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE0 rdi0 overflow\n");
if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE0 pix1 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE0 pix1 overflow\n");
if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE0 rdi1 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE0 rdi1 overflow\n");
if (unlikely(value2 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE0 rdi2 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE0 rdi2 overflow\n");
if (unlikely(value3 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE1 pix0 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE1 pix0 overflow\n");
if (unlikely(value3 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE1 rdi0 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE1 rdi0 overflow\n");
if (unlikely(value4 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE1 pix1 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE1 pix1 overflow\n");
if (unlikely(value4 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE1 rdi1 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE1 rdi1 overflow\n");
if (unlikely(value5 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE1 rdi2 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE1 rdi2 overflow\n");
return IRQ_HANDLED;
}
@@ -228,6 +229,7 @@ static irqreturn_t ispif_isr_8x96(int irq, void *dev)
static irqreturn_t ispif_isr_8x16(int irq, void *dev)
{
struct ispif_device *ispif = dev;
+ struct camss *camss = ispif->camss;
u32 value0, value1, value2;
value0 = readl_relaxed(ispif->base + ISPIF_VFE_m_IRQ_STATUS_0(0));
@@ -244,30 +246,32 @@ static irqreturn_t ispif_isr_8x16(int irq, void *dev)
complete(&ispif->reset_complete[0]);
if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE0 pix0 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE0 pix0 overflow\n");
if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE0 rdi0 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE0 rdi0 overflow\n");
if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE0 pix1 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE0 pix1 overflow\n");
if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE0 rdi1 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE0 rdi1 overflow\n");
if (unlikely(value2 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
- dev_err_ratelimited(to_device(ispif), "VFE0 rdi2 overflow\n");
+ dev_err_ratelimited(camss->dev, "VFE0 rdi2 overflow\n");
return IRQ_HANDLED;
}
static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
{
+ struct camss *camss = ispif->camss;
+
unsigned long time;
u32 val;
- if (vfe_id > (to_camss(ispif)->vfe_num - 1)) {
- dev_err(to_device(ispif),
+ if (vfe_id > (camss->vfe_num - 1)) {
+ dev_err(camss->dev,
"Error: asked reset for invalid VFE%d\n", vfe_id);
return -ENOENT;
}
@@ -300,7 +304,7 @@ static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
time = wait_for_completion_timeout(&ispif->reset_complete[vfe_id],
msecs_to_jiffies(ISPIF_RESET_TIMEOUT_MS));
if (!time) {
- dev_err(to_device(ispif),
+ dev_err(camss->dev,
"ISPIF for VFE%d reset timeout\n", vfe_id);
return -EIO;
}
@@ -316,30 +320,31 @@ static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
*/
static int ispif_reset(struct ispif_device *ispif, u8 vfe_id)
{
+ struct camss *camss = ispif->camss;
int ret;
- ret = camss_pm_domain_on(to_camss(ispif), PM_DOMAIN_VFE0);
+ ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE0);
if (ret < 0)
return ret;
- ret = camss_pm_domain_on(to_camss(ispif), PM_DOMAIN_VFE1);
+ ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE1);
if (ret < 0)
return ret;
ret = camss_enable_clocks(ispif->nclocks_for_reset,
ispif->clock_for_reset,
- to_device(ispif));
+ camss->dev);
if (ret < 0)
return ret;
ret = ispif_vfe_reset(ispif, vfe_id);
if (ret)
- dev_dbg(to_device(ispif), "ISPIF Reset failed\n");
+ dev_dbg(camss->dev, "ISPIF Reset failed\n");
camss_disable_clocks(ispif->nclocks_for_reset, ispif->clock_for_reset);
- camss_pm_domain_off(to_camss(ispif), PM_DOMAIN_VFE0);
- camss_pm_domain_off(to_camss(ispif), PM_DOMAIN_VFE1);
+ camss_pm_domain_off(camss, PM_DOMAIN_VFE0);
+ camss_pm_domain_off(camss, PM_DOMAIN_VFE1);
return ret;
}
@@ -355,7 +360,7 @@ static int ispif_set_power(struct v4l2_subdev *sd, int on)
{
struct ispif_line *line = v4l2_get_subdevdata(sd);
struct ispif_device *ispif = line->ispif;
- struct device *dev = to_device(ispif);
+ struct device *dev = ispif->camss->dev;
int ret = 0;
mutex_lock(&ispif->power_lock);
@@ -505,7 +510,7 @@ static int ispif_validate_intf_status(struct ispif_device *ispif,
}
if ((val & 0xf) != 0xf) {
- dev_err(to_device(ispif), "%s: ispif is busy: 0x%x\n",
+ dev_err(ispif->camss->dev, "%s: ispif is busy: 0x%x\n",
__func__, val);
ret = -EBUSY;
}
@@ -552,7 +557,7 @@ static int ispif_wait_for_stop(struct ispif_device *ispif,
ISPIF_TIMEOUT_SLEEP_US,
ISPIF_TIMEOUT_ALL_US);
if (ret < 0)
- dev_err(to_device(ispif), "%s: ispif stop timeout\n",
+ dev_err(ispif->camss->dev, "%s: ispif stop timeout\n",
__func__);
return ret;
@@ -800,6 +805,7 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
{
struct ispif_line *line = v4l2_get_subdevdata(sd);
struct ispif_device *ispif = line->ispif;
+ struct camss *camss = ispif->camss;
enum ispif_intf intf = line->interface;
u8 csid = line->csid_id;
u8 vfe = line->vfe_id;
@@ -825,8 +831,8 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
ispif_select_csid(ispif, intf, csid, vfe, 1);
ispif_select_cid(ispif, intf, cid, vfe, 1);
ispif_config_irq(ispif, intf, vfe, 1);
- if (to_camss(ispif)->version == CAMSS_8x96 ||
- to_camss(ispif)->version == CAMSS_660)
+ if (camss->version == CAMSS_8x96 ||
+ camss->version == CAMSS_660)
ispif_config_pack(ispif,
line->fmt[MSM_ISPIF_PAD_SINK].code,
intf, cid, vfe, 1);
@@ -843,8 +849,8 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
return ret;
mutex_lock(&ispif->config_lock);
- if (to_camss(ispif)->version == CAMSS_8x96 ||
- to_camss(ispif)->version == CAMSS_660)
+ if (camss->version == CAMSS_8x96 ||
+ camss->version == CAMSS_660)
ispif_config_pack(ispif,
line->fmt[MSM_ISPIF_PAD_SINK].code,
intf, cid, vfe, 0);
@@ -1088,26 +1094,32 @@ static int ispif_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
*
* Return 0 on success or a negative error code otherwise
*/
-int msm_ispif_subdev_init(struct ispif_device *ispif,
+int msm_ispif_subdev_init(struct camss *camss,
const struct resources_ispif *res)
{
- struct device *dev = to_device(ispif);
+ struct device *dev = camss->dev;
+ struct ispif_device *ispif = camss->ispif;
struct platform_device *pdev = to_platform_device(dev);
struct resource *r;
int i;
int ret;
+ if (!camss->ispif)
+ return 0;
+
+ ispif->camss = camss;
+
/* Number of ISPIF lines - same as number of CSID hardware modules */
- if (to_camss(ispif)->version == CAMSS_8x16)
+ if (camss->version == CAMSS_8x16)
ispif->line_num = 2;
- else if (to_camss(ispif)->version == CAMSS_8x96 ||
- to_camss(ispif)->version == CAMSS_660)
+ else if (camss->version == CAMSS_8x96 ||
+ camss->version == CAMSS_660)
ispif->line_num = 4;
else
return -EINVAL;
- ispif->line = devm_kcalloc(dev, ispif->line_num, sizeof(*ispif->line),
- GFP_KERNEL);
+ ispif->line = devm_kcalloc(dev, ispif->line_num,
+ sizeof(*ispif->line), GFP_KERNEL);
if (!ispif->line)
return -ENOMEM;
@@ -1115,12 +1127,12 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
ispif->line[i].ispif = ispif;
ispif->line[i].id = i;
- if (to_camss(ispif)->version == CAMSS_8x16) {
+ if (camss->version == CAMSS_8x16) {
ispif->line[i].formats = ispif_formats_8x16;
ispif->line[i].nformats =
ARRAY_SIZE(ispif_formats_8x16);
- } else if (to_camss(ispif)->version == CAMSS_8x96 ||
- to_camss(ispif)->version == CAMSS_660) {
+ } else if (camss->version == CAMSS_8x96 ||
+ camss->version == CAMSS_660) {
ispif->line[i].formats = ispif_formats_8x96;
ispif->line[i].nformats =
ARRAY_SIZE(ispif_formats_8x96);
@@ -1157,15 +1169,16 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
ispif->irq = r->start;
snprintf(ispif->irq_name, sizeof(ispif->irq_name), "%s_%s",
dev_name(dev), MSM_ISPIF_NAME);
- if (to_camss(ispif)->version == CAMSS_8x16)
+ if (camss->version == CAMSS_8x16)
ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x16,
IRQF_TRIGGER_RISING, ispif->irq_name, ispif);
- else if (to_camss(ispif)->version == CAMSS_8x96 ||
- to_camss(ispif)->version == CAMSS_660)
+ else if (camss->version == CAMSS_8x96 ||
+ camss->version == CAMSS_660)
ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x96,
IRQF_TRIGGER_RISING, ispif->irq_name, ispif);
else
ret = -EINVAL;
+
if (ret < 0) {
dev_err(dev, "request_irq failed: %d\n", ret);
return ret;
@@ -1331,10 +1344,15 @@ static const struct media_entity_operations ispif_media_ops = {
int msm_ispif_register_entities(struct ispif_device *ispif,
struct v4l2_device *v4l2_dev)
{
- struct device *dev = to_device(ispif);
+ struct camss *camss;
int ret;
int i;
+ if (!ispif)
+ return 0;
+
+ camss = ispif->camss;
+
for (i = 0; i < ispif->line_num; i++) {
struct v4l2_subdev *sd = &ispif->line[i].subdev;
struct media_pad *pads = ispif->line[i].pads;
@@ -1348,7 +1366,7 @@ int msm_ispif_register_entities(struct ispif_device *ispif,
ret = ispif_init_formats(sd, NULL);
if (ret < 0) {
- dev_err(dev, "Failed to init format: %d\n", ret);
+ dev_err(camss->dev, "Failed to init format: %d\n", ret);
goto error;
}
@@ -1360,13 +1378,15 @@ int msm_ispif_register_entities(struct ispif_device *ispif,
ret = media_entity_pads_init(&sd->entity, MSM_ISPIF_PADS_NUM,
pads);
if (ret < 0) {
- dev_err(dev, "Failed to init media entity: %d\n", ret);
+ dev_err(camss->dev, "Failed to init media entity: %d\n",
+ ret);
goto error;
}
ret = v4l2_device_register_subdev(v4l2_dev, sd);
if (ret < 0) {
- dev_err(dev, "Failed to register subdev: %d\n", ret);
+ dev_err(camss->dev, "Failed to register subdev: %d\n",
+ ret);
media_entity_cleanup(&sd->entity);
goto error;
}
@@ -1393,6 +1413,9 @@ void msm_ispif_unregister_entities(struct ispif_device *ispif)
{
int i;
+ if (!ispif)
+ return;
+
mutex_destroy(&ispif->power_lock);
mutex_destroy(&ispif->config_lock);
diff --git a/drivers/media/platform/qcom/camss/camss-ispif.h b/drivers/media/platform/qcom/camss/camss-ispif.h
index 4132174f7ea1..fdf28e68cc7d 100644
--- a/drivers/media/platform/qcom/camss/camss-ispif.h
+++ b/drivers/media/platform/qcom/camss/camss-ispif.h
@@ -63,11 +63,12 @@ struct ispif_device {
struct mutex config_lock;
unsigned int line_num;
struct ispif_line *line;
+ struct camss *camss;
};
struct resources_ispif;
-int msm_ispif_subdev_init(struct ispif_device *ispif,
+int msm_ispif_subdev_init(struct camss *camss,
const struct resources_ispif *res);
int msm_ispif_register_entities(struct ispif_device *ispif,
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index 7c0f669f8aa6..5ac2dfc67c8b 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -745,10 +745,10 @@ static int camss_init_subdevices(struct camss *camss)
}
}
- ret = msm_ispif_subdev_init(&camss->ispif, ispif_res);
+ ret = msm_ispif_subdev_init(camss, ispif_res);
if (ret < 0) {
dev_err(camss->dev, "Failed to init ispif sub-device: %d\n",
- ret);
+ ret);
return ret;
}
@@ -798,10 +798,11 @@ static int camss_register_entities(struct camss *camss)
}
}
- ret = msm_ispif_register_entities(&camss->ispif, &camss->v4l2_dev);
+ ret = msm_ispif_register_entities(camss->ispif,
+ &camss->v4l2_dev);
if (ret < 0) {
dev_err(camss->dev, "Failed to register ispif entities: %d\n",
- ret);
+ ret);
goto err_reg_ispif;
}
@@ -835,43 +836,64 @@ static int camss_register_entities(struct camss *camss)
}
}
- for (i = 0; i < camss->csid_num; i++) {
- for (j = 0; j < camss->ispif.line_num; j++) {
- ret = media_create_pad_link(
- &camss->csid[i].subdev.entity,
- MSM_CSID_PAD_SRC,
- &camss->ispif.line[j].subdev.entity,
- MSM_ISPIF_PAD_SINK,
- 0);
- if (ret < 0) {
- dev_err(camss->dev,
- "Failed to link %s->%s entities: %d\n",
- camss->csid[i].subdev.entity.name,
- camss->ispif.line[j].subdev.entity.name,
- ret);
- goto err_link;
- }
- }
- }
-
- for (i = 0; i < camss->ispif.line_num; i++)
- for (k = 0; k < camss->vfe_num; k++)
- for (j = 0; j < ARRAY_SIZE(camss->vfe[k].line); j++) {
+ if (camss->ispif) {
+ for (i = 0; i < camss->csid_num; i++) {
+ for (j = 0; j < camss->ispif->line_num; j++) {
ret = media_create_pad_link(
- &camss->ispif.line[i].subdev.entity,
- MSM_ISPIF_PAD_SRC,
- &camss->vfe[k].line[j].subdev.entity,
- MSM_VFE_PAD_SINK,
+ &camss->csid[i].subdev.entity,
+ MSM_CSID_PAD_SRC,
+ &camss->ispif->line[j].subdev.entity,
+ MSM_ISPIF_PAD_SINK,
0);
if (ret < 0) {
dev_err(camss->dev,
"Failed to link %s->%s entities: %d\n",
- camss->ispif.line[i].subdev.entity.name,
- camss->vfe[k].line[j].subdev.entity.name,
+ camss->csid[i].subdev.entity.name,
+ camss->ispif->line[j].subdev.entity.name,
ret);
goto err_link;
}
}
+ }
+
+ for (i = 0; i < camss->ispif->line_num; i++)
+ for (k = 0; k < camss->vfe_num; k++)
+ for (j = 0; j < ARRAY_SIZE(camss->vfe[k].line); j++) {
+ ret = media_create_pad_link(
+ &camss->ispif->line[i].subdev.entity,
+ MSM_ISPIF_PAD_SRC,
+ &camss->vfe[k].line[j].subdev.entity,
+ MSM_VFE_PAD_SINK,
+ 0);
+ if (ret < 0) {
+ dev_err(camss->dev,
+ "Failed to link %s->%s entities: %d\n",
+ camss->ispif->line[i].subdev.entity.name,
+ camss->vfe[k].line[j].subdev.entity.name,
+ ret);
+ goto err_link;
+ }
+ }
+ } else {
+ for (i = 0; i < camss->csid_num; i++)
+ for (k = 0; k < camss->vfe_num; k++)
+ for (j = 0; j < ARRAY_SIZE(camss->vfe[k].line); j++) {
+ ret = media_create_pad_link(
+ &camss->csid[i].subdev.entity,
+ MSM_CSID_PAD_SRC,
+ &camss->vfe[k].line[j].subdev.entity,
+ MSM_VFE_PAD_SINK,
+ 0);
+ if (ret < 0) {
+ dev_err(camss->dev,
+ "Failed to link %s->%s entities: %d\n",
+ camss->csid[i].subdev.entity.name,
+ camss->vfe[k].line[j].subdev.entity.name,
+ ret);
+ goto err_link;
+ }
+ }
+ }
return 0;
@@ -881,8 +903,8 @@ static int camss_register_entities(struct camss *camss)
for (i--; i >= 0; i--)
msm_vfe_unregister_entities(&camss->vfe[i]);
- msm_ispif_unregister_entities(&camss->ispif);
err_reg_ispif:
+ msm_ispif_unregister_entities(camss->ispif);
i = camss->csid_num;
err_reg_csid:
@@ -913,7 +935,7 @@ static void camss_unregister_entities(struct camss *camss)
for (i = 0; i < camss->csid_num; i++)
msm_csid_unregister_entity(&camss->csid[i]);
- msm_ispif_unregister_entities(&camss->ispif);
+ msm_ispif_unregister_entities(camss->ispif);
for (i = 0; i < camss->vfe_num; i++)
msm_vfe_unregister_entities(&camss->vfe[i]);
@@ -1044,6 +1066,15 @@ static int camss_probe(struct platform_device *pdev)
goto err_free;
}
+ if (camss->version == CAMSS_8x16 ||
+ camss->version == CAMSS_8x96) {
+ camss->ispif = devm_kcalloc(dev, 1, sizeof(*camss->ispif), GFP_KERNEL);
+ if (!camss->ispif) {
+ ret = -ENOMEM;
+ goto err_free;
+ }
+ }
+
camss->vfe = devm_kcalloc(dev, camss->vfe_num, sizeof(*camss->vfe),
GFP_KERNEL);
if (!camss->vfe) {
diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
index 46e986452824..b7ad8e9f68a8 100644
--- a/drivers/media/platform/qcom/camss/camss.h
+++ b/drivers/media/platform/qcom/camss/camss.h
@@ -79,7 +79,7 @@ struct camss {
struct csiphy_device *csiphy;
int csid_num;
struct csid_device *csid;
- struct ispif_device ispif;
+ struct ispif_device *ispif;
int vfe_num;
struct vfe_device *vfe;
atomic_t ref_count;
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 05/22] media: camss: Make ISPIF subdevice optional
2021-02-17 11:21 ` [PATCH v5 05/22] media: camss: Make ISPIF subdevice optional Robert Foss
@ 2021-02-18 19:49 ` Andrey Konovalov
0 siblings, 0 replies; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-18 19:49 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
On 17.02.2021 14:21, Robert Foss wrote:
> This driver supports multiple architecture versions of the Qualcomm ISP.
> The CAMSS architecure which this driver is name after, and with the
> introduction of this series, the Titan architecture.
>
> The ISPIF is an IP-block that is only present in the CAMSS generation of
> the architecture. In order to support the Titan generation, make the
> ISPIF an optional subdevice.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Thanks,
Andrey
> ---
>
>
> Changes since v1:
> - Björn: Improved commit message
> - Björn: Use local 'dev' ptr instead of 'camss->dev'
> - Björn: Remove res/ispif NULL checks
> - Björn: Remove ispif NULL checks before calling
> msm_ispif_unregister_entities()
> - Andrey: Fixed incorrect allocation size
>
> Changes since v4:
> - Andrey: Remove !camss->ispif conditional from camss.c
> - Andrey: Fix !camss->ispif in camss-ispif.c
> - Move !camss->ispif check to msm_ispif_subdev_init()
>
>
> .../media/platform/qcom/camss/camss-ispif.c | 119 +++++++++++-------
> .../media/platform/qcom/camss/camss-ispif.h | 3 +-
> drivers/media/platform/qcom/camss/camss.c | 99 ++++++++++-----
> drivers/media/platform/qcom/camss/camss.h | 2 +-
> 4 files changed, 139 insertions(+), 84 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
> index adeb92808998..fc121da4ab0c 100644
> --- a/drivers/media/platform/qcom/camss/camss-ispif.c
> +++ b/drivers/media/platform/qcom/camss/camss-ispif.c
> @@ -161,6 +161,7 @@ static const u32 ispif_formats_8x96[] = {
> static irqreturn_t ispif_isr_8x96(int irq, void *dev)
> {
> struct ispif_device *ispif = dev;
> + struct camss *camss = ispif->camss;
> u32 value0, value1, value2, value3, value4, value5;
>
> value0 = readl_relaxed(ispif->base + ISPIF_VFE_m_IRQ_STATUS_0(0));
> @@ -186,34 +187,34 @@ static irqreturn_t ispif_isr_8x96(int irq, void *dev)
> complete(&ispif->reset_complete[1]);
>
> if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE0 pix0 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE0 pix0 overflow\n");
>
> if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE0 rdi0 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE0 rdi0 overflow\n");
>
> if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE0 pix1 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE0 pix1 overflow\n");
>
> if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE0 rdi1 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE0 rdi1 overflow\n");
>
> if (unlikely(value2 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE0 rdi2 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE0 rdi2 overflow\n");
>
> if (unlikely(value3 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE1 pix0 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE1 pix0 overflow\n");
>
> if (unlikely(value3 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE1 rdi0 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE1 rdi0 overflow\n");
>
> if (unlikely(value4 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE1 pix1 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE1 pix1 overflow\n");
>
> if (unlikely(value4 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE1 rdi1 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE1 rdi1 overflow\n");
>
> if (unlikely(value5 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE1 rdi2 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE1 rdi2 overflow\n");
>
> return IRQ_HANDLED;
> }
> @@ -228,6 +229,7 @@ static irqreturn_t ispif_isr_8x96(int irq, void *dev)
> static irqreturn_t ispif_isr_8x16(int irq, void *dev)
> {
> struct ispif_device *ispif = dev;
> + struct camss *camss = ispif->camss;
> u32 value0, value1, value2;
>
> value0 = readl_relaxed(ispif->base + ISPIF_VFE_m_IRQ_STATUS_0(0));
> @@ -244,30 +246,32 @@ static irqreturn_t ispif_isr_8x16(int irq, void *dev)
> complete(&ispif->reset_complete[0]);
>
> if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE0 pix0 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE0 pix0 overflow\n");
>
> if (unlikely(value0 & ISPIF_VFE_m_IRQ_STATUS_0_RDI0_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE0 rdi0 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE0 rdi0 overflow\n");
>
> if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_PIX1_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE0 pix1 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE0 pix1 overflow\n");
>
> if (unlikely(value1 & ISPIF_VFE_m_IRQ_STATUS_1_RDI1_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE0 rdi1 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE0 rdi1 overflow\n");
>
> if (unlikely(value2 & ISPIF_VFE_m_IRQ_STATUS_2_RDI2_OVERFLOW))
> - dev_err_ratelimited(to_device(ispif), "VFE0 rdi2 overflow\n");
> + dev_err_ratelimited(camss->dev, "VFE0 rdi2 overflow\n");
>
> return IRQ_HANDLED;
> }
>
> static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
> {
> + struct camss *camss = ispif->camss;
> +
> unsigned long time;
> u32 val;
>
> - if (vfe_id > (to_camss(ispif)->vfe_num - 1)) {
> - dev_err(to_device(ispif),
> + if (vfe_id > (camss->vfe_num - 1)) {
> + dev_err(camss->dev,
> "Error: asked reset for invalid VFE%d\n", vfe_id);
> return -ENOENT;
> }
> @@ -300,7 +304,7 @@ static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
> time = wait_for_completion_timeout(&ispif->reset_complete[vfe_id],
> msecs_to_jiffies(ISPIF_RESET_TIMEOUT_MS));
> if (!time) {
> - dev_err(to_device(ispif),
> + dev_err(camss->dev,
> "ISPIF for VFE%d reset timeout\n", vfe_id);
> return -EIO;
> }
> @@ -316,30 +320,31 @@ static int ispif_vfe_reset(struct ispif_device *ispif, u8 vfe_id)
> */
> static int ispif_reset(struct ispif_device *ispif, u8 vfe_id)
> {
> + struct camss *camss = ispif->camss;
> int ret;
>
> - ret = camss_pm_domain_on(to_camss(ispif), PM_DOMAIN_VFE0);
> + ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE0);
> if (ret < 0)
> return ret;
>
> - ret = camss_pm_domain_on(to_camss(ispif), PM_DOMAIN_VFE1);
> + ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE1);
> if (ret < 0)
> return ret;
>
> ret = camss_enable_clocks(ispif->nclocks_for_reset,
> ispif->clock_for_reset,
> - to_device(ispif));
> + camss->dev);
> if (ret < 0)
> return ret;
>
> ret = ispif_vfe_reset(ispif, vfe_id);
> if (ret)
> - dev_dbg(to_device(ispif), "ISPIF Reset failed\n");
> + dev_dbg(camss->dev, "ISPIF Reset failed\n");
>
> camss_disable_clocks(ispif->nclocks_for_reset, ispif->clock_for_reset);
>
> - camss_pm_domain_off(to_camss(ispif), PM_DOMAIN_VFE0);
> - camss_pm_domain_off(to_camss(ispif), PM_DOMAIN_VFE1);
> + camss_pm_domain_off(camss, PM_DOMAIN_VFE0);
> + camss_pm_domain_off(camss, PM_DOMAIN_VFE1);
>
> return ret;
> }
> @@ -355,7 +360,7 @@ static int ispif_set_power(struct v4l2_subdev *sd, int on)
> {
> struct ispif_line *line = v4l2_get_subdevdata(sd);
> struct ispif_device *ispif = line->ispif;
> - struct device *dev = to_device(ispif);
> + struct device *dev = ispif->camss->dev;
> int ret = 0;
>
> mutex_lock(&ispif->power_lock);
> @@ -505,7 +510,7 @@ static int ispif_validate_intf_status(struct ispif_device *ispif,
> }
>
> if ((val & 0xf) != 0xf) {
> - dev_err(to_device(ispif), "%s: ispif is busy: 0x%x\n",
> + dev_err(ispif->camss->dev, "%s: ispif is busy: 0x%x\n",
> __func__, val);
> ret = -EBUSY;
> }
> @@ -552,7 +557,7 @@ static int ispif_wait_for_stop(struct ispif_device *ispif,
> ISPIF_TIMEOUT_SLEEP_US,
> ISPIF_TIMEOUT_ALL_US);
> if (ret < 0)
> - dev_err(to_device(ispif), "%s: ispif stop timeout\n",
> + dev_err(ispif->camss->dev, "%s: ispif stop timeout\n",
> __func__);
>
> return ret;
> @@ -800,6 +805,7 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
> {
> struct ispif_line *line = v4l2_get_subdevdata(sd);
> struct ispif_device *ispif = line->ispif;
> + struct camss *camss = ispif->camss;
> enum ispif_intf intf = line->interface;
> u8 csid = line->csid_id;
> u8 vfe = line->vfe_id;
> @@ -825,8 +831,8 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
> ispif_select_csid(ispif, intf, csid, vfe, 1);
> ispif_select_cid(ispif, intf, cid, vfe, 1);
> ispif_config_irq(ispif, intf, vfe, 1);
> - if (to_camss(ispif)->version == CAMSS_8x96 ||
> - to_camss(ispif)->version == CAMSS_660)
> + if (camss->version == CAMSS_8x96 ||
> + camss->version == CAMSS_660)
> ispif_config_pack(ispif,
> line->fmt[MSM_ISPIF_PAD_SINK].code,
> intf, cid, vfe, 1);
> @@ -843,8 +849,8 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)
> return ret;
>
> mutex_lock(&ispif->config_lock);
> - if (to_camss(ispif)->version == CAMSS_8x96 ||
> - to_camss(ispif)->version == CAMSS_660)
> + if (camss->version == CAMSS_8x96 ||
> + camss->version == CAMSS_660)
> ispif_config_pack(ispif,
> line->fmt[MSM_ISPIF_PAD_SINK].code,
> intf, cid, vfe, 0);
> @@ -1088,26 +1094,32 @@ static int ispif_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
> *
> * Return 0 on success or a negative error code otherwise
> */
> -int msm_ispif_subdev_init(struct ispif_device *ispif,
> +int msm_ispif_subdev_init(struct camss *camss,
> const struct resources_ispif *res)
> {
> - struct device *dev = to_device(ispif);
> + struct device *dev = camss->dev;
> + struct ispif_device *ispif = camss->ispif;
> struct platform_device *pdev = to_platform_device(dev);
> struct resource *r;
> int i;
> int ret;
>
> + if (!camss->ispif)
> + return 0;
> +
> + ispif->camss = camss;
> +
> /* Number of ISPIF lines - same as number of CSID hardware modules */
> - if (to_camss(ispif)->version == CAMSS_8x16)
> + if (camss->version == CAMSS_8x16)
> ispif->line_num = 2;
> - else if (to_camss(ispif)->version == CAMSS_8x96 ||
> - to_camss(ispif)->version == CAMSS_660)
> + else if (camss->version == CAMSS_8x96 ||
> + camss->version == CAMSS_660)
> ispif->line_num = 4;
> else
> return -EINVAL;
>
> - ispif->line = devm_kcalloc(dev, ispif->line_num, sizeof(*ispif->line),
> - GFP_KERNEL);
> + ispif->line = devm_kcalloc(dev, ispif->line_num,
> + sizeof(*ispif->line), GFP_KERNEL);
> if (!ispif->line)
> return -ENOMEM;
>
> @@ -1115,12 +1127,12 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
> ispif->line[i].ispif = ispif;
> ispif->line[i].id = i;
>
> - if (to_camss(ispif)->version == CAMSS_8x16) {
> + if (camss->version == CAMSS_8x16) {
> ispif->line[i].formats = ispif_formats_8x16;
> ispif->line[i].nformats =
> ARRAY_SIZE(ispif_formats_8x16);
> - } else if (to_camss(ispif)->version == CAMSS_8x96 ||
> - to_camss(ispif)->version == CAMSS_660) {
> + } else if (camss->version == CAMSS_8x96 ||
> + camss->version == CAMSS_660) {
> ispif->line[i].formats = ispif_formats_8x96;
> ispif->line[i].nformats =
> ARRAY_SIZE(ispif_formats_8x96);
> @@ -1157,15 +1169,16 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,
> ispif->irq = r->start;
> snprintf(ispif->irq_name, sizeof(ispif->irq_name), "%s_%s",
> dev_name(dev), MSM_ISPIF_NAME);
> - if (to_camss(ispif)->version == CAMSS_8x16)
> + if (camss->version == CAMSS_8x16)
> ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x16,
> IRQF_TRIGGER_RISING, ispif->irq_name, ispif);
> - else if (to_camss(ispif)->version == CAMSS_8x96 ||
> - to_camss(ispif)->version == CAMSS_660)
> + else if (camss->version == CAMSS_8x96 ||
> + camss->version == CAMSS_660)
> ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x96,
> IRQF_TRIGGER_RISING, ispif->irq_name, ispif);
> else
> ret = -EINVAL;
> +
> if (ret < 0) {
> dev_err(dev, "request_irq failed: %d\n", ret);
> return ret;
> @@ -1331,10 +1344,15 @@ static const struct media_entity_operations ispif_media_ops = {
> int msm_ispif_register_entities(struct ispif_device *ispif,
> struct v4l2_device *v4l2_dev)
> {
> - struct device *dev = to_device(ispif);
> + struct camss *camss;
> int ret;
> int i;
>
> + if (!ispif)
> + return 0;
> +
> + camss = ispif->camss;
> +
> for (i = 0; i < ispif->line_num; i++) {
> struct v4l2_subdev *sd = &ispif->line[i].subdev;
> struct media_pad *pads = ispif->line[i].pads;
> @@ -1348,7 +1366,7 @@ int msm_ispif_register_entities(struct ispif_device *ispif,
>
> ret = ispif_init_formats(sd, NULL);
> if (ret < 0) {
> - dev_err(dev, "Failed to init format: %d\n", ret);
> + dev_err(camss->dev, "Failed to init format: %d\n", ret);
> goto error;
> }
>
> @@ -1360,13 +1378,15 @@ int msm_ispif_register_entities(struct ispif_device *ispif,
> ret = media_entity_pads_init(&sd->entity, MSM_ISPIF_PADS_NUM,
> pads);
> if (ret < 0) {
> - dev_err(dev, "Failed to init media entity: %d\n", ret);
> + dev_err(camss->dev, "Failed to init media entity: %d\n",
> + ret);
> goto error;
> }
>
> ret = v4l2_device_register_subdev(v4l2_dev, sd);
> if (ret < 0) {
> - dev_err(dev, "Failed to register subdev: %d\n", ret);
> + dev_err(camss->dev, "Failed to register subdev: %d\n",
> + ret);
> media_entity_cleanup(&sd->entity);
> goto error;
> }
> @@ -1393,6 +1413,9 @@ void msm_ispif_unregister_entities(struct ispif_device *ispif)
> {
> int i;
>
> + if (!ispif)
> + return;
> +
> mutex_destroy(&ispif->power_lock);
> mutex_destroy(&ispif->config_lock);
>
> diff --git a/drivers/media/platform/qcom/camss/camss-ispif.h b/drivers/media/platform/qcom/camss/camss-ispif.h
> index 4132174f7ea1..fdf28e68cc7d 100644
> --- a/drivers/media/platform/qcom/camss/camss-ispif.h
> +++ b/drivers/media/platform/qcom/camss/camss-ispif.h
> @@ -63,11 +63,12 @@ struct ispif_device {
> struct mutex config_lock;
> unsigned int line_num;
> struct ispif_line *line;
> + struct camss *camss;
> };
>
> struct resources_ispif;
>
> -int msm_ispif_subdev_init(struct ispif_device *ispif,
> +int msm_ispif_subdev_init(struct camss *camss,
> const struct resources_ispif *res);
>
> int msm_ispif_register_entities(struct ispif_device *ispif,
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 7c0f669f8aa6..5ac2dfc67c8b 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -745,10 +745,10 @@ static int camss_init_subdevices(struct camss *camss)
> }
> }
>
> - ret = msm_ispif_subdev_init(&camss->ispif, ispif_res);
> + ret = msm_ispif_subdev_init(camss, ispif_res);
> if (ret < 0) {
> dev_err(camss->dev, "Failed to init ispif sub-device: %d\n",
> - ret);
> + ret);
> return ret;
> }
>
> @@ -798,10 +798,11 @@ static int camss_register_entities(struct camss *camss)
> }
> }
>
> - ret = msm_ispif_register_entities(&camss->ispif, &camss->v4l2_dev);
> + ret = msm_ispif_register_entities(camss->ispif,
> + &camss->v4l2_dev);
> if (ret < 0) {
> dev_err(camss->dev, "Failed to register ispif entities: %d\n",
> - ret);
> + ret);
> goto err_reg_ispif;
> }
>
> @@ -835,43 +836,64 @@ static int camss_register_entities(struct camss *camss)
> }
> }
>
> - for (i = 0; i < camss->csid_num; i++) {
> - for (j = 0; j < camss->ispif.line_num; j++) {
> - ret = media_create_pad_link(
> - &camss->csid[i].subdev.entity,
> - MSM_CSID_PAD_SRC,
> - &camss->ispif.line[j].subdev.entity,
> - MSM_ISPIF_PAD_SINK,
> - 0);
> - if (ret < 0) {
> - dev_err(camss->dev,
> - "Failed to link %s->%s entities: %d\n",
> - camss->csid[i].subdev.entity.name,
> - camss->ispif.line[j].subdev.entity.name,
> - ret);
> - goto err_link;
> - }
> - }
> - }
> -
> - for (i = 0; i < camss->ispif.line_num; i++)
> - for (k = 0; k < camss->vfe_num; k++)
> - for (j = 0; j < ARRAY_SIZE(camss->vfe[k].line); j++) {
> + if (camss->ispif) {
> + for (i = 0; i < camss->csid_num; i++) {
> + for (j = 0; j < camss->ispif->line_num; j++) {
> ret = media_create_pad_link(
> - &camss->ispif.line[i].subdev.entity,
> - MSM_ISPIF_PAD_SRC,
> - &camss->vfe[k].line[j].subdev.entity,
> - MSM_VFE_PAD_SINK,
> + &camss->csid[i].subdev.entity,
> + MSM_CSID_PAD_SRC,
> + &camss->ispif->line[j].subdev.entity,
> + MSM_ISPIF_PAD_SINK,
> 0);
> if (ret < 0) {
> dev_err(camss->dev,
> "Failed to link %s->%s entities: %d\n",
> - camss->ispif.line[i].subdev.entity.name,
> - camss->vfe[k].line[j].subdev.entity.name,
> + camss->csid[i].subdev.entity.name,
> + camss->ispif->line[j].subdev.entity.name,
> ret);
> goto err_link;
> }
> }
> + }
> +
> + for (i = 0; i < camss->ispif->line_num; i++)
> + for (k = 0; k < camss->vfe_num; k++)
> + for (j = 0; j < ARRAY_SIZE(camss->vfe[k].line); j++) {
> + ret = media_create_pad_link(
> + &camss->ispif->line[i].subdev.entity,
> + MSM_ISPIF_PAD_SRC,
> + &camss->vfe[k].line[j].subdev.entity,
> + MSM_VFE_PAD_SINK,
> + 0);
> + if (ret < 0) {
> + dev_err(camss->dev,
> + "Failed to link %s->%s entities: %d\n",
> + camss->ispif->line[i].subdev.entity.name,
> + camss->vfe[k].line[j].subdev.entity.name,
> + ret);
> + goto err_link;
> + }
> + }
> + } else {
> + for (i = 0; i < camss->csid_num; i++)
> + for (k = 0; k < camss->vfe_num; k++)
> + for (j = 0; j < ARRAY_SIZE(camss->vfe[k].line); j++) {
> + ret = media_create_pad_link(
> + &camss->csid[i].subdev.entity,
> + MSM_CSID_PAD_SRC,
> + &camss->vfe[k].line[j].subdev.entity,
> + MSM_VFE_PAD_SINK,
> + 0);
> + if (ret < 0) {
> + dev_err(camss->dev,
> + "Failed to link %s->%s entities: %d\n",
> + camss->csid[i].subdev.entity.name,
> + camss->vfe[k].line[j].subdev.entity.name,
> + ret);
> + goto err_link;
> + }
> + }
> + }
>
> return 0;
>
> @@ -881,8 +903,8 @@ static int camss_register_entities(struct camss *camss)
> for (i--; i >= 0; i--)
> msm_vfe_unregister_entities(&camss->vfe[i]);
>
> - msm_ispif_unregister_entities(&camss->ispif);
> err_reg_ispif:
> + msm_ispif_unregister_entities(camss->ispif);
>
> i = camss->csid_num;
> err_reg_csid:
> @@ -913,7 +935,7 @@ static void camss_unregister_entities(struct camss *camss)
> for (i = 0; i < camss->csid_num; i++)
> msm_csid_unregister_entity(&camss->csid[i]);
>
> - msm_ispif_unregister_entities(&camss->ispif);
> + msm_ispif_unregister_entities(camss->ispif);
>
> for (i = 0; i < camss->vfe_num; i++)
> msm_vfe_unregister_entities(&camss->vfe[i]);
> @@ -1044,6 +1066,15 @@ static int camss_probe(struct platform_device *pdev)
> goto err_free;
> }
>
> + if (camss->version == CAMSS_8x16 ||
> + camss->version == CAMSS_8x96) {
> + camss->ispif = devm_kcalloc(dev, 1, sizeof(*camss->ispif), GFP_KERNEL);
> + if (!camss->ispif) {
> + ret = -ENOMEM;
> + goto err_free;
> + }
> + }
> +
> camss->vfe = devm_kcalloc(dev, camss->vfe_num, sizeof(*camss->vfe),
> GFP_KERNEL);
> if (!camss->vfe) {
> diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
> index 46e986452824..b7ad8e9f68a8 100644
> --- a/drivers/media/platform/qcom/camss/camss.h
> +++ b/drivers/media/platform/qcom/camss/camss.h
> @@ -79,7 +79,7 @@ struct camss {
> struct csiphy_device *csiphy;
> int csid_num;
> struct csid_device *csid;
> - struct ispif_device ispif;
> + struct ispif_device *ispif;
> int vfe_num;
> struct vfe_device *vfe;
> atomic_t ref_count;
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (4 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 05/22] media: camss: Make ISPIF subdevice optional Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-20 21:40 ` Andrey Konovalov
2021-02-20 21:40 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 08/22] media: camss: Add missing format identifiers Robert Foss
` (14 subsequent siblings)
20 siblings, 2 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Add register definitions for version 170 of the Titan architecture
and implement support for the RDI output mode.
The RDI mode as opposed to the PIX output mode for the VFE unit does
not support any ISP functionality. This means essentially only
supporting dumping the output of the whatever the CSI decoder receives
from the sensor.
For example will a sensor outputting YUV pixel format frames, only
allow the VFE to dump those frames as they are received by the ISP
to memory through the RDI interface.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
Changes since v1:
- Andrey: Remove commented out chunk
- Remove left over WIP comments
Changes since v4:
- Andrey: Remove traces of PIX support
- Andrey: Fix vfe_global_reset() overwriting reset command
- Remove unused variable
drivers/media/platform/qcom/camss/Makefile | 1 +
.../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
drivers/media/platform/qcom/camss/camss-vfe.c | 47 +-
drivers/media/platform/qcom/camss/camss-vfe.h | 26 +-
.../media/platform/qcom/camss/camss-video.c | 52 ++
drivers/media/platform/qcom/camss/camss.c | 61 ++
6 files changed, 957 insertions(+), 20 deletions(-)
create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c
diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
index 940c0ae3e003..052c4f405fa3 100644
--- a/drivers/media/platform/qcom/camss/Makefile
+++ b/drivers/media/platform/qcom/camss/Makefile
@@ -11,6 +11,7 @@ qcom-camss-objs += \
camss-vfe-4-1.o \
camss-vfe-4-7.o \
camss-vfe-4-8.o \
+ camss-vfe-170.o \
camss-vfe-gen1.o \
camss-vfe.o \
camss-video.o \
diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
new file mode 100644
index 000000000000..c4991b1f22f8
--- /dev/null
+++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
@@ -0,0 +1,790 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * camss-vfe-4-7.c
+ *
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
+ *
+ * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015-2018 Linaro Ltd.
+ */
+
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+
+#include "camss.h"
+#include "camss-vfe.h"
+
+#define VFE_HW_VERSION (0x000)
+
+#define VFE_GLOBAL_RESET_CMD (0x018)
+#define GLOBAL_RESET_CMD_CORE BIT(0)
+#define GLOBAL_RESET_CMD_CAMIF BIT(1)
+#define GLOBAL_RESET_CMD_BUS BIT(2)
+#define GLOBAL_RESET_CMD_BUS_BDG BIT(3)
+#define GLOBAL_RESET_CMD_REGISTER BIT(4)
+#define GLOBAL_RESET_CMD_PM BIT(5)
+#define GLOBAL_RESET_CMD_BUS_MISR BIT(6)
+#define GLOBAL_RESET_CMD_TESTGEN BIT(7)
+#define GLOBAL_RESET_CMD_DSP BIT(8)
+#define GLOBAL_RESET_CMD_IDLE_CGC BIT(9)
+#define GLOBAL_RESET_CMD_RDI0 BIT(10)
+#define GLOBAL_RESET_CMD_RDI1 BIT(11)
+#define GLOBAL_RESET_CMD_RDI2 BIT(12)
+#define GLOBAL_RESET_CMD_RDI3 BIT(13)
+#define GLOBAL_RESET_CMD_VFE_DOMAIN BIT(30)
+#define GLOBAL_RESET_CMD_RESET_BYPASS BIT(31)
+
+
+#define VFE_CORE_CFG (0x050)
+#define CFG_PIXEL_PATTERN_YCBYCR (0x4)
+#define CFG_PIXEL_PATTERN_YCRYCB (0x5)
+#define CFG_PIXEL_PATTERN_CBYCRY (0x6)
+#define CFG_PIXEL_PATTERN_CRYCBY (0x7)
+#define CFG_COMPOSITE_REG_UPDATE_EN BIT(4)
+
+#define VFE_IRQ_CMD (0x058)
+#define CMD_GLOBAL_CLEAR BIT(0)
+
+#define VFE_IRQ_MASK_0 (0x05c)
+#define MASK_0_CAMIF_SOF BIT(0)
+#define MASK_0_CAMIF_EOF BIT(1)
+#define MASK_0_RDI_REG_UPDATE(n) BIT((n) + 5)
+#define MASK_0_IMAGE_MASTER_n_PING_PONG(n) BIT((n) + 8)
+#define MASK_0_IMAGE_COMPOSITE_DONE_n(n) BIT((n) + 25)
+#define MASK_0_RESET_ACK BIT(31)
+
+#define VFE_IRQ_MASK_1 (0x060)
+#define MASK_1_CAMIF_ERROR BIT(0)
+#define MASK_1_VIOLATION BIT(7)
+#define MASK_1_BUS_BDG_HALT_ACK BIT(8)
+#define MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n) BIT((n) + 9)
+#define MASK_1_RDI_SOF(n) BIT((n) + 29)
+
+#define VFE_IRQ_CLEAR_0 (0x064)
+#define VFE_IRQ_CLEAR_1 (0x068)
+
+#define VFE_IRQ_STATUS_0 (0x06c)
+#define STATUS_0_CAMIF_SOF BIT(0)
+#define STATUS_0_RDI_REG_UPDATE(n) BIT((n) + 5)
+#define STATUS_0_IMAGE_MASTER_PING_PONG(n) BIT((n) + 8)
+#define STATUS_0_IMAGE_COMPOSITE_DONE(n) BIT((n) + 25)
+#define STATUS_0_RESET_ACK BIT(31)
+
+#define VFE_IRQ_STATUS_1 (0x070)
+#define STATUS_1_VIOLATION BIT(7)
+#define STATUS_1_BUS_BDG_HALT_ACK BIT(8)
+#define STATUS_1_RDI_SOF(n) BIT((n) + 27)
+
+#define VFE_VIOLATION_STATUS (0x07c)
+
+#define VFE_CAMIF_CMD (0x478)
+#define CMD_CLEAR_CAMIF_STATUS BIT(2)
+
+#define VFE_CAMIF_CFG (0x47c)
+#define CFG_VSYNC_SYNC_EDGE (0)
+#define VSYNC_ACTIVE_HIGH (0)
+#define VSYNC_ACTIVE_LOW (1)
+#define CFG_HSYNC_SYNC_EDGE (1)
+#define HSYNC_ACTIVE_HIGH (0)
+#define HSYNC_ACTIVE_LOW (1)
+#define CFG_VFE_SUBSAMPLE_ENABLE BIT(4)
+#define CFG_BUS_SUBSAMPLE_ENABLE BIT(5)
+#define CFG_VFE_OUTPUT_EN BIT(6)
+#define CFG_BUS_OUTPUT_EN BIT(7)
+#define CFG_BINNING_EN BIT(9)
+#define CFG_FRAME_BASED_EN BIT(10)
+#define CFG_RAW_CROP_EN BIT(22)
+
+// XXX different, don't exist in TITAN register docs
+#define VFE_0_CAMIF_FRAME_CFG 0x484
+#define VFE_0_CAMIF_WINDOW_WIDTH_CFG 0x488
+#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG 0x48c
+#define VFE_0_CAMIF_SUBSAMPLE_CFG 0x490
+#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN 0x498
+#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN 0x49c
+#define VFE_0_CAMIF_STATUS 0x4a4
+#define VFE_0_CAMIF_STATUS_HALT BIT(31)
+#define CAMIF_TIMEOUT_SLEEP_US 1000
+#define CAMIF_TIMEOUT_ALL_US 1000000
+
+#define VFE_REG_UPDATE_CMD (0x4ac)
+#define REG_UPDATE_RDI(n) BIT(1 + (n))
+
+
+#define VFE_BUS_IRQ_MASK(n) (0x2044 + (n) * 4)
+#define VFE_BUS_IRQ_CLEAR(n) (0x2050 + (n) * 4)
+
+#define VFE_BUS_IRQ_STATUS(n) (0x205c + (n) * 4)
+#define STATUS0_COMP_RESET_DONE BIT(0)
+#define STATUS0_COMP_REG_UPDATE0_DONE BIT(1)
+#define STATUS0_COMP_REG_UPDATE1_DONE BIT(2)
+#define STATUS0_COMP_REG_UPDATE2_DONE BIT(3)
+#define STATUS0_COMP_REG_UPDATE3_DONE BIT(4)
+#define STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
+#define STATUS0_COMP0_BUF_DONE BIT(5)
+#define STATUS0_COMP1_BUF_DONE BIT(6)
+#define STATUS0_COMP2_BUF_DONE BIT(7)
+#define STATUS0_COMP3_BUF_DONE BIT(8)
+#define STATUS0_COMP4_BUF_DONE BIT(9)
+#define STATUS0_COMP5_BUF_DONE BIT(10)
+#define STATUS0_COMP_BUF_DONE(n) BIT(n + 5)
+#define STATUS0_COMP_ERROR BIT(11)
+#define STATUS0_COMP_OVERWRITE BIT(12)
+#define STATUS0_OVERFLOW BIT(13)
+#define STATUS0_VIOLATION BIT(14)
+/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
+#define STATUS1_WM_CLIENT_BUF_DONE(n) BIT(n)
+#define STATUS1_EARLY_DONE BIT(24)
+#define STATUS2_DUAL_COMP0_BUF_DONE BIT(0)
+#define STATUS2_DUAL_COMP1_BUF_DONE BIT(1)
+#define STATUS2_DUAL_COMP2_BUF_DONE BIT(2)
+#define STATUS2_DUAL_COMP3_BUF_DONE BIT(3)
+#define STATUS2_DUAL_COMP4_BUF_DONE BIT(4)
+#define STATUS2_DUAL_COMP5_BUF_DONE BIT(5)
+#define STATUS2_DUAL_COMP_BUF_DONE(n) BIT(n)
+#define STATUS2_DUAL_COMP_ERROR BIT(6)
+#define STATUS2_DUAL_COMP_OVERWRITE BIT(7)
+
+#define VFE_BUS_IRQ_CLEAR_GLOBAL (0x2068)
+
+#define VFE_BUS_WM_DEBUG_STATUS_CFG (0x226c)
+#define DEBUG_STATUS_CFG_STATUS0(n) BIT(n)
+#define DEBUG_STATUS_CFG_STATUS1(n) BIT(8+n)
+
+#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER (0x2080)
+
+#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC (0x2084)
+#define BUS_VER2_MAX_CLIENTS (24)
+#define WM_ADDR_NO_SYNC_DEFAULT_VAL \
+ ((1 << BUS_VER2_MAX_CLIENTS) - 1)
+
+#define VFE_BUS_WM_CGC_OVERRIDE (0x200c)
+#define WM_CGC_OVERRIDE_ALL (0xFFFFF)
+
+#define VFE_BUS_WM_TEST_BUS_CTRL (0x211c)
+
+#define VFE_BUS_WM_STATUS0(n) (0x2200 + (n) * 0x100)
+#define VFE_BUS_WM_STATUS1(n) (0x2204 + (n) * 0x100)
+#define VFE_BUS_WM_CFG(n) (0x2208 + (n) * 0x100)
+#define WM_CFG_EN (0)
+#define WM_CFG_MODE (1)
+#define MODE_QCOM_PLAIN (0)
+#define MODE_MIPI_RAW (1)
+#define WM_CFG_VIRTUALFRAME (2)
+#define VFE_BUS_WM_HEADER_ADDR(n) (0x220c + (n) * 0x100)
+#define VFE_BUS_WM_HEADER_CFG(n) (0x2210 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR(n) (0x2214 + (n) * 0x100)
+#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n) (0x2218 + (n) * 0x100)
+#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n) (0x221c + (n) * 0x100)
+#define WM_BUFFER_DEFAULT_WIDTH (0xFF01)
+
+#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n) (0x2220 + (n) * 0x100)
+#define VFE_BUS_WM_PACKER_CFG(n) (0x2224 + (n) * 0x100)
+
+#define VFE_BUS_WM_STRIDE(n) (0x2228 + (n) * 0x100)
+#define WM_STRIDE_DEFAULT_STRIDE (0xFF01)
+
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n) (0x2248 + (n) * 0x100)
+#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n) (0x224c + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PERIOD(n) (0x2250 + (n) * 0x100)
+#define VFE_BUS_WM_FRAMEDROP_PATTERN(n) (0x2254 + (n) * 0x100)
+#define VFE_BUS_WM_FRAME_INC(n) (0x2258 + (n) * 0x100)
+#define VFE_BUS_WM_BURST_LIMIT(n) (0x225c + (n) * 0x100)
+
+
+static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+{
+ u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
+
+ u32 gen = (hw_version >> 28) & 0xF;
+ u32 rev = (hw_version >> 16) & 0xFFF;
+ u32 step = hw_version & 0xFFFF;
+
+ dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
+}
+
+static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
+{
+ u32 bits = readl_relaxed(vfe->base + reg);
+
+ writel_relaxed(bits & ~clr_bits, vfe->base + reg);
+}
+
+static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
+{
+ u32 bits = readl_relaxed(vfe->base + reg);
+
+ writel_relaxed(bits | set_bits, vfe->base + reg);
+}
+
+static void vfe_global_reset(struct vfe_device *vfe)
+{
+ u32 reset_bits = GLOBAL_RESET_CMD_CORE |
+ GLOBAL_RESET_CMD_CAMIF |
+ GLOBAL_RESET_CMD_BUS |
+ GLOBAL_RESET_CMD_REGISTER |
+ GLOBAL_RESET_CMD_PM |
+ GLOBAL_RESET_CMD_BUS_MISR |
+ GLOBAL_RESET_CMD_IDLE_CGC |
+ GLOBAL_RESET_CMD_RDI0 |
+ GLOBAL_RESET_CMD_RDI1 |
+ GLOBAL_RESET_CMD_RDI2;
+
+ writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
+
+ /* Make sure IRQ mask has been written before resetting */
+ wmb();
+
+ writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
+}
+
+static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
+{
+ u32 val;
+
+ /*Set Debug Registers*/
+ val = DEBUG_STATUS_CFG_STATUS0(1) |
+ DEBUG_STATUS_CFG_STATUS0(7);
+ writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
+
+ /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
+ writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
+
+ /* no clock gating at bus input */
+ val = WM_CGC_OVERRIDE_ALL;
+ writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
+
+ writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
+
+ /* if addr_no_sync has default value then config the addr no sync reg */
+ val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
+ writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
+
+ writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
+
+ val = WM_BUFFER_DEFAULT_WIDTH;
+ writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
+
+ val = 0;
+ writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
+
+ val = 0;
+ writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
+
+ /* Configure stride for RDIs */
+ //val = pix->plane_fmt[0].bytesperline;
+ val = WM_STRIDE_DEFAULT_STRIDE;
+ writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
+
+ /* Enable WM */
+ val = 1 << WM_CFG_EN |
+ MODE_MIPI_RAW << WM_CFG_MODE;
+ writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
+{
+ /* Disable WM */
+ writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
+}
+
+static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
+ struct vfe_line *line)
+{
+ struct v4l2_pix_format_mplane *pix =
+ &line->video_out.active_fmt.fmt.pix_mp;
+ u32 stride = pix->plane_fmt[0].bytesperline;
+
+ writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
+ writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
+}
+
+static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+ vfe->reg_update |= REG_UPDATE_RDI(line_id);
+
+ /* Enforce ordering between previous reg writes and reg update */
+ wmb();
+
+ writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
+
+ /* Enforce ordering between reg update and subsequent reg writes */
+ wmb();
+}
+
+static inline void vfe_reg_update_clear(struct vfe_device *vfe,
+ enum vfe_line_id line_id)
+{
+ vfe->reg_update &= ~REG_UPDATE_RDI(line_id);
+}
+
+static void vfe_enable_irq_common(struct vfe_device *vfe)
+{
+ vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
+ vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
+
+ writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
+ writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
+ writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));
+}
+
+static void vfe_isr_halt_ack(struct vfe_device *vfe)
+{
+ complete(&vfe->halt_complete);
+}
+
+static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
+{
+ *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+ *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+ writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
+ writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+ /* Enforce ordering between IRQ Clear and Global IRQ Clear */
+ wmb();
+ writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+}
+
+static void vfe_violation_read(struct vfe_device *vfe)
+{
+ u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
+
+ pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
+}
+
+/*
+ * vfe_isr - VFE module interrupt handler
+ * @irq: Interrupt line
+ * @dev: VFE device
+ *
+ * Return IRQ_HANDLED on success
+ */
+static irqreturn_t vfe_isr(int irq, void *dev)
+{
+ struct vfe_device *vfe = dev;
+ u32 status0, status1, vfe_bus_status[3];
+ int i, wm;
+
+ status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
+ status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
+
+ writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
+ writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
+
+ for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
+ vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
+ writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
+ }
+
+ /* Enforce ordering between IRQ reading and interpretation */
+ wmb();
+
+ writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
+ writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
+
+ if (status0 & STATUS_0_RESET_ACK)
+ vfe->isr_ops.reset_ack(vfe);
+
+ for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+ if (status0 & STATUS_0_RDI_REG_UPDATE(i))
+ vfe->isr_ops.reg_update(vfe, i);
+
+ for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
+ if (status0 & STATUS_1_RDI_SOF(i))
+ vfe->isr_ops.sof(vfe, i);
+
+ for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
+ if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
+ vfe->isr_ops.comp_done(vfe, i);
+
+ for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
+ if (status0 & BIT(9))
+ if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
+ vfe->isr_ops.wm_done(vfe, wm);
+
+ return IRQ_HANDLED;
+}
+
+/*
+ * vfe_halt - Trigger halt on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_halt(struct vfe_device *vfe)
+{
+ unsigned long time;
+
+ return 0;
+
+ reinit_completion(&vfe->halt_complete);
+
+ time = wait_for_completion_timeout(&vfe->halt_complete,
+ msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
+ if (!time) {
+ dev_err(vfe->camss->dev, "VFE halt timeout\n");
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static int vfe_get_output(struct vfe_line *line)
+{
+ struct vfe_device *vfe = to_vfe(line);
+ struct vfe_output *output;
+ unsigned long flags;
+ int i;
+ int wm_idx;
+
+ spin_lock_irqsave(&vfe->output_lock, flags);
+
+ output = &line->output;
+ if (output->state != VFE_OUTPUT_OFF) {
+ dev_err(vfe->camss->dev, "Output is running\n");
+ goto error;
+ }
+
+ output->wm_num = 1;
+
+ for (i = 0; i < output->wm_num; i++) {
+ wm_idx = vfe_reserve_wm(vfe, line->id);
+ if (wm_idx < 0) {
+ dev_err(vfe->camss->dev, "Can not reserve wm\n");
+ goto error_get_wm;
+ }
+ output->wm_idx[i] = wm_idx;
+ }
+
+ output->drop_update_idx = 0;
+
+ spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+ return 0;
+
+error_get_wm:
+ for (i--; i >= 0; i--)
+ vfe_release_wm(vfe, output->wm_idx[i]);
+ output->state = VFE_OUTPUT_OFF;
+error:
+ spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+ return -EINVAL;
+}
+
+static int vfe_enable_output(struct vfe_line *line)
+{
+ struct vfe_device *vfe = to_vfe(line);
+ struct vfe_output *output = &line->output;
+ const struct vfe_hw_ops *ops = vfe->ops;
+ struct media_entity *sensor;
+ unsigned long flags;
+ unsigned int frame_skip = 0;
+ unsigned int i;
+
+ sensor = camss_find_sensor(&line->subdev.entity);
+ if (sensor) {
+ struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
+
+ v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
+ /* Max frame skip is 29 frames */
+ if (frame_skip > VFE_FRAME_DROP_VAL - 1)
+ frame_skip = VFE_FRAME_DROP_VAL - 1;
+ }
+
+ spin_lock_irqsave(&vfe->output_lock, flags);
+
+ ops->reg_update_clear(vfe, line->id);
+
+ if (output->state != VFE_OUTPUT_OFF) {
+ dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
+ output->state);
+ spin_unlock_irqrestore(&vfe->output_lock, flags);
+ return -EINVAL;
+ }
+
+ WARN_ON(output->gen2.active_num);
+
+ output->state = VFE_OUTPUT_ON;
+
+ output->sequence = 0;
+ output->wait_reg_update = 0;
+ reinit_completion(&output->reg_update);
+
+ vfe_wm_start(vfe, output->wm_idx[0], line);
+
+ for (i = 0; i < 2; i++) {
+ output->buf[i] = vfe_buf_get_pending(output);
+ if (!output->buf[i])
+ break;
+ output->gen2.active_num++;
+ vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
+ }
+
+ ops->reg_update(vfe, line->id);
+
+ spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+ return 0;
+}
+
+static int vfe_disable_output(struct vfe_line *line)
+{
+ struct vfe_device *vfe = to_vfe(line);
+ struct vfe_output *output = &line->output;
+ unsigned long flags;
+ unsigned int i;
+ bool done;
+ int timeout = 0;
+
+ do {
+ spin_lock_irqsave(&vfe->output_lock, flags);
+ done = !output->gen2.active_num;
+ spin_unlock_irqrestore(&vfe->output_lock, flags);
+ usleep_range(10000, 20000);
+
+ if (timeout++ == 100) {
+ dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
+ vfe_reset(vfe);
+ output->gen2.active_num = 0;
+ return 0;
+ }
+ } while (!done);
+
+ spin_lock_irqsave(&vfe->output_lock, flags);
+ for (i = 0; i < output->wm_num; i++)
+ vfe_wm_stop(vfe, output->wm_idx[i]);
+ spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+ return 0;
+}
+
+/*
+ * vfe_enable - Enable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_enable(struct vfe_line *line)
+{
+ struct vfe_device *vfe = to_vfe(line);
+ int ret;
+
+ mutex_lock(&vfe->stream_lock);
+
+ if (!vfe->stream_count)
+ vfe_enable_irq_common(vfe);
+
+ vfe->stream_count++;
+
+ mutex_unlock(&vfe->stream_lock);
+
+ ret = vfe_get_output(line);
+ if (ret < 0)
+ goto error_get_output;
+
+ ret = vfe_enable_output(line);
+ if (ret < 0)
+ goto error_enable_output;
+
+ vfe->was_streaming = 1;
+
+ return 0;
+
+
+error_enable_output:
+ vfe_put_output(line);
+
+error_get_output:
+ mutex_lock(&vfe->stream_lock);
+
+ vfe->stream_count--;
+
+ mutex_unlock(&vfe->stream_lock);
+
+ return ret;
+}
+
+/*
+ * vfe_disable - Disable streaming on VFE line
+ * @line: VFE line
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_disable(struct vfe_line *line)
+{
+ struct vfe_device *vfe = to_vfe(line);
+
+ vfe_disable_output(line);
+
+ vfe_put_output(line);
+
+ mutex_lock(&vfe->stream_lock);
+
+ vfe->stream_count--;
+
+ mutex_unlock(&vfe->stream_lock);
+
+ return 0;
+}
+
+/*
+ * vfe_isr_sof - Process start of frame interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+
+}
+
+/*
+ * vfe_isr_reg_update - Process reg update interrupt
+ * @vfe: VFE Device
+ * @line_id: VFE line
+ */
+static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
+{
+ struct vfe_output *output;
+ unsigned long flags;
+
+ spin_lock_irqsave(&vfe->output_lock, flags);
+ vfe->ops->reg_update_clear(vfe, line_id);
+
+ output = &vfe->line[line_id].output;
+
+ if (output->wait_reg_update) {
+ output->wait_reg_update = 0;
+ complete(&output->reg_update);
+ }
+
+ spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_isr_wm_done - Process write master done interrupt
+ * @vfe: VFE Device
+ * @wm: Write master id
+ */
+static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
+{
+ struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
+ struct camss_buffer *ready_buf;
+ struct vfe_output *output;
+ unsigned long flags;
+ u32 index;
+ u64 ts = ktime_get_ns();
+
+ spin_lock_irqsave(&vfe->output_lock, flags);
+
+ if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
+ dev_err_ratelimited(vfe->camss->dev,
+ "Received wm done for unmapped index\n");
+ goto out_unlock;
+ }
+ output = &vfe->line[vfe->wm_output_map[wm]].output;
+
+ ready_buf = output->buf[0];
+ if (!ready_buf) {
+ dev_err_ratelimited(vfe->camss->dev,
+ "Missing ready buf %d!\n", output->state);
+ goto out_unlock;
+ }
+
+ ready_buf->vb.vb2_buf.timestamp = ts;
+ ready_buf->vb.sequence = output->sequence++;
+
+ index = 0;
+ output->buf[0] = output->buf[1];
+ if (output->buf[0])
+ index = 1;
+
+ output->buf[index] = vfe_buf_get_pending(output);
+
+ if (output->buf[index])
+ vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
+ else
+ output->gen2.active_num--;
+
+ spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+ vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+
+ return;
+
+out_unlock:
+ spin_unlock_irqrestore(&vfe->output_lock, flags);
+}
+
+/*
+ * vfe_queue_buffer - Add empty buffer
+ * @vid: Video device structure
+ * @buf: Buffer to be enqueued
+ *
+ * Add an empty buffer - depending on the current number of buffers it will be
+ * put in pending buffer queue or directly given to the hardware to be filled.
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int vfe_queue_buffer(struct camss_video *vid,
+ struct camss_buffer *buf)
+{
+ struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
+ struct vfe_device *vfe = to_vfe(line);
+ struct vfe_output *output;
+ unsigned long flags;
+
+ output = &line->output;
+
+ spin_lock_irqsave(&vfe->output_lock, flags);
+
+ if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
+ output->buf[output->gen2.active_num++] = buf;
+ vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
+ } else {
+ vfe_buf_add_pending(output, buf);
+ }
+
+ spin_unlock_irqrestore(&vfe->output_lock, flags);
+
+ return 0;
+}
+
+const struct vfe_isr_ops vfe_isr_ops_170 = {
+ .reset_ack = vfe_isr_reset_ack,
+ .halt_ack = vfe_isr_halt_ack,
+ .reg_update = vfe_isr_reg_update,
+ .sof = vfe_isr_sof,
+ .comp_done = vfe_isr_comp_done,
+ .wm_done = vfe_isr_wm_done,
+};
+
+static const struct camss_video_ops vfe_video_ops_170 = {
+ .queue_buffer = vfe_queue_buffer,
+ .flush_buffers = vfe_flush_buffers,
+};
+
+static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
+{
+ vfe->isr_ops = vfe_isr_ops_170;
+ vfe->video_ops = vfe_video_ops_170;
+
+ vfe->line_num = VFE_LINE_NUM_GEN2;
+}
+
+const struct vfe_hw_ops vfe_ops_170 = {
+ .global_reset = vfe_global_reset,
+ .hw_version_read = vfe_hw_version_read,
+ .isr_read = vfe_isr_read,
+ .isr = vfe_isr,
+ .reg_update_clear = vfe_reg_update_clear,
+ .reg_update = vfe_reg_update,
+ .subdev_init = vfe_subdev_init,
+ .vfe_disable = vfe_disable,
+ .vfe_enable = vfe_enable,
+ .vfe_halt = vfe_halt,
+ .violation_read = vfe_violation_read,
+};
diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index 375843bd16af..6fafeb8a5484 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
{ MEDIA_BUS_FMT_YVYU8_2X8, 8 },
};
+static const struct vfe_format formats_rdi_845[] = {
+ { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
+ { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
+ { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
+ { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
+ { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
+ { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
+ { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
+ { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
+ { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
+ { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
+ { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
+ { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
+ { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
+ { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
+ { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
+ { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
+ { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
+ { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
+ { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
+ { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
+ { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
+ { MEDIA_BUS_FMT_Y10_1X10, 10 },
+ { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
+};
+
/*
* vfe_get_bpp - map media bus format to bits per pixel
* @formats: supported media bus formats array
@@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
return sink_code;
}
else if (vfe->camss->version == CAMSS_8x96 ||
- vfe->camss->version == CAMSS_660)
+ vfe->camss->version == CAMSS_660 ||
+ vfe->camss->version == CAMSS_845)
switch (sink_code) {
case MEDIA_BUS_FMT_YUYV8_2X8:
{
@@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
return 0;
}
-/*
- * vfe_reset - Trigger reset on VFE module and wait to complete
- * @vfe: VFE device
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int vfe_reset(struct vfe_device *vfe)
+int vfe_reset(struct vfe_device *vfe)
{
unsigned long time;
@@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
struct camss_clock *clock = &vfe->clock[i];
if (!strcmp(clock->name, "vfe0") ||
- !strcmp(clock->name, "vfe1")) {
+ !strcmp(clock->name, "vfe1") ||
+ !strcmp(clock->name, "vfe_lite")) {
u64 min_rate = 0;
long rate;
@@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
case CAMSS_660:
vfe->ops = &vfe_ops_4_8;
break;
+
+ case CAMSS_845:
+ vfe->ops = &vfe_ops_170;
+ break;
default:
return -EINVAL;
}
@@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
l->formats = formats_rdi_8x96;
l->nformats = ARRAY_SIZE(formats_rdi_8x96);
}
+ } else if (camss->version == CAMSS_845) {
+ l->formats = formats_rdi_845;
+ l->nformats = ARRAY_SIZE(formats_rdi_845);
} else {
return -EINVAL;
}
diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
index aad5dc74c2c0..29b3d930ffc6 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe.h
+++ b/drivers/media/platform/qcom/camss/camss-vfe.h
@@ -19,7 +19,6 @@
#include "camss-video.h"
#include "camss-vfe-gen1.h"
-
#define MSM_VFE_PAD_SINK 0
#define MSM_VFE_PAD_SRC 1
#define MSM_VFE_PADS_NUM 2
@@ -38,14 +37,14 @@
#define to_vfe(ptr_line) \
container_of(vfe_line_array(ptr_line), struct vfe_device, line)
-
enum vfe_output_state {
VFE_OUTPUT_OFF,
VFE_OUTPUT_RESERVED,
VFE_OUTPUT_SINGLE,
VFE_OUTPUT_CONTINUOUS,
VFE_OUTPUT_IDLE,
- VFE_OUTPUT_STOPPING
+ VFE_OUTPUT_STOPPING,
+ VFE_OUTPUT_ON,
};
enum vfe_line_id {
@@ -53,6 +52,7 @@ enum vfe_line_id {
VFE_LINE_RDI0 = 0,
VFE_LINE_RDI1 = 1,
VFE_LINE_RDI2 = 2,
+ VFE_LINE_NUM_GEN2 = 3,
VFE_LINE_PIX = 3,
VFE_LINE_NUM_GEN1 = 4,
VFE_LINE_NUM_MAX = 4
@@ -73,6 +73,9 @@ struct vfe_output {
int active_buf;
int wait_sof;
} gen1;
+ struct {
+ int active_num;
+ } gen2;
};
enum vfe_output_state state;
unsigned int sequence;
@@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
-/*
- * vfe_disable - Disable streaming on VFE line
- * @line: VFE line
- *
- * Return 0 on success or a negative error code otherwise
- */
-int vfe_disable(struct vfe_line *line);
-
int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
/*
@@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
int vfe_release_wm(struct vfe_device *vfe, u8 wm);
int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
+/*
+ * vfe_reset - Trigger reset on VFE module and wait to complete
+ * @vfe: VFE device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+int vfe_reset(struct vfe_device *vfe);
+
extern const struct vfe_hw_ops vfe_ops_4_1;
extern const struct vfe_hw_ops vfe_ops_4_7;
extern const struct vfe_hw_ops vfe_ops_4_8;
+extern const struct vfe_hw_ops vfe_ops_170;
#endif /* QC_MSM_CAMSS_VFE_H */
diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
index 97cea7c4d769..f282275af626 100644
--- a/drivers/media/platform/qcom/camss/camss-video.c
+++ b/drivers/media/platform/qcom/camss/camss-video.c
@@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
{ { 1, 1 } }, { { 1, 1 } }, { 16 } },
};
+static const struct camss_format_info formats_rdi_845[] = {
+ { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+ { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+ { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+ { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+ { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+ { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+ { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+ { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 8 } },
+ { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+ { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+ { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+ { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+ { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+ { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+ { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+ { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+ { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+ { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+ { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+ { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+ { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+ { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 10 } },
+ { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
+ { { 1, 1 } }, { { 1, 1 } }, { 16 } },
+};
+
static const struct camss_format_info formats_pix_8x16[] = {
{ MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
{ { 1, 1 } }, { { 2, 3 } }, { 8 } },
@@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
video->formats = formats_rdi_8x96;
video->nformats = ARRAY_SIZE(formats_rdi_8x96);
}
+ } else if (video->camss->version == CAMSS_845) {
+ video->formats = formats_rdi_845;
+ video->nformats = ARRAY_SIZE(formats_rdi_845);
} else {
ret = -EINVAL;
goto error_video_register;
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index 6c6f1e59ccd8..0e006def1996 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
}
};
+static const struct resources vfe_res_845[] = {
+ /* VFE0 */
+ {
+ .regulator = { NULL },
+ .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+ "soc_ahb", "vfe0", "vfe0_axi",
+ "vfe0_src", "csi0",
+ "csi0_src"},
+ .clock_rate = { { 0 },
+ { 0 },
+ { 80000000 },
+ { 0 },
+ { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+ { 0 },
+ { 320000000 },
+ { 19200000, 75000000, 384000000, 538666667 },
+ { 384000000 } },
+ .reg = { "vfe0" },
+ .interrupt = { "vfe0" }
+ },
+
+ /* VFE1 */
+ {
+ .regulator = { NULL },
+ .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+ "soc_ahb", "vfe1", "vfe1_axi",
+ "vfe1_src", "csi1",
+ "csi1_src"},
+ .clock_rate = { { 0 },
+ { 0 },
+ { 80000000 },
+ { 0 },
+ { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+ { 0 },
+ { 320000000 },
+ { 19200000, 75000000, 384000000, 538666667 },
+ { 384000000 } },
+ .reg = { "vfe1" },
+ .interrupt = { "vfe1" }
+ },
+
+ /* VFE-lite */
+ {
+ .regulator = { NULL },
+ .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
+ "soc_ahb", "vfe_lite",
+ "vfe_lite_src", "csi2",
+ "csi2_src"},
+ .clock_rate = { { 0 },
+ { 0 },
+ { 80000000 },
+ { 0 },
+ { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+ { 320000000 },
+ { 19200000, 75000000, 384000000, 538666667 },
+ { 384000000 } },
+ .reg = { "vfe_lite" },
+ .interrupt = { "vfe_lite" }
+ }
+};
+
/*
* camss_add_clock_margin - Add margin to clock frequency rate
* @rate: Clock frequency rate
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170
2021-02-17 11:21 ` [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170 Robert Foss
@ 2021-02-20 21:40 ` Andrey Konovalov
2021-02-22 16:37 ` Robert Foss
2021-02-20 21:40 ` Andrey Konovalov
1 sibling, 1 reply; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-20 21:40 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
On 17.02.2021 14:21, Robert Foss wrote:
> Add register definitions for version 170 of the Titan architecture
> and implement support for the RDI output mode.
>
> The RDI mode as opposed to the PIX output mode for the VFE unit does
> not support any ISP functionality. This means essentially only
> supporting dumping the output of the whatever the CSI decoder receives
> from the sensor.
>
> For example will a sensor outputting YUV pixel format frames, only
> allow the VFE to dump those frames as they are received by the ISP
> to memory through the RDI interface.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
>
>
> Changes since v1:
> - Andrey: Remove commented out chunk
> - Remove left over WIP comments
>
> Changes since v4:
> - Andrey: Remove traces of PIX support
> - Andrey: Fix vfe_global_reset() overwriting reset command
> - Remove unused variable
>
>
>
> drivers/media/platform/qcom/camss/Makefile | 1 +
> .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
> drivers/media/platform/qcom/camss/camss-vfe.c | 47 +-
> drivers/media/platform/qcom/camss/camss-vfe.h | 26 +-
> .../media/platform/qcom/camss/camss-video.c | 52 ++
> drivers/media/platform/qcom/camss/camss.c | 61 ++
> 6 files changed, 957 insertions(+), 20 deletions(-)
> create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c
>
> diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
> index 940c0ae3e003..052c4f405fa3 100644
> --- a/drivers/media/platform/qcom/camss/Makefile
> +++ b/drivers/media/platform/qcom/camss/Makefile
> @@ -11,6 +11,7 @@ qcom-camss-objs += \
> camss-vfe-4-1.o \
> camss-vfe-4-7.o \
> camss-vfe-4-8.o \
> + camss-vfe-170.o \
> camss-vfe-gen1.o \
> camss-vfe.o \
> camss-video.o \
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> new file mode 100644
> index 000000000000..c4991b1f22f8
> --- /dev/null
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> @@ -0,0 +1,790 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * camss-vfe-4-7.c
> + *
> + * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
> + *
> + * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
> + * Copyright (C) 2015-2018 Linaro Ltd.
- it looks like the header comes from v4.7 without updating to Titan 170
> + */
> +
> +#include <linux/delay.h>
> +#include <linux/interrupt.h>
> +#include <linux/io.h>
> +#include <linux/iopoll.h>
> +
> +#include "camss.h"
> +#include "camss-vfe.h"
> +
> +#define VFE_HW_VERSION (0x000)
> +
> +#define VFE_GLOBAL_RESET_CMD (0x018)
> +#define GLOBAL_RESET_CMD_CORE BIT(0)
> +#define GLOBAL_RESET_CMD_CAMIF BIT(1)
> +#define GLOBAL_RESET_CMD_BUS BIT(2)
> +#define GLOBAL_RESET_CMD_BUS_BDG BIT(3)
> +#define GLOBAL_RESET_CMD_REGISTER BIT(4)
> +#define GLOBAL_RESET_CMD_PM BIT(5)
> +#define GLOBAL_RESET_CMD_BUS_MISR BIT(6)
> +#define GLOBAL_RESET_CMD_TESTGEN BIT(7)
> +#define GLOBAL_RESET_CMD_DSP BIT(8)
> +#define GLOBAL_RESET_CMD_IDLE_CGC BIT(9)
> +#define GLOBAL_RESET_CMD_RDI0 BIT(10)
> +#define GLOBAL_RESET_CMD_RDI1 BIT(11)
> +#define GLOBAL_RESET_CMD_RDI2 BIT(12)
> +#define GLOBAL_RESET_CMD_RDI3 BIT(13)
> +#define GLOBAL_RESET_CMD_VFE_DOMAIN BIT(30)
> +#define GLOBAL_RESET_CMD_RESET_BYPASS BIT(31)
> +
> +
> +#define VFE_CORE_CFG (0x050)
> +#define CFG_PIXEL_PATTERN_YCBYCR (0x4)
> +#define CFG_PIXEL_PATTERN_YCRYCB (0x5)
> +#define CFG_PIXEL_PATTERN_CBYCRY (0x6)
> +#define CFG_PIXEL_PATTERN_CRYCBY (0x7)
> +#define CFG_COMPOSITE_REG_UPDATE_EN BIT(4)
> +
> +#define VFE_IRQ_CMD (0x058)
> +#define CMD_GLOBAL_CLEAR BIT(0)
> +
> +#define VFE_IRQ_MASK_0 (0x05c)
> +#define MASK_0_CAMIF_SOF BIT(0)
> +#define MASK_0_CAMIF_EOF BIT(1)
> +#define MASK_0_RDI_REG_UPDATE(n) BIT((n) + 5)
> +#define MASK_0_IMAGE_MASTER_n_PING_PONG(n) BIT((n) + 8)
> +#define MASK_0_IMAGE_COMPOSITE_DONE_n(n) BIT((n) + 25)
> +#define MASK_0_RESET_ACK BIT(31)
> +
> +#define VFE_IRQ_MASK_1 (0x060)
> +#define MASK_1_CAMIF_ERROR BIT(0)
> +#define MASK_1_VIOLATION BIT(7)
> +#define MASK_1_BUS_BDG_HALT_ACK BIT(8)
> +#define MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n) BIT((n) + 9)
> +#define MASK_1_RDI_SOF(n) BIT((n) + 29)
> +
> +#define VFE_IRQ_CLEAR_0 (0x064)
> +#define VFE_IRQ_CLEAR_1 (0x068)
> +
> +#define VFE_IRQ_STATUS_0 (0x06c)
> +#define STATUS_0_CAMIF_SOF BIT(0)
> +#define STATUS_0_RDI_REG_UPDATE(n) BIT((n) + 5)
> +#define STATUS_0_IMAGE_MASTER_PING_PONG(n) BIT((n) + 8)
> +#define STATUS_0_IMAGE_COMPOSITE_DONE(n) BIT((n) + 25)
> +#define STATUS_0_RESET_ACK BIT(31)
> +
> +#define VFE_IRQ_STATUS_1 (0x070)
> +#define STATUS_1_VIOLATION BIT(7)
> +#define STATUS_1_BUS_BDG_HALT_ACK BIT(8)
> +#define STATUS_1_RDI_SOF(n) BIT((n) + 27)
> +
> +#define VFE_VIOLATION_STATUS (0x07c)
> +
> +#define VFE_CAMIF_CMD (0x478)
> +#define CMD_CLEAR_CAMIF_STATUS BIT(2)
> +
> +#define VFE_CAMIF_CFG (0x47c)
> +#define CFG_VSYNC_SYNC_EDGE (0)
> +#define VSYNC_ACTIVE_HIGH (0)
> +#define VSYNC_ACTIVE_LOW (1)
> +#define CFG_HSYNC_SYNC_EDGE (1)
> +#define HSYNC_ACTIVE_HIGH (0)
> +#define HSYNC_ACTIVE_LOW (1)
> +#define CFG_VFE_SUBSAMPLE_ENABLE BIT(4)
> +#define CFG_BUS_SUBSAMPLE_ENABLE BIT(5)
> +#define CFG_VFE_OUTPUT_EN BIT(6)
> +#define CFG_BUS_OUTPUT_EN BIT(7)
> +#define CFG_BINNING_EN BIT(9)
> +#define CFG_FRAME_BASED_EN BIT(10)
> +#define CFG_RAW_CROP_EN BIT(22)
> +
> +// XXX different, don't exist in TITAN register docs
> +#define VFE_0_CAMIF_FRAME_CFG 0x484
> +#define VFE_0_CAMIF_WINDOW_WIDTH_CFG 0x488
> +#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG 0x48c
> +#define VFE_0_CAMIF_SUBSAMPLE_CFG 0x490
> +#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN 0x498
> +#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN 0x49c
> +#define VFE_0_CAMIF_STATUS 0x4a4
> +#define VFE_0_CAMIF_STATUS_HALT BIT(31)
> +#define CAMIF_TIMEOUT_SLEEP_US 1000
> +#define CAMIF_TIMEOUT_ALL_US 1000000
> +
> +#define VFE_REG_UPDATE_CMD (0x4ac)
> +#define REG_UPDATE_RDI(n) BIT(1 + (n))
> +
> +
> +#define VFE_BUS_IRQ_MASK(n) (0x2044 + (n) * 4)
> +#define VFE_BUS_IRQ_CLEAR(n) (0x2050 + (n) * 4)
> +
> +#define VFE_BUS_IRQ_STATUS(n) (0x205c + (n) * 4)
> +#define STATUS0_COMP_RESET_DONE BIT(0)
> +#define STATUS0_COMP_REG_UPDATE0_DONE BIT(1)
> +#define STATUS0_COMP_REG_UPDATE1_DONE BIT(2)
> +#define STATUS0_COMP_REG_UPDATE2_DONE BIT(3)
> +#define STATUS0_COMP_REG_UPDATE3_DONE BIT(4)
> +#define STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
> +#define STATUS0_COMP0_BUF_DONE BIT(5)
> +#define STATUS0_COMP1_BUF_DONE BIT(6)
> +#define STATUS0_COMP2_BUF_DONE BIT(7)
> +#define STATUS0_COMP3_BUF_DONE BIT(8)
> +#define STATUS0_COMP4_BUF_DONE BIT(9)
> +#define STATUS0_COMP5_BUF_DONE BIT(10)
> +#define STATUS0_COMP_BUF_DONE(n) BIT(n + 5)
> +#define STATUS0_COMP_ERROR BIT(11)
> +#define STATUS0_COMP_OVERWRITE BIT(12)
> +#define STATUS0_OVERFLOW BIT(13)
> +#define STATUS0_VIOLATION BIT(14)
> +/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
> +#define STATUS1_WM_CLIENT_BUF_DONE(n) BIT(n)
> +#define STATUS1_EARLY_DONE BIT(24)
> +#define STATUS2_DUAL_COMP0_BUF_DONE BIT(0)
> +#define STATUS2_DUAL_COMP1_BUF_DONE BIT(1)
> +#define STATUS2_DUAL_COMP2_BUF_DONE BIT(2)
> +#define STATUS2_DUAL_COMP3_BUF_DONE BIT(3)
> +#define STATUS2_DUAL_COMP4_BUF_DONE BIT(4)
> +#define STATUS2_DUAL_COMP5_BUF_DONE BIT(5)
> +#define STATUS2_DUAL_COMP_BUF_DONE(n) BIT(n)
> +#define STATUS2_DUAL_COMP_ERROR BIT(6)
> +#define STATUS2_DUAL_COMP_OVERWRITE BIT(7)
> +
> +#define VFE_BUS_IRQ_CLEAR_GLOBAL (0x2068)
> +
> +#define VFE_BUS_WM_DEBUG_STATUS_CFG (0x226c)
> +#define DEBUG_STATUS_CFG_STATUS0(n) BIT(n)
> +#define DEBUG_STATUS_CFG_STATUS1(n) BIT(8+n)
> +
> +#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER (0x2080)
> +
> +#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC (0x2084)
> +#define BUS_VER2_MAX_CLIENTS (24)
> +#define WM_ADDR_NO_SYNC_DEFAULT_VAL \
> + ((1 << BUS_VER2_MAX_CLIENTS) - 1)
> +
> +#define VFE_BUS_WM_CGC_OVERRIDE (0x200c)
> +#define WM_CGC_OVERRIDE_ALL (0xFFFFF)
> +
> +#define VFE_BUS_WM_TEST_BUS_CTRL (0x211c)
> +
> +#define VFE_BUS_WM_STATUS0(n) (0x2200 + (n) * 0x100)
> +#define VFE_BUS_WM_STATUS1(n) (0x2204 + (n) * 0x100)
> +#define VFE_BUS_WM_CFG(n) (0x2208 + (n) * 0x100)
> +#define WM_CFG_EN (0)
> +#define WM_CFG_MODE (1)
> +#define MODE_QCOM_PLAIN (0)
> +#define MODE_MIPI_RAW (1)
> +#define WM_CFG_VIRTUALFRAME (2)
> +#define VFE_BUS_WM_HEADER_ADDR(n) (0x220c + (n) * 0x100)
> +#define VFE_BUS_WM_HEADER_CFG(n) (0x2210 + (n) * 0x100)
> +#define VFE_BUS_WM_IMAGE_ADDR(n) (0x2214 + (n) * 0x100)
> +#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n) (0x2218 + (n) * 0x100)
> +#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n) (0x221c + (n) * 0x100)
> +#define WM_BUFFER_DEFAULT_WIDTH (0xFF01)
> +
> +#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n) (0x2220 + (n) * 0x100)
> +#define VFE_BUS_WM_PACKER_CFG(n) (0x2224 + (n) * 0x100)
> +
> +#define VFE_BUS_WM_STRIDE(n) (0x2228 + (n) * 0x100)
> +#define WM_STRIDE_DEFAULT_STRIDE (0xFF01)
> +
> +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n) (0x2248 + (n) * 0x100)
> +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n) (0x224c + (n) * 0x100)
> +#define VFE_BUS_WM_FRAMEDROP_PERIOD(n) (0x2250 + (n) * 0x100)
> +#define VFE_BUS_WM_FRAMEDROP_PATTERN(n) (0x2254 + (n) * 0x100)
> +#define VFE_BUS_WM_FRAME_INC(n) (0x2258 + (n) * 0x100)
> +#define VFE_BUS_WM_BURST_LIMIT(n) (0x225c + (n) * 0x100)
> +
> +
> +static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
> +{
> + u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
> +
> + u32 gen = (hw_version >> 28) & 0xF;
> + u32 rev = (hw_version >> 16) & 0xFFF;
> + u32 step = hw_version & 0xFFFF;
> +
> + dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
> +}
> +
> +static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
> +{
> + u32 bits = readl_relaxed(vfe->base + reg);
> +
> + writel_relaxed(bits & ~clr_bits, vfe->base + reg);
> +}
> +
> +static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
> +{
> + u32 bits = readl_relaxed(vfe->base + reg);
> +
> + writel_relaxed(bits | set_bits, vfe->base + reg);
> +}
> +
> +static void vfe_global_reset(struct vfe_device *vfe)
> +{
> + u32 reset_bits = GLOBAL_RESET_CMD_CORE |
> + GLOBAL_RESET_CMD_CAMIF |
> + GLOBAL_RESET_CMD_BUS |
> + GLOBAL_RESET_CMD_REGISTER |
> + GLOBAL_RESET_CMD_PM |
> + GLOBAL_RESET_CMD_BUS_MISR |
> + GLOBAL_RESET_CMD_IDLE_CGC |
> + GLOBAL_RESET_CMD_RDI0 |
> + GLOBAL_RESET_CMD_RDI1 |
> + GLOBAL_RESET_CMD_RDI2;
- so the reset_bits is set to 0x00001E77 in v5.
In v4 the reset_bits was set to 0x00003F9F which corresponds to:
GLOBAL_RESET_CMD_CORE |
GLOBAL_RESET_CMD_CAMIF |
GLOBAL_RESET_CMD_BUS |
GLOBAL_RESET_CMD_BUS_BDG |
GLOBAL_RESET_CMD_REGISTER |
GLOBAL_RESET_CMD_TESTGEN |
GLOBAL_RESET_CMD_DSP |
GLOBAL_RESET_CMD_IDLE_CGC |
GLOBAL_RESET_CMD_RDI0 |
GLOBAL_RESET_CMD_RDI1 |
GLOBAL_RESET_CMD_RDI2 |
GLOBAL_RESET_CMD_RDI3;
So the difference between v4 and v5 is:
reset in v4, not reset in v5:
GLOBAL_RESET_CMD_BUS_BDG
GLOBAL_RESET_CMD_TESTGEN
GLOBAL_RESET_CMD_DSP
reset in v5, not reset in v4:
GLOBAL_RESET_CMD_PM
GLOBAL_RESET_CMD_BUS_MISR
- correct?
It is probably worth a few words in the v4 vs v5 changelog.
(dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2
according to the driver code)
> +
> + writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
> +
> + /* Make sure IRQ mask has been written before resetting */
> + wmb();
> +
> + writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
> +}
> +
> +static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
> +{
> + u32 val;
> +
> + /*Set Debug Registers*/
> + val = DEBUG_STATUS_CFG_STATUS0(1) |
> + DEBUG_STATUS_CFG_STATUS0(7);
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
> +
> + /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
> + writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
> +
> + /* no clock gating at bus input */
> + val = WM_CGC_OVERRIDE_ALL;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
> +
> + writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
> +
> + /* if addr_no_sync has default value then config the addr no sync reg */
> + val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
> +
> + writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
> +
> + val = WM_BUFFER_DEFAULT_WIDTH;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
> +
> + val = 0;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
> +
> + val = 0;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
> +
> + /* Configure stride for RDIs */
> + //val = pix->plane_fmt[0].bytesperline;
> + val = WM_STRIDE_DEFAULT_STRIDE;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
> +
> + /* Enable WM */
> + val = 1 << WM_CFG_EN |
> + MODE_MIPI_RAW << WM_CFG_MODE;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
> +}
> +
> +static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
> +{
> + /* Disable WM */
> + writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
> +}
> +
> +static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
> + struct vfe_line *line)
> +{
> + struct v4l2_pix_format_mplane *pix =
> + &line->video_out.active_fmt.fmt.pix_mp;
> + u32 stride = pix->plane_fmt[0].bytesperline;
> +
> + writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
> + writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
> +}
> +
> +static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
> +{
> + vfe->reg_update |= REG_UPDATE_RDI(line_id);
> +
> + /* Enforce ordering between previous reg writes and reg update */
> + wmb();
> +
> + writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
> +
> + /* Enforce ordering between reg update and subsequent reg writes */
> + wmb();
> +}
> +
> +static inline void vfe_reg_update_clear(struct vfe_device *vfe,
> + enum vfe_line_id line_id)
> +{
> + vfe->reg_update &= ~REG_UPDATE_RDI(line_id);
> +}
> +
> +static void vfe_enable_irq_common(struct vfe_device *vfe)
> +{
> + vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
> + vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
> +
> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));
Looking at the #defines in the beginning of this file, only part
of the IRQ sources (not the whole 32 per each register) are used
or defined.
Is it safe to unmask the unused (reserved?) bits in the above 5
IRQ mask registers?
> +}
> +
> +static void vfe_isr_halt_ack(struct vfe_device *vfe)
> +{
> + complete(&vfe->halt_complete);
> +}
> +
> +static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
> +{
> + *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
> + *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
> +
> + writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
> + writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
> +
> + /* Enforce ordering between IRQ Clear and Global IRQ Clear */
> + wmb();
> + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
> +}
> +
> +static void vfe_violation_read(struct vfe_device *vfe)
> +{
> + u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
> +
> + pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
> +}
> +
> +/*
> + * vfe_isr - VFE module interrupt handler
> + * @irq: Interrupt line
> + * @dev: VFE device
> + *
> + * Return IRQ_HANDLED on success
> + */
> +static irqreturn_t vfe_isr(int irq, void *dev)
> +{
> + struct vfe_device *vfe = dev;
> + u32 status0, status1, vfe_bus_status[3];
> + int i, wm;
> +
> + status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
> + status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
> +
> + writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
> + writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
> +
> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
> + vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
> + writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
> + }
> +
> + /* Enforce ordering between IRQ reading and interpretation */
> + wmb();
> +
> + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
> + writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
> +
> + if (status0 & STATUS_0_RESET_ACK)
> + vfe->isr_ops.reset_ack(vfe);
> +
> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
> + if (status0 & STATUS_0_RDI_REG_UPDATE(i))
> + vfe->isr_ops.reg_update(vfe, i);
> +
> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
> + if (status0 & STATUS_1_RDI_SOF(i))
> + vfe->isr_ops.sof(vfe, i);
> +
> + for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
> + if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
> + vfe->isr_ops.comp_done(vfe, i);
> +
> + for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
> + if (status0 & BIT(9))
> + if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
> + vfe->isr_ops.wm_done(vfe, wm);
> +
> + return IRQ_HANDLED;
> +}
> +
> +/*
> + * vfe_halt - Trigger halt on VFE module and wait to complete
> + * @vfe: VFE device
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +static int vfe_halt(struct vfe_device *vfe)
> +{
> + unsigned long time;
> +
> + return 0;
> +
> + reinit_completion(&vfe->halt_complete);
> +
> + time = wait_for_completion_timeout(&vfe->halt_complete,
> + msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
> + if (!time) {
> + dev_err(vfe->camss->dev, "VFE halt timeout\n");
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static int vfe_get_output(struct vfe_line *line)
> +{
> + struct vfe_device *vfe = to_vfe(line);
> + struct vfe_output *output;
> + unsigned long flags;
> + int i;
> + int wm_idx;
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> +
> + output = &line->output;
> + if (output->state != VFE_OUTPUT_OFF) {
> + dev_err(vfe->camss->dev, "Output is running\n");
> + goto error;
> + }
> +
> + output->wm_num = 1;
> +
> + for (i = 0; i < output->wm_num; i++) {
- this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...
> + wm_idx = vfe_reserve_wm(vfe, line->id);
> + if (wm_idx < 0) {
> + dev_err(vfe->camss->dev, "Can not reserve wm\n");
> + goto error_get_wm;
> + }
> + output->wm_idx[i] = wm_idx;
> + }
> +
> + output->drop_update_idx = 0;
> +
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + return 0;
> +
> +error_get_wm:
> + for (i--; i >= 0; i--)
- ... and this one too. And the "i" local var is no longer needed.
Thanks,
Andrey
> + vfe_release_wm(vfe, output->wm_idx[i]);
> + output->state = VFE_OUTPUT_OFF;
> +error:
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + return -EINVAL;
> +}
> +
> +static int vfe_enable_output(struct vfe_line *line)
> +{
> + struct vfe_device *vfe = to_vfe(line);
> + struct vfe_output *output = &line->output;
> + const struct vfe_hw_ops *ops = vfe->ops;
> + struct media_entity *sensor;
> + unsigned long flags;
> + unsigned int frame_skip = 0;
> + unsigned int i;
> +
> + sensor = camss_find_sensor(&line->subdev.entity);
> + if (sensor) {
> + struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
> +
> + v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
> + /* Max frame skip is 29 frames */
> + if (frame_skip > VFE_FRAME_DROP_VAL - 1)
> + frame_skip = VFE_FRAME_DROP_VAL - 1;
> + }
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> +
> + ops->reg_update_clear(vfe, line->id);
> +
> + if (output->state != VFE_OUTPUT_OFF) {
> + dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
> + output->state);
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> + return -EINVAL;
> + }
> +
> + WARN_ON(output->gen2.active_num);
> +
> + output->state = VFE_OUTPUT_ON;
> +
> + output->sequence = 0;
> + output->wait_reg_update = 0;
> + reinit_completion(&output->reg_update);
> +
> + vfe_wm_start(vfe, output->wm_idx[0], line);
> +
> + for (i = 0; i < 2; i++) {
> + output->buf[i] = vfe_buf_get_pending(output);
> + if (!output->buf[i])
> + break;
> + output->gen2.active_num++;
> + vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
> + }
> +
> + ops->reg_update(vfe, line->id);
> +
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + return 0;
> +}
> +
> +static int vfe_disable_output(struct vfe_line *line)
> +{
> + struct vfe_device *vfe = to_vfe(line);
> + struct vfe_output *output = &line->output;
> + unsigned long flags;
> + unsigned int i;
> + bool done;
> + int timeout = 0;
> +
> + do {
> + spin_lock_irqsave(&vfe->output_lock, flags);
> + done = !output->gen2.active_num;
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> + usleep_range(10000, 20000);
> +
> + if (timeout++ == 100) {
> + dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
> + vfe_reset(vfe);
> + output->gen2.active_num = 0;
> + return 0;
> + }
> + } while (!done);
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> + for (i = 0; i < output->wm_num; i++)
> + vfe_wm_stop(vfe, output->wm_idx[i]);
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + return 0;
> +}
> +
> +/*
> + * vfe_enable - Enable streaming on VFE line
> + * @line: VFE line
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +static int vfe_enable(struct vfe_line *line)
> +{
> + struct vfe_device *vfe = to_vfe(line);
> + int ret;
> +
> + mutex_lock(&vfe->stream_lock);
> +
> + if (!vfe->stream_count)
> + vfe_enable_irq_common(vfe);
> +
> + vfe->stream_count++;
> +
> + mutex_unlock(&vfe->stream_lock);
> +
> + ret = vfe_get_output(line);
> + if (ret < 0)
> + goto error_get_output;
> +
> + ret = vfe_enable_output(line);
> + if (ret < 0)
> + goto error_enable_output;
> +
> + vfe->was_streaming = 1;
> +
> + return 0;
> +
> +
> +error_enable_output:
> + vfe_put_output(line);
> +
> +error_get_output:
> + mutex_lock(&vfe->stream_lock);
> +
> + vfe->stream_count--;
> +
> + mutex_unlock(&vfe->stream_lock);
> +
> + return ret;
> +}
> +
> +/*
> + * vfe_disable - Disable streaming on VFE line
> + * @line: VFE line
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +static int vfe_disable(struct vfe_line *line)
> +{
> + struct vfe_device *vfe = to_vfe(line);
> +
> + vfe_disable_output(line);
> +
> + vfe_put_output(line);
> +
> + mutex_lock(&vfe->stream_lock);
> +
> + vfe->stream_count--;
> +
> + mutex_unlock(&vfe->stream_lock);
> +
> + return 0;
> +}
> +
> +/*
> + * vfe_isr_sof - Process start of frame interrupt
> + * @vfe: VFE Device
> + * @line_id: VFE line
> + */
> +static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
> +{
> +
> +}
> +
> +/*
> + * vfe_isr_reg_update - Process reg update interrupt
> + * @vfe: VFE Device
> + * @line_id: VFE line
> + */
> +static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
> +{
> + struct vfe_output *output;
> + unsigned long flags;
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> + vfe->ops->reg_update_clear(vfe, line_id);
> +
> + output = &vfe->line[line_id].output;
> +
> + if (output->wait_reg_update) {
> + output->wait_reg_update = 0;
> + complete(&output->reg_update);
> + }
> +
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +}
> +
> +/*
> + * vfe_isr_wm_done - Process write master done interrupt
> + * @vfe: VFE Device
> + * @wm: Write master id
> + */
> +static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
> +{
> + struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
> + struct camss_buffer *ready_buf;
> + struct vfe_output *output;
> + unsigned long flags;
> + u32 index;
> + u64 ts = ktime_get_ns();
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> +
> + if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
> + dev_err_ratelimited(vfe->camss->dev,
> + "Received wm done for unmapped index\n");
> + goto out_unlock;
> + }
> + output = &vfe->line[vfe->wm_output_map[wm]].output;
> +
> + ready_buf = output->buf[0];
> + if (!ready_buf) {
> + dev_err_ratelimited(vfe->camss->dev,
> + "Missing ready buf %d!\n", output->state);
> + goto out_unlock;
> + }
> +
> + ready_buf->vb.vb2_buf.timestamp = ts;
> + ready_buf->vb.sequence = output->sequence++;
> +
> + index = 0;
> + output->buf[0] = output->buf[1];
> + if (output->buf[0])
> + index = 1;
> +
> + output->buf[index] = vfe_buf_get_pending(output);
> +
> + if (output->buf[index])
> + vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
> + else
> + output->gen2.active_num--;
> +
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> +
> + return;
> +
> +out_unlock:
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +}
> +
> +/*
> + * vfe_queue_buffer - Add empty buffer
> + * @vid: Video device structure
> + * @buf: Buffer to be enqueued
> + *
> + * Add an empty buffer - depending on the current number of buffers it will be
> + * put in pending buffer queue or directly given to the hardware to be filled.
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +static int vfe_queue_buffer(struct camss_video *vid,
> + struct camss_buffer *buf)
> +{
> + struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
> + struct vfe_device *vfe = to_vfe(line);
> + struct vfe_output *output;
> + unsigned long flags;
> +
> + output = &line->output;
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> +
> + if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
> + output->buf[output->gen2.active_num++] = buf;
> + vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
> + } else {
> + vfe_buf_add_pending(output, buf);
> + }
> +
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + return 0;
> +}
> +
> +const struct vfe_isr_ops vfe_isr_ops_170 = {
> + .reset_ack = vfe_isr_reset_ack,
> + .halt_ack = vfe_isr_halt_ack,
> + .reg_update = vfe_isr_reg_update,
> + .sof = vfe_isr_sof,
> + .comp_done = vfe_isr_comp_done,
> + .wm_done = vfe_isr_wm_done,
> +};
> +
> +static const struct camss_video_ops vfe_video_ops_170 = {
> + .queue_buffer = vfe_queue_buffer,
> + .flush_buffers = vfe_flush_buffers,
> +};
> +
> +static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
> +{
> + vfe->isr_ops = vfe_isr_ops_170;
> + vfe->video_ops = vfe_video_ops_170;
> +
> + vfe->line_num = VFE_LINE_NUM_GEN2;
> +}
> +
> +const struct vfe_hw_ops vfe_ops_170 = {
> + .global_reset = vfe_global_reset,
> + .hw_version_read = vfe_hw_version_read,
> + .isr_read = vfe_isr_read,
> + .isr = vfe_isr,
> + .reg_update_clear = vfe_reg_update_clear,
> + .reg_update = vfe_reg_update,
> + .subdev_init = vfe_subdev_init,
> + .vfe_disable = vfe_disable,
> + .vfe_enable = vfe_enable,
> + .vfe_halt = vfe_halt,
> + .violation_read = vfe_violation_read,
> +};
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
> index 375843bd16af..6fafeb8a5484 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> @@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
> { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
> };
>
> +static const struct vfe_format formats_rdi_845[] = {
> + { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
> + { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
> + { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
> + { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
> + { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
> + { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
> + { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
> + { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
> + { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
> + { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
> + { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
> + { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
> + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
> + { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
> + { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
> + { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
> + { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
> + { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
> + { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
> + { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
> + { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
> + { MEDIA_BUS_FMT_Y10_1X10, 10 },
> + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
> +};
> +
> /*
> * vfe_get_bpp - map media bus format to bits per pixel
> * @formats: supported media bus formats array
> @@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
> return sink_code;
> }
> else if (vfe->camss->version == CAMSS_8x96 ||
> - vfe->camss->version == CAMSS_660)
> + vfe->camss->version == CAMSS_660 ||
> + vfe->camss->version == CAMSS_845)
> switch (sink_code) {
> case MEDIA_BUS_FMT_YUYV8_2X8:
> {
> @@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
> return 0;
> }
>
> -/*
> - * vfe_reset - Trigger reset on VFE module and wait to complete
> - * @vfe: VFE device
> - *
> - * Return 0 on success or a negative error code otherwise
> - */
> -static int vfe_reset(struct vfe_device *vfe)
> +int vfe_reset(struct vfe_device *vfe)
> {
> unsigned long time;
>
> @@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
> struct camss_clock *clock = &vfe->clock[i];
>
> if (!strcmp(clock->name, "vfe0") ||
> - !strcmp(clock->name, "vfe1")) {
> + !strcmp(clock->name, "vfe1") ||
> + !strcmp(clock->name, "vfe_lite")) {
> u64 min_rate = 0;
> long rate;
>
> @@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> case CAMSS_660:
> vfe->ops = &vfe_ops_4_8;
> break;
> +
> + case CAMSS_845:
> + vfe->ops = &vfe_ops_170;
> + break;
> default:
> return -EINVAL;
> }
> @@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> l->formats = formats_rdi_8x96;
> l->nformats = ARRAY_SIZE(formats_rdi_8x96);
> }
> + } else if (camss->version == CAMSS_845) {
> + l->formats = formats_rdi_845;
> + l->nformats = ARRAY_SIZE(formats_rdi_845);
> } else {
> return -EINVAL;
> }
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
> index aad5dc74c2c0..29b3d930ffc6 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.h
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.h
> @@ -19,7 +19,6 @@
> #include "camss-video.h"
> #include "camss-vfe-gen1.h"
>
> -
> #define MSM_VFE_PAD_SINK 0
> #define MSM_VFE_PAD_SRC 1
> #define MSM_VFE_PADS_NUM 2
> @@ -38,14 +37,14 @@
> #define to_vfe(ptr_line) \
> container_of(vfe_line_array(ptr_line), struct vfe_device, line)
>
> -
> enum vfe_output_state {
> VFE_OUTPUT_OFF,
> VFE_OUTPUT_RESERVED,
> VFE_OUTPUT_SINGLE,
> VFE_OUTPUT_CONTINUOUS,
> VFE_OUTPUT_IDLE,
> - VFE_OUTPUT_STOPPING
> + VFE_OUTPUT_STOPPING,
> + VFE_OUTPUT_ON,
> };
>
> enum vfe_line_id {
> @@ -53,6 +52,7 @@ enum vfe_line_id {
> VFE_LINE_RDI0 = 0,
> VFE_LINE_RDI1 = 1,
> VFE_LINE_RDI2 = 2,
> + VFE_LINE_NUM_GEN2 = 3,
> VFE_LINE_PIX = 3,
> VFE_LINE_NUM_GEN1 = 4,
> VFE_LINE_NUM_MAX = 4
> @@ -73,6 +73,9 @@ struct vfe_output {
> int active_buf;
> int wait_sof;
> } gen1;
> + struct {
> + int active_num;
> + } gen2;
> };
> enum vfe_output_state state;
> unsigned int sequence;
> @@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
>
> struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
>
> -/*
> - * vfe_disable - Disable streaming on VFE line
> - * @line: VFE line
> - *
> - * Return 0 on success or a negative error code otherwise
> - */
> -int vfe_disable(struct vfe_line *line);
> -
> int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
>
> /*
> @@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
> int vfe_release_wm(struct vfe_device *vfe, u8 wm);
> int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
>
> +/*
> + * vfe_reset - Trigger reset on VFE module and wait to complete
> + * @vfe: VFE device
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +int vfe_reset(struct vfe_device *vfe);
> +
> extern const struct vfe_hw_ops vfe_ops_4_1;
> extern const struct vfe_hw_ops vfe_ops_4_7;
> extern const struct vfe_hw_ops vfe_ops_4_8;
> +extern const struct vfe_hw_ops vfe_ops_170;
>
> #endif /* QC_MSM_CAMSS_VFE_H */
> diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
> index 97cea7c4d769..f282275af626 100644
> --- a/drivers/media/platform/qcom/camss/camss-video.c
> +++ b/drivers/media/platform/qcom/camss/camss-video.c
> @@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
> { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> };
>
> +static const struct camss_format_info formats_rdi_845[] = {
> + { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> + { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> + { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> + { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> + { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> + { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> + { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> + { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> + { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> + { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> + { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> + { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> + { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> + { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> + { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> + { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> + { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> + { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> + { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> + { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> + { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> +};
> +
> static const struct camss_format_info formats_pix_8x16[] = {
> { MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
> { { 1, 1 } }, { { 2, 3 } }, { 8 } },
> @@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
> video->formats = formats_rdi_8x96;
> video->nformats = ARRAY_SIZE(formats_rdi_8x96);
> }
> + } else if (video->camss->version == CAMSS_845) {
> + video->formats = formats_rdi_845;
> + video->nformats = ARRAY_SIZE(formats_rdi_845);
> } else {
> ret = -EINVAL;
> goto error_video_register;
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 6c6f1e59ccd8..0e006def1996 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
> }
> };
>
> +static const struct resources vfe_res_845[] = {
> + /* VFE0 */
> + {
> + .regulator = { NULL },
> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> + "soc_ahb", "vfe0", "vfe0_axi",
> + "vfe0_src", "csi0",
> + "csi0_src"},
> + .clock_rate = { { 0 },
> + { 0 },
> + { 80000000 },
> + { 0 },
> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> + { 0 },
> + { 320000000 },
> + { 19200000, 75000000, 384000000, 538666667 },
> + { 384000000 } },
> + .reg = { "vfe0" },
> + .interrupt = { "vfe0" }
> + },
> +
> + /* VFE1 */
> + {
> + .regulator = { NULL },
> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> + "soc_ahb", "vfe1", "vfe1_axi",
> + "vfe1_src", "csi1",
> + "csi1_src"},
> + .clock_rate = { { 0 },
> + { 0 },
> + { 80000000 },
> + { 0 },
> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> + { 0 },
> + { 320000000 },
> + { 19200000, 75000000, 384000000, 538666667 },
> + { 384000000 } },
> + .reg = { "vfe1" },
> + .interrupt = { "vfe1" }
> + },
> +
> + /* VFE-lite */
> + {
> + .regulator = { NULL },
> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> + "soc_ahb", "vfe_lite",
> + "vfe_lite_src", "csi2",
> + "csi2_src"},
> + .clock_rate = { { 0 },
> + { 0 },
> + { 80000000 },
> + { 0 },
> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> + { 320000000 },
> + { 19200000, 75000000, 384000000, 538666667 },
> + { 384000000 } },
> + .reg = { "vfe_lite" },
> + .interrupt = { "vfe_lite" }
> + }
> +};
> +
> /*
> * camss_add_clock_margin - Add margin to clock frequency rate
> * @rate: Clock frequency rate
>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170
2021-02-20 21:40 ` Andrey Konovalov
@ 2021-02-22 16:37 ` Robert Foss
2021-02-22 17:06 ` Andrey Konovalov
0 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-22 16:37 UTC (permalink / raw)
To: Andrey Konovalov
Cc: Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab,
Rob Herring, angelogioacchino.delregno, MSM, linux-media,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, AngeloGioacchino Del Regno, Sakari Ailus,
Nicolas Boichat, Rob Herring, Tomasz Figa,
Azam Sadiq Pasha Kapatrala Syed, Sarvesh Sridutt,
Laurent Pinchart, Jonathan Marek
On Sat, 20 Feb 2021 at 22:40, Andrey Konovalov
<andrey.konovalov@linaro.org> wrote:
>
> Hi Robert,
>
> Thank you for your patch!
>
> On 17.02.2021 14:21, Robert Foss wrote:
> > Add register definitions for version 170 of the Titan architecture
> > and implement support for the RDI output mode.
> >
> > The RDI mode as opposed to the PIX output mode for the VFE unit does
> > not support any ISP functionality. This means essentially only
> > supporting dumping the output of the whatever the CSI decoder receives
> > from the sensor.
> >
> > For example will a sensor outputting YUV pixel format frames, only
> > allow the VFE to dump those frames as they are received by the ISP
> > to memory through the RDI interface.
> >
> > Signed-off-by: Robert Foss <robert.foss@linaro.org>
> > ---
> >
> >
> > Changes since v1:
> > - Andrey: Remove commented out chunk
> > - Remove left over WIP comments
> >
> > Changes since v4:
> > - Andrey: Remove traces of PIX support
> > - Andrey: Fix vfe_global_reset() overwriting reset command
> > - Remove unused variable
> >
> >
> >
> > drivers/media/platform/qcom/camss/Makefile | 1 +
> > .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
> > drivers/media/platform/qcom/camss/camss-vfe.c | 47 +-
> > drivers/media/platform/qcom/camss/camss-vfe.h | 26 +-
> > .../media/platform/qcom/camss/camss-video.c | 52 ++
> > drivers/media/platform/qcom/camss/camss.c | 61 ++
> > 6 files changed, 957 insertions(+), 20 deletions(-)
> > create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c
> >
> > diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
> > index 940c0ae3e003..052c4f405fa3 100644
> > --- a/drivers/media/platform/qcom/camss/Makefile
> > +++ b/drivers/media/platform/qcom/camss/Makefile
> > @@ -11,6 +11,7 @@ qcom-camss-objs += \
> > camss-vfe-4-1.o \
> > camss-vfe-4-7.o \
> > camss-vfe-4-8.o \
> > + camss-vfe-170.o \
> > camss-vfe-gen1.o \
> > camss-vfe.o \
> > camss-video.o \
> > diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> > new file mode 100644
> > index 000000000000..c4991b1f22f8
> > --- /dev/null
> > +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> > @@ -0,0 +1,790 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * camss-vfe-4-7.c
> > + *
> > + * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
> > + *
> > + * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
> > + * Copyright (C) 2015-2018 Linaro Ltd.
>
> - it looks like the header comes from v4.7 without updating to Titan 170
Gotcha, thanks!
>
> > + */
> > +
> > +#include <linux/delay.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/io.h>
> > +#include <linux/iopoll.h>
> > +
> > +#include "camss.h"
> > +#include "camss-vfe.h"
> > +
> > +#define VFE_HW_VERSION (0x000)
> > +
> > +#define VFE_GLOBAL_RESET_CMD (0x018)
> > +#define GLOBAL_RESET_CMD_CORE BIT(0)
> > +#define GLOBAL_RESET_CMD_CAMIF BIT(1)
> > +#define GLOBAL_RESET_CMD_BUS BIT(2)
> > +#define GLOBAL_RESET_CMD_BUS_BDG BIT(3)
> > +#define GLOBAL_RESET_CMD_REGISTER BIT(4)
> > +#define GLOBAL_RESET_CMD_PM BIT(5)
> > +#define GLOBAL_RESET_CMD_BUS_MISR BIT(6)
> > +#define GLOBAL_RESET_CMD_TESTGEN BIT(7)
> > +#define GLOBAL_RESET_CMD_DSP BIT(8)
> > +#define GLOBAL_RESET_CMD_IDLE_CGC BIT(9)
> > +#define GLOBAL_RESET_CMD_RDI0 BIT(10)
> > +#define GLOBAL_RESET_CMD_RDI1 BIT(11)
> > +#define GLOBAL_RESET_CMD_RDI2 BIT(12)
> > +#define GLOBAL_RESET_CMD_RDI3 BIT(13)
> > +#define GLOBAL_RESET_CMD_VFE_DOMAIN BIT(30)
> > +#define GLOBAL_RESET_CMD_RESET_BYPASS BIT(31)
> > +
> > +
> > +#define VFE_CORE_CFG (0x050)
> > +#define CFG_PIXEL_PATTERN_YCBYCR (0x4)
> > +#define CFG_PIXEL_PATTERN_YCRYCB (0x5)
> > +#define CFG_PIXEL_PATTERN_CBYCRY (0x6)
> > +#define CFG_PIXEL_PATTERN_CRYCBY (0x7)
> > +#define CFG_COMPOSITE_REG_UPDATE_EN BIT(4)
> > +
> > +#define VFE_IRQ_CMD (0x058)
> > +#define CMD_GLOBAL_CLEAR BIT(0)
> > +
> > +#define VFE_IRQ_MASK_0 (0x05c)
> > +#define MASK_0_CAMIF_SOF BIT(0)
> > +#define MASK_0_CAMIF_EOF BIT(1)
> > +#define MASK_0_RDI_REG_UPDATE(n) BIT((n) + 5)
> > +#define MASK_0_IMAGE_MASTER_n_PING_PONG(n) BIT((n) + 8)
> > +#define MASK_0_IMAGE_COMPOSITE_DONE_n(n) BIT((n) + 25)
> > +#define MASK_0_RESET_ACK BIT(31)
> > +
> > +#define VFE_IRQ_MASK_1 (0x060)
> > +#define MASK_1_CAMIF_ERROR BIT(0)
> > +#define MASK_1_VIOLATION BIT(7)
> > +#define MASK_1_BUS_BDG_HALT_ACK BIT(8)
> > +#define MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n) BIT((n) + 9)
> > +#define MASK_1_RDI_SOF(n) BIT((n) + 29)
> > +
> > +#define VFE_IRQ_CLEAR_0 (0x064)
> > +#define VFE_IRQ_CLEAR_1 (0x068)
> > +
> > +#define VFE_IRQ_STATUS_0 (0x06c)
> > +#define STATUS_0_CAMIF_SOF BIT(0)
> > +#define STATUS_0_RDI_REG_UPDATE(n) BIT((n) + 5)
> > +#define STATUS_0_IMAGE_MASTER_PING_PONG(n) BIT((n) + 8)
> > +#define STATUS_0_IMAGE_COMPOSITE_DONE(n) BIT((n) + 25)
> > +#define STATUS_0_RESET_ACK BIT(31)
> > +
> > +#define VFE_IRQ_STATUS_1 (0x070)
> > +#define STATUS_1_VIOLATION BIT(7)
> > +#define STATUS_1_BUS_BDG_HALT_ACK BIT(8)
> > +#define STATUS_1_RDI_SOF(n) BIT((n) + 27)
> > +
> > +#define VFE_VIOLATION_STATUS (0x07c)
> > +
> > +#define VFE_CAMIF_CMD (0x478)
> > +#define CMD_CLEAR_CAMIF_STATUS BIT(2)
> > +
> > +#define VFE_CAMIF_CFG (0x47c)
> > +#define CFG_VSYNC_SYNC_EDGE (0)
> > +#define VSYNC_ACTIVE_HIGH (0)
> > +#define VSYNC_ACTIVE_LOW (1)
> > +#define CFG_HSYNC_SYNC_EDGE (1)
> > +#define HSYNC_ACTIVE_HIGH (0)
> > +#define HSYNC_ACTIVE_LOW (1)
> > +#define CFG_VFE_SUBSAMPLE_ENABLE BIT(4)
> > +#define CFG_BUS_SUBSAMPLE_ENABLE BIT(5)
> > +#define CFG_VFE_OUTPUT_EN BIT(6)
> > +#define CFG_BUS_OUTPUT_EN BIT(7)
> > +#define CFG_BINNING_EN BIT(9)
> > +#define CFG_FRAME_BASED_EN BIT(10)
> > +#define CFG_RAW_CROP_EN BIT(22)
> > +
> > +// XXX different, don't exist in TITAN register docs
> > +#define VFE_0_CAMIF_FRAME_CFG 0x484
> > +#define VFE_0_CAMIF_WINDOW_WIDTH_CFG 0x488
> > +#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG 0x48c
> > +#define VFE_0_CAMIF_SUBSAMPLE_CFG 0x490
> > +#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN 0x498
> > +#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN 0x49c
> > +#define VFE_0_CAMIF_STATUS 0x4a4
> > +#define VFE_0_CAMIF_STATUS_HALT BIT(31)
> > +#define CAMIF_TIMEOUT_SLEEP_US 1000
> > +#define CAMIF_TIMEOUT_ALL_US 1000000
> > +
> > +#define VFE_REG_UPDATE_CMD (0x4ac)
> > +#define REG_UPDATE_RDI(n) BIT(1 + (n))
> > +
> > +
> > +#define VFE_BUS_IRQ_MASK(n) (0x2044 + (n) * 4)
> > +#define VFE_BUS_IRQ_CLEAR(n) (0x2050 + (n) * 4)
> > +
> > +#define VFE_BUS_IRQ_STATUS(n) (0x205c + (n) * 4)
> > +#define STATUS0_COMP_RESET_DONE BIT(0)
> > +#define STATUS0_COMP_REG_UPDATE0_DONE BIT(1)
> > +#define STATUS0_COMP_REG_UPDATE1_DONE BIT(2)
> > +#define STATUS0_COMP_REG_UPDATE2_DONE BIT(3)
> > +#define STATUS0_COMP_REG_UPDATE3_DONE BIT(4)
> > +#define STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
> > +#define STATUS0_COMP0_BUF_DONE BIT(5)
> > +#define STATUS0_COMP1_BUF_DONE BIT(6)
> > +#define STATUS0_COMP2_BUF_DONE BIT(7)
> > +#define STATUS0_COMP3_BUF_DONE BIT(8)
> > +#define STATUS0_COMP4_BUF_DONE BIT(9)
> > +#define STATUS0_COMP5_BUF_DONE BIT(10)
> > +#define STATUS0_COMP_BUF_DONE(n) BIT(n + 5)
> > +#define STATUS0_COMP_ERROR BIT(11)
> > +#define STATUS0_COMP_OVERWRITE BIT(12)
> > +#define STATUS0_OVERFLOW BIT(13)
> > +#define STATUS0_VIOLATION BIT(14)
> > +/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
> > +#define STATUS1_WM_CLIENT_BUF_DONE(n) BIT(n)
> > +#define STATUS1_EARLY_DONE BIT(24)
> > +#define STATUS2_DUAL_COMP0_BUF_DONE BIT(0)
> > +#define STATUS2_DUAL_COMP1_BUF_DONE BIT(1)
> > +#define STATUS2_DUAL_COMP2_BUF_DONE BIT(2)
> > +#define STATUS2_DUAL_COMP3_BUF_DONE BIT(3)
> > +#define STATUS2_DUAL_COMP4_BUF_DONE BIT(4)
> > +#define STATUS2_DUAL_COMP5_BUF_DONE BIT(5)
> > +#define STATUS2_DUAL_COMP_BUF_DONE(n) BIT(n)
> > +#define STATUS2_DUAL_COMP_ERROR BIT(6)
> > +#define STATUS2_DUAL_COMP_OVERWRITE BIT(7)
> > +
> > +#define VFE_BUS_IRQ_CLEAR_GLOBAL (0x2068)
> > +
> > +#define VFE_BUS_WM_DEBUG_STATUS_CFG (0x226c)
> > +#define DEBUG_STATUS_CFG_STATUS0(n) BIT(n)
> > +#define DEBUG_STATUS_CFG_STATUS1(n) BIT(8+n)
> > +
> > +#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER (0x2080)
> > +
> > +#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC (0x2084)
> > +#define BUS_VER2_MAX_CLIENTS (24)
> > +#define WM_ADDR_NO_SYNC_DEFAULT_VAL \
> > + ((1 << BUS_VER2_MAX_CLIENTS) - 1)
> > +
> > +#define VFE_BUS_WM_CGC_OVERRIDE (0x200c)
> > +#define WM_CGC_OVERRIDE_ALL (0xFFFFF)
> > +
> > +#define VFE_BUS_WM_TEST_BUS_CTRL (0x211c)
> > +
> > +#define VFE_BUS_WM_STATUS0(n) (0x2200 + (n) * 0x100)
> > +#define VFE_BUS_WM_STATUS1(n) (0x2204 + (n) * 0x100)
> > +#define VFE_BUS_WM_CFG(n) (0x2208 + (n) * 0x100)
> > +#define WM_CFG_EN (0)
> > +#define WM_CFG_MODE (1)
> > +#define MODE_QCOM_PLAIN (0)
> > +#define MODE_MIPI_RAW (1)
> > +#define WM_CFG_VIRTUALFRAME (2)
> > +#define VFE_BUS_WM_HEADER_ADDR(n) (0x220c + (n) * 0x100)
> > +#define VFE_BUS_WM_HEADER_CFG(n) (0x2210 + (n) * 0x100)
> > +#define VFE_BUS_WM_IMAGE_ADDR(n) (0x2214 + (n) * 0x100)
> > +#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n) (0x2218 + (n) * 0x100)
> > +#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n) (0x221c + (n) * 0x100)
> > +#define WM_BUFFER_DEFAULT_WIDTH (0xFF01)
> > +
> > +#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n) (0x2220 + (n) * 0x100)
> > +#define VFE_BUS_WM_PACKER_CFG(n) (0x2224 + (n) * 0x100)
> > +
> > +#define VFE_BUS_WM_STRIDE(n) (0x2228 + (n) * 0x100)
> > +#define WM_STRIDE_DEFAULT_STRIDE (0xFF01)
> > +
> > +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n) (0x2248 + (n) * 0x100)
> > +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n) (0x224c + (n) * 0x100)
> > +#define VFE_BUS_WM_FRAMEDROP_PERIOD(n) (0x2250 + (n) * 0x100)
> > +#define VFE_BUS_WM_FRAMEDROP_PATTERN(n) (0x2254 + (n) * 0x100)
> > +#define VFE_BUS_WM_FRAME_INC(n) (0x2258 + (n) * 0x100)
> > +#define VFE_BUS_WM_BURST_LIMIT(n) (0x225c + (n) * 0x100)
> > +
> > +
> > +static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
> > +{
> > + u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
> > +
> > + u32 gen = (hw_version >> 28) & 0xF;
> > + u32 rev = (hw_version >> 16) & 0xFFF;
> > + u32 step = hw_version & 0xFFFF;
> > +
> > + dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
> > +}
> > +
> > +static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
> > +{
> > + u32 bits = readl_relaxed(vfe->base + reg);
> > +
> > + writel_relaxed(bits & ~clr_bits, vfe->base + reg);
> > +}
> > +
> > +static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
> > +{
> > + u32 bits = readl_relaxed(vfe->base + reg);
> > +
> > + writel_relaxed(bits | set_bits, vfe->base + reg);
> > +}
> > +
> > +static void vfe_global_reset(struct vfe_device *vfe)
> > +{
> > + u32 reset_bits = GLOBAL_RESET_CMD_CORE |
> > + GLOBAL_RESET_CMD_CAMIF |
> > + GLOBAL_RESET_CMD_BUS |
> > + GLOBAL_RESET_CMD_REGISTER |
> > + GLOBAL_RESET_CMD_PM |
> > + GLOBAL_RESET_CMD_BUS_MISR |
> > + GLOBAL_RESET_CMD_IDLE_CGC |
> > + GLOBAL_RESET_CMD_RDI0 |
> > + GLOBAL_RESET_CMD_RDI1 |
> > + GLOBAL_RESET_CMD_RDI2;
>
> - so the reset_bits is set to 0x00001E77 in v5.
>
> In v4 the reset_bits was set to 0x00003F9F which corresponds to:
>
> GLOBAL_RESET_CMD_CORE |
> GLOBAL_RESET_CMD_CAMIF |
> GLOBAL_RESET_CMD_BUS |
> GLOBAL_RESET_CMD_BUS_BDG |
> GLOBAL_RESET_CMD_REGISTER |
> GLOBAL_RESET_CMD_TESTGEN |
> GLOBAL_RESET_CMD_DSP |
> GLOBAL_RESET_CMD_IDLE_CGC |
> GLOBAL_RESET_CMD_RDI0 |
> GLOBAL_RESET_CMD_RDI1 |
> GLOBAL_RESET_CMD_RDI2 |
> GLOBAL_RESET_CMD_RDI3;
>
> So the difference between v4 and v5 is:
>
> reset in v4, not reset in v5:
> GLOBAL_RESET_CMD_BUS_BDG
> GLOBAL_RESET_CMD_TESTGEN
> GLOBAL_RESET_CMD_DSP
>
> reset in v5, not reset in v4:
> GLOBAL_RESET_CMD_PM
> GLOBAL_RESET_CMD_BUS_MISR
>
> - correct?
>
> It is probably worth a few words in the v4 vs v5 changelog.
>
> (dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2
> according to the driver code)
>
Great catch! I made a mistake with the bit-ordering after doing a
hex->binary translation.
I'll straighten this out in v6.
> > +
> > + writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
> > +
> > + /* Make sure IRQ mask has been written before resetting */
> > + wmb();
> > +
> > + writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
> > +}
> > +
> > +static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
> > +{
> > + u32 val;
> > +
> > + /*Set Debug Registers*/
> > + val = DEBUG_STATUS_CFG_STATUS0(1) |
> > + DEBUG_STATUS_CFG_STATUS0(7);
> > + writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
> > +
> > + /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
> > + writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
> > +
> > + /* no clock gating at bus input */
> > + val = WM_CGC_OVERRIDE_ALL;
> > + writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
> > +
> > + writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
> > +
> > + /* if addr_no_sync has default value then config the addr no sync reg */
> > + val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
> > + writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
> > +
> > + writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
> > +
> > + val = WM_BUFFER_DEFAULT_WIDTH;
> > + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
> > +
> > + val = 0;
> > + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
> > +
> > + val = 0;
> > + writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
> > +
> > + /* Configure stride for RDIs */
> > + //val = pix->plane_fmt[0].bytesperline;
> > + val = WM_STRIDE_DEFAULT_STRIDE;
> > + writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
> > +
> > + /* Enable WM */
> > + val = 1 << WM_CFG_EN |
> > + MODE_MIPI_RAW << WM_CFG_MODE;
> > + writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
> > +}
> > +
> > +static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
> > +{
> > + /* Disable WM */
> > + writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
> > +}
> > +
> > +static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
> > + struct vfe_line *line)
> > +{
> > + struct v4l2_pix_format_mplane *pix =
> > + &line->video_out.active_fmt.fmt.pix_mp;
> > + u32 stride = pix->plane_fmt[0].bytesperline;
> > +
> > + writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
> > + writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
> > +}
> > +
> > +static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
> > +{
> > + vfe->reg_update |= REG_UPDATE_RDI(line_id);
> > +
> > + /* Enforce ordering between previous reg writes and reg update */
> > + wmb();
> > +
> > + writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
> > +
> > + /* Enforce ordering between reg update and subsequent reg writes */
> > + wmb();
> > +}
> > +
> > +static inline void vfe_reg_update_clear(struct vfe_device *vfe,
> > + enum vfe_line_id line_id)
> > +{
> > + vfe->reg_update &= ~REG_UPDATE_RDI(line_id);
> > +}
> > +
> > +static void vfe_enable_irq_common(struct vfe_device *vfe)
> > +{
> > + vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
> > + vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
> > +
> > + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
> > + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
> > + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));
>
> Looking at the #defines in the beginning of this file, only part
> of the IRQ sources (not the whole 32 per each register) are used
> or defined.
>
> Is it safe to unmask the unused (reserved?) bits in the above 5
> IRQ mask registers?
Unfortunately this register is not defined at all in any documentation
of the downstream[1] kernel, so I think the situation is actually a
bit worse than what you've pointed out here.
I'd like to remove the register defines above since I don't have a
reliable source for them. But I would like to keep the register writes
just as they are since that seems to work.
What are your thoughts?
[1] https://git.linaro.org/people/robert.foss/linux.git/log/?h=msm_sdm845
>
> > +}
> > +
> > +static void vfe_isr_halt_ack(struct vfe_device *vfe)
> > +{
> > + complete(&vfe->halt_complete);
> > +}
> > +
> > +static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
> > +{
> > + *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
> > + *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
> > +
> > + writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
> > + writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
> > +
> > + /* Enforce ordering between IRQ Clear and Global IRQ Clear */
> > + wmb();
> > + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
> > +}
> > +
> > +static void vfe_violation_read(struct vfe_device *vfe)
> > +{
> > + u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
> > +
> > + pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
> > +}
> > +
> > +/*
> > + * vfe_isr - VFE module interrupt handler
> > + * @irq: Interrupt line
> > + * @dev: VFE device
> > + *
> > + * Return IRQ_HANDLED on success
> > + */
> > +static irqreturn_t vfe_isr(int irq, void *dev)
> > +{
> > + struct vfe_device *vfe = dev;
> > + u32 status0, status1, vfe_bus_status[3];
> > + int i, wm;
> > +
> > + status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
> > + status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
> > +
> > + writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
> > + writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
> > +
> > + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
> > + vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
> > + writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
> > + }
> > +
> > + /* Enforce ordering between IRQ reading and interpretation */
> > + wmb();
> > +
> > + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
> > + writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
> > +
> > + if (status0 & STATUS_0_RESET_ACK)
> > + vfe->isr_ops.reset_ack(vfe);
> > +
> > + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
> > + if (status0 & STATUS_0_RDI_REG_UPDATE(i))
> > + vfe->isr_ops.reg_update(vfe, i);
> > +
> > + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
> > + if (status0 & STATUS_1_RDI_SOF(i))
> > + vfe->isr_ops.sof(vfe, i);
> > +
> > + for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
> > + if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
> > + vfe->isr_ops.comp_done(vfe, i);
> > +
> > + for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
> > + if (status0 & BIT(9))
> > + if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
> > + vfe->isr_ops.wm_done(vfe, wm);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > +/*
> > + * vfe_halt - Trigger halt on VFE module and wait to complete
> > + * @vfe: VFE device
> > + *
> > + * Return 0 on success or a negative error code otherwise
> > + */
> > +static int vfe_halt(struct vfe_device *vfe)
> > +{
> > + unsigned long time;
> > +
> > + return 0;
> > +
> > + reinit_completion(&vfe->halt_complete);
> > +
> > + time = wait_for_completion_timeout(&vfe->halt_complete,
> > + msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
> > + if (!time) {
> > + dev_err(vfe->camss->dev, "VFE halt timeout\n");
> > + return -EIO;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int vfe_get_output(struct vfe_line *line)
> > +{
> > + struct vfe_device *vfe = to_vfe(line);
> > + struct vfe_output *output;
> > + unsigned long flags;
> > + int i;
> > + int wm_idx;
> > +
> > + spin_lock_irqsave(&vfe->output_lock, flags);
> > +
> > + output = &line->output;
> > + if (output->state != VFE_OUTPUT_OFF) {
> > + dev_err(vfe->camss->dev, "Output is running\n");
> > + goto error;
> > + }
> > +
> > + output->wm_num = 1;
> > +
> > + for (i = 0; i < output->wm_num; i++) {
>
> - this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...
Ack.
>
> > + wm_idx = vfe_reserve_wm(vfe, line->id);
> > + if (wm_idx < 0) {
> > + dev_err(vfe->camss->dev, "Can not reserve wm\n");
> > + goto error_get_wm;
> > + }
> > + output->wm_idx[i] = wm_idx;
> > + }
> > +
> > + output->drop_update_idx = 0;
> > +
> > + spin_unlock_irqrestore(&vfe->output_lock, flags);
> > +
> > + return 0;
> > +
> > +error_get_wm:
> > + for (i--; i >= 0; i--)
>
> - ... and this one too. And the "i" local var is no longer needed.
Ack
>
> Thanks,
> Andrey
>
> > + vfe_release_wm(vfe, output->wm_idx[i]);
> > + output->state = VFE_OUTPUT_OFF;
> > +error:
> > + spin_unlock_irqrestore(&vfe->output_lock, flags);
> > +
> > + return -EINVAL;
> > +}
> > +
> > +static int vfe_enable_output(struct vfe_line *line)
> > +{
> > + struct vfe_device *vfe = to_vfe(line);
> > + struct vfe_output *output = &line->output;
> > + const struct vfe_hw_ops *ops = vfe->ops;
> > + struct media_entity *sensor;
> > + unsigned long flags;
> > + unsigned int frame_skip = 0;
> > + unsigned int i;
> > +
> > + sensor = camss_find_sensor(&line->subdev.entity);
> > + if (sensor) {
> > + struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
> > +
> > + v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
> > + /* Max frame skip is 29 frames */
> > + if (frame_skip > VFE_FRAME_DROP_VAL - 1)
> > + frame_skip = VFE_FRAME_DROP_VAL - 1;
> > + }
> > +
> > + spin_lock_irqsave(&vfe->output_lock, flags);
> > +
> > + ops->reg_update_clear(vfe, line->id);
> > +
> > + if (output->state != VFE_OUTPUT_OFF) {
> > + dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
> > + output->state);
> > + spin_unlock_irqrestore(&vfe->output_lock, flags);
> > + return -EINVAL;
> > + }
> > +
> > + WARN_ON(output->gen2.active_num);
> > +
> > + output->state = VFE_OUTPUT_ON;
> > +
> > + output->sequence = 0;
> > + output->wait_reg_update = 0;
> > + reinit_completion(&output->reg_update);
> > +
> > + vfe_wm_start(vfe, output->wm_idx[0], line);
> > +
> > + for (i = 0; i < 2; i++) {
> > + output->buf[i] = vfe_buf_get_pending(output);
> > + if (!output->buf[i])
> > + break;
> > + output->gen2.active_num++;
> > + vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
> > + }
> > +
> > + ops->reg_update(vfe, line->id);
> > +
> > + spin_unlock_irqrestore(&vfe->output_lock, flags);
> > +
> > + return 0;
> > +}
> > +
> > +static int vfe_disable_output(struct vfe_line *line)
> > +{
> > + struct vfe_device *vfe = to_vfe(line);
> > + struct vfe_output *output = &line->output;
> > + unsigned long flags;
> > + unsigned int i;
> > + bool done;
> > + int timeout = 0;
> > +
> > + do {
> > + spin_lock_irqsave(&vfe->output_lock, flags);
> > + done = !output->gen2.active_num;
> > + spin_unlock_irqrestore(&vfe->output_lock, flags);
> > + usleep_range(10000, 20000);
> > +
> > + if (timeout++ == 100) {
> > + dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
> > + vfe_reset(vfe);
> > + output->gen2.active_num = 0;
> > + return 0;
> > + }
> > + } while (!done);
> > +
> > + spin_lock_irqsave(&vfe->output_lock, flags);
> > + for (i = 0; i < output->wm_num; i++)
> > + vfe_wm_stop(vfe, output->wm_idx[i]);
> > + spin_unlock_irqrestore(&vfe->output_lock, flags);
> > +
> > + return 0;
> > +}
> > +
> > +/*
> > + * vfe_enable - Enable streaming on VFE line
> > + * @line: VFE line
> > + *
> > + * Return 0 on success or a negative error code otherwise
> > + */
> > +static int vfe_enable(struct vfe_line *line)
> > +{
> > + struct vfe_device *vfe = to_vfe(line);
> > + int ret;
> > +
> > + mutex_lock(&vfe->stream_lock);
> > +
> > + if (!vfe->stream_count)
> > + vfe_enable_irq_common(vfe);
> > +
> > + vfe->stream_count++;
> > +
> > + mutex_unlock(&vfe->stream_lock);
> > +
> > + ret = vfe_get_output(line);
> > + if (ret < 0)
> > + goto error_get_output;
> > +
> > + ret = vfe_enable_output(line);
> > + if (ret < 0)
> > + goto error_enable_output;
> > +
> > + vfe->was_streaming = 1;
> > +
> > + return 0;
> > +
> > +
> > +error_enable_output:
> > + vfe_put_output(line);
> > +
> > +error_get_output:
> > + mutex_lock(&vfe->stream_lock);
> > +
> > + vfe->stream_count--;
> > +
> > + mutex_unlock(&vfe->stream_lock);
> > +
> > + return ret;
> > +}
> > +
> > +/*
> > + * vfe_disable - Disable streaming on VFE line
> > + * @line: VFE line
> > + *
> > + * Return 0 on success or a negative error code otherwise
> > + */
> > +static int vfe_disable(struct vfe_line *line)
> > +{
> > + struct vfe_device *vfe = to_vfe(line);
> > +
> > + vfe_disable_output(line);
> > +
> > + vfe_put_output(line);
> > +
> > + mutex_lock(&vfe->stream_lock);
> > +
> > + vfe->stream_count--;
> > +
> > + mutex_unlock(&vfe->stream_lock);
> > +
> > + return 0;
> > +}
> > +
> > +/*
> > + * vfe_isr_sof - Process start of frame interrupt
> > + * @vfe: VFE Device
> > + * @line_id: VFE line
> > + */
> > +static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
> > +{
> > +
> > +}
> > +
> > +/*
> > + * vfe_isr_reg_update - Process reg update interrupt
> > + * @vfe: VFE Device
> > + * @line_id: VFE line
> > + */
> > +static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
> > +{
> > + struct vfe_output *output;
> > + unsigned long flags;
> > +
> > + spin_lock_irqsave(&vfe->output_lock, flags);
> > + vfe->ops->reg_update_clear(vfe, line_id);
> > +
> > + output = &vfe->line[line_id].output;
> > +
> > + if (output->wait_reg_update) {
> > + output->wait_reg_update = 0;
> > + complete(&output->reg_update);
> > + }
> > +
> > + spin_unlock_irqrestore(&vfe->output_lock, flags);
> > +}
> > +
> > +/*
> > + * vfe_isr_wm_done - Process write master done interrupt
> > + * @vfe: VFE Device
> > + * @wm: Write master id
> > + */
> > +static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
> > +{
> > + struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
> > + struct camss_buffer *ready_buf;
> > + struct vfe_output *output;
> > + unsigned long flags;
> > + u32 index;
> > + u64 ts = ktime_get_ns();
> > +
> > + spin_lock_irqsave(&vfe->output_lock, flags);
> > +
> > + if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
> > + dev_err_ratelimited(vfe->camss->dev,
> > + "Received wm done for unmapped index\n");
> > + goto out_unlock;
> > + }
> > + output = &vfe->line[vfe->wm_output_map[wm]].output;
> > +
> > + ready_buf = output->buf[0];
> > + if (!ready_buf) {
> > + dev_err_ratelimited(vfe->camss->dev,
> > + "Missing ready buf %d!\n", output->state);
> > + goto out_unlock;
> > + }
> > +
> > + ready_buf->vb.vb2_buf.timestamp = ts;
> > + ready_buf->vb.sequence = output->sequence++;
> > +
> > + index = 0;
> > + output->buf[0] = output->buf[1];
> > + if (output->buf[0])
> > + index = 1;
> > +
> > + output->buf[index] = vfe_buf_get_pending(output);
> > +
> > + if (output->buf[index])
> > + vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
> > + else
> > + output->gen2.active_num--;
> > +
> > + spin_unlock_irqrestore(&vfe->output_lock, flags);
> > +
> > + vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> > +
> > + return;
> > +
> > +out_unlock:
> > + spin_unlock_irqrestore(&vfe->output_lock, flags);
> > +}
> > +
> > +/*
> > + * vfe_queue_buffer - Add empty buffer
> > + * @vid: Video device structure
> > + * @buf: Buffer to be enqueued
> > + *
> > + * Add an empty buffer - depending on the current number of buffers it will be
> > + * put in pending buffer queue or directly given to the hardware to be filled.
> > + *
> > + * Return 0 on success or a negative error code otherwise
> > + */
> > +static int vfe_queue_buffer(struct camss_video *vid,
> > + struct camss_buffer *buf)
> > +{
> > + struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
> > + struct vfe_device *vfe = to_vfe(line);
> > + struct vfe_output *output;
> > + unsigned long flags;
> > +
> > + output = &line->output;
> > +
> > + spin_lock_irqsave(&vfe->output_lock, flags);
> > +
> > + if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
> > + output->buf[output->gen2.active_num++] = buf;
> > + vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
> > + } else {
> > + vfe_buf_add_pending(output, buf);
> > + }
> > +
> > + spin_unlock_irqrestore(&vfe->output_lock, flags);
> > +
> > + return 0;
> > +}
> > +
> > +const struct vfe_isr_ops vfe_isr_ops_170 = {
> > + .reset_ack = vfe_isr_reset_ack,
> > + .halt_ack = vfe_isr_halt_ack,
> > + .reg_update = vfe_isr_reg_update,
> > + .sof = vfe_isr_sof,
> > + .comp_done = vfe_isr_comp_done,
> > + .wm_done = vfe_isr_wm_done,
> > +};
> > +
> > +static const struct camss_video_ops vfe_video_ops_170 = {
> > + .queue_buffer = vfe_queue_buffer,
> > + .flush_buffers = vfe_flush_buffers,
> > +};
> > +
> > +static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
> > +{
> > + vfe->isr_ops = vfe_isr_ops_170;
> > + vfe->video_ops = vfe_video_ops_170;
> > +
> > + vfe->line_num = VFE_LINE_NUM_GEN2;
> > +}
> > +
> > +const struct vfe_hw_ops vfe_ops_170 = {
> > + .global_reset = vfe_global_reset,
> > + .hw_version_read = vfe_hw_version_read,
> > + .isr_read = vfe_isr_read,
> > + .isr = vfe_isr,
> > + .reg_update_clear = vfe_reg_update_clear,
> > + .reg_update = vfe_reg_update,
> > + .subdev_init = vfe_subdev_init,
> > + .vfe_disable = vfe_disable,
> > + .vfe_enable = vfe_enable,
> > + .vfe_halt = vfe_halt,
> > + .violation_read = vfe_violation_read,
> > +};
> > diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
> > index 375843bd16af..6fafeb8a5484 100644
> > --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> > +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> > @@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
> > { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
> > };
> >
> > +static const struct vfe_format formats_rdi_845[] = {
> > + { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
> > + { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
> > + { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
> > + { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
> > + { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
> > + { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
> > + { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
> > + { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
> > + { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
> > + { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
> > + { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
> > + { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
> > + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
> > + { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
> > + { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
> > + { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
> > + { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
> > + { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
> > + { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
> > + { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
> > + { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
> > + { MEDIA_BUS_FMT_Y10_1X10, 10 },
> > + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
> > +};
> > +
> > /*
> > * vfe_get_bpp - map media bus format to bits per pixel
> > * @formats: supported media bus formats array
> > @@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
> > return sink_code;
> > }
> > else if (vfe->camss->version == CAMSS_8x96 ||
> > - vfe->camss->version == CAMSS_660)
> > + vfe->camss->version == CAMSS_660 ||
> > + vfe->camss->version == CAMSS_845)
> > switch (sink_code) {
> > case MEDIA_BUS_FMT_YUYV8_2X8:
> > {
> > @@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
> > return 0;
> > }
> >
> > -/*
> > - * vfe_reset - Trigger reset on VFE module and wait to complete
> > - * @vfe: VFE device
> > - *
> > - * Return 0 on success or a negative error code otherwise
> > - */
> > -static int vfe_reset(struct vfe_device *vfe)
> > +int vfe_reset(struct vfe_device *vfe)
> > {
> > unsigned long time;
> >
> > @@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
> > struct camss_clock *clock = &vfe->clock[i];
> >
> > if (!strcmp(clock->name, "vfe0") ||
> > - !strcmp(clock->name, "vfe1")) {
> > + !strcmp(clock->name, "vfe1") ||
> > + !strcmp(clock->name, "vfe_lite")) {
> > u64 min_rate = 0;
> > long rate;
> >
> > @@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> > case CAMSS_660:
> > vfe->ops = &vfe_ops_4_8;
> > break;
> > +
> > + case CAMSS_845:
> > + vfe->ops = &vfe_ops_170;
> > + break;
> > default:
> > return -EINVAL;
> > }
> > @@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> > l->formats = formats_rdi_8x96;
> > l->nformats = ARRAY_SIZE(formats_rdi_8x96);
> > }
> > + } else if (camss->version == CAMSS_845) {
> > + l->formats = formats_rdi_845;
> > + l->nformats = ARRAY_SIZE(formats_rdi_845);
> > } else {
> > return -EINVAL;
> > }
> > diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
> > index aad5dc74c2c0..29b3d930ffc6 100644
> > --- a/drivers/media/platform/qcom/camss/camss-vfe.h
> > +++ b/drivers/media/platform/qcom/camss/camss-vfe.h
> > @@ -19,7 +19,6 @@
> > #include "camss-video.h"
> > #include "camss-vfe-gen1.h"
> >
> > -
> > #define MSM_VFE_PAD_SINK 0
> > #define MSM_VFE_PAD_SRC 1
> > #define MSM_VFE_PADS_NUM 2
> > @@ -38,14 +37,14 @@
> > #define to_vfe(ptr_line) \
> > container_of(vfe_line_array(ptr_line), struct vfe_device, line)
> >
> > -
> > enum vfe_output_state {
> > VFE_OUTPUT_OFF,
> > VFE_OUTPUT_RESERVED,
> > VFE_OUTPUT_SINGLE,
> > VFE_OUTPUT_CONTINUOUS,
> > VFE_OUTPUT_IDLE,
> > - VFE_OUTPUT_STOPPING
> > + VFE_OUTPUT_STOPPING,
> > + VFE_OUTPUT_ON,
> > };
> >
> > enum vfe_line_id {
> > @@ -53,6 +52,7 @@ enum vfe_line_id {
> > VFE_LINE_RDI0 = 0,
> > VFE_LINE_RDI1 = 1,
> > VFE_LINE_RDI2 = 2,
> > + VFE_LINE_NUM_GEN2 = 3,
> > VFE_LINE_PIX = 3,
> > VFE_LINE_NUM_GEN1 = 4,
> > VFE_LINE_NUM_MAX = 4
> > @@ -73,6 +73,9 @@ struct vfe_output {
> > int active_buf;
> > int wait_sof;
> > } gen1;
> > + struct {
> > + int active_num;
> > + } gen2;
> > };
> > enum vfe_output_state state;
> > unsigned int sequence;
> > @@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
> >
> > struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
> >
> > -/*
> > - * vfe_disable - Disable streaming on VFE line
> > - * @line: VFE line
> > - *
> > - * Return 0 on success or a negative error code otherwise
> > - */
> > -int vfe_disable(struct vfe_line *line);
> > -
> > int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
> >
> > /*
> > @@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
> > int vfe_release_wm(struct vfe_device *vfe, u8 wm);
> > int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
> >
> > +/*
> > + * vfe_reset - Trigger reset on VFE module and wait to complete
> > + * @vfe: VFE device
> > + *
> > + * Return 0 on success or a negative error code otherwise
> > + */
> > +int vfe_reset(struct vfe_device *vfe);
> > +
> > extern const struct vfe_hw_ops vfe_ops_4_1;
> > extern const struct vfe_hw_ops vfe_ops_4_7;
> > extern const struct vfe_hw_ops vfe_ops_4_8;
> > +extern const struct vfe_hw_ops vfe_ops_170;
> >
> > #endif /* QC_MSM_CAMSS_VFE_H */
> > diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
> > index 97cea7c4d769..f282275af626 100644
> > --- a/drivers/media/platform/qcom/camss/camss-video.c
> > +++ b/drivers/media/platform/qcom/camss/camss-video.c
> > @@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
> > { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> > };
> >
> > +static const struct camss_format_info formats_rdi_845[] = {
> > + { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> > + { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> > + { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> > + { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> > + { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> > + { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> > + { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> > + { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> > + { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> > + { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> > + { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> > + { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> > + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> > + { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> > + { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> > + { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> > + { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> > + { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> > + { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> > + { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> > + { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> > + { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> > + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
> > + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> > +};
> > +
> > static const struct camss_format_info formats_pix_8x16[] = {
> > { MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
> > { { 1, 1 } }, { { 2, 3 } }, { 8 } },
> > @@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
> > video->formats = formats_rdi_8x96;
> > video->nformats = ARRAY_SIZE(formats_rdi_8x96);
> > }
> > + } else if (video->camss->version == CAMSS_845) {
> > + video->formats = formats_rdi_845;
> > + video->nformats = ARRAY_SIZE(formats_rdi_845);
> > } else {
> > ret = -EINVAL;
> > goto error_video_register;
> > diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> > index 6c6f1e59ccd8..0e006def1996 100644
> > --- a/drivers/media/platform/qcom/camss/camss.c
> > +++ b/drivers/media/platform/qcom/camss/camss.c
> > @@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
> > }
> > };
> >
> > +static const struct resources vfe_res_845[] = {
> > + /* VFE0 */
> > + {
> > + .regulator = { NULL },
> > + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> > + "soc_ahb", "vfe0", "vfe0_axi",
> > + "vfe0_src", "csi0",
> > + "csi0_src"},
> > + .clock_rate = { { 0 },
> > + { 0 },
> > + { 80000000 },
> > + { 0 },
> > + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> > + { 0 },
> > + { 320000000 },
> > + { 19200000, 75000000, 384000000, 538666667 },
> > + { 384000000 } },
> > + .reg = { "vfe0" },
> > + .interrupt = { "vfe0" }
> > + },
> > +
> > + /* VFE1 */
> > + {
> > + .regulator = { NULL },
> > + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> > + "soc_ahb", "vfe1", "vfe1_axi",
> > + "vfe1_src", "csi1",
> > + "csi1_src"},
> > + .clock_rate = { { 0 },
> > + { 0 },
> > + { 80000000 },
> > + { 0 },
> > + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> > + { 0 },
> > + { 320000000 },
> > + { 19200000, 75000000, 384000000, 538666667 },
> > + { 384000000 } },
> > + .reg = { "vfe1" },
> > + .interrupt = { "vfe1" }
> > + },
> > +
> > + /* VFE-lite */
> > + {
> > + .regulator = { NULL },
> > + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> > + "soc_ahb", "vfe_lite",
> > + "vfe_lite_src", "csi2",
> > + "csi2_src"},
> > + .clock_rate = { { 0 },
> > + { 0 },
> > + { 80000000 },
> > + { 0 },
> > + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> > + { 320000000 },
> > + { 19200000, 75000000, 384000000, 538666667 },
> > + { 384000000 } },
> > + .reg = { "vfe_lite" },
> > + .interrupt = { "vfe_lite" }
> > + }
> > +};
> > +
> > /*
> > * camss_add_clock_margin - Add margin to clock frequency rate
> > * @rate: Clock frequency rate
> >
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170
2021-02-22 16:37 ` Robert Foss
@ 2021-02-22 17:06 ` Andrey Konovalov
2021-02-22 17:21 ` Robert Foss
0 siblings, 1 reply; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-22 17:06 UTC (permalink / raw)
To: Robert Foss
Cc: Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab,
Rob Herring, angelogioacchino.delregno, MSM, linux-media,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, AngeloGioacchino Del Regno, Sakari Ailus,
Nicolas Boichat, Rob Herring, Tomasz Figa,
Azam Sadiq Pasha Kapatrala Syed, Sarvesh Sridutt,
Laurent Pinchart, Jonathan Marek
Hi Robert,
On 22.02.2021 19:37, Robert Foss wrote:
> On Sat, 20 Feb 2021 at 22:40, Andrey Konovalov
> <andrey.konovalov@linaro.org> wrote:
>>
>> Hi Robert,
>>
>> Thank you for your patch!
>>
>> On 17.02.2021 14:21, Robert Foss wrote:
>>> Add register definitions for version 170 of the Titan architecture
>>> and implement support for the RDI output mode.
>>>
>>> The RDI mode as opposed to the PIX output mode for the VFE unit does
>>> not support any ISP functionality. This means essentially only
>>> supporting dumping the output of the whatever the CSI decoder receives
>>> from the sensor.
>>>
>>> For example will a sensor outputting YUV pixel format frames, only
>>> allow the VFE to dump those frames as they are received by the ISP
>>> to memory through the RDI interface.
>>>
>>> Signed-off-by: Robert Foss <robert.foss@linaro.org>
>>> ---
>>>
>>>
>>> Changes since v1:
>>> - Andrey: Remove commented out chunk
>>> - Remove left over WIP comments
>>>
>>> Changes since v4:
>>> - Andrey: Remove traces of PIX support
>>> - Andrey: Fix vfe_global_reset() overwriting reset command
>>> - Remove unused variable
>>>
>>>
>>>
>>> drivers/media/platform/qcom/camss/Makefile | 1 +
>>> .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
>>> drivers/media/platform/qcom/camss/camss-vfe.c | 47 +-
>>> drivers/media/platform/qcom/camss/camss-vfe.h | 26 +-
>>> .../media/platform/qcom/camss/camss-video.c | 52 ++
>>> drivers/media/platform/qcom/camss/camss.c | 61 ++
>>> 6 files changed, 957 insertions(+), 20 deletions(-)
>>> create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c
>>>
>>> diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
>>> index 940c0ae3e003..052c4f405fa3 100644
>>> --- a/drivers/media/platform/qcom/camss/Makefile
>>> +++ b/drivers/media/platform/qcom/camss/Makefile
>>> @@ -11,6 +11,7 @@ qcom-camss-objs += \
>>> camss-vfe-4-1.o \
>>> camss-vfe-4-7.o \
>>> camss-vfe-4-8.o \
>>> + camss-vfe-170.o \
>>> camss-vfe-gen1.o \
>>> camss-vfe.o \
>>> camss-video.o \
>>> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
>>> new file mode 100644
>>> index 000000000000..c4991b1f22f8
>>> --- /dev/null
>>> +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
>>> @@ -0,0 +1,790 @@
>>> +// SPDX-License-Identifier: GPL-2.0
>>> +/*
>>> + * camss-vfe-4-7.c
>>> + *
>>> + * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
>>> + *
>>> + * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
>>> + * Copyright (C) 2015-2018 Linaro Ltd.
>>
>> - it looks like the header comes from v4.7 without updating to Titan 170
>
> Gotcha, thanks!
>
>>
>>> + */
>>> +
>>> +#include <linux/delay.h>
>>> +#include <linux/interrupt.h>
>>> +#include <linux/io.h>
>>> +#include <linux/iopoll.h>
>>> +
>>> +#include "camss.h"
>>> +#include "camss-vfe.h"
>>> +
>>> +#define VFE_HW_VERSION (0x000)
>>> +
>>> +#define VFE_GLOBAL_RESET_CMD (0x018)
>>> +#define GLOBAL_RESET_CMD_CORE BIT(0)
>>> +#define GLOBAL_RESET_CMD_CAMIF BIT(1)
>>> +#define GLOBAL_RESET_CMD_BUS BIT(2)
>>> +#define GLOBAL_RESET_CMD_BUS_BDG BIT(3)
>>> +#define GLOBAL_RESET_CMD_REGISTER BIT(4)
>>> +#define GLOBAL_RESET_CMD_PM BIT(5)
>>> +#define GLOBAL_RESET_CMD_BUS_MISR BIT(6)
>>> +#define GLOBAL_RESET_CMD_TESTGEN BIT(7)
>>> +#define GLOBAL_RESET_CMD_DSP BIT(8)
>>> +#define GLOBAL_RESET_CMD_IDLE_CGC BIT(9)
>>> +#define GLOBAL_RESET_CMD_RDI0 BIT(10)
>>> +#define GLOBAL_RESET_CMD_RDI1 BIT(11)
>>> +#define GLOBAL_RESET_CMD_RDI2 BIT(12)
>>> +#define GLOBAL_RESET_CMD_RDI3 BIT(13)
>>> +#define GLOBAL_RESET_CMD_VFE_DOMAIN BIT(30)
>>> +#define GLOBAL_RESET_CMD_RESET_BYPASS BIT(31)
>>> +
>>> +
>>> +#define VFE_CORE_CFG (0x050)
>>> +#define CFG_PIXEL_PATTERN_YCBYCR (0x4)
>>> +#define CFG_PIXEL_PATTERN_YCRYCB (0x5)
>>> +#define CFG_PIXEL_PATTERN_CBYCRY (0x6)
>>> +#define CFG_PIXEL_PATTERN_CRYCBY (0x7)
>>> +#define CFG_COMPOSITE_REG_UPDATE_EN BIT(4)
>>> +
>>> +#define VFE_IRQ_CMD (0x058)
>>> +#define CMD_GLOBAL_CLEAR BIT(0)
>>> +
>>> +#define VFE_IRQ_MASK_0 (0x05c)
>>> +#define MASK_0_CAMIF_SOF BIT(0)
>>> +#define MASK_0_CAMIF_EOF BIT(1)
>>> +#define MASK_0_RDI_REG_UPDATE(n) BIT((n) + 5)
>>> +#define MASK_0_IMAGE_MASTER_n_PING_PONG(n) BIT((n) + 8)
>>> +#define MASK_0_IMAGE_COMPOSITE_DONE_n(n) BIT((n) + 25)
>>> +#define MASK_0_RESET_ACK BIT(31)
>>> +
>>> +#define VFE_IRQ_MASK_1 (0x060)
>>> +#define MASK_1_CAMIF_ERROR BIT(0)
>>> +#define MASK_1_VIOLATION BIT(7)
>>> +#define MASK_1_BUS_BDG_HALT_ACK BIT(8)
>>> +#define MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n) BIT((n) + 9)
>>> +#define MASK_1_RDI_SOF(n) BIT((n) + 29)
>>> +
>>> +#define VFE_IRQ_CLEAR_0 (0x064)
>>> +#define VFE_IRQ_CLEAR_1 (0x068)
>>> +
>>> +#define VFE_IRQ_STATUS_0 (0x06c)
>>> +#define STATUS_0_CAMIF_SOF BIT(0)
>>> +#define STATUS_0_RDI_REG_UPDATE(n) BIT((n) + 5)
>>> +#define STATUS_0_IMAGE_MASTER_PING_PONG(n) BIT((n) + 8)
>>> +#define STATUS_0_IMAGE_COMPOSITE_DONE(n) BIT((n) + 25)
>>> +#define STATUS_0_RESET_ACK BIT(31)
>>> +
>>> +#define VFE_IRQ_STATUS_1 (0x070)
>>> +#define STATUS_1_VIOLATION BIT(7)
>>> +#define STATUS_1_BUS_BDG_HALT_ACK BIT(8)
>>> +#define STATUS_1_RDI_SOF(n) BIT((n) + 27)
>>> +
>>> +#define VFE_VIOLATION_STATUS (0x07c)
>>> +
>>> +#define VFE_CAMIF_CMD (0x478)
>>> +#define CMD_CLEAR_CAMIF_STATUS BIT(2)
>>> +
>>> +#define VFE_CAMIF_CFG (0x47c)
>>> +#define CFG_VSYNC_SYNC_EDGE (0)
>>> +#define VSYNC_ACTIVE_HIGH (0)
>>> +#define VSYNC_ACTIVE_LOW (1)
>>> +#define CFG_HSYNC_SYNC_EDGE (1)
>>> +#define HSYNC_ACTIVE_HIGH (0)
>>> +#define HSYNC_ACTIVE_LOW (1)
>>> +#define CFG_VFE_SUBSAMPLE_ENABLE BIT(4)
>>> +#define CFG_BUS_SUBSAMPLE_ENABLE BIT(5)
>>> +#define CFG_VFE_OUTPUT_EN BIT(6)
>>> +#define CFG_BUS_OUTPUT_EN BIT(7)
>>> +#define CFG_BINNING_EN BIT(9)
>>> +#define CFG_FRAME_BASED_EN BIT(10)
>>> +#define CFG_RAW_CROP_EN BIT(22)
>>> +
>>> +// XXX different, don't exist in TITAN register docs
>>> +#define VFE_0_CAMIF_FRAME_CFG 0x484
>>> +#define VFE_0_CAMIF_WINDOW_WIDTH_CFG 0x488
>>> +#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG 0x48c
>>> +#define VFE_0_CAMIF_SUBSAMPLE_CFG 0x490
>>> +#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN 0x498
>>> +#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN 0x49c
>>> +#define VFE_0_CAMIF_STATUS 0x4a4
>>> +#define VFE_0_CAMIF_STATUS_HALT BIT(31)
>>> +#define CAMIF_TIMEOUT_SLEEP_US 1000
>>> +#define CAMIF_TIMEOUT_ALL_US 1000000
>>> +
>>> +#define VFE_REG_UPDATE_CMD (0x4ac)
>>> +#define REG_UPDATE_RDI(n) BIT(1 + (n))
>>> +
>>> +
>>> +#define VFE_BUS_IRQ_MASK(n) (0x2044 + (n) * 4)
>>> +#define VFE_BUS_IRQ_CLEAR(n) (0x2050 + (n) * 4)
>>> +
>>> +#define VFE_BUS_IRQ_STATUS(n) (0x205c + (n) * 4)
>>> +#define STATUS0_COMP_RESET_DONE BIT(0)
>>> +#define STATUS0_COMP_REG_UPDATE0_DONE BIT(1)
>>> +#define STATUS0_COMP_REG_UPDATE1_DONE BIT(2)
>>> +#define STATUS0_COMP_REG_UPDATE2_DONE BIT(3)
>>> +#define STATUS0_COMP_REG_UPDATE3_DONE BIT(4)
>>> +#define STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
>>> +#define STATUS0_COMP0_BUF_DONE BIT(5)
>>> +#define STATUS0_COMP1_BUF_DONE BIT(6)
>>> +#define STATUS0_COMP2_BUF_DONE BIT(7)
>>> +#define STATUS0_COMP3_BUF_DONE BIT(8)
>>> +#define STATUS0_COMP4_BUF_DONE BIT(9)
>>> +#define STATUS0_COMP5_BUF_DONE BIT(10)
>>> +#define STATUS0_COMP_BUF_DONE(n) BIT(n + 5)
>>> +#define STATUS0_COMP_ERROR BIT(11)
>>> +#define STATUS0_COMP_OVERWRITE BIT(12)
>>> +#define STATUS0_OVERFLOW BIT(13)
>>> +#define STATUS0_VIOLATION BIT(14)
>>> +/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
>>> +#define STATUS1_WM_CLIENT_BUF_DONE(n) BIT(n)
>>> +#define STATUS1_EARLY_DONE BIT(24)
>>> +#define STATUS2_DUAL_COMP0_BUF_DONE BIT(0)
>>> +#define STATUS2_DUAL_COMP1_BUF_DONE BIT(1)
>>> +#define STATUS2_DUAL_COMP2_BUF_DONE BIT(2)
>>> +#define STATUS2_DUAL_COMP3_BUF_DONE BIT(3)
>>> +#define STATUS2_DUAL_COMP4_BUF_DONE BIT(4)
>>> +#define STATUS2_DUAL_COMP5_BUF_DONE BIT(5)
>>> +#define STATUS2_DUAL_COMP_BUF_DONE(n) BIT(n)
>>> +#define STATUS2_DUAL_COMP_ERROR BIT(6)
>>> +#define STATUS2_DUAL_COMP_OVERWRITE BIT(7)
>>> +
>>> +#define VFE_BUS_IRQ_CLEAR_GLOBAL (0x2068)
>>> +
>>> +#define VFE_BUS_WM_DEBUG_STATUS_CFG (0x226c)
>>> +#define DEBUG_STATUS_CFG_STATUS0(n) BIT(n)
>>> +#define DEBUG_STATUS_CFG_STATUS1(n) BIT(8+n)
>>> +
>>> +#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER (0x2080)
>>> +
>>> +#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC (0x2084)
>>> +#define BUS_VER2_MAX_CLIENTS (24)
>>> +#define WM_ADDR_NO_SYNC_DEFAULT_VAL \
>>> + ((1 << BUS_VER2_MAX_CLIENTS) - 1)
>>> +
>>> +#define VFE_BUS_WM_CGC_OVERRIDE (0x200c)
>>> +#define WM_CGC_OVERRIDE_ALL (0xFFFFF)
>>> +
>>> +#define VFE_BUS_WM_TEST_BUS_CTRL (0x211c)
>>> +
>>> +#define VFE_BUS_WM_STATUS0(n) (0x2200 + (n) * 0x100)
>>> +#define VFE_BUS_WM_STATUS1(n) (0x2204 + (n) * 0x100)
>>> +#define VFE_BUS_WM_CFG(n) (0x2208 + (n) * 0x100)
>>> +#define WM_CFG_EN (0)
>>> +#define WM_CFG_MODE (1)
>>> +#define MODE_QCOM_PLAIN (0)
>>> +#define MODE_MIPI_RAW (1)
>>> +#define WM_CFG_VIRTUALFRAME (2)
>>> +#define VFE_BUS_WM_HEADER_ADDR(n) (0x220c + (n) * 0x100)
>>> +#define VFE_BUS_WM_HEADER_CFG(n) (0x2210 + (n) * 0x100)
>>> +#define VFE_BUS_WM_IMAGE_ADDR(n) (0x2214 + (n) * 0x100)
>>> +#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n) (0x2218 + (n) * 0x100)
>>> +#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n) (0x221c + (n) * 0x100)
>>> +#define WM_BUFFER_DEFAULT_WIDTH (0xFF01)
>>> +
>>> +#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n) (0x2220 + (n) * 0x100)
>>> +#define VFE_BUS_WM_PACKER_CFG(n) (0x2224 + (n) * 0x100)
>>> +
>>> +#define VFE_BUS_WM_STRIDE(n) (0x2228 + (n) * 0x100)
>>> +#define WM_STRIDE_DEFAULT_STRIDE (0xFF01)
>>> +
>>> +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n) (0x2248 + (n) * 0x100)
>>> +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n) (0x224c + (n) * 0x100)
>>> +#define VFE_BUS_WM_FRAMEDROP_PERIOD(n) (0x2250 + (n) * 0x100)
>>> +#define VFE_BUS_WM_FRAMEDROP_PATTERN(n) (0x2254 + (n) * 0x100)
>>> +#define VFE_BUS_WM_FRAME_INC(n) (0x2258 + (n) * 0x100)
>>> +#define VFE_BUS_WM_BURST_LIMIT(n) (0x225c + (n) * 0x100)
>>> +
>>> +
>>> +static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
>>> +{
>>> + u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
>>> +
>>> + u32 gen = (hw_version >> 28) & 0xF;
>>> + u32 rev = (hw_version >> 16) & 0xFFF;
>>> + u32 step = hw_version & 0xFFFF;
>>> +
>>> + dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
>>> +}
>>> +
>>> +static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
>>> +{
>>> + u32 bits = readl_relaxed(vfe->base + reg);
>>> +
>>> + writel_relaxed(bits & ~clr_bits, vfe->base + reg);
>>> +}
>>> +
>>> +static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
>>> +{
>>> + u32 bits = readl_relaxed(vfe->base + reg);
>>> +
>>> + writel_relaxed(bits | set_bits, vfe->base + reg);
>>> +}
>>> +
>>> +static void vfe_global_reset(struct vfe_device *vfe)
>>> +{
>>> + u32 reset_bits = GLOBAL_RESET_CMD_CORE |
>>> + GLOBAL_RESET_CMD_CAMIF |
>>> + GLOBAL_RESET_CMD_BUS |
>>> + GLOBAL_RESET_CMD_REGISTER |
>>> + GLOBAL_RESET_CMD_PM |
>>> + GLOBAL_RESET_CMD_BUS_MISR |
>>> + GLOBAL_RESET_CMD_IDLE_CGC |
>>> + GLOBAL_RESET_CMD_RDI0 |
>>> + GLOBAL_RESET_CMD_RDI1 |
>>> + GLOBAL_RESET_CMD_RDI2;
>>
>> - so the reset_bits is set to 0x00001E77 in v5.
>>
>> In v4 the reset_bits was set to 0x00003F9F which corresponds to:
>>
>> GLOBAL_RESET_CMD_CORE |
>> GLOBAL_RESET_CMD_CAMIF |
>> GLOBAL_RESET_CMD_BUS |
>> GLOBAL_RESET_CMD_BUS_BDG |
>> GLOBAL_RESET_CMD_REGISTER |
>> GLOBAL_RESET_CMD_TESTGEN |
>> GLOBAL_RESET_CMD_DSP |
>> GLOBAL_RESET_CMD_IDLE_CGC |
>> GLOBAL_RESET_CMD_RDI0 |
>> GLOBAL_RESET_CMD_RDI1 |
>> GLOBAL_RESET_CMD_RDI2 |
>> GLOBAL_RESET_CMD_RDI3;
>>
>> So the difference between v4 and v5 is:
>>
>> reset in v4, not reset in v5:
>> GLOBAL_RESET_CMD_BUS_BDG
>> GLOBAL_RESET_CMD_TESTGEN
>> GLOBAL_RESET_CMD_DSP
>>
>> reset in v5, not reset in v4:
>> GLOBAL_RESET_CMD_PM
>> GLOBAL_RESET_CMD_BUS_MISR
>>
>> - correct?
>>
>> It is probably worth a few words in the v4 vs v5 changelog.
>>
>> (dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2
>> according to the driver code)
>>
>
> Great catch! I made a mistake with the bit-ordering after doing a
> hex->binary translation.
> I'll straighten this out in v6.
>
>>> +
>>> + writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
>>> +
>>> + /* Make sure IRQ mask has been written before resetting */
>>> + wmb();
>>> +
>>> + writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
>>> +}
>>> +
>>> +static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
>>> +{
>>> + u32 val;
>>> +
>>> + /*Set Debug Registers*/
>>> + val = DEBUG_STATUS_CFG_STATUS0(1) |
>>> + DEBUG_STATUS_CFG_STATUS0(7);
>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
>>> +
>>> + /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
>>> + writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
>>> +
>>> + /* no clock gating at bus input */
>>> + val = WM_CGC_OVERRIDE_ALL;
>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
>>> +
>>> + writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
>>> +
>>> + /* if addr_no_sync has default value then config the addr no sync reg */
>>> + val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
>>> +
>>> + writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
>>> +
>>> + val = WM_BUFFER_DEFAULT_WIDTH;
>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
>>> +
>>> + val = 0;
>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
>>> +
>>> + val = 0;
>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
>>> +
>>> + /* Configure stride for RDIs */
>>> + //val = pix->plane_fmt[0].bytesperline;
>>> + val = WM_STRIDE_DEFAULT_STRIDE;
>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
>>> +
>>> + /* Enable WM */
>>> + val = 1 << WM_CFG_EN |
>>> + MODE_MIPI_RAW << WM_CFG_MODE;
>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
>>> +}
>>> +
>>> +static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
>>> +{
>>> + /* Disable WM */
>>> + writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
>>> +}
>>> +
>>> +static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
>>> + struct vfe_line *line)
>>> +{
>>> + struct v4l2_pix_format_mplane *pix =
>>> + &line->video_out.active_fmt.fmt.pix_mp;
>>> + u32 stride = pix->plane_fmt[0].bytesperline;
>>> +
>>> + writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
>>> + writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
>>> +}
>>> +
>>> +static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
>>> +{
>>> + vfe->reg_update |= REG_UPDATE_RDI(line_id);
>>> +
>>> + /* Enforce ordering between previous reg writes and reg update */
>>> + wmb();
>>> +
>>> + writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
>>> +
>>> + /* Enforce ordering between reg update and subsequent reg writes */
>>> + wmb();
>>> +}
>>> +
>>> +static inline void vfe_reg_update_clear(struct vfe_device *vfe,
>>> + enum vfe_line_id line_id)
>>> +{
>>> + vfe->reg_update &= ~REG_UPDATE_RDI(line_id);
>>> +}
>>> +
>>> +static void vfe_enable_irq_common(struct vfe_device *vfe)
>>> +{
>>> + vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
>>> + vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
>>> +
>>> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
>>> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
>>> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));
>>
>> Looking at the #defines in the beginning of this file, only part
>> of the IRQ sources (not the whole 32 per each register) are used
>> or defined.
>>
>> Is it safe to unmask the unused (reserved?) bits in the above 5
>> IRQ mask registers?
>
> Unfortunately this register is not defined at all in any documentation
> of the downstream[1] kernel, so I think the situation is actually a
> bit worse than what you've pointed out here.
> I'd like to remove the register defines above since I don't have a
> reliable source for them. But I would like to keep the register writes
> just as they are since that seems to work.
>
> What are your thoughts?
Without having the documentation, using the known good writes is fine.
Removing the unused defines is also good.
Thanks,
Andrey
> [1] https://git.linaro.org/people/robert.foss/linux.git/log/?h=msm_sdm845
>
>>
>>> +}
>>> +
>>> +static void vfe_isr_halt_ack(struct vfe_device *vfe)
>>> +{
>>> + complete(&vfe->halt_complete);
>>> +}
>>> +
>>> +static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
>>> +{
>>> + *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
>>> + *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
>>> +
>>> + writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
>>> + writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
>>> +
>>> + /* Enforce ordering between IRQ Clear and Global IRQ Clear */
>>> + wmb();
>>> + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
>>> +}
>>> +
>>> +static void vfe_violation_read(struct vfe_device *vfe)
>>> +{
>>> + u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
>>> +
>>> + pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
>>> +}
>>> +
>>> +/*
>>> + * vfe_isr - VFE module interrupt handler
>>> + * @irq: Interrupt line
>>> + * @dev: VFE device
>>> + *
>>> + * Return IRQ_HANDLED on success
>>> + */
>>> +static irqreturn_t vfe_isr(int irq, void *dev)
>>> +{
>>> + struct vfe_device *vfe = dev;
>>> + u32 status0, status1, vfe_bus_status[3];
>>> + int i, wm;
>>> +
>>> + status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
>>> + status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
>>> +
>>> + writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
>>> + writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
>>> +
>>> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
>>> + vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
>>> + writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
>>> + }
>>> +
>>> + /* Enforce ordering between IRQ reading and interpretation */
>>> + wmb();
>>> +
>>> + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
>>> + writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
>>> +
>>> + if (status0 & STATUS_0_RESET_ACK)
>>> + vfe->isr_ops.reset_ack(vfe);
>>> +
>>> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
>>> + if (status0 & STATUS_0_RDI_REG_UPDATE(i))
>>> + vfe->isr_ops.reg_update(vfe, i);
>>> +
>>> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
>>> + if (status0 & STATUS_1_RDI_SOF(i))
>>> + vfe->isr_ops.sof(vfe, i);
>>> +
>>> + for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
>>> + if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
>>> + vfe->isr_ops.comp_done(vfe, i);
>>> +
>>> + for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
>>> + if (status0 & BIT(9))
>>> + if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
>>> + vfe->isr_ops.wm_done(vfe, wm);
>>> +
>>> + return IRQ_HANDLED;
>>> +}
>>> +
>>> +/*
>>> + * vfe_halt - Trigger halt on VFE module and wait to complete
>>> + * @vfe: VFE device
>>> + *
>>> + * Return 0 on success or a negative error code otherwise
>>> + */
>>> +static int vfe_halt(struct vfe_device *vfe)
>>> +{
>>> + unsigned long time;
>>> +
>>> + return 0;
>>> +
>>> + reinit_completion(&vfe->halt_complete);
>>> +
>>> + time = wait_for_completion_timeout(&vfe->halt_complete,
>>> + msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
>>> + if (!time) {
>>> + dev_err(vfe->camss->dev, "VFE halt timeout\n");
>>> + return -EIO;
>>> + }
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int vfe_get_output(struct vfe_line *line)
>>> +{
>>> + struct vfe_device *vfe = to_vfe(line);
>>> + struct vfe_output *output;
>>> + unsigned long flags;
>>> + int i;
>>> + int wm_idx;
>>> +
>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>> +
>>> + output = &line->output;
>>> + if (output->state != VFE_OUTPUT_OFF) {
>>> + dev_err(vfe->camss->dev, "Output is running\n");
>>> + goto error;
>>> + }
>>> +
>>> + output->wm_num = 1;
>>> +
>>> + for (i = 0; i < output->wm_num; i++) {
>>
>> - this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...
>
> Ack.
>
>>
>>> + wm_idx = vfe_reserve_wm(vfe, line->id);
>>> + if (wm_idx < 0) {
>>> + dev_err(vfe->camss->dev, "Can not reserve wm\n");
>>> + goto error_get_wm;
>>> + }
>>> + output->wm_idx[i] = wm_idx;
>>> + }
>>> +
>>> + output->drop_update_idx = 0;
>>> +
>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>> +
>>> + return 0;
>>> +
>>> +error_get_wm:
>>> + for (i--; i >= 0; i--)
>>
>> - ... and this one too. And the "i" local var is no longer needed.
>
> Ack
>
>>
>> Thanks,
>> Andrey
>>
>>> + vfe_release_wm(vfe, output->wm_idx[i]);
>>> + output->state = VFE_OUTPUT_OFF;
>>> +error:
>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>> +
>>> + return -EINVAL;
>>> +}
>>> +
>>> +static int vfe_enable_output(struct vfe_line *line)
>>> +{
>>> + struct vfe_device *vfe = to_vfe(line);
>>> + struct vfe_output *output = &line->output;
>>> + const struct vfe_hw_ops *ops = vfe->ops;
>>> + struct media_entity *sensor;
>>> + unsigned long flags;
>>> + unsigned int frame_skip = 0;
>>> + unsigned int i;
>>> +
>>> + sensor = camss_find_sensor(&line->subdev.entity);
>>> + if (sensor) {
>>> + struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
>>> +
>>> + v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
>>> + /* Max frame skip is 29 frames */
>>> + if (frame_skip > VFE_FRAME_DROP_VAL - 1)
>>> + frame_skip = VFE_FRAME_DROP_VAL - 1;
>>> + }
>>> +
>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>> +
>>> + ops->reg_update_clear(vfe, line->id);
>>> +
>>> + if (output->state != VFE_OUTPUT_OFF) {
>>> + dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
>>> + output->state);
>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + WARN_ON(output->gen2.active_num);
>>> +
>>> + output->state = VFE_OUTPUT_ON;
>>> +
>>> + output->sequence = 0;
>>> + output->wait_reg_update = 0;
>>> + reinit_completion(&output->reg_update);
>>> +
>>> + vfe_wm_start(vfe, output->wm_idx[0], line);
>>> +
>>> + for (i = 0; i < 2; i++) {
>>> + output->buf[i] = vfe_buf_get_pending(output);
>>> + if (!output->buf[i])
>>> + break;
>>> + output->gen2.active_num++;
>>> + vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
>>> + }
>>> +
>>> + ops->reg_update(vfe, line->id);
>>> +
>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int vfe_disable_output(struct vfe_line *line)
>>> +{
>>> + struct vfe_device *vfe = to_vfe(line);
>>> + struct vfe_output *output = &line->output;
>>> + unsigned long flags;
>>> + unsigned int i;
>>> + bool done;
>>> + int timeout = 0;
>>> +
>>> + do {
>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>> + done = !output->gen2.active_num;
>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>> + usleep_range(10000, 20000);
>>> +
>>> + if (timeout++ == 100) {
>>> + dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
>>> + vfe_reset(vfe);
>>> + output->gen2.active_num = 0;
>>> + return 0;
>>> + }
>>> + } while (!done);
>>> +
>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>> + for (i = 0; i < output->wm_num; i++)
>>> + vfe_wm_stop(vfe, output->wm_idx[i]);
>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +/*
>>> + * vfe_enable - Enable streaming on VFE line
>>> + * @line: VFE line
>>> + *
>>> + * Return 0 on success or a negative error code otherwise
>>> + */
>>> +static int vfe_enable(struct vfe_line *line)
>>> +{
>>> + struct vfe_device *vfe = to_vfe(line);
>>> + int ret;
>>> +
>>> + mutex_lock(&vfe->stream_lock);
>>> +
>>> + if (!vfe->stream_count)
>>> + vfe_enable_irq_common(vfe);
>>> +
>>> + vfe->stream_count++;
>>> +
>>> + mutex_unlock(&vfe->stream_lock);
>>> +
>>> + ret = vfe_get_output(line);
>>> + if (ret < 0)
>>> + goto error_get_output;
>>> +
>>> + ret = vfe_enable_output(line);
>>> + if (ret < 0)
>>> + goto error_enable_output;
>>> +
>>> + vfe->was_streaming = 1;
>>> +
>>> + return 0;
>>> +
>>> +
>>> +error_enable_output:
>>> + vfe_put_output(line);
>>> +
>>> +error_get_output:
>>> + mutex_lock(&vfe->stream_lock);
>>> +
>>> + vfe->stream_count--;
>>> +
>>> + mutex_unlock(&vfe->stream_lock);
>>> +
>>> + return ret;
>>> +}
>>> +
>>> +/*
>>> + * vfe_disable - Disable streaming on VFE line
>>> + * @line: VFE line
>>> + *
>>> + * Return 0 on success or a negative error code otherwise
>>> + */
>>> +static int vfe_disable(struct vfe_line *line)
>>> +{
>>> + struct vfe_device *vfe = to_vfe(line);
>>> +
>>> + vfe_disable_output(line);
>>> +
>>> + vfe_put_output(line);
>>> +
>>> + mutex_lock(&vfe->stream_lock);
>>> +
>>> + vfe->stream_count--;
>>> +
>>> + mutex_unlock(&vfe->stream_lock);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +/*
>>> + * vfe_isr_sof - Process start of frame interrupt
>>> + * @vfe: VFE Device
>>> + * @line_id: VFE line
>>> + */
>>> +static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
>>> +{
>>> +
>>> +}
>>> +
>>> +/*
>>> + * vfe_isr_reg_update - Process reg update interrupt
>>> + * @vfe: VFE Device
>>> + * @line_id: VFE line
>>> + */
>>> +static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
>>> +{
>>> + struct vfe_output *output;
>>> + unsigned long flags;
>>> +
>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>> + vfe->ops->reg_update_clear(vfe, line_id);
>>> +
>>> + output = &vfe->line[line_id].output;
>>> +
>>> + if (output->wait_reg_update) {
>>> + output->wait_reg_update = 0;
>>> + complete(&output->reg_update);
>>> + }
>>> +
>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>> +}
>>> +
>>> +/*
>>> + * vfe_isr_wm_done - Process write master done interrupt
>>> + * @vfe: VFE Device
>>> + * @wm: Write master id
>>> + */
>>> +static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
>>> +{
>>> + struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
>>> + struct camss_buffer *ready_buf;
>>> + struct vfe_output *output;
>>> + unsigned long flags;
>>> + u32 index;
>>> + u64 ts = ktime_get_ns();
>>> +
>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>> +
>>> + if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
>>> + dev_err_ratelimited(vfe->camss->dev,
>>> + "Received wm done for unmapped index\n");
>>> + goto out_unlock;
>>> + }
>>> + output = &vfe->line[vfe->wm_output_map[wm]].output;
>>> +
>>> + ready_buf = output->buf[0];
>>> + if (!ready_buf) {
>>> + dev_err_ratelimited(vfe->camss->dev,
>>> + "Missing ready buf %d!\n", output->state);
>>> + goto out_unlock;
>>> + }
>>> +
>>> + ready_buf->vb.vb2_buf.timestamp = ts;
>>> + ready_buf->vb.sequence = output->sequence++;
>>> +
>>> + index = 0;
>>> + output->buf[0] = output->buf[1];
>>> + if (output->buf[0])
>>> + index = 1;
>>> +
>>> + output->buf[index] = vfe_buf_get_pending(output);
>>> +
>>> + if (output->buf[index])
>>> + vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
>>> + else
>>> + output->gen2.active_num--;
>>> +
>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>> +
>>> + vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>>> +
>>> + return;
>>> +
>>> +out_unlock:
>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>> +}
>>> +
>>> +/*
>>> + * vfe_queue_buffer - Add empty buffer
>>> + * @vid: Video device structure
>>> + * @buf: Buffer to be enqueued
>>> + *
>>> + * Add an empty buffer - depending on the current number of buffers it will be
>>> + * put in pending buffer queue or directly given to the hardware to be filled.
>>> + *
>>> + * Return 0 on success or a negative error code otherwise
>>> + */
>>> +static int vfe_queue_buffer(struct camss_video *vid,
>>> + struct camss_buffer *buf)
>>> +{
>>> + struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
>>> + struct vfe_device *vfe = to_vfe(line);
>>> + struct vfe_output *output;
>>> + unsigned long flags;
>>> +
>>> + output = &line->output;
>>> +
>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>> +
>>> + if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
>>> + output->buf[output->gen2.active_num++] = buf;
>>> + vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
>>> + } else {
>>> + vfe_buf_add_pending(output, buf);
>>> + }
>>> +
>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +const struct vfe_isr_ops vfe_isr_ops_170 = {
>>> + .reset_ack = vfe_isr_reset_ack,
>>> + .halt_ack = vfe_isr_halt_ack,
>>> + .reg_update = vfe_isr_reg_update,
>>> + .sof = vfe_isr_sof,
>>> + .comp_done = vfe_isr_comp_done,
>>> + .wm_done = vfe_isr_wm_done,
>>> +};
>>> +
>>> +static const struct camss_video_ops vfe_video_ops_170 = {
>>> + .queue_buffer = vfe_queue_buffer,
>>> + .flush_buffers = vfe_flush_buffers,
>>> +};
>>> +
>>> +static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
>>> +{
>>> + vfe->isr_ops = vfe_isr_ops_170;
>>> + vfe->video_ops = vfe_video_ops_170;
>>> +
>>> + vfe->line_num = VFE_LINE_NUM_GEN2;
>>> +}
>>> +
>>> +const struct vfe_hw_ops vfe_ops_170 = {
>>> + .global_reset = vfe_global_reset,
>>> + .hw_version_read = vfe_hw_version_read,
>>> + .isr_read = vfe_isr_read,
>>> + .isr = vfe_isr,
>>> + .reg_update_clear = vfe_reg_update_clear,
>>> + .reg_update = vfe_reg_update,
>>> + .subdev_init = vfe_subdev_init,
>>> + .vfe_disable = vfe_disable,
>>> + .vfe_enable = vfe_enable,
>>> + .vfe_halt = vfe_halt,
>>> + .violation_read = vfe_violation_read,
>>> +};
>>> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
>>> index 375843bd16af..6fafeb8a5484 100644
>>> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
>>> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
>>> @@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
>>> { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
>>> };
>>>
>>> +static const struct vfe_format formats_rdi_845[] = {
>>> + { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
>>> + { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
>>> + { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
>>> + { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
>>> + { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
>>> + { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
>>> + { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
>>> + { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
>>> + { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
>>> + { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
>>> + { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
>>> + { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
>>> + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
>>> + { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
>>> + { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
>>> + { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
>>> + { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
>>> + { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
>>> + { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
>>> + { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
>>> + { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
>>> + { MEDIA_BUS_FMT_Y10_1X10, 10 },
>>> + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
>>> +};
>>> +
>>> /*
>>> * vfe_get_bpp - map media bus format to bits per pixel
>>> * @formats: supported media bus formats array
>>> @@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
>>> return sink_code;
>>> }
>>> else if (vfe->camss->version == CAMSS_8x96 ||
>>> - vfe->camss->version == CAMSS_660)
>>> + vfe->camss->version == CAMSS_660 ||
>>> + vfe->camss->version == CAMSS_845)
>>> switch (sink_code) {
>>> case MEDIA_BUS_FMT_YUYV8_2X8:
>>> {
>>> @@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
>>> return 0;
>>> }
>>>
>>> -/*
>>> - * vfe_reset - Trigger reset on VFE module and wait to complete
>>> - * @vfe: VFE device
>>> - *
>>> - * Return 0 on success or a negative error code otherwise
>>> - */
>>> -static int vfe_reset(struct vfe_device *vfe)
>>> +int vfe_reset(struct vfe_device *vfe)
>>> {
>>> unsigned long time;
>>>
>>> @@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
>>> struct camss_clock *clock = &vfe->clock[i];
>>>
>>> if (!strcmp(clock->name, "vfe0") ||
>>> - !strcmp(clock->name, "vfe1")) {
>>> + !strcmp(clock->name, "vfe1") ||
>>> + !strcmp(clock->name, "vfe_lite")) {
>>> u64 min_rate = 0;
>>> long rate;
>>>
>>> @@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
>>> case CAMSS_660:
>>> vfe->ops = &vfe_ops_4_8;
>>> break;
>>> +
>>> + case CAMSS_845:
>>> + vfe->ops = &vfe_ops_170;
>>> + break;
>>> default:
>>> return -EINVAL;
>>> }
>>> @@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
>>> l->formats = formats_rdi_8x96;
>>> l->nformats = ARRAY_SIZE(formats_rdi_8x96);
>>> }
>>> + } else if (camss->version == CAMSS_845) {
>>> + l->formats = formats_rdi_845;
>>> + l->nformats = ARRAY_SIZE(formats_rdi_845);
>>> } else {
>>> return -EINVAL;
>>> }
>>> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
>>> index aad5dc74c2c0..29b3d930ffc6 100644
>>> --- a/drivers/media/platform/qcom/camss/camss-vfe.h
>>> +++ b/drivers/media/platform/qcom/camss/camss-vfe.h
>>> @@ -19,7 +19,6 @@
>>> #include "camss-video.h"
>>> #include "camss-vfe-gen1.h"
>>>
>>> -
>>> #define MSM_VFE_PAD_SINK 0
>>> #define MSM_VFE_PAD_SRC 1
>>> #define MSM_VFE_PADS_NUM 2
>>> @@ -38,14 +37,14 @@
>>> #define to_vfe(ptr_line) \
>>> container_of(vfe_line_array(ptr_line), struct vfe_device, line)
>>>
>>> -
>>> enum vfe_output_state {
>>> VFE_OUTPUT_OFF,
>>> VFE_OUTPUT_RESERVED,
>>> VFE_OUTPUT_SINGLE,
>>> VFE_OUTPUT_CONTINUOUS,
>>> VFE_OUTPUT_IDLE,
>>> - VFE_OUTPUT_STOPPING
>>> + VFE_OUTPUT_STOPPING,
>>> + VFE_OUTPUT_ON,
>>> };
>>>
>>> enum vfe_line_id {
>>> @@ -53,6 +52,7 @@ enum vfe_line_id {
>>> VFE_LINE_RDI0 = 0,
>>> VFE_LINE_RDI1 = 1,
>>> VFE_LINE_RDI2 = 2,
>>> + VFE_LINE_NUM_GEN2 = 3,
>>> VFE_LINE_PIX = 3,
>>> VFE_LINE_NUM_GEN1 = 4,
>>> VFE_LINE_NUM_MAX = 4
>>> @@ -73,6 +73,9 @@ struct vfe_output {
>>> int active_buf;
>>> int wait_sof;
>>> } gen1;
>>> + struct {
>>> + int active_num;
>>> + } gen2;
>>> };
>>> enum vfe_output_state state;
>>> unsigned int sequence;
>>> @@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
>>>
>>> struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
>>>
>>> -/*
>>> - * vfe_disable - Disable streaming on VFE line
>>> - * @line: VFE line
>>> - *
>>> - * Return 0 on success or a negative error code otherwise
>>> - */
>>> -int vfe_disable(struct vfe_line *line);
>>> -
>>> int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
>>>
>>> /*
>>> @@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
>>> int vfe_release_wm(struct vfe_device *vfe, u8 wm);
>>> int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
>>>
>>> +/*
>>> + * vfe_reset - Trigger reset on VFE module and wait to complete
>>> + * @vfe: VFE device
>>> + *
>>> + * Return 0 on success or a negative error code otherwise
>>> + */
>>> +int vfe_reset(struct vfe_device *vfe);
>>> +
>>> extern const struct vfe_hw_ops vfe_ops_4_1;
>>> extern const struct vfe_hw_ops vfe_ops_4_7;
>>> extern const struct vfe_hw_ops vfe_ops_4_8;
>>> +extern const struct vfe_hw_ops vfe_ops_170;
>>>
>>> #endif /* QC_MSM_CAMSS_VFE_H */
>>> diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
>>> index 97cea7c4d769..f282275af626 100644
>>> --- a/drivers/media/platform/qcom/camss/camss-video.c
>>> +++ b/drivers/media/platform/qcom/camss/camss-video.c
>>> @@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
>>> { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>> };
>>>
>>> +static const struct camss_format_info formats_rdi_845[] = {
>>> + { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>> + { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>> + { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>> + { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>> + { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
>>> + { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
>>> + { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
>>> + { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
>>> + { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
>>> + { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
>>> + { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
>>> + { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
>>> + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>> + { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
>>> + { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
>>> + { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
>>> + { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
>>> + { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
>>> + { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
>>> + { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
>>> + { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
>>> + { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
>>> + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>> +};
>>> +
>>> static const struct camss_format_info formats_pix_8x16[] = {
>>> { MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
>>> { { 1, 1 } }, { { 2, 3 } }, { 8 } },
>>> @@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
>>> video->formats = formats_rdi_8x96;
>>> video->nformats = ARRAY_SIZE(formats_rdi_8x96);
>>> }
>>> + } else if (video->camss->version == CAMSS_845) {
>>> + video->formats = formats_rdi_845;
>>> + video->nformats = ARRAY_SIZE(formats_rdi_845);
>>> } else {
>>> ret = -EINVAL;
>>> goto error_video_register;
>>> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
>>> index 6c6f1e59ccd8..0e006def1996 100644
>>> --- a/drivers/media/platform/qcom/camss/camss.c
>>> +++ b/drivers/media/platform/qcom/camss/camss.c
>>> @@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
>>> }
>>> };
>>>
>>> +static const struct resources vfe_res_845[] = {
>>> + /* VFE0 */
>>> + {
>>> + .regulator = { NULL },
>>> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
>>> + "soc_ahb", "vfe0", "vfe0_axi",
>>> + "vfe0_src", "csi0",
>>> + "csi0_src"},
>>> + .clock_rate = { { 0 },
>>> + { 0 },
>>> + { 80000000 },
>>> + { 0 },
>>> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
>>> + { 0 },
>>> + { 320000000 },
>>> + { 19200000, 75000000, 384000000, 538666667 },
>>> + { 384000000 } },
>>> + .reg = { "vfe0" },
>>> + .interrupt = { "vfe0" }
>>> + },
>>> +
>>> + /* VFE1 */
>>> + {
>>> + .regulator = { NULL },
>>> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
>>> + "soc_ahb", "vfe1", "vfe1_axi",
>>> + "vfe1_src", "csi1",
>>> + "csi1_src"},
>>> + .clock_rate = { { 0 },
>>> + { 0 },
>>> + { 80000000 },
>>> + { 0 },
>>> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
>>> + { 0 },
>>> + { 320000000 },
>>> + { 19200000, 75000000, 384000000, 538666667 },
>>> + { 384000000 } },
>>> + .reg = { "vfe1" },
>>> + .interrupt = { "vfe1" }
>>> + },
>>> +
>>> + /* VFE-lite */
>>> + {
>>> + .regulator = { NULL },
>>> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
>>> + "soc_ahb", "vfe_lite",
>>> + "vfe_lite_src", "csi2",
>>> + "csi2_src"},
>>> + .clock_rate = { { 0 },
>>> + { 0 },
>>> + { 80000000 },
>>> + { 0 },
>>> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
>>> + { 320000000 },
>>> + { 19200000, 75000000, 384000000, 538666667 },
>>> + { 384000000 } },
>>> + .reg = { "vfe_lite" },
>>> + .interrupt = { "vfe_lite" }
>>> + }
>>> +};
>>> +
>>> /*
>>> * camss_add_clock_margin - Add margin to clock frequency rate
>>> * @rate: Clock frequency rate
>>>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170
2021-02-22 17:06 ` Andrey Konovalov
@ 2021-02-22 17:21 ` Robert Foss
2021-02-22 17:24 ` Andrey Konovalov
0 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-22 17:21 UTC (permalink / raw)
To: Andrey Konovalov
Cc: Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab,
Rob Herring, angelogioacchino.delregno, MSM, linux-media,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, AngeloGioacchino Del Regno, Sakari Ailus,
Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
On Mon, 22 Feb 2021 at 18:06, Andrey Konovalov
<andrey.konovalov@linaro.org> wrote:
>
> Hi Robert,
>
> On 22.02.2021 19:37, Robert Foss wrote:
> > On Sat, 20 Feb 2021 at 22:40, Andrey Konovalov
> > <andrey.konovalov@linaro.org> wrote:
> >>
> >> Hi Robert,
> >>
> >> Thank you for your patch!
> >>
> >> On 17.02.2021 14:21, Robert Foss wrote:
> >>> Add register definitions for version 170 of the Titan architecture
> >>> and implement support for the RDI output mode.
> >>>
> >>> The RDI mode as opposed to the PIX output mode for the VFE unit does
> >>> not support any ISP functionality. This means essentially only
> >>> supporting dumping the output of the whatever the CSI decoder receives
> >>> from the sensor.
> >>>
> >>> For example will a sensor outputting YUV pixel format frames, only
> >>> allow the VFE to dump those frames as they are received by the ISP
> >>> to memory through the RDI interface.
> >>>
> >>> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> >>> ---
> >>>
> >>>
> >>> Changes since v1:
> >>> - Andrey: Remove commented out chunk
> >>> - Remove left over WIP comments
> >>>
> >>> Changes since v4:
> >>> - Andrey: Remove traces of PIX support
> >>> - Andrey: Fix vfe_global_reset() overwriting reset command
> >>> - Remove unused variable
> >>>
> >>>
> >>>
> >>> drivers/media/platform/qcom/camss/Makefile | 1 +
> >>> .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
> >>> drivers/media/platform/qcom/camss/camss-vfe.c | 47 +-
> >>> drivers/media/platform/qcom/camss/camss-vfe.h | 26 +-
> >>> .../media/platform/qcom/camss/camss-video.c | 52 ++
> >>> drivers/media/platform/qcom/camss/camss.c | 61 ++
> >>> 6 files changed, 957 insertions(+), 20 deletions(-)
> >>> create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c
> >>>
> >>> diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
> >>> index 940c0ae3e003..052c4f405fa3 100644
> >>> --- a/drivers/media/platform/qcom/camss/Makefile
> >>> +++ b/drivers/media/platform/qcom/camss/Makefile
> >>> @@ -11,6 +11,7 @@ qcom-camss-objs += \
> >>> camss-vfe-4-1.o \
> >>> camss-vfe-4-7.o \
> >>> camss-vfe-4-8.o \
> >>> + camss-vfe-170.o \
> >>> camss-vfe-gen1.o \
> >>> camss-vfe.o \
> >>> camss-video.o \
> >>> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> >>> new file mode 100644
> >>> index 000000000000..c4991b1f22f8
> >>> --- /dev/null
> >>> +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> >>> @@ -0,0 +1,790 @@
> >>> +// SPDX-License-Identifier: GPL-2.0
> >>> +/*
> >>> + * camss-vfe-4-7.c
> >>> + *
> >>> + * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
> >>> + *
> >>> + * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
> >>> + * Copyright (C) 2015-2018 Linaro Ltd.
> >>
> >> - it looks like the header comes from v4.7 without updating to Titan 170
> >
> > Gotcha, thanks!
> >
> >>
> >>> + */
> >>> +
> >>> +#include <linux/delay.h>
> >>> +#include <linux/interrupt.h>
> >>> +#include <linux/io.h>
> >>> +#include <linux/iopoll.h>
> >>> +
> >>> +#include "camss.h"
> >>> +#include "camss-vfe.h"
> >>> +
> >>> +#define VFE_HW_VERSION (0x000)
> >>> +
> >>> +#define VFE_GLOBAL_RESET_CMD (0x018)
> >>> +#define GLOBAL_RESET_CMD_CORE BIT(0)
> >>> +#define GLOBAL_RESET_CMD_CAMIF BIT(1)
> >>> +#define GLOBAL_RESET_CMD_BUS BIT(2)
> >>> +#define GLOBAL_RESET_CMD_BUS_BDG BIT(3)
> >>> +#define GLOBAL_RESET_CMD_REGISTER BIT(4)
> >>> +#define GLOBAL_RESET_CMD_PM BIT(5)
> >>> +#define GLOBAL_RESET_CMD_BUS_MISR BIT(6)
> >>> +#define GLOBAL_RESET_CMD_TESTGEN BIT(7)
> >>> +#define GLOBAL_RESET_CMD_DSP BIT(8)
> >>> +#define GLOBAL_RESET_CMD_IDLE_CGC BIT(9)
> >>> +#define GLOBAL_RESET_CMD_RDI0 BIT(10)
> >>> +#define GLOBAL_RESET_CMD_RDI1 BIT(11)
> >>> +#define GLOBAL_RESET_CMD_RDI2 BIT(12)
> >>> +#define GLOBAL_RESET_CMD_RDI3 BIT(13)
> >>> +#define GLOBAL_RESET_CMD_VFE_DOMAIN BIT(30)
> >>> +#define GLOBAL_RESET_CMD_RESET_BYPASS BIT(31)
> >>> +
> >>> +
> >>> +#define VFE_CORE_CFG (0x050)
> >>> +#define CFG_PIXEL_PATTERN_YCBYCR (0x4)
> >>> +#define CFG_PIXEL_PATTERN_YCRYCB (0x5)
> >>> +#define CFG_PIXEL_PATTERN_CBYCRY (0x6)
> >>> +#define CFG_PIXEL_PATTERN_CRYCBY (0x7)
> >>> +#define CFG_COMPOSITE_REG_UPDATE_EN BIT(4)
> >>> +
> >>> +#define VFE_IRQ_CMD (0x058)
> >>> +#define CMD_GLOBAL_CLEAR BIT(0)
> >>> +
> >>> +#define VFE_IRQ_MASK_0 (0x05c)
> >>> +#define MASK_0_CAMIF_SOF BIT(0)
> >>> +#define MASK_0_CAMIF_EOF BIT(1)
> >>> +#define MASK_0_RDI_REG_UPDATE(n) BIT((n) + 5)
> >>> +#define MASK_0_IMAGE_MASTER_n_PING_PONG(n) BIT((n) + 8)
> >>> +#define MASK_0_IMAGE_COMPOSITE_DONE_n(n) BIT((n) + 25)
> >>> +#define MASK_0_RESET_ACK BIT(31)
> >>> +
> >>> +#define VFE_IRQ_MASK_1 (0x060)
> >>> +#define MASK_1_CAMIF_ERROR BIT(0)
> >>> +#define MASK_1_VIOLATION BIT(7)
> >>> +#define MASK_1_BUS_BDG_HALT_ACK BIT(8)
> >>> +#define MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n) BIT((n) + 9)
> >>> +#define MASK_1_RDI_SOF(n) BIT((n) + 29)
> >>> +
> >>> +#define VFE_IRQ_CLEAR_0 (0x064)
> >>> +#define VFE_IRQ_CLEAR_1 (0x068)
> >>> +
> >>> +#define VFE_IRQ_STATUS_0 (0x06c)
> >>> +#define STATUS_0_CAMIF_SOF BIT(0)
> >>> +#define STATUS_0_RDI_REG_UPDATE(n) BIT((n) + 5)
> >>> +#define STATUS_0_IMAGE_MASTER_PING_PONG(n) BIT((n) + 8)
> >>> +#define STATUS_0_IMAGE_COMPOSITE_DONE(n) BIT((n) + 25)
> >>> +#define STATUS_0_RESET_ACK BIT(31)
> >>> +
> >>> +#define VFE_IRQ_STATUS_1 (0x070)
> >>> +#define STATUS_1_VIOLATION BIT(7)
> >>> +#define STATUS_1_BUS_BDG_HALT_ACK BIT(8)
> >>> +#define STATUS_1_RDI_SOF(n) BIT((n) + 27)
> >>> +
> >>> +#define VFE_VIOLATION_STATUS (0x07c)
> >>> +
> >>> +#define VFE_CAMIF_CMD (0x478)
> >>> +#define CMD_CLEAR_CAMIF_STATUS BIT(2)
> >>> +
> >>> +#define VFE_CAMIF_CFG (0x47c)
> >>> +#define CFG_VSYNC_SYNC_EDGE (0)
> >>> +#define VSYNC_ACTIVE_HIGH (0)
> >>> +#define VSYNC_ACTIVE_LOW (1)
> >>> +#define CFG_HSYNC_SYNC_EDGE (1)
> >>> +#define HSYNC_ACTIVE_HIGH (0)
> >>> +#define HSYNC_ACTIVE_LOW (1)
> >>> +#define CFG_VFE_SUBSAMPLE_ENABLE BIT(4)
> >>> +#define CFG_BUS_SUBSAMPLE_ENABLE BIT(5)
> >>> +#define CFG_VFE_OUTPUT_EN BIT(6)
> >>> +#define CFG_BUS_OUTPUT_EN BIT(7)
> >>> +#define CFG_BINNING_EN BIT(9)
> >>> +#define CFG_FRAME_BASED_EN BIT(10)
> >>> +#define CFG_RAW_CROP_EN BIT(22)
> >>> +
> >>> +// XXX different, don't exist in TITAN register docs
> >>> +#define VFE_0_CAMIF_FRAME_CFG 0x484
> >>> +#define VFE_0_CAMIF_WINDOW_WIDTH_CFG 0x488
> >>> +#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG 0x48c
> >>> +#define VFE_0_CAMIF_SUBSAMPLE_CFG 0x490
> >>> +#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN 0x498
> >>> +#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN 0x49c
> >>> +#define VFE_0_CAMIF_STATUS 0x4a4
> >>> +#define VFE_0_CAMIF_STATUS_HALT BIT(31)
> >>> +#define CAMIF_TIMEOUT_SLEEP_US 1000
> >>> +#define CAMIF_TIMEOUT_ALL_US 1000000
> >>> +
> >>> +#define VFE_REG_UPDATE_CMD (0x4ac)
> >>> +#define REG_UPDATE_RDI(n) BIT(1 + (n))
> >>> +
> >>> +
> >>> +#define VFE_BUS_IRQ_MASK(n) (0x2044 + (n) * 4)
> >>> +#define VFE_BUS_IRQ_CLEAR(n) (0x2050 + (n) * 4)
> >>> +
> >>> +#define VFE_BUS_IRQ_STATUS(n) (0x205c + (n) * 4)
> >>> +#define STATUS0_COMP_RESET_DONE BIT(0)
> >>> +#define STATUS0_COMP_REG_UPDATE0_DONE BIT(1)
> >>> +#define STATUS0_COMP_REG_UPDATE1_DONE BIT(2)
> >>> +#define STATUS0_COMP_REG_UPDATE2_DONE BIT(3)
> >>> +#define STATUS0_COMP_REG_UPDATE3_DONE BIT(4)
> >>> +#define STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
> >>> +#define STATUS0_COMP0_BUF_DONE BIT(5)
> >>> +#define STATUS0_COMP1_BUF_DONE BIT(6)
> >>> +#define STATUS0_COMP2_BUF_DONE BIT(7)
> >>> +#define STATUS0_COMP3_BUF_DONE BIT(8)
> >>> +#define STATUS0_COMP4_BUF_DONE BIT(9)
> >>> +#define STATUS0_COMP5_BUF_DONE BIT(10)
> >>> +#define STATUS0_COMP_BUF_DONE(n) BIT(n + 5)
> >>> +#define STATUS0_COMP_ERROR BIT(11)
> >>> +#define STATUS0_COMP_OVERWRITE BIT(12)
> >>> +#define STATUS0_OVERFLOW BIT(13)
> >>> +#define STATUS0_VIOLATION BIT(14)
> >>> +/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
> >>> +#define STATUS1_WM_CLIENT_BUF_DONE(n) BIT(n)
> >>> +#define STATUS1_EARLY_DONE BIT(24)
> >>> +#define STATUS2_DUAL_COMP0_BUF_DONE BIT(0)
> >>> +#define STATUS2_DUAL_COMP1_BUF_DONE BIT(1)
> >>> +#define STATUS2_DUAL_COMP2_BUF_DONE BIT(2)
> >>> +#define STATUS2_DUAL_COMP3_BUF_DONE BIT(3)
> >>> +#define STATUS2_DUAL_COMP4_BUF_DONE BIT(4)
> >>> +#define STATUS2_DUAL_COMP5_BUF_DONE BIT(5)
> >>> +#define STATUS2_DUAL_COMP_BUF_DONE(n) BIT(n)
> >>> +#define STATUS2_DUAL_COMP_ERROR BIT(6)
> >>> +#define STATUS2_DUAL_COMP_OVERWRITE BIT(7)
> >>> +
> >>> +#define VFE_BUS_IRQ_CLEAR_GLOBAL (0x2068)
> >>> +
> >>> +#define VFE_BUS_WM_DEBUG_STATUS_CFG (0x226c)
> >>> +#define DEBUG_STATUS_CFG_STATUS0(n) BIT(n)
> >>> +#define DEBUG_STATUS_CFG_STATUS1(n) BIT(8+n)
> >>> +
> >>> +#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER (0x2080)
> >>> +
> >>> +#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC (0x2084)
> >>> +#define BUS_VER2_MAX_CLIENTS (24)
> >>> +#define WM_ADDR_NO_SYNC_DEFAULT_VAL \
> >>> + ((1 << BUS_VER2_MAX_CLIENTS) - 1)
> >>> +
> >>> +#define VFE_BUS_WM_CGC_OVERRIDE (0x200c)
> >>> +#define WM_CGC_OVERRIDE_ALL (0xFFFFF)
> >>> +
> >>> +#define VFE_BUS_WM_TEST_BUS_CTRL (0x211c)
> >>> +
> >>> +#define VFE_BUS_WM_STATUS0(n) (0x2200 + (n) * 0x100)
> >>> +#define VFE_BUS_WM_STATUS1(n) (0x2204 + (n) * 0x100)
> >>> +#define VFE_BUS_WM_CFG(n) (0x2208 + (n) * 0x100)
> >>> +#define WM_CFG_EN (0)
> >>> +#define WM_CFG_MODE (1)
> >>> +#define MODE_QCOM_PLAIN (0)
> >>> +#define MODE_MIPI_RAW (1)
> >>> +#define WM_CFG_VIRTUALFRAME (2)
> >>> +#define VFE_BUS_WM_HEADER_ADDR(n) (0x220c + (n) * 0x100)
> >>> +#define VFE_BUS_WM_HEADER_CFG(n) (0x2210 + (n) * 0x100)
> >>> +#define VFE_BUS_WM_IMAGE_ADDR(n) (0x2214 + (n) * 0x100)
> >>> +#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n) (0x2218 + (n) * 0x100)
> >>> +#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n) (0x221c + (n) * 0x100)
> >>> +#define WM_BUFFER_DEFAULT_WIDTH (0xFF01)
> >>> +
> >>> +#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n) (0x2220 + (n) * 0x100)
> >>> +#define VFE_BUS_WM_PACKER_CFG(n) (0x2224 + (n) * 0x100)
> >>> +
> >>> +#define VFE_BUS_WM_STRIDE(n) (0x2228 + (n) * 0x100)
> >>> +#define WM_STRIDE_DEFAULT_STRIDE (0xFF01)
> >>> +
> >>> +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n) (0x2248 + (n) * 0x100)
> >>> +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n) (0x224c + (n) * 0x100)
> >>> +#define VFE_BUS_WM_FRAMEDROP_PERIOD(n) (0x2250 + (n) * 0x100)
> >>> +#define VFE_BUS_WM_FRAMEDROP_PATTERN(n) (0x2254 + (n) * 0x100)
> >>> +#define VFE_BUS_WM_FRAME_INC(n) (0x2258 + (n) * 0x100)
> >>> +#define VFE_BUS_WM_BURST_LIMIT(n) (0x225c + (n) * 0x100)
> >>> +
> >>> +
> >>> +static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
> >>> +{
> >>> + u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
> >>> +
> >>> + u32 gen = (hw_version >> 28) & 0xF;
> >>> + u32 rev = (hw_version >> 16) & 0xFFF;
> >>> + u32 step = hw_version & 0xFFFF;
> >>> +
> >>> + dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
> >>> +}
> >>> +
> >>> +static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
> >>> +{
> >>> + u32 bits = readl_relaxed(vfe->base + reg);
> >>> +
> >>> + writel_relaxed(bits & ~clr_bits, vfe->base + reg);
> >>> +}
> >>> +
> >>> +static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
> >>> +{
> >>> + u32 bits = readl_relaxed(vfe->base + reg);
> >>> +
> >>> + writel_relaxed(bits | set_bits, vfe->base + reg);
> >>> +}
> >>> +
> >>> +static void vfe_global_reset(struct vfe_device *vfe)
> >>> +{
> >>> + u32 reset_bits = GLOBAL_RESET_CMD_CORE |
> >>> + GLOBAL_RESET_CMD_CAMIF |
> >>> + GLOBAL_RESET_CMD_BUS |
> >>> + GLOBAL_RESET_CMD_REGISTER |
> >>> + GLOBAL_RESET_CMD_PM |
> >>> + GLOBAL_RESET_CMD_BUS_MISR |
> >>> + GLOBAL_RESET_CMD_IDLE_CGC |
> >>> + GLOBAL_RESET_CMD_RDI0 |
> >>> + GLOBAL_RESET_CMD_RDI1 |
> >>> + GLOBAL_RESET_CMD_RDI2;
> >>
> >> - so the reset_bits is set to 0x00001E77 in v5.
> >>
> >> In v4 the reset_bits was set to 0x00003F9F which corresponds to:
> >>
> >> GLOBAL_RESET_CMD_CORE |
> >> GLOBAL_RESET_CMD_CAMIF |
> >> GLOBAL_RESET_CMD_BUS |
> >> GLOBAL_RESET_CMD_BUS_BDG |
> >> GLOBAL_RESET_CMD_REGISTER |
> >> GLOBAL_RESET_CMD_TESTGEN |
> >> GLOBAL_RESET_CMD_DSP |
> >> GLOBAL_RESET_CMD_IDLE_CGC |
> >> GLOBAL_RESET_CMD_RDI0 |
> >> GLOBAL_RESET_CMD_RDI1 |
> >> GLOBAL_RESET_CMD_RDI2 |
> >> GLOBAL_RESET_CMD_RDI3;
> >>
> >> So the difference between v4 and v5 is:
> >>
> >> reset in v4, not reset in v5:
> >> GLOBAL_RESET_CMD_BUS_BDG
> >> GLOBAL_RESET_CMD_TESTGEN
> >> GLOBAL_RESET_CMD_DSP
> >>
> >> reset in v5, not reset in v4:
> >> GLOBAL_RESET_CMD_PM
> >> GLOBAL_RESET_CMD_BUS_MISR
> >>
> >> - correct?
> >>
> >> It is probably worth a few words in the v4 vs v5 changelog.
> >>
> >> (dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2
> >> according to the driver code)
> >>
> >
> > Great catch! I made a mistake with the bit-ordering after doing a
> > hex->binary translation.
> > I'll straighten this out in v6.
> >
> >>> +
> >>> + writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
> >>> +
> >>> + /* Make sure IRQ mask has been written before resetting */
> >>> + wmb();
> >>> +
> >>> + writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
> >>> +}
> >>> +
> >>> +static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
> >>> +{
> >>> + u32 val;
> >>> +
> >>> + /*Set Debug Registers*/
> >>> + val = DEBUG_STATUS_CFG_STATUS0(1) |
> >>> + DEBUG_STATUS_CFG_STATUS0(7);
> >>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
> >>> +
> >>> + /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
> >>> + writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
> >>> +
> >>> + /* no clock gating at bus input */
> >>> + val = WM_CGC_OVERRIDE_ALL;
> >>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
> >>> +
> >>> + writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
> >>> +
> >>> + /* if addr_no_sync has default value then config the addr no sync reg */
> >>> + val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
> >>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
> >>> +
> >>> + writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
> >>> +
> >>> + val = WM_BUFFER_DEFAULT_WIDTH;
> >>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
> >>> +
> >>> + val = 0;
> >>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
> >>> +
> >>> + val = 0;
> >>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
> >>> +
> >>> + /* Configure stride for RDIs */
> >>> + //val = pix->plane_fmt[0].bytesperline;
> >>> + val = WM_STRIDE_DEFAULT_STRIDE;
> >>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
> >>> +
> >>> + /* Enable WM */
> >>> + val = 1 << WM_CFG_EN |
> >>> + MODE_MIPI_RAW << WM_CFG_MODE;
> >>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
> >>> +}
> >>> +
> >>> +static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
> >>> +{
> >>> + /* Disable WM */
> >>> + writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
> >>> +}
> >>> +
> >>> +static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
> >>> + struct vfe_line *line)
> >>> +{
> >>> + struct v4l2_pix_format_mplane *pix =
> >>> + &line->video_out.active_fmt.fmt.pix_mp;
> >>> + u32 stride = pix->plane_fmt[0].bytesperline;
> >>> +
> >>> + writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
> >>> + writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
> >>> +}
> >>> +
> >>> +static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
> >>> +{
> >>> + vfe->reg_update |= REG_UPDATE_RDI(line_id);
> >>> +
> >>> + /* Enforce ordering between previous reg writes and reg update */
> >>> + wmb();
> >>> +
> >>> + writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
> >>> +
> >>> + /* Enforce ordering between reg update and subsequent reg writes */
> >>> + wmb();
> >>> +}
> >>> +
> >>> +static inline void vfe_reg_update_clear(struct vfe_device *vfe,
> >>> + enum vfe_line_id line_id)
> >>> +{
> >>> + vfe->reg_update &= ~REG_UPDATE_RDI(line_id);
> >>> +}
> >>> +
> >>> +static void vfe_enable_irq_common(struct vfe_device *vfe)
> >>> +{
> >>> + vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
> >>> + vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
> >>> +
> >>> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
> >>> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
> >>> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));
> >>
> >> Looking at the #defines in the beginning of this file, only part
> >> of the IRQ sources (not the whole 32 per each register) are used
> >> or defined.
> >>
> >> Is it safe to unmask the unused (reserved?) bits in the above 5
> >> IRQ mask registers?
> >
> > Unfortunately this register is not defined at all in any documentation
> > of the downstream[1] kernel, so I think the situation is actually a
> > bit worse than what you've pointed out here.
> > I'd like to remove the register defines above since I don't have a
> > reliable source for them. But I would like to keep the register writes
> > just as they are since that seems to work.
> >
> > What are your thoughts?
>
> Without having the documentation, using the known good writes is fine.
> Removing the unused defines is also good.
Some of the register definitions like STATUS0_COMP_BUF_DONE is used
currently, and are documented for later generations of this hardware.
But I'm not finding any traces for this generation. Chances are that
they are the same, but I cant guarantee it. But at least some of them
seem to be correct, and are indeed needed. I'm tempted to leave this
exactly the way it is. Would that be ok for you?
>
> Thanks,
> Andrey
>
> > [1] https://git.linaro.org/people/robert.foss/linux.git/log/?h=msm_sdm845
> >
> >>
> >>> +}
> >>> +
> >>> +static void vfe_isr_halt_ack(struct vfe_device *vfe)
> >>> +{
> >>> + complete(&vfe->halt_complete);
> >>> +}
> >>> +
> >>> +static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
> >>> +{
> >>> + *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
> >>> + *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
> >>> +
> >>> + writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
> >>> + writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
> >>> +
> >>> + /* Enforce ordering between IRQ Clear and Global IRQ Clear */
> >>> + wmb();
> >>> + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
> >>> +}
> >>> +
> >>> +static void vfe_violation_read(struct vfe_device *vfe)
> >>> +{
> >>> + u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
> >>> +
> >>> + pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
> >>> +}
> >>> +
> >>> +/*
> >>> + * vfe_isr - VFE module interrupt handler
> >>> + * @irq: Interrupt line
> >>> + * @dev: VFE device
> >>> + *
> >>> + * Return IRQ_HANDLED on success
> >>> + */
> >>> +static irqreturn_t vfe_isr(int irq, void *dev)
> >>> +{
> >>> + struct vfe_device *vfe = dev;
> >>> + u32 status0, status1, vfe_bus_status[3];
> >>> + int i, wm;
> >>> +
> >>> + status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
> >>> + status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
> >>> +
> >>> + writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
> >>> + writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
> >>> +
> >>> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
> >>> + vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
> >>> + writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
> >>> + }
> >>> +
> >>> + /* Enforce ordering between IRQ reading and interpretation */
> >>> + wmb();
> >>> +
> >>> + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
> >>> + writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
> >>> +
> >>> + if (status0 & STATUS_0_RESET_ACK)
> >>> + vfe->isr_ops.reset_ack(vfe);
> >>> +
> >>> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
> >>> + if (status0 & STATUS_0_RDI_REG_UPDATE(i))
> >>> + vfe->isr_ops.reg_update(vfe, i);
> >>> +
> >>> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
> >>> + if (status0 & STATUS_1_RDI_SOF(i))
> >>> + vfe->isr_ops.sof(vfe, i);
> >>> +
> >>> + for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
> >>> + if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
> >>> + vfe->isr_ops.comp_done(vfe, i);
> >>> +
> >>> + for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
> >>> + if (status0 & BIT(9))
> >>> + if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
> >>> + vfe->isr_ops.wm_done(vfe, wm);
> >>> +
> >>> + return IRQ_HANDLED;
> >>> +}
> >>> +
> >>> +/*
> >>> + * vfe_halt - Trigger halt on VFE module and wait to complete
> >>> + * @vfe: VFE device
> >>> + *
> >>> + * Return 0 on success or a negative error code otherwise
> >>> + */
> >>> +static int vfe_halt(struct vfe_device *vfe)
> >>> +{
> >>> + unsigned long time;
> >>> +
> >>> + return 0;
> >>> +
> >>> + reinit_completion(&vfe->halt_complete);
> >>> +
> >>> + time = wait_for_completion_timeout(&vfe->halt_complete,
> >>> + msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
> >>> + if (!time) {
> >>> + dev_err(vfe->camss->dev, "VFE halt timeout\n");
> >>> + return -EIO;
> >>> + }
> >>> +
> >>> + return 0;
> >>> +}
> >>> +
> >>> +static int vfe_get_output(struct vfe_line *line)
> >>> +{
> >>> + struct vfe_device *vfe = to_vfe(line);
> >>> + struct vfe_output *output;
> >>> + unsigned long flags;
> >>> + int i;
> >>> + int wm_idx;
> >>> +
> >>> + spin_lock_irqsave(&vfe->output_lock, flags);
> >>> +
> >>> + output = &line->output;
> >>> + if (output->state != VFE_OUTPUT_OFF) {
> >>> + dev_err(vfe->camss->dev, "Output is running\n");
> >>> + goto error;
> >>> + }
> >>> +
> >>> + output->wm_num = 1;
> >>> +
> >>> + for (i = 0; i < output->wm_num; i++) {
> >>
> >> - this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...
> >
> > Ack.
> >
> >>
> >>> + wm_idx = vfe_reserve_wm(vfe, line->id);
> >>> + if (wm_idx < 0) {
> >>> + dev_err(vfe->camss->dev, "Can not reserve wm\n");
> >>> + goto error_get_wm;
> >>> + }
> >>> + output->wm_idx[i] = wm_idx;
> >>> + }
> >>> +
> >>> + output->drop_update_idx = 0;
> >>> +
> >>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> >>> +
> >>> + return 0;
> >>> +
> >>> +error_get_wm:
> >>> + for (i--; i >= 0; i--)
> >>
> >> - ... and this one too. And the "i" local var is no longer needed.
> >
> > Ack
> >
> >>
> >> Thanks,
> >> Andrey
> >>
> >>> + vfe_release_wm(vfe, output->wm_idx[i]);
> >>> + output->state = VFE_OUTPUT_OFF;
> >>> +error:
> >>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> >>> +
> >>> + return -EINVAL;
> >>> +}
> >>> +
> >>> +static int vfe_enable_output(struct vfe_line *line)
> >>> +{
> >>> + struct vfe_device *vfe = to_vfe(line);
> >>> + struct vfe_output *output = &line->output;
> >>> + const struct vfe_hw_ops *ops = vfe->ops;
> >>> + struct media_entity *sensor;
> >>> + unsigned long flags;
> >>> + unsigned int frame_skip = 0;
> >>> + unsigned int i;
> >>> +
> >>> + sensor = camss_find_sensor(&line->subdev.entity);
> >>> + if (sensor) {
> >>> + struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
> >>> +
> >>> + v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
> >>> + /* Max frame skip is 29 frames */
> >>> + if (frame_skip > VFE_FRAME_DROP_VAL - 1)
> >>> + frame_skip = VFE_FRAME_DROP_VAL - 1;
> >>> + }
> >>> +
> >>> + spin_lock_irqsave(&vfe->output_lock, flags);
> >>> +
> >>> + ops->reg_update_clear(vfe, line->id);
> >>> +
> >>> + if (output->state != VFE_OUTPUT_OFF) {
> >>> + dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
> >>> + output->state);
> >>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> >>> + return -EINVAL;
> >>> + }
> >>> +
> >>> + WARN_ON(output->gen2.active_num);
> >>> +
> >>> + output->state = VFE_OUTPUT_ON;
> >>> +
> >>> + output->sequence = 0;
> >>> + output->wait_reg_update = 0;
> >>> + reinit_completion(&output->reg_update);
> >>> +
> >>> + vfe_wm_start(vfe, output->wm_idx[0], line);
> >>> +
> >>> + for (i = 0; i < 2; i++) {
> >>> + output->buf[i] = vfe_buf_get_pending(output);
> >>> + if (!output->buf[i])
> >>> + break;
> >>> + output->gen2.active_num++;
> >>> + vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
> >>> + }
> >>> +
> >>> + ops->reg_update(vfe, line->id);
> >>> +
> >>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> >>> +
> >>> + return 0;
> >>> +}
> >>> +
> >>> +static int vfe_disable_output(struct vfe_line *line)
> >>> +{
> >>> + struct vfe_device *vfe = to_vfe(line);
> >>> + struct vfe_output *output = &line->output;
> >>> + unsigned long flags;
> >>> + unsigned int i;
> >>> + bool done;
> >>> + int timeout = 0;
> >>> +
> >>> + do {
> >>> + spin_lock_irqsave(&vfe->output_lock, flags);
> >>> + done = !output->gen2.active_num;
> >>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> >>> + usleep_range(10000, 20000);
> >>> +
> >>> + if (timeout++ == 100) {
> >>> + dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
> >>> + vfe_reset(vfe);
> >>> + output->gen2.active_num = 0;
> >>> + return 0;
> >>> + }
> >>> + } while (!done);
> >>> +
> >>> + spin_lock_irqsave(&vfe->output_lock, flags);
> >>> + for (i = 0; i < output->wm_num; i++)
> >>> + vfe_wm_stop(vfe, output->wm_idx[i]);
> >>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> >>> +
> >>> + return 0;
> >>> +}
> >>> +
> >>> +/*
> >>> + * vfe_enable - Enable streaming on VFE line
> >>> + * @line: VFE line
> >>> + *
> >>> + * Return 0 on success or a negative error code otherwise
> >>> + */
> >>> +static int vfe_enable(struct vfe_line *line)
> >>> +{
> >>> + struct vfe_device *vfe = to_vfe(line);
> >>> + int ret;
> >>> +
> >>> + mutex_lock(&vfe->stream_lock);
> >>> +
> >>> + if (!vfe->stream_count)
> >>> + vfe_enable_irq_common(vfe);
> >>> +
> >>> + vfe->stream_count++;
> >>> +
> >>> + mutex_unlock(&vfe->stream_lock);
> >>> +
> >>> + ret = vfe_get_output(line);
> >>> + if (ret < 0)
> >>> + goto error_get_output;
> >>> +
> >>> + ret = vfe_enable_output(line);
> >>> + if (ret < 0)
> >>> + goto error_enable_output;
> >>> +
> >>> + vfe->was_streaming = 1;
> >>> +
> >>> + return 0;
> >>> +
> >>> +
> >>> +error_enable_output:
> >>> + vfe_put_output(line);
> >>> +
> >>> +error_get_output:
> >>> + mutex_lock(&vfe->stream_lock);
> >>> +
> >>> + vfe->stream_count--;
> >>> +
> >>> + mutex_unlock(&vfe->stream_lock);
> >>> +
> >>> + return ret;
> >>> +}
> >>> +
> >>> +/*
> >>> + * vfe_disable - Disable streaming on VFE line
> >>> + * @line: VFE line
> >>> + *
> >>> + * Return 0 on success or a negative error code otherwise
> >>> + */
> >>> +static int vfe_disable(struct vfe_line *line)
> >>> +{
> >>> + struct vfe_device *vfe = to_vfe(line);
> >>> +
> >>> + vfe_disable_output(line);
> >>> +
> >>> + vfe_put_output(line);
> >>> +
> >>> + mutex_lock(&vfe->stream_lock);
> >>> +
> >>> + vfe->stream_count--;
> >>> +
> >>> + mutex_unlock(&vfe->stream_lock);
> >>> +
> >>> + return 0;
> >>> +}
> >>> +
> >>> +/*
> >>> + * vfe_isr_sof - Process start of frame interrupt
> >>> + * @vfe: VFE Device
> >>> + * @line_id: VFE line
> >>> + */
> >>> +static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
> >>> +{
> >>> +
> >>> +}
> >>> +
> >>> +/*
> >>> + * vfe_isr_reg_update - Process reg update interrupt
> >>> + * @vfe: VFE Device
> >>> + * @line_id: VFE line
> >>> + */
> >>> +static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
> >>> +{
> >>> + struct vfe_output *output;
> >>> + unsigned long flags;
> >>> +
> >>> + spin_lock_irqsave(&vfe->output_lock, flags);
> >>> + vfe->ops->reg_update_clear(vfe, line_id);
> >>> +
> >>> + output = &vfe->line[line_id].output;
> >>> +
> >>> + if (output->wait_reg_update) {
> >>> + output->wait_reg_update = 0;
> >>> + complete(&output->reg_update);
> >>> + }
> >>> +
> >>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> >>> +}
> >>> +
> >>> +/*
> >>> + * vfe_isr_wm_done - Process write master done interrupt
> >>> + * @vfe: VFE Device
> >>> + * @wm: Write master id
> >>> + */
> >>> +static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
> >>> +{
> >>> + struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
> >>> + struct camss_buffer *ready_buf;
> >>> + struct vfe_output *output;
> >>> + unsigned long flags;
> >>> + u32 index;
> >>> + u64 ts = ktime_get_ns();
> >>> +
> >>> + spin_lock_irqsave(&vfe->output_lock, flags);
> >>> +
> >>> + if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
> >>> + dev_err_ratelimited(vfe->camss->dev,
> >>> + "Received wm done for unmapped index\n");
> >>> + goto out_unlock;
> >>> + }
> >>> + output = &vfe->line[vfe->wm_output_map[wm]].output;
> >>> +
> >>> + ready_buf = output->buf[0];
> >>> + if (!ready_buf) {
> >>> + dev_err_ratelimited(vfe->camss->dev,
> >>> + "Missing ready buf %d!\n", output->state);
> >>> + goto out_unlock;
> >>> + }
> >>> +
> >>> + ready_buf->vb.vb2_buf.timestamp = ts;
> >>> + ready_buf->vb.sequence = output->sequence++;
> >>> +
> >>> + index = 0;
> >>> + output->buf[0] = output->buf[1];
> >>> + if (output->buf[0])
> >>> + index = 1;
> >>> +
> >>> + output->buf[index] = vfe_buf_get_pending(output);
> >>> +
> >>> + if (output->buf[index])
> >>> + vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
> >>> + else
> >>> + output->gen2.active_num--;
> >>> +
> >>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> >>> +
> >>> + vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> >>> +
> >>> + return;
> >>> +
> >>> +out_unlock:
> >>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> >>> +}
> >>> +
> >>> +/*
> >>> + * vfe_queue_buffer - Add empty buffer
> >>> + * @vid: Video device structure
> >>> + * @buf: Buffer to be enqueued
> >>> + *
> >>> + * Add an empty buffer - depending on the current number of buffers it will be
> >>> + * put in pending buffer queue or directly given to the hardware to be filled.
> >>> + *
> >>> + * Return 0 on success or a negative error code otherwise
> >>> + */
> >>> +static int vfe_queue_buffer(struct camss_video *vid,
> >>> + struct camss_buffer *buf)
> >>> +{
> >>> + struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
> >>> + struct vfe_device *vfe = to_vfe(line);
> >>> + struct vfe_output *output;
> >>> + unsigned long flags;
> >>> +
> >>> + output = &line->output;
> >>> +
> >>> + spin_lock_irqsave(&vfe->output_lock, flags);
> >>> +
> >>> + if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
> >>> + output->buf[output->gen2.active_num++] = buf;
> >>> + vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
> >>> + } else {
> >>> + vfe_buf_add_pending(output, buf);
> >>> + }
> >>> +
> >>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> >>> +
> >>> + return 0;
> >>> +}
> >>> +
> >>> +const struct vfe_isr_ops vfe_isr_ops_170 = {
> >>> + .reset_ack = vfe_isr_reset_ack,
> >>> + .halt_ack = vfe_isr_halt_ack,
> >>> + .reg_update = vfe_isr_reg_update,
> >>> + .sof = vfe_isr_sof,
> >>> + .comp_done = vfe_isr_comp_done,
> >>> + .wm_done = vfe_isr_wm_done,
> >>> +};
> >>> +
> >>> +static const struct camss_video_ops vfe_video_ops_170 = {
> >>> + .queue_buffer = vfe_queue_buffer,
> >>> + .flush_buffers = vfe_flush_buffers,
> >>> +};
> >>> +
> >>> +static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
> >>> +{
> >>> + vfe->isr_ops = vfe_isr_ops_170;
> >>> + vfe->video_ops = vfe_video_ops_170;
> >>> +
> >>> + vfe->line_num = VFE_LINE_NUM_GEN2;
> >>> +}
> >>> +
> >>> +const struct vfe_hw_ops vfe_ops_170 = {
> >>> + .global_reset = vfe_global_reset,
> >>> + .hw_version_read = vfe_hw_version_read,
> >>> + .isr_read = vfe_isr_read,
> >>> + .isr = vfe_isr,
> >>> + .reg_update_clear = vfe_reg_update_clear,
> >>> + .reg_update = vfe_reg_update,
> >>> + .subdev_init = vfe_subdev_init,
> >>> + .vfe_disable = vfe_disable,
> >>> + .vfe_enable = vfe_enable,
> >>> + .vfe_halt = vfe_halt,
> >>> + .violation_read = vfe_violation_read,
> >>> +};
> >>> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
> >>> index 375843bd16af..6fafeb8a5484 100644
> >>> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> >>> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> >>> @@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
> >>> { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
> >>> };
> >>>
> >>> +static const struct vfe_format formats_rdi_845[] = {
> >>> + { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
> >>> + { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
> >>> + { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
> >>> + { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
> >>> + { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
> >>> + { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
> >>> + { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
> >>> + { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
> >>> + { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
> >>> + { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
> >>> + { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
> >>> + { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
> >>> + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
> >>> + { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
> >>> + { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
> >>> + { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
> >>> + { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
> >>> + { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
> >>> + { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
> >>> + { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
> >>> + { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
> >>> + { MEDIA_BUS_FMT_Y10_1X10, 10 },
> >>> + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
> >>> +};
> >>> +
> >>> /*
> >>> * vfe_get_bpp - map media bus format to bits per pixel
> >>> * @formats: supported media bus formats array
> >>> @@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
> >>> return sink_code;
> >>> }
> >>> else if (vfe->camss->version == CAMSS_8x96 ||
> >>> - vfe->camss->version == CAMSS_660)
> >>> + vfe->camss->version == CAMSS_660 ||
> >>> + vfe->camss->version == CAMSS_845)
> >>> switch (sink_code) {
> >>> case MEDIA_BUS_FMT_YUYV8_2X8:
> >>> {
> >>> @@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
> >>> return 0;
> >>> }
> >>>
> >>> -/*
> >>> - * vfe_reset - Trigger reset on VFE module and wait to complete
> >>> - * @vfe: VFE device
> >>> - *
> >>> - * Return 0 on success or a negative error code otherwise
> >>> - */
> >>> -static int vfe_reset(struct vfe_device *vfe)
> >>> +int vfe_reset(struct vfe_device *vfe)
> >>> {
> >>> unsigned long time;
> >>>
> >>> @@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
> >>> struct camss_clock *clock = &vfe->clock[i];
> >>>
> >>> if (!strcmp(clock->name, "vfe0") ||
> >>> - !strcmp(clock->name, "vfe1")) {
> >>> + !strcmp(clock->name, "vfe1") ||
> >>> + !strcmp(clock->name, "vfe_lite")) {
> >>> u64 min_rate = 0;
> >>> long rate;
> >>>
> >>> @@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> >>> case CAMSS_660:
> >>> vfe->ops = &vfe_ops_4_8;
> >>> break;
> >>> +
> >>> + case CAMSS_845:
> >>> + vfe->ops = &vfe_ops_170;
> >>> + break;
> >>> default:
> >>> return -EINVAL;
> >>> }
> >>> @@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> >>> l->formats = formats_rdi_8x96;
> >>> l->nformats = ARRAY_SIZE(formats_rdi_8x96);
> >>> }
> >>> + } else if (camss->version == CAMSS_845) {
> >>> + l->formats = formats_rdi_845;
> >>> + l->nformats = ARRAY_SIZE(formats_rdi_845);
> >>> } else {
> >>> return -EINVAL;
> >>> }
> >>> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
> >>> index aad5dc74c2c0..29b3d930ffc6 100644
> >>> --- a/drivers/media/platform/qcom/camss/camss-vfe.h
> >>> +++ b/drivers/media/platform/qcom/camss/camss-vfe.h
> >>> @@ -19,7 +19,6 @@
> >>> #include "camss-video.h"
> >>> #include "camss-vfe-gen1.h"
> >>>
> >>> -
> >>> #define MSM_VFE_PAD_SINK 0
> >>> #define MSM_VFE_PAD_SRC 1
> >>> #define MSM_VFE_PADS_NUM 2
> >>> @@ -38,14 +37,14 @@
> >>> #define to_vfe(ptr_line) \
> >>> container_of(vfe_line_array(ptr_line), struct vfe_device, line)
> >>>
> >>> -
> >>> enum vfe_output_state {
> >>> VFE_OUTPUT_OFF,
> >>> VFE_OUTPUT_RESERVED,
> >>> VFE_OUTPUT_SINGLE,
> >>> VFE_OUTPUT_CONTINUOUS,
> >>> VFE_OUTPUT_IDLE,
> >>> - VFE_OUTPUT_STOPPING
> >>> + VFE_OUTPUT_STOPPING,
> >>> + VFE_OUTPUT_ON,
> >>> };
> >>>
> >>> enum vfe_line_id {
> >>> @@ -53,6 +52,7 @@ enum vfe_line_id {
> >>> VFE_LINE_RDI0 = 0,
> >>> VFE_LINE_RDI1 = 1,
> >>> VFE_LINE_RDI2 = 2,
> >>> + VFE_LINE_NUM_GEN2 = 3,
> >>> VFE_LINE_PIX = 3,
> >>> VFE_LINE_NUM_GEN1 = 4,
> >>> VFE_LINE_NUM_MAX = 4
> >>> @@ -73,6 +73,9 @@ struct vfe_output {
> >>> int active_buf;
> >>> int wait_sof;
> >>> } gen1;
> >>> + struct {
> >>> + int active_num;
> >>> + } gen2;
> >>> };
> >>> enum vfe_output_state state;
> >>> unsigned int sequence;
> >>> @@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
> >>>
> >>> struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
> >>>
> >>> -/*
> >>> - * vfe_disable - Disable streaming on VFE line
> >>> - * @line: VFE line
> >>> - *
> >>> - * Return 0 on success or a negative error code otherwise
> >>> - */
> >>> -int vfe_disable(struct vfe_line *line);
> >>> -
> >>> int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
> >>>
> >>> /*
> >>> @@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
> >>> int vfe_release_wm(struct vfe_device *vfe, u8 wm);
> >>> int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
> >>>
> >>> +/*
> >>> + * vfe_reset - Trigger reset on VFE module and wait to complete
> >>> + * @vfe: VFE device
> >>> + *
> >>> + * Return 0 on success or a negative error code otherwise
> >>> + */
> >>> +int vfe_reset(struct vfe_device *vfe);
> >>> +
> >>> extern const struct vfe_hw_ops vfe_ops_4_1;
> >>> extern const struct vfe_hw_ops vfe_ops_4_7;
> >>> extern const struct vfe_hw_ops vfe_ops_4_8;
> >>> +extern const struct vfe_hw_ops vfe_ops_170;
> >>>
> >>> #endif /* QC_MSM_CAMSS_VFE_H */
> >>> diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
> >>> index 97cea7c4d769..f282275af626 100644
> >>> --- a/drivers/media/platform/qcom/camss/camss-video.c
> >>> +++ b/drivers/media/platform/qcom/camss/camss-video.c
> >>> @@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
> >>> { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> >>> };
> >>>
> >>> +static const struct camss_format_info formats_rdi_845[] = {
> >>> + { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> >>> + { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> >>> + { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> >>> + { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> >>> + { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> >>> + { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> >>> + { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> >>> + { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> >>> + { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> >>> + { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> >>> + { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> >>> + { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> >>> + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> >>> + { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> >>> + { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> >>> + { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> >>> + { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> >>> + { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> >>> + { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> >>> + { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> >>> + { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> >>> + { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> >>> + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
> >>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> >>> +};
> >>> +
> >>> static const struct camss_format_info formats_pix_8x16[] = {
> >>> { MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
> >>> { { 1, 1 } }, { { 2, 3 } }, { 8 } },
> >>> @@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
> >>> video->formats = formats_rdi_8x96;
> >>> video->nformats = ARRAY_SIZE(formats_rdi_8x96);
> >>> }
> >>> + } else if (video->camss->version == CAMSS_845) {
> >>> + video->formats = formats_rdi_845;
> >>> + video->nformats = ARRAY_SIZE(formats_rdi_845);
> >>> } else {
> >>> ret = -EINVAL;
> >>> goto error_video_register;
> >>> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> >>> index 6c6f1e59ccd8..0e006def1996 100644
> >>> --- a/drivers/media/platform/qcom/camss/camss.c
> >>> +++ b/drivers/media/platform/qcom/camss/camss.c
> >>> @@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
> >>> }
> >>> };
> >>>
> >>> +static const struct resources vfe_res_845[] = {
> >>> + /* VFE0 */
> >>> + {
> >>> + .regulator = { NULL },
> >>> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> >>> + "soc_ahb", "vfe0", "vfe0_axi",
> >>> + "vfe0_src", "csi0",
> >>> + "csi0_src"},
> >>> + .clock_rate = { { 0 },
> >>> + { 0 },
> >>> + { 80000000 },
> >>> + { 0 },
> >>> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> >>> + { 0 },
> >>> + { 320000000 },
> >>> + { 19200000, 75000000, 384000000, 538666667 },
> >>> + { 384000000 } },
> >>> + .reg = { "vfe0" },
> >>> + .interrupt = { "vfe0" }
> >>> + },
> >>> +
> >>> + /* VFE1 */
> >>> + {
> >>> + .regulator = { NULL },
> >>> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> >>> + "soc_ahb", "vfe1", "vfe1_axi",
> >>> + "vfe1_src", "csi1",
> >>> + "csi1_src"},
> >>> + .clock_rate = { { 0 },
> >>> + { 0 },
> >>> + { 80000000 },
> >>> + { 0 },
> >>> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> >>> + { 0 },
> >>> + { 320000000 },
> >>> + { 19200000, 75000000, 384000000, 538666667 },
> >>> + { 384000000 } },
> >>> + .reg = { "vfe1" },
> >>> + .interrupt = { "vfe1" }
> >>> + },
> >>> +
> >>> + /* VFE-lite */
> >>> + {
> >>> + .regulator = { NULL },
> >>> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> >>> + "soc_ahb", "vfe_lite",
> >>> + "vfe_lite_src", "csi2",
> >>> + "csi2_src"},
> >>> + .clock_rate = { { 0 },
> >>> + { 0 },
> >>> + { 80000000 },
> >>> + { 0 },
> >>> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> >>> + { 320000000 },
> >>> + { 19200000, 75000000, 384000000, 538666667 },
> >>> + { 384000000 } },
> >>> + .reg = { "vfe_lite" },
> >>> + .interrupt = { "vfe_lite" }
> >>> + }
> >>> +};
> >>> +
> >>> /*
> >>> * camss_add_clock_margin - Add margin to clock frequency rate
> >>> * @rate: Clock frequency rate
> >>>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170
2021-02-22 17:21 ` Robert Foss
@ 2021-02-22 17:24 ` Andrey Konovalov
0 siblings, 0 replies; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-22 17:24 UTC (permalink / raw)
To: Robert Foss
Cc: Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab,
Rob Herring, angelogioacchino.delregno, MSM, linux-media,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, AngeloGioacchino Del Regno, Sakari Ailus,
Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
On 22.02.2021 20:21, Robert Foss wrote:
> On Mon, 22 Feb 2021 at 18:06, Andrey Konovalov
> <andrey.konovalov@linaro.org> wrote:
>>
>> Hi Robert,
>>
>> On 22.02.2021 19:37, Robert Foss wrote:
>>> On Sat, 20 Feb 2021 at 22:40, Andrey Konovalov
>>> <andrey.konovalov@linaro.org> wrote:
>>>>
>>>> Hi Robert,
>>>>
>>>> Thank you for your patch!
>>>>
>>>> On 17.02.2021 14:21, Robert Foss wrote:
>>>>> Add register definitions for version 170 of the Titan architecture
>>>>> and implement support for the RDI output mode.
>>>>>
>>>>> The RDI mode as opposed to the PIX output mode for the VFE unit does
>>>>> not support any ISP functionality. This means essentially only
>>>>> supporting dumping the output of the whatever the CSI decoder receives
>>>>> from the sensor.
>>>>>
>>>>> For example will a sensor outputting YUV pixel format frames, only
>>>>> allow the VFE to dump those frames as they are received by the ISP
>>>>> to memory through the RDI interface.
>>>>>
>>>>> Signed-off-by: Robert Foss <robert.foss@linaro.org>
>>>>> ---
>>>>>
>>>>>
>>>>> Changes since v1:
>>>>> - Andrey: Remove commented out chunk
>>>>> - Remove left over WIP comments
>>>>>
>>>>> Changes since v4:
>>>>> - Andrey: Remove traces of PIX support
>>>>> - Andrey: Fix vfe_global_reset() overwriting reset command
>>>>> - Remove unused variable
>>>>>
>>>>>
>>>>>
>>>>> drivers/media/platform/qcom/camss/Makefile | 1 +
>>>>> .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
>>>>> drivers/media/platform/qcom/camss/camss-vfe.c | 47 +-
>>>>> drivers/media/platform/qcom/camss/camss-vfe.h | 26 +-
>>>>> .../media/platform/qcom/camss/camss-video.c | 52 ++
>>>>> drivers/media/platform/qcom/camss/camss.c | 61 ++
>>>>> 6 files changed, 957 insertions(+), 20 deletions(-)
>>>>> create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c
>>>>>
>>>>> diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
>>>>> index 940c0ae3e003..052c4f405fa3 100644
>>>>> --- a/drivers/media/platform/qcom/camss/Makefile
>>>>> +++ b/drivers/media/platform/qcom/camss/Makefile
>>>>> @@ -11,6 +11,7 @@ qcom-camss-objs += \
>>>>> camss-vfe-4-1.o \
>>>>> camss-vfe-4-7.o \
>>>>> camss-vfe-4-8.o \
>>>>> + camss-vfe-170.o \
>>>>> camss-vfe-gen1.o \
>>>>> camss-vfe.o \
>>>>> camss-video.o \
>>>>> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
>>>>> new file mode 100644
>>>>> index 000000000000..c4991b1f22f8
>>>>> --- /dev/null
>>>>> +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
>>>>> @@ -0,0 +1,790 @@
>>>>> +// SPDX-License-Identifier: GPL-2.0
>>>>> +/*
>>>>> + * camss-vfe-4-7.c
>>>>> + *
>>>>> + * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
>>>>> + *
>>>>> + * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
>>>>> + * Copyright (C) 2015-2018 Linaro Ltd.
>>>>
>>>> - it looks like the header comes from v4.7 without updating to Titan 170
>>>
>>> Gotcha, thanks!
>>>
>>>>
>>>>> + */
>>>>> +
>>>>> +#include <linux/delay.h>
>>>>> +#include <linux/interrupt.h>
>>>>> +#include <linux/io.h>
>>>>> +#include <linux/iopoll.h>
>>>>> +
>>>>> +#include "camss.h"
>>>>> +#include "camss-vfe.h"
>>>>> +
>>>>> +#define VFE_HW_VERSION (0x000)
>>>>> +
>>>>> +#define VFE_GLOBAL_RESET_CMD (0x018)
>>>>> +#define GLOBAL_RESET_CMD_CORE BIT(0)
>>>>> +#define GLOBAL_RESET_CMD_CAMIF BIT(1)
>>>>> +#define GLOBAL_RESET_CMD_BUS BIT(2)
>>>>> +#define GLOBAL_RESET_CMD_BUS_BDG BIT(3)
>>>>> +#define GLOBAL_RESET_CMD_REGISTER BIT(4)
>>>>> +#define GLOBAL_RESET_CMD_PM BIT(5)
>>>>> +#define GLOBAL_RESET_CMD_BUS_MISR BIT(6)
>>>>> +#define GLOBAL_RESET_CMD_TESTGEN BIT(7)
>>>>> +#define GLOBAL_RESET_CMD_DSP BIT(8)
>>>>> +#define GLOBAL_RESET_CMD_IDLE_CGC BIT(9)
>>>>> +#define GLOBAL_RESET_CMD_RDI0 BIT(10)
>>>>> +#define GLOBAL_RESET_CMD_RDI1 BIT(11)
>>>>> +#define GLOBAL_RESET_CMD_RDI2 BIT(12)
>>>>> +#define GLOBAL_RESET_CMD_RDI3 BIT(13)
>>>>> +#define GLOBAL_RESET_CMD_VFE_DOMAIN BIT(30)
>>>>> +#define GLOBAL_RESET_CMD_RESET_BYPASS BIT(31)
>>>>> +
>>>>> +
>>>>> +#define VFE_CORE_CFG (0x050)
>>>>> +#define CFG_PIXEL_PATTERN_YCBYCR (0x4)
>>>>> +#define CFG_PIXEL_PATTERN_YCRYCB (0x5)
>>>>> +#define CFG_PIXEL_PATTERN_CBYCRY (0x6)
>>>>> +#define CFG_PIXEL_PATTERN_CRYCBY (0x7)
>>>>> +#define CFG_COMPOSITE_REG_UPDATE_EN BIT(4)
>>>>> +
>>>>> +#define VFE_IRQ_CMD (0x058)
>>>>> +#define CMD_GLOBAL_CLEAR BIT(0)
>>>>> +
>>>>> +#define VFE_IRQ_MASK_0 (0x05c)
>>>>> +#define MASK_0_CAMIF_SOF BIT(0)
>>>>> +#define MASK_0_CAMIF_EOF BIT(1)
>>>>> +#define MASK_0_RDI_REG_UPDATE(n) BIT((n) + 5)
>>>>> +#define MASK_0_IMAGE_MASTER_n_PING_PONG(n) BIT((n) + 8)
>>>>> +#define MASK_0_IMAGE_COMPOSITE_DONE_n(n) BIT((n) + 25)
>>>>> +#define MASK_0_RESET_ACK BIT(31)
>>>>> +
>>>>> +#define VFE_IRQ_MASK_1 (0x060)
>>>>> +#define MASK_1_CAMIF_ERROR BIT(0)
>>>>> +#define MASK_1_VIOLATION BIT(7)
>>>>> +#define MASK_1_BUS_BDG_HALT_ACK BIT(8)
>>>>> +#define MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n) BIT((n) + 9)
>>>>> +#define MASK_1_RDI_SOF(n) BIT((n) + 29)
>>>>> +
>>>>> +#define VFE_IRQ_CLEAR_0 (0x064)
>>>>> +#define VFE_IRQ_CLEAR_1 (0x068)
>>>>> +
>>>>> +#define VFE_IRQ_STATUS_0 (0x06c)
>>>>> +#define STATUS_0_CAMIF_SOF BIT(0)
>>>>> +#define STATUS_0_RDI_REG_UPDATE(n) BIT((n) + 5)
>>>>> +#define STATUS_0_IMAGE_MASTER_PING_PONG(n) BIT((n) + 8)
>>>>> +#define STATUS_0_IMAGE_COMPOSITE_DONE(n) BIT((n) + 25)
>>>>> +#define STATUS_0_RESET_ACK BIT(31)
>>>>> +
>>>>> +#define VFE_IRQ_STATUS_1 (0x070)
>>>>> +#define STATUS_1_VIOLATION BIT(7)
>>>>> +#define STATUS_1_BUS_BDG_HALT_ACK BIT(8)
>>>>> +#define STATUS_1_RDI_SOF(n) BIT((n) + 27)
>>>>> +
>>>>> +#define VFE_VIOLATION_STATUS (0x07c)
>>>>> +
>>>>> +#define VFE_CAMIF_CMD (0x478)
>>>>> +#define CMD_CLEAR_CAMIF_STATUS BIT(2)
>>>>> +
>>>>> +#define VFE_CAMIF_CFG (0x47c)
>>>>> +#define CFG_VSYNC_SYNC_EDGE (0)
>>>>> +#define VSYNC_ACTIVE_HIGH (0)
>>>>> +#define VSYNC_ACTIVE_LOW (1)
>>>>> +#define CFG_HSYNC_SYNC_EDGE (1)
>>>>> +#define HSYNC_ACTIVE_HIGH (0)
>>>>> +#define HSYNC_ACTIVE_LOW (1)
>>>>> +#define CFG_VFE_SUBSAMPLE_ENABLE BIT(4)
>>>>> +#define CFG_BUS_SUBSAMPLE_ENABLE BIT(5)
>>>>> +#define CFG_VFE_OUTPUT_EN BIT(6)
>>>>> +#define CFG_BUS_OUTPUT_EN BIT(7)
>>>>> +#define CFG_BINNING_EN BIT(9)
>>>>> +#define CFG_FRAME_BASED_EN BIT(10)
>>>>> +#define CFG_RAW_CROP_EN BIT(22)
>>>>> +
>>>>> +// XXX different, don't exist in TITAN register docs
>>>>> +#define VFE_0_CAMIF_FRAME_CFG 0x484
>>>>> +#define VFE_0_CAMIF_WINDOW_WIDTH_CFG 0x488
>>>>> +#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG 0x48c
>>>>> +#define VFE_0_CAMIF_SUBSAMPLE_CFG 0x490
>>>>> +#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN 0x498
>>>>> +#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN 0x49c
>>>>> +#define VFE_0_CAMIF_STATUS 0x4a4
>>>>> +#define VFE_0_CAMIF_STATUS_HALT BIT(31)
>>>>> +#define CAMIF_TIMEOUT_SLEEP_US 1000
>>>>> +#define CAMIF_TIMEOUT_ALL_US 1000000
>>>>> +
>>>>> +#define VFE_REG_UPDATE_CMD (0x4ac)
>>>>> +#define REG_UPDATE_RDI(n) BIT(1 + (n))
>>>>> +
>>>>> +
>>>>> +#define VFE_BUS_IRQ_MASK(n) (0x2044 + (n) * 4)
>>>>> +#define VFE_BUS_IRQ_CLEAR(n) (0x2050 + (n) * 4)
>>>>> +
>>>>> +#define VFE_BUS_IRQ_STATUS(n) (0x205c + (n) * 4)
>>>>> +#define STATUS0_COMP_RESET_DONE BIT(0)
>>>>> +#define STATUS0_COMP_REG_UPDATE0_DONE BIT(1)
>>>>> +#define STATUS0_COMP_REG_UPDATE1_DONE BIT(2)
>>>>> +#define STATUS0_COMP_REG_UPDATE2_DONE BIT(3)
>>>>> +#define STATUS0_COMP_REG_UPDATE3_DONE BIT(4)
>>>>> +#define STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
>>>>> +#define STATUS0_COMP0_BUF_DONE BIT(5)
>>>>> +#define STATUS0_COMP1_BUF_DONE BIT(6)
>>>>> +#define STATUS0_COMP2_BUF_DONE BIT(7)
>>>>> +#define STATUS0_COMP3_BUF_DONE BIT(8)
>>>>> +#define STATUS0_COMP4_BUF_DONE BIT(9)
>>>>> +#define STATUS0_COMP5_BUF_DONE BIT(10)
>>>>> +#define STATUS0_COMP_BUF_DONE(n) BIT(n + 5)
>>>>> +#define STATUS0_COMP_ERROR BIT(11)
>>>>> +#define STATUS0_COMP_OVERWRITE BIT(12)
>>>>> +#define STATUS0_OVERFLOW BIT(13)
>>>>> +#define STATUS0_VIOLATION BIT(14)
>>>>> +/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
>>>>> +#define STATUS1_WM_CLIENT_BUF_DONE(n) BIT(n)
>>>>> +#define STATUS1_EARLY_DONE BIT(24)
>>>>> +#define STATUS2_DUAL_COMP0_BUF_DONE BIT(0)
>>>>> +#define STATUS2_DUAL_COMP1_BUF_DONE BIT(1)
>>>>> +#define STATUS2_DUAL_COMP2_BUF_DONE BIT(2)
>>>>> +#define STATUS2_DUAL_COMP3_BUF_DONE BIT(3)
>>>>> +#define STATUS2_DUAL_COMP4_BUF_DONE BIT(4)
>>>>> +#define STATUS2_DUAL_COMP5_BUF_DONE BIT(5)
>>>>> +#define STATUS2_DUAL_COMP_BUF_DONE(n) BIT(n)
>>>>> +#define STATUS2_DUAL_COMP_ERROR BIT(6)
>>>>> +#define STATUS2_DUAL_COMP_OVERWRITE BIT(7)
>>>>> +
>>>>> +#define VFE_BUS_IRQ_CLEAR_GLOBAL (0x2068)
>>>>> +
>>>>> +#define VFE_BUS_WM_DEBUG_STATUS_CFG (0x226c)
>>>>> +#define DEBUG_STATUS_CFG_STATUS0(n) BIT(n)
>>>>> +#define DEBUG_STATUS_CFG_STATUS1(n) BIT(8+n)
>>>>> +
>>>>> +#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER (0x2080)
>>>>> +
>>>>> +#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC (0x2084)
>>>>> +#define BUS_VER2_MAX_CLIENTS (24)
>>>>> +#define WM_ADDR_NO_SYNC_DEFAULT_VAL \
>>>>> + ((1 << BUS_VER2_MAX_CLIENTS) - 1)
>>>>> +
>>>>> +#define VFE_BUS_WM_CGC_OVERRIDE (0x200c)
>>>>> +#define WM_CGC_OVERRIDE_ALL (0xFFFFF)
>>>>> +
>>>>> +#define VFE_BUS_WM_TEST_BUS_CTRL (0x211c)
>>>>> +
>>>>> +#define VFE_BUS_WM_STATUS0(n) (0x2200 + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_STATUS1(n) (0x2204 + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_CFG(n) (0x2208 + (n) * 0x100)
>>>>> +#define WM_CFG_EN (0)
>>>>> +#define WM_CFG_MODE (1)
>>>>> +#define MODE_QCOM_PLAIN (0)
>>>>> +#define MODE_MIPI_RAW (1)
>>>>> +#define WM_CFG_VIRTUALFRAME (2)
>>>>> +#define VFE_BUS_WM_HEADER_ADDR(n) (0x220c + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_HEADER_CFG(n) (0x2210 + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_IMAGE_ADDR(n) (0x2214 + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n) (0x2218 + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n) (0x221c + (n) * 0x100)
>>>>> +#define WM_BUFFER_DEFAULT_WIDTH (0xFF01)
>>>>> +
>>>>> +#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n) (0x2220 + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_PACKER_CFG(n) (0x2224 + (n) * 0x100)
>>>>> +
>>>>> +#define VFE_BUS_WM_STRIDE(n) (0x2228 + (n) * 0x100)
>>>>> +#define WM_STRIDE_DEFAULT_STRIDE (0xFF01)
>>>>> +
>>>>> +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n) (0x2248 + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n) (0x224c + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_FRAMEDROP_PERIOD(n) (0x2250 + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_FRAMEDROP_PATTERN(n) (0x2254 + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_FRAME_INC(n) (0x2258 + (n) * 0x100)
>>>>> +#define VFE_BUS_WM_BURST_LIMIT(n) (0x225c + (n) * 0x100)
>>>>> +
>>>>> +
>>>>> +static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
>>>>> +{
>>>>> + u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
>>>>> +
>>>>> + u32 gen = (hw_version >> 28) & 0xF;
>>>>> + u32 rev = (hw_version >> 16) & 0xFFF;
>>>>> + u32 step = hw_version & 0xFFFF;
>>>>> +
>>>>> + dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
>>>>> +}
>>>>> +
>>>>> +static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
>>>>> +{
>>>>> + u32 bits = readl_relaxed(vfe->base + reg);
>>>>> +
>>>>> + writel_relaxed(bits & ~clr_bits, vfe->base + reg);
>>>>> +}
>>>>> +
>>>>> +static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
>>>>> +{
>>>>> + u32 bits = readl_relaxed(vfe->base + reg);
>>>>> +
>>>>> + writel_relaxed(bits | set_bits, vfe->base + reg);
>>>>> +}
>>>>> +
>>>>> +static void vfe_global_reset(struct vfe_device *vfe)
>>>>> +{
>>>>> + u32 reset_bits = GLOBAL_RESET_CMD_CORE |
>>>>> + GLOBAL_RESET_CMD_CAMIF |
>>>>> + GLOBAL_RESET_CMD_BUS |
>>>>> + GLOBAL_RESET_CMD_REGISTER |
>>>>> + GLOBAL_RESET_CMD_PM |
>>>>> + GLOBAL_RESET_CMD_BUS_MISR |
>>>>> + GLOBAL_RESET_CMD_IDLE_CGC |
>>>>> + GLOBAL_RESET_CMD_RDI0 |
>>>>> + GLOBAL_RESET_CMD_RDI1 |
>>>>> + GLOBAL_RESET_CMD_RDI2;
>>>>
>>>> - so the reset_bits is set to 0x00001E77 in v5.
>>>>
>>>> In v4 the reset_bits was set to 0x00003F9F which corresponds to:
>>>>
>>>> GLOBAL_RESET_CMD_CORE |
>>>> GLOBAL_RESET_CMD_CAMIF |
>>>> GLOBAL_RESET_CMD_BUS |
>>>> GLOBAL_RESET_CMD_BUS_BDG |
>>>> GLOBAL_RESET_CMD_REGISTER |
>>>> GLOBAL_RESET_CMD_TESTGEN |
>>>> GLOBAL_RESET_CMD_DSP |
>>>> GLOBAL_RESET_CMD_IDLE_CGC |
>>>> GLOBAL_RESET_CMD_RDI0 |
>>>> GLOBAL_RESET_CMD_RDI1 |
>>>> GLOBAL_RESET_CMD_RDI2 |
>>>> GLOBAL_RESET_CMD_RDI3;
>>>>
>>>> So the difference between v4 and v5 is:
>>>>
>>>> reset in v4, not reset in v5:
>>>> GLOBAL_RESET_CMD_BUS_BDG
>>>> GLOBAL_RESET_CMD_TESTGEN
>>>> GLOBAL_RESET_CMD_DSP
>>>>
>>>> reset in v5, not reset in v4:
>>>> GLOBAL_RESET_CMD_PM
>>>> GLOBAL_RESET_CMD_BUS_MISR
>>>>
>>>> - correct?
>>>>
>>>> It is probably worth a few words in the v4 vs v5 changelog.
>>>>
>>>> (dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2
>>>> according to the driver code)
>>>>
>>>
>>> Great catch! I made a mistake with the bit-ordering after doing a
>>> hex->binary translation.
>>> I'll straighten this out in v6.
>>>
>>>>> +
>>>>> + writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
>>>>> +
>>>>> + /* Make sure IRQ mask has been written before resetting */
>>>>> + wmb();
>>>>> +
>>>>> + writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
>>>>> +}
>>>>> +
>>>>> +static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
>>>>> +{
>>>>> + u32 val;
>>>>> +
>>>>> + /*Set Debug Registers*/
>>>>> + val = DEBUG_STATUS_CFG_STATUS0(1) |
>>>>> + DEBUG_STATUS_CFG_STATUS0(7);
>>>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
>>>>> +
>>>>> + /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
>>>>> + writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
>>>>> +
>>>>> + /* no clock gating at bus input */
>>>>> + val = WM_CGC_OVERRIDE_ALL;
>>>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
>>>>> +
>>>>> + writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
>>>>> +
>>>>> + /* if addr_no_sync has default value then config the addr no sync reg */
>>>>> + val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
>>>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
>>>>> +
>>>>> + writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
>>>>> +
>>>>> + val = WM_BUFFER_DEFAULT_WIDTH;
>>>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
>>>>> +
>>>>> + val = 0;
>>>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
>>>>> +
>>>>> + val = 0;
>>>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
>>>>> +
>>>>> + /* Configure stride for RDIs */
>>>>> + //val = pix->plane_fmt[0].bytesperline;
>>>>> + val = WM_STRIDE_DEFAULT_STRIDE;
>>>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
>>>>> +
>>>>> + /* Enable WM */
>>>>> + val = 1 << WM_CFG_EN |
>>>>> + MODE_MIPI_RAW << WM_CFG_MODE;
>>>>> + writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
>>>>> +}
>>>>> +
>>>>> +static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
>>>>> +{
>>>>> + /* Disable WM */
>>>>> + writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
>>>>> +}
>>>>> +
>>>>> +static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
>>>>> + struct vfe_line *line)
>>>>> +{
>>>>> + struct v4l2_pix_format_mplane *pix =
>>>>> + &line->video_out.active_fmt.fmt.pix_mp;
>>>>> + u32 stride = pix->plane_fmt[0].bytesperline;
>>>>> +
>>>>> + writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
>>>>> + writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
>>>>> +}
>>>>> +
>>>>> +static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
>>>>> +{
>>>>> + vfe->reg_update |= REG_UPDATE_RDI(line_id);
>>>>> +
>>>>> + /* Enforce ordering between previous reg writes and reg update */
>>>>> + wmb();
>>>>> +
>>>>> + writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
>>>>> +
>>>>> + /* Enforce ordering between reg update and subsequent reg writes */
>>>>> + wmb();
>>>>> +}
>>>>> +
>>>>> +static inline void vfe_reg_update_clear(struct vfe_device *vfe,
>>>>> + enum vfe_line_id line_id)
>>>>> +{
>>>>> + vfe->reg_update &= ~REG_UPDATE_RDI(line_id);
>>>>> +}
>>>>> +
>>>>> +static void vfe_enable_irq_common(struct vfe_device *vfe)
>>>>> +{
>>>>> + vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
>>>>> + vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
>>>>> +
>>>>> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
>>>>> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
>>>>> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));
>>>>
>>>> Looking at the #defines in the beginning of this file, only part
>>>> of the IRQ sources (not the whole 32 per each register) are used
>>>> or defined.
>>>>
>>>> Is it safe to unmask the unused (reserved?) bits in the above 5
>>>> IRQ mask registers?
>>>
>>> Unfortunately this register is not defined at all in any documentation
>>> of the downstream[1] kernel, so I think the situation is actually a
>>> bit worse than what you've pointed out here.
>>> I'd like to remove the register defines above since I don't have a
>>> reliable source for them. But I would like to keep the register writes
>>> just as they are since that seems to work.
>>>
>>> What are your thoughts?
>>
>> Without having the documentation, using the known good writes is fine.
>> Removing the unused defines is also good.
>
> Some of the register definitions like STATUS0_COMP_BUF_DONE is used
> currently, and are documented for later generations of this hardware.
> But I'm not finding any traces for this generation. Chances are that
> they are the same, but I cant guarantee it. But at least some of them
> seem to be correct, and are indeed needed. I'm tempted to leave this
> exactly the way it is. Would that be ok for you?
Yes, that's OK for me.
Thanks,
Andrey
>>
>> Thanks,
>> Andrey
>>
>>> [1] https://git.linaro.org/people/robert.foss/linux.git/log/?h=msm_sdm845
>>>
>>>>
>>>>> +}
>>>>> +
>>>>> +static void vfe_isr_halt_ack(struct vfe_device *vfe)
>>>>> +{
>>>>> + complete(&vfe->halt_complete);
>>>>> +}
>>>>> +
>>>>> +static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
>>>>> +{
>>>>> + *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
>>>>> + *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
>>>>> +
>>>>> + writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
>>>>> + writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
>>>>> +
>>>>> + /* Enforce ordering between IRQ Clear and Global IRQ Clear */
>>>>> + wmb();
>>>>> + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
>>>>> +}
>>>>> +
>>>>> +static void vfe_violation_read(struct vfe_device *vfe)
>>>>> +{
>>>>> + u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
>>>>> +
>>>>> + pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
>>>>> +}
>>>>> +
>>>>> +/*
>>>>> + * vfe_isr - VFE module interrupt handler
>>>>> + * @irq: Interrupt line
>>>>> + * @dev: VFE device
>>>>> + *
>>>>> + * Return IRQ_HANDLED on success
>>>>> + */
>>>>> +static irqreturn_t vfe_isr(int irq, void *dev)
>>>>> +{
>>>>> + struct vfe_device *vfe = dev;
>>>>> + u32 status0, status1, vfe_bus_status[3];
>>>>> + int i, wm;
>>>>> +
>>>>> + status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
>>>>> + status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
>>>>> +
>>>>> + writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
>>>>> + writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
>>>>> +
>>>>> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
>>>>> + vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
>>>>> + writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
>>>>> + }
>>>>> +
>>>>> + /* Enforce ordering between IRQ reading and interpretation */
>>>>> + wmb();
>>>>> +
>>>>> + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
>>>>> + writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
>>>>> +
>>>>> + if (status0 & STATUS_0_RESET_ACK)
>>>>> + vfe->isr_ops.reset_ack(vfe);
>>>>> +
>>>>> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
>>>>> + if (status0 & STATUS_0_RDI_REG_UPDATE(i))
>>>>> + vfe->isr_ops.reg_update(vfe, i);
>>>>> +
>>>>> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
>>>>> + if (status0 & STATUS_1_RDI_SOF(i))
>>>>> + vfe->isr_ops.sof(vfe, i);
>>>>> +
>>>>> + for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
>>>>> + if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
>>>>> + vfe->isr_ops.comp_done(vfe, i);
>>>>> +
>>>>> + for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
>>>>> + if (status0 & BIT(9))
>>>>> + if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
>>>>> + vfe->isr_ops.wm_done(vfe, wm);
>>>>> +
>>>>> + return IRQ_HANDLED;
>>>>> +}
>>>>> +
>>>>> +/*
>>>>> + * vfe_halt - Trigger halt on VFE module and wait to complete
>>>>> + * @vfe: VFE device
>>>>> + *
>>>>> + * Return 0 on success or a negative error code otherwise
>>>>> + */
>>>>> +static int vfe_halt(struct vfe_device *vfe)
>>>>> +{
>>>>> + unsigned long time;
>>>>> +
>>>>> + return 0;
>>>>> +
>>>>> + reinit_completion(&vfe->halt_complete);
>>>>> +
>>>>> + time = wait_for_completion_timeout(&vfe->halt_complete,
>>>>> + msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
>>>>> + if (!time) {
>>>>> + dev_err(vfe->camss->dev, "VFE halt timeout\n");
>>>>> + return -EIO;
>>>>> + }
>>>>> +
>>>>> + return 0;
>>>>> +}
>>>>> +
>>>>> +static int vfe_get_output(struct vfe_line *line)
>>>>> +{
>>>>> + struct vfe_device *vfe = to_vfe(line);
>>>>> + struct vfe_output *output;
>>>>> + unsigned long flags;
>>>>> + int i;
>>>>> + int wm_idx;
>>>>> +
>>>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>>>> +
>>>>> + output = &line->output;
>>>>> + if (output->state != VFE_OUTPUT_OFF) {
>>>>> + dev_err(vfe->camss->dev, "Output is running\n");
>>>>> + goto error;
>>>>> + }
>>>>> +
>>>>> + output->wm_num = 1;
>>>>> +
>>>>> + for (i = 0; i < output->wm_num; i++) {
>>>>
>>>> - this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...
>>>
>>> Ack.
>>>
>>>>
>>>>> + wm_idx = vfe_reserve_wm(vfe, line->id);
>>>>> + if (wm_idx < 0) {
>>>>> + dev_err(vfe->camss->dev, "Can not reserve wm\n");
>>>>> + goto error_get_wm;
>>>>> + }
>>>>> + output->wm_idx[i] = wm_idx;
>>>>> + }
>>>>> +
>>>>> + output->drop_update_idx = 0;
>>>>> +
>>>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>>>> +
>>>>> + return 0;
>>>>> +
>>>>> +error_get_wm:
>>>>> + for (i--; i >= 0; i--)
>>>>
>>>> - ... and this one too. And the "i" local var is no longer needed.
>>>
>>> Ack
>>>
>>>>
>>>> Thanks,
>>>> Andrey
>>>>
>>>>> + vfe_release_wm(vfe, output->wm_idx[i]);
>>>>> + output->state = VFE_OUTPUT_OFF;
>>>>> +error:
>>>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>>>> +
>>>>> + return -EINVAL;
>>>>> +}
>>>>> +
>>>>> +static int vfe_enable_output(struct vfe_line *line)
>>>>> +{
>>>>> + struct vfe_device *vfe = to_vfe(line);
>>>>> + struct vfe_output *output = &line->output;
>>>>> + const struct vfe_hw_ops *ops = vfe->ops;
>>>>> + struct media_entity *sensor;
>>>>> + unsigned long flags;
>>>>> + unsigned int frame_skip = 0;
>>>>> + unsigned int i;
>>>>> +
>>>>> + sensor = camss_find_sensor(&line->subdev.entity);
>>>>> + if (sensor) {
>>>>> + struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
>>>>> +
>>>>> + v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
>>>>> + /* Max frame skip is 29 frames */
>>>>> + if (frame_skip > VFE_FRAME_DROP_VAL - 1)
>>>>> + frame_skip = VFE_FRAME_DROP_VAL - 1;
>>>>> + }
>>>>> +
>>>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>>>> +
>>>>> + ops->reg_update_clear(vfe, line->id);
>>>>> +
>>>>> + if (output->state != VFE_OUTPUT_OFF) {
>>>>> + dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
>>>>> + output->state);
>>>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>>>> + return -EINVAL;
>>>>> + }
>>>>> +
>>>>> + WARN_ON(output->gen2.active_num);
>>>>> +
>>>>> + output->state = VFE_OUTPUT_ON;
>>>>> +
>>>>> + output->sequence = 0;
>>>>> + output->wait_reg_update = 0;
>>>>> + reinit_completion(&output->reg_update);
>>>>> +
>>>>> + vfe_wm_start(vfe, output->wm_idx[0], line);
>>>>> +
>>>>> + for (i = 0; i < 2; i++) {
>>>>> + output->buf[i] = vfe_buf_get_pending(output);
>>>>> + if (!output->buf[i])
>>>>> + break;
>>>>> + output->gen2.active_num++;
>>>>> + vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
>>>>> + }
>>>>> +
>>>>> + ops->reg_update(vfe, line->id);
>>>>> +
>>>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>>>> +
>>>>> + return 0;
>>>>> +}
>>>>> +
>>>>> +static int vfe_disable_output(struct vfe_line *line)
>>>>> +{
>>>>> + struct vfe_device *vfe = to_vfe(line);
>>>>> + struct vfe_output *output = &line->output;
>>>>> + unsigned long flags;
>>>>> + unsigned int i;
>>>>> + bool done;
>>>>> + int timeout = 0;
>>>>> +
>>>>> + do {
>>>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>>>> + done = !output->gen2.active_num;
>>>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>>>> + usleep_range(10000, 20000);
>>>>> +
>>>>> + if (timeout++ == 100) {
>>>>> + dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
>>>>> + vfe_reset(vfe);
>>>>> + output->gen2.active_num = 0;
>>>>> + return 0;
>>>>> + }
>>>>> + } while (!done);
>>>>> +
>>>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>>>> + for (i = 0; i < output->wm_num; i++)
>>>>> + vfe_wm_stop(vfe, output->wm_idx[i]);
>>>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>>>> +
>>>>> + return 0;
>>>>> +}
>>>>> +
>>>>> +/*
>>>>> + * vfe_enable - Enable streaming on VFE line
>>>>> + * @line: VFE line
>>>>> + *
>>>>> + * Return 0 on success or a negative error code otherwise
>>>>> + */
>>>>> +static int vfe_enable(struct vfe_line *line)
>>>>> +{
>>>>> + struct vfe_device *vfe = to_vfe(line);
>>>>> + int ret;
>>>>> +
>>>>> + mutex_lock(&vfe->stream_lock);
>>>>> +
>>>>> + if (!vfe->stream_count)
>>>>> + vfe_enable_irq_common(vfe);
>>>>> +
>>>>> + vfe->stream_count++;
>>>>> +
>>>>> + mutex_unlock(&vfe->stream_lock);
>>>>> +
>>>>> + ret = vfe_get_output(line);
>>>>> + if (ret < 0)
>>>>> + goto error_get_output;
>>>>> +
>>>>> + ret = vfe_enable_output(line);
>>>>> + if (ret < 0)
>>>>> + goto error_enable_output;
>>>>> +
>>>>> + vfe->was_streaming = 1;
>>>>> +
>>>>> + return 0;
>>>>> +
>>>>> +
>>>>> +error_enable_output:
>>>>> + vfe_put_output(line);
>>>>> +
>>>>> +error_get_output:
>>>>> + mutex_lock(&vfe->stream_lock);
>>>>> +
>>>>> + vfe->stream_count--;
>>>>> +
>>>>> + mutex_unlock(&vfe->stream_lock);
>>>>> +
>>>>> + return ret;
>>>>> +}
>>>>> +
>>>>> +/*
>>>>> + * vfe_disable - Disable streaming on VFE line
>>>>> + * @line: VFE line
>>>>> + *
>>>>> + * Return 0 on success or a negative error code otherwise
>>>>> + */
>>>>> +static int vfe_disable(struct vfe_line *line)
>>>>> +{
>>>>> + struct vfe_device *vfe = to_vfe(line);
>>>>> +
>>>>> + vfe_disable_output(line);
>>>>> +
>>>>> + vfe_put_output(line);
>>>>> +
>>>>> + mutex_lock(&vfe->stream_lock);
>>>>> +
>>>>> + vfe->stream_count--;
>>>>> +
>>>>> + mutex_unlock(&vfe->stream_lock);
>>>>> +
>>>>> + return 0;
>>>>> +}
>>>>> +
>>>>> +/*
>>>>> + * vfe_isr_sof - Process start of frame interrupt
>>>>> + * @vfe: VFE Device
>>>>> + * @line_id: VFE line
>>>>> + */
>>>>> +static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
>>>>> +{
>>>>> +
>>>>> +}
>>>>> +
>>>>> +/*
>>>>> + * vfe_isr_reg_update - Process reg update interrupt
>>>>> + * @vfe: VFE Device
>>>>> + * @line_id: VFE line
>>>>> + */
>>>>> +static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
>>>>> +{
>>>>> + struct vfe_output *output;
>>>>> + unsigned long flags;
>>>>> +
>>>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>>>> + vfe->ops->reg_update_clear(vfe, line_id);
>>>>> +
>>>>> + output = &vfe->line[line_id].output;
>>>>> +
>>>>> + if (output->wait_reg_update) {
>>>>> + output->wait_reg_update = 0;
>>>>> + complete(&output->reg_update);
>>>>> + }
>>>>> +
>>>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>>>> +}
>>>>> +
>>>>> +/*
>>>>> + * vfe_isr_wm_done - Process write master done interrupt
>>>>> + * @vfe: VFE Device
>>>>> + * @wm: Write master id
>>>>> + */
>>>>> +static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
>>>>> +{
>>>>> + struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
>>>>> + struct camss_buffer *ready_buf;
>>>>> + struct vfe_output *output;
>>>>> + unsigned long flags;
>>>>> + u32 index;
>>>>> + u64 ts = ktime_get_ns();
>>>>> +
>>>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>>>> +
>>>>> + if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
>>>>> + dev_err_ratelimited(vfe->camss->dev,
>>>>> + "Received wm done for unmapped index\n");
>>>>> + goto out_unlock;
>>>>> + }
>>>>> + output = &vfe->line[vfe->wm_output_map[wm]].output;
>>>>> +
>>>>> + ready_buf = output->buf[0];
>>>>> + if (!ready_buf) {
>>>>> + dev_err_ratelimited(vfe->camss->dev,
>>>>> + "Missing ready buf %d!\n", output->state);
>>>>> + goto out_unlock;
>>>>> + }
>>>>> +
>>>>> + ready_buf->vb.vb2_buf.timestamp = ts;
>>>>> + ready_buf->vb.sequence = output->sequence++;
>>>>> +
>>>>> + index = 0;
>>>>> + output->buf[0] = output->buf[1];
>>>>> + if (output->buf[0])
>>>>> + index = 1;
>>>>> +
>>>>> + output->buf[index] = vfe_buf_get_pending(output);
>>>>> +
>>>>> + if (output->buf[index])
>>>>> + vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
>>>>> + else
>>>>> + output->gen2.active_num--;
>>>>> +
>>>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>>>> +
>>>>> + vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>>>>> +
>>>>> + return;
>>>>> +
>>>>> +out_unlock:
>>>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>>>> +}
>>>>> +
>>>>> +/*
>>>>> + * vfe_queue_buffer - Add empty buffer
>>>>> + * @vid: Video device structure
>>>>> + * @buf: Buffer to be enqueued
>>>>> + *
>>>>> + * Add an empty buffer - depending on the current number of buffers it will be
>>>>> + * put in pending buffer queue or directly given to the hardware to be filled.
>>>>> + *
>>>>> + * Return 0 on success or a negative error code otherwise
>>>>> + */
>>>>> +static int vfe_queue_buffer(struct camss_video *vid,
>>>>> + struct camss_buffer *buf)
>>>>> +{
>>>>> + struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
>>>>> + struct vfe_device *vfe = to_vfe(line);
>>>>> + struct vfe_output *output;
>>>>> + unsigned long flags;
>>>>> +
>>>>> + output = &line->output;
>>>>> +
>>>>> + spin_lock_irqsave(&vfe->output_lock, flags);
>>>>> +
>>>>> + if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
>>>>> + output->buf[output->gen2.active_num++] = buf;
>>>>> + vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
>>>>> + } else {
>>>>> + vfe_buf_add_pending(output, buf);
>>>>> + }
>>>>> +
>>>>> + spin_unlock_irqrestore(&vfe->output_lock, flags);
>>>>> +
>>>>> + return 0;
>>>>> +}
>>>>> +
>>>>> +const struct vfe_isr_ops vfe_isr_ops_170 = {
>>>>> + .reset_ack = vfe_isr_reset_ack,
>>>>> + .halt_ack = vfe_isr_halt_ack,
>>>>> + .reg_update = vfe_isr_reg_update,
>>>>> + .sof = vfe_isr_sof,
>>>>> + .comp_done = vfe_isr_comp_done,
>>>>> + .wm_done = vfe_isr_wm_done,
>>>>> +};
>>>>> +
>>>>> +static const struct camss_video_ops vfe_video_ops_170 = {
>>>>> + .queue_buffer = vfe_queue_buffer,
>>>>> + .flush_buffers = vfe_flush_buffers,
>>>>> +};
>>>>> +
>>>>> +static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
>>>>> +{
>>>>> + vfe->isr_ops = vfe_isr_ops_170;
>>>>> + vfe->video_ops = vfe_video_ops_170;
>>>>> +
>>>>> + vfe->line_num = VFE_LINE_NUM_GEN2;
>>>>> +}
>>>>> +
>>>>> +const struct vfe_hw_ops vfe_ops_170 = {
>>>>> + .global_reset = vfe_global_reset,
>>>>> + .hw_version_read = vfe_hw_version_read,
>>>>> + .isr_read = vfe_isr_read,
>>>>> + .isr = vfe_isr,
>>>>> + .reg_update_clear = vfe_reg_update_clear,
>>>>> + .reg_update = vfe_reg_update,
>>>>> + .subdev_init = vfe_subdev_init,
>>>>> + .vfe_disable = vfe_disable,
>>>>> + .vfe_enable = vfe_enable,
>>>>> + .vfe_halt = vfe_halt,
>>>>> + .violation_read = vfe_violation_read,
>>>>> +};
>>>>> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
>>>>> index 375843bd16af..6fafeb8a5484 100644
>>>>> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
>>>>> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
>>>>> @@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
>>>>> { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
>>>>> };
>>>>>
>>>>> +static const struct vfe_format formats_rdi_845[] = {
>>>>> + { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
>>>>> + { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
>>>>> + { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
>>>>> + { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
>>>>> + { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
>>>>> + { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
>>>>> + { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
>>>>> + { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
>>>>> + { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
>>>>> + { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
>>>>> + { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
>>>>> + { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
>>>>> + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
>>>>> + { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
>>>>> + { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
>>>>> + { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
>>>>> + { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
>>>>> + { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
>>>>> + { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
>>>>> + { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
>>>>> + { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
>>>>> + { MEDIA_BUS_FMT_Y10_1X10, 10 },
>>>>> + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
>>>>> +};
>>>>> +
>>>>> /*
>>>>> * vfe_get_bpp - map media bus format to bits per pixel
>>>>> * @formats: supported media bus formats array
>>>>> @@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
>>>>> return sink_code;
>>>>> }
>>>>> else if (vfe->camss->version == CAMSS_8x96 ||
>>>>> - vfe->camss->version == CAMSS_660)
>>>>> + vfe->camss->version == CAMSS_660 ||
>>>>> + vfe->camss->version == CAMSS_845)
>>>>> switch (sink_code) {
>>>>> case MEDIA_BUS_FMT_YUYV8_2X8:
>>>>> {
>>>>> @@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
>>>>> return 0;
>>>>> }
>>>>>
>>>>> -/*
>>>>> - * vfe_reset - Trigger reset on VFE module and wait to complete
>>>>> - * @vfe: VFE device
>>>>> - *
>>>>> - * Return 0 on success or a negative error code otherwise
>>>>> - */
>>>>> -static int vfe_reset(struct vfe_device *vfe)
>>>>> +int vfe_reset(struct vfe_device *vfe)
>>>>> {
>>>>> unsigned long time;
>>>>>
>>>>> @@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
>>>>> struct camss_clock *clock = &vfe->clock[i];
>>>>>
>>>>> if (!strcmp(clock->name, "vfe0") ||
>>>>> - !strcmp(clock->name, "vfe1")) {
>>>>> + !strcmp(clock->name, "vfe1") ||
>>>>> + !strcmp(clock->name, "vfe_lite")) {
>>>>> u64 min_rate = 0;
>>>>> long rate;
>>>>>
>>>>> @@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
>>>>> case CAMSS_660:
>>>>> vfe->ops = &vfe_ops_4_8;
>>>>> break;
>>>>> +
>>>>> + case CAMSS_845:
>>>>> + vfe->ops = &vfe_ops_170;
>>>>> + break;
>>>>> default:
>>>>> return -EINVAL;
>>>>> }
>>>>> @@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
>>>>> l->formats = formats_rdi_8x96;
>>>>> l->nformats = ARRAY_SIZE(formats_rdi_8x96);
>>>>> }
>>>>> + } else if (camss->version == CAMSS_845) {
>>>>> + l->formats = formats_rdi_845;
>>>>> + l->nformats = ARRAY_SIZE(formats_rdi_845);
>>>>> } else {
>>>>> return -EINVAL;
>>>>> }
>>>>> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
>>>>> index aad5dc74c2c0..29b3d930ffc6 100644
>>>>> --- a/drivers/media/platform/qcom/camss/camss-vfe.h
>>>>> +++ b/drivers/media/platform/qcom/camss/camss-vfe.h
>>>>> @@ -19,7 +19,6 @@
>>>>> #include "camss-video.h"
>>>>> #include "camss-vfe-gen1.h"
>>>>>
>>>>> -
>>>>> #define MSM_VFE_PAD_SINK 0
>>>>> #define MSM_VFE_PAD_SRC 1
>>>>> #define MSM_VFE_PADS_NUM 2
>>>>> @@ -38,14 +37,14 @@
>>>>> #define to_vfe(ptr_line) \
>>>>> container_of(vfe_line_array(ptr_line), struct vfe_device, line)
>>>>>
>>>>> -
>>>>> enum vfe_output_state {
>>>>> VFE_OUTPUT_OFF,
>>>>> VFE_OUTPUT_RESERVED,
>>>>> VFE_OUTPUT_SINGLE,
>>>>> VFE_OUTPUT_CONTINUOUS,
>>>>> VFE_OUTPUT_IDLE,
>>>>> - VFE_OUTPUT_STOPPING
>>>>> + VFE_OUTPUT_STOPPING,
>>>>> + VFE_OUTPUT_ON,
>>>>> };
>>>>>
>>>>> enum vfe_line_id {
>>>>> @@ -53,6 +52,7 @@ enum vfe_line_id {
>>>>> VFE_LINE_RDI0 = 0,
>>>>> VFE_LINE_RDI1 = 1,
>>>>> VFE_LINE_RDI2 = 2,
>>>>> + VFE_LINE_NUM_GEN2 = 3,
>>>>> VFE_LINE_PIX = 3,
>>>>> VFE_LINE_NUM_GEN1 = 4,
>>>>> VFE_LINE_NUM_MAX = 4
>>>>> @@ -73,6 +73,9 @@ struct vfe_output {
>>>>> int active_buf;
>>>>> int wait_sof;
>>>>> } gen1;
>>>>> + struct {
>>>>> + int active_num;
>>>>> + } gen2;
>>>>> };
>>>>> enum vfe_output_state state;
>>>>> unsigned int sequence;
>>>>> @@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
>>>>>
>>>>> struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
>>>>>
>>>>> -/*
>>>>> - * vfe_disable - Disable streaming on VFE line
>>>>> - * @line: VFE line
>>>>> - *
>>>>> - * Return 0 on success or a negative error code otherwise
>>>>> - */
>>>>> -int vfe_disable(struct vfe_line *line);
>>>>> -
>>>>> int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
>>>>>
>>>>> /*
>>>>> @@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
>>>>> int vfe_release_wm(struct vfe_device *vfe, u8 wm);
>>>>> int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
>>>>>
>>>>> +/*
>>>>> + * vfe_reset - Trigger reset on VFE module and wait to complete
>>>>> + * @vfe: VFE device
>>>>> + *
>>>>> + * Return 0 on success or a negative error code otherwise
>>>>> + */
>>>>> +int vfe_reset(struct vfe_device *vfe);
>>>>> +
>>>>> extern const struct vfe_hw_ops vfe_ops_4_1;
>>>>> extern const struct vfe_hw_ops vfe_ops_4_7;
>>>>> extern const struct vfe_hw_ops vfe_ops_4_8;
>>>>> +extern const struct vfe_hw_ops vfe_ops_170;
>>>>>
>>>>> #endif /* QC_MSM_CAMSS_VFE_H */
>>>>> diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
>>>>> index 97cea7c4d769..f282275af626 100644
>>>>> --- a/drivers/media/platform/qcom/camss/camss-video.c
>>>>> +++ b/drivers/media/platform/qcom/camss/camss-video.c
>>>>> @@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
>>>>> { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>>>> };
>>>>>
>>>>> +static const struct camss_format_info formats_rdi_845[] = {
>>>>> + { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>>>> + { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>>>> + { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>>>> + { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>>>> + { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
>>>>> + { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
>>>>> + { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
>>>>> + { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
>>>>> + { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
>>>>> + { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
>>>>> + { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
>>>>> + { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
>>>>> + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>>>> + { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
>>>>> + { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
>>>>> + { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
>>>>> + { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
>>>>> + { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
>>>>> + { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
>>>>> + { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
>>>>> + { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
>>>>> + { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
>>>>> + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
>>>>> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
>>>>> +};
>>>>> +
>>>>> static const struct camss_format_info formats_pix_8x16[] = {
>>>>> { MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
>>>>> { { 1, 1 } }, { { 2, 3 } }, { 8 } },
>>>>> @@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
>>>>> video->formats = formats_rdi_8x96;
>>>>> video->nformats = ARRAY_SIZE(formats_rdi_8x96);
>>>>> }
>>>>> + } else if (video->camss->version == CAMSS_845) {
>>>>> + video->formats = formats_rdi_845;
>>>>> + video->nformats = ARRAY_SIZE(formats_rdi_845);
>>>>> } else {
>>>>> ret = -EINVAL;
>>>>> goto error_video_register;
>>>>> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
>>>>> index 6c6f1e59ccd8..0e006def1996 100644
>>>>> --- a/drivers/media/platform/qcom/camss/camss.c
>>>>> +++ b/drivers/media/platform/qcom/camss/camss.c
>>>>> @@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
>>>>> }
>>>>> };
>>>>>
>>>>> +static const struct resources vfe_res_845[] = {
>>>>> + /* VFE0 */
>>>>> + {
>>>>> + .regulator = { NULL },
>>>>> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
>>>>> + "soc_ahb", "vfe0", "vfe0_axi",
>>>>> + "vfe0_src", "csi0",
>>>>> + "csi0_src"},
>>>>> + .clock_rate = { { 0 },
>>>>> + { 0 },
>>>>> + { 80000000 },
>>>>> + { 0 },
>>>>> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
>>>>> + { 0 },
>>>>> + { 320000000 },
>>>>> + { 19200000, 75000000, 384000000, 538666667 },
>>>>> + { 384000000 } },
>>>>> + .reg = { "vfe0" },
>>>>> + .interrupt = { "vfe0" }
>>>>> + },
>>>>> +
>>>>> + /* VFE1 */
>>>>> + {
>>>>> + .regulator = { NULL },
>>>>> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
>>>>> + "soc_ahb", "vfe1", "vfe1_axi",
>>>>> + "vfe1_src", "csi1",
>>>>> + "csi1_src"},
>>>>> + .clock_rate = { { 0 },
>>>>> + { 0 },
>>>>> + { 80000000 },
>>>>> + { 0 },
>>>>> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
>>>>> + { 0 },
>>>>> + { 320000000 },
>>>>> + { 19200000, 75000000, 384000000, 538666667 },
>>>>> + { 384000000 } },
>>>>> + .reg = { "vfe1" },
>>>>> + .interrupt = { "vfe1" }
>>>>> + },
>>>>> +
>>>>> + /* VFE-lite */
>>>>> + {
>>>>> + .regulator = { NULL },
>>>>> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
>>>>> + "soc_ahb", "vfe_lite",
>>>>> + "vfe_lite_src", "csi2",
>>>>> + "csi2_src"},
>>>>> + .clock_rate = { { 0 },
>>>>> + { 0 },
>>>>> + { 80000000 },
>>>>> + { 0 },
>>>>> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
>>>>> + { 320000000 },
>>>>> + { 19200000, 75000000, 384000000, 538666667 },
>>>>> + { 384000000 } },
>>>>> + .reg = { "vfe_lite" },
>>>>> + .interrupt = { "vfe_lite" }
>>>>> + }
>>>>> +};
>>>>> +
>>>>> /*
>>>>> * camss_add_clock_margin - Add margin to clock frequency rate
>>>>> * @rate: Clock frequency rate
>>>>>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170
2021-02-17 11:21 ` [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170 Robert Foss
2021-02-20 21:40 ` Andrey Konovalov
@ 2021-02-20 21:40 ` Andrey Konovalov
1 sibling, 0 replies; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-20 21:40 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
On 17.02.2021 14:21, Robert Foss wrote:
> Add register definitions for version 170 of the Titan architecture
> and implement support for the RDI output mode.
>
> The RDI mode as opposed to the PIX output mode for the VFE unit does
> not support any ISP functionality. This means essentially only
> supporting dumping the output of the whatever the CSI decoder receives
> from the sensor.
>
> For example will a sensor outputting YUV pixel format frames, only
> allow the VFE to dump those frames as they are received by the ISP
> to memory through the RDI interface.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
>
>
> Changes since v1:
> - Andrey: Remove commented out chunk
> - Remove left over WIP comments
>
> Changes since v4:
> - Andrey: Remove traces of PIX support
> - Andrey: Fix vfe_global_reset() overwriting reset command
> - Remove unused variable
>
>
>
> drivers/media/platform/qcom/camss/Makefile | 1 +
> .../media/platform/qcom/camss/camss-vfe-170.c | 790 ++++++++++++++++++
> drivers/media/platform/qcom/camss/camss-vfe.c | 47 +-
> drivers/media/platform/qcom/camss/camss-vfe.h | 26 +-
> .../media/platform/qcom/camss/camss-video.c | 52 ++
> drivers/media/platform/qcom/camss/camss.c | 61 ++
> 6 files changed, 957 insertions(+), 20 deletions(-)
> create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-170.c
>
> diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
> index 940c0ae3e003..052c4f405fa3 100644
> --- a/drivers/media/platform/qcom/camss/Makefile
> +++ b/drivers/media/platform/qcom/camss/Makefile
> @@ -11,6 +11,7 @@ qcom-camss-objs += \
> camss-vfe-4-1.o \
> camss-vfe-4-7.o \
> camss-vfe-4-8.o \
> + camss-vfe-170.o \
> camss-vfe-gen1.o \
> camss-vfe.o \
> camss-video.o \
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> new file mode 100644
> index 000000000000..c4991b1f22f8
> --- /dev/null
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> @@ -0,0 +1,790 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * camss-vfe-4-7.c
> + *
> + * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v4.7
> + *
> + * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
> + * Copyright (C) 2015-2018 Linaro Ltd.
- it looks like the header comes from v4.7 without updating to Titan 170
> + */
> +
> +#include <linux/delay.h>
> +#include <linux/interrupt.h>
> +#include <linux/io.h>
> +#include <linux/iopoll.h>
> +
> +#include "camss.h"
> +#include "camss-vfe.h"
> +
> +#define VFE_HW_VERSION (0x000)
> +
> +#define VFE_GLOBAL_RESET_CMD (0x018)
> +#define GLOBAL_RESET_CMD_CORE BIT(0)
> +#define GLOBAL_RESET_CMD_CAMIF BIT(1)
> +#define GLOBAL_RESET_CMD_BUS BIT(2)
> +#define GLOBAL_RESET_CMD_BUS_BDG BIT(3)
> +#define GLOBAL_RESET_CMD_REGISTER BIT(4)
> +#define GLOBAL_RESET_CMD_PM BIT(5)
> +#define GLOBAL_RESET_CMD_BUS_MISR BIT(6)
> +#define GLOBAL_RESET_CMD_TESTGEN BIT(7)
> +#define GLOBAL_RESET_CMD_DSP BIT(8)
> +#define GLOBAL_RESET_CMD_IDLE_CGC BIT(9)
> +#define GLOBAL_RESET_CMD_RDI0 BIT(10)
> +#define GLOBAL_RESET_CMD_RDI1 BIT(11)
> +#define GLOBAL_RESET_CMD_RDI2 BIT(12)
> +#define GLOBAL_RESET_CMD_RDI3 BIT(13)
> +#define GLOBAL_RESET_CMD_VFE_DOMAIN BIT(30)
> +#define GLOBAL_RESET_CMD_RESET_BYPASS BIT(31)
> +
> +
> +#define VFE_CORE_CFG (0x050)
> +#define CFG_PIXEL_PATTERN_YCBYCR (0x4)
> +#define CFG_PIXEL_PATTERN_YCRYCB (0x5)
> +#define CFG_PIXEL_PATTERN_CBYCRY (0x6)
> +#define CFG_PIXEL_PATTERN_CRYCBY (0x7)
> +#define CFG_COMPOSITE_REG_UPDATE_EN BIT(4)
> +
> +#define VFE_IRQ_CMD (0x058)
> +#define CMD_GLOBAL_CLEAR BIT(0)
> +
> +#define VFE_IRQ_MASK_0 (0x05c)
> +#define MASK_0_CAMIF_SOF BIT(0)
> +#define MASK_0_CAMIF_EOF BIT(1)
> +#define MASK_0_RDI_REG_UPDATE(n) BIT((n) + 5)
> +#define MASK_0_IMAGE_MASTER_n_PING_PONG(n) BIT((n) + 8)
> +#define MASK_0_IMAGE_COMPOSITE_DONE_n(n) BIT((n) + 25)
> +#define MASK_0_RESET_ACK BIT(31)
> +
> +#define VFE_IRQ_MASK_1 (0x060)
> +#define MASK_1_CAMIF_ERROR BIT(0)
> +#define MASK_1_VIOLATION BIT(7)
> +#define MASK_1_BUS_BDG_HALT_ACK BIT(8)
> +#define MASK_1_IMAGE_MASTER_n_BUS_OVERFLOW(n) BIT((n) + 9)
> +#define MASK_1_RDI_SOF(n) BIT((n) + 29)
> +
> +#define VFE_IRQ_CLEAR_0 (0x064)
> +#define VFE_IRQ_CLEAR_1 (0x068)
> +
> +#define VFE_IRQ_STATUS_0 (0x06c)
> +#define STATUS_0_CAMIF_SOF BIT(0)
> +#define STATUS_0_RDI_REG_UPDATE(n) BIT((n) + 5)
> +#define STATUS_0_IMAGE_MASTER_PING_PONG(n) BIT((n) + 8)
> +#define STATUS_0_IMAGE_COMPOSITE_DONE(n) BIT((n) + 25)
> +#define STATUS_0_RESET_ACK BIT(31)
> +
> +#define VFE_IRQ_STATUS_1 (0x070)
> +#define STATUS_1_VIOLATION BIT(7)
> +#define STATUS_1_BUS_BDG_HALT_ACK BIT(8)
> +#define STATUS_1_RDI_SOF(n) BIT((n) + 27)
> +
> +#define VFE_VIOLATION_STATUS (0x07c)
> +
> +#define VFE_CAMIF_CMD (0x478)
> +#define CMD_CLEAR_CAMIF_STATUS BIT(2)
> +
> +#define VFE_CAMIF_CFG (0x47c)
> +#define CFG_VSYNC_SYNC_EDGE (0)
> +#define VSYNC_ACTIVE_HIGH (0)
> +#define VSYNC_ACTIVE_LOW (1)
> +#define CFG_HSYNC_SYNC_EDGE (1)
> +#define HSYNC_ACTIVE_HIGH (0)
> +#define HSYNC_ACTIVE_LOW (1)
> +#define CFG_VFE_SUBSAMPLE_ENABLE BIT(4)
> +#define CFG_BUS_SUBSAMPLE_ENABLE BIT(5)
> +#define CFG_VFE_OUTPUT_EN BIT(6)
> +#define CFG_BUS_OUTPUT_EN BIT(7)
> +#define CFG_BINNING_EN BIT(9)
> +#define CFG_FRAME_BASED_EN BIT(10)
> +#define CFG_RAW_CROP_EN BIT(22)
> +
> +// XXX different, don't exist in TITAN register docs
> +#define VFE_0_CAMIF_FRAME_CFG 0x484
> +#define VFE_0_CAMIF_WINDOW_WIDTH_CFG 0x488
> +#define VFE_0_CAMIF_WINDOW_HEIGHT_CFG 0x48c
> +#define VFE_0_CAMIF_SUBSAMPLE_CFG 0x490
> +#define VFE_0_CAMIF_IRQ_FRAMEDROP_PATTERN 0x498
> +#define VFE_0_CAMIF_IRQ_SUBSAMPLE_PATTERN 0x49c
> +#define VFE_0_CAMIF_STATUS 0x4a4
> +#define VFE_0_CAMIF_STATUS_HALT BIT(31)
> +#define CAMIF_TIMEOUT_SLEEP_US 1000
> +#define CAMIF_TIMEOUT_ALL_US 1000000
> +
> +#define VFE_REG_UPDATE_CMD (0x4ac)
> +#define REG_UPDATE_RDI(n) BIT(1 + (n))
> +
> +
> +#define VFE_BUS_IRQ_MASK(n) (0x2044 + (n) * 4)
> +#define VFE_BUS_IRQ_CLEAR(n) (0x2050 + (n) * 4)
> +
> +#define VFE_BUS_IRQ_STATUS(n) (0x205c + (n) * 4)
> +#define STATUS0_COMP_RESET_DONE BIT(0)
> +#define STATUS0_COMP_REG_UPDATE0_DONE BIT(1)
> +#define STATUS0_COMP_REG_UPDATE1_DONE BIT(2)
> +#define STATUS0_COMP_REG_UPDATE2_DONE BIT(3)
> +#define STATUS0_COMP_REG_UPDATE3_DONE BIT(4)
> +#define STATUS0_COMP_REG_UPDATE_DONE(n) BIT(n + 1)
> +#define STATUS0_COMP0_BUF_DONE BIT(5)
> +#define STATUS0_COMP1_BUF_DONE BIT(6)
> +#define STATUS0_COMP2_BUF_DONE BIT(7)
> +#define STATUS0_COMP3_BUF_DONE BIT(8)
> +#define STATUS0_COMP4_BUF_DONE BIT(9)
> +#define STATUS0_COMP5_BUF_DONE BIT(10)
> +#define STATUS0_COMP_BUF_DONE(n) BIT(n + 5)
> +#define STATUS0_COMP_ERROR BIT(11)
> +#define STATUS0_COMP_OVERWRITE BIT(12)
> +#define STATUS0_OVERFLOW BIT(13)
> +#define STATUS0_VIOLATION BIT(14)
> +/* WM_CLIENT_BUF_DONE defined for buffers 0:19 */
> +#define STATUS1_WM_CLIENT_BUF_DONE(n) BIT(n)
> +#define STATUS1_EARLY_DONE BIT(24)
> +#define STATUS2_DUAL_COMP0_BUF_DONE BIT(0)
> +#define STATUS2_DUAL_COMP1_BUF_DONE BIT(1)
> +#define STATUS2_DUAL_COMP2_BUF_DONE BIT(2)
> +#define STATUS2_DUAL_COMP3_BUF_DONE BIT(3)
> +#define STATUS2_DUAL_COMP4_BUF_DONE BIT(4)
> +#define STATUS2_DUAL_COMP5_BUF_DONE BIT(5)
> +#define STATUS2_DUAL_COMP_BUF_DONE(n) BIT(n)
> +#define STATUS2_DUAL_COMP_ERROR BIT(6)
> +#define STATUS2_DUAL_COMP_OVERWRITE BIT(7)
> +
> +#define VFE_BUS_IRQ_CLEAR_GLOBAL (0x2068)
> +
> +#define VFE_BUS_WM_DEBUG_STATUS_CFG (0x226c)
> +#define DEBUG_STATUS_CFG_STATUS0(n) BIT(n)
> +#define DEBUG_STATUS_CFG_STATUS1(n) BIT(8+n)
> +
> +#define VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER (0x2080)
> +
> +#define VFE_BUS_WM_ADDR_SYNC_NO_SYNC (0x2084)
> +#define BUS_VER2_MAX_CLIENTS (24)
> +#define WM_ADDR_NO_SYNC_DEFAULT_VAL \
> + ((1 << BUS_VER2_MAX_CLIENTS) - 1)
> +
> +#define VFE_BUS_WM_CGC_OVERRIDE (0x200c)
> +#define WM_CGC_OVERRIDE_ALL (0xFFFFF)
> +
> +#define VFE_BUS_WM_TEST_BUS_CTRL (0x211c)
> +
> +#define VFE_BUS_WM_STATUS0(n) (0x2200 + (n) * 0x100)
> +#define VFE_BUS_WM_STATUS1(n) (0x2204 + (n) * 0x100)
> +#define VFE_BUS_WM_CFG(n) (0x2208 + (n) * 0x100)
> +#define WM_CFG_EN (0)
> +#define WM_CFG_MODE (1)
> +#define MODE_QCOM_PLAIN (0)
> +#define MODE_MIPI_RAW (1)
> +#define WM_CFG_VIRTUALFRAME (2)
> +#define VFE_BUS_WM_HEADER_ADDR(n) (0x220c + (n) * 0x100)
> +#define VFE_BUS_WM_HEADER_CFG(n) (0x2210 + (n) * 0x100)
> +#define VFE_BUS_WM_IMAGE_ADDR(n) (0x2214 + (n) * 0x100)
> +#define VFE_BUS_WM_IMAGE_ADDR_OFFSET(n) (0x2218 + (n) * 0x100)
> +#define VFE_BUS_WM_BUFFER_WIDTH_CFG(n) (0x221c + (n) * 0x100)
> +#define WM_BUFFER_DEFAULT_WIDTH (0xFF01)
> +
> +#define VFE_BUS_WM_BUFFER_HEIGHT_CFG(n) (0x2220 + (n) * 0x100)
> +#define VFE_BUS_WM_PACKER_CFG(n) (0x2224 + (n) * 0x100)
> +
> +#define VFE_BUS_WM_STRIDE(n) (0x2228 + (n) * 0x100)
> +#define WM_STRIDE_DEFAULT_STRIDE (0xFF01)
> +
> +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PERIOD(n) (0x2248 + (n) * 0x100)
> +#define VFE_BUS_WM_IRQ_SUBSAMPLE_PATTERN(n) (0x224c + (n) * 0x100)
> +#define VFE_BUS_WM_FRAMEDROP_PERIOD(n) (0x2250 + (n) * 0x100)
> +#define VFE_BUS_WM_FRAMEDROP_PATTERN(n) (0x2254 + (n) * 0x100)
> +#define VFE_BUS_WM_FRAME_INC(n) (0x2258 + (n) * 0x100)
> +#define VFE_BUS_WM_BURST_LIMIT(n) (0x225c + (n) * 0x100)
> +
> +
> +static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
> +{
> + u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
> +
> + u32 gen = (hw_version >> 28) & 0xF;
> + u32 rev = (hw_version >> 16) & 0xFFF;
> + u32 step = hw_version & 0xFFFF;
> +
> + dev_err(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
> +}
> +
> +static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
> +{
> + u32 bits = readl_relaxed(vfe->base + reg);
> +
> + writel_relaxed(bits & ~clr_bits, vfe->base + reg);
> +}
> +
> +static inline void vfe_reg_set(struct vfe_device *vfe, u32 reg, u32 set_bits)
> +{
> + u32 bits = readl_relaxed(vfe->base + reg);
> +
> + writel_relaxed(bits | set_bits, vfe->base + reg);
> +}
> +
> +static void vfe_global_reset(struct vfe_device *vfe)
> +{
> + u32 reset_bits = GLOBAL_RESET_CMD_CORE |
> + GLOBAL_RESET_CMD_CAMIF |
> + GLOBAL_RESET_CMD_BUS |
> + GLOBAL_RESET_CMD_REGISTER |
> + GLOBAL_RESET_CMD_PM |
> + GLOBAL_RESET_CMD_BUS_MISR |
> + GLOBAL_RESET_CMD_IDLE_CGC |
> + GLOBAL_RESET_CMD_RDI0 |
> + GLOBAL_RESET_CMD_RDI1 |
> + GLOBAL_RESET_CMD_RDI2;
- so the reset_bits is set to 0x00001E77 in v5.
In v4 the reset_bits was set to 0x00003F9F which corresponds to:
GLOBAL_RESET_CMD_CORE |
GLOBAL_RESET_CMD_CAMIF |
GLOBAL_RESET_CMD_BUS |
GLOBAL_RESET_CMD_BUS_BDG |
GLOBAL_RESET_CMD_REGISTER |
GLOBAL_RESET_CMD_TESTGEN |
GLOBAL_RESET_CMD_DSP |
GLOBAL_RESET_CMD_IDLE_CGC |
GLOBAL_RESET_CMD_RDI0 |
GLOBAL_RESET_CMD_RDI1 |
GLOBAL_RESET_CMD_RDI2 |
GLOBAL_RESET_CMD_RDI3;
So the difference between v4 and v5 is:
reset in v4, not reset in v5:
GLOBAL_RESET_CMD_BUS_BDG
GLOBAL_RESET_CMD_TESTGEN
GLOBAL_RESET_CMD_DSP
reset in v5, not reset in v4:
GLOBAL_RESET_CMD_PM
GLOBAL_RESET_CMD_BUS_MISR
- correct?
It is probably worth a few words in the v4 vs v5 changelog.
(dropping GLOBAL_RESET_CMD_RDI3 in v5 is clear - Titan 170 has only RDI0 to RDI2
according to the driver code)
> +
> + writel_relaxed(BIT(31), vfe->base + VFE_IRQ_MASK_0);
> +
> + /* Make sure IRQ mask has been written before resetting */
> + wmb();
> +
> + writel_relaxed(reset_bits, vfe->base + VFE_GLOBAL_RESET_CMD);
> +}
> +
> +static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
> +{
> + u32 val;
> +
> + /*Set Debug Registers*/
> + val = DEBUG_STATUS_CFG_STATUS0(1) |
> + DEBUG_STATUS_CFG_STATUS0(7);
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_DEBUG_STATUS_CFG);
> +
> + /* BUS_WM_INPUT_IF_ADDR_SYNC_FRAME_HEADER */
> + writel_relaxed(0, vfe->base + VFE_BUS_WM_ADDR_SYNC_FRAME_HEADER);
> +
> + /* no clock gating at bus input */
> + val = WM_CGC_OVERRIDE_ALL;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_CGC_OVERRIDE);
> +
> + writel_relaxed(0x0, vfe->base + VFE_BUS_WM_TEST_BUS_CTRL);
> +
> + /* if addr_no_sync has default value then config the addr no sync reg */
> + val = WM_ADDR_NO_SYNC_DEFAULT_VAL;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_ADDR_SYNC_NO_SYNC);
> +
> + writel_relaxed(0xf, vfe->base + VFE_BUS_WM_BURST_LIMIT(wm));
> +
> + val = WM_BUFFER_DEFAULT_WIDTH;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_WIDTH_CFG(wm));
> +
> + val = 0;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_BUFFER_HEIGHT_CFG(wm));
> +
> + val = 0;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
> +
> + /* Configure stride for RDIs */
> + //val = pix->plane_fmt[0].bytesperline;
> + val = WM_STRIDE_DEFAULT_STRIDE;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
> +
> + /* Enable WM */
> + val = 1 << WM_CFG_EN |
> + MODE_MIPI_RAW << WM_CFG_MODE;
> + writel_relaxed(val, vfe->base + VFE_BUS_WM_CFG(wm));
> +}
> +
> +static void vfe_wm_stop(struct vfe_device *vfe, u8 wm)
> +{
> + /* Disable WM */
> + writel_relaxed(0, vfe->base + VFE_BUS_WM_CFG(wm));
> +}
> +
> +static void vfe_wm_update(struct vfe_device *vfe, u8 wm, u32 addr,
> + struct vfe_line *line)
> +{
> + struct v4l2_pix_format_mplane *pix =
> + &line->video_out.active_fmt.fmt.pix_mp;
> + u32 stride = pix->plane_fmt[0].bytesperline;
> +
> + writel_relaxed(addr, vfe->base + VFE_BUS_WM_IMAGE_ADDR(wm));
> + writel_relaxed(stride * pix->height, vfe->base + VFE_BUS_WM_FRAME_INC(wm));
> +}
> +
> +static void vfe_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
> +{
> + vfe->reg_update |= REG_UPDATE_RDI(line_id);
> +
> + /* Enforce ordering between previous reg writes and reg update */
> + wmb();
> +
> + writel_relaxed(vfe->reg_update, vfe->base + VFE_REG_UPDATE_CMD);
> +
> + /* Enforce ordering between reg update and subsequent reg writes */
> + wmb();
> +}
> +
> +static inline void vfe_reg_update_clear(struct vfe_device *vfe,
> + enum vfe_line_id line_id)
> +{
> + vfe->reg_update &= ~REG_UPDATE_RDI(line_id);
> +}
> +
> +static void vfe_enable_irq_common(struct vfe_device *vfe)
> +{
> + vfe_reg_set(vfe, VFE_IRQ_MASK_0, ~0u);
> + vfe_reg_set(vfe, VFE_IRQ_MASK_1, ~0u);
> +
> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(0));
> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(1));
> + writel_relaxed(~0u, vfe->base + VFE_BUS_IRQ_MASK(2));
Looking at the #defines in the beginning of this file, only part
of the IRQ sources (not the whole 32 per each register) are used
or defined.
Is it safe to unmask the unused (reserved?) bits in the above 5
IRQ mask registers?
> +}
> +
> +static void vfe_isr_halt_ack(struct vfe_device *vfe)
> +{
> + complete(&vfe->halt_complete);
> +}
> +
> +static void vfe_isr_read(struct vfe_device *vfe, u32 *status0, u32 *status1)
> +{
> + *status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
> + *status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
> +
> + writel_relaxed(*status0, vfe->base + VFE_IRQ_CLEAR_0);
> + writel_relaxed(*status1, vfe->base + VFE_IRQ_CLEAR_1);
> +
> + /* Enforce ordering between IRQ Clear and Global IRQ Clear */
> + wmb();
> + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
> +}
> +
> +static void vfe_violation_read(struct vfe_device *vfe)
> +{
> + u32 violation = readl_relaxed(vfe->base + VFE_VIOLATION_STATUS);
> +
> + pr_err_ratelimited("VFE: violation = 0x%08x\n", violation);
> +}
> +
> +/*
> + * vfe_isr - VFE module interrupt handler
> + * @irq: Interrupt line
> + * @dev: VFE device
> + *
> + * Return IRQ_HANDLED on success
> + */
> +static irqreturn_t vfe_isr(int irq, void *dev)
> +{
> + struct vfe_device *vfe = dev;
> + u32 status0, status1, vfe_bus_status[3];
> + int i, wm;
> +
> + status0 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_0);
> + status1 = readl_relaxed(vfe->base + VFE_IRQ_STATUS_1);
> +
> + writel_relaxed(status0, vfe->base + VFE_IRQ_CLEAR_0);
> + writel_relaxed(status1, vfe->base + VFE_IRQ_CLEAR_1);
> +
> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++) {
> + vfe_bus_status[i] = readl_relaxed(vfe->base + VFE_BUS_IRQ_STATUS(i));
> + writel_relaxed(vfe_bus_status[i], vfe->base + VFE_BUS_IRQ_CLEAR(i));
> + }
> +
> + /* Enforce ordering between IRQ reading and interpretation */
> + wmb();
> +
> + writel_relaxed(CMD_GLOBAL_CLEAR, vfe->base + VFE_IRQ_CMD);
> + writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
> +
> + if (status0 & STATUS_0_RESET_ACK)
> + vfe->isr_ops.reset_ack(vfe);
> +
> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
> + if (status0 & STATUS_0_RDI_REG_UPDATE(i))
> + vfe->isr_ops.reg_update(vfe, i);
> +
> + for (i = VFE_LINE_RDI0; i <= VFE_LINE_RDI2; i++)
> + if (status0 & STATUS_1_RDI_SOF(i))
> + vfe->isr_ops.sof(vfe, i);
> +
> + for (i = 0; i < MSM_VFE_COMPOSITE_IRQ_NUM; i++)
> + if (vfe_bus_status[0] & STATUS0_COMP_BUF_DONE(i))
> + vfe->isr_ops.comp_done(vfe, i);
> +
> + for (wm = 0; wm < MSM_VFE_IMAGE_MASTERS_NUM; wm++)
> + if (status0 & BIT(9))
> + if (vfe_bus_status[1] & STATUS1_WM_CLIENT_BUF_DONE(wm))
> + vfe->isr_ops.wm_done(vfe, wm);
> +
> + return IRQ_HANDLED;
> +}
> +
> +/*
> + * vfe_halt - Trigger halt on VFE module and wait to complete
> + * @vfe: VFE device
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +static int vfe_halt(struct vfe_device *vfe)
> +{
> + unsigned long time;
> +
> + return 0;
> +
> + reinit_completion(&vfe->halt_complete);
> +
> + time = wait_for_completion_timeout(&vfe->halt_complete,
> + msecs_to_jiffies(VFE_HALT_TIMEOUT_MS));
> + if (!time) {
> + dev_err(vfe->camss->dev, "VFE halt timeout\n");
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static int vfe_get_output(struct vfe_line *line)
> +{
> + struct vfe_device *vfe = to_vfe(line);
> + struct vfe_output *output;
> + unsigned long flags;
> + int i;
> + int wm_idx;
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> +
> + output = &line->output;
> + if (output->state != VFE_OUTPUT_OFF) {
> + dev_err(vfe->camss->dev, "Output is running\n");
> + goto error;
> + }
> +
> + output->wm_num = 1;
> +
> + for (i = 0; i < output->wm_num; i++) {
- this for loop can now be omitted ("for (i = 0; i < 1; i++)" is just one pass) ...
> + wm_idx = vfe_reserve_wm(vfe, line->id);
> + if (wm_idx < 0) {
> + dev_err(vfe->camss->dev, "Can not reserve wm\n");
> + goto error_get_wm;
> + }
> + output->wm_idx[i] = wm_idx;
> + }
> +
> + output->drop_update_idx = 0;
> +
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + return 0;
> +
> +error_get_wm:
> + for (i--; i >= 0; i--)
- ... and this one too. And the "i" local var is no longer needed.
Thanks,
Andrey
> + vfe_release_wm(vfe, output->wm_idx[i]);
> + output->state = VFE_OUTPUT_OFF;
> +error:
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + return -EINVAL;
> +}
> +
> +static int vfe_enable_output(struct vfe_line *line)
> +{
> + struct vfe_device *vfe = to_vfe(line);
> + struct vfe_output *output = &line->output;
> + const struct vfe_hw_ops *ops = vfe->ops;
> + struct media_entity *sensor;
> + unsigned long flags;
> + unsigned int frame_skip = 0;
> + unsigned int i;
> +
> + sensor = camss_find_sensor(&line->subdev.entity);
> + if (sensor) {
> + struct v4l2_subdev *subdev = media_entity_to_v4l2_subdev(sensor);
> +
> + v4l2_subdev_call(subdev, sensor, g_skip_frames, &frame_skip);
> + /* Max frame skip is 29 frames */
> + if (frame_skip > VFE_FRAME_DROP_VAL - 1)
> + frame_skip = VFE_FRAME_DROP_VAL - 1;
> + }
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> +
> + ops->reg_update_clear(vfe, line->id);
> +
> + if (output->state != VFE_OUTPUT_OFF) {
> + dev_err(vfe->camss->dev, "Output is not in reserved state %d\n",
> + output->state);
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> + return -EINVAL;
> + }
> +
> + WARN_ON(output->gen2.active_num);
> +
> + output->state = VFE_OUTPUT_ON;
> +
> + output->sequence = 0;
> + output->wait_reg_update = 0;
> + reinit_completion(&output->reg_update);
> +
> + vfe_wm_start(vfe, output->wm_idx[0], line);
> +
> + for (i = 0; i < 2; i++) {
> + output->buf[i] = vfe_buf_get_pending(output);
> + if (!output->buf[i])
> + break;
> + output->gen2.active_num++;
> + vfe_wm_update(vfe, output->wm_idx[0], output->buf[i]->addr[0], line);
> + }
> +
> + ops->reg_update(vfe, line->id);
> +
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + return 0;
> +}
> +
> +static int vfe_disable_output(struct vfe_line *line)
> +{
> + struct vfe_device *vfe = to_vfe(line);
> + struct vfe_output *output = &line->output;
> + unsigned long flags;
> + unsigned int i;
> + bool done;
> + int timeout = 0;
> +
> + do {
> + spin_lock_irqsave(&vfe->output_lock, flags);
> + done = !output->gen2.active_num;
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> + usleep_range(10000, 20000);
> +
> + if (timeout++ == 100) {
> + dev_err(vfe->camss->dev, "VFE idle timeout - resetting\n");
> + vfe_reset(vfe);
> + output->gen2.active_num = 0;
> + return 0;
> + }
> + } while (!done);
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> + for (i = 0; i < output->wm_num; i++)
> + vfe_wm_stop(vfe, output->wm_idx[i]);
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + return 0;
> +}
> +
> +/*
> + * vfe_enable - Enable streaming on VFE line
> + * @line: VFE line
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +static int vfe_enable(struct vfe_line *line)
> +{
> + struct vfe_device *vfe = to_vfe(line);
> + int ret;
> +
> + mutex_lock(&vfe->stream_lock);
> +
> + if (!vfe->stream_count)
> + vfe_enable_irq_common(vfe);
> +
> + vfe->stream_count++;
> +
> + mutex_unlock(&vfe->stream_lock);
> +
> + ret = vfe_get_output(line);
> + if (ret < 0)
> + goto error_get_output;
> +
> + ret = vfe_enable_output(line);
> + if (ret < 0)
> + goto error_enable_output;
> +
> + vfe->was_streaming = 1;
> +
> + return 0;
> +
> +
> +error_enable_output:
> + vfe_put_output(line);
> +
> +error_get_output:
> + mutex_lock(&vfe->stream_lock);
> +
> + vfe->stream_count--;
> +
> + mutex_unlock(&vfe->stream_lock);
> +
> + return ret;
> +}
> +
> +/*
> + * vfe_disable - Disable streaming on VFE line
> + * @line: VFE line
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +static int vfe_disable(struct vfe_line *line)
> +{
> + struct vfe_device *vfe = to_vfe(line);
> +
> + vfe_disable_output(line);
> +
> + vfe_put_output(line);
> +
> + mutex_lock(&vfe->stream_lock);
> +
> + vfe->stream_count--;
> +
> + mutex_unlock(&vfe->stream_lock);
> +
> + return 0;
> +}
> +
> +/*
> + * vfe_isr_sof - Process start of frame interrupt
> + * @vfe: VFE Device
> + * @line_id: VFE line
> + */
> +static void vfe_isr_sof(struct vfe_device *vfe, enum vfe_line_id line_id)
> +{
> +
> +}
> +
> +/*
> + * vfe_isr_reg_update - Process reg update interrupt
> + * @vfe: VFE Device
> + * @line_id: VFE line
> + */
> +static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)
> +{
> + struct vfe_output *output;
> + unsigned long flags;
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> + vfe->ops->reg_update_clear(vfe, line_id);
> +
> + output = &vfe->line[line_id].output;
> +
> + if (output->wait_reg_update) {
> + output->wait_reg_update = 0;
> + complete(&output->reg_update);
> + }
> +
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +}
> +
> +/*
> + * vfe_isr_wm_done - Process write master done interrupt
> + * @vfe: VFE Device
> + * @wm: Write master id
> + */
> +static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm)
> +{
> + struct vfe_line *line = &vfe->line[vfe->wm_output_map[wm]];
> + struct camss_buffer *ready_buf;
> + struct vfe_output *output;
> + unsigned long flags;
> + u32 index;
> + u64 ts = ktime_get_ns();
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> +
> + if (vfe->wm_output_map[wm] == VFE_LINE_NONE) {
> + dev_err_ratelimited(vfe->camss->dev,
> + "Received wm done for unmapped index\n");
> + goto out_unlock;
> + }
> + output = &vfe->line[vfe->wm_output_map[wm]].output;
> +
> + ready_buf = output->buf[0];
> + if (!ready_buf) {
> + dev_err_ratelimited(vfe->camss->dev,
> + "Missing ready buf %d!\n", output->state);
> + goto out_unlock;
> + }
> +
> + ready_buf->vb.vb2_buf.timestamp = ts;
> + ready_buf->vb.sequence = output->sequence++;
> +
> + index = 0;
> + output->buf[0] = output->buf[1];
> + if (output->buf[0])
> + index = 1;
> +
> + output->buf[index] = vfe_buf_get_pending(output);
> +
> + if (output->buf[index])
> + vfe_wm_update(vfe, output->wm_idx[0], output->buf[index]->addr[0], line);
> + else
> + output->gen2.active_num--;
> +
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> +
> + return;
> +
> +out_unlock:
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +}
> +
> +/*
> + * vfe_queue_buffer - Add empty buffer
> + * @vid: Video device structure
> + * @buf: Buffer to be enqueued
> + *
> + * Add an empty buffer - depending on the current number of buffers it will be
> + * put in pending buffer queue or directly given to the hardware to be filled.
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +static int vfe_queue_buffer(struct camss_video *vid,
> + struct camss_buffer *buf)
> +{
> + struct vfe_line *line = container_of(vid, struct vfe_line, video_out);
> + struct vfe_device *vfe = to_vfe(line);
> + struct vfe_output *output;
> + unsigned long flags;
> +
> + output = &line->output;
> +
> + spin_lock_irqsave(&vfe->output_lock, flags);
> +
> + if (output->state == VFE_OUTPUT_ON && output->gen2.active_num < 2) {
> + output->buf[output->gen2.active_num++] = buf;
> + vfe_wm_update(vfe, output->wm_idx[0], buf->addr[0], line);
> + } else {
> + vfe_buf_add_pending(output, buf);
> + }
> +
> + spin_unlock_irqrestore(&vfe->output_lock, flags);
> +
> + return 0;
> +}
> +
> +const struct vfe_isr_ops vfe_isr_ops_170 = {
> + .reset_ack = vfe_isr_reset_ack,
> + .halt_ack = vfe_isr_halt_ack,
> + .reg_update = vfe_isr_reg_update,
> + .sof = vfe_isr_sof,
> + .comp_done = vfe_isr_comp_done,
> + .wm_done = vfe_isr_wm_done,
> +};
> +
> +static const struct camss_video_ops vfe_video_ops_170 = {
> + .queue_buffer = vfe_queue_buffer,
> + .flush_buffers = vfe_flush_buffers,
> +};
> +
> +static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
> +{
> + vfe->isr_ops = vfe_isr_ops_170;
> + vfe->video_ops = vfe_video_ops_170;
> +
> + vfe->line_num = VFE_LINE_NUM_GEN2;
> +}
> +
> +const struct vfe_hw_ops vfe_ops_170 = {
> + .global_reset = vfe_global_reset,
> + .hw_version_read = vfe_hw_version_read,
> + .isr_read = vfe_isr_read,
> + .isr = vfe_isr,
> + .reg_update_clear = vfe_reg_update_clear,
> + .reg_update = vfe_reg_update,
> + .subdev_init = vfe_subdev_init,
> + .vfe_disable = vfe_disable,
> + .vfe_enable = vfe_enable,
> + .vfe_halt = vfe_halt,
> + .violation_read = vfe_violation_read,
> +};
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
> index 375843bd16af..6fafeb8a5484 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> @@ -96,6 +96,32 @@ static const struct vfe_format formats_pix_8x96[] = {
> { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
> };
>
> +static const struct vfe_format formats_rdi_845[] = {
> + { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
> + { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
> + { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
> + { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
> + { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
> + { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
> + { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
> + { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
> + { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
> + { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
> + { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
> + { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
> + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
> + { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
> + { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
> + { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
> + { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
> + { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
> + { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
> + { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
> + { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
> + { MEDIA_BUS_FMT_Y10_1X10, 10 },
> + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, 16 },
> +};
> +
> /*
> * vfe_get_bpp - map media bus format to bits per pixel
> * @formats: supported media bus formats array
> @@ -192,7 +218,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
> return sink_code;
> }
> else if (vfe->camss->version == CAMSS_8x96 ||
> - vfe->camss->version == CAMSS_660)
> + vfe->camss->version == CAMSS_660 ||
> + vfe->camss->version == CAMSS_845)
> switch (sink_code) {
> case MEDIA_BUS_FMT_YUYV8_2X8:
> {
> @@ -256,13 +283,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
> return 0;
> }
>
> -/*
> - * vfe_reset - Trigger reset on VFE module and wait to complete
> - * @vfe: VFE device
> - *
> - * Return 0 on success or a negative error code otherwise
> - */
> -static int vfe_reset(struct vfe_device *vfe)
> +int vfe_reset(struct vfe_device *vfe)
> {
> unsigned long time;
>
> @@ -429,7 +450,8 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
> struct camss_clock *clock = &vfe->clock[i];
>
> if (!strcmp(clock->name, "vfe0") ||
> - !strcmp(clock->name, "vfe1")) {
> + !strcmp(clock->name, "vfe1") ||
> + !strcmp(clock->name, "vfe_lite")) {
> u64 min_rate = 0;
> long rate;
>
> @@ -1268,6 +1290,10 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> case CAMSS_660:
> vfe->ops = &vfe_ops_4_8;
> break;
> +
> + case CAMSS_845:
> + vfe->ops = &vfe_ops_170;
> + break;
> default:
> return -EINVAL;
> }
> @@ -1379,6 +1405,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> l->formats = formats_rdi_8x96;
> l->nformats = ARRAY_SIZE(formats_rdi_8x96);
> }
> + } else if (camss->version == CAMSS_845) {
> + l->formats = formats_rdi_845;
> + l->nformats = ARRAY_SIZE(formats_rdi_845);
> } else {
> return -EINVAL;
> }
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
> index aad5dc74c2c0..29b3d930ffc6 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.h
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.h
> @@ -19,7 +19,6 @@
> #include "camss-video.h"
> #include "camss-vfe-gen1.h"
>
> -
> #define MSM_VFE_PAD_SINK 0
> #define MSM_VFE_PAD_SRC 1
> #define MSM_VFE_PADS_NUM 2
> @@ -38,14 +37,14 @@
> #define to_vfe(ptr_line) \
> container_of(vfe_line_array(ptr_line), struct vfe_device, line)
>
> -
> enum vfe_output_state {
> VFE_OUTPUT_OFF,
> VFE_OUTPUT_RESERVED,
> VFE_OUTPUT_SINGLE,
> VFE_OUTPUT_CONTINUOUS,
> VFE_OUTPUT_IDLE,
> - VFE_OUTPUT_STOPPING
> + VFE_OUTPUT_STOPPING,
> + VFE_OUTPUT_ON,
> };
>
> enum vfe_line_id {
> @@ -53,6 +52,7 @@ enum vfe_line_id {
> VFE_LINE_RDI0 = 0,
> VFE_LINE_RDI1 = 1,
> VFE_LINE_RDI2 = 2,
> + VFE_LINE_NUM_GEN2 = 3,
> VFE_LINE_PIX = 3,
> VFE_LINE_NUM_GEN1 = 4,
> VFE_LINE_NUM_MAX = 4
> @@ -73,6 +73,9 @@ struct vfe_output {
> int active_buf;
> int wait_sof;
> } gen1;
> + struct {
> + int active_num;
> + } gen2;
> };
> enum vfe_output_state state;
> unsigned int sequence;
> @@ -171,14 +174,6 @@ void vfe_buf_add_pending(struct vfe_output *output, struct camss_buffer *buffer)
>
> struct camss_buffer *vfe_buf_get_pending(struct vfe_output *output);
>
> -/*
> - * vfe_disable - Disable streaming on VFE line
> - * @line: VFE line
> - *
> - * Return 0 on success or a negative error code otherwise
> - */
> -int vfe_disable(struct vfe_line *line);
> -
> int vfe_flush_buffers(struct camss_video *vid, enum vb2_buffer_state state);
>
> /*
> @@ -193,8 +188,17 @@ int vfe_put_output(struct vfe_line *line);
> int vfe_release_wm(struct vfe_device *vfe, u8 wm);
> int vfe_reserve_wm(struct vfe_device *vfe, enum vfe_line_id line_id);
>
> +/*
> + * vfe_reset - Trigger reset on VFE module and wait to complete
> + * @vfe: VFE device
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +int vfe_reset(struct vfe_device *vfe);
> +
> extern const struct vfe_hw_ops vfe_ops_4_1;
> extern const struct vfe_hw_ops vfe_ops_4_7;
> extern const struct vfe_hw_ops vfe_ops_4_8;
> +extern const struct vfe_hw_ops vfe_ops_170;
>
> #endif /* QC_MSM_CAMSS_VFE_H */
> diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
> index 97cea7c4d769..f282275af626 100644
> --- a/drivers/media/platform/qcom/camss/camss-video.c
> +++ b/drivers/media/platform/qcom/camss/camss-video.c
> @@ -133,6 +133,55 @@ static const struct camss_format_info formats_rdi_8x96[] = {
> { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> };
>
> +static const struct camss_format_info formats_rdi_845[] = {
> + { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_PIX_FMT_UYVY, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> + { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_PIX_FMT_VYUY, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> + { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_PIX_FMT_YUYV, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> + { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_PIX_FMT_YVYU, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> + { MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_PIX_FMT_SBGGR8, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> + { MEDIA_BUS_FMT_SGBRG8_1X8, V4L2_PIX_FMT_SGBRG8, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> + { MEDIA_BUS_FMT_SGRBG8_1X8, V4L2_PIX_FMT_SGRBG8, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> + { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_PIX_FMT_SRGGB8, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 8 } },
> + { MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_PIX_FMT_SBGGR10P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> + { MEDIA_BUS_FMT_SGBRG10_1X10, V4L2_PIX_FMT_SGBRG10P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> + { MEDIA_BUS_FMT_SGRBG10_1X10, V4L2_PIX_FMT_SGRBG10P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> + { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_PIX_FMT_SRGGB10P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> + { MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_PIX_FMT_SBGGR10, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> + { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> + { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> + { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> + { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 12 } },
> + { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> + { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> + { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> + { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 14 } },
> + { MEDIA_BUS_FMT_Y10_1X10, V4L2_PIX_FMT_Y10P, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 10 } },
> + { MEDIA_BUS_FMT_Y10_2X8_PADHI_LE, V4L2_PIX_FMT_Y10, 1,
> + { { 1, 1 } }, { { 1, 1 } }, { 16 } },
> +};
> +
> static const struct camss_format_info formats_pix_8x16[] = {
> { MEDIA_BUS_FMT_YUYV8_1_5X8, V4L2_PIX_FMT_NV12, 1,
> { { 1, 1 } }, { { 2, 3 } }, { 8 } },
> @@ -960,6 +1009,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
> video->formats = formats_rdi_8x96;
> video->nformats = ARRAY_SIZE(formats_rdi_8x96);
> }
> + } else if (video->camss->version == CAMSS_845) {
> + video->formats = formats_rdi_845;
> + video->nformats = ARRAY_SIZE(formats_rdi_845);
> } else {
> ret = -EINVAL;
> goto error_video_register;
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 6c6f1e59ccd8..0e006def1996 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -465,6 +465,67 @@ static const struct resources vfe_res_660[] = {
> }
> };
>
> +static const struct resources vfe_res_845[] = {
> + /* VFE0 */
> + {
> + .regulator = { NULL },
> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> + "soc_ahb", "vfe0", "vfe0_axi",
> + "vfe0_src", "csi0",
> + "csi0_src"},
> + .clock_rate = { { 0 },
> + { 0 },
> + { 80000000 },
> + { 0 },
> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> + { 0 },
> + { 320000000 },
> + { 19200000, 75000000, 384000000, 538666667 },
> + { 384000000 } },
> + .reg = { "vfe0" },
> + .interrupt = { "vfe0" }
> + },
> +
> + /* VFE1 */
> + {
> + .regulator = { NULL },
> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> + "soc_ahb", "vfe1", "vfe1_axi",
> + "vfe1_src", "csi1",
> + "csi1_src"},
> + .clock_rate = { { 0 },
> + { 0 },
> + { 80000000 },
> + { 0 },
> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> + { 0 },
> + { 320000000 },
> + { 19200000, 75000000, 384000000, 538666667 },
> + { 384000000 } },
> + .reg = { "vfe1" },
> + .interrupt = { "vfe1" }
> + },
> +
> + /* VFE-lite */
> + {
> + .regulator = { NULL },
> + .clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
> + "soc_ahb", "vfe_lite",
> + "vfe_lite_src", "csi2",
> + "csi2_src"},
> + .clock_rate = { { 0 },
> + { 0 },
> + { 80000000 },
> + { 0 },
> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> + { 320000000 },
> + { 19200000, 75000000, 384000000, 538666667 },
> + { 384000000 } },
> + .reg = { "vfe_lite" },
> + .interrupt = { "vfe_lite" }
> + }
> +};
> +
> /*
> * camss_add_clock_margin - Add margin to clock frequency rate
> * @rate: Clock frequency rate
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 08/22] media: camss: Add missing format identifiers
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (5 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 07/22] media: camss: Add support for VFE hardware version Titan 170 Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-22 16:26 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 09/22] media: camss: Refactor CSID HW version support Robert Foss
` (13 subsequent siblings)
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
The CSI-2 spec defines the following types:
- Data Type - Often abbreviated DT
- Decode Format - Often abbreviated as DF
- Encode Format
These definitions are as far as I can tell complete for CSI-2.
Additionally the Qualcomm internal type describing Plain Formats
has been added. Plain formats describe the size of the pixels
written by the RDI units to memory. PLAIN8 for example has the size
8 bits, and PLAIN32 32 bits. The appropriate Plain Format is
determined by the Decode Format used. The smallest Plain Format
that is able to contain a pixel of the used Decode Format is the
appropriate one to use.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
.../media/platform/qcom/camss/camss-csid.h | 50 +++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
index 1824b3745e10..02fc34ee8a41 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.h
+++ b/drivers/media/platform/qcom/camss/camss-csid.h
@@ -21,6 +21,56 @@
#define MSM_CSID_PAD_SRC 1
#define MSM_CSID_PADS_NUM 2
+#define DATA_TYPE_EMBEDDED_DATA_8BIT 0x12
+#define DATA_TYPE_YUV420_8BIT 0x18
+#define DATA_TYPE_YUV420_10BIT 0x19
+#define DATA_TYPE_YUV420_8BIT_LEGACY 0x1a
+#define DATA_TYPE_YUV420_8BIT_SHIFTED 0x1c /* Chroma Shifted Pixel Sampling */
+#define DATA_TYPE_YUV420_10BIT_SHIFTED 0x1d /* Chroma Shifted Pixel Sampling */
+#define DATA_TYPE_YUV422_8BIT 0x1e
+#define DATA_TYPE_YUV422_10BIT 0x1f
+#define DATA_TYPE_RGB444 0x20
+#define DATA_TYPE_RGB555 0x21
+#define DATA_TYPE_RGB565 0x22
+#define DATA_TYPE_RGB666 0x23
+#define DATA_TYPE_RGB888 0x24
+#define DATA_TYPE_RAW_24BIT 0x27
+#define DATA_TYPE_RAW_6BIT 0x28
+#define DATA_TYPE_RAW_7BIT 0x29
+#define DATA_TYPE_RAW_8BIT 0x2a
+#define DATA_TYPE_RAW_10BIT 0x2b
+#define DATA_TYPE_RAW_12BIT 0x2c
+#define DATA_TYPE_RAW_14BIT 0x2d
+#define DATA_TYPE_RAW_16BIT 0x2e
+#define DATA_TYPE_RAW_20BIT 0x2f
+
+#define DECODE_FORMAT_UNCOMPRESSED_6_BIT 0x0
+#define DECODE_FORMAT_UNCOMPRESSED_8_BIT 0x1
+#define DECODE_FORMAT_UNCOMPRESSED_10_BIT 0x2
+#define DECODE_FORMAT_UNCOMPRESSED_12_BIT 0x3
+#define DECODE_FORMAT_UNCOMPRESSED_14_BIT 0x4
+#define DECODE_FORMAT_UNCOMPRESSED_16_BIT 0x5
+#define DECODE_FORMAT_UNCOMPRESSED_20_BIT 0x6
+#define DECODE_FORMAT_DPCM_10_6_10 0x7
+#define DECODE_FORMAT_DPCM_10_8_10 0x8
+#define DECODE_FORMAT_DPCM_12_6_12 0x9
+#define DECODE_FORMAT_DPCM_12_8_12 0xA
+#define DECODE_FORMAT_DPCM_14_8_14 0xB
+#define DECODE_FORMAT_DPCM_14_10_14 0xC
+#define DECODE_FORMAT_USER_DEFINED 0xE
+#define DECODE_FORMAT_PAYLOAD_ONLY 0xF
+
+#define ENCODE_FORMAT_RAW_8_BIT 0x1
+#define ENCODE_FORMAT_RAW_10_BIT 0x2
+#define ENCODE_FORMAT_RAW_12_BIT 0x3
+#define ENCODE_FORMAT_RAW_14_BIT 0x4
+#define ENCODE_FORMAT_RAW_16_BIT 0x5
+
+#define PLAIN_FORMAT_PLAIN8 0x0 /* supports DPCM, UNCOMPRESSED_6/8_BIT */
+#define PLAIN_FORMAT_PLAIN16 0x1 /* supports DPCM, UNCOMPRESSED_10/16_BIT */
+#define PLAIN_FORMAT_PLAIN32 0x2 /* supports UNCOMPRESSED_20_BIT */
+
+
enum csid_payload_mode {
CSID_PAYLOAD_MODE_INCREMENTING = 0,
CSID_PAYLOAD_MODE_ALTERNATING_55_AA = 1,
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 08/22] media: camss: Add missing format identifiers
2021-02-17 11:21 ` [PATCH v5 08/22] media: camss: Add missing format identifiers Robert Foss
@ 2021-02-22 16:26 ` Andrey Konovalov
2021-02-23 17:25 ` Robert Foss
0 siblings, 1 reply; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-22 16:26 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
On 17.02.2021 14:21, Robert Foss wrote:
> The CSI-2 spec defines the following types:
> - Data Type - Often abbreviated DT
> - Decode Format - Often abbreviated as DF
> - Encode Format
>
> These definitions are as far as I can tell complete for CSI-2.
>
> Additionally the Qualcomm internal type describing Plain Formats
> has been added. Plain formats describe the size of the pixels
> written by the RDI units to memory. PLAIN8 for example has the size
> 8 bits, and PLAIN32 32 bits. The appropriate Plain Format is
> determined by the Decode Format used. The smallest Plain Format
> that is able to contain a pixel of the used Decode Format is the
> appropriate one to use.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
> .../media/platform/qcom/camss/camss-csid.h | 50 +++++++++++++++++++
> 1 file changed, 50 insertions(+)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
> index 1824b3745e10..02fc34ee8a41 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.h
> +++ b/drivers/media/platform/qcom/camss/camss-csid.h
> @@ -21,6 +21,56 @@
> #define MSM_CSID_PAD_SRC 1
> #define MSM_CSID_PADS_NUM 2
>
> +#define DATA_TYPE_EMBEDDED_DATA_8BIT 0x12
> +#define DATA_TYPE_YUV420_8BIT 0x18
> +#define DATA_TYPE_YUV420_10BIT 0x19
> +#define DATA_TYPE_YUV420_8BIT_LEGACY 0x1a
> +#define DATA_TYPE_YUV420_8BIT_SHIFTED 0x1c /* Chroma Shifted Pixel Sampling */
> +#define DATA_TYPE_YUV420_10BIT_SHIFTED 0x1d /* Chroma Shifted Pixel Sampling */
> +#define DATA_TYPE_YUV422_8BIT 0x1e
> +#define DATA_TYPE_YUV422_10BIT 0x1f
> +#define DATA_TYPE_RGB444 0x20
> +#define DATA_TYPE_RGB555 0x21
> +#define DATA_TYPE_RGB565 0x22
> +#define DATA_TYPE_RGB666 0x23
> +#define DATA_TYPE_RGB888 0x24
> +#define DATA_TYPE_RAW_24BIT 0x27
> +#define DATA_TYPE_RAW_6BIT 0x28
> +#define DATA_TYPE_RAW_7BIT 0x29
> +#define DATA_TYPE_RAW_8BIT 0x2a
> +#define DATA_TYPE_RAW_10BIT 0x2b
> +#define DATA_TYPE_RAW_12BIT 0x2c
> +#define DATA_TYPE_RAW_14BIT 0x2d
> +#define DATA_TYPE_RAW_16BIT 0x2e
> +#define DATA_TYPE_RAW_20BIT 0x2f
- these look OK for me (the old MIPI spec draft I have doesn't have
some of the data types listed above).
As these are generic values from the MIPI standard, it could probably make
sense to create a common header file for that someday.
E.g. the very similar defines (same values, different names) are present in
drivers/staging/media/atomisp/pci/isp_capture_defs.h
But it looks like most of the current drivers don't need the MIPI data type
defines, so not a problem at the moment.
> +
> +#define DECODE_FORMAT_UNCOMPRESSED_6_BIT 0x0
> +#define DECODE_FORMAT_UNCOMPRESSED_8_BIT 0x1
> +#define DECODE_FORMAT_UNCOMPRESSED_10_BIT 0x2
> +#define DECODE_FORMAT_UNCOMPRESSED_12_BIT 0x3
> +#define DECODE_FORMAT_UNCOMPRESSED_14_BIT 0x4
> +#define DECODE_FORMAT_UNCOMPRESSED_16_BIT 0x5
> +#define DECODE_FORMAT_UNCOMPRESSED_20_BIT 0x6
> +#define DECODE_FORMAT_DPCM_10_6_10 0x7
> +#define DECODE_FORMAT_DPCM_10_8_10 0x8
> +#define DECODE_FORMAT_DPCM_12_6_12 0x9
> +#define DECODE_FORMAT_DPCM_12_8_12 0xA
> +#define DECODE_FORMAT_DPCM_14_8_14 0xB
> +#define DECODE_FORMAT_DPCM_14_10_14 0xC
> +#define DECODE_FORMAT_USER_DEFINED 0xE
> +#define DECODE_FORMAT_PAYLOAD_ONLY 0xF
- interesting that the subset of the DECODE_FORMAT's used in
camss-csid-4-1.c (the first four formats above - UNCOMPRESSED_6_BIT
to UNCOMPRESSED_12_BIT ones) has the same values as the corresponding
field in the CSID_CID_n_CFG registers - according to the public
"APQ8016E Technical Reference Manual" [1]. So these exact DECODE_FORMAT_*
values are written into the bits 7:4 of the hw register.
But in [1] the values of DPCM_10_6_10 to DPCM_12_8_12 are 0x4 to 0x7
(as the camss-csid-4-1.c doesn't support DPCM this is not an issue).
Are the DECODE_FORMAT_* values above defined in the MIPI standard, or did
they come from the datasheet for a particular SOC?
[1] https://developer.qualcomm.com/download/sd410/snapdragon-410e-technical-reference-manual.pdf
page 990
> +
> +#define ENCODE_FORMAT_RAW_8_BIT 0x1
> +#define ENCODE_FORMAT_RAW_10_BIT 0x2
> +#define ENCODE_FORMAT_RAW_12_BIT 0x3
> +#define ENCODE_FORMAT_RAW_14_BIT 0x4
> +#define ENCODE_FORMAT_RAW_16_BIT 0x5
- the ENCODE_FORMAT_* defines are not used in the driver.
> +
> +#define PLAIN_FORMAT_PLAIN8 0x0 /* supports DPCM, UNCOMPRESSED_6/8_BIT */
> +#define PLAIN_FORMAT_PLAIN16 0x1 /* supports DPCM, UNCOMPRESSED_10/16_BIT */
> +#define PLAIN_FORMAT_PLAIN32 0x2 /* supports UNCOMPRESSED_20_BIT */
- the PLAIN_FORMAT_* defines are not used in the driver, but
camss-csid-4-1.c and camss-csid-4-7.c do define there own
CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 and CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16
(without relying on PLAIN_FORMAT_PLAIN8 or PLAIN_FORMAT_PLAIN16).
Thanks,
Andrey
> +
> +
> enum csid_payload_mode {
> CSID_PAYLOAD_MODE_INCREMENTING = 0,
> CSID_PAYLOAD_MODE_ALTERNATING_55_AA = 1,
>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 08/22] media: camss: Add missing format identifiers
2021-02-22 16:26 ` Andrey Konovalov
@ 2021-02-23 17:25 ` Robert Foss
0 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-23 17:25 UTC (permalink / raw)
To: Andrey Konovalov
Cc: Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab,
Rob Herring, angelogioacchino.delregno, MSM, linux-media,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, AngeloGioacchino Del Regno, Sakari Ailus,
Nicolas Boichat, Rob Herring, Tomasz Figa,
Azam Sadiq Pasha Kapatrala Syed, Sarvesh Sridutt,
Laurent Pinchart, Jonathan Marek
On Mon, 22 Feb 2021 at 17:26, Andrey Konovalov
<andrey.konovalov@linaro.org> wrote:
>
> Hi Robert,
>
> Thank you for your patch!
>
> On 17.02.2021 14:21, Robert Foss wrote:
> > The CSI-2 spec defines the following types:
> > - Data Type - Often abbreviated DT
> > - Decode Format - Often abbreviated as DF
> > - Encode Format
> >
> > These definitions are as far as I can tell complete for CSI-2.
> >
> > Additionally the Qualcomm internal type describing Plain Formats
> > has been added. Plain formats describe the size of the pixels
> > written by the RDI units to memory. PLAIN8 for example has the size
> > 8 bits, and PLAIN32 32 bits. The appropriate Plain Format is
> > determined by the Decode Format used. The smallest Plain Format
> > that is able to contain a pixel of the used Decode Format is the
> > appropriate one to use.
> >
> > Signed-off-by: Robert Foss <robert.foss@linaro.org>
> > ---
> > .../media/platform/qcom/camss/camss-csid.h | 50 +++++++++++++++++++
> > 1 file changed, 50 insertions(+)
> >
> > diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
> > index 1824b3745e10..02fc34ee8a41 100644
> > --- a/drivers/media/platform/qcom/camss/camss-csid.h
> > +++ b/drivers/media/platform/qcom/camss/camss-csid.h
> > @@ -21,6 +21,56 @@
> > #define MSM_CSID_PAD_SRC 1
> > #define MSM_CSID_PADS_NUM 2
> >
> > +#define DATA_TYPE_EMBEDDED_DATA_8BIT 0x12
> > +#define DATA_TYPE_YUV420_8BIT 0x18
> > +#define DATA_TYPE_YUV420_10BIT 0x19
> > +#define DATA_TYPE_YUV420_8BIT_LEGACY 0x1a
> > +#define DATA_TYPE_YUV420_8BIT_SHIFTED 0x1c /* Chroma Shifted Pixel Sampling */
> > +#define DATA_TYPE_YUV420_10BIT_SHIFTED 0x1d /* Chroma Shifted Pixel Sampling */
> > +#define DATA_TYPE_YUV422_8BIT 0x1e
> > +#define DATA_TYPE_YUV422_10BIT 0x1f
> > +#define DATA_TYPE_RGB444 0x20
> > +#define DATA_TYPE_RGB555 0x21
> > +#define DATA_TYPE_RGB565 0x22
> > +#define DATA_TYPE_RGB666 0x23
> > +#define DATA_TYPE_RGB888 0x24
> > +#define DATA_TYPE_RAW_24BIT 0x27
> > +#define DATA_TYPE_RAW_6BIT 0x28
> > +#define DATA_TYPE_RAW_7BIT 0x29
> > +#define DATA_TYPE_RAW_8BIT 0x2a
> > +#define DATA_TYPE_RAW_10BIT 0x2b
> > +#define DATA_TYPE_RAW_12BIT 0x2c
> > +#define DATA_TYPE_RAW_14BIT 0x2d
> > +#define DATA_TYPE_RAW_16BIT 0x2e
> > +#define DATA_TYPE_RAW_20BIT 0x2f
>
> - these look OK for me (the old MIPI spec draft I have doesn't have
> some of the data types listed above).
>
> As these are generic values from the MIPI standard, it could probably make
> sense to create a common header file for that someday.
> E.g. the very similar defines (same values, different names) are present in
> drivers/staging/media/atomisp/pci/isp_capture_defs.h
> But it looks like most of the current drivers don't need the MIPI data type
> defines, so not a problem at the moment.
Both for the DTs and the DF/EF/PFs I figured it would be nice to have
as much of these variables listed somewhere as they aren't always so
easy to find a reference for.
>
> > +
> > +#define DECODE_FORMAT_UNCOMPRESSED_6_BIT 0x0
> > +#define DECODE_FORMAT_UNCOMPRESSED_8_BIT 0x1
> > +#define DECODE_FORMAT_UNCOMPRESSED_10_BIT 0x2
> > +#define DECODE_FORMAT_UNCOMPRESSED_12_BIT 0x3
> > +#define DECODE_FORMAT_UNCOMPRESSED_14_BIT 0x4
> > +#define DECODE_FORMAT_UNCOMPRESSED_16_BIT 0x5
> > +#define DECODE_FORMAT_UNCOMPRESSED_20_BIT 0x6
> > +#define DECODE_FORMAT_DPCM_10_6_10 0x7
> > +#define DECODE_FORMAT_DPCM_10_8_10 0x8
> > +#define DECODE_FORMAT_DPCM_12_6_12 0x9
> > +#define DECODE_FORMAT_DPCM_12_8_12 0xA
> > +#define DECODE_FORMAT_DPCM_14_8_14 0xB
> > +#define DECODE_FORMAT_DPCM_14_10_14 0xC
> > +#define DECODE_FORMAT_USER_DEFINED 0xE
> > +#define DECODE_FORMAT_PAYLOAD_ONLY 0xF
>
> - interesting that the subset of the DECODE_FORMAT's used in
> camss-csid-4-1.c (the first four formats above - UNCOMPRESSED_6_BIT
> to UNCOMPRESSED_12_BIT ones) has the same values as the corresponding
> field in the CSID_CID_n_CFG registers - according to the public
> "APQ8016E Technical Reference Manual" [1]. So these exact DECODE_FORMAT_*
> values are written into the bits 7:4 of the hw register.
> But in [1] the values of DPCM_10_6_10 to DPCM_12_8_12 are 0x4 to 0x7
> (as the camss-csid-4-1.c doesn't support DPCM this is not an issue).
> Are the DECODE_FORMAT_* values above defined in the MIPI standard, or did
> they come from the datasheet for a particular SOC?
DF & EFs are a part of the MIPI spec, but the identifier is SOC/vendor specific.
PFs are not a part of the MIPI spec at all, but rather a Qcom specific term.
Having looked over the DFs again, there are some incompatible
differences between Gen1 & Gen2. I think the way forward is moving
DF/EF/PFs to Gen 1/2 specific headers.
>
> [1] https://developer.qualcomm.com/download/sd410/snapdragon-410e-technical-reference-manual.pdf
> page 990
> > +
> > +#define ENCODE_FORMAT_RAW_8_BIT 0x1
> > +#define ENCODE_FORMAT_RAW_10_BIT 0x2
> > +#define ENCODE_FORMAT_RAW_12_BIT 0x3
> > +#define ENCODE_FORMAT_RAW_14_BIT 0x4
> > +#define ENCODE_FORMAT_RAW_16_BIT 0x5
>
> - the ENCODE_FORMAT_* defines are not used in the driver.
That's intentional, collecting this information somewhere for future
use seemed like a good idea. But I'm happy to remove it if that's a
bad idea.
>
> > +
> > +#define PLAIN_FORMAT_PLAIN8 0x0 /* supports DPCM, UNCOMPRESSED_6/8_BIT */
> > +#define PLAIN_FORMAT_PLAIN16 0x1 /* supports DPCM, UNCOMPRESSED_10/16_BIT */
> > +#define PLAIN_FORMAT_PLAIN32 0x2 /* supports UNCOMPRESSED_20_BIT */
>
> - the PLAIN_FORMAT_* defines are not used in the driver, but
> camss-csid-4-1.c and camss-csid-4-7.c do define there own
> CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 and CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16
> (without relying on PLAIN_FORMAT_PLAIN8 or PLAIN_FORMAT_PLAIN16).
I missed this duplication, I'll fix this in the next version.
>
> Thanks,
> Andrey
>
> > +
> > +
> > enum csid_payload_mode {
> > CSID_PAYLOAD_MODE_INCREMENTING = 0,
> > CSID_PAYLOAD_MODE_ALTERNATING_55_AA = 1,
> >
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 09/22] media: camss: Refactor CSID HW version support
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (6 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 08/22] media: camss: Add missing format identifiers Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-21 15:15 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 10/22] media: camss: Add support for CSID hardware version Titan 170 Robert Foss
` (12 subsequent siblings)
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
In order to support Qualcomm ISP hardware architectures that diverge
from older architectures, the CSID subdevice drivers needs to be refactored
to better abstract the different ISP hardware architectures.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
Changes since v1
- kernel test robot: Add missing include, interrupt.h
Changes since v4
- Andrey: Removed whitespace from some includes
- Andrey: Removed unused enum
drivers/media/platform/qcom/camss/Makefile | 2 +
.../platform/qcom/camss/camss-csid-4-1.c | 330 ++++++++++
.../platform/qcom/camss/camss-csid-4-7.c | 406 ++++++++++++
.../media/platform/qcom/camss/camss-csid.c | 616 +-----------------
.../media/platform/qcom/camss/camss-csid.h | 126 +++-
5 files changed, 890 insertions(+), 590 deletions(-)
create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-1.c
create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-7.c
diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
index 052c4f405fa3..cff388b653ba 100644
--- a/drivers/media/platform/qcom/camss/Makefile
+++ b/drivers/media/platform/qcom/camss/Makefile
@@ -4,6 +4,8 @@
qcom-camss-objs += \
camss.o \
camss-csid.o \
+ camss-csid-4-1.o \
+ camss-csid-4-7.o \
camss-csiphy-2ph-1-0.o \
camss-csiphy-3ph-1-0.o \
camss-csiphy.o \
diff --git a/drivers/media/platform/qcom/camss/camss-csid-4-1.c b/drivers/media/platform/qcom/camss/camss-csid-4-1.c
new file mode 100644
index 000000000000..c92077a7f758
--- /dev/null
+++ b/drivers/media/platform/qcom/camss/camss-csid-4-1.c
@@ -0,0 +1,330 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * camss-csid-4-1.c
+ *
+ * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
+ *
+ * Copyright (C) 2020 Linaro Ltd.
+ */
+
+#include <linux/completion.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+
+#include "camss-csid.h"
+#include "camss.h"
+
+#define CAMSS_CSID_HW_VERSION 0x0
+#define CAMSS_CSID_CORE_CTRL_0 0x004
+#define CAMSS_CSID_CORE_CTRL_1 0x008
+#define CAMSS_CSID_RST_CMD 0x00c
+#define CAMSS_CSID_CID_LUT_VC_n(n) (0x010 + 0x4 * (n))
+#define CAMSS_CSID_CID_n_CFG(n) (0x020 + 0x4 * (n))
+#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
+#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
+#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
+#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
+#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
+#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
+#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
+#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
+#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
+#define CAMSS_CSID_IRQ_CLEAR_CMD 0x060
+#define CAMSS_CSID_IRQ_MASK 0x064
+#define CAMSS_CSID_IRQ_STATUS 0x068
+#define CAMSS_CSID_TG_CTRL 0x0a0
+#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
+#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
+#define CAMSS_CSID_TG_VC_CFG 0x0a4
+#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
+#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
+#define CAMSS_CSID_TG_DT_n_CGG_0(n) (0x0ac + 0xc * (n))
+#define CAMSS_CSID_TG_DT_n_CGG_1(n) (0x0b0 + 0xc * (n))
+#define CAMSS_CSID_TG_DT_n_CGG_2(n) (0x0b4 + 0xc * (n))
+
+
+static const struct csid_format csid_formats[] = {
+ {
+ MEDIA_BUS_FMT_UYVY8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_VYUY8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_YUYV8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_YVYU8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_Y10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+};
+
+static void csid_configure_stream(struct csid_device *csid, u8 enable)
+{
+ struct csid_testgen_config *tg = &csid->testgen;
+ u32 val;
+
+ if (enable) {
+ struct v4l2_mbus_framefmt *input_format;
+ const struct csid_format *format;
+ u8 vc = 0; /* Virtual Channel 0 */
+ u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
+ u8 dt_shift;
+
+ if (tg->enabled) {
+ /* Config Test Generator */
+ u32 num_lines, num_bytes_per_line;
+
+ input_format = &csid->fmt[MSM_CSID_PAD_SRC];
+ format = csid_get_fmt_entry(csid->formats, csid->nformats,
+ input_format->code);
+ num_bytes_per_line = input_format->width * format->bpp * format->spp / 8;
+ num_lines = input_format->height;
+
+ /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
+ /* 1:0 VC */
+ val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
+ ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_VC_CFG);
+
+ /* 28:16 bytes per lines, 12:0 num of lines */
+ val = ((num_bytes_per_line & 0x1fff) << 16) |
+ (num_lines & 0x1fff);
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_0(0));
+
+ /* 5:0 data type */
+ val = format->data_type;
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_1(0));
+
+ /* 2:0 output test pattern */
+ val = tg->mode;
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_2(0));
+ } else {
+ struct csid_phy_config *phy = &csid->phy;
+
+ input_format = &csid->fmt[MSM_CSID_PAD_SINK];
+ format = csid_get_fmt_entry(csid->formats, csid->nformats,
+ input_format->code);
+
+ val = phy->lane_cnt - 1;
+ val |= phy->lane_assign << 4;
+
+ writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_0);
+
+ val = phy->csiphy_id << 17;
+ val |= 0x9;
+
+ writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_1);
+ }
+
+ /* Config LUT */
+
+ dt_shift = (cid % 4) * 8;
+ val = readl_relaxed(csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
+ val &= ~(0xff << dt_shift);
+ val |= format->data_type << dt_shift;
+ writel_relaxed(val, csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
+
+ val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
+ val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
+ val |= format->decode_format << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
+ val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
+ writel_relaxed(val, csid->base + CAMSS_CSID_CID_n_CFG(cid));
+
+ if (tg->enabled) {
+ val = CAMSS_CSID_TG_CTRL_ENABLE;
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
+ }
+ } else {
+ if (tg->enabled) {
+ val = CAMSS_CSID_TG_CTRL_DISABLE;
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
+ }
+ }
+}
+
+static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
+{
+ s32 regval = val - 1;
+
+ if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1)
+ csid->testgen.mode = regval;
+
+ return 0;
+}
+
+static u32 csid_hw_version(struct csid_device *csid)
+{
+ u32 hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
+
+ dev_dbg(csid->camss->dev, "CSID HW Version = 0x%08x\n", hw_version);
+
+ return hw_version;
+}
+
+static irqreturn_t csid_isr(int irq, void *dev)
+{
+ struct csid_device *csid = dev;
+ u32 value;
+
+ value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS);
+ writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD);
+
+ if ((value >> 11) & 0x1)
+ complete(&csid->reset_complete);
+
+ return IRQ_HANDLED;
+}
+
+static int csid_reset(struct csid_device *csid)
+{
+ unsigned long time;
+
+ reinit_completion(&csid->reset_complete);
+
+ writel_relaxed(0x7fff, csid->base + CAMSS_CSID_RST_CMD);
+
+ time = wait_for_completion_timeout(&csid->reset_complete,
+ msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
+ if (!time) {
+ dev_err(csid->camss->dev, "CSID reset timeout\n");
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
+ unsigned int match_format_idx, u32 match_code)
+{
+ if (match_format_idx > 0)
+ return 0;
+
+ return sink_code;
+}
+
+static void csid_subdev_init(struct csid_device *csid)
+{
+ csid->formats = csid_formats;
+ csid->nformats = ARRAY_SIZE(csid_formats);
+ csid->testgen.modes = csid_testgen_modes;
+ csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1;
+}
+
+const struct csid_hw_ops csid_ops_4_1 = {
+ .configure_stream = csid_configure_stream,
+ .configure_testgen_pattern = csid_configure_testgen_pattern,
+ .hw_version = csid_hw_version,
+ .isr = csid_isr,
+ .reset = csid_reset,
+ .src_pad_code = csid_src_pad_code,
+ .subdev_init = csid_subdev_init,
+};
diff --git a/drivers/media/platform/qcom/camss/camss-csid-4-7.c b/drivers/media/platform/qcom/camss/camss-csid-4-7.c
new file mode 100644
index 000000000000..16a69b140f4e
--- /dev/null
+++ b/drivers/media/platform/qcom/camss/camss-csid-4-7.c
@@ -0,0 +1,406 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * camss-csid-4-7.c
+ *
+ * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
+ *
+ * Copyright (C) 2020 Linaro Ltd.
+ */
+#include <linux/completion.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+
+#include "camss-csid.h"
+#include "camss.h"
+
+#define CAMSS_CSID_HW_VERSION 0x0
+#define CAMSS_CSID_CORE_CTRL_0 0x004
+#define CAMSS_CSID_CORE_CTRL_1 0x008
+#define CAMSS_CSID_RST_CMD 0x010
+#define CAMSS_CSID_CID_LUT_VC_n(n) (0x014 + 0x4 * (n))
+#define CAMSS_CSID_CID_n_CFG(n) (0x024 + 0x4 * (n))
+#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
+#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
+#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
+#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
+#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
+#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
+#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
+#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
+#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
+#define CAMSS_CSID_IRQ_CLEAR_CMD 0x064
+#define CAMSS_CSID_IRQ_MASK 0x068
+#define CAMSS_CSID_IRQ_STATUS 0x06c
+#define CAMSS_CSID_TG_CTRL 0x0a8
+#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
+#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
+#define CAMSS_CSID_TG_VC_CFG 0x0ac
+#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
+#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
+#define CAMSS_CSID_TG_DT_n_CGG_0(n) (0x0b4 + 0xc * (n))
+#define CAMSS_CSID_TG_DT_n_CGG_1(n) (0x0b8 + 0xc * (n))
+#define CAMSS_CSID_TG_DT_n_CGG_2(n) (0x0bc + 0xc * (n))
+
+
+static const struct csid_format csid_formats[] = {
+ {
+ MEDIA_BUS_FMT_UYVY8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_VYUY8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_YUYV8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_YVYU8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR14_1X14,
+ DATA_TYPE_RAW_14BIT,
+ DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+ 14,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG14_1X14,
+ DATA_TYPE_RAW_14BIT,
+ DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+ 14,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG14_1X14,
+ DATA_TYPE_RAW_14BIT,
+ DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+ 14,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB14_1X14,
+ DATA_TYPE_RAW_14BIT,
+ DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+ 14,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_Y10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+};
+
+static void csid_configure_stream(struct csid_device *csid, u8 enable)
+{
+ struct csid_testgen_config *tg = &csid->testgen;
+ u32 sink_code = csid->fmt[MSM_CSID_PAD_SINK].code;
+ u32 src_code = csid->fmt[MSM_CSID_PAD_SRC].code;
+ u32 val;
+
+ if (enable) {
+ struct v4l2_mbus_framefmt *input_format;
+ const struct csid_format *format;
+ u8 vc = 0; /* Virtual Channel 0 */
+ u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
+ u8 dt_shift;
+
+ if (tg->enabled) {
+ /* Config Test Generator */
+ u32 num_bytes_per_line, num_lines;
+
+ input_format = &csid->fmt[MSM_CSID_PAD_SRC];
+ format = csid_get_fmt_entry(csid->formats, csid->nformats,
+ input_format->code);
+ num_bytes_per_line = input_format->width * format->bpp * format->spp / 8;
+ num_lines = input_format->height;
+
+ /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
+ /* 1:0 VC */
+ val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
+ ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_VC_CFG);
+
+ /* 28:16 bytes per lines, 12:0 num of lines */
+ val = ((num_bytes_per_line & 0x1fff) << 16) |
+ (num_lines & 0x1fff);
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_0(0));
+
+ /* 5:0 data type */
+ val = format->data_type;
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_1(0));
+
+ /* 2:0 output test pattern */
+ val = tg->mode;
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_2(0));
+ } else {
+ struct csid_phy_config *phy = &csid->phy;
+
+ input_format = &csid->fmt[MSM_CSID_PAD_SINK];
+ format = csid_get_fmt_entry(csid->formats, csid->nformats,
+ input_format->code);
+
+ val = phy->lane_cnt - 1;
+ val |= phy->lane_assign << 4;
+
+ writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_0);
+
+ val = phy->csiphy_id << 17;
+ val |= 0x9;
+
+ writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_1);
+ }
+
+ /* Config LUT */
+
+ dt_shift = (cid % 4) * 8;
+
+ val = readl_relaxed(csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
+ val &= ~(0xff << dt_shift);
+ val |= format->data_type << dt_shift;
+ writel_relaxed(val, csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
+
+ val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
+ val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
+ val |= format->decode_format << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
+ val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
+
+ if ((sink_code == MEDIA_BUS_FMT_SBGGR10_1X10 &&
+ src_code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) ||
+ (sink_code == MEDIA_BUS_FMT_Y10_1X10 &&
+ src_code == MEDIA_BUS_FMT_Y10_2X8_PADHI_LE)) {
+ val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING;
+ val |= CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16;
+ val |= CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB;
+ }
+
+ writel_relaxed(val, csid->base + CAMSS_CSID_CID_n_CFG(cid));
+
+ if (tg->enabled) {
+ val = CAMSS_CSID_TG_CTRL_ENABLE;
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
+ }
+ } else {
+ if (tg->enabled) {
+ val = CAMSS_CSID_TG_CTRL_DISABLE;
+ writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
+ }
+ }
+}
+
+static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
+{
+ s32 regval = val - 1;
+
+ if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7)
+ csid->testgen.mode = regval;
+
+ return 0;
+}
+
+static u32 csid_hw_version(struct csid_device *csid)
+{
+ u32 hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
+
+ dev_dbg(csid->camss->dev, "CSID HW Version = 0x%08x\n", hw_version);
+
+ return hw_version;
+}
+
+/*
+ * isr - CSID module interrupt service routine
+ * @irq: Interrupt line
+ * @dev: CSID device
+ *
+ * Return IRQ_HANDLED on success
+ */
+static irqreturn_t csid_isr(int irq, void *dev)
+{
+ struct csid_device *csid = dev;
+ u32 value;
+
+ value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS);
+ writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD);
+
+ if ((value >> 11) & 0x1)
+ complete(&csid->reset_complete);
+
+ return IRQ_HANDLED;
+}
+
+/*
+ * csid_reset - Trigger reset on CSID module and wait to complete
+ * @csid: CSID device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int csid_reset(struct csid_device *csid)
+{
+ unsigned long time;
+
+ reinit_completion(&csid->reset_complete);
+
+ writel_relaxed(0x7fff, csid->base + CAMSS_CSID_RST_CMD);
+
+ time = wait_for_completion_timeout(&csid->reset_complete,
+ msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
+ if (!time) {
+ dev_err(csid->camss->dev, "CSID reset timeout\n");
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
+ unsigned int match_format_idx, u32 match_code)
+{
+ switch (sink_code) {
+ case MEDIA_BUS_FMT_SBGGR10_1X10:
+ {
+ u32 src_code[] = {
+ MEDIA_BUS_FMT_SBGGR10_1X10,
+ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
+ };
+
+ return csid_find_code(src_code, ARRAY_SIZE(src_code),
+ match_format_idx, match_code);
+ }
+ case MEDIA_BUS_FMT_Y10_1X10:
+ {
+ u32 src_code[] = {
+ MEDIA_BUS_FMT_Y10_1X10,
+ MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
+ };
+
+ return csid_find_code(src_code, ARRAY_SIZE(src_code),
+ match_format_idx, match_code);
+ }
+ default:
+ if (match_format_idx > 0)
+ return 0;
+
+ return sink_code;
+ }
+}
+
+static void csid_subdev_init(struct csid_device *csid)
+{
+ csid->formats = csid_formats;
+ csid->nformats = ARRAY_SIZE(csid_formats);
+ csid->testgen.modes = csid_testgen_modes;
+ csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7;
+}
+
+const struct csid_hw_ops csid_ops_4_7 = {
+ .configure_stream = csid_configure_stream,
+ .configure_testgen_pattern = csid_configure_testgen_pattern,
+ .hw_version = csid_hw_version,
+ .isr = csid_isr,
+ .reset = csid_reset,
+ .src_pad_code = csid_src_pad_code,
+ .subdev_init = csid_subdev_init,
+};
diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index be3fe76f3dc3..601bd810f2b0 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -26,405 +26,35 @@
#define MSM_CSID_NAME "msm_csid"
-#define CAMSS_CSID_HW_VERSION 0x0
-#define CAMSS_CSID_CORE_CTRL_0 0x004
-#define CAMSS_CSID_CORE_CTRL_1 0x008
-#define CAMSS_CSID_RST_CMD(v) ((v) == CAMSS_8x16 ? 0x00c : 0x010)
-#define CAMSS_CSID_CID_LUT_VC_n(v, n) \
- (((v) == CAMSS_8x16 ? 0x010 : 0x014) + 0x4 * (n))
-#define CAMSS_CSID_CID_n_CFG(v, n) \
- (((v) == CAMSS_8x16 ? 0x020 : 0x024) + 0x4 * (n))
-#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
-#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
-#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
-#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
-#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
-#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
-#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
-#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
-#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
-#define CAMSS_CSID_IRQ_CLEAR_CMD(v) ((v) == CAMSS_8x16 ? 0x060 : 0x064)
-#define CAMSS_CSID_IRQ_MASK(v) ((v) == CAMSS_8x16 ? 0x064 : 0x068)
-#define CAMSS_CSID_IRQ_STATUS(v) ((v) == CAMSS_8x16 ? 0x068 : 0x06c)
-#define CAMSS_CSID_TG_CTRL(v) ((v) == CAMSS_8x16 ? 0x0a0 : 0x0a8)
-#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
-#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
-#define CAMSS_CSID_TG_VC_CFG(v) ((v) == CAMSS_8x16 ? 0x0a4 : 0x0ac)
-#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
-#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
-#define CAMSS_CSID_TG_DT_n_CGG_0(v, n) \
- (((v) == CAMSS_8x16 ? 0x0ac : 0x0b4) + 0xc * (n))
-#define CAMSS_CSID_TG_DT_n_CGG_1(v, n) \
- (((v) == CAMSS_8x16 ? 0x0b0 : 0x0b8) + 0xc * (n))
-#define CAMSS_CSID_TG_DT_n_CGG_2(v, n) \
- (((v) == CAMSS_8x16 ? 0x0b4 : 0x0bc) + 0xc * (n))
-
-#define DATA_TYPE_EMBEDDED_DATA_8BIT 0x12
-#define DATA_TYPE_YUV422_8BIT 0x1e
-#define DATA_TYPE_RAW_6BIT 0x28
-#define DATA_TYPE_RAW_8BIT 0x2a
-#define DATA_TYPE_RAW_10BIT 0x2b
-#define DATA_TYPE_RAW_12BIT 0x2c
-#define DATA_TYPE_RAW_14BIT 0x2d
-
-#define DECODE_FORMAT_UNCOMPRESSED_6_BIT 0x0
-#define DECODE_FORMAT_UNCOMPRESSED_8_BIT 0x1
-#define DECODE_FORMAT_UNCOMPRESSED_10_BIT 0x2
-#define DECODE_FORMAT_UNCOMPRESSED_12_BIT 0x3
-#define DECODE_FORMAT_UNCOMPRESSED_14_BIT 0x8
-
-#define CSID_RESET_TIMEOUT_MS 500
-
-struct csid_format {
- u32 code;
- u8 data_type;
- u8 decode_format;
- u8 bpp;
- u8 spp; /* bus samples per pixel */
-};
-
-static const struct csid_format csid_formats_8x16[] = {
- {
- MEDIA_BUS_FMT_UYVY8_2X8,
- DATA_TYPE_YUV422_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 2,
- },
- {
- MEDIA_BUS_FMT_VYUY8_2X8,
- DATA_TYPE_YUV422_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 2,
- },
- {
- MEDIA_BUS_FMT_YUYV8_2X8,
- DATA_TYPE_YUV422_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 2,
- },
- {
- MEDIA_BUS_FMT_YVYU8_2X8,
- DATA_TYPE_YUV422_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 2,
- },
- {
- MEDIA_BUS_FMT_SBGGR8_1X8,
- DATA_TYPE_RAW_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGBRG8_1X8,
- DATA_TYPE_RAW_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGRBG8_1X8,
- DATA_TYPE_RAW_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 1,
- },
- {
- MEDIA_BUS_FMT_SRGGB8_1X8,
- DATA_TYPE_RAW_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 1,
- },
- {
- MEDIA_BUS_FMT_SBGGR10_1X10,
- DATA_TYPE_RAW_10BIT,
- DECODE_FORMAT_UNCOMPRESSED_10_BIT,
- 10,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGBRG10_1X10,
- DATA_TYPE_RAW_10BIT,
- DECODE_FORMAT_UNCOMPRESSED_10_BIT,
- 10,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGRBG10_1X10,
- DATA_TYPE_RAW_10BIT,
- DECODE_FORMAT_UNCOMPRESSED_10_BIT,
- 10,
- 1,
- },
- {
- MEDIA_BUS_FMT_SRGGB10_1X10,
- DATA_TYPE_RAW_10BIT,
- DECODE_FORMAT_UNCOMPRESSED_10_BIT,
- 10,
- 1,
- },
- {
- MEDIA_BUS_FMT_SBGGR12_1X12,
- DATA_TYPE_RAW_12BIT,
- DECODE_FORMAT_UNCOMPRESSED_12_BIT,
- 12,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGBRG12_1X12,
- DATA_TYPE_RAW_12BIT,
- DECODE_FORMAT_UNCOMPRESSED_12_BIT,
- 12,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGRBG12_1X12,
- DATA_TYPE_RAW_12BIT,
- DECODE_FORMAT_UNCOMPRESSED_12_BIT,
- 12,
- 1,
- },
- {
- MEDIA_BUS_FMT_SRGGB12_1X12,
- DATA_TYPE_RAW_12BIT,
- DECODE_FORMAT_UNCOMPRESSED_12_BIT,
- 12,
- 1,
- },
- {
- MEDIA_BUS_FMT_Y10_1X10,
- DATA_TYPE_RAW_10BIT,
- DECODE_FORMAT_UNCOMPRESSED_10_BIT,
- 10,
- 1,
- },
-};
-
-static const struct csid_format csid_formats_8x96[] = {
- {
- MEDIA_BUS_FMT_UYVY8_2X8,
- DATA_TYPE_YUV422_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 2,
- },
- {
- MEDIA_BUS_FMT_VYUY8_2X8,
- DATA_TYPE_YUV422_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 2,
- },
- {
- MEDIA_BUS_FMT_YUYV8_2X8,
- DATA_TYPE_YUV422_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 2,
- },
- {
- MEDIA_BUS_FMT_YVYU8_2X8,
- DATA_TYPE_YUV422_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 2,
- },
- {
- MEDIA_BUS_FMT_SBGGR8_1X8,
- DATA_TYPE_RAW_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGBRG8_1X8,
- DATA_TYPE_RAW_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGRBG8_1X8,
- DATA_TYPE_RAW_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 1,
- },
- {
- MEDIA_BUS_FMT_SRGGB8_1X8,
- DATA_TYPE_RAW_8BIT,
- DECODE_FORMAT_UNCOMPRESSED_8_BIT,
- 8,
- 1,
- },
- {
- MEDIA_BUS_FMT_SBGGR10_1X10,
- DATA_TYPE_RAW_10BIT,
- DECODE_FORMAT_UNCOMPRESSED_10_BIT,
- 10,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGBRG10_1X10,
- DATA_TYPE_RAW_10BIT,
- DECODE_FORMAT_UNCOMPRESSED_10_BIT,
- 10,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGRBG10_1X10,
- DATA_TYPE_RAW_10BIT,
- DECODE_FORMAT_UNCOMPRESSED_10_BIT,
- 10,
- 1,
- },
- {
- MEDIA_BUS_FMT_SRGGB10_1X10,
- DATA_TYPE_RAW_10BIT,
- DECODE_FORMAT_UNCOMPRESSED_10_BIT,
- 10,
- 1,
- },
- {
- MEDIA_BUS_FMT_SBGGR12_1X12,
- DATA_TYPE_RAW_12BIT,
- DECODE_FORMAT_UNCOMPRESSED_12_BIT,
- 12,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGBRG12_1X12,
- DATA_TYPE_RAW_12BIT,
- DECODE_FORMAT_UNCOMPRESSED_12_BIT,
- 12,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGRBG12_1X12,
- DATA_TYPE_RAW_12BIT,
- DECODE_FORMAT_UNCOMPRESSED_12_BIT,
- 12,
- 1,
- },
- {
- MEDIA_BUS_FMT_SRGGB12_1X12,
- DATA_TYPE_RAW_12BIT,
- DECODE_FORMAT_UNCOMPRESSED_12_BIT,
- 12,
- 1,
- },
- {
- MEDIA_BUS_FMT_SBGGR14_1X14,
- DATA_TYPE_RAW_14BIT,
- DECODE_FORMAT_UNCOMPRESSED_14_BIT,
- 14,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGBRG14_1X14,
- DATA_TYPE_RAW_14BIT,
- DECODE_FORMAT_UNCOMPRESSED_14_BIT,
- 14,
- 1,
- },
- {
- MEDIA_BUS_FMT_SGRBG14_1X14,
- DATA_TYPE_RAW_14BIT,
- DECODE_FORMAT_UNCOMPRESSED_14_BIT,
- 14,
- 1,
- },
- {
- MEDIA_BUS_FMT_SRGGB14_1X14,
- DATA_TYPE_RAW_14BIT,
- DECODE_FORMAT_UNCOMPRESSED_14_BIT,
- 14,
- 1,
- },
- {
- MEDIA_BUS_FMT_Y10_1X10,
- DATA_TYPE_RAW_10BIT,
- DECODE_FORMAT_UNCOMPRESSED_10_BIT,
- 10,
- 1,
- },
-};
-static u32 csid_find_code(u32 *code, unsigned int n_code,
- unsigned int index, u32 req_code)
+u32 csid_find_code(u32 *codes, unsigned int ncodes,
+ unsigned int match_format_idx, u32 match_code)
{
int i;
- if (!req_code && (index >= n_code))
+ if (!match_code && (match_format_idx >= ncodes))
return 0;
- for (i = 0; i < n_code; i++)
- if (req_code) {
- if (req_code == code[i])
- return req_code;
+ for (i = 0; i < ncodes; i++)
+ if (match_code) {
+ if (codes[i] == match_code)
+ return match_code;
} else {
- if (i == index)
- return code[i];
- }
-
- return code[0];
-}
-
-static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
- unsigned int index, u32 src_req_code)
-{
- if (csid->camss->version == CAMSS_8x16) {
- if (index > 0)
- return 0;
-
- return sink_code;
- } else if (csid->camss->version == CAMSS_8x96 ||
- csid->camss->version == CAMSS_660) {
- switch (sink_code) {
- case MEDIA_BUS_FMT_SBGGR10_1X10:
- {
- u32 src_code[] = {
- MEDIA_BUS_FMT_SBGGR10_1X10,
- MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
- };
-
- return csid_find_code(src_code, ARRAY_SIZE(src_code),
- index, src_req_code);
- }
- case MEDIA_BUS_FMT_Y10_1X10:
- {
- u32 src_code[] = {
- MEDIA_BUS_FMT_Y10_1X10,
- MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
- };
-
- return csid_find_code(src_code, ARRAY_SIZE(src_code),
- index, src_req_code);
+ if (i == match_format_idx)
+ return codes[i];
}
- default:
- if (index > 0)
- return 0;
- return sink_code;
- }
- } else {
- return 0;
- }
+ return codes[0];
}
-static const struct csid_format *csid_get_fmt_entry(
+const struct csid_format *csid_get_fmt_entry(
const struct csid_format *formats,
- unsigned int nformat,
+ unsigned int nformats,
u32 code)
{
unsigned int i;
- for (i = 0; i < nformat; i++)
+ for (i = 0; i < nformats; i++)
if (code == formats[i].code)
return &formats[i];
@@ -433,28 +63,6 @@ static const struct csid_format *csid_get_fmt_entry(
return &formats[0];
}
-/*
- * csid_isr - CSID module interrupt handler
- * @irq: Interrupt line
- * @dev: CSID device
- *
- * Return IRQ_HANDLED on success
- */
-static irqreturn_t csid_isr(int irq, void *dev)
-{
- struct csid_device *csid = dev;
- enum camss_version ver = csid->camss->version;
- u32 value;
-
- value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS(ver));
- writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD(ver));
-
- if ((value >> 11) & 0x1)
- complete(&csid->reset_complete);
-
- return IRQ_HANDLED;
-}
-
/*
* csid_set_clock_rates - Calculate and set clock rates on CSID module
* @csiphy: CSID device
@@ -521,31 +129,6 @@ static int csid_set_clock_rates(struct csid_device *csid)
return 0;
}
-/*
- * csid_reset - Trigger reset on CSID module and wait to complete
- * @csid: CSID device
- *
- * Return 0 on success or a negative error code otherwise
- */
-static int csid_reset(struct csid_device *csid)
-{
- unsigned long time;
-
- reinit_completion(&csid->reset_complete);
-
- writel_relaxed(0x7fff, csid->base +
- CAMSS_CSID_RST_CMD(csid->camss->version));
-
- time = wait_for_completion_timeout(&csid->reset_complete,
- msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
- if (!time) {
- dev_err(csid->camss->dev, "CSID reset timeout\n");
- return -EIO;
- }
-
- return 0;
-}
-
/*
* csid_set_power - Power on/off CSID module
* @sd: CSID V4L2 subdevice
@@ -560,8 +143,6 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
int ret;
if (on) {
- u32 hw_version;
-
ret = pm_runtime_get_sync(dev);
if (ret < 0) {
pm_runtime_put_sync(dev);
@@ -590,7 +171,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
enable_irq(csid->irq);
- ret = csid_reset(csid);
+ ret = csid->ops->reset(csid);
if (ret < 0) {
disable_irq(csid->irq);
camss_disable_clocks(csid->nclocks, csid->clock);
@@ -599,8 +180,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
return ret;
}
- hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
- dev_dbg(dev, "CSID HW Version = 0x%08x\n", hw_version);
+ csid->ops->hw_version(csid);
} else {
disable_irq(csid->irq);
camss_disable_clocks(csid->nclocks, csid->clock);
@@ -623,16 +203,9 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
static int csid_set_stream(struct v4l2_subdev *sd, int enable)
{
struct csid_device *csid = v4l2_get_subdevdata(sd);
- struct csid_testgen_config *tg = &csid->testgen;
- enum camss_version ver = csid->camss->version;
- u32 val;
+ int ret;
if (enable) {
- u8 vc = 0; /* Virtual Channel 0 */
- u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
- u8 dt, dt_shift, df;
- int ret;
-
ret = v4l2_ctrl_handler_setup(&csid->ctrls);
if (ret < 0) {
dev_err(csid->camss->dev,
@@ -640,116 +213,13 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)
return ret;
}
- if (!tg->enabled &&
+ if (!csid->testgen.enabled &&
!media_entity_remote_pad(&csid->pads[MSM_CSID_PAD_SINK]))
return -ENOLINK;
-
- if (tg->enabled) {
- /* Config Test Generator */
- struct v4l2_mbus_framefmt *f =
- &csid->fmt[MSM_CSID_PAD_SRC];
- const struct csid_format *format = csid_get_fmt_entry(
- csid->formats, csid->nformats, f->code);
- u32 num_bytes_per_line =
- f->width * format->bpp * format->spp / 8;
- u32 num_lines = f->height;
-
- /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
- /* 1:0 VC */
- val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
- ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
- writel_relaxed(val, csid->base +
- CAMSS_CSID_TG_VC_CFG(ver));
-
- /* 28:16 bytes per lines, 12:0 num of lines */
- val = ((num_bytes_per_line & 0x1fff) << 16) |
- (num_lines & 0x1fff);
- writel_relaxed(val, csid->base +
- CAMSS_CSID_TG_DT_n_CGG_0(ver, 0));
-
- dt = format->data_type;
-
- /* 5:0 data type */
- val = dt;
- writel_relaxed(val, csid->base +
- CAMSS_CSID_TG_DT_n_CGG_1(ver, 0));
-
- /* 2:0 output test pattern */
- val = tg->payload_mode;
- writel_relaxed(val, csid->base +
- CAMSS_CSID_TG_DT_n_CGG_2(ver, 0));
-
- df = format->decode_format;
- } else {
- struct v4l2_mbus_framefmt *f =
- &csid->fmt[MSM_CSID_PAD_SINK];
- const struct csid_format *format = csid_get_fmt_entry(
- csid->formats, csid->nformats, f->code);
- struct csid_phy_config *phy = &csid->phy;
-
- val = phy->lane_cnt - 1;
- val |= phy->lane_assign << 4;
-
- writel_relaxed(val,
- csid->base + CAMSS_CSID_CORE_CTRL_0);
-
- val = phy->csiphy_id << 17;
- val |= 0x9;
-
- writel_relaxed(val,
- csid->base + CAMSS_CSID_CORE_CTRL_1);
-
- dt = format->data_type;
- df = format->decode_format;
- }
-
- /* Config LUT */
-
- dt_shift = (cid % 4) * 8;
-
- val = readl_relaxed(csid->base +
- CAMSS_CSID_CID_LUT_VC_n(ver, vc));
- val &= ~(0xff << dt_shift);
- val |= dt << dt_shift;
- writel_relaxed(val, csid->base +
- CAMSS_CSID_CID_LUT_VC_n(ver, vc));
-
- val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
- val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
- val |= df << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
- val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
-
- if (csid->camss->version == CAMSS_8x96 ||
- csid->camss->version == CAMSS_660) {
- u32 sink_code = csid->fmt[MSM_CSID_PAD_SINK].code;
- u32 src_code = csid->fmt[MSM_CSID_PAD_SRC].code;
-
- if ((sink_code == MEDIA_BUS_FMT_SBGGR10_1X10 &&
- src_code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) ||
- (sink_code == MEDIA_BUS_FMT_Y10_1X10 &&
- src_code == MEDIA_BUS_FMT_Y10_2X8_PADHI_LE)) {
- val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING;
- val |= CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16;
- val |= CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB;
- }
- }
-
- writel_relaxed(val, csid->base +
- CAMSS_CSID_CID_n_CFG(ver, cid));
-
- if (tg->enabled) {
- val = CAMSS_CSID_TG_CTRL_ENABLE;
- writel_relaxed(val, csid->base +
- CAMSS_CSID_TG_CTRL(ver));
- }
- } else {
- if (tg->enabled) {
- val = CAMSS_CSID_TG_CTRL_DISABLE;
- writel_relaxed(val, csid->base +
- CAMSS_CSID_TG_CTRL(ver));
- }
}
+ csid->ops->configure_stream(csid, enable);
+
return 0;
}
@@ -818,7 +288,7 @@ static void csid_try_format(struct csid_device *csid,
*fmt = *__csid_get_format(csid, cfg,
MSM_CSID_PAD_SINK, which);
- fmt->code = csid_src_pad_code(csid, fmt->code, 0, code);
+ fmt->code = csid->ops->src_pad_code(csid, fmt->code, 0, code);
} else {
/* Test generator is enabled, set format on source */
/* pad to allow test generator usage */
@@ -868,7 +338,7 @@ static int csid_enum_mbus_code(struct v4l2_subdev *sd,
MSM_CSID_PAD_SINK,
code->which);
- code->code = csid_src_pad_code(csid, sink_fmt->code,
+ code->code = csid->ops->src_pad_code(csid, sink_fmt->code,
code->index, 0);
if (!code->code)
return -EINVAL;
@@ -1004,15 +474,6 @@ static int csid_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
return csid_set_format(sd, fh ? fh->pad : NULL, &format);
}
-static const char * const csid_test_pattern_menu[] = {
- "Disabled",
- "Incrementing",
- "Alternating 0x55/0xAA",
- "All Zeros 0x00",
- "All Ones 0xFF",
- "Pseudo-random Data",
-};
-
/*
* csid_set_test_pattern - Set test generator's pattern mode
* @csid: CSID device
@@ -1030,25 +491,7 @@ static int csid_set_test_pattern(struct csid_device *csid, s32 value)
tg->enabled = !!value;
- switch (value) {
- case 1:
- tg->payload_mode = CSID_PAYLOAD_MODE_INCREMENTING;
- break;
- case 2:
- tg->payload_mode = CSID_PAYLOAD_MODE_ALTERNATING_55_AA;
- break;
- case 3:
- tg->payload_mode = CSID_PAYLOAD_MODE_ALL_ZEROES;
- break;
- case 4:
- tg->payload_mode = CSID_PAYLOAD_MODE_ALL_ONES;
- break;
- case 5:
- tg->payload_mode = CSID_PAYLOAD_MODE_RANDOM;
- break;
- }
-
- return 0;
+ return csid->ops->configure_testgen_pattern(csid, value);
}
/*
@@ -1097,17 +540,14 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
csid->id = id;
if (camss->version == CAMSS_8x16) {
- csid->formats = csid_formats_8x16;
- csid->nformats =
- ARRAY_SIZE(csid_formats_8x16);
+ csid->ops = &csid_ops_4_1;
} else if (camss->version == CAMSS_8x96 ||
camss->version == CAMSS_660) {
- csid->formats = csid_formats_8x96;
- csid->nformats =
- ARRAY_SIZE(csid_formats_8x96);
+ csid->ops = &csid_ops_4_7;
} else {
return -EINVAL;
}
+ csid->ops->subdev_init(csid);
/* Memory */
@@ -1130,7 +570,7 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
csid->irq = r->start;
snprintf(csid->irq_name, sizeof(csid->irq_name), "%s_%s%d",
dev_name(dev), MSM_CSID_NAME, csid->id);
- ret = devm_request_irq(dev, csid->irq, csid_isr,
+ ret = devm_request_irq(dev, csid->irq, csid->ops->isr,
IRQF_TRIGGER_RISING, csid->irq_name, csid);
if (ret < 0) {
dev_err(dev, "request_irq failed: %d\n", ret);
@@ -1341,8 +781,8 @@ int msm_csid_register_entity(struct csid_device *csid,
csid->testgen_mode = v4l2_ctrl_new_std_menu_items(&csid->ctrls,
&csid_ctrl_ops, V4L2_CID_TEST_PATTERN,
- ARRAY_SIZE(csid_test_pattern_menu) - 1, 0, 0,
- csid_test_pattern_menu);
+ csid->testgen.nmodes, 0, 0,
+ csid->testgen.modes);
if (csid->ctrls.error) {
dev_err(dev, "Failed to init ctrl: %d\n", csid->ctrls.error);
diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
index 02fc34ee8a41..d40194e2bed3 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.h
+++ b/drivers/media/platform/qcom/camss/camss-csid.h
@@ -11,6 +11,7 @@
#define QC_MSM_CAMSS_CSID_H
#include <linux/clk.h>
+#include <linux/interrupt.h>
#include <media/media-entity.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
@@ -70,19 +71,50 @@
#define PLAIN_FORMAT_PLAIN16 0x1 /* supports DPCM, UNCOMPRESSED_10/16_BIT */
#define PLAIN_FORMAT_PLAIN32 0x2 /* supports UNCOMPRESSED_20_BIT */
+#define CSID_RESET_TIMEOUT_MS 500
-enum csid_payload_mode {
+
+enum csid_testgen_mode {
CSID_PAYLOAD_MODE_INCREMENTING = 0,
CSID_PAYLOAD_MODE_ALTERNATING_55_AA = 1,
CSID_PAYLOAD_MODE_ALL_ZEROES = 2,
CSID_PAYLOAD_MODE_ALL_ONES = 3,
CSID_PAYLOAD_MODE_RANDOM = 4,
CSID_PAYLOAD_MODE_USER_SPECIFIED = 5,
+ CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1 = 5,
+ CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7 = 5,
+ CSID_PAYLOAD_MODE_COMPLEX_PATTERN = 6,
+ CSID_PAYLOAD_MODE_COLOR_BOX = 7,
+ CSID_PAYLOAD_MODE_COLOR_BARS = 8,
+ CSID_PAYLOAD_MODE_MAX_SUPPORTED_170 = 8,
+};
+
+static const char * const csid_testgen_modes[] = {
+ "Disabled",
+ "Incrementing",
+ "Alternating 0x55/0xAA",
+ "All Zeros 0x00",
+ "All Ones 0xFF",
+ "Pseudo-random Data",
+ "User Specified",
+ "Complex pattern",
+ "Color box",
+ "Color bars",
+};
+
+struct csid_format {
+ u32 code;
+ u8 data_type;
+ u8 decode_format;
+ u8 bpp;
+ u8 spp; /* bus samples per pixel */
};
struct csid_testgen_config {
+ enum csid_testgen_mode mode;
+ const char * const*modes;
+ u8 nmodes;
u8 enabled;
- enum csid_payload_mode payload_mode;
};
struct csid_phy_config {
@@ -91,6 +123,65 @@ struct csid_phy_config {
u32 lane_assign;
};
+struct csid_device;
+
+struct csid_hw_ops {
+ /*
+ * configure_stream - Configures and starts CSID input stream
+ * @csid: CSID device
+ */
+ void (*configure_stream)(struct csid_device *csid, u8 enable);
+
+ /*
+ * configure_testgen_pattern - Validates and configures output pattern mode
+ * of test pattern generator
+ * @csid: CSID device
+ */
+ int (*configure_testgen_pattern)(struct csid_device *csid, s32 val);
+
+ /*
+ * hw_version - Read hardware version register from hardware
+ * @csid: CSID device
+ */
+ u32 (*hw_version)(struct csid_device *csid);
+
+ /*
+ * isr - CSID module interrupt service routine
+ * @irq: Interrupt line
+ * @dev: CSID device
+ *
+ * Return IRQ_HANDLED on success
+ */
+ irqreturn_t (*isr)(int irq, void *dev);
+
+ /*
+ * reset - Trigger reset on CSID module and wait to complete
+ * @csid: CSID device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+ int (*reset)(struct csid_device *csid);
+
+ /*
+ * src_pad_code - Pick an output/src format based on the input/sink format
+ * @csid: CSID device
+ * @sink_code: The sink format of the input
+ * @match_format_idx: Request preferred index, as defined by subdevice csid_format.
+ * Set @match_code to 0 if used.
+ * @match_code: Request preferred code, set @match_format_idx to 0 if used
+ *
+ * Return 0 on failure or src format code otherwise
+ */
+ u32 (*src_pad_code)(struct csid_device *csid, u32 sink_code,
+ unsigned int match_format_idx, u32 match_code);
+
+ /*
+ * subdev_init - Initialize CSID device according for hardware revision
+ * @csid: CSID device
+ */
+ void (*subdev_init)(struct csid_device *csid);
+};
+
struct csid_device {
struct camss *camss;
u8 id;
@@ -110,10 +201,37 @@ struct csid_device {
struct v4l2_ctrl *testgen_mode;
const struct csid_format *formats;
unsigned int nformats;
+ const struct csid_hw_ops *ops;
};
struct resources;
+
+/*
+ * csid_find_code - Find a format code in an array using array index or format code
+ * @codes: Array of format codes
+ * @ncodes: Length of @code array
+ * @req_format_idx: Request preferred index, as defined by subdevice csid_format.
+ * Set @match_code to 0 if used.
+ * @match_code: Request preferred code, set @req_format_idx to 0 if used
+ *
+ * Return 0 on failure or format code otherwise
+ */
+u32 csid_find_code(u32 *codes, unsigned int ncode,
+ unsigned int match_format_idx, u32 match_code);
+
+/*
+ * csid_get_fmt_entry - Find csid_format entry with matching format code
+ * @formats: Array of format csid_format entries
+ * @nformats: Length of @nformats array
+ * @code: Desired format code
+ *
+ * Return formats[0] on failure to find code
+ */
+const struct csid_format *csid_get_fmt_entry(const struct csid_format *formats,
+ unsigned int nformats,
+ u32 code);
+
int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
const struct resources *res, u8 id);
@@ -124,4 +242,8 @@ void msm_csid_unregister_entity(struct csid_device *csid);
void msm_csid_get_csid_id(struct media_entity *entity, u8 *id);
+
+extern const struct csid_hw_ops csid_ops_4_1;
+extern const struct csid_hw_ops csid_ops_4_7;
+
#endif /* QC_MSM_CAMSS_CSID_H */
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 09/22] media: camss: Refactor CSID HW version support
2021-02-17 11:21 ` [PATCH v5 09/22] media: camss: Refactor CSID HW version support Robert Foss
@ 2021-02-21 15:15 ` Andrey Konovalov
2021-02-21 17:50 ` Andrey Konovalov
0 siblings, 1 reply; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-21 15:15 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Thanks,
Andrey
On 17.02.2021 14:21, Robert Foss wrote:
> In order to support Qualcomm ISP hardware architectures that diverge
> from older architectures, the CSID subdevice drivers needs to be refactored
> to better abstract the different ISP hardware architectures.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
>
> Changes since v1
> - kernel test robot: Add missing include, interrupt.h
>
> Changes since v4
> - Andrey: Removed whitespace from some includes
> - Andrey: Removed unused enum
>
>
> drivers/media/platform/qcom/camss/Makefile | 2 +
> .../platform/qcom/camss/camss-csid-4-1.c | 330 ++++++++++
> .../platform/qcom/camss/camss-csid-4-7.c | 406 ++++++++++++
> .../media/platform/qcom/camss/camss-csid.c | 616 +-----------------
> .../media/platform/qcom/camss/camss-csid.h | 126 +++-
> 5 files changed, 890 insertions(+), 590 deletions(-)
> create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-1.c
> create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-7.c
>
> diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
> index 052c4f405fa3..cff388b653ba 100644
> --- a/drivers/media/platform/qcom/camss/Makefile
> +++ b/drivers/media/platform/qcom/camss/Makefile
> @@ -4,6 +4,8 @@
> qcom-camss-objs += \
> camss.o \
> camss-csid.o \
> + camss-csid-4-1.o \
> + camss-csid-4-7.o \
> camss-csiphy-2ph-1-0.o \
> camss-csiphy-3ph-1-0.o \
> camss-csiphy.o \
> diff --git a/drivers/media/platform/qcom/camss/camss-csid-4-1.c b/drivers/media/platform/qcom/camss/camss-csid-4-1.c
> new file mode 100644
> index 000000000000..c92077a7f758
> --- /dev/null
> +++ b/drivers/media/platform/qcom/camss/camss-csid-4-1.c
> @@ -0,0 +1,330 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * camss-csid-4-1.c
> + *
> + * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
> + *
> + * Copyright (C) 2020 Linaro Ltd.
> + */
> +
> +#include <linux/completion.h>
> +#include <linux/interrupt.h>
> +#include <linux/io.h>
> +#include <linux/kernel.h>
> +#include <linux/of.h>
> +
> +#include "camss-csid.h"
> +#include "camss.h"
> +
> +#define CAMSS_CSID_HW_VERSION 0x0
> +#define CAMSS_CSID_CORE_CTRL_0 0x004
> +#define CAMSS_CSID_CORE_CTRL_1 0x008
> +#define CAMSS_CSID_RST_CMD 0x00c
> +#define CAMSS_CSID_CID_LUT_VC_n(n) (0x010 + 0x4 * (n))
> +#define CAMSS_CSID_CID_n_CFG(n) (0x020 + 0x4 * (n))
> +#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
> +#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
> +#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
> +#define CAMSS_CSID_IRQ_CLEAR_CMD 0x060
> +#define CAMSS_CSID_IRQ_MASK 0x064
> +#define CAMSS_CSID_IRQ_STATUS 0x068
> +#define CAMSS_CSID_TG_CTRL 0x0a0
> +#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
> +#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
> +#define CAMSS_CSID_TG_VC_CFG 0x0a4
> +#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
> +#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
> +#define CAMSS_CSID_TG_DT_n_CGG_0(n) (0x0ac + 0xc * (n))
> +#define CAMSS_CSID_TG_DT_n_CGG_1(n) (0x0b0 + 0xc * (n))
> +#define CAMSS_CSID_TG_DT_n_CGG_2(n) (0x0b4 + 0xc * (n))
> +
> +
> +static const struct csid_format csid_formats[] = {
> + {
> + MEDIA_BUS_FMT_UYVY8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_VYUY8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_YUYV8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_YVYU8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_Y10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> +};
> +
> +static void csid_configure_stream(struct csid_device *csid, u8 enable)
> +{
> + struct csid_testgen_config *tg = &csid->testgen;
> + u32 val;
> +
> + if (enable) {
> + struct v4l2_mbus_framefmt *input_format;
> + const struct csid_format *format;
> + u8 vc = 0; /* Virtual Channel 0 */
> + u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
> + u8 dt_shift;
> +
> + if (tg->enabled) {
> + /* Config Test Generator */
> + u32 num_lines, num_bytes_per_line;
> +
> + input_format = &csid->fmt[MSM_CSID_PAD_SRC];
> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
> + input_format->code);
> + num_bytes_per_line = input_format->width * format->bpp * format->spp / 8;
> + num_lines = input_format->height;
> +
> + /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
> + /* 1:0 VC */
> + val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
> + ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_VC_CFG);
> +
> + /* 28:16 bytes per lines, 12:0 num of lines */
> + val = ((num_bytes_per_line & 0x1fff) << 16) |
> + (num_lines & 0x1fff);
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_0(0));
> +
> + /* 5:0 data type */
> + val = format->data_type;
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_1(0));
> +
> + /* 2:0 output test pattern */
> + val = tg->mode;
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_2(0));
> + } else {
> + struct csid_phy_config *phy = &csid->phy;
> +
> + input_format = &csid->fmt[MSM_CSID_PAD_SINK];
> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
> + input_format->code);
> +
> + val = phy->lane_cnt - 1;
> + val |= phy->lane_assign << 4;
> +
> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_0);
> +
> + val = phy->csiphy_id << 17;
> + val |= 0x9;
> +
> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_1);
> + }
> +
> + /* Config LUT */
> +
> + dt_shift = (cid % 4) * 8;
> + val = readl_relaxed(csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
> + val &= ~(0xff << dt_shift);
> + val |= format->data_type << dt_shift;
> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
> +
> + val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
> + val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
> + val |= format->decode_format << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
> + val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_n_CFG(cid));
> +
> + if (tg->enabled) {
> + val = CAMSS_CSID_TG_CTRL_ENABLE;
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
> + }
> + } else {
> + if (tg->enabled) {
> + val = CAMSS_CSID_TG_CTRL_DISABLE;
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
> + }
> + }
> +}
> +
> +static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
> +{
> + s32 regval = val - 1;
> +
> + if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1)
> + csid->testgen.mode = regval;
> +
> + return 0;
> +}
> +
> +static u32 csid_hw_version(struct csid_device *csid)
> +{
> + u32 hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
> +
> + dev_dbg(csid->camss->dev, "CSID HW Version = 0x%08x\n", hw_version);
> +
> + return hw_version;
> +}
> +
> +static irqreturn_t csid_isr(int irq, void *dev)
> +{
> + struct csid_device *csid = dev;
> + u32 value;
> +
> + value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS);
> + writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD);
> +
> + if ((value >> 11) & 0x1)
> + complete(&csid->reset_complete);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int csid_reset(struct csid_device *csid)
> +{
> + unsigned long time;
> +
> + reinit_completion(&csid->reset_complete);
> +
> + writel_relaxed(0x7fff, csid->base + CAMSS_CSID_RST_CMD);
> +
> + time = wait_for_completion_timeout(&csid->reset_complete,
> + msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
> + if (!time) {
> + dev_err(csid->camss->dev, "CSID reset timeout\n");
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
> + unsigned int match_format_idx, u32 match_code)
> +{
> + if (match_format_idx > 0)
> + return 0;
> +
> + return sink_code;
> +}
> +
> +static void csid_subdev_init(struct csid_device *csid)
> +{
> + csid->formats = csid_formats;
> + csid->nformats = ARRAY_SIZE(csid_formats);
> + csid->testgen.modes = csid_testgen_modes;
> + csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1;
> +}
> +
> +const struct csid_hw_ops csid_ops_4_1 = {
> + .configure_stream = csid_configure_stream,
> + .configure_testgen_pattern = csid_configure_testgen_pattern,
> + .hw_version = csid_hw_version,
> + .isr = csid_isr,
> + .reset = csid_reset,
> + .src_pad_code = csid_src_pad_code,
> + .subdev_init = csid_subdev_init,
> +};
> diff --git a/drivers/media/platform/qcom/camss/camss-csid-4-7.c b/drivers/media/platform/qcom/camss/camss-csid-4-7.c
> new file mode 100644
> index 000000000000..16a69b140f4e
> --- /dev/null
> +++ b/drivers/media/platform/qcom/camss/camss-csid-4-7.c
> @@ -0,0 +1,406 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * camss-csid-4-7.c
> + *
> + * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
> + *
> + * Copyright (C) 2020 Linaro Ltd.
> + */
> +#include <linux/completion.h>
> +#include <linux/interrupt.h>
> +#include <linux/io.h>
> +#include <linux/kernel.h>
> +#include <linux/of.h>
> +
> +#include "camss-csid.h"
> +#include "camss.h"
> +
> +#define CAMSS_CSID_HW_VERSION 0x0
> +#define CAMSS_CSID_CORE_CTRL_0 0x004
> +#define CAMSS_CSID_CORE_CTRL_1 0x008
> +#define CAMSS_CSID_RST_CMD 0x010
> +#define CAMSS_CSID_CID_LUT_VC_n(n) (0x014 + 0x4 * (n))
> +#define CAMSS_CSID_CID_n_CFG(n) (0x024 + 0x4 * (n))
> +#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
> +#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
> +#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
> +#define CAMSS_CSID_IRQ_CLEAR_CMD 0x064
> +#define CAMSS_CSID_IRQ_MASK 0x068
> +#define CAMSS_CSID_IRQ_STATUS 0x06c
> +#define CAMSS_CSID_TG_CTRL 0x0a8
> +#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
> +#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
> +#define CAMSS_CSID_TG_VC_CFG 0x0ac
> +#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
> +#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
> +#define CAMSS_CSID_TG_DT_n_CGG_0(n) (0x0b4 + 0xc * (n))
> +#define CAMSS_CSID_TG_DT_n_CGG_1(n) (0x0b8 + 0xc * (n))
> +#define CAMSS_CSID_TG_DT_n_CGG_2(n) (0x0bc + 0xc * (n))
> +
> +
> +static const struct csid_format csid_formats[] = {
> + {
> + MEDIA_BUS_FMT_UYVY8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_VYUY8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_YUYV8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_YVYU8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR14_1X14,
> + DATA_TYPE_RAW_14BIT,
> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> + 14,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG14_1X14,
> + DATA_TYPE_RAW_14BIT,
> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> + 14,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG14_1X14,
> + DATA_TYPE_RAW_14BIT,
> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> + 14,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB14_1X14,
> + DATA_TYPE_RAW_14BIT,
> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> + 14,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_Y10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> +};
> +
> +static void csid_configure_stream(struct csid_device *csid, u8 enable)
> +{
> + struct csid_testgen_config *tg = &csid->testgen;
> + u32 sink_code = csid->fmt[MSM_CSID_PAD_SINK].code;
> + u32 src_code = csid->fmt[MSM_CSID_PAD_SRC].code;
> + u32 val;
> +
> + if (enable) {
> + struct v4l2_mbus_framefmt *input_format;
> + const struct csid_format *format;
> + u8 vc = 0; /* Virtual Channel 0 */
> + u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
> + u8 dt_shift;
> +
> + if (tg->enabled) {
> + /* Config Test Generator */
> + u32 num_bytes_per_line, num_lines;
> +
> + input_format = &csid->fmt[MSM_CSID_PAD_SRC];
> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
> + input_format->code);
> + num_bytes_per_line = input_format->width * format->bpp * format->spp / 8;
> + num_lines = input_format->height;
> +
> + /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
> + /* 1:0 VC */
> + val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
> + ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_VC_CFG);
> +
> + /* 28:16 bytes per lines, 12:0 num of lines */
> + val = ((num_bytes_per_line & 0x1fff) << 16) |
> + (num_lines & 0x1fff);
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_0(0));
> +
> + /* 5:0 data type */
> + val = format->data_type;
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_1(0));
> +
> + /* 2:0 output test pattern */
> + val = tg->mode;
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_2(0));
> + } else {
> + struct csid_phy_config *phy = &csid->phy;
> +
> + input_format = &csid->fmt[MSM_CSID_PAD_SINK];
> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
> + input_format->code);
> +
> + val = phy->lane_cnt - 1;
> + val |= phy->lane_assign << 4;
> +
> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_0);
> +
> + val = phy->csiphy_id << 17;
> + val |= 0x9;
> +
> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_1);
> + }
> +
> + /* Config LUT */
> +
> + dt_shift = (cid % 4) * 8;
> +
> + val = readl_relaxed(csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
> + val &= ~(0xff << dt_shift);
> + val |= format->data_type << dt_shift;
> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
> +
> + val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
> + val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
> + val |= format->decode_format << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
> + val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
> +
> + if ((sink_code == MEDIA_BUS_FMT_SBGGR10_1X10 &&
> + src_code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) ||
> + (sink_code == MEDIA_BUS_FMT_Y10_1X10 &&
> + src_code == MEDIA_BUS_FMT_Y10_2X8_PADHI_LE)) {
> + val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING;
> + val |= CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16;
> + val |= CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB;
> + }
> +
> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_n_CFG(cid));
> +
> + if (tg->enabled) {
> + val = CAMSS_CSID_TG_CTRL_ENABLE;
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
> + }
> + } else {
> + if (tg->enabled) {
> + val = CAMSS_CSID_TG_CTRL_DISABLE;
> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
> + }
> + }
> +}
> +
> +static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
> +{
> + s32 regval = val - 1;
> +
> + if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7)
> + csid->testgen.mode = regval;
> +
> + return 0;
> +}
> +
> +static u32 csid_hw_version(struct csid_device *csid)
> +{
> + u32 hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
> +
> + dev_dbg(csid->camss->dev, "CSID HW Version = 0x%08x\n", hw_version);
> +
> + return hw_version;
> +}
> +
> +/*
> + * isr - CSID module interrupt service routine
> + * @irq: Interrupt line
> + * @dev: CSID device
> + *
> + * Return IRQ_HANDLED on success
> + */
> +static irqreturn_t csid_isr(int irq, void *dev)
> +{
> + struct csid_device *csid = dev;
> + u32 value;
> +
> + value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS);
> + writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD);
> +
> + if ((value >> 11) & 0x1)
> + complete(&csid->reset_complete);
> +
> + return IRQ_HANDLED;
> +}
> +
> +/*
> + * csid_reset - Trigger reset on CSID module and wait to complete
> + * @csid: CSID device
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +static int csid_reset(struct csid_device *csid)
> +{
> + unsigned long time;
> +
> + reinit_completion(&csid->reset_complete);
> +
> + writel_relaxed(0x7fff, csid->base + CAMSS_CSID_RST_CMD);
> +
> + time = wait_for_completion_timeout(&csid->reset_complete,
> + msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
> + if (!time) {
> + dev_err(csid->camss->dev, "CSID reset timeout\n");
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
> + unsigned int match_format_idx, u32 match_code)
> +{
> + switch (sink_code) {
> + case MEDIA_BUS_FMT_SBGGR10_1X10:
> + {
> + u32 src_code[] = {
> + MEDIA_BUS_FMT_SBGGR10_1X10,
> + MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
> + };
> +
> + return csid_find_code(src_code, ARRAY_SIZE(src_code),
> + match_format_idx, match_code);
> + }
> + case MEDIA_BUS_FMT_Y10_1X10:
> + {
> + u32 src_code[] = {
> + MEDIA_BUS_FMT_Y10_1X10,
> + MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
> + };
> +
> + return csid_find_code(src_code, ARRAY_SIZE(src_code),
> + match_format_idx, match_code);
> + }
> + default:
> + if (match_format_idx > 0)
> + return 0;
> +
> + return sink_code;
> + }
> +}
> +
> +static void csid_subdev_init(struct csid_device *csid)
> +{
> + csid->formats = csid_formats;
> + csid->nformats = ARRAY_SIZE(csid_formats);
> + csid->testgen.modes = csid_testgen_modes;
> + csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7;
> +}
> +
> +const struct csid_hw_ops csid_ops_4_7 = {
> + .configure_stream = csid_configure_stream,
> + .configure_testgen_pattern = csid_configure_testgen_pattern,
> + .hw_version = csid_hw_version,
> + .isr = csid_isr,
> + .reset = csid_reset,
> + .src_pad_code = csid_src_pad_code,
> + .subdev_init = csid_subdev_init,
> +};
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
> index be3fe76f3dc3..601bd810f2b0 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.c
> +++ b/drivers/media/platform/qcom/camss/camss-csid.c
> @@ -26,405 +26,35 @@
>
> #define MSM_CSID_NAME "msm_csid"
>
> -#define CAMSS_CSID_HW_VERSION 0x0
> -#define CAMSS_CSID_CORE_CTRL_0 0x004
> -#define CAMSS_CSID_CORE_CTRL_1 0x008
> -#define CAMSS_CSID_RST_CMD(v) ((v) == CAMSS_8x16 ? 0x00c : 0x010)
> -#define CAMSS_CSID_CID_LUT_VC_n(v, n) \
> - (((v) == CAMSS_8x16 ? 0x010 : 0x014) + 0x4 * (n))
> -#define CAMSS_CSID_CID_n_CFG(v, n) \
> - (((v) == CAMSS_8x16 ? 0x020 : 0x024) + 0x4 * (n))
> -#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
> -#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
> -#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
> -#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
> -#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
> -#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
> -#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
> -#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
> -#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
> -#define CAMSS_CSID_IRQ_CLEAR_CMD(v) ((v) == CAMSS_8x16 ? 0x060 : 0x064)
> -#define CAMSS_CSID_IRQ_MASK(v) ((v) == CAMSS_8x16 ? 0x064 : 0x068)
> -#define CAMSS_CSID_IRQ_STATUS(v) ((v) == CAMSS_8x16 ? 0x068 : 0x06c)
> -#define CAMSS_CSID_TG_CTRL(v) ((v) == CAMSS_8x16 ? 0x0a0 : 0x0a8)
> -#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
> -#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
> -#define CAMSS_CSID_TG_VC_CFG(v) ((v) == CAMSS_8x16 ? 0x0a4 : 0x0ac)
> -#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
> -#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
> -#define CAMSS_CSID_TG_DT_n_CGG_0(v, n) \
> - (((v) == CAMSS_8x16 ? 0x0ac : 0x0b4) + 0xc * (n))
> -#define CAMSS_CSID_TG_DT_n_CGG_1(v, n) \
> - (((v) == CAMSS_8x16 ? 0x0b0 : 0x0b8) + 0xc * (n))
> -#define CAMSS_CSID_TG_DT_n_CGG_2(v, n) \
> - (((v) == CAMSS_8x16 ? 0x0b4 : 0x0bc) + 0xc * (n))
> -
> -#define DATA_TYPE_EMBEDDED_DATA_8BIT 0x12
> -#define DATA_TYPE_YUV422_8BIT 0x1e
> -#define DATA_TYPE_RAW_6BIT 0x28
> -#define DATA_TYPE_RAW_8BIT 0x2a
> -#define DATA_TYPE_RAW_10BIT 0x2b
> -#define DATA_TYPE_RAW_12BIT 0x2c
> -#define DATA_TYPE_RAW_14BIT 0x2d
> -
> -#define DECODE_FORMAT_UNCOMPRESSED_6_BIT 0x0
> -#define DECODE_FORMAT_UNCOMPRESSED_8_BIT 0x1
> -#define DECODE_FORMAT_UNCOMPRESSED_10_BIT 0x2
> -#define DECODE_FORMAT_UNCOMPRESSED_12_BIT 0x3
> -#define DECODE_FORMAT_UNCOMPRESSED_14_BIT 0x8
> -
> -#define CSID_RESET_TIMEOUT_MS 500
> -
> -struct csid_format {
> - u32 code;
> - u8 data_type;
> - u8 decode_format;
> - u8 bpp;
> - u8 spp; /* bus samples per pixel */
> -};
> -
> -static const struct csid_format csid_formats_8x16[] = {
> - {
> - MEDIA_BUS_FMT_UYVY8_2X8,
> - DATA_TYPE_YUV422_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 2,
> - },
> - {
> - MEDIA_BUS_FMT_VYUY8_2X8,
> - DATA_TYPE_YUV422_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 2,
> - },
> - {
> - MEDIA_BUS_FMT_YUYV8_2X8,
> - DATA_TYPE_YUV422_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 2,
> - },
> - {
> - MEDIA_BUS_FMT_YVYU8_2X8,
> - DATA_TYPE_YUV422_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 2,
> - },
> - {
> - MEDIA_BUS_FMT_SBGGR8_1X8,
> - DATA_TYPE_RAW_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGBRG8_1X8,
> - DATA_TYPE_RAW_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGRBG8_1X8,
> - DATA_TYPE_RAW_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SRGGB8_1X8,
> - DATA_TYPE_RAW_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SBGGR10_1X10,
> - DATA_TYPE_RAW_10BIT,
> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> - 10,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGBRG10_1X10,
> - DATA_TYPE_RAW_10BIT,
> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> - 10,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGRBG10_1X10,
> - DATA_TYPE_RAW_10BIT,
> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> - 10,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SRGGB10_1X10,
> - DATA_TYPE_RAW_10BIT,
> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> - 10,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SBGGR12_1X12,
> - DATA_TYPE_RAW_12BIT,
> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> - 12,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGBRG12_1X12,
> - DATA_TYPE_RAW_12BIT,
> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> - 12,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGRBG12_1X12,
> - DATA_TYPE_RAW_12BIT,
> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> - 12,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SRGGB12_1X12,
> - DATA_TYPE_RAW_12BIT,
> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> - 12,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_Y10_1X10,
> - DATA_TYPE_RAW_10BIT,
> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> - 10,
> - 1,
> - },
> -};
> -
> -static const struct csid_format csid_formats_8x96[] = {
> - {
> - MEDIA_BUS_FMT_UYVY8_2X8,
> - DATA_TYPE_YUV422_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 2,
> - },
> - {
> - MEDIA_BUS_FMT_VYUY8_2X8,
> - DATA_TYPE_YUV422_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 2,
> - },
> - {
> - MEDIA_BUS_FMT_YUYV8_2X8,
> - DATA_TYPE_YUV422_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 2,
> - },
> - {
> - MEDIA_BUS_FMT_YVYU8_2X8,
> - DATA_TYPE_YUV422_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 2,
> - },
> - {
> - MEDIA_BUS_FMT_SBGGR8_1X8,
> - DATA_TYPE_RAW_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGBRG8_1X8,
> - DATA_TYPE_RAW_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGRBG8_1X8,
> - DATA_TYPE_RAW_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SRGGB8_1X8,
> - DATA_TYPE_RAW_8BIT,
> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> - 8,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SBGGR10_1X10,
> - DATA_TYPE_RAW_10BIT,
> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> - 10,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGBRG10_1X10,
> - DATA_TYPE_RAW_10BIT,
> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> - 10,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGRBG10_1X10,
> - DATA_TYPE_RAW_10BIT,
> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> - 10,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SRGGB10_1X10,
> - DATA_TYPE_RAW_10BIT,
> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> - 10,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SBGGR12_1X12,
> - DATA_TYPE_RAW_12BIT,
> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> - 12,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGBRG12_1X12,
> - DATA_TYPE_RAW_12BIT,
> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> - 12,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGRBG12_1X12,
> - DATA_TYPE_RAW_12BIT,
> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> - 12,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SRGGB12_1X12,
> - DATA_TYPE_RAW_12BIT,
> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> - 12,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SBGGR14_1X14,
> - DATA_TYPE_RAW_14BIT,
> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> - 14,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGBRG14_1X14,
> - DATA_TYPE_RAW_14BIT,
> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> - 14,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SGRBG14_1X14,
> - DATA_TYPE_RAW_14BIT,
> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> - 14,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_SRGGB14_1X14,
> - DATA_TYPE_RAW_14BIT,
> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> - 14,
> - 1,
> - },
> - {
> - MEDIA_BUS_FMT_Y10_1X10,
> - DATA_TYPE_RAW_10BIT,
> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> - 10,
> - 1,
> - },
> -};
>
> -static u32 csid_find_code(u32 *code, unsigned int n_code,
> - unsigned int index, u32 req_code)
> +u32 csid_find_code(u32 *codes, unsigned int ncodes,
> + unsigned int match_format_idx, u32 match_code)
> {
> int i;
>
> - if (!req_code && (index >= n_code))
> + if (!match_code && (match_format_idx >= ncodes))
> return 0;
>
> - for (i = 0; i < n_code; i++)
> - if (req_code) {
> - if (req_code == code[i])
> - return req_code;
> + for (i = 0; i < ncodes; i++)
> + if (match_code) {
> + if (codes[i] == match_code)
> + return match_code;
> } else {
> - if (i == index)
> - return code[i];
> - }
> -
> - return code[0];
> -}
> -
> -static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
> - unsigned int index, u32 src_req_code)
> -{
> - if (csid->camss->version == CAMSS_8x16) {
> - if (index > 0)
> - return 0;
> -
> - return sink_code;
> - } else if (csid->camss->version == CAMSS_8x96 ||
> - csid->camss->version == CAMSS_660) {
> - switch (sink_code) {
> - case MEDIA_BUS_FMT_SBGGR10_1X10:
> - {
> - u32 src_code[] = {
> - MEDIA_BUS_FMT_SBGGR10_1X10,
> - MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
> - };
> -
> - return csid_find_code(src_code, ARRAY_SIZE(src_code),
> - index, src_req_code);
> - }
> - case MEDIA_BUS_FMT_Y10_1X10:
> - {
> - u32 src_code[] = {
> - MEDIA_BUS_FMT_Y10_1X10,
> - MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
> - };
> -
> - return csid_find_code(src_code, ARRAY_SIZE(src_code),
> - index, src_req_code);
> + if (i == match_format_idx)
> + return codes[i];
> }
> - default:
> - if (index > 0)
> - return 0;
>
> - return sink_code;
> - }
> - } else {
> - return 0;
> - }
> + return codes[0];
> }
>
> -static const struct csid_format *csid_get_fmt_entry(
> +const struct csid_format *csid_get_fmt_entry(
> const struct csid_format *formats,
> - unsigned int nformat,
> + unsigned int nformats,
> u32 code)
> {
> unsigned int i;
>
> - for (i = 0; i < nformat; i++)
> + for (i = 0; i < nformats; i++)
> if (code == formats[i].code)
> return &formats[i];
>
> @@ -433,28 +63,6 @@ static const struct csid_format *csid_get_fmt_entry(
> return &formats[0];
> }
>
> -/*
> - * csid_isr - CSID module interrupt handler
> - * @irq: Interrupt line
> - * @dev: CSID device
> - *
> - * Return IRQ_HANDLED on success
> - */
> -static irqreturn_t csid_isr(int irq, void *dev)
> -{
> - struct csid_device *csid = dev;
> - enum camss_version ver = csid->camss->version;
> - u32 value;
> -
> - value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS(ver));
> - writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD(ver));
> -
> - if ((value >> 11) & 0x1)
> - complete(&csid->reset_complete);
> -
> - return IRQ_HANDLED;
> -}
> -
> /*
> * csid_set_clock_rates - Calculate and set clock rates on CSID module
> * @csiphy: CSID device
> @@ -521,31 +129,6 @@ static int csid_set_clock_rates(struct csid_device *csid)
> return 0;
> }
>
> -/*
> - * csid_reset - Trigger reset on CSID module and wait to complete
> - * @csid: CSID device
> - *
> - * Return 0 on success or a negative error code otherwise
> - */
> -static int csid_reset(struct csid_device *csid)
> -{
> - unsigned long time;
> -
> - reinit_completion(&csid->reset_complete);
> -
> - writel_relaxed(0x7fff, csid->base +
> - CAMSS_CSID_RST_CMD(csid->camss->version));
> -
> - time = wait_for_completion_timeout(&csid->reset_complete,
> - msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
> - if (!time) {
> - dev_err(csid->camss->dev, "CSID reset timeout\n");
> - return -EIO;
> - }
> -
> - return 0;
> -}
> -
> /*
> * csid_set_power - Power on/off CSID module
> * @sd: CSID V4L2 subdevice
> @@ -560,8 +143,6 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
> int ret;
>
> if (on) {
> - u32 hw_version;
> -
> ret = pm_runtime_get_sync(dev);
> if (ret < 0) {
> pm_runtime_put_sync(dev);
> @@ -590,7 +171,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
>
> enable_irq(csid->irq);
>
> - ret = csid_reset(csid);
> + ret = csid->ops->reset(csid);
> if (ret < 0) {
> disable_irq(csid->irq);
> camss_disable_clocks(csid->nclocks, csid->clock);
> @@ -599,8 +180,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
> return ret;
> }
>
> - hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
> - dev_dbg(dev, "CSID HW Version = 0x%08x\n", hw_version);
> + csid->ops->hw_version(csid);
> } else {
> disable_irq(csid->irq);
> camss_disable_clocks(csid->nclocks, csid->clock);
> @@ -623,16 +203,9 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
> static int csid_set_stream(struct v4l2_subdev *sd, int enable)
> {
> struct csid_device *csid = v4l2_get_subdevdata(sd);
> - struct csid_testgen_config *tg = &csid->testgen;
> - enum camss_version ver = csid->camss->version;
> - u32 val;
> + int ret;
>
> if (enable) {
> - u8 vc = 0; /* Virtual Channel 0 */
> - u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
> - u8 dt, dt_shift, df;
> - int ret;
> -
> ret = v4l2_ctrl_handler_setup(&csid->ctrls);
> if (ret < 0) {
> dev_err(csid->camss->dev,
> @@ -640,116 +213,13 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)
> return ret;
> }
>
> - if (!tg->enabled &&
> + if (!csid->testgen.enabled &&
> !media_entity_remote_pad(&csid->pads[MSM_CSID_PAD_SINK]))
> return -ENOLINK;
> -
> - if (tg->enabled) {
> - /* Config Test Generator */
> - struct v4l2_mbus_framefmt *f =
> - &csid->fmt[MSM_CSID_PAD_SRC];
> - const struct csid_format *format = csid_get_fmt_entry(
> - csid->formats, csid->nformats, f->code);
> - u32 num_bytes_per_line =
> - f->width * format->bpp * format->spp / 8;
> - u32 num_lines = f->height;
> -
> - /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
> - /* 1:0 VC */
> - val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
> - ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
> - writel_relaxed(val, csid->base +
> - CAMSS_CSID_TG_VC_CFG(ver));
> -
> - /* 28:16 bytes per lines, 12:0 num of lines */
> - val = ((num_bytes_per_line & 0x1fff) << 16) |
> - (num_lines & 0x1fff);
> - writel_relaxed(val, csid->base +
> - CAMSS_CSID_TG_DT_n_CGG_0(ver, 0));
> -
> - dt = format->data_type;
> -
> - /* 5:0 data type */
> - val = dt;
> - writel_relaxed(val, csid->base +
> - CAMSS_CSID_TG_DT_n_CGG_1(ver, 0));
> -
> - /* 2:0 output test pattern */
> - val = tg->payload_mode;
> - writel_relaxed(val, csid->base +
> - CAMSS_CSID_TG_DT_n_CGG_2(ver, 0));
> -
> - df = format->decode_format;
> - } else {
> - struct v4l2_mbus_framefmt *f =
> - &csid->fmt[MSM_CSID_PAD_SINK];
> - const struct csid_format *format = csid_get_fmt_entry(
> - csid->formats, csid->nformats, f->code);
> - struct csid_phy_config *phy = &csid->phy;
> -
> - val = phy->lane_cnt - 1;
> - val |= phy->lane_assign << 4;
> -
> - writel_relaxed(val,
> - csid->base + CAMSS_CSID_CORE_CTRL_0);
> -
> - val = phy->csiphy_id << 17;
> - val |= 0x9;
> -
> - writel_relaxed(val,
> - csid->base + CAMSS_CSID_CORE_CTRL_1);
> -
> - dt = format->data_type;
> - df = format->decode_format;
> - }
> -
> - /* Config LUT */
> -
> - dt_shift = (cid % 4) * 8;
> -
> - val = readl_relaxed(csid->base +
> - CAMSS_CSID_CID_LUT_VC_n(ver, vc));
> - val &= ~(0xff << dt_shift);
> - val |= dt << dt_shift;
> - writel_relaxed(val, csid->base +
> - CAMSS_CSID_CID_LUT_VC_n(ver, vc));
> -
> - val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
> - val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
> - val |= df << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
> - val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
> -
> - if (csid->camss->version == CAMSS_8x96 ||
> - csid->camss->version == CAMSS_660) {
> - u32 sink_code = csid->fmt[MSM_CSID_PAD_SINK].code;
> - u32 src_code = csid->fmt[MSM_CSID_PAD_SRC].code;
> -
> - if ((sink_code == MEDIA_BUS_FMT_SBGGR10_1X10 &&
> - src_code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) ||
> - (sink_code == MEDIA_BUS_FMT_Y10_1X10 &&
> - src_code == MEDIA_BUS_FMT_Y10_2X8_PADHI_LE)) {
> - val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING;
> - val |= CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16;
> - val |= CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB;
> - }
> - }
> -
> - writel_relaxed(val, csid->base +
> - CAMSS_CSID_CID_n_CFG(ver, cid));
> -
> - if (tg->enabled) {
> - val = CAMSS_CSID_TG_CTRL_ENABLE;
> - writel_relaxed(val, csid->base +
> - CAMSS_CSID_TG_CTRL(ver));
> - }
> - } else {
> - if (tg->enabled) {
> - val = CAMSS_CSID_TG_CTRL_DISABLE;
> - writel_relaxed(val, csid->base +
> - CAMSS_CSID_TG_CTRL(ver));
> - }
> }
>
> + csid->ops->configure_stream(csid, enable);
> +
> return 0;
> }
>
> @@ -818,7 +288,7 @@ static void csid_try_format(struct csid_device *csid,
>
> *fmt = *__csid_get_format(csid, cfg,
> MSM_CSID_PAD_SINK, which);
> - fmt->code = csid_src_pad_code(csid, fmt->code, 0, code);
> + fmt->code = csid->ops->src_pad_code(csid, fmt->code, 0, code);
> } else {
> /* Test generator is enabled, set format on source */
> /* pad to allow test generator usage */
> @@ -868,7 +338,7 @@ static int csid_enum_mbus_code(struct v4l2_subdev *sd,
> MSM_CSID_PAD_SINK,
> code->which);
>
> - code->code = csid_src_pad_code(csid, sink_fmt->code,
> + code->code = csid->ops->src_pad_code(csid, sink_fmt->code,
> code->index, 0);
> if (!code->code)
> return -EINVAL;
> @@ -1004,15 +474,6 @@ static int csid_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
> return csid_set_format(sd, fh ? fh->pad : NULL, &format);
> }
>
> -static const char * const csid_test_pattern_menu[] = {
> - "Disabled",
> - "Incrementing",
> - "Alternating 0x55/0xAA",
> - "All Zeros 0x00",
> - "All Ones 0xFF",
> - "Pseudo-random Data",
> -};
> -
> /*
> * csid_set_test_pattern - Set test generator's pattern mode
> * @csid: CSID device
> @@ -1030,25 +491,7 @@ static int csid_set_test_pattern(struct csid_device *csid, s32 value)
>
> tg->enabled = !!value;
>
> - switch (value) {
> - case 1:
> - tg->payload_mode = CSID_PAYLOAD_MODE_INCREMENTING;
> - break;
> - case 2:
> - tg->payload_mode = CSID_PAYLOAD_MODE_ALTERNATING_55_AA;
> - break;
> - case 3:
> - tg->payload_mode = CSID_PAYLOAD_MODE_ALL_ZEROES;
> - break;
> - case 4:
> - tg->payload_mode = CSID_PAYLOAD_MODE_ALL_ONES;
> - break;
> - case 5:
> - tg->payload_mode = CSID_PAYLOAD_MODE_RANDOM;
> - break;
> - }
> -
> - return 0;
> + return csid->ops->configure_testgen_pattern(csid, value);
> }
>
> /*
> @@ -1097,17 +540,14 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
> csid->id = id;
>
> if (camss->version == CAMSS_8x16) {
> - csid->formats = csid_formats_8x16;
> - csid->nformats =
> - ARRAY_SIZE(csid_formats_8x16);
> + csid->ops = &csid_ops_4_1;
> } else if (camss->version == CAMSS_8x96 ||
> camss->version == CAMSS_660) {
> - csid->formats = csid_formats_8x96;
> - csid->nformats =
> - ARRAY_SIZE(csid_formats_8x96);
> + csid->ops = &csid_ops_4_7;
> } else {
> return -EINVAL;
> }
> + csid->ops->subdev_init(csid);
>
> /* Memory */
>
> @@ -1130,7 +570,7 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
> csid->irq = r->start;
> snprintf(csid->irq_name, sizeof(csid->irq_name), "%s_%s%d",
> dev_name(dev), MSM_CSID_NAME, csid->id);
> - ret = devm_request_irq(dev, csid->irq, csid_isr,
> + ret = devm_request_irq(dev, csid->irq, csid->ops->isr,
> IRQF_TRIGGER_RISING, csid->irq_name, csid);
> if (ret < 0) {
> dev_err(dev, "request_irq failed: %d\n", ret);
> @@ -1341,8 +781,8 @@ int msm_csid_register_entity(struct csid_device *csid,
>
> csid->testgen_mode = v4l2_ctrl_new_std_menu_items(&csid->ctrls,
> &csid_ctrl_ops, V4L2_CID_TEST_PATTERN,
> - ARRAY_SIZE(csid_test_pattern_menu) - 1, 0, 0,
> - csid_test_pattern_menu);
> + csid->testgen.nmodes, 0, 0,
> + csid->testgen.modes);
>
> if (csid->ctrls.error) {
> dev_err(dev, "Failed to init ctrl: %d\n", csid->ctrls.error);
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
> index 02fc34ee8a41..d40194e2bed3 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.h
> +++ b/drivers/media/platform/qcom/camss/camss-csid.h
> @@ -11,6 +11,7 @@
> #define QC_MSM_CAMSS_CSID_H
>
> #include <linux/clk.h>
> +#include <linux/interrupt.h>
> #include <media/media-entity.h>
> #include <media/v4l2-ctrls.h>
> #include <media/v4l2-device.h>
> @@ -70,19 +71,50 @@
> #define PLAIN_FORMAT_PLAIN16 0x1 /* supports DPCM, UNCOMPRESSED_10/16_BIT */
> #define PLAIN_FORMAT_PLAIN32 0x2 /* supports UNCOMPRESSED_20_BIT */
>
> +#define CSID_RESET_TIMEOUT_MS 500
>
> -enum csid_payload_mode {
> +
> +enum csid_testgen_mode {
> CSID_PAYLOAD_MODE_INCREMENTING = 0,
> CSID_PAYLOAD_MODE_ALTERNATING_55_AA = 1,
> CSID_PAYLOAD_MODE_ALL_ZEROES = 2,
> CSID_PAYLOAD_MODE_ALL_ONES = 3,
> CSID_PAYLOAD_MODE_RANDOM = 4,
> CSID_PAYLOAD_MODE_USER_SPECIFIED = 5,
> + CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1 = 5,
> + CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7 = 5,
> + CSID_PAYLOAD_MODE_COMPLEX_PATTERN = 6,
> + CSID_PAYLOAD_MODE_COLOR_BOX = 7,
> + CSID_PAYLOAD_MODE_COLOR_BARS = 8,
> + CSID_PAYLOAD_MODE_MAX_SUPPORTED_170 = 8,
> +};
> +
> +static const char * const csid_testgen_modes[] = {
> + "Disabled",
> + "Incrementing",
> + "Alternating 0x55/0xAA",
> + "All Zeros 0x00",
> + "All Ones 0xFF",
> + "Pseudo-random Data",
> + "User Specified",
> + "Complex pattern",
> + "Color box",
> + "Color bars",
> +};
> +
> +struct csid_format {
> + u32 code;
> + u8 data_type;
> + u8 decode_format;
> + u8 bpp;
> + u8 spp; /* bus samples per pixel */
> };
>
> struct csid_testgen_config {
> + enum csid_testgen_mode mode;
> + const char * const*modes;
> + u8 nmodes;
> u8 enabled;
> - enum csid_payload_mode payload_mode;
> };
>
> struct csid_phy_config {
> @@ -91,6 +123,65 @@ struct csid_phy_config {
> u32 lane_assign;
> };
>
> +struct csid_device;
> +
> +struct csid_hw_ops {
> + /*
> + * configure_stream - Configures and starts CSID input stream
> + * @csid: CSID device
> + */
> + void (*configure_stream)(struct csid_device *csid, u8 enable);
> +
> + /*
> + * configure_testgen_pattern - Validates and configures output pattern mode
> + * of test pattern generator
> + * @csid: CSID device
> + */
> + int (*configure_testgen_pattern)(struct csid_device *csid, s32 val);
> +
> + /*
> + * hw_version - Read hardware version register from hardware
> + * @csid: CSID device
> + */
> + u32 (*hw_version)(struct csid_device *csid);
> +
> + /*
> + * isr - CSID module interrupt service routine
> + * @irq: Interrupt line
> + * @dev: CSID device
> + *
> + * Return IRQ_HANDLED on success
> + */
> + irqreturn_t (*isr)(int irq, void *dev);
> +
> + /*
> + * reset - Trigger reset on CSID module and wait to complete
> + * @csid: CSID device
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> + int (*reset)(struct csid_device *csid);
> +
> + /*
> + * src_pad_code - Pick an output/src format based on the input/sink format
> + * @csid: CSID device
> + * @sink_code: The sink format of the input
> + * @match_format_idx: Request preferred index, as defined by subdevice csid_format.
> + * Set @match_code to 0 if used.
> + * @match_code: Request preferred code, set @match_format_idx to 0 if used
> + *
> + * Return 0 on failure or src format code otherwise
> + */
> + u32 (*src_pad_code)(struct csid_device *csid, u32 sink_code,
> + unsigned int match_format_idx, u32 match_code);
> +
> + /*
> + * subdev_init - Initialize CSID device according for hardware revision
> + * @csid: CSID device
> + */
> + void (*subdev_init)(struct csid_device *csid);
> +};
> +
> struct csid_device {
> struct camss *camss;
> u8 id;
> @@ -110,10 +201,37 @@ struct csid_device {
> struct v4l2_ctrl *testgen_mode;
> const struct csid_format *formats;
> unsigned int nformats;
> + const struct csid_hw_ops *ops;
> };
>
> struct resources;
>
> +
> +/*
> + * csid_find_code - Find a format code in an array using array index or format code
> + * @codes: Array of format codes
> + * @ncodes: Length of @code array
> + * @req_format_idx: Request preferred index, as defined by subdevice csid_format.
> + * Set @match_code to 0 if used.
> + * @match_code: Request preferred code, set @req_format_idx to 0 if used
> + *
> + * Return 0 on failure or format code otherwise
> + */
> +u32 csid_find_code(u32 *codes, unsigned int ncode,
> + unsigned int match_format_idx, u32 match_code);
> +
> +/*
> + * csid_get_fmt_entry - Find csid_format entry with matching format code
> + * @formats: Array of format csid_format entries
> + * @nformats: Length of @nformats array
> + * @code: Desired format code
> + *
> + * Return formats[0] on failure to find code
> + */
> +const struct csid_format *csid_get_fmt_entry(const struct csid_format *formats,
> + unsigned int nformats,
> + u32 code);
> +
> int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
> const struct resources *res, u8 id);
>
> @@ -124,4 +242,8 @@ void msm_csid_unregister_entity(struct csid_device *csid);
>
> void msm_csid_get_csid_id(struct media_entity *entity, u8 *id);
>
> +
> +extern const struct csid_hw_ops csid_ops_4_1;
> +extern const struct csid_hw_ops csid_ops_4_7;
> +
> #endif /* QC_MSM_CAMSS_CSID_H */
>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 09/22] media: camss: Refactor CSID HW version support
2021-02-21 15:15 ` Andrey Konovalov
@ 2021-02-21 17:50 ` Andrey Konovalov
2021-02-22 18:13 ` Robert Foss
0 siblings, 1 reply; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-21 17:50 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
After reviewing the [PATCH v5 10/22], I noticed that this patch also
has a problematic test_pattern control implementation.
See below.
On 21.02.2021 18:15, Andrey Konovalov wrote:
> Hi Robert,
>
> Thank you for your patch!
>
> Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
>
> Thanks,
> Andrey
>
> On 17.02.2021 14:21, Robert Foss wrote:
>> In order to support Qualcomm ISP hardware architectures that diverge
>> from older architectures, the CSID subdevice drivers needs to be refactored
>> to better abstract the different ISP hardware architectures.
>>
>> Signed-off-by: Robert Foss <robert.foss@linaro.org>
>> ---
>>
>> Changes since v1
>> - kernel test robot: Add missing include, interrupt.h
>>
>> Changes since v4
>> - Andrey: Removed whitespace from some includes
>> - Andrey: Removed unused enum
>>
>>
>> drivers/media/platform/qcom/camss/Makefile | 2 +
>> .../platform/qcom/camss/camss-csid-4-1.c | 330 ++++++++++
>> .../platform/qcom/camss/camss-csid-4-7.c | 406 ++++++++++++
>> .../media/platform/qcom/camss/camss-csid.c | 616 +-----------------
>> .../media/platform/qcom/camss/camss-csid.h | 126 +++-
>> 5 files changed, 890 insertions(+), 590 deletions(-)
>> create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-1.c
>> create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-7.c
>>
>> diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
>> index 052c4f405fa3..cff388b653ba 100644
>> --- a/drivers/media/platform/qcom/camss/Makefile
>> +++ b/drivers/media/platform/qcom/camss/Makefile
>> @@ -4,6 +4,8 @@
>> qcom-camss-objs += \
>> camss.o \
>> camss-csid.o \
>> + camss-csid-4-1.o \
>> + camss-csid-4-7.o \
>> camss-csiphy-2ph-1-0.o \
>> camss-csiphy-3ph-1-0.o \
>> camss-csiphy.o \
>> diff --git a/drivers/media/platform/qcom/camss/camss-csid-4-1.c b/drivers/media/platform/qcom/camss/camss-csid-4-1.c
>> new file mode 100644
>> index 000000000000..c92077a7f758
>> --- /dev/null
>> +++ b/drivers/media/platform/qcom/camss/camss-csid-4-1.c
>> @@ -0,0 +1,330 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/*
>> + * camss-csid-4-1.c
>> + *
>> + * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
>> + *
>> + * Copyright (C) 2020 Linaro Ltd.
>> + */
>> +
>> +#include <linux/completion.h>
>> +#include <linux/interrupt.h>
>> +#include <linux/io.h>
>> +#include <linux/kernel.h>
>> +#include <linux/of.h>
>> +
>> +#include "camss-csid.h"
>> +#include "camss.h"
>> +
>> +#define CAMSS_CSID_HW_VERSION 0x0
>> +#define CAMSS_CSID_CORE_CTRL_0 0x004
>> +#define CAMSS_CSID_CORE_CTRL_1 0x008
>> +#define CAMSS_CSID_RST_CMD 0x00c
>> +#define CAMSS_CSID_CID_LUT_VC_n(n) (0x010 + 0x4 * (n))
>> +#define CAMSS_CSID_CID_n_CFG(n) (0x020 + 0x4 * (n))
>> +#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
>> +#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
>> +#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
>> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
>> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
>> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
>> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
>> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
>> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
>> +#define CAMSS_CSID_IRQ_CLEAR_CMD 0x060
>> +#define CAMSS_CSID_IRQ_MASK 0x064
>> +#define CAMSS_CSID_IRQ_STATUS 0x068
>> +#define CAMSS_CSID_TG_CTRL 0x0a0
>> +#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
>> +#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
>> +#define CAMSS_CSID_TG_VC_CFG 0x0a4
>> +#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
>> +#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
>> +#define CAMSS_CSID_TG_DT_n_CGG_0(n) (0x0ac + 0xc * (n))
>> +#define CAMSS_CSID_TG_DT_n_CGG_1(n) (0x0b0 + 0xc * (n))
>> +#define CAMSS_CSID_TG_DT_n_CGG_2(n) (0x0b4 + 0xc * (n))
>> +
>> +
>> +static const struct csid_format csid_formats[] = {
>> + {
>> + MEDIA_BUS_FMT_UYVY8_2X8,
>> + DATA_TYPE_YUV422_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 2,
>> + },
>> + {
>> + MEDIA_BUS_FMT_VYUY8_2X8,
>> + DATA_TYPE_YUV422_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 2,
>> + },
>> + {
>> + MEDIA_BUS_FMT_YUYV8_2X8,
>> + DATA_TYPE_YUV422_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 2,
>> + },
>> + {
>> + MEDIA_BUS_FMT_YVYU8_2X8,
>> + DATA_TYPE_YUV422_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 2,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SBGGR8_1X8,
>> + DATA_TYPE_RAW_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGBRG8_1X8,
>> + DATA_TYPE_RAW_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGRBG8_1X8,
>> + DATA_TYPE_RAW_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SRGGB8_1X8,
>> + DATA_TYPE_RAW_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SBGGR10_1X10,
>> + DATA_TYPE_RAW_10BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> + 10,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGBRG10_1X10,
>> + DATA_TYPE_RAW_10BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> + 10,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGRBG10_1X10,
>> + DATA_TYPE_RAW_10BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> + 10,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SRGGB10_1X10,
>> + DATA_TYPE_RAW_10BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> + 10,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SBGGR12_1X12,
>> + DATA_TYPE_RAW_12BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> + 12,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGBRG12_1X12,
>> + DATA_TYPE_RAW_12BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> + 12,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGRBG12_1X12,
>> + DATA_TYPE_RAW_12BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> + 12,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SRGGB12_1X12,
>> + DATA_TYPE_RAW_12BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> + 12,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_Y10_1X10,
>> + DATA_TYPE_RAW_10BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> + 10,
>> + 1,
>> + },
>> +};
>> +
>> +static void csid_configure_stream(struct csid_device *csid, u8 enable)
>> +{
>> + struct csid_testgen_config *tg = &csid->testgen;
>> + u32 val;
>> +
>> + if (enable) {
>> + struct v4l2_mbus_framefmt *input_format;
>> + const struct csid_format *format;
>> + u8 vc = 0; /* Virtual Channel 0 */
>> + u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
>> + u8 dt_shift;
>> +
>> + if (tg->enabled) {
>> + /* Config Test Generator */
>> + u32 num_lines, num_bytes_per_line;
>> +
>> + input_format = &csid->fmt[MSM_CSID_PAD_SRC];
>> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
>> + input_format->code);
>> + num_bytes_per_line = input_format->width * format->bpp * format->spp / 8;
>> + num_lines = input_format->height;
>> +
>> + /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
>> + /* 1:0 VC */
>> + val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
>> + ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_VC_CFG);
>> +
>> + /* 28:16 bytes per lines, 12:0 num of lines */
>> + val = ((num_bytes_per_line & 0x1fff) << 16) |
>> + (num_lines & 0x1fff);
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_0(0));
>> +
>> + /* 5:0 data type */
>> + val = format->data_type;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_1(0));
>> +
>> + /* 2:0 output test pattern */
>> + val = tg->mode;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_2(0));
>> + } else {
>> + struct csid_phy_config *phy = &csid->phy;
>> +
>> + input_format = &csid->fmt[MSM_CSID_PAD_SINK];
>> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
>> + input_format->code);
>> +
>> + val = phy->lane_cnt - 1;
>> + val |= phy->lane_assign << 4;
>> +
>> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_0);
>> +
>> + val = phy->csiphy_id << 17;
>> + val |= 0x9;
>> +
>> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_1);
>> + }
>> +
>> + /* Config LUT */
>> +
>> + dt_shift = (cid % 4) * 8;
>> + val = readl_relaxed(csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
>> + val &= ~(0xff << dt_shift);
>> + val |= format->data_type << dt_shift;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
>> +
>> + val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
>> + val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
>> + val |= format->decode_format << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
>> + val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_n_CFG(cid));
>> +
>> + if (tg->enabled) {
>> + val = CAMSS_CSID_TG_CTRL_ENABLE;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
>> + }
>> + } else {
>> + if (tg->enabled) {
>> + val = CAMSS_CSID_TG_CTRL_DISABLE;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
>> + }
>> + }
>> +}
>> +
>> +static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
>> +{
>> + s32 regval = val - 1;
>> +
>> + if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1)
>> + csid->testgen.mode = regval;
regval of 0 is the valid "Incrementing" test pattern. The condition above
should be "regval >= 0", not "regval > 0".
>> +
>> + return 0;
>> +}
>> +
>> +static u32 csid_hw_version(struct csid_device *csid)
>> +{
>> + u32 hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
>> +
>> + dev_dbg(csid->camss->dev, "CSID HW Version = 0x%08x\n", hw_version);
>> +
>> + return hw_version;
>> +}
>> +
>> +static irqreturn_t csid_isr(int irq, void *dev)
>> +{
>> + struct csid_device *csid = dev;
>> + u32 value;
>> +
>> + value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS);
>> + writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD);
>> +
>> + if ((value >> 11) & 0x1)
>> + complete(&csid->reset_complete);
>> +
>> + return IRQ_HANDLED;
>> +}
>> +
>> +static int csid_reset(struct csid_device *csid)
>> +{
>> + unsigned long time;
>> +
>> + reinit_completion(&csid->reset_complete);
>> +
>> + writel_relaxed(0x7fff, csid->base + CAMSS_CSID_RST_CMD);
>> +
>> + time = wait_for_completion_timeout(&csid->reset_complete,
>> + msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
>> + if (!time) {
>> + dev_err(csid->camss->dev, "CSID reset timeout\n");
>> + return -EIO;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
>> + unsigned int match_format_idx, u32 match_code)
>> +{
>> + if (match_format_idx > 0)
>> + return 0;
>> +
>> + return sink_code;
>> +}
>> +
>> +static void csid_subdev_init(struct csid_device *csid)
>> +{
>> + csid->formats = csid_formats;
>> + csid->nformats = ARRAY_SIZE(csid_formats);
>> + csid->testgen.modes = csid_testgen_modes;
>> + csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1;
>> +}
>> +
>> +const struct csid_hw_ops csid_ops_4_1 = {
>> + .configure_stream = csid_configure_stream,
>> + .configure_testgen_pattern = csid_configure_testgen_pattern,
>> + .hw_version = csid_hw_version,
>> + .isr = csid_isr,
>> + .reset = csid_reset,
>> + .src_pad_code = csid_src_pad_code,
>> + .subdev_init = csid_subdev_init,
>> +};
>> diff --git a/drivers/media/platform/qcom/camss/camss-csid-4-7.c b/drivers/media/platform/qcom/camss/camss-csid-4-7.c
>> new file mode 100644
>> index 000000000000..16a69b140f4e
>> --- /dev/null
>> +++ b/drivers/media/platform/qcom/camss/camss-csid-4-7.c
>> @@ -0,0 +1,406 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/*
>> + * camss-csid-4-7.c
>> + *
>> + * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
>> + *
>> + * Copyright (C) 2020 Linaro Ltd.
>> + */
>> +#include <linux/completion.h>
>> +#include <linux/interrupt.h>
>> +#include <linux/io.h>
>> +#include <linux/kernel.h>
>> +#include <linux/of.h>
>> +
>> +#include "camss-csid.h"
>> +#include "camss.h"
>> +
>> +#define CAMSS_CSID_HW_VERSION 0x0
>> +#define CAMSS_CSID_CORE_CTRL_0 0x004
>> +#define CAMSS_CSID_CORE_CTRL_1 0x008
>> +#define CAMSS_CSID_RST_CMD 0x010
>> +#define CAMSS_CSID_CID_LUT_VC_n(n) (0x014 + 0x4 * (n))
>> +#define CAMSS_CSID_CID_n_CFG(n) (0x024 + 0x4 * (n))
>> +#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
>> +#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
>> +#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
>> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
>> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
>> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
>> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
>> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
>> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
>> +#define CAMSS_CSID_IRQ_CLEAR_CMD 0x064
>> +#define CAMSS_CSID_IRQ_MASK 0x068
>> +#define CAMSS_CSID_IRQ_STATUS 0x06c
>> +#define CAMSS_CSID_TG_CTRL 0x0a8
>> +#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
>> +#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
>> +#define CAMSS_CSID_TG_VC_CFG 0x0ac
>> +#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
>> +#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
>> +#define CAMSS_CSID_TG_DT_n_CGG_0(n) (0x0b4 + 0xc * (n))
>> +#define CAMSS_CSID_TG_DT_n_CGG_1(n) (0x0b8 + 0xc * (n))
>> +#define CAMSS_CSID_TG_DT_n_CGG_2(n) (0x0bc + 0xc * (n))
>> +
>> +
>> +static const struct csid_format csid_formats[] = {
>> + {
>> + MEDIA_BUS_FMT_UYVY8_2X8,
>> + DATA_TYPE_YUV422_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 2,
>> + },
>> + {
>> + MEDIA_BUS_FMT_VYUY8_2X8,
>> + DATA_TYPE_YUV422_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 2,
>> + },
>> + {
>> + MEDIA_BUS_FMT_YUYV8_2X8,
>> + DATA_TYPE_YUV422_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 2,
>> + },
>> + {
>> + MEDIA_BUS_FMT_YVYU8_2X8,
>> + DATA_TYPE_YUV422_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 2,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SBGGR8_1X8,
>> + DATA_TYPE_RAW_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGBRG8_1X8,
>> + DATA_TYPE_RAW_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGRBG8_1X8,
>> + DATA_TYPE_RAW_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SRGGB8_1X8,
>> + DATA_TYPE_RAW_8BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> + 8,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SBGGR10_1X10,
>> + DATA_TYPE_RAW_10BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> + 10,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGBRG10_1X10,
>> + DATA_TYPE_RAW_10BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> + 10,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGRBG10_1X10,
>> + DATA_TYPE_RAW_10BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> + 10,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SRGGB10_1X10,
>> + DATA_TYPE_RAW_10BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> + 10,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SBGGR12_1X12,
>> + DATA_TYPE_RAW_12BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> + 12,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGBRG12_1X12,
>> + DATA_TYPE_RAW_12BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> + 12,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGRBG12_1X12,
>> + DATA_TYPE_RAW_12BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> + 12,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SRGGB12_1X12,
>> + DATA_TYPE_RAW_12BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> + 12,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SBGGR14_1X14,
>> + DATA_TYPE_RAW_14BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
>> + 14,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGBRG14_1X14,
>> + DATA_TYPE_RAW_14BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
>> + 14,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SGRBG14_1X14,
>> + DATA_TYPE_RAW_14BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
>> + 14,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_SRGGB14_1X14,
>> + DATA_TYPE_RAW_14BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
>> + 14,
>> + 1,
>> + },
>> + {
>> + MEDIA_BUS_FMT_Y10_1X10,
>> + DATA_TYPE_RAW_10BIT,
>> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> + 10,
>> + 1,
>> + },
>> +};
>> +
>> +static void csid_configure_stream(struct csid_device *csid, u8 enable)
>> +{
>> + struct csid_testgen_config *tg = &csid->testgen;
>> + u32 sink_code = csid->fmt[MSM_CSID_PAD_SINK].code;
>> + u32 src_code = csid->fmt[MSM_CSID_PAD_SRC].code;
>> + u32 val;
>> +
>> + if (enable) {
>> + struct v4l2_mbus_framefmt *input_format;
>> + const struct csid_format *format;
>> + u8 vc = 0; /* Virtual Channel 0 */
>> + u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
>> + u8 dt_shift;
>> +
>> + if (tg->enabled) {
>> + /* Config Test Generator */
>> + u32 num_bytes_per_line, num_lines;
>> +
>> + input_format = &csid->fmt[MSM_CSID_PAD_SRC];
>> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
>> + input_format->code);
>> + num_bytes_per_line = input_format->width * format->bpp * format->spp / 8;
>> + num_lines = input_format->height;
>> +
>> + /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
>> + /* 1:0 VC */
>> + val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
>> + ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_VC_CFG);
>> +
>> + /* 28:16 bytes per lines, 12:0 num of lines */
>> + val = ((num_bytes_per_line & 0x1fff) << 16) |
>> + (num_lines & 0x1fff);
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_0(0));
>> +
>> + /* 5:0 data type */
>> + val = format->data_type;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_1(0));
>> +
>> + /* 2:0 output test pattern */
>> + val = tg->mode;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_2(0));
>> + } else {
>> + struct csid_phy_config *phy = &csid->phy;
>> +
>> + input_format = &csid->fmt[MSM_CSID_PAD_SINK];
>> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
>> + input_format->code);
>> +
>> + val = phy->lane_cnt - 1;
>> + val |= phy->lane_assign << 4;
>> +
>> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_0);
>> +
>> + val = phy->csiphy_id << 17;
>> + val |= 0x9;
>> +
>> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_1);
>> + }
>> +
>> + /* Config LUT */
>> +
>> + dt_shift = (cid % 4) * 8;
>> +
>> + val = readl_relaxed(csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
>> + val &= ~(0xff << dt_shift);
>> + val |= format->data_type << dt_shift;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
>> +
>> + val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
>> + val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
>> + val |= format->decode_format << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
>> + val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
>> +
>> + if ((sink_code == MEDIA_BUS_FMT_SBGGR10_1X10 &&
>> + src_code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) ||
>> + (sink_code == MEDIA_BUS_FMT_Y10_1X10 &&
>> + src_code == MEDIA_BUS_FMT_Y10_2X8_PADHI_LE)) {
>> + val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING;
>> + val |= CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16;
>> + val |= CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB;
>> + }
>> +
>> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_n_CFG(cid));
>> +
>> + if (tg->enabled) {
>> + val = CAMSS_CSID_TG_CTRL_ENABLE;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
>> + }
>> + } else {
>> + if (tg->enabled) {
>> + val = CAMSS_CSID_TG_CTRL_DISABLE;
>> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
>> + }
>> + }
>> +}
>> +
>> +static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
>> +{
>> + s32 regval = val - 1;
>> +
>> + if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7)
>> + csid->testgen.mode = regval;
regval of 0 is the valid "Incrementing" test pattern. The condition above
should be "regval >= 0", not "regval > 0".
>> + return 0;
>> +}
>> +
>> +static u32 csid_hw_version(struct csid_device *csid)
>> +{
>> + u32 hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
>> +
>> + dev_dbg(csid->camss->dev, "CSID HW Version = 0x%08x\n", hw_version);
>> +
>> + return hw_version;
>> +}
>> +
>> +/*
>> + * isr - CSID module interrupt service routine
>> + * @irq: Interrupt line
>> + * @dev: CSID device
>> + *
>> + * Return IRQ_HANDLED on success
>> + */
>> +static irqreturn_t csid_isr(int irq, void *dev)
>> +{
>> + struct csid_device *csid = dev;
>> + u32 value;
>> +
>> + value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS);
>> + writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD);
>> +
>> + if ((value >> 11) & 0x1)
>> + complete(&csid->reset_complete);
>> +
>> + return IRQ_HANDLED;
>> +}
>> +
>> +/*
>> + * csid_reset - Trigger reset on CSID module and wait to complete
>> + * @csid: CSID device
>> + *
>> + * Return 0 on success or a negative error code otherwise
>> + */
>> +static int csid_reset(struct csid_device *csid)
>> +{
>> + unsigned long time;
>> +
>> + reinit_completion(&csid->reset_complete);
>> +
>> + writel_relaxed(0x7fff, csid->base + CAMSS_CSID_RST_CMD);
>> +
>> + time = wait_for_completion_timeout(&csid->reset_complete,
>> + msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
>> + if (!time) {
>> + dev_err(csid->camss->dev, "CSID reset timeout\n");
>> + return -EIO;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
>> + unsigned int match_format_idx, u32 match_code)
>> +{
>> + switch (sink_code) {
>> + case MEDIA_BUS_FMT_SBGGR10_1X10:
>> + {
>> + u32 src_code[] = {
>> + MEDIA_BUS_FMT_SBGGR10_1X10,
>> + MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
>> + };
>> +
>> + return csid_find_code(src_code, ARRAY_SIZE(src_code),
>> + match_format_idx, match_code);
>> + }
>> + case MEDIA_BUS_FMT_Y10_1X10:
>> + {
>> + u32 src_code[] = {
>> + MEDIA_BUS_FMT_Y10_1X10,
>> + MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
>> + };
>> +
>> + return csid_find_code(src_code, ARRAY_SIZE(src_code),
>> + match_format_idx, match_code);
>> + }
>> + default:
>> + if (match_format_idx > 0)
>> + return 0;
>> +
>> + return sink_code;
>> + }
>> +}
>> +
>> +static void csid_subdev_init(struct csid_device *csid)
>> +{
>> + csid->formats = csid_formats;
>> + csid->nformats = ARRAY_SIZE(csid_formats);
>> + csid->testgen.modes = csid_testgen_modes;
>> + csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7;
>> +}
>> +
>> +const struct csid_hw_ops csid_ops_4_7 = {
>> + .configure_stream = csid_configure_stream,
>> + .configure_testgen_pattern = csid_configure_testgen_pattern,
>> + .hw_version = csid_hw_version,
>> + .isr = csid_isr,
>> + .reset = csid_reset,
>> + .src_pad_code = csid_src_pad_code,
>> + .subdev_init = csid_subdev_init,
>> +};
>> diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
>> index be3fe76f3dc3..601bd810f2b0 100644
>> --- a/drivers/media/platform/qcom/camss/camss-csid.c
>> +++ b/drivers/media/platform/qcom/camss/camss-csid.c
>> @@ -26,405 +26,35 @@
>> #define MSM_CSID_NAME "msm_csid"
>> -#define CAMSS_CSID_HW_VERSION 0x0
>> -#define CAMSS_CSID_CORE_CTRL_0 0x004
>> -#define CAMSS_CSID_CORE_CTRL_1 0x008
>> -#define CAMSS_CSID_RST_CMD(v) ((v) == CAMSS_8x16 ? 0x00c : 0x010)
>> -#define CAMSS_CSID_CID_LUT_VC_n(v, n) \
>> - (((v) == CAMSS_8x16 ? 0x010 : 0x014) + 0x4 * (n))
>> -#define CAMSS_CSID_CID_n_CFG(v, n) \
>> - (((v) == CAMSS_8x16 ? 0x020 : 0x024) + 0x4 * (n))
>> -#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
>> -#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
>> -#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
>> -#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
>> -#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
>> -#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
>> -#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
>> -#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
>> -#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
>> -#define CAMSS_CSID_IRQ_CLEAR_CMD(v) ((v) == CAMSS_8x16 ? 0x060 : 0x064)
>> -#define CAMSS_CSID_IRQ_MASK(v) ((v) == CAMSS_8x16 ? 0x064 : 0x068)
>> -#define CAMSS_CSID_IRQ_STATUS(v) ((v) == CAMSS_8x16 ? 0x068 : 0x06c)
>> -#define CAMSS_CSID_TG_CTRL(v) ((v) == CAMSS_8x16 ? 0x0a0 : 0x0a8)
>> -#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
>> -#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
>> -#define CAMSS_CSID_TG_VC_CFG(v) ((v) == CAMSS_8x16 ? 0x0a4 : 0x0ac)
>> -#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
>> -#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
>> -#define CAMSS_CSID_TG_DT_n_CGG_0(v, n) \
>> - (((v) == CAMSS_8x16 ? 0x0ac : 0x0b4) + 0xc * (n))
>> -#define CAMSS_CSID_TG_DT_n_CGG_1(v, n) \
>> - (((v) == CAMSS_8x16 ? 0x0b0 : 0x0b8) + 0xc * (n))
>> -#define CAMSS_CSID_TG_DT_n_CGG_2(v, n) \
>> - (((v) == CAMSS_8x16 ? 0x0b4 : 0x0bc) + 0xc * (n))
>> -
>> -#define DATA_TYPE_EMBEDDED_DATA_8BIT 0x12
>> -#define DATA_TYPE_YUV422_8BIT 0x1e
>> -#define DATA_TYPE_RAW_6BIT 0x28
>> -#define DATA_TYPE_RAW_8BIT 0x2a
>> -#define DATA_TYPE_RAW_10BIT 0x2b
>> -#define DATA_TYPE_RAW_12BIT 0x2c
>> -#define DATA_TYPE_RAW_14BIT 0x2d
>> -
>> -#define DECODE_FORMAT_UNCOMPRESSED_6_BIT 0x0
>> -#define DECODE_FORMAT_UNCOMPRESSED_8_BIT 0x1
>> -#define DECODE_FORMAT_UNCOMPRESSED_10_BIT 0x2
>> -#define DECODE_FORMAT_UNCOMPRESSED_12_BIT 0x3
>> -#define DECODE_FORMAT_UNCOMPRESSED_14_BIT 0x8
>> -
>> -#define CSID_RESET_TIMEOUT_MS 500
>> -
>> -struct csid_format {
>> - u32 code;
>> - u8 data_type;
>> - u8 decode_format;
>> - u8 bpp;
>> - u8 spp; /* bus samples per pixel */
>> -};
>> -
>> -static const struct csid_format csid_formats_8x16[] = {
>> - {
>> - MEDIA_BUS_FMT_UYVY8_2X8,
>> - DATA_TYPE_YUV422_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 2,
>> - },
>> - {
>> - MEDIA_BUS_FMT_VYUY8_2X8,
>> - DATA_TYPE_YUV422_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 2,
>> - },
>> - {
>> - MEDIA_BUS_FMT_YUYV8_2X8,
>> - DATA_TYPE_YUV422_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 2,
>> - },
>> - {
>> - MEDIA_BUS_FMT_YVYU8_2X8,
>> - DATA_TYPE_YUV422_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 2,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SBGGR8_1X8,
>> - DATA_TYPE_RAW_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGBRG8_1X8,
>> - DATA_TYPE_RAW_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGRBG8_1X8,
>> - DATA_TYPE_RAW_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SRGGB8_1X8,
>> - DATA_TYPE_RAW_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SBGGR10_1X10,
>> - DATA_TYPE_RAW_10BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> - 10,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGBRG10_1X10,
>> - DATA_TYPE_RAW_10BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> - 10,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGRBG10_1X10,
>> - DATA_TYPE_RAW_10BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> - 10,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SRGGB10_1X10,
>> - DATA_TYPE_RAW_10BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> - 10,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SBGGR12_1X12,
>> - DATA_TYPE_RAW_12BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> - 12,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGBRG12_1X12,
>> - DATA_TYPE_RAW_12BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> - 12,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGRBG12_1X12,
>> - DATA_TYPE_RAW_12BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> - 12,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SRGGB12_1X12,
>> - DATA_TYPE_RAW_12BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> - 12,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_Y10_1X10,
>> - DATA_TYPE_RAW_10BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> - 10,
>> - 1,
>> - },
>> -};
>> -
>> -static const struct csid_format csid_formats_8x96[] = {
>> - {
>> - MEDIA_BUS_FMT_UYVY8_2X8,
>> - DATA_TYPE_YUV422_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 2,
>> - },
>> - {
>> - MEDIA_BUS_FMT_VYUY8_2X8,
>> - DATA_TYPE_YUV422_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 2,
>> - },
>> - {
>> - MEDIA_BUS_FMT_YUYV8_2X8,
>> - DATA_TYPE_YUV422_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 2,
>> - },
>> - {
>> - MEDIA_BUS_FMT_YVYU8_2X8,
>> - DATA_TYPE_YUV422_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 2,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SBGGR8_1X8,
>> - DATA_TYPE_RAW_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGBRG8_1X8,
>> - DATA_TYPE_RAW_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGRBG8_1X8,
>> - DATA_TYPE_RAW_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SRGGB8_1X8,
>> - DATA_TYPE_RAW_8BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
>> - 8,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SBGGR10_1X10,
>> - DATA_TYPE_RAW_10BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> - 10,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGBRG10_1X10,
>> - DATA_TYPE_RAW_10BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> - 10,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGRBG10_1X10,
>> - DATA_TYPE_RAW_10BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> - 10,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SRGGB10_1X10,
>> - DATA_TYPE_RAW_10BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> - 10,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SBGGR12_1X12,
>> - DATA_TYPE_RAW_12BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> - 12,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGBRG12_1X12,
>> - DATA_TYPE_RAW_12BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> - 12,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGRBG12_1X12,
>> - DATA_TYPE_RAW_12BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> - 12,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SRGGB12_1X12,
>> - DATA_TYPE_RAW_12BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
>> - 12,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SBGGR14_1X14,
>> - DATA_TYPE_RAW_14BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
>> - 14,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGBRG14_1X14,
>> - DATA_TYPE_RAW_14BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
>> - 14,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SGRBG14_1X14,
>> - DATA_TYPE_RAW_14BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
>> - 14,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_SRGGB14_1X14,
>> - DATA_TYPE_RAW_14BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
>> - 14,
>> - 1,
>> - },
>> - {
>> - MEDIA_BUS_FMT_Y10_1X10,
>> - DATA_TYPE_RAW_10BIT,
>> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
>> - 10,
>> - 1,
>> - },
>> -};
>> -static u32 csid_find_code(u32 *code, unsigned int n_code,
>> - unsigned int index, u32 req_code)
>> +u32 csid_find_code(u32 *codes, unsigned int ncodes,
>> + unsigned int match_format_idx, u32 match_code)
>> {
>> int i;
>> - if (!req_code && (index >= n_code))
>> + if (!match_code && (match_format_idx >= ncodes))
>> return 0;
>> - for (i = 0; i < n_code; i++)
>> - if (req_code) {
>> - if (req_code == code[i])
>> - return req_code;
>> + for (i = 0; i < ncodes; i++)
>> + if (match_code) {
>> + if (codes[i] == match_code)
>> + return match_code;
>> } else {
>> - if (i == index)
>> - return code[i];
>> - }
>> -
>> - return code[0];
>> -}
>> -
>> -static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
>> - unsigned int index, u32 src_req_code)
>> -{
>> - if (csid->camss->version == CAMSS_8x16) {
>> - if (index > 0)
>> - return 0;
>> -
>> - return sink_code;
>> - } else if (csid->camss->version == CAMSS_8x96 ||
>> - csid->camss->version == CAMSS_660) {
>> - switch (sink_code) {
>> - case MEDIA_BUS_FMT_SBGGR10_1X10:
>> - {
>> - u32 src_code[] = {
>> - MEDIA_BUS_FMT_SBGGR10_1X10,
>> - MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
>> - };
>> -
>> - return csid_find_code(src_code, ARRAY_SIZE(src_code),
>> - index, src_req_code);
>> - }
>> - case MEDIA_BUS_FMT_Y10_1X10:
>> - {
>> - u32 src_code[] = {
>> - MEDIA_BUS_FMT_Y10_1X10,
>> - MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
>> - };
>> -
>> - return csid_find_code(src_code, ARRAY_SIZE(src_code),
>> - index, src_req_code);
>> + if (i == match_format_idx)
>> + return codes[i];
>> }
>> - default:
>> - if (index > 0)
>> - return 0;
>> - return sink_code;
>> - }
>> - } else {
>> - return 0;
>> - }
>> + return codes[0];
>> }
>> -static const struct csid_format *csid_get_fmt_entry(
>> +const struct csid_format *csid_get_fmt_entry(
>> const struct csid_format *formats,
>> - unsigned int nformat,
>> + unsigned int nformats,
>> u32 code)
>> {
>> unsigned int i;
>> - for (i = 0; i < nformat; i++)
>> + for (i = 0; i < nformats; i++)
>> if (code == formats[i].code)
>> return &formats[i];
>> @@ -433,28 +63,6 @@ static const struct csid_format *csid_get_fmt_entry(
>> return &formats[0];
>> }
>> -/*
>> - * csid_isr - CSID module interrupt handler
>> - * @irq: Interrupt line
>> - * @dev: CSID device
>> - *
>> - * Return IRQ_HANDLED on success
>> - */
>> -static irqreturn_t csid_isr(int irq, void *dev)
>> -{
>> - struct csid_device *csid = dev;
>> - enum camss_version ver = csid->camss->version;
>> - u32 value;
>> -
>> - value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS(ver));
>> - writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD(ver));
>> -
>> - if ((value >> 11) & 0x1)
>> - complete(&csid->reset_complete);
>> -
>> - return IRQ_HANDLED;
>> -}
>> -
>> /*
>> * csid_set_clock_rates - Calculate and set clock rates on CSID module
>> * @csiphy: CSID device
>> @@ -521,31 +129,6 @@ static int csid_set_clock_rates(struct csid_device *csid)
>> return 0;
>> }
>> -/*
>> - * csid_reset - Trigger reset on CSID module and wait to complete
>> - * @csid: CSID device
>> - *
>> - * Return 0 on success or a negative error code otherwise
>> - */
>> -static int csid_reset(struct csid_device *csid)
>> -{
>> - unsigned long time;
>> -
>> - reinit_completion(&csid->reset_complete);
>> -
>> - writel_relaxed(0x7fff, csid->base +
>> - CAMSS_CSID_RST_CMD(csid->camss->version));
>> -
>> - time = wait_for_completion_timeout(&csid->reset_complete,
>> - msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
>> - if (!time) {
>> - dev_err(csid->camss->dev, "CSID reset timeout\n");
>> - return -EIO;
>> - }
>> -
>> - return 0;
>> -}
>> -
>> /*
>> * csid_set_power - Power on/off CSID module
>> * @sd: CSID V4L2 subdevice
>> @@ -560,8 +143,6 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
>> int ret;
>> if (on) {
>> - u32 hw_version;
>> -
>> ret = pm_runtime_get_sync(dev);
>> if (ret < 0) {
>> pm_runtime_put_sync(dev);
>> @@ -590,7 +171,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
>> enable_irq(csid->irq);
>> - ret = csid_reset(csid);
>> + ret = csid->ops->reset(csid);
>> if (ret < 0) {
>> disable_irq(csid->irq);
>> camss_disable_clocks(csid->nclocks, csid->clock);
>> @@ -599,8 +180,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
>> return ret;
>> }
>> - hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
>> - dev_dbg(dev, "CSID HW Version = 0x%08x\n", hw_version);
>> + csid->ops->hw_version(csid);
>> } else {
>> disable_irq(csid->irq);
>> camss_disable_clocks(csid->nclocks, csid->clock);
>> @@ -623,16 +203,9 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
>> static int csid_set_stream(struct v4l2_subdev *sd, int enable)
>> {
>> struct csid_device *csid = v4l2_get_subdevdata(sd);
>> - struct csid_testgen_config *tg = &csid->testgen;
>> - enum camss_version ver = csid->camss->version;
>> - u32 val;
>> + int ret;
>> if (enable) {
>> - u8 vc = 0; /* Virtual Channel 0 */
>> - u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
>> - u8 dt, dt_shift, df;
>> - int ret;
>> -
>> ret = v4l2_ctrl_handler_setup(&csid->ctrls);
>> if (ret < 0) {
>> dev_err(csid->camss->dev,
>> @@ -640,116 +213,13 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)
>> return ret;
>> }
>> - if (!tg->enabled &&
>> + if (!csid->testgen.enabled &&
>> !media_entity_remote_pad(&csid->pads[MSM_CSID_PAD_SINK]))
>> return -ENOLINK;
>> -
>> - if (tg->enabled) {
>> - /* Config Test Generator */
>> - struct v4l2_mbus_framefmt *f =
>> - &csid->fmt[MSM_CSID_PAD_SRC];
>> - const struct csid_format *format = csid_get_fmt_entry(
>> - csid->formats, csid->nformats, f->code);
>> - u32 num_bytes_per_line =
>> - f->width * format->bpp * format->spp / 8;
>> - u32 num_lines = f->height;
>> -
>> - /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
>> - /* 1:0 VC */
>> - val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
>> - ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
>> - writel_relaxed(val, csid->base +
>> - CAMSS_CSID_TG_VC_CFG(ver));
>> -
>> - /* 28:16 bytes per lines, 12:0 num of lines */
>> - val = ((num_bytes_per_line & 0x1fff) << 16) |
>> - (num_lines & 0x1fff);
>> - writel_relaxed(val, csid->base +
>> - CAMSS_CSID_TG_DT_n_CGG_0(ver, 0));
>> -
>> - dt = format->data_type;
>> -
>> - /* 5:0 data type */
>> - val = dt;
>> - writel_relaxed(val, csid->base +
>> - CAMSS_CSID_TG_DT_n_CGG_1(ver, 0));
>> -
>> - /* 2:0 output test pattern */
>> - val = tg->payload_mode;
>> - writel_relaxed(val, csid->base +
>> - CAMSS_CSID_TG_DT_n_CGG_2(ver, 0));
>> -
>> - df = format->decode_format;
>> - } else {
>> - struct v4l2_mbus_framefmt *f =
>> - &csid->fmt[MSM_CSID_PAD_SINK];
>> - const struct csid_format *format = csid_get_fmt_entry(
>> - csid->formats, csid->nformats, f->code);
>> - struct csid_phy_config *phy = &csid->phy;
>> -
>> - val = phy->lane_cnt - 1;
>> - val |= phy->lane_assign << 4;
>> -
>> - writel_relaxed(val,
>> - csid->base + CAMSS_CSID_CORE_CTRL_0);
>> -
>> - val = phy->csiphy_id << 17;
>> - val |= 0x9;
>> -
>> - writel_relaxed(val,
>> - csid->base + CAMSS_CSID_CORE_CTRL_1);
>> -
>> - dt = format->data_type;
>> - df = format->decode_format;
>> - }
>> -
>> - /* Config LUT */
>> -
>> - dt_shift = (cid % 4) * 8;
>> -
>> - val = readl_relaxed(csid->base +
>> - CAMSS_CSID_CID_LUT_VC_n(ver, vc));
>> - val &= ~(0xff << dt_shift);
>> - val |= dt << dt_shift;
>> - writel_relaxed(val, csid->base +
>> - CAMSS_CSID_CID_LUT_VC_n(ver, vc));
>> -
>> - val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
>> - val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
>> - val |= df << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
>> - val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
>> -
>> - if (csid->camss->version == CAMSS_8x96 ||
>> - csid->camss->version == CAMSS_660) {
>> - u32 sink_code = csid->fmt[MSM_CSID_PAD_SINK].code;
>> - u32 src_code = csid->fmt[MSM_CSID_PAD_SRC].code;
>> -
>> - if ((sink_code == MEDIA_BUS_FMT_SBGGR10_1X10 &&
>> - src_code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) ||
>> - (sink_code == MEDIA_BUS_FMT_Y10_1X10 &&
>> - src_code == MEDIA_BUS_FMT_Y10_2X8_PADHI_LE)) {
>> - val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING;
>> - val |= CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16;
>> - val |= CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB;
>> - }
>> - }
>> -
>> - writel_relaxed(val, csid->base +
>> - CAMSS_CSID_CID_n_CFG(ver, cid));
>> -
>> - if (tg->enabled) {
>> - val = CAMSS_CSID_TG_CTRL_ENABLE;
>> - writel_relaxed(val, csid->base +
>> - CAMSS_CSID_TG_CTRL(ver));
>> - }
>> - } else {
>> - if (tg->enabled) {
>> - val = CAMSS_CSID_TG_CTRL_DISABLE;
>> - writel_relaxed(val, csid->base +
>> - CAMSS_CSID_TG_CTRL(ver));
>> - }
>> }
>> + csid->ops->configure_stream(csid, enable);
>> +
>> return 0;
>> }
>> @@ -818,7 +288,7 @@ static void csid_try_format(struct csid_device *csid,
>> *fmt = *__csid_get_format(csid, cfg,
>> MSM_CSID_PAD_SINK, which);
>> - fmt->code = csid_src_pad_code(csid, fmt->code, 0, code);
>> + fmt->code = csid->ops->src_pad_code(csid, fmt->code, 0, code);
>> } else {
>> /* Test generator is enabled, set format on source */
>> /* pad to allow test generator usage */
>> @@ -868,7 +338,7 @@ static int csid_enum_mbus_code(struct v4l2_subdev *sd,
>> MSM_CSID_PAD_SINK,
>> code->which);
>> - code->code = csid_src_pad_code(csid, sink_fmt->code,
>> + code->code = csid->ops->src_pad_code(csid, sink_fmt->code,
>> code->index, 0);
>> if (!code->code)
>> return -EINVAL;
>> @@ -1004,15 +474,6 @@ static int csid_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
>> return csid_set_format(sd, fh ? fh->pad : NULL, &format);
>> }
>> -static const char * const csid_test_pattern_menu[] = {
>> - "Disabled",
>> - "Incrementing",
>> - "Alternating 0x55/0xAA",
>> - "All Zeros 0x00",
>> - "All Ones 0xFF",
>> - "Pseudo-random Data",
>> -};
>> -
>> /*
>> * csid_set_test_pattern - Set test generator's pattern mode
>> * @csid: CSID device
>> @@ -1030,25 +491,7 @@ static int csid_set_test_pattern(struct csid_device *csid, s32 value)
>> tg->enabled = !!value;
>> - switch (value) {
>> - case 1:
>> - tg->payload_mode = CSID_PAYLOAD_MODE_INCREMENTING;
>> - break;
>> - case 2:
>> - tg->payload_mode = CSID_PAYLOAD_MODE_ALTERNATING_55_AA;
>> - break;
>> - case 3:
>> - tg->payload_mode = CSID_PAYLOAD_MODE_ALL_ZEROES;
>> - break;
>> - case 4:
>> - tg->payload_mode = CSID_PAYLOAD_MODE_ALL_ONES;
>> - break;
>> - case 5:
>> - tg->payload_mode = CSID_PAYLOAD_MODE_RANDOM;
>> - break;
>> - }
>> -
>> - return 0;
>> + return csid->ops->configure_testgen_pattern(csid, value);
>> }
>> /*
>> @@ -1097,17 +540,14 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
>> csid->id = id;
>> if (camss->version == CAMSS_8x16) {
>> - csid->formats = csid_formats_8x16;
>> - csid->nformats =
>> - ARRAY_SIZE(csid_formats_8x16);
>> + csid->ops = &csid_ops_4_1;
>> } else if (camss->version == CAMSS_8x96 ||
>> camss->version == CAMSS_660) {
>> - csid->formats = csid_formats_8x96;
>> - csid->nformats =
>> - ARRAY_SIZE(csid_formats_8x96);
>> + csid->ops = &csid_ops_4_7;
>> } else {
>> return -EINVAL;
>> }
>> + csid->ops->subdev_init(csid);
>> /* Memory */
>> @@ -1130,7 +570,7 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
>> csid->irq = r->start;
>> snprintf(csid->irq_name, sizeof(csid->irq_name), "%s_%s%d",
>> dev_name(dev), MSM_CSID_NAME, csid->id);
>> - ret = devm_request_irq(dev, csid->irq, csid_isr,
>> + ret = devm_request_irq(dev, csid->irq, csid->ops->isr,
>> IRQF_TRIGGER_RISING, csid->irq_name, csid);
>> if (ret < 0) {
>> dev_err(dev, "request_irq failed: %d\n", ret);
>> @@ -1341,8 +781,8 @@ int msm_csid_register_entity(struct csid_device *csid,
>> csid->testgen_mode = v4l2_ctrl_new_std_menu_items(&csid->ctrls,
>> &csid_ctrl_ops, V4L2_CID_TEST_PATTERN,
>> - ARRAY_SIZE(csid_test_pattern_menu) - 1, 0, 0,
>> - csid_test_pattern_menu);
>> + csid->testgen.nmodes, 0, 0,
enum csid_testgen_mode has the test patterns id's numbered from 0 to MAX_SUPPORTED.
So the MAX_SUPPORTED is the number of test patterns *minus one*.
csid->testgen.nmodes points to the csid_testgen_modes[] array which contains the
test patterns name *plus* "Disabled" as the first element.
Thus the old (ARRAY_SIZE(csid_test_pattern_menu) - 1) is greater by one than
csid->testgen.nmodes.
By passing csid->testgen.nmodes as the max value to v4l2_ctrl_new_std_menu_items()
you exclude the last test pattern from the menu - you can check the output of
"v4l2-ctl -L -d <csid subdevice>".
IMHO the logic would be simpler, if the test patterns were numbered starting from 1, not 0,
leaving the value of 0 to "TG disabled".
Thanks,
Andrey
>> + csid->testgen.modes);
>> if (csid->ctrls.error) {
>> dev_err(dev, "Failed to init ctrl: %d\n", csid->ctrls.error);
>> diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
>> index 02fc34ee8a41..d40194e2bed3 100644
>> --- a/drivers/media/platform/qcom/camss/camss-csid.h
>> +++ b/drivers/media/platform/qcom/camss/camss-csid.h
>> @@ -11,6 +11,7 @@
>> #define QC_MSM_CAMSS_CSID_H
>> #include <linux/clk.h>
>> +#include <linux/interrupt.h>
>> #include <media/media-entity.h>
>> #include <media/v4l2-ctrls.h>
>> #include <media/v4l2-device.h>
>> @@ -70,19 +71,50 @@
>> #define PLAIN_FORMAT_PLAIN16 0x1 /* supports DPCM, UNCOMPRESSED_10/16_BIT */
>> #define PLAIN_FORMAT_PLAIN32 0x2 /* supports UNCOMPRESSED_20_BIT */
>> +#define CSID_RESET_TIMEOUT_MS 500
>> -enum csid_payload_mode {
>> +
>> +enum csid_testgen_mode {
>> CSID_PAYLOAD_MODE_INCREMENTING = 0,
>> CSID_PAYLOAD_MODE_ALTERNATING_55_AA = 1,
>> CSID_PAYLOAD_MODE_ALL_ZEROES = 2,
>> CSID_PAYLOAD_MODE_ALL_ONES = 3,
>> CSID_PAYLOAD_MODE_RANDOM = 4,
>> CSID_PAYLOAD_MODE_USER_SPECIFIED = 5,
>> + CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1 = 5,
>> + CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7 = 5,
>> + CSID_PAYLOAD_MODE_COMPLEX_PATTERN = 6,
>> + CSID_PAYLOAD_MODE_COLOR_BOX = 7,
>> + CSID_PAYLOAD_MODE_COLOR_BARS = 8,
>> + CSID_PAYLOAD_MODE_MAX_SUPPORTED_170 = 8,
>> +};
>> +
>> +static const char * const csid_testgen_modes[] = {
>> + "Disabled",
>> + "Incrementing",
>> + "Alternating 0x55/0xAA",
>> + "All Zeros 0x00",
>> + "All Ones 0xFF",
>> + "Pseudo-random Data",
>> + "User Specified",
>> + "Complex pattern",
>> + "Color box",
>> + "Color bars",
>> +};
>> +
>> +struct csid_format {
>> + u32 code;
>> + u8 data_type;
>> + u8 decode_format;
>> + u8 bpp;
>> + u8 spp; /* bus samples per pixel */
>> };
>> struct csid_testgen_config {
>> + enum csid_testgen_mode mode;
>> + const char * const*modes;
>> + u8 nmodes;
>> u8 enabled;
>> - enum csid_payload_mode payload_mode;
>> };
>> struct csid_phy_config {
>> @@ -91,6 +123,65 @@ struct csid_phy_config {
>> u32 lane_assign;
>> };
>> +struct csid_device;
>> +
>> +struct csid_hw_ops {
>> + /*
>> + * configure_stream - Configures and starts CSID input stream
>> + * @csid: CSID device
>> + */
>> + void (*configure_stream)(struct csid_device *csid, u8 enable);
>> +
>> + /*
>> + * configure_testgen_pattern - Validates and configures output pattern mode
>> + * of test pattern generator
>> + * @csid: CSID device
>> + */
>> + int (*configure_testgen_pattern)(struct csid_device *csid, s32 val);
>> +
>> + /*
>> + * hw_version - Read hardware version register from hardware
>> + * @csid: CSID device
>> + */
>> + u32 (*hw_version)(struct csid_device *csid);
>> +
>> + /*
>> + * isr - CSID module interrupt service routine
>> + * @irq: Interrupt line
>> + * @dev: CSID device
>> + *
>> + * Return IRQ_HANDLED on success
>> + */
>> + irqreturn_t (*isr)(int irq, void *dev);
>> +
>> + /*
>> + * reset - Trigger reset on CSID module and wait to complete
>> + * @csid: CSID device
>> + *
>> + * Return 0 on success or a negative error code otherwise
>> + */
>> + int (*reset)(struct csid_device *csid);
>> +
>> + /*
>> + * src_pad_code - Pick an output/src format based on the input/sink format
>> + * @csid: CSID device
>> + * @sink_code: The sink format of the input
>> + * @match_format_idx: Request preferred index, as defined by subdevice csid_format.
>> + * Set @match_code to 0 if used.
>> + * @match_code: Request preferred code, set @match_format_idx to 0 if used
>> + *
>> + * Return 0 on failure or src format code otherwise
>> + */
>> + u32 (*src_pad_code)(struct csid_device *csid, u32 sink_code,
>> + unsigned int match_format_idx, u32 match_code);
>> +
>> + /*
>> + * subdev_init - Initialize CSID device according for hardware revision
>> + * @csid: CSID device
>> + */
>> + void (*subdev_init)(struct csid_device *csid);
>> +};
>> +
>> struct csid_device {
>> struct camss *camss;
>> u8 id;
>> @@ -110,10 +201,37 @@ struct csid_device {
>> struct v4l2_ctrl *testgen_mode;
>> const struct csid_format *formats;
>> unsigned int nformats;
>> + const struct csid_hw_ops *ops;
>> };
>> struct resources;
>> +
>> +/*
>> + * csid_find_code - Find a format code in an array using array index or format code
>> + * @codes: Array of format codes
>> + * @ncodes: Length of @code array
>> + * @req_format_idx: Request preferred index, as defined by subdevice csid_format.
>> + * Set @match_code to 0 if used.
>> + * @match_code: Request preferred code, set @req_format_idx to 0 if used
>> + *
>> + * Return 0 on failure or format code otherwise
>> + */
>> +u32 csid_find_code(u32 *codes, unsigned int ncode,
>> + unsigned int match_format_idx, u32 match_code);
>> +
>> +/*
>> + * csid_get_fmt_entry - Find csid_format entry with matching format code
>> + * @formats: Array of format csid_format entries
>> + * @nformats: Length of @nformats array
>> + * @code: Desired format code
>> + *
>> + * Return formats[0] on failure to find code
>> + */
>> +const struct csid_format *csid_get_fmt_entry(const struct csid_format *formats,
>> + unsigned int nformats,
>> + u32 code);
>> +
>> int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
>> const struct resources *res, u8 id);
>> @@ -124,4 +242,8 @@ void msm_csid_unregister_entity(struct csid_device *csid);
>> void msm_csid_get_csid_id(struct media_entity *entity, u8 *id);
>> +
>> +extern const struct csid_hw_ops csid_ops_4_1;
>> +extern const struct csid_hw_ops csid_ops_4_7;
>> +
>> #endif /* QC_MSM_CAMSS_CSID_H */
>>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 09/22] media: camss: Refactor CSID HW version support
2021-02-21 17:50 ` Andrey Konovalov
@ 2021-02-22 18:13 ` Robert Foss
0 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-22 18:13 UTC (permalink / raw)
To: Andrey Konovalov
Cc: Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab,
Rob Herring, angelogioacchino.delregno, MSM, linux-media,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, AngeloGioacchino Del Regno, Tomasz Figa,
Azam Sadiq Pasha Kapatrala Syed, Sarvesh Sridutt, Jonathan Marek,
Sakari Ailus
On Sun, 21 Feb 2021 at 18:50, Andrey Konovalov
<andrey.konovalov@linaro.org> wrote:
>
> Hi Robert,
>
> After reviewing the [PATCH v5 10/22], I noticed that this patch also
> has a problematic test_pattern control implementation.
>
> See below.
>
> On 21.02.2021 18:15, Andrey Konovalov wrote:
> > Hi Robert,
> >
> > Thank you for your patch!
> >
> > Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
> >
> > Thanks,
> > Andrey
> >
> > On 17.02.2021 14:21, Robert Foss wrote:
> >> In order to support Qualcomm ISP hardware architectures that diverge
> >> from older architectures, the CSID subdevice drivers needs to be refactored
> >> to better abstract the different ISP hardware architectures.
> >>
> >> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> >> ---
> >>
> >> Changes since v1
> >> - kernel test robot: Add missing include, interrupt.h
> >>
> >> Changes since v4
> >> - Andrey: Removed whitespace from some includes
> >> - Andrey: Removed unused enum
> >>
> >>
> >> drivers/media/platform/qcom/camss/Makefile | 2 +
> >> .../platform/qcom/camss/camss-csid-4-1.c | 330 ++++++++++
> >> .../platform/qcom/camss/camss-csid-4-7.c | 406 ++++++++++++
> >> .../media/platform/qcom/camss/camss-csid.c | 616 +-----------------
> >> .../media/platform/qcom/camss/camss-csid.h | 126 +++-
> >> 5 files changed, 890 insertions(+), 590 deletions(-)
> >> create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-1.c
> >> create mode 100644 drivers/media/platform/qcom/camss/camss-csid-4-7.c
> >>
> >> diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
> >> index 052c4f405fa3..cff388b653ba 100644
> >> --- a/drivers/media/platform/qcom/camss/Makefile
> >> +++ b/drivers/media/platform/qcom/camss/Makefile
> >> @@ -4,6 +4,8 @@
> >> qcom-camss-objs += \
> >> camss.o \
> >> camss-csid.o \
> >> + camss-csid-4-1.o \
> >> + camss-csid-4-7.o \
> >> camss-csiphy-2ph-1-0.o \
> >> camss-csiphy-3ph-1-0.o \
> >> camss-csiphy.o \
> >> diff --git a/drivers/media/platform/qcom/camss/camss-csid-4-1.c b/drivers/media/platform/qcom/camss/camss-csid-4-1.c
> >> new file mode 100644
> >> index 000000000000..c92077a7f758
> >> --- /dev/null
> >> +++ b/drivers/media/platform/qcom/camss/camss-csid-4-1.c
> >> @@ -0,0 +1,330 @@
> >> +// SPDX-License-Identifier: GPL-2.0
> >> +/*
> >> + * camss-csid-4-1.c
> >> + *
> >> + * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
> >> + *
> >> + * Copyright (C) 2020 Linaro Ltd.
> >> + */
> >> +
> >> +#include <linux/completion.h>
> >> +#include <linux/interrupt.h>
> >> +#include <linux/io.h>
> >> +#include <linux/kernel.h>
> >> +#include <linux/of.h>
> >> +
> >> +#include "camss-csid.h"
> >> +#include "camss.h"
> >> +
> >> +#define CAMSS_CSID_HW_VERSION 0x0
> >> +#define CAMSS_CSID_CORE_CTRL_0 0x004
> >> +#define CAMSS_CSID_CORE_CTRL_1 0x008
> >> +#define CAMSS_CSID_RST_CMD 0x00c
> >> +#define CAMSS_CSID_CID_LUT_VC_n(n) (0x010 + 0x4 * (n))
> >> +#define CAMSS_CSID_CID_n_CFG(n) (0x020 + 0x4 * (n))
> >> +#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
> >> +#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
> >> +#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
> >> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
> >> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
> >> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
> >> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
> >> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
> >> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
> >> +#define CAMSS_CSID_IRQ_CLEAR_CMD 0x060
> >> +#define CAMSS_CSID_IRQ_MASK 0x064
> >> +#define CAMSS_CSID_IRQ_STATUS 0x068
> >> +#define CAMSS_CSID_TG_CTRL 0x0a0
> >> +#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
> >> +#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
> >> +#define CAMSS_CSID_TG_VC_CFG 0x0a4
> >> +#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
> >> +#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
> >> +#define CAMSS_CSID_TG_DT_n_CGG_0(n) (0x0ac + 0xc * (n))
> >> +#define CAMSS_CSID_TG_DT_n_CGG_1(n) (0x0b0 + 0xc * (n))
> >> +#define CAMSS_CSID_TG_DT_n_CGG_2(n) (0x0b4 + 0xc * (n))
> >> +
> >> +
> >> +static const struct csid_format csid_formats[] = {
> >> + {
> >> + MEDIA_BUS_FMT_UYVY8_2X8,
> >> + DATA_TYPE_YUV422_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 2,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_VYUY8_2X8,
> >> + DATA_TYPE_YUV422_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 2,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_YUYV8_2X8,
> >> + DATA_TYPE_YUV422_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 2,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_YVYU8_2X8,
> >> + DATA_TYPE_YUV422_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 2,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SBGGR8_1X8,
> >> + DATA_TYPE_RAW_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGBRG8_1X8,
> >> + DATA_TYPE_RAW_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGRBG8_1X8,
> >> + DATA_TYPE_RAW_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SRGGB8_1X8,
> >> + DATA_TYPE_RAW_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SBGGR10_1X10,
> >> + DATA_TYPE_RAW_10BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> + 10,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGBRG10_1X10,
> >> + DATA_TYPE_RAW_10BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> + 10,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGRBG10_1X10,
> >> + DATA_TYPE_RAW_10BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> + 10,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SRGGB10_1X10,
> >> + DATA_TYPE_RAW_10BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> + 10,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SBGGR12_1X12,
> >> + DATA_TYPE_RAW_12BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> + 12,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGBRG12_1X12,
> >> + DATA_TYPE_RAW_12BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> + 12,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGRBG12_1X12,
> >> + DATA_TYPE_RAW_12BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> + 12,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SRGGB12_1X12,
> >> + DATA_TYPE_RAW_12BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> + 12,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_Y10_1X10,
> >> + DATA_TYPE_RAW_10BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> + 10,
> >> + 1,
> >> + },
> >> +};
> >> +
> >> +static void csid_configure_stream(struct csid_device *csid, u8 enable)
> >> +{
> >> + struct csid_testgen_config *tg = &csid->testgen;
> >> + u32 val;
> >> +
> >> + if (enable) {
> >> + struct v4l2_mbus_framefmt *input_format;
> >> + const struct csid_format *format;
> >> + u8 vc = 0; /* Virtual Channel 0 */
> >> + u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
> >> + u8 dt_shift;
> >> +
> >> + if (tg->enabled) {
> >> + /* Config Test Generator */
> >> + u32 num_lines, num_bytes_per_line;
> >> +
> >> + input_format = &csid->fmt[MSM_CSID_PAD_SRC];
> >> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
> >> + input_format->code);
> >> + num_bytes_per_line = input_format->width * format->bpp * format->spp / 8;
> >> + num_lines = input_format->height;
> >> +
> >> + /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
> >> + /* 1:0 VC */
> >> + val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
> >> + ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_VC_CFG);
> >> +
> >> + /* 28:16 bytes per lines, 12:0 num of lines */
> >> + val = ((num_bytes_per_line & 0x1fff) << 16) |
> >> + (num_lines & 0x1fff);
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_0(0));
> >> +
> >> + /* 5:0 data type */
> >> + val = format->data_type;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_1(0));
> >> +
> >> + /* 2:0 output test pattern */
> >> + val = tg->mode;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_2(0));
> >> + } else {
> >> + struct csid_phy_config *phy = &csid->phy;
> >> +
> >> + input_format = &csid->fmt[MSM_CSID_PAD_SINK];
> >> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
> >> + input_format->code);
> >> +
> >> + val = phy->lane_cnt - 1;
> >> + val |= phy->lane_assign << 4;
> >> +
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_0);
> >> +
> >> + val = phy->csiphy_id << 17;
> >> + val |= 0x9;
> >> +
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_1);
> >> + }
> >> +
> >> + /* Config LUT */
> >> +
> >> + dt_shift = (cid % 4) * 8;
> >> + val = readl_relaxed(csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
> >> + val &= ~(0xff << dt_shift);
> >> + val |= format->data_type << dt_shift;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
> >> +
> >> + val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
> >> + val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
> >> + val |= format->decode_format << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
> >> + val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_n_CFG(cid));
> >> +
> >> + if (tg->enabled) {
> >> + val = CAMSS_CSID_TG_CTRL_ENABLE;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
> >> + }
> >> + } else {
> >> + if (tg->enabled) {
> >> + val = CAMSS_CSID_TG_CTRL_DISABLE;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
> >> + }
> >> + }
> >> +}
> >> +
> >> +static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
> >> +{
> >> + s32 regval = val - 1;
> >> +
> >> + if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1)
> >> + csid->testgen.mode = regval;
>
> regval of 0 is the valid "Incrementing" test pattern. The condition above
> should be "regval >= 0", not "regval > 0".
Ack
>
> >> +
> >> + return 0;
> >> +}
> >> +
> >> +static u32 csid_hw_version(struct csid_device *csid)
> >> +{
> >> + u32 hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
> >> +
> >> + dev_dbg(csid->camss->dev, "CSID HW Version = 0x%08x\n", hw_version);
> >> +
> >> + return hw_version;
> >> +}
> >> +
> >> +static irqreturn_t csid_isr(int irq, void *dev)
> >> +{
> >> + struct csid_device *csid = dev;
> >> + u32 value;
> >> +
> >> + value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS);
> >> + writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD);
> >> +
> >> + if ((value >> 11) & 0x1)
> >> + complete(&csid->reset_complete);
> >> +
> >> + return IRQ_HANDLED;
> >> +}
> >> +
> >> +static int csid_reset(struct csid_device *csid)
> >> +{
> >> + unsigned long time;
> >> +
> >> + reinit_completion(&csid->reset_complete);
> >> +
> >> + writel_relaxed(0x7fff, csid->base + CAMSS_CSID_RST_CMD);
> >> +
> >> + time = wait_for_completion_timeout(&csid->reset_complete,
> >> + msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
> >> + if (!time) {
> >> + dev_err(csid->camss->dev, "CSID reset timeout\n");
> >> + return -EIO;
> >> + }
> >> +
> >> + return 0;
> >> +}
> >> +
> >> +static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
> >> + unsigned int match_format_idx, u32 match_code)
> >> +{
> >> + if (match_format_idx > 0)
> >> + return 0;
> >> +
> >> + return sink_code;
> >> +}
> >> +
> >> +static void csid_subdev_init(struct csid_device *csid)
> >> +{
> >> + csid->formats = csid_formats;
> >> + csid->nformats = ARRAY_SIZE(csid_formats);
> >> + csid->testgen.modes = csid_testgen_modes;
> >> + csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1;
> >> +}
> >> +
> >> +const struct csid_hw_ops csid_ops_4_1 = {
> >> + .configure_stream = csid_configure_stream,
> >> + .configure_testgen_pattern = csid_configure_testgen_pattern,
> >> + .hw_version = csid_hw_version,
> >> + .isr = csid_isr,
> >> + .reset = csid_reset,
> >> + .src_pad_code = csid_src_pad_code,
> >> + .subdev_init = csid_subdev_init,
> >> +};
> >> diff --git a/drivers/media/platform/qcom/camss/camss-csid-4-7.c b/drivers/media/platform/qcom/camss/camss-csid-4-7.c
> >> new file mode 100644
> >> index 000000000000..16a69b140f4e
> >> --- /dev/null
> >> +++ b/drivers/media/platform/qcom/camss/camss-csid-4-7.c
> >> @@ -0,0 +1,406 @@
> >> +// SPDX-License-Identifier: GPL-2.0
> >> +/*
> >> + * camss-csid-4-7.c
> >> + *
> >> + * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
> >> + *
> >> + * Copyright (C) 2020 Linaro Ltd.
> >> + */
> >> +#include <linux/completion.h>
> >> +#include <linux/interrupt.h>
> >> +#include <linux/io.h>
> >> +#include <linux/kernel.h>
> >> +#include <linux/of.h>
> >> +
> >> +#include "camss-csid.h"
> >> +#include "camss.h"
> >> +
> >> +#define CAMSS_CSID_HW_VERSION 0x0
> >> +#define CAMSS_CSID_CORE_CTRL_0 0x004
> >> +#define CAMSS_CSID_CORE_CTRL_1 0x008
> >> +#define CAMSS_CSID_RST_CMD 0x010
> >> +#define CAMSS_CSID_CID_LUT_VC_n(n) (0x014 + 0x4 * (n))
> >> +#define CAMSS_CSID_CID_n_CFG(n) (0x024 + 0x4 * (n))
> >> +#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
> >> +#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
> >> +#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
> >> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
> >> +#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
> >> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
> >> +#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
> >> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
> >> +#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
> >> +#define CAMSS_CSID_IRQ_CLEAR_CMD 0x064
> >> +#define CAMSS_CSID_IRQ_MASK 0x068
> >> +#define CAMSS_CSID_IRQ_STATUS 0x06c
> >> +#define CAMSS_CSID_TG_CTRL 0x0a8
> >> +#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
> >> +#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
> >> +#define CAMSS_CSID_TG_VC_CFG 0x0ac
> >> +#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
> >> +#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
> >> +#define CAMSS_CSID_TG_DT_n_CGG_0(n) (0x0b4 + 0xc * (n))
> >> +#define CAMSS_CSID_TG_DT_n_CGG_1(n) (0x0b8 + 0xc * (n))
> >> +#define CAMSS_CSID_TG_DT_n_CGG_2(n) (0x0bc + 0xc * (n))
> >> +
> >> +
> >> +static const struct csid_format csid_formats[] = {
> >> + {
> >> + MEDIA_BUS_FMT_UYVY8_2X8,
> >> + DATA_TYPE_YUV422_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 2,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_VYUY8_2X8,
> >> + DATA_TYPE_YUV422_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 2,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_YUYV8_2X8,
> >> + DATA_TYPE_YUV422_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 2,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_YVYU8_2X8,
> >> + DATA_TYPE_YUV422_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 2,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SBGGR8_1X8,
> >> + DATA_TYPE_RAW_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGBRG8_1X8,
> >> + DATA_TYPE_RAW_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGRBG8_1X8,
> >> + DATA_TYPE_RAW_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SRGGB8_1X8,
> >> + DATA_TYPE_RAW_8BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> + 8,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SBGGR10_1X10,
> >> + DATA_TYPE_RAW_10BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> + 10,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGBRG10_1X10,
> >> + DATA_TYPE_RAW_10BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> + 10,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGRBG10_1X10,
> >> + DATA_TYPE_RAW_10BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> + 10,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SRGGB10_1X10,
> >> + DATA_TYPE_RAW_10BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> + 10,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SBGGR12_1X12,
> >> + DATA_TYPE_RAW_12BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> + 12,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGBRG12_1X12,
> >> + DATA_TYPE_RAW_12BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> + 12,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGRBG12_1X12,
> >> + DATA_TYPE_RAW_12BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> + 12,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SRGGB12_1X12,
> >> + DATA_TYPE_RAW_12BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> + 12,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SBGGR14_1X14,
> >> + DATA_TYPE_RAW_14BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> >> + 14,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGBRG14_1X14,
> >> + DATA_TYPE_RAW_14BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> >> + 14,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SGRBG14_1X14,
> >> + DATA_TYPE_RAW_14BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> >> + 14,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_SRGGB14_1X14,
> >> + DATA_TYPE_RAW_14BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> >> + 14,
> >> + 1,
> >> + },
> >> + {
> >> + MEDIA_BUS_FMT_Y10_1X10,
> >> + DATA_TYPE_RAW_10BIT,
> >> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> + 10,
> >> + 1,
> >> + },
> >> +};
> >> +
> >> +static void csid_configure_stream(struct csid_device *csid, u8 enable)
> >> +{
> >> + struct csid_testgen_config *tg = &csid->testgen;
> >> + u32 sink_code = csid->fmt[MSM_CSID_PAD_SINK].code;
> >> + u32 src_code = csid->fmt[MSM_CSID_PAD_SRC].code;
> >> + u32 val;
> >> +
> >> + if (enable) {
> >> + struct v4l2_mbus_framefmt *input_format;
> >> + const struct csid_format *format;
> >> + u8 vc = 0; /* Virtual Channel 0 */
> >> + u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
> >> + u8 dt_shift;
> >> +
> >> + if (tg->enabled) {
> >> + /* Config Test Generator */
> >> + u32 num_bytes_per_line, num_lines;
> >> +
> >> + input_format = &csid->fmt[MSM_CSID_PAD_SRC];
> >> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
> >> + input_format->code);
> >> + num_bytes_per_line = input_format->width * format->bpp * format->spp / 8;
> >> + num_lines = input_format->height;
> >> +
> >> + /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
> >> + /* 1:0 VC */
> >> + val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
> >> + ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_VC_CFG);
> >> +
> >> + /* 28:16 bytes per lines, 12:0 num of lines */
> >> + val = ((num_bytes_per_line & 0x1fff) << 16) |
> >> + (num_lines & 0x1fff);
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_0(0));
> >> +
> >> + /* 5:0 data type */
> >> + val = format->data_type;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_1(0));
> >> +
> >> + /* 2:0 output test pattern */
> >> + val = tg->mode;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_DT_n_CGG_2(0));
> >> + } else {
> >> + struct csid_phy_config *phy = &csid->phy;
> >> +
> >> + input_format = &csid->fmt[MSM_CSID_PAD_SINK];
> >> + format = csid_get_fmt_entry(csid->formats, csid->nformats,
> >> + input_format->code);
> >> +
> >> + val = phy->lane_cnt - 1;
> >> + val |= phy->lane_assign << 4;
> >> +
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_0);
> >> +
> >> + val = phy->csiphy_id << 17;
> >> + val |= 0x9;
> >> +
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_CORE_CTRL_1);
> >> + }
> >> +
> >> + /* Config LUT */
> >> +
> >> + dt_shift = (cid % 4) * 8;
> >> +
> >> + val = readl_relaxed(csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
> >> + val &= ~(0xff << dt_shift);
> >> + val |= format->data_type << dt_shift;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_LUT_VC_n(vc));
> >> +
> >> + val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
> >> + val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
> >> + val |= format->decode_format << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
> >> + val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
> >> +
> >> + if ((sink_code == MEDIA_BUS_FMT_SBGGR10_1X10 &&
> >> + src_code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) ||
> >> + (sink_code == MEDIA_BUS_FMT_Y10_1X10 &&
> >> + src_code == MEDIA_BUS_FMT_Y10_2X8_PADHI_LE)) {
> >> + val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING;
> >> + val |= CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16;
> >> + val |= CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB;
> >> + }
> >> +
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_CID_n_CFG(cid));
> >> +
> >> + if (tg->enabled) {
> >> + val = CAMSS_CSID_TG_CTRL_ENABLE;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
> >> + }
> >> + } else {
> >> + if (tg->enabled) {
> >> + val = CAMSS_CSID_TG_CTRL_DISABLE;
> >> + writel_relaxed(val, csid->base + CAMSS_CSID_TG_CTRL);
> >> + }
> >> + }
> >> +}
> >> +
> >> +static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
> >> +{
> >> + s32 regval = val - 1;
> >> +
> >> + if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7)
> >> + csid->testgen.mode = regval;
>
> regval of 0 is the valid "Incrementing" test pattern. The condition above
> should be "regval >= 0", not "regval > 0".
Ack
>
> >> + return 0;
> >> +}
> >> +
> >> +static u32 csid_hw_version(struct csid_device *csid)
> >> +{
> >> + u32 hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
> >> +
> >> + dev_dbg(csid->camss->dev, "CSID HW Version = 0x%08x\n", hw_version);
> >> +
> >> + return hw_version;
> >> +}
> >> +
> >> +/*
> >> + * isr - CSID module interrupt service routine
> >> + * @irq: Interrupt line
> >> + * @dev: CSID device
> >> + *
> >> + * Return IRQ_HANDLED on success
> >> + */
> >> +static irqreturn_t csid_isr(int irq, void *dev)
> >> +{
> >> + struct csid_device *csid = dev;
> >> + u32 value;
> >> +
> >> + value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS);
> >> + writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD);
> >> +
> >> + if ((value >> 11) & 0x1)
> >> + complete(&csid->reset_complete);
> >> +
> >> + return IRQ_HANDLED;
> >> +}
> >> +
> >> +/*
> >> + * csid_reset - Trigger reset on CSID module and wait to complete
> >> + * @csid: CSID device
> >> + *
> >> + * Return 0 on success or a negative error code otherwise
> >> + */
> >> +static int csid_reset(struct csid_device *csid)
> >> +{
> >> + unsigned long time;
> >> +
> >> + reinit_completion(&csid->reset_complete);
> >> +
> >> + writel_relaxed(0x7fff, csid->base + CAMSS_CSID_RST_CMD);
> >> +
> >> + time = wait_for_completion_timeout(&csid->reset_complete,
> >> + msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
> >> + if (!time) {
> >> + dev_err(csid->camss->dev, "CSID reset timeout\n");
> >> + return -EIO;
> >> + }
> >> +
> >> + return 0;
> >> +}
> >> +
> >> +static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
> >> + unsigned int match_format_idx, u32 match_code)
> >> +{
> >> + switch (sink_code) {
> >> + case MEDIA_BUS_FMT_SBGGR10_1X10:
> >> + {
> >> + u32 src_code[] = {
> >> + MEDIA_BUS_FMT_SBGGR10_1X10,
> >> + MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
> >> + };
> >> +
> >> + return csid_find_code(src_code, ARRAY_SIZE(src_code),
> >> + match_format_idx, match_code);
> >> + }
> >> + case MEDIA_BUS_FMT_Y10_1X10:
> >> + {
> >> + u32 src_code[] = {
> >> + MEDIA_BUS_FMT_Y10_1X10,
> >> + MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
> >> + };
> >> +
> >> + return csid_find_code(src_code, ARRAY_SIZE(src_code),
> >> + match_format_idx, match_code);
> >> + }
> >> + default:
> >> + if (match_format_idx > 0)
> >> + return 0;
> >> +
> >> + return sink_code;
> >> + }
> >> +}
> >> +
> >> +static void csid_subdev_init(struct csid_device *csid)
> >> +{
> >> + csid->formats = csid_formats;
> >> + csid->nformats = ARRAY_SIZE(csid_formats);
> >> + csid->testgen.modes = csid_testgen_modes;
> >> + csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7;
> >> +}
> >> +
> >> +const struct csid_hw_ops csid_ops_4_7 = {
> >> + .configure_stream = csid_configure_stream,
> >> + .configure_testgen_pattern = csid_configure_testgen_pattern,
> >> + .hw_version = csid_hw_version,
> >> + .isr = csid_isr,
> >> + .reset = csid_reset,
> >> + .src_pad_code = csid_src_pad_code,
> >> + .subdev_init = csid_subdev_init,
> >> +};
> >> diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
> >> index be3fe76f3dc3..601bd810f2b0 100644
> >> --- a/drivers/media/platform/qcom/camss/camss-csid.c
> >> +++ b/drivers/media/platform/qcom/camss/camss-csid.c
> >> @@ -26,405 +26,35 @@
> >> #define MSM_CSID_NAME "msm_csid"
> >> -#define CAMSS_CSID_HW_VERSION 0x0
> >> -#define CAMSS_CSID_CORE_CTRL_0 0x004
> >> -#define CAMSS_CSID_CORE_CTRL_1 0x008
> >> -#define CAMSS_CSID_RST_CMD(v) ((v) == CAMSS_8x16 ? 0x00c : 0x010)
> >> -#define CAMSS_CSID_CID_LUT_VC_n(v, n) \
> >> - (((v) == CAMSS_8x16 ? 0x010 : 0x014) + 0x4 * (n))
> >> -#define CAMSS_CSID_CID_n_CFG(v, n) \
> >> - (((v) == CAMSS_8x16 ? 0x020 : 0x024) + 0x4 * (n))
> >> -#define CAMSS_CSID_CID_n_CFG_ISPIF_EN BIT(0)
> >> -#define CAMSS_CSID_CID_n_CFG_RDI_EN BIT(1)
> >> -#define CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT 4
> >> -#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_8 (0 << 8)
> >> -#define CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16 (1 << 8)
> >> -#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB (0 << 9)
> >> -#define CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_MSB (1 << 9)
> >> -#define CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP (0 << 10)
> >> -#define CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING (1 << 10)
> >> -#define CAMSS_CSID_IRQ_CLEAR_CMD(v) ((v) == CAMSS_8x16 ? 0x060 : 0x064)
> >> -#define CAMSS_CSID_IRQ_MASK(v) ((v) == CAMSS_8x16 ? 0x064 : 0x068)
> >> -#define CAMSS_CSID_IRQ_STATUS(v) ((v) == CAMSS_8x16 ? 0x068 : 0x06c)
> >> -#define CAMSS_CSID_TG_CTRL(v) ((v) == CAMSS_8x16 ? 0x0a0 : 0x0a8)
> >> -#define CAMSS_CSID_TG_CTRL_DISABLE 0xa06436
> >> -#define CAMSS_CSID_TG_CTRL_ENABLE 0xa06437
> >> -#define CAMSS_CSID_TG_VC_CFG(v) ((v) == CAMSS_8x16 ? 0x0a4 : 0x0ac)
> >> -#define CAMSS_CSID_TG_VC_CFG_H_BLANKING 0x3ff
> >> -#define CAMSS_CSID_TG_VC_CFG_V_BLANKING 0x7f
> >> -#define CAMSS_CSID_TG_DT_n_CGG_0(v, n) \
> >> - (((v) == CAMSS_8x16 ? 0x0ac : 0x0b4) + 0xc * (n))
> >> -#define CAMSS_CSID_TG_DT_n_CGG_1(v, n) \
> >> - (((v) == CAMSS_8x16 ? 0x0b0 : 0x0b8) + 0xc * (n))
> >> -#define CAMSS_CSID_TG_DT_n_CGG_2(v, n) \
> >> - (((v) == CAMSS_8x16 ? 0x0b4 : 0x0bc) + 0xc * (n))
> >> -
> >> -#define DATA_TYPE_EMBEDDED_DATA_8BIT 0x12
> >> -#define DATA_TYPE_YUV422_8BIT 0x1e
> >> -#define DATA_TYPE_RAW_6BIT 0x28
> >> -#define DATA_TYPE_RAW_8BIT 0x2a
> >> -#define DATA_TYPE_RAW_10BIT 0x2b
> >> -#define DATA_TYPE_RAW_12BIT 0x2c
> >> -#define DATA_TYPE_RAW_14BIT 0x2d
> >> -
> >> -#define DECODE_FORMAT_UNCOMPRESSED_6_BIT 0x0
> >> -#define DECODE_FORMAT_UNCOMPRESSED_8_BIT 0x1
> >> -#define DECODE_FORMAT_UNCOMPRESSED_10_BIT 0x2
> >> -#define DECODE_FORMAT_UNCOMPRESSED_12_BIT 0x3
> >> -#define DECODE_FORMAT_UNCOMPRESSED_14_BIT 0x8
> >> -
> >> -#define CSID_RESET_TIMEOUT_MS 500
> >> -
> >> -struct csid_format {
> >> - u32 code;
> >> - u8 data_type;
> >> - u8 decode_format;
> >> - u8 bpp;
> >> - u8 spp; /* bus samples per pixel */
> >> -};
> >> -
> >> -static const struct csid_format csid_formats_8x16[] = {
> >> - {
> >> - MEDIA_BUS_FMT_UYVY8_2X8,
> >> - DATA_TYPE_YUV422_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 2,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_VYUY8_2X8,
> >> - DATA_TYPE_YUV422_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 2,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_YUYV8_2X8,
> >> - DATA_TYPE_YUV422_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 2,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_YVYU8_2X8,
> >> - DATA_TYPE_YUV422_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 2,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SBGGR8_1X8,
> >> - DATA_TYPE_RAW_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGBRG8_1X8,
> >> - DATA_TYPE_RAW_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGRBG8_1X8,
> >> - DATA_TYPE_RAW_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SRGGB8_1X8,
> >> - DATA_TYPE_RAW_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SBGGR10_1X10,
> >> - DATA_TYPE_RAW_10BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> - 10,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGBRG10_1X10,
> >> - DATA_TYPE_RAW_10BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> - 10,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGRBG10_1X10,
> >> - DATA_TYPE_RAW_10BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> - 10,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SRGGB10_1X10,
> >> - DATA_TYPE_RAW_10BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> - 10,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SBGGR12_1X12,
> >> - DATA_TYPE_RAW_12BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> - 12,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGBRG12_1X12,
> >> - DATA_TYPE_RAW_12BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> - 12,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGRBG12_1X12,
> >> - DATA_TYPE_RAW_12BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> - 12,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SRGGB12_1X12,
> >> - DATA_TYPE_RAW_12BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> - 12,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_Y10_1X10,
> >> - DATA_TYPE_RAW_10BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> - 10,
> >> - 1,
> >> - },
> >> -};
> >> -
> >> -static const struct csid_format csid_formats_8x96[] = {
> >> - {
> >> - MEDIA_BUS_FMT_UYVY8_2X8,
> >> - DATA_TYPE_YUV422_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 2,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_VYUY8_2X8,
> >> - DATA_TYPE_YUV422_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 2,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_YUYV8_2X8,
> >> - DATA_TYPE_YUV422_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 2,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_YVYU8_2X8,
> >> - DATA_TYPE_YUV422_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 2,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SBGGR8_1X8,
> >> - DATA_TYPE_RAW_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGBRG8_1X8,
> >> - DATA_TYPE_RAW_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGRBG8_1X8,
> >> - DATA_TYPE_RAW_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SRGGB8_1X8,
> >> - DATA_TYPE_RAW_8BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> >> - 8,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SBGGR10_1X10,
> >> - DATA_TYPE_RAW_10BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> - 10,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGBRG10_1X10,
> >> - DATA_TYPE_RAW_10BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> - 10,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGRBG10_1X10,
> >> - DATA_TYPE_RAW_10BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> - 10,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SRGGB10_1X10,
> >> - DATA_TYPE_RAW_10BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> - 10,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SBGGR12_1X12,
> >> - DATA_TYPE_RAW_12BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> - 12,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGBRG12_1X12,
> >> - DATA_TYPE_RAW_12BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> - 12,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGRBG12_1X12,
> >> - DATA_TYPE_RAW_12BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> - 12,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SRGGB12_1X12,
> >> - DATA_TYPE_RAW_12BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> >> - 12,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SBGGR14_1X14,
> >> - DATA_TYPE_RAW_14BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> >> - 14,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGBRG14_1X14,
> >> - DATA_TYPE_RAW_14BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> >> - 14,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SGRBG14_1X14,
> >> - DATA_TYPE_RAW_14BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> >> - 14,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_SRGGB14_1X14,
> >> - DATA_TYPE_RAW_14BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> >> - 14,
> >> - 1,
> >> - },
> >> - {
> >> - MEDIA_BUS_FMT_Y10_1X10,
> >> - DATA_TYPE_RAW_10BIT,
> >> - DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> >> - 10,
> >> - 1,
> >> - },
> >> -};
> >> -static u32 csid_find_code(u32 *code, unsigned int n_code,
> >> - unsigned int index, u32 req_code)
> >> +u32 csid_find_code(u32 *codes, unsigned int ncodes,
> >> + unsigned int match_format_idx, u32 match_code)
> >> {
> >> int i;
> >> - if (!req_code && (index >= n_code))
> >> + if (!match_code && (match_format_idx >= ncodes))
> >> return 0;
> >> - for (i = 0; i < n_code; i++)
> >> - if (req_code) {
> >> - if (req_code == code[i])
> >> - return req_code;
> >> + for (i = 0; i < ncodes; i++)
> >> + if (match_code) {
> >> + if (codes[i] == match_code)
> >> + return match_code;
> >> } else {
> >> - if (i == index)
> >> - return code[i];
> >> - }
> >> -
> >> - return code[0];
> >> -}
> >> -
> >> -static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
> >> - unsigned int index, u32 src_req_code)
> >> -{
> >> - if (csid->camss->version == CAMSS_8x16) {
> >> - if (index > 0)
> >> - return 0;
> >> -
> >> - return sink_code;
> >> - } else if (csid->camss->version == CAMSS_8x96 ||
> >> - csid->camss->version == CAMSS_660) {
> >> - switch (sink_code) {
> >> - case MEDIA_BUS_FMT_SBGGR10_1X10:
> >> - {
> >> - u32 src_code[] = {
> >> - MEDIA_BUS_FMT_SBGGR10_1X10,
> >> - MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
> >> - };
> >> -
> >> - return csid_find_code(src_code, ARRAY_SIZE(src_code),
> >> - index, src_req_code);
> >> - }
> >> - case MEDIA_BUS_FMT_Y10_1X10:
> >> - {
> >> - u32 src_code[] = {
> >> - MEDIA_BUS_FMT_Y10_1X10,
> >> - MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
> >> - };
> >> -
> >> - return csid_find_code(src_code, ARRAY_SIZE(src_code),
> >> - index, src_req_code);
> >> + if (i == match_format_idx)
> >> + return codes[i];
> >> }
> >> - default:
> >> - if (index > 0)
> >> - return 0;
> >> - return sink_code;
> >> - }
> >> - } else {
> >> - return 0;
> >> - }
> >> + return codes[0];
> >> }
> >> -static const struct csid_format *csid_get_fmt_entry(
> >> +const struct csid_format *csid_get_fmt_entry(
> >> const struct csid_format *formats,
> >> - unsigned int nformat,
> >> + unsigned int nformats,
> >> u32 code)
> >> {
> >> unsigned int i;
> >> - for (i = 0; i < nformat; i++)
> >> + for (i = 0; i < nformats; i++)
> >> if (code == formats[i].code)
> >> return &formats[i];
> >> @@ -433,28 +63,6 @@ static const struct csid_format *csid_get_fmt_entry(
> >> return &formats[0];
> >> }
> >> -/*
> >> - * csid_isr - CSID module interrupt handler
> >> - * @irq: Interrupt line
> >> - * @dev: CSID device
> >> - *
> >> - * Return IRQ_HANDLED on success
> >> - */
> >> -static irqreturn_t csid_isr(int irq, void *dev)
> >> -{
> >> - struct csid_device *csid = dev;
> >> - enum camss_version ver = csid->camss->version;
> >> - u32 value;
> >> -
> >> - value = readl_relaxed(csid->base + CAMSS_CSID_IRQ_STATUS(ver));
> >> - writel_relaxed(value, csid->base + CAMSS_CSID_IRQ_CLEAR_CMD(ver));
> >> -
> >> - if ((value >> 11) & 0x1)
> >> - complete(&csid->reset_complete);
> >> -
> >> - return IRQ_HANDLED;
> >> -}
> >> -
> >> /*
> >> * csid_set_clock_rates - Calculate and set clock rates on CSID module
> >> * @csiphy: CSID device
> >> @@ -521,31 +129,6 @@ static int csid_set_clock_rates(struct csid_device *csid)
> >> return 0;
> >> }
> >> -/*
> >> - * csid_reset - Trigger reset on CSID module and wait to complete
> >> - * @csid: CSID device
> >> - *
> >> - * Return 0 on success or a negative error code otherwise
> >> - */
> >> -static int csid_reset(struct csid_device *csid)
> >> -{
> >> - unsigned long time;
> >> -
> >> - reinit_completion(&csid->reset_complete);
> >> -
> >> - writel_relaxed(0x7fff, csid->base +
> >> - CAMSS_CSID_RST_CMD(csid->camss->version));
> >> -
> >> - time = wait_for_completion_timeout(&csid->reset_complete,
> >> - msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
> >> - if (!time) {
> >> - dev_err(csid->camss->dev, "CSID reset timeout\n");
> >> - return -EIO;
> >> - }
> >> -
> >> - return 0;
> >> -}
> >> -
> >> /*
> >> * csid_set_power - Power on/off CSID module
> >> * @sd: CSID V4L2 subdevice
> >> @@ -560,8 +143,6 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
> >> int ret;
> >> if (on) {
> >> - u32 hw_version;
> >> -
> >> ret = pm_runtime_get_sync(dev);
> >> if (ret < 0) {
> >> pm_runtime_put_sync(dev);
> >> @@ -590,7 +171,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
> >> enable_irq(csid->irq);
> >> - ret = csid_reset(csid);
> >> + ret = csid->ops->reset(csid);
> >> if (ret < 0) {
> >> disable_irq(csid->irq);
> >> camss_disable_clocks(csid->nclocks, csid->clock);
> >> @@ -599,8 +180,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
> >> return ret;
> >> }
> >> - hw_version = readl_relaxed(csid->base + CAMSS_CSID_HW_VERSION);
> >> - dev_dbg(dev, "CSID HW Version = 0x%08x\n", hw_version);
> >> + csid->ops->hw_version(csid);
> >> } else {
> >> disable_irq(csid->irq);
> >> camss_disable_clocks(csid->nclocks, csid->clock);
> >> @@ -623,16 +203,9 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
> >> static int csid_set_stream(struct v4l2_subdev *sd, int enable)
> >> {
> >> struct csid_device *csid = v4l2_get_subdevdata(sd);
> >> - struct csid_testgen_config *tg = &csid->testgen;
> >> - enum camss_version ver = csid->camss->version;
> >> - u32 val;
> >> + int ret;
> >> if (enable) {
> >> - u8 vc = 0; /* Virtual Channel 0 */
> >> - u8 cid = vc * 4; /* id of Virtual Channel and Data Type set */
> >> - u8 dt, dt_shift, df;
> >> - int ret;
> >> -
> >> ret = v4l2_ctrl_handler_setup(&csid->ctrls);
> >> if (ret < 0) {
> >> dev_err(csid->camss->dev,
> >> @@ -640,116 +213,13 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable)
> >> return ret;
> >> }
> >> - if (!tg->enabled &&
> >> + if (!csid->testgen.enabled &&
> >> !media_entity_remote_pad(&csid->pads[MSM_CSID_PAD_SINK]))
> >> return -ENOLINK;
> >> -
> >> - if (tg->enabled) {
> >> - /* Config Test Generator */
> >> - struct v4l2_mbus_framefmt *f =
> >> - &csid->fmt[MSM_CSID_PAD_SRC];
> >> - const struct csid_format *format = csid_get_fmt_entry(
> >> - csid->formats, csid->nformats, f->code);
> >> - u32 num_bytes_per_line =
> >> - f->width * format->bpp * format->spp / 8;
> >> - u32 num_lines = f->height;
> >> -
> >> - /* 31:24 V blank, 23:13 H blank, 3:2 num of active DT */
> >> - /* 1:0 VC */
> >> - val = ((CAMSS_CSID_TG_VC_CFG_V_BLANKING & 0xff) << 24) |
> >> - ((CAMSS_CSID_TG_VC_CFG_H_BLANKING & 0x7ff) << 13);
> >> - writel_relaxed(val, csid->base +
> >> - CAMSS_CSID_TG_VC_CFG(ver));
> >> -
> >> - /* 28:16 bytes per lines, 12:0 num of lines */
> >> - val = ((num_bytes_per_line & 0x1fff) << 16) |
> >> - (num_lines & 0x1fff);
> >> - writel_relaxed(val, csid->base +
> >> - CAMSS_CSID_TG_DT_n_CGG_0(ver, 0));
> >> -
> >> - dt = format->data_type;
> >> -
> >> - /* 5:0 data type */
> >> - val = dt;
> >> - writel_relaxed(val, csid->base +
> >> - CAMSS_CSID_TG_DT_n_CGG_1(ver, 0));
> >> -
> >> - /* 2:0 output test pattern */
> >> - val = tg->payload_mode;
> >> - writel_relaxed(val, csid->base +
> >> - CAMSS_CSID_TG_DT_n_CGG_2(ver, 0));
> >> -
> >> - df = format->decode_format;
> >> - } else {
> >> - struct v4l2_mbus_framefmt *f =
> >> - &csid->fmt[MSM_CSID_PAD_SINK];
> >> - const struct csid_format *format = csid_get_fmt_entry(
> >> - csid->formats, csid->nformats, f->code);
> >> - struct csid_phy_config *phy = &csid->phy;
> >> -
> >> - val = phy->lane_cnt - 1;
> >> - val |= phy->lane_assign << 4;
> >> -
> >> - writel_relaxed(val,
> >> - csid->base + CAMSS_CSID_CORE_CTRL_0);
> >> -
> >> - val = phy->csiphy_id << 17;
> >> - val |= 0x9;
> >> -
> >> - writel_relaxed(val,
> >> - csid->base + CAMSS_CSID_CORE_CTRL_1);
> >> -
> >> - dt = format->data_type;
> >> - df = format->decode_format;
> >> - }
> >> -
> >> - /* Config LUT */
> >> -
> >> - dt_shift = (cid % 4) * 8;
> >> -
> >> - val = readl_relaxed(csid->base +
> >> - CAMSS_CSID_CID_LUT_VC_n(ver, vc));
> >> - val &= ~(0xff << dt_shift);
> >> - val |= dt << dt_shift;
> >> - writel_relaxed(val, csid->base +
> >> - CAMSS_CSID_CID_LUT_VC_n(ver, vc));
> >> -
> >> - val = CAMSS_CSID_CID_n_CFG_ISPIF_EN;
> >> - val |= CAMSS_CSID_CID_n_CFG_RDI_EN;
> >> - val |= df << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT;
> >> - val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP;
> >> -
> >> - if (csid->camss->version == CAMSS_8x96 ||
> >> - csid->camss->version == CAMSS_660) {
> >> - u32 sink_code = csid->fmt[MSM_CSID_PAD_SINK].code;
> >> - u32 src_code = csid->fmt[MSM_CSID_PAD_SRC].code;
> >> -
> >> - if ((sink_code == MEDIA_BUS_FMT_SBGGR10_1X10 &&
> >> - src_code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) ||
> >> - (sink_code == MEDIA_BUS_FMT_Y10_1X10 &&
> >> - src_code == MEDIA_BUS_FMT_Y10_2X8_PADHI_LE)) {
> >> - val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_PLAIN_PACKING;
> >> - val |= CAMSS_CSID_CID_n_CFG_PLAIN_FORMAT_16;
> >> - val |= CAMSS_CSID_CID_n_CFG_PLAIN_ALIGNMENT_LSB;
> >> - }
> >> - }
> >> -
> >> - writel_relaxed(val, csid->base +
> >> - CAMSS_CSID_CID_n_CFG(ver, cid));
> >> -
> >> - if (tg->enabled) {
> >> - val = CAMSS_CSID_TG_CTRL_ENABLE;
> >> - writel_relaxed(val, csid->base +
> >> - CAMSS_CSID_TG_CTRL(ver));
> >> - }
> >> - } else {
> >> - if (tg->enabled) {
> >> - val = CAMSS_CSID_TG_CTRL_DISABLE;
> >> - writel_relaxed(val, csid->base +
> >> - CAMSS_CSID_TG_CTRL(ver));
> >> - }
> >> }
> >> + csid->ops->configure_stream(csid, enable);
> >> +
> >> return 0;
> >> }
> >> @@ -818,7 +288,7 @@ static void csid_try_format(struct csid_device *csid,
> >> *fmt = *__csid_get_format(csid, cfg,
> >> MSM_CSID_PAD_SINK, which);
> >> - fmt->code = csid_src_pad_code(csid, fmt->code, 0, code);
> >> + fmt->code = csid->ops->src_pad_code(csid, fmt->code, 0, code);
> >> } else {
> >> /* Test generator is enabled, set format on source */
> >> /* pad to allow test generator usage */
> >> @@ -868,7 +338,7 @@ static int csid_enum_mbus_code(struct v4l2_subdev *sd,
> >> MSM_CSID_PAD_SINK,
> >> code->which);
> >> - code->code = csid_src_pad_code(csid, sink_fmt->code,
> >> + code->code = csid->ops->src_pad_code(csid, sink_fmt->code,
> >> code->index, 0);
> >> if (!code->code)
> >> return -EINVAL;
> >> @@ -1004,15 +474,6 @@ static int csid_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
> >> return csid_set_format(sd, fh ? fh->pad : NULL, &format);
> >> }
> >> -static const char * const csid_test_pattern_menu[] = {
> >> - "Disabled",
> >> - "Incrementing",
> >> - "Alternating 0x55/0xAA",
> >> - "All Zeros 0x00",
> >> - "All Ones 0xFF",
> >> - "Pseudo-random Data",
> >> -};
> >> -
> >> /*
> >> * csid_set_test_pattern - Set test generator's pattern mode
> >> * @csid: CSID device
> >> @@ -1030,25 +491,7 @@ static int csid_set_test_pattern(struct csid_device *csid, s32 value)
> >> tg->enabled = !!value;
> >> - switch (value) {
> >> - case 1:
> >> - tg->payload_mode = CSID_PAYLOAD_MODE_INCREMENTING;
> >> - break;
> >> - case 2:
> >> - tg->payload_mode = CSID_PAYLOAD_MODE_ALTERNATING_55_AA;
> >> - break;
> >> - case 3:
> >> - tg->payload_mode = CSID_PAYLOAD_MODE_ALL_ZEROES;
> >> - break;
> >> - case 4:
> >> - tg->payload_mode = CSID_PAYLOAD_MODE_ALL_ONES;
> >> - break;
> >> - case 5:
> >> - tg->payload_mode = CSID_PAYLOAD_MODE_RANDOM;
> >> - break;
> >> - }
> >> -
> >> - return 0;
> >> + return csid->ops->configure_testgen_pattern(csid, value);
> >> }
> >> /*
> >> @@ -1097,17 +540,14 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
> >> csid->id = id;
> >> if (camss->version == CAMSS_8x16) {
> >> - csid->formats = csid_formats_8x16;
> >> - csid->nformats =
> >> - ARRAY_SIZE(csid_formats_8x16);
> >> + csid->ops = &csid_ops_4_1;
> >> } else if (camss->version == CAMSS_8x96 ||
> >> camss->version == CAMSS_660) {
> >> - csid->formats = csid_formats_8x96;
> >> - csid->nformats =
> >> - ARRAY_SIZE(csid_formats_8x96);
> >> + csid->ops = &csid_ops_4_7;
> >> } else {
> >> return -EINVAL;
> >> }
> >> + csid->ops->subdev_init(csid);
> >> /* Memory */
> >> @@ -1130,7 +570,7 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
> >> csid->irq = r->start;
> >> snprintf(csid->irq_name, sizeof(csid->irq_name), "%s_%s%d",
> >> dev_name(dev), MSM_CSID_NAME, csid->id);
> >> - ret = devm_request_irq(dev, csid->irq, csid_isr,
> >> + ret = devm_request_irq(dev, csid->irq, csid->ops->isr,
> >> IRQF_TRIGGER_RISING, csid->irq_name, csid);
> >> if (ret < 0) {
> >> dev_err(dev, "request_irq failed: %d\n", ret);
> >> @@ -1341,8 +781,8 @@ int msm_csid_register_entity(struct csid_device *csid,
> >> csid->testgen_mode = v4l2_ctrl_new_std_menu_items(&csid->ctrls,
> >> &csid_ctrl_ops, V4L2_CID_TEST_PATTERN,
> >> - ARRAY_SIZE(csid_test_pattern_menu) - 1, 0, 0,
> >> - csid_test_pattern_menu);
> >> + csid->testgen.nmodes, 0, 0,
>
> enum csid_testgen_mode has the test patterns id's numbered from 0 to MAX_SUPPORTED.
> So the MAX_SUPPORTED is the number of test patterns *minus one*.
> csid->testgen.nmodes points to the csid_testgen_modes[] array which contains the
> test patterns name *plus* "Disabled" as the first element.
> Thus the old (ARRAY_SIZE(csid_test_pattern_menu) - 1) is greater by one than
> csid->testgen.nmodes.
> By passing csid->testgen.nmodes as the max value to v4l2_ctrl_new_std_menu_items()
> you exclude the last test pattern from the menu - you can check the output of
> "v4l2-ctl -L -d <csid subdevice>".
> IMHO the logic would be simpler, if the test patterns were numbered starting from 1, not 0,
> leaving the value of 0 to "TG disabled".
Ack. I agree. The reason for the current enum numbering is because it
aligns with register values. But adding a '-1' to the register write
is cleaner than having this pile of exceptions throughout the code.
I think I'll rework enum, the related code chunks, and switch out the
MAX_SUPPORTED value for NUM_SUPPORTED == MAX_SUPPORTED + 1, to get rid
of offsets everywhere.
>
>
> Thanks,
> Andrey
>
> >> + csid->testgen.modes);
> >> if (csid->ctrls.error) {
> >> dev_err(dev, "Failed to init ctrl: %d\n", csid->ctrls.error);
> >> diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
> >> index 02fc34ee8a41..d40194e2bed3 100644
> >> --- a/drivers/media/platform/qcom/camss/camss-csid.h
> >> +++ b/drivers/media/platform/qcom/camss/camss-csid.h
> >> @@ -11,6 +11,7 @@
> >> #define QC_MSM_CAMSS_CSID_H
> >> #include <linux/clk.h>
> >> +#include <linux/interrupt.h>
> >> #include <media/media-entity.h>
> >> #include <media/v4l2-ctrls.h>
> >> #include <media/v4l2-device.h>
> >> @@ -70,19 +71,50 @@
> >> #define PLAIN_FORMAT_PLAIN16 0x1 /* supports DPCM, UNCOMPRESSED_10/16_BIT */
> >> #define PLAIN_FORMAT_PLAIN32 0x2 /* supports UNCOMPRESSED_20_BIT */
> >> +#define CSID_RESET_TIMEOUT_MS 500
> >> -enum csid_payload_mode {
> >> +
> >> +enum csid_testgen_mode {
> >> CSID_PAYLOAD_MODE_INCREMENTING = 0,
> >> CSID_PAYLOAD_MODE_ALTERNATING_55_AA = 1,
> >> CSID_PAYLOAD_MODE_ALL_ZEROES = 2,
> >> CSID_PAYLOAD_MODE_ALL_ONES = 3,
> >> CSID_PAYLOAD_MODE_RANDOM = 4,
> >> CSID_PAYLOAD_MODE_USER_SPECIFIED = 5,
> >> + CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_1 = 5,
> >> + CSID_PAYLOAD_MODE_MAX_SUPPORTED_4_7 = 5,
> >> + CSID_PAYLOAD_MODE_COMPLEX_PATTERN = 6,
> >> + CSID_PAYLOAD_MODE_COLOR_BOX = 7,
> >> + CSID_PAYLOAD_MODE_COLOR_BARS = 8,
> >> + CSID_PAYLOAD_MODE_MAX_SUPPORTED_170 = 8,
> >> +};
> >> +
> >> +static const char * const csid_testgen_modes[] = {
> >> + "Disabled",
> >> + "Incrementing",
> >> + "Alternating 0x55/0xAA",
> >> + "All Zeros 0x00",
> >> + "All Ones 0xFF",
> >> + "Pseudo-random Data",
> >> + "User Specified",
> >> + "Complex pattern",
> >> + "Color box",
> >> + "Color bars",
> >> +};
> >> +
> >> +struct csid_format {
> >> + u32 code;
> >> + u8 data_type;
> >> + u8 decode_format;
> >> + u8 bpp;
> >> + u8 spp; /* bus samples per pixel */
> >> };
> >> struct csid_testgen_config {
> >> + enum csid_testgen_mode mode;
> >> + const char * const*modes;
> >> + u8 nmodes;
> >> u8 enabled;
> >> - enum csid_payload_mode payload_mode;
> >> };
> >> struct csid_phy_config {
> >> @@ -91,6 +123,65 @@ struct csid_phy_config {
> >> u32 lane_assign;
> >> };
> >> +struct csid_device;
> >> +
> >> +struct csid_hw_ops {
> >> + /*
> >> + * configure_stream - Configures and starts CSID input stream
> >> + * @csid: CSID device
> >> + */
> >> + void (*configure_stream)(struct csid_device *csid, u8 enable);
> >> +
> >> + /*
> >> + * configure_testgen_pattern - Validates and configures output pattern mode
> >> + * of test pattern generator
> >> + * @csid: CSID device
> >> + */
> >> + int (*configure_testgen_pattern)(struct csid_device *csid, s32 val);
> >> +
> >> + /*
> >> + * hw_version - Read hardware version register from hardware
> >> + * @csid: CSID device
> >> + */
> >> + u32 (*hw_version)(struct csid_device *csid);
> >> +
> >> + /*
> >> + * isr - CSID module interrupt service routine
> >> + * @irq: Interrupt line
> >> + * @dev: CSID device
> >> + *
> >> + * Return IRQ_HANDLED on success
> >> + */
> >> + irqreturn_t (*isr)(int irq, void *dev);
> >> +
> >> + /*
> >> + * reset - Trigger reset on CSID module and wait to complete
> >> + * @csid: CSID device
> >> + *
> >> + * Return 0 on success or a negative error code otherwise
> >> + */
> >> + int (*reset)(struct csid_device *csid);
> >> +
> >> + /*
> >> + * src_pad_code - Pick an output/src format based on the input/sink format
> >> + * @csid: CSID device
> >> + * @sink_code: The sink format of the input
> >> + * @match_format_idx: Request preferred index, as defined by subdevice csid_format.
> >> + * Set @match_code to 0 if used.
> >> + * @match_code: Request preferred code, set @match_format_idx to 0 if used
> >> + *
> >> + * Return 0 on failure or src format code otherwise
> >> + */
> >> + u32 (*src_pad_code)(struct csid_device *csid, u32 sink_code,
> >> + unsigned int match_format_idx, u32 match_code);
> >> +
> >> + /*
> >> + * subdev_init - Initialize CSID device according for hardware revision
> >> + * @csid: CSID device
> >> + */
> >> + void (*subdev_init)(struct csid_device *csid);
> >> +};
> >> +
> >> struct csid_device {
> >> struct camss *camss;
> >> u8 id;
> >> @@ -110,10 +201,37 @@ struct csid_device {
> >> struct v4l2_ctrl *testgen_mode;
> >> const struct csid_format *formats;
> >> unsigned int nformats;
> >> + const struct csid_hw_ops *ops;
> >> };
> >> struct resources;
> >> +
> >> +/*
> >> + * csid_find_code - Find a format code in an array using array index or format code
> >> + * @codes: Array of format codes
> >> + * @ncodes: Length of @code array
> >> + * @req_format_idx: Request preferred index, as defined by subdevice csid_format.
> >> + * Set @match_code to 0 if used.
> >> + * @match_code: Request preferred code, set @req_format_idx to 0 if used
> >> + *
> >> + * Return 0 on failure or format code otherwise
> >> + */
> >> +u32 csid_find_code(u32 *codes, unsigned int ncode,
> >> + unsigned int match_format_idx, u32 match_code);
> >> +
> >> +/*
> >> + * csid_get_fmt_entry - Find csid_format entry with matching format code
> >> + * @formats: Array of format csid_format entries
> >> + * @nformats: Length of @nformats array
> >> + * @code: Desired format code
> >> + *
> >> + * Return formats[0] on failure to find code
> >> + */
> >> +const struct csid_format *csid_get_fmt_entry(const struct csid_format *formats,
> >> + unsigned int nformats,
> >> + u32 code);
> >> +
> >> int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
> >> const struct resources *res, u8 id);
> >> @@ -124,4 +242,8 @@ void msm_csid_unregister_entity(struct csid_device *csid);
> >> void msm_csid_get_csid_id(struct media_entity *entity, u8 *id);
> >> +
> >> +extern const struct csid_hw_ops csid_ops_4_1;
> >> +extern const struct csid_hw_ops csid_ops_4_7;
> >> +
> >> #endif /* QC_MSM_CAMSS_CSID_H */
> >>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 10/22] media: camss: Add support for CSID hardware version Titan 170
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (7 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 09/22] media: camss: Refactor CSID HW version support Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-21 17:14 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 11/22] media: camss: Add support for CSIPHY " Robert Foss
` (11 subsequent siblings)
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Add register definitions for version 170 of the Titan architecture
and implement support for the CSID subdevice.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
drivers/media/platform/qcom/camss/Makefile | 1 +
.../platform/qcom/camss/camss-csid-170.c | 602 ++++++++++++++++++
.../media/platform/qcom/camss/camss-csid.c | 4 +
.../media/platform/qcom/camss/camss-csid.h | 2 +
.../media/platform/qcom/camss/camss-vfe-170.c | 1 -
drivers/media/platform/qcom/camss/camss.c | 62 ++
6 files changed, 671 insertions(+), 1 deletion(-)
create mode 100644 drivers/media/platform/qcom/camss/camss-csid-170.c
diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
index cff388b653ba..0752c46ea37b 100644
--- a/drivers/media/platform/qcom/camss/Makefile
+++ b/drivers/media/platform/qcom/camss/Makefile
@@ -6,6 +6,7 @@ qcom-camss-objs += \
camss-csid.o \
camss-csid-4-1.o \
camss-csid-4-7.o \
+ camss-csid-170.o \
camss-csiphy-2ph-1-0.o \
camss-csiphy-3ph-1-0.o \
camss-csiphy.o \
diff --git a/drivers/media/platform/qcom/camss/camss-csid-170.c b/drivers/media/platform/qcom/camss/camss-csid-170.c
new file mode 100644
index 000000000000..0e9b08ed38c2
--- /dev/null
+++ b/drivers/media/platform/qcom/camss/camss-csid-170.c
@@ -0,0 +1,602 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * camss-csid-4-7.c
+ *
+ * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
+ *
+ * Copyright (C) 2020 Linaro Ltd.
+ */
+#include <linux/completion.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+
+#include "camss-csid.h"
+#include "camss.h"
+
+/* The CSID 2 IP-block is different from the others,
+ * and is of a bare-bones Lite version, with no PIX
+ * interface support. As a result of that it has an
+ * alternate register layout.
+ */
+#define IS_LITE (csid->id == 2 ? 1 : 0)
+
+#define CSID_HW_VERSION 0x0
+#define HW_VERSION_STEPPING 0
+#define HW_VERSION_REVISION 16
+#define HW_VERSION_GENERATION 28
+
+#define CSID_RST_STROBES 0x10
+#define RST_STROBES 0
+
+#define CSID_CSI2_RX_IRQ_STATUS 0x20
+#define CSID_CSI2_RX_IRQ_MASK 0x24
+#define CSID_CSI2_RX_IRQ_CLEAR 0x28
+
+#define CSID_CSI2_RDIN_IRQ_STATUS(rdi) ((IS_LITE ? 0x30 : 0x40) \
+ + 0x10 * (rdi))
+#define CSID_CSI2_RDIN_IRQ_MASK(rdi) ((IS_LITE ? 0x34 : 0x44) \
+ + 0x10 * (rdi))
+#define CSID_CSI2_RDIN_IRQ_CLEAR(rdi) ((IS_LITE ? 0x38 : 0x48) \
+ + 0x10 * (rdi))
+#define CSID_CSI2_RDIN_IRQ_SET(rdi) ((IS_LITE ? 0x3C : 0x4C) \
+ + 0x10 * (rdi))
+
+#define CSID_TOP_IRQ_STATUS 0x70
+#define TOP_IRQ_STATUS_RESET_DONE 0
+#define CSID_TOP_IRQ_MASK 0x74
+#define CSID_TOP_IRQ_CLEAR 0x78
+#define CSID_TOP_IRQ_SET 0x7C
+#define CSID_IRQ_CMD 0x80
+#define IRQ_CMD_CLEAR 0
+#define IRQ_CMD_SET 4
+
+#define CSID_CSI2_RX_CFG0 0x100
+#define CSI2_RX_CFG0_NUM_ACTIVE_LANES 0
+#define CSI2_RX_CFG0_DL0_INPUT_SEL 4
+#define CSI2_RX_CFG0_DL1_INPUT_SEL 8
+#define CSI2_RX_CFG0_DL2_INPUT_SEL 12
+#define CSI2_RX_CFG0_DL3_INPUT_SEL 16
+#define CSI2_RX_CFG0_PHY_NUM_SEL 20
+#define CSI2_RX_CFG0_PHY_TYPE_SEL 24
+
+#define CSID_CSI2_RX_CFG1 0x104
+#define CSI2_RX_CFG1_PACKET_ECC_CORRECTION_EN 0
+#define CSI2_RX_CFG1_DE_SCRAMBLE_EN 1
+#define CSI2_RX_CFG1_VC_MODE 2
+#define CSI2_RX_CFG1_COMPLETE_STREAM_EN 4
+#define CSI2_RX_CFG1_COMPLETE_STREAM_FRAME_TIMING 5
+#define CSI2_RX_CFG1_MISR_EN 6
+#define CSI2_RX_CFG1_CGC_MODE 7
+#define CGC_MODE_DYNAMIC_GATING 0
+#define CGC_MODE_ALWAYS_ON 1
+
+#define CSID_RDI_CFG0(rdi) ((IS_LITE ? 0x200 : 0x300) \
+ + 0x100 * (rdi))
+#define RDI_CFG0_BYTE_CNTR_EN 0
+#define RDI_CFG0_FORMAT_MEASURE_EN 1
+#define RDI_CFG0_TIMESTAMP_EN 2
+#define RDI_CFG0_DROP_H_EN 3
+#define RDI_CFG0_DROP_V_EN 4
+#define RDI_CFG0_CROP_H_EN 5
+#define RDI_CFG0_CROP_V_EN 6
+#define RDI_CFG0_MISR_EN 7
+#define RDI_CFG0_CGC_MODE 8
+#define CGC_MODE_DYNAMIC 0
+#define CGC_MODE_ALWAYS_ON 1
+#define RDI_CFG0_PLAIN_ALIGNMENT 9
+#define PLAIN_ALIGNMENT_LSB 0
+#define PLAIN_ALIGNMENT_MSB 1
+#define RDI_CFG0_PLAIN_FORMAT 10
+#define RDI_CFG0_DECODE_FORMAT 12
+#define RDI_CFG0_DATA_TYPE 16
+#define RDI_CFG0_VIRTUAL_CHANNEL 22
+#define RDI_CFG0_DT_ID 27
+#define RDI_CFG0_EARLY_EOF_EN 29
+#define RDI_CFG0_PACKING_FORMAT 30
+#define RDI_CFG0_ENABLE 31
+
+#define CSID_RDI_CFG1(rdi) ((IS_LITE ? 0x204 : 0x304)\
+ + 0x100 * (rdi))
+#define RDI_CFG1_TIMESTAMP_STB_SEL 0
+
+#define CSID_RDI_CTRL(rdi) ((IS_LITE ? 0x208 : 0x308)\
+ + 0x100 * (rdi))
+#define RDI_CTRL_HALT_CMD 0
+#define ALT_CMD_RESUME_AT_FRAME_BOUNDARY 1
+#define RDI_CTRL_HALT_MODE 2
+
+#define CSID_RDI_FRM_DROP_PATTERN(rdi) ((IS_LITE ? 0x20C : 0x30C)\
+ + 0x100 * (rdi))
+#define CSID_RDI_FRM_DROP_PERIOD(rdi) ((IS_LITE ? 0x210 : 0x310)\
+ + 0x100 * (rdi))
+#define CSID_RDI_IRQ_SUBSAMPLE_PATTERN(rdi) ((IS_LITE ? 0x214 : 0x314)\
+ + 0x100 * (rdi))
+#define CSID_RDI_IRQ_SUBSAMPLE_PERIOD(rdi) ((IS_LITE ? 0x218 : 0x318)\
+ + 0x100 * (rdi))
+#define CSID_RDI_RPP_PIX_DROP_PATTERN(rdi) ((IS_LITE ? 0x224 : 0x324)\
+ + 0x100 * (rdi))
+#define CSID_RDI_RPP_PIX_DROP_PERIOD(rdi) ((IS_LITE ? 0x228 : 0x328)\
+ + 0x100 * (rdi))
+#define CSID_RDI_RPP_LINE_DROP_PATTERN(rdi) ((IS_LITE ? 0x22C : 0x32C)\
+ + 0x100 * (rdi))
+#define CSID_RDI_RPP_LINE_DROP_PERIOD(rdi) ((IS_LITE ? 0x230 : 0x330)\
+ + 0x100 * (rdi))
+
+#define CSID_TPG_CTRL 0x600
+#define TPG_CTRL_TEST_EN 0
+#define TPG_CTRL_FS_PKT_EN 1
+#define TPG_CTRL_FE_PKT_EN 2
+#define TPG_CTRL_NUM_ACTIVE_LANES 4
+#define TPG_CTRL_CYCLES_BETWEEN_PKTS 8
+#define TPG_CTRL_NUM_TRAIL_BYTES 20
+
+#define CSID_TPG_VC_CFG0 0x604
+#define TPG_VC_CFG0_VC_NUM 0
+#define TPG_VC_CFG0_NUM_ACTIVE_SLOTS 8
+#define NUM_ACTIVE_SLOTS_0_ENABLED 0
+#define NUM_ACTIVE_SLOTS_0_1_ENABLED 1
+#define NUM_ACTIVE_SLOTS_0_1_2_ENABLED 2
+#define NUM_ACTIVE_SLOTS_0_1_3_ENABLED 3
+#define TPG_VC_CFG0_LINE_INTERLEAVING_MODE 10
+#define INTELEAVING_MODE_INTERLEAVED 0
+#define INTELEAVING_MODE_ONE_SHOT 1
+#define TPG_VC_CFG0_NUM_FRAMES 16
+
+#define CSID_TPG_VC_CFG1 0x608
+#define TPG_VC_CFG1_H_BLANKING_COUNT 0
+#define TPG_VC_CFG1_V_BLANKING_COUNT 12
+#define TPG_VC_CFG1_V_BLANK_FRAME_WIDTH_SEL 24
+
+#define CSID_TPG_LFSR_SEED 0x60C
+
+#define CSID_TPG_DT_n_CFG_0(n) (0x610 + (n) * 0xC)
+#define TPG_DT_n_CFG_0_FRAME_HEIGHT 0
+#define TPG_DT_n_CFG_0_FRAME_WIDTH 16
+
+#define CSID_TPG_DT_n_CFG_1(n) (0x614 + (n) * 0xC)
+#define TPG_DT_n_CFG_1_DATA_TYPE 0
+#define TPG_DT_n_CFG_1_ECC_XOR_MASK 8
+#define TPG_DT_n_CFG_1_CRC_XOR_MASK 16
+
+#define CSID_TPG_DT_n_CFG_2(n) (0x618 + (n) * 0xC)
+#define TPG_DT_n_CFG_2_PAYLOAD_MODE 0
+#define TPG_DT_n_CFG_2_USER_SPECIFIED_PAYLOAD 4
+#define TPG_DT_n_CFG_2_ENCODE_FORMAT 16
+
+#define CSID_TPG_COLOR_BARS_CFG 0x640
+#define TPG_COLOR_BARS_CFG_UNICOLOR_BAR_EN 0
+#define TPG_COLOR_BARS_CFG_UNICOLOR_BAR_SEL 4
+#define TPG_COLOR_BARS_CFG_SPLIT_EN 5
+#define TPG_COLOR_BARS_CFG_ROTATE_PERIOD 8
+
+#define CSID_TPG_COLOR_BOX_CFG 0x644
+#define TPG_COLOR_BOX_CFG_MODE 0
+#define TPG_COLOR_BOX_PATTERN_SEL 2
+
+
+static const struct csid_format csid_formats[] = {
+ {
+ MEDIA_BUS_FMT_UYVY8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_VYUY8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_YUYV8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_YVYU8_2X8,
+ DATA_TYPE_YUV422_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 2,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB8_1X8,
+ DATA_TYPE_RAW_8BIT,
+ DECODE_FORMAT_UNCOMPRESSED_8_BIT,
+ 8,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_Y10_1X10,
+ DATA_TYPE_RAW_10BIT,
+ DECODE_FORMAT_UNCOMPRESSED_10_BIT,
+ 10,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB12_1X12,
+ DATA_TYPE_RAW_12BIT,
+ DECODE_FORMAT_UNCOMPRESSED_12_BIT,
+ 12,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SBGGR14_1X14,
+ DATA_TYPE_RAW_14BIT,
+ DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+ 14,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGBRG14_1X14,
+ DATA_TYPE_RAW_14BIT,
+ DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+ 14,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SGRBG14_1X14,
+ DATA_TYPE_RAW_14BIT,
+ DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+ 14,
+ 1,
+ },
+ {
+ MEDIA_BUS_FMT_SRGGB14_1X14,
+ DATA_TYPE_RAW_14BIT,
+ DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+ 14,
+ 1,
+ },
+};
+
+static void csid_configure_stream(struct csid_device *csid, u8 enable)
+{
+ struct csid_testgen_config *tg = &csid->testgen;
+ u32 val;
+ u32 phy_sel = 0;
+ u8 lane_cnt = csid->phy.lane_cnt;
+ struct v4l2_mbus_framefmt *input_format =
+ &csid->fmt[MSM_CSID_PAD_SRC];
+ const struct csid_format *format = csid_get_fmt_entry(
+ csid->formats, csid->nformats, input_format->code);
+ if (!lane_cnt)
+ lane_cnt = 4;
+
+ if (!tg->enabled)
+ phy_sel = csid->phy.csiphy_id;
+
+ if (enable) {
+ u8 vc = 0; /* Virtual Channel 0 */
+ u8 dt_id = vc * 4;
+
+ if (tg->enabled) {
+ /* Config Test Generator */
+ vc = 0xa;
+
+ /* configure one DT, infinite frames */
+ val = vc << TPG_VC_CFG0_VC_NUM;
+ val |= INTELEAVING_MODE_ONE_SHOT << TPG_VC_CFG0_LINE_INTERLEAVING_MODE;
+ val |= 0 << TPG_VC_CFG0_NUM_FRAMES;
+ writel_relaxed(val, csid->base + CSID_TPG_VC_CFG0);
+
+ val = 0x740 << TPG_VC_CFG1_H_BLANKING_COUNT;
+ val |= 0x3ff << TPG_VC_CFG1_V_BLANKING_COUNT;
+ writel_relaxed(val, csid->base + CSID_TPG_VC_CFG1);
+
+ writel_relaxed(0x12345678, csid->base + CSID_TPG_LFSR_SEED);
+
+ val = input_format->height & 0x1fff << TPG_DT_n_CFG_0_FRAME_HEIGHT;
+ val |= input_format->width & 0x1fff << TPG_DT_n_CFG_0_FRAME_WIDTH;
+ writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_0(0));
+
+ val = DATA_TYPE_RAW_10BIT << TPG_DT_n_CFG_1_DATA_TYPE;
+ writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_1(0));
+
+ val = tg->mode << TPG_DT_n_CFG_2_PAYLOAD_MODE;
+ val |= 0xBE << TPG_DT_n_CFG_2_USER_SPECIFIED_PAYLOAD;
+ val |= format->decode_format << TPG_DT_n_CFG_2_ENCODE_FORMAT;
+ writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_2(0));
+
+ writel_relaxed(0, csid->base + CSID_TPG_COLOR_BARS_CFG);
+
+ writel_relaxed(0, csid->base + CSID_TPG_COLOR_BOX_CFG);
+ }
+
+ val = 1 << RDI_CFG0_BYTE_CNTR_EN;
+ val |= 1 << RDI_CFG0_FORMAT_MEASURE_EN;
+ val |= 1 << RDI_CFG0_TIMESTAMP_EN;
+ val |= DECODE_FORMAT_PAYLOAD_ONLY << RDI_CFG0_DECODE_FORMAT;
+ val |= DATA_TYPE_RAW_10BIT << RDI_CFG0_DATA_TYPE;
+ val |= vc << RDI_CFG0_VIRTUAL_CHANNEL;
+ val |= dt_id << RDI_CFG0_DT_ID;
+ writel_relaxed(val, csid->base + CSID_RDI_CFG0(0));
+
+ /* CSID_TIMESTAMP_STB_POST_IRQ */
+ val = 2 << RDI_CFG1_TIMESTAMP_STB_SEL;
+ writel_relaxed(val, csid->base + CSID_RDI_CFG1(0));
+
+ val = 1;
+ writel_relaxed(val, csid->base + CSID_RDI_FRM_DROP_PERIOD(0));
+
+ val = 0;
+ writel_relaxed(0, csid->base + CSID_RDI_FRM_DROP_PATTERN(0));
+
+ val = 1;
+ writel_relaxed(val, csid->base + CSID_RDI_IRQ_SUBSAMPLE_PERIOD(0));
+
+ val = 0;
+ writel_relaxed(val, csid->base + CSID_RDI_IRQ_SUBSAMPLE_PATTERN(0));
+
+ val = 1;
+ writel_relaxed(val, csid->base + CSID_RDI_RPP_PIX_DROP_PERIOD(0));
+
+ val = 0;
+ writel_relaxed(val, csid->base + CSID_RDI_RPP_PIX_DROP_PATTERN(0));
+
+ val = 1;
+ writel_relaxed(val, csid->base + CSID_RDI_RPP_LINE_DROP_PERIOD(0));
+
+ val = 0;
+ writel_relaxed(val, csid->base + CSID_RDI_RPP_LINE_DROP_PATTERN(0));
+
+ val = 0;
+ writel_relaxed(val, csid->base + CSID_RDI_CTRL(0));
+
+ val = readl_relaxed(csid->base + CSID_RDI_CFG0(0));
+ val |= 1 << RDI_CFG0_ENABLE;
+ writel_relaxed(val, csid->base + CSID_RDI_CFG0(0));
+ }
+
+ if (tg->enabled) {
+ val = enable << TPG_CTRL_TEST_EN;
+ val |= 1 << TPG_CTRL_FS_PKT_EN;
+ val |= 1 << TPG_CTRL_FE_PKT_EN;
+ val |= (lane_cnt - 1) << TPG_CTRL_NUM_ACTIVE_LANES;
+ val |= 0x64 << TPG_CTRL_CYCLES_BETWEEN_PKTS;
+ val |= 0xA << TPG_CTRL_NUM_TRAIL_BYTES;
+ writel_relaxed(val, csid->base + CSID_TPG_CTRL);
+ }
+
+ val = (lane_cnt - 1) << CSI2_RX_CFG0_NUM_ACTIVE_LANES;
+ val |= csid->phy.lane_assign << CSI2_RX_CFG0_DL0_INPUT_SEL;
+ val |= phy_sel << CSI2_RX_CFG0_PHY_NUM_SEL;
+ writel_relaxed(val, csid->base + CSID_CSI2_RX_CFG0);
+
+
+ val = 1 << CSI2_RX_CFG1_PACKET_ECC_CORRECTION_EN;
+ val |= 1 << CSI2_RX_CFG1_MISR_EN;
+ writel_relaxed(val, csid->base + CSID_CSI2_RX_CFG1); // csi2_vc_mode_shift_val ?
+
+ /* error irqs start at BIT(11) */
+ writel_relaxed(~0u, csid->base + CSID_CSI2_RX_IRQ_MASK);
+
+ /* RDI irq */
+ writel_relaxed(~0u, csid->base + CSID_TOP_IRQ_MASK);
+
+ val = 1 << RDI_CTRL_HALT_CMD;
+ writel_relaxed(val, csid->base + CSID_RDI_CTRL(0));
+}
+
+static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
+{
+ s32 regval = val - 1;
+
+ if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_170)
+ csid->testgen.mode = regval;
+
+ return 0;
+}
+
+/*
+ * csid_hw_version - CSID hardware version query
+ * @csid: CSID device
+ *
+ * Return HW version or error
+ */
+static u32 csid_hw_version(struct csid_device *csid)
+{
+ u32 hw_version;
+ u32 hw_gen;
+ u32 hw_rev;
+ u32 hw_step;
+
+ hw_version = readl_relaxed(csid->base + CSID_HW_VERSION);
+ hw_gen = (hw_version >> HW_VERSION_GENERATION) & 0xF;
+ hw_rev = (hw_version >> HW_VERSION_REVISION) & 0xFFF;
+ hw_step = (hw_version >> HW_VERSION_STEPPING) & 0xFFFF;
+ dev_dbg(csid->camss->dev, "CSID HW Version = %u.%u.%u\n",
+ hw_gen, hw_rev, hw_step);
+
+ return hw_version;
+}
+
+/*
+ * csid_isr - CSID module interrupt service routine
+ * @irq: Interrupt line
+ * @dev: CSID device
+ *
+ * Return IRQ_HANDLED on success
+ */
+static irqreturn_t csid_isr(int irq, void *dev)
+{
+ struct csid_device *csid = dev;
+ u32 val;
+ u8 reset_done;
+
+ val = readl_relaxed(csid->base + CSID_TOP_IRQ_STATUS);
+ writel_relaxed(val, csid->base + CSID_TOP_IRQ_CLEAR);
+ reset_done = val & BIT(TOP_IRQ_STATUS_RESET_DONE);
+
+ val = readl_relaxed(csid->base + CSID_CSI2_RX_IRQ_STATUS);
+ writel_relaxed(val, csid->base + CSID_CSI2_RX_IRQ_CLEAR);
+
+ val = readl_relaxed(csid->base + CSID_CSI2_RDIN_IRQ_STATUS(0));
+ writel_relaxed(val, csid->base + CSID_CSI2_RDIN_IRQ_CLEAR(0));
+
+ val = 1 << IRQ_CMD_CLEAR;
+ writel_relaxed(val, csid->base + CSID_IRQ_CMD);
+
+ if (reset_done)
+ complete(&csid->reset_complete);
+
+ return IRQ_HANDLED;
+}
+
+/*
+ * csid_reset - Trigger reset on CSID module and wait to complete
+ * @csid: CSID device
+ *
+ * Return 0 on success or a negative error code otherwise
+ */
+static int csid_reset(struct csid_device *csid)
+{
+ unsigned long time;
+ u32 val;
+
+ reinit_completion(&csid->reset_complete);
+
+ writel_relaxed(1, csid->base + CSID_TOP_IRQ_CLEAR);
+ writel_relaxed(1, csid->base + CSID_IRQ_CMD);
+ writel_relaxed(1, csid->base + CSID_TOP_IRQ_MASK);
+ writel_relaxed(1, csid->base + CSID_IRQ_CMD);
+
+ /* preserve registers */
+ val = 0x1e << RST_STROBES;
+ writel_relaxed(val, csid->base + CSID_RST_STROBES);
+
+ time = wait_for_completion_timeout(&csid->reset_complete,
+ msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
+ if (!time) {
+ dev_err(csid->camss->dev, "CSID reset timeout\n");
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
+ unsigned int match_format_idx, u32 match_code)
+{
+ switch (sink_code) {
+ case MEDIA_BUS_FMT_SBGGR10_1X10:
+ {
+ u32 src_code[] = {
+ MEDIA_BUS_FMT_SBGGR10_1X10,
+ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
+ };
+
+ return csid_find_code(src_code, ARRAY_SIZE(src_code),
+ match_format_idx, match_code);
+ }
+ case MEDIA_BUS_FMT_Y10_1X10:
+ {
+ u32 src_code[] = {
+ MEDIA_BUS_FMT_Y10_1X10,
+ MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
+ };
+
+ return csid_find_code(src_code, ARRAY_SIZE(src_code),
+ match_format_idx, match_code);
+ }
+ default:
+ if (match_format_idx > 0)
+ return 0;
+
+ return sink_code;
+ }
+}
+
+static void csid_subdev_init(struct csid_device *csid)
+{
+ csid->formats = csid_formats;
+ csid->nformats = ARRAY_SIZE(csid_formats);
+ csid->testgen.modes = csid_testgen_modes;
+ csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_170;
+}
+
+const struct csid_hw_ops csid_ops_170 = {
+ .configure_stream = csid_configure_stream,
+ .configure_testgen_pattern = csid_configure_testgen_pattern,
+ .hw_version = csid_hw_version,
+ .isr = csid_isr,
+ .reset = csid_reset,
+ .src_pad_code = csid_src_pad_code,
+ .subdev_init = csid_subdev_init,
+};
diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index 601bd810f2b0..294a0a9e4dfa 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -123,6 +123,8 @@ static int csid_set_clock_rates(struct csid_device *csid)
dev_err(dev, "clk set rate failed: %d\n", ret);
return ret;
}
+ } else if (clock->nfreqs) {
+ clk_set_rate(clock->clk, clock->freq[0]);
}
}
@@ -544,6 +546,8 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
} else if (camss->version == CAMSS_8x96 ||
camss->version == CAMSS_660) {
csid->ops = &csid_ops_4_7;
+ } else if (camss->version == CAMSS_845) {
+ csid->ops = &csid_ops_170;
} else {
return -EINVAL;
}
diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
index d40194e2bed3..49a6b5492403 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.h
+++ b/drivers/media/platform/qcom/camss/camss-csid.h
@@ -245,5 +245,7 @@ void msm_csid_get_csid_id(struct media_entity *entity, u8 *id);
extern const struct csid_hw_ops csid_ops_4_1;
extern const struct csid_hw_ops csid_ops_4_7;
+extern const struct csid_hw_ops csid_ops_170;
+
#endif /* QC_MSM_CAMSS_CSID_H */
diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
index c4991b1f22f8..9ddc30a73868 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe-170.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
@@ -274,7 +274,6 @@ static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
/* Configure stride for RDIs */
- //val = pix->plane_fmt[0].bytesperline;
val = WM_STRIDE_DEFAULT_STRIDE;
writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index 0e006def1996..0b1693c34fbc 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -465,6 +465,68 @@ static const struct resources vfe_res_660[] = {
}
};
+static const struct resources csid_res_845[] = {
+ /* CSID0 */
+ {
+ .regulator = { "vdda-csi0" },
+ .clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
+ "soc_ahb", "vfe0", "vfe0_src",
+ "vfe0_cphy_rx", "csi0",
+ "csi0_src" },
+ .clock_rate = { { 0 },
+ { 384000000 },
+ { 80000000 },
+ { 0 },
+ { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+ { 320000000 },
+ { 0 },
+ { 19200000, 75000000, 384000000, 538666667 },
+ { 384000000 } },
+ .reg = { "csid0" },
+ .interrupt = { "csid0" }
+ },
+
+ /* CSID1 */
+ {
+ .regulator = { "vdda-csi1" },
+ .clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
+ "soc_ahb", "vfe1", "vfe1_src",
+ "vfe1_cphy_rx", "csi1",
+ "csi1_src" },
+ .clock_rate = { { 0 },
+ { 384000000 },
+ { 80000000 },
+ { 0 },
+ { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+ { 320000000 },
+ { 0 },
+ { 19200000, 75000000, 384000000, 538666667 },
+ { 384000000 } },
+ .reg = { "csid1" },
+ .interrupt = { "csid1" }
+ },
+
+ /* CSID2 */
+ {
+ .regulator = { "vdda-csi2" },
+ .clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
+ "soc_ahb", "vfe_lite", "vfe_lite_src",
+ "vfe_lite_cphy_rx", "csi2",
+ "csi2_src" },
+ .clock_rate = { { 0 },
+ { 384000000 },
+ { 80000000 },
+ { 0 },
+ { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
+ { 320000000 },
+ { 0 },
+ { 19200000, 75000000, 384000000, 538666667 },
+ { 384000000 } },
+ .reg = { "csid2" },
+ .interrupt = { "csid2" }
+ }
+};
+
static const struct resources vfe_res_845[] = {
/* VFE0 */
{
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 10/22] media: camss: Add support for CSID hardware version Titan 170
2021-02-17 11:21 ` [PATCH v5 10/22] media: camss: Add support for CSID hardware version Titan 170 Robert Foss
@ 2021-02-21 17:14 ` Andrey Konovalov
2021-02-22 17:06 ` Robert Foss
0 siblings, 1 reply; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-21 17:14 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
On 17.02.2021 14:21, Robert Foss wrote:
> Add register definitions for version 170 of the Titan architecture
> and implement support for the CSID subdevice.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
> drivers/media/platform/qcom/camss/Makefile | 1 +
> .../platform/qcom/camss/camss-csid-170.c | 602 ++++++++++++++++++
> .../media/platform/qcom/camss/camss-csid.c | 4 +
> .../media/platform/qcom/camss/camss-csid.h | 2 +
> .../media/platform/qcom/camss/camss-vfe-170.c | 1 -
> drivers/media/platform/qcom/camss/camss.c | 62 ++
> 6 files changed, 671 insertions(+), 1 deletion(-)
> create mode 100644 drivers/media/platform/qcom/camss/camss-csid-170.c
>
> diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
> index cff388b653ba..0752c46ea37b 100644
> --- a/drivers/media/platform/qcom/camss/Makefile
> +++ b/drivers/media/platform/qcom/camss/Makefile
> @@ -6,6 +6,7 @@ qcom-camss-objs += \
> camss-csid.o \
> camss-csid-4-1.o \
> camss-csid-4-7.o \
> + camss-csid-170.o \
> camss-csiphy-2ph-1-0.o \
> camss-csiphy-3ph-1-0.o \
> camss-csiphy.o \
> diff --git a/drivers/media/platform/qcom/camss/camss-csid-170.c b/drivers/media/platform/qcom/camss/camss-csid-170.c
> new file mode 100644
> index 000000000000..0e9b08ed38c2
> --- /dev/null
> +++ b/drivers/media/platform/qcom/camss/camss-csid-170.c
> @@ -0,0 +1,602 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * camss-csid-4-7.c
> + *
> + * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
> + *
> + * Copyright (C) 2020 Linaro Ltd.
> + */
> +#include <linux/completion.h>
> +#include <linux/interrupt.h>
> +#include <linux/io.h>
> +#include <linux/kernel.h>
> +#include <linux/of.h>
> +
> +#include "camss-csid.h"
> +#include "camss.h"
> +
> +/* The CSID 2 IP-block is different from the others,
> + * and is of a bare-bones Lite version, with no PIX
> + * interface support. As a result of that it has an
> + * alternate register layout.
> + */
> +#define IS_LITE (csid->id == 2 ? 1 : 0)
> +
> +#define CSID_HW_VERSION 0x0
> +#define HW_VERSION_STEPPING 0
> +#define HW_VERSION_REVISION 16
> +#define HW_VERSION_GENERATION 28
> +
> +#define CSID_RST_STROBES 0x10
> +#define RST_STROBES 0
> +
> +#define CSID_CSI2_RX_IRQ_STATUS 0x20
> +#define CSID_CSI2_RX_IRQ_MASK 0x24
> +#define CSID_CSI2_RX_IRQ_CLEAR 0x28
> +
> +#define CSID_CSI2_RDIN_IRQ_STATUS(rdi) ((IS_LITE ? 0x30 : 0x40) \
> + + 0x10 * (rdi))
> +#define CSID_CSI2_RDIN_IRQ_MASK(rdi) ((IS_LITE ? 0x34 : 0x44) \
> + + 0x10 * (rdi))
> +#define CSID_CSI2_RDIN_IRQ_CLEAR(rdi) ((IS_LITE ? 0x38 : 0x48) \
> + + 0x10 * (rdi))
> +#define CSID_CSI2_RDIN_IRQ_SET(rdi) ((IS_LITE ? 0x3C : 0x4C) \
> + + 0x10 * (rdi))
> +
> +#define CSID_TOP_IRQ_STATUS 0x70
> +#define TOP_IRQ_STATUS_RESET_DONE 0
> +#define CSID_TOP_IRQ_MASK 0x74
> +#define CSID_TOP_IRQ_CLEAR 0x78
> +#define CSID_TOP_IRQ_SET 0x7C
> +#define CSID_IRQ_CMD 0x80
> +#define IRQ_CMD_CLEAR 0
> +#define IRQ_CMD_SET 4
> +
> +#define CSID_CSI2_RX_CFG0 0x100
> +#define CSI2_RX_CFG0_NUM_ACTIVE_LANES 0
> +#define CSI2_RX_CFG0_DL0_INPUT_SEL 4
> +#define CSI2_RX_CFG0_DL1_INPUT_SEL 8
> +#define CSI2_RX_CFG0_DL2_INPUT_SEL 12
> +#define CSI2_RX_CFG0_DL3_INPUT_SEL 16
> +#define CSI2_RX_CFG0_PHY_NUM_SEL 20
> +#define CSI2_RX_CFG0_PHY_TYPE_SEL 24
> +
> +#define CSID_CSI2_RX_CFG1 0x104
> +#define CSI2_RX_CFG1_PACKET_ECC_CORRECTION_EN 0
> +#define CSI2_RX_CFG1_DE_SCRAMBLE_EN 1
> +#define CSI2_RX_CFG1_VC_MODE 2
> +#define CSI2_RX_CFG1_COMPLETE_STREAM_EN 4
> +#define CSI2_RX_CFG1_COMPLETE_STREAM_FRAME_TIMING 5
> +#define CSI2_RX_CFG1_MISR_EN 6
> +#define CSI2_RX_CFG1_CGC_MODE 7
> +#define CGC_MODE_DYNAMIC_GATING 0
> +#define CGC_MODE_ALWAYS_ON 1
> +
> +#define CSID_RDI_CFG0(rdi) ((IS_LITE ? 0x200 : 0x300) \
> + + 0x100 * (rdi))
> +#define RDI_CFG0_BYTE_CNTR_EN 0
> +#define RDI_CFG0_FORMAT_MEASURE_EN 1
> +#define RDI_CFG0_TIMESTAMP_EN 2
> +#define RDI_CFG0_DROP_H_EN 3
> +#define RDI_CFG0_DROP_V_EN 4
> +#define RDI_CFG0_CROP_H_EN 5
> +#define RDI_CFG0_CROP_V_EN 6
> +#define RDI_CFG0_MISR_EN 7
> +#define RDI_CFG0_CGC_MODE 8
> +#define CGC_MODE_DYNAMIC 0
> +#define CGC_MODE_ALWAYS_ON 1
> +#define RDI_CFG0_PLAIN_ALIGNMENT 9
> +#define PLAIN_ALIGNMENT_LSB 0
> +#define PLAIN_ALIGNMENT_MSB 1
> +#define RDI_CFG0_PLAIN_FORMAT 10
> +#define RDI_CFG0_DECODE_FORMAT 12
> +#define RDI_CFG0_DATA_TYPE 16
> +#define RDI_CFG0_VIRTUAL_CHANNEL 22
> +#define RDI_CFG0_DT_ID 27
> +#define RDI_CFG0_EARLY_EOF_EN 29
> +#define RDI_CFG0_PACKING_FORMAT 30
> +#define RDI_CFG0_ENABLE 31
> +
> +#define CSID_RDI_CFG1(rdi) ((IS_LITE ? 0x204 : 0x304)\
> + + 0x100 * (rdi))
> +#define RDI_CFG1_TIMESTAMP_STB_SEL 0
> +
> +#define CSID_RDI_CTRL(rdi) ((IS_LITE ? 0x208 : 0x308)\
> + + 0x100 * (rdi))
> +#define RDI_CTRL_HALT_CMD 0
> +#define ALT_CMD_RESUME_AT_FRAME_BOUNDARY 1
> +#define RDI_CTRL_HALT_MODE 2
> +
> +#define CSID_RDI_FRM_DROP_PATTERN(rdi) ((IS_LITE ? 0x20C : 0x30C)\
> + + 0x100 * (rdi))
> +#define CSID_RDI_FRM_DROP_PERIOD(rdi) ((IS_LITE ? 0x210 : 0x310)\
> + + 0x100 * (rdi))
> +#define CSID_RDI_IRQ_SUBSAMPLE_PATTERN(rdi) ((IS_LITE ? 0x214 : 0x314)\
> + + 0x100 * (rdi))
> +#define CSID_RDI_IRQ_SUBSAMPLE_PERIOD(rdi) ((IS_LITE ? 0x218 : 0x318)\
> + + 0x100 * (rdi))
> +#define CSID_RDI_RPP_PIX_DROP_PATTERN(rdi) ((IS_LITE ? 0x224 : 0x324)\
> + + 0x100 * (rdi))
> +#define CSID_RDI_RPP_PIX_DROP_PERIOD(rdi) ((IS_LITE ? 0x228 : 0x328)\
> + + 0x100 * (rdi))
> +#define CSID_RDI_RPP_LINE_DROP_PATTERN(rdi) ((IS_LITE ? 0x22C : 0x32C)\
> + + 0x100 * (rdi))
> +#define CSID_RDI_RPP_LINE_DROP_PERIOD(rdi) ((IS_LITE ? 0x230 : 0x330)\
> + + 0x100 * (rdi))
> +
> +#define CSID_TPG_CTRL 0x600
> +#define TPG_CTRL_TEST_EN 0
> +#define TPG_CTRL_FS_PKT_EN 1
> +#define TPG_CTRL_FE_PKT_EN 2
> +#define TPG_CTRL_NUM_ACTIVE_LANES 4
> +#define TPG_CTRL_CYCLES_BETWEEN_PKTS 8
> +#define TPG_CTRL_NUM_TRAIL_BYTES 20
> +
> +#define CSID_TPG_VC_CFG0 0x604
> +#define TPG_VC_CFG0_VC_NUM 0
> +#define TPG_VC_CFG0_NUM_ACTIVE_SLOTS 8
> +#define NUM_ACTIVE_SLOTS_0_ENABLED 0
> +#define NUM_ACTIVE_SLOTS_0_1_ENABLED 1
> +#define NUM_ACTIVE_SLOTS_0_1_2_ENABLED 2
> +#define NUM_ACTIVE_SLOTS_0_1_3_ENABLED 3
> +#define TPG_VC_CFG0_LINE_INTERLEAVING_MODE 10
> +#define INTELEAVING_MODE_INTERLEAVED 0
> +#define INTELEAVING_MODE_ONE_SHOT 1
> +#define TPG_VC_CFG0_NUM_FRAMES 16
> +
> +#define CSID_TPG_VC_CFG1 0x608
> +#define TPG_VC_CFG1_H_BLANKING_COUNT 0
> +#define TPG_VC_CFG1_V_BLANKING_COUNT 12
> +#define TPG_VC_CFG1_V_BLANK_FRAME_WIDTH_SEL 24
> +
> +#define CSID_TPG_LFSR_SEED 0x60C
> +
> +#define CSID_TPG_DT_n_CFG_0(n) (0x610 + (n) * 0xC)
> +#define TPG_DT_n_CFG_0_FRAME_HEIGHT 0
> +#define TPG_DT_n_CFG_0_FRAME_WIDTH 16
> +
> +#define CSID_TPG_DT_n_CFG_1(n) (0x614 + (n) * 0xC)
> +#define TPG_DT_n_CFG_1_DATA_TYPE 0
> +#define TPG_DT_n_CFG_1_ECC_XOR_MASK 8
> +#define TPG_DT_n_CFG_1_CRC_XOR_MASK 16
> +
> +#define CSID_TPG_DT_n_CFG_2(n) (0x618 + (n) * 0xC)
> +#define TPG_DT_n_CFG_2_PAYLOAD_MODE 0
> +#define TPG_DT_n_CFG_2_USER_SPECIFIED_PAYLOAD 4
> +#define TPG_DT_n_CFG_2_ENCODE_FORMAT 16
> +
> +#define CSID_TPG_COLOR_BARS_CFG 0x640
> +#define TPG_COLOR_BARS_CFG_UNICOLOR_BAR_EN 0
> +#define TPG_COLOR_BARS_CFG_UNICOLOR_BAR_SEL 4
> +#define TPG_COLOR_BARS_CFG_SPLIT_EN 5
> +#define TPG_COLOR_BARS_CFG_ROTATE_PERIOD 8
> +
> +#define CSID_TPG_COLOR_BOX_CFG 0x644
> +#define TPG_COLOR_BOX_CFG_MODE 0
> +#define TPG_COLOR_BOX_PATTERN_SEL 2
> +
> +
> +static const struct csid_format csid_formats[] = {
> + {
> + MEDIA_BUS_FMT_UYVY8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_VYUY8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_YUYV8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_YVYU8_2X8,
> + DATA_TYPE_YUV422_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 2,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB8_1X8,
> + DATA_TYPE_RAW_8BIT,
> + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> + 8,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_Y10_1X10,
> + DATA_TYPE_RAW_10BIT,
> + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> + 10,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB12_1X12,
> + DATA_TYPE_RAW_12BIT,
> + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> + 12,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SBGGR14_1X14,
> + DATA_TYPE_RAW_14BIT,
> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> + 14,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGBRG14_1X14,
> + DATA_TYPE_RAW_14BIT,
> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> + 14,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SGRBG14_1X14,
> + DATA_TYPE_RAW_14BIT,
> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> + 14,
> + 1,
> + },
> + {
> + MEDIA_BUS_FMT_SRGGB14_1X14,
> + DATA_TYPE_RAW_14BIT,
> + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> + 14,
> + 1,
> + },
> +};
> +
> +static void csid_configure_stream(struct csid_device *csid, u8 enable)
> +{
> + struct csid_testgen_config *tg = &csid->testgen;
> + u32 val;
> + u32 phy_sel = 0;
> + u8 lane_cnt = csid->phy.lane_cnt;
> + struct v4l2_mbus_framefmt *input_format =
> + &csid->fmt[MSM_CSID_PAD_SRC];
> + const struct csid_format *format = csid_get_fmt_entry(
> + csid->formats, csid->nformats, input_format->code);
> + if (!lane_cnt)
> + lane_cnt = 4;
> +
> + if (!tg->enabled)
> + phy_sel = csid->phy.csiphy_id;
> +
> + if (enable) {
> + u8 vc = 0; /* Virtual Channel 0 */
> + u8 dt_id = vc * 4;
> +
> + if (tg->enabled) {
> + /* Config Test Generator */
> + vc = 0xa;
> +
> + /* configure one DT, infinite frames */
> + val = vc << TPG_VC_CFG0_VC_NUM;
> + val |= INTELEAVING_MODE_ONE_SHOT << TPG_VC_CFG0_LINE_INTERLEAVING_MODE;
> + val |= 0 << TPG_VC_CFG0_NUM_FRAMES;
> + writel_relaxed(val, csid->base + CSID_TPG_VC_CFG0);
> +
> + val = 0x740 << TPG_VC_CFG1_H_BLANKING_COUNT;
> + val |= 0x3ff << TPG_VC_CFG1_V_BLANKING_COUNT;
> + writel_relaxed(val, csid->base + CSID_TPG_VC_CFG1);
> +
> + writel_relaxed(0x12345678, csid->base + CSID_TPG_LFSR_SEED);
> +
> + val = input_format->height & 0x1fff << TPG_DT_n_CFG_0_FRAME_HEIGHT;
> + val |= input_format->width & 0x1fff << TPG_DT_n_CFG_0_FRAME_WIDTH;
> + writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_0(0));
> +
> + val = DATA_TYPE_RAW_10BIT << TPG_DT_n_CFG_1_DATA_TYPE;
> + writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_1(0));
> +
> + val = tg->mode << TPG_DT_n_CFG_2_PAYLOAD_MODE;
> + val |= 0xBE << TPG_DT_n_CFG_2_USER_SPECIFIED_PAYLOAD;
> + val |= format->decode_format << TPG_DT_n_CFG_2_ENCODE_FORMAT;
> + writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_2(0));
> +
> + writel_relaxed(0, csid->base + CSID_TPG_COLOR_BARS_CFG);
> +
> + writel_relaxed(0, csid->base + CSID_TPG_COLOR_BOX_CFG);
> + }
> +
> + val = 1 << RDI_CFG0_BYTE_CNTR_EN;
> + val |= 1 << RDI_CFG0_FORMAT_MEASURE_EN;
> + val |= 1 << RDI_CFG0_TIMESTAMP_EN;
> + val |= DECODE_FORMAT_PAYLOAD_ONLY << RDI_CFG0_DECODE_FORMAT;
> + val |= DATA_TYPE_RAW_10BIT << RDI_CFG0_DATA_TYPE;
> + val |= vc << RDI_CFG0_VIRTUAL_CHANNEL;
> + val |= dt_id << RDI_CFG0_DT_ID;
> + writel_relaxed(val, csid->base + CSID_RDI_CFG0(0));
> +
> + /* CSID_TIMESTAMP_STB_POST_IRQ */
> + val = 2 << RDI_CFG1_TIMESTAMP_STB_SEL;
> + writel_relaxed(val, csid->base + CSID_RDI_CFG1(0));
> +
> + val = 1;
> + writel_relaxed(val, csid->base + CSID_RDI_FRM_DROP_PERIOD(0));
> +
> + val = 0;
> + writel_relaxed(0, csid->base + CSID_RDI_FRM_DROP_PATTERN(0));
> +
> + val = 1;
> + writel_relaxed(val, csid->base + CSID_RDI_IRQ_SUBSAMPLE_PERIOD(0));
> +
> + val = 0;
> + writel_relaxed(val, csid->base + CSID_RDI_IRQ_SUBSAMPLE_PATTERN(0));
> +
> + val = 1;
> + writel_relaxed(val, csid->base + CSID_RDI_RPP_PIX_DROP_PERIOD(0));
> +
> + val = 0;
> + writel_relaxed(val, csid->base + CSID_RDI_RPP_PIX_DROP_PATTERN(0));
> +
> + val = 1;
> + writel_relaxed(val, csid->base + CSID_RDI_RPP_LINE_DROP_PERIOD(0));
> +
> + val = 0;
> + writel_relaxed(val, csid->base + CSID_RDI_RPP_LINE_DROP_PATTERN(0));
> +
> + val = 0;
> + writel_relaxed(val, csid->base + CSID_RDI_CTRL(0));
> +
> + val = readl_relaxed(csid->base + CSID_RDI_CFG0(0));
> + val |= 1 << RDI_CFG0_ENABLE;
> + writel_relaxed(val, csid->base + CSID_RDI_CFG0(0));
> + }
> +
> + if (tg->enabled) {
> + val = enable << TPG_CTRL_TEST_EN;
> + val |= 1 << TPG_CTRL_FS_PKT_EN;
> + val |= 1 << TPG_CTRL_FE_PKT_EN;
> + val |= (lane_cnt - 1) << TPG_CTRL_NUM_ACTIVE_LANES;
> + val |= 0x64 << TPG_CTRL_CYCLES_BETWEEN_PKTS;
> + val |= 0xA << TPG_CTRL_NUM_TRAIL_BYTES;
> + writel_relaxed(val, csid->base + CSID_TPG_CTRL);
> + }
> +
> + val = (lane_cnt - 1) << CSI2_RX_CFG0_NUM_ACTIVE_LANES;
> + val |= csid->phy.lane_assign << CSI2_RX_CFG0_DL0_INPUT_SEL;
> + val |= phy_sel << CSI2_RX_CFG0_PHY_NUM_SEL;
> + writel_relaxed(val, csid->base + CSID_CSI2_RX_CFG0);
> +
> +
> + val = 1 << CSI2_RX_CFG1_PACKET_ECC_CORRECTION_EN;
> + val |= 1 << CSI2_RX_CFG1_MISR_EN;
> + writel_relaxed(val, csid->base + CSID_CSI2_RX_CFG1); // csi2_vc_mode_shift_val ?
> +
> + /* error irqs start at BIT(11) */
> + writel_relaxed(~0u, csid->base + CSID_CSI2_RX_IRQ_MASK);
> +
> + /* RDI irq */
> + writel_relaxed(~0u, csid->base + CSID_TOP_IRQ_MASK);
> +
> + val = 1 << RDI_CTRL_HALT_CMD;
> + writel_relaxed(val, csid->base + CSID_RDI_CTRL(0));
> +}
> +
> +static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
Here (val == 0) means "testgen disabled", and (val >= 1) selects the test
pattern: (val == 1) corresponds to CSID_PAYLOAD_MODE_INCREMENTING etc.
> +{
> + s32 regval = val - 1;
- now regval contains the zero-based test pattern mode number
> + if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_170)
- by excluding regval of zero you made it impossible to select
CSID_PAYLOAD_MODE_INCREMENTING, didn't you?
It looks like the above line of code should be:
if (regval >= 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_170)
With this sorted out,
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Thanks,
Andrey
> + csid->testgen.mode = regval;
> +
> + return 0;
> +}
> +
> +/*
> + * csid_hw_version - CSID hardware version query
> + * @csid: CSID device
> + *
> + * Return HW version or error
> + */
> +static u32 csid_hw_version(struct csid_device *csid)
> +{
> + u32 hw_version;
> + u32 hw_gen;
> + u32 hw_rev;
> + u32 hw_step;
> +
> + hw_version = readl_relaxed(csid->base + CSID_HW_VERSION);
> + hw_gen = (hw_version >> HW_VERSION_GENERATION) & 0xF;
> + hw_rev = (hw_version >> HW_VERSION_REVISION) & 0xFFF;
> + hw_step = (hw_version >> HW_VERSION_STEPPING) & 0xFFFF;
> + dev_dbg(csid->camss->dev, "CSID HW Version = %u.%u.%u\n",
> + hw_gen, hw_rev, hw_step);
> +
> + return hw_version;
> +}
> +
> +/*
> + * csid_isr - CSID module interrupt service routine
> + * @irq: Interrupt line
> + * @dev: CSID device
> + *
> + * Return IRQ_HANDLED on success
> + */
> +static irqreturn_t csid_isr(int irq, void *dev)
> +{
> + struct csid_device *csid = dev;
> + u32 val;
> + u8 reset_done;
> +
> + val = readl_relaxed(csid->base + CSID_TOP_IRQ_STATUS);
> + writel_relaxed(val, csid->base + CSID_TOP_IRQ_CLEAR);
> + reset_done = val & BIT(TOP_IRQ_STATUS_RESET_DONE);
> +
> + val = readl_relaxed(csid->base + CSID_CSI2_RX_IRQ_STATUS);
> + writel_relaxed(val, csid->base + CSID_CSI2_RX_IRQ_CLEAR);
> +
> + val = readl_relaxed(csid->base + CSID_CSI2_RDIN_IRQ_STATUS(0));
> + writel_relaxed(val, csid->base + CSID_CSI2_RDIN_IRQ_CLEAR(0));
> +
> + val = 1 << IRQ_CMD_CLEAR;
> + writel_relaxed(val, csid->base + CSID_IRQ_CMD);
> +
> + if (reset_done)
> + complete(&csid->reset_complete);
> +
> + return IRQ_HANDLED;
> +}
> +
> +/*
> + * csid_reset - Trigger reset on CSID module and wait to complete
> + * @csid: CSID device
> + *
> + * Return 0 on success or a negative error code otherwise
> + */
> +static int csid_reset(struct csid_device *csid)
> +{
> + unsigned long time;
> + u32 val;
> +
> + reinit_completion(&csid->reset_complete);
> +
> + writel_relaxed(1, csid->base + CSID_TOP_IRQ_CLEAR);
> + writel_relaxed(1, csid->base + CSID_IRQ_CMD);
> + writel_relaxed(1, csid->base + CSID_TOP_IRQ_MASK);
> + writel_relaxed(1, csid->base + CSID_IRQ_CMD);
> +
> + /* preserve registers */
> + val = 0x1e << RST_STROBES;
> + writel_relaxed(val, csid->base + CSID_RST_STROBES);
> +
> + time = wait_for_completion_timeout(&csid->reset_complete,
> + msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
> + if (!time) {
> + dev_err(csid->camss->dev, "CSID reset timeout\n");
> + return -EIO;
> + }
> +
> + return 0;
> +}
> +
> +static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
> + unsigned int match_format_idx, u32 match_code)
> +{
> + switch (sink_code) {
> + case MEDIA_BUS_FMT_SBGGR10_1X10:
> + {
> + u32 src_code[] = {
> + MEDIA_BUS_FMT_SBGGR10_1X10,
> + MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
> + };
> +
> + return csid_find_code(src_code, ARRAY_SIZE(src_code),
> + match_format_idx, match_code);
> + }
> + case MEDIA_BUS_FMT_Y10_1X10:
> + {
> + u32 src_code[] = {
> + MEDIA_BUS_FMT_Y10_1X10,
> + MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
> + };
> +
> + return csid_find_code(src_code, ARRAY_SIZE(src_code),
> + match_format_idx, match_code);
> + }
> + default:
> + if (match_format_idx > 0)
> + return 0;
> +
> + return sink_code;
> + }
> +}
> +
> +static void csid_subdev_init(struct csid_device *csid)
> +{
> + csid->formats = csid_formats;
> + csid->nformats = ARRAY_SIZE(csid_formats);
> + csid->testgen.modes = csid_testgen_modes;
> + csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_170;
> +}
> +
> +const struct csid_hw_ops csid_ops_170 = {
> + .configure_stream = csid_configure_stream,
> + .configure_testgen_pattern = csid_configure_testgen_pattern,
> + .hw_version = csid_hw_version,
> + .isr = csid_isr,
> + .reset = csid_reset,
> + .src_pad_code = csid_src_pad_code,
> + .subdev_init = csid_subdev_init,
> +};
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
> index 601bd810f2b0..294a0a9e4dfa 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.c
> +++ b/drivers/media/platform/qcom/camss/camss-csid.c
> @@ -123,6 +123,8 @@ static int csid_set_clock_rates(struct csid_device *csid)
> dev_err(dev, "clk set rate failed: %d\n", ret);
> return ret;
> }
> + } else if (clock->nfreqs) {
> + clk_set_rate(clock->clk, clock->freq[0]);
> }
> }
>
> @@ -544,6 +546,8 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
> } else if (camss->version == CAMSS_8x96 ||
> camss->version == CAMSS_660) {
> csid->ops = &csid_ops_4_7;
> + } else if (camss->version == CAMSS_845) {
> + csid->ops = &csid_ops_170;
> } else {
> return -EINVAL;
> }
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
> index d40194e2bed3..49a6b5492403 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.h
> +++ b/drivers/media/platform/qcom/camss/camss-csid.h
> @@ -245,5 +245,7 @@ void msm_csid_get_csid_id(struct media_entity *entity, u8 *id);
>
> extern const struct csid_hw_ops csid_ops_4_1;
> extern const struct csid_hw_ops csid_ops_4_7;
> +extern const struct csid_hw_ops csid_ops_170;
> +
>
> #endif /* QC_MSM_CAMSS_CSID_H */
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> index c4991b1f22f8..9ddc30a73868 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe-170.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> @@ -274,7 +274,6 @@ static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
> writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
>
> /* Configure stride for RDIs */
> - //val = pix->plane_fmt[0].bytesperline;
> val = WM_STRIDE_DEFAULT_STRIDE;
> writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
>
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 0e006def1996..0b1693c34fbc 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -465,6 +465,68 @@ static const struct resources vfe_res_660[] = {
> }
> };
>
> +static const struct resources csid_res_845[] = {
> + /* CSID0 */
> + {
> + .regulator = { "vdda-csi0" },
> + .clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
> + "soc_ahb", "vfe0", "vfe0_src",
> + "vfe0_cphy_rx", "csi0",
> + "csi0_src" },
> + .clock_rate = { { 0 },
> + { 384000000 },
> + { 80000000 },
> + { 0 },
> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> + { 320000000 },
> + { 0 },
> + { 19200000, 75000000, 384000000, 538666667 },
> + { 384000000 } },
> + .reg = { "csid0" },
> + .interrupt = { "csid0" }
> + },
> +
> + /* CSID1 */
> + {
> + .regulator = { "vdda-csi1" },
> + .clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
> + "soc_ahb", "vfe1", "vfe1_src",
> + "vfe1_cphy_rx", "csi1",
> + "csi1_src" },
> + .clock_rate = { { 0 },
> + { 384000000 },
> + { 80000000 },
> + { 0 },
> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> + { 320000000 },
> + { 0 },
> + { 19200000, 75000000, 384000000, 538666667 },
> + { 384000000 } },
> + .reg = { "csid1" },
> + .interrupt = { "csid1" }
> + },
> +
> + /* CSID2 */
> + {
> + .regulator = { "vdda-csi2" },
> + .clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
> + "soc_ahb", "vfe_lite", "vfe_lite_src",
> + "vfe_lite_cphy_rx", "csi2",
> + "csi2_src" },
> + .clock_rate = { { 0 },
> + { 384000000 },
> + { 80000000 },
> + { 0 },
> + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> + { 320000000 },
> + { 0 },
> + { 19200000, 75000000, 384000000, 538666667 },
> + { 384000000 } },
> + .reg = { "csid2" },
> + .interrupt = { "csid2" }
> + }
> +};
> +
> static const struct resources vfe_res_845[] = {
> /* VFE0 */
> {
>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 10/22] media: camss: Add support for CSID hardware version Titan 170
2021-02-21 17:14 ` Andrey Konovalov
@ 2021-02-22 17:06 ` Robert Foss
0 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-22 17:06 UTC (permalink / raw)
To: Andrey Konovalov
Cc: Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab,
Rob Herring, angelogioacchino.delregno, MSM, linux-media,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, AngeloGioacchino Del Regno, Sakari Ailus,
Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed, Sarvesh Sridutt,
Laurent Pinchart, Jonathan Marek
On Sun, 21 Feb 2021 at 18:14, Andrey Konovalov
<andrey.konovalov@linaro.org> wrote:
>
> Hi Robert,
>
> Thank you for your patch!
>
> On 17.02.2021 14:21, Robert Foss wrote:
> > Add register definitions for version 170 of the Titan architecture
> > and implement support for the CSID subdevice.
> >
> > Signed-off-by: Robert Foss <robert.foss@linaro.org>
> > ---
> > drivers/media/platform/qcom/camss/Makefile | 1 +
> > .../platform/qcom/camss/camss-csid-170.c | 602 ++++++++++++++++++
> > .../media/platform/qcom/camss/camss-csid.c | 4 +
> > .../media/platform/qcom/camss/camss-csid.h | 2 +
> > .../media/platform/qcom/camss/camss-vfe-170.c | 1 -
> > drivers/media/platform/qcom/camss/camss.c | 62 ++
> > 6 files changed, 671 insertions(+), 1 deletion(-)
> > create mode 100644 drivers/media/platform/qcom/camss/camss-csid-170.c
> >
> > diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
> > index cff388b653ba..0752c46ea37b 100644
> > --- a/drivers/media/platform/qcom/camss/Makefile
> > +++ b/drivers/media/platform/qcom/camss/Makefile
> > @@ -6,6 +6,7 @@ qcom-camss-objs += \
> > camss-csid.o \
> > camss-csid-4-1.o \
> > camss-csid-4-7.o \
> > + camss-csid-170.o \
> > camss-csiphy-2ph-1-0.o \
> > camss-csiphy-3ph-1-0.o \
> > camss-csiphy.o \
> > diff --git a/drivers/media/platform/qcom/camss/camss-csid-170.c b/drivers/media/platform/qcom/camss/camss-csid-170.c
> > new file mode 100644
> > index 000000000000..0e9b08ed38c2
> > --- /dev/null
> > +++ b/drivers/media/platform/qcom/camss/camss-csid-170.c
> > @@ -0,0 +1,602 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * camss-csid-4-7.c
> > + *
> > + * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module
> > + *
> > + * Copyright (C) 2020 Linaro Ltd.
> > + */
> > +#include <linux/completion.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/io.h>
> > +#include <linux/kernel.h>
> > +#include <linux/of.h>
> > +
> > +#include "camss-csid.h"
> > +#include "camss.h"
> > +
> > +/* The CSID 2 IP-block is different from the others,
> > + * and is of a bare-bones Lite version, with no PIX
> > + * interface support. As a result of that it has an
> > + * alternate register layout.
> > + */
> > +#define IS_LITE (csid->id == 2 ? 1 : 0)
> > +
> > +#define CSID_HW_VERSION 0x0
> > +#define HW_VERSION_STEPPING 0
> > +#define HW_VERSION_REVISION 16
> > +#define HW_VERSION_GENERATION 28
> > +
> > +#define CSID_RST_STROBES 0x10
> > +#define RST_STROBES 0
> > +
> > +#define CSID_CSI2_RX_IRQ_STATUS 0x20
> > +#define CSID_CSI2_RX_IRQ_MASK 0x24
> > +#define CSID_CSI2_RX_IRQ_CLEAR 0x28
> > +
> > +#define CSID_CSI2_RDIN_IRQ_STATUS(rdi) ((IS_LITE ? 0x30 : 0x40) \
> > + + 0x10 * (rdi))
> > +#define CSID_CSI2_RDIN_IRQ_MASK(rdi) ((IS_LITE ? 0x34 : 0x44) \
> > + + 0x10 * (rdi))
> > +#define CSID_CSI2_RDIN_IRQ_CLEAR(rdi) ((IS_LITE ? 0x38 : 0x48) \
> > + + 0x10 * (rdi))
> > +#define CSID_CSI2_RDIN_IRQ_SET(rdi) ((IS_LITE ? 0x3C : 0x4C) \
> > + + 0x10 * (rdi))
> > +
> > +#define CSID_TOP_IRQ_STATUS 0x70
> > +#define TOP_IRQ_STATUS_RESET_DONE 0
> > +#define CSID_TOP_IRQ_MASK 0x74
> > +#define CSID_TOP_IRQ_CLEAR 0x78
> > +#define CSID_TOP_IRQ_SET 0x7C
> > +#define CSID_IRQ_CMD 0x80
> > +#define IRQ_CMD_CLEAR 0
> > +#define IRQ_CMD_SET 4
> > +
> > +#define CSID_CSI2_RX_CFG0 0x100
> > +#define CSI2_RX_CFG0_NUM_ACTIVE_LANES 0
> > +#define CSI2_RX_CFG0_DL0_INPUT_SEL 4
> > +#define CSI2_RX_CFG0_DL1_INPUT_SEL 8
> > +#define CSI2_RX_CFG0_DL2_INPUT_SEL 12
> > +#define CSI2_RX_CFG0_DL3_INPUT_SEL 16
> > +#define CSI2_RX_CFG0_PHY_NUM_SEL 20
> > +#define CSI2_RX_CFG0_PHY_TYPE_SEL 24
> > +
> > +#define CSID_CSI2_RX_CFG1 0x104
> > +#define CSI2_RX_CFG1_PACKET_ECC_CORRECTION_EN 0
> > +#define CSI2_RX_CFG1_DE_SCRAMBLE_EN 1
> > +#define CSI2_RX_CFG1_VC_MODE 2
> > +#define CSI2_RX_CFG1_COMPLETE_STREAM_EN 4
> > +#define CSI2_RX_CFG1_COMPLETE_STREAM_FRAME_TIMING 5
> > +#define CSI2_RX_CFG1_MISR_EN 6
> > +#define CSI2_RX_CFG1_CGC_MODE 7
> > +#define CGC_MODE_DYNAMIC_GATING 0
> > +#define CGC_MODE_ALWAYS_ON 1
> > +
> > +#define CSID_RDI_CFG0(rdi) ((IS_LITE ? 0x200 : 0x300) \
> > + + 0x100 * (rdi))
> > +#define RDI_CFG0_BYTE_CNTR_EN 0
> > +#define RDI_CFG0_FORMAT_MEASURE_EN 1
> > +#define RDI_CFG0_TIMESTAMP_EN 2
> > +#define RDI_CFG0_DROP_H_EN 3
> > +#define RDI_CFG0_DROP_V_EN 4
> > +#define RDI_CFG0_CROP_H_EN 5
> > +#define RDI_CFG0_CROP_V_EN 6
> > +#define RDI_CFG0_MISR_EN 7
> > +#define RDI_CFG0_CGC_MODE 8
> > +#define CGC_MODE_DYNAMIC 0
> > +#define CGC_MODE_ALWAYS_ON 1
> > +#define RDI_CFG0_PLAIN_ALIGNMENT 9
> > +#define PLAIN_ALIGNMENT_LSB 0
> > +#define PLAIN_ALIGNMENT_MSB 1
> > +#define RDI_CFG0_PLAIN_FORMAT 10
> > +#define RDI_CFG0_DECODE_FORMAT 12
> > +#define RDI_CFG0_DATA_TYPE 16
> > +#define RDI_CFG0_VIRTUAL_CHANNEL 22
> > +#define RDI_CFG0_DT_ID 27
> > +#define RDI_CFG0_EARLY_EOF_EN 29
> > +#define RDI_CFG0_PACKING_FORMAT 30
> > +#define RDI_CFG0_ENABLE 31
> > +
> > +#define CSID_RDI_CFG1(rdi) ((IS_LITE ? 0x204 : 0x304)\
> > + + 0x100 * (rdi))
> > +#define RDI_CFG1_TIMESTAMP_STB_SEL 0
> > +
> > +#define CSID_RDI_CTRL(rdi) ((IS_LITE ? 0x208 : 0x308)\
> > + + 0x100 * (rdi))
> > +#define RDI_CTRL_HALT_CMD 0
> > +#define ALT_CMD_RESUME_AT_FRAME_BOUNDARY 1
> > +#define RDI_CTRL_HALT_MODE 2
> > +
> > +#define CSID_RDI_FRM_DROP_PATTERN(rdi) ((IS_LITE ? 0x20C : 0x30C)\
> > + + 0x100 * (rdi))
> > +#define CSID_RDI_FRM_DROP_PERIOD(rdi) ((IS_LITE ? 0x210 : 0x310)\
> > + + 0x100 * (rdi))
> > +#define CSID_RDI_IRQ_SUBSAMPLE_PATTERN(rdi) ((IS_LITE ? 0x214 : 0x314)\
> > + + 0x100 * (rdi))
> > +#define CSID_RDI_IRQ_SUBSAMPLE_PERIOD(rdi) ((IS_LITE ? 0x218 : 0x318)\
> > + + 0x100 * (rdi))
> > +#define CSID_RDI_RPP_PIX_DROP_PATTERN(rdi) ((IS_LITE ? 0x224 : 0x324)\
> > + + 0x100 * (rdi))
> > +#define CSID_RDI_RPP_PIX_DROP_PERIOD(rdi) ((IS_LITE ? 0x228 : 0x328)\
> > + + 0x100 * (rdi))
> > +#define CSID_RDI_RPP_LINE_DROP_PATTERN(rdi) ((IS_LITE ? 0x22C : 0x32C)\
> > + + 0x100 * (rdi))
> > +#define CSID_RDI_RPP_LINE_DROP_PERIOD(rdi) ((IS_LITE ? 0x230 : 0x330)\
> > + + 0x100 * (rdi))
> > +
> > +#define CSID_TPG_CTRL 0x600
> > +#define TPG_CTRL_TEST_EN 0
> > +#define TPG_CTRL_FS_PKT_EN 1
> > +#define TPG_CTRL_FE_PKT_EN 2
> > +#define TPG_CTRL_NUM_ACTIVE_LANES 4
> > +#define TPG_CTRL_CYCLES_BETWEEN_PKTS 8
> > +#define TPG_CTRL_NUM_TRAIL_BYTES 20
> > +
> > +#define CSID_TPG_VC_CFG0 0x604
> > +#define TPG_VC_CFG0_VC_NUM 0
> > +#define TPG_VC_CFG0_NUM_ACTIVE_SLOTS 8
> > +#define NUM_ACTIVE_SLOTS_0_ENABLED 0
> > +#define NUM_ACTIVE_SLOTS_0_1_ENABLED 1
> > +#define NUM_ACTIVE_SLOTS_0_1_2_ENABLED 2
> > +#define NUM_ACTIVE_SLOTS_0_1_3_ENABLED 3
> > +#define TPG_VC_CFG0_LINE_INTERLEAVING_MODE 10
> > +#define INTELEAVING_MODE_INTERLEAVED 0
> > +#define INTELEAVING_MODE_ONE_SHOT 1
> > +#define TPG_VC_CFG0_NUM_FRAMES 16
> > +
> > +#define CSID_TPG_VC_CFG1 0x608
> > +#define TPG_VC_CFG1_H_BLANKING_COUNT 0
> > +#define TPG_VC_CFG1_V_BLANKING_COUNT 12
> > +#define TPG_VC_CFG1_V_BLANK_FRAME_WIDTH_SEL 24
> > +
> > +#define CSID_TPG_LFSR_SEED 0x60C
> > +
> > +#define CSID_TPG_DT_n_CFG_0(n) (0x610 + (n) * 0xC)
> > +#define TPG_DT_n_CFG_0_FRAME_HEIGHT 0
> > +#define TPG_DT_n_CFG_0_FRAME_WIDTH 16
> > +
> > +#define CSID_TPG_DT_n_CFG_1(n) (0x614 + (n) * 0xC)
> > +#define TPG_DT_n_CFG_1_DATA_TYPE 0
> > +#define TPG_DT_n_CFG_1_ECC_XOR_MASK 8
> > +#define TPG_DT_n_CFG_1_CRC_XOR_MASK 16
> > +
> > +#define CSID_TPG_DT_n_CFG_2(n) (0x618 + (n) * 0xC)
> > +#define TPG_DT_n_CFG_2_PAYLOAD_MODE 0
> > +#define TPG_DT_n_CFG_2_USER_SPECIFIED_PAYLOAD 4
> > +#define TPG_DT_n_CFG_2_ENCODE_FORMAT 16
> > +
> > +#define CSID_TPG_COLOR_BARS_CFG 0x640
> > +#define TPG_COLOR_BARS_CFG_UNICOLOR_BAR_EN 0
> > +#define TPG_COLOR_BARS_CFG_UNICOLOR_BAR_SEL 4
> > +#define TPG_COLOR_BARS_CFG_SPLIT_EN 5
> > +#define TPG_COLOR_BARS_CFG_ROTATE_PERIOD 8
> > +
> > +#define CSID_TPG_COLOR_BOX_CFG 0x644
> > +#define TPG_COLOR_BOX_CFG_MODE 0
> > +#define TPG_COLOR_BOX_PATTERN_SEL 2
> > +
> > +
> > +static const struct csid_format csid_formats[] = {
> > + {
> > + MEDIA_BUS_FMT_UYVY8_2X8,
> > + DATA_TYPE_YUV422_8BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> > + 8,
> > + 2,
> > + },
> > + {
> > + MEDIA_BUS_FMT_VYUY8_2X8,
> > + DATA_TYPE_YUV422_8BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> > + 8,
> > + 2,
> > + },
> > + {
> > + MEDIA_BUS_FMT_YUYV8_2X8,
> > + DATA_TYPE_YUV422_8BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> > + 8,
> > + 2,
> > + },
> > + {
> > + MEDIA_BUS_FMT_YVYU8_2X8,
> > + DATA_TYPE_YUV422_8BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> > + 8,
> > + 2,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SBGGR8_1X8,
> > + DATA_TYPE_RAW_8BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> > + 8,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SGBRG8_1X8,
> > + DATA_TYPE_RAW_8BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> > + 8,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SGRBG8_1X8,
> > + DATA_TYPE_RAW_8BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> > + 8,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SRGGB8_1X8,
> > + DATA_TYPE_RAW_8BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_8_BIT,
> > + 8,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SBGGR10_1X10,
> > + DATA_TYPE_RAW_10BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> > + 10,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SGBRG10_1X10,
> > + DATA_TYPE_RAW_10BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> > + 10,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SGRBG10_1X10,
> > + DATA_TYPE_RAW_10BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> > + 10,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SRGGB10_1X10,
> > + DATA_TYPE_RAW_10BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> > + 10,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_Y10_1X10,
> > + DATA_TYPE_RAW_10BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_10_BIT,
> > + 10,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SBGGR12_1X12,
> > + DATA_TYPE_RAW_12BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> > + 12,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SGBRG12_1X12,
> > + DATA_TYPE_RAW_12BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> > + 12,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SGRBG12_1X12,
> > + DATA_TYPE_RAW_12BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> > + 12,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SRGGB12_1X12,
> > + DATA_TYPE_RAW_12BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_12_BIT,
> > + 12,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SBGGR14_1X14,
> > + DATA_TYPE_RAW_14BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> > + 14,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SGBRG14_1X14,
> > + DATA_TYPE_RAW_14BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> > + 14,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SGRBG14_1X14,
> > + DATA_TYPE_RAW_14BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> > + 14,
> > + 1,
> > + },
> > + {
> > + MEDIA_BUS_FMT_SRGGB14_1X14,
> > + DATA_TYPE_RAW_14BIT,
> > + DECODE_FORMAT_UNCOMPRESSED_14_BIT,
> > + 14,
> > + 1,
> > + },
> > +};
> > +
> > +static void csid_configure_stream(struct csid_device *csid, u8 enable)
> > +{
> > + struct csid_testgen_config *tg = &csid->testgen;
> > + u32 val;
> > + u32 phy_sel = 0;
> > + u8 lane_cnt = csid->phy.lane_cnt;
> > + struct v4l2_mbus_framefmt *input_format =
> > + &csid->fmt[MSM_CSID_PAD_SRC];
> > + const struct csid_format *format = csid_get_fmt_entry(
> > + csid->formats, csid->nformats, input_format->code);
> > + if (!lane_cnt)
> > + lane_cnt = 4;
> > +
> > + if (!tg->enabled)
> > + phy_sel = csid->phy.csiphy_id;
> > +
> > + if (enable) {
> > + u8 vc = 0; /* Virtual Channel 0 */
> > + u8 dt_id = vc * 4;
> > +
> > + if (tg->enabled) {
> > + /* Config Test Generator */
> > + vc = 0xa;
> > +
> > + /* configure one DT, infinite frames */
> > + val = vc << TPG_VC_CFG0_VC_NUM;
> > + val |= INTELEAVING_MODE_ONE_SHOT << TPG_VC_CFG0_LINE_INTERLEAVING_MODE;
> > + val |= 0 << TPG_VC_CFG0_NUM_FRAMES;
> > + writel_relaxed(val, csid->base + CSID_TPG_VC_CFG0);
> > +
> > + val = 0x740 << TPG_VC_CFG1_H_BLANKING_COUNT;
> > + val |= 0x3ff << TPG_VC_CFG1_V_BLANKING_COUNT;
> > + writel_relaxed(val, csid->base + CSID_TPG_VC_CFG1);
> > +
> > + writel_relaxed(0x12345678, csid->base + CSID_TPG_LFSR_SEED);
> > +
> > + val = input_format->height & 0x1fff << TPG_DT_n_CFG_0_FRAME_HEIGHT;
> > + val |= input_format->width & 0x1fff << TPG_DT_n_CFG_0_FRAME_WIDTH;
> > + writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_0(0));
> > +
> > + val = DATA_TYPE_RAW_10BIT << TPG_DT_n_CFG_1_DATA_TYPE;
> > + writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_1(0));
> > +
> > + val = tg->mode << TPG_DT_n_CFG_2_PAYLOAD_MODE;
> > + val |= 0xBE << TPG_DT_n_CFG_2_USER_SPECIFIED_PAYLOAD;
> > + val |= format->decode_format << TPG_DT_n_CFG_2_ENCODE_FORMAT;
> > + writel_relaxed(val, csid->base + CSID_TPG_DT_n_CFG_2(0));
> > +
> > + writel_relaxed(0, csid->base + CSID_TPG_COLOR_BARS_CFG);
> > +
> > + writel_relaxed(0, csid->base + CSID_TPG_COLOR_BOX_CFG);
> > + }
> > +
> > + val = 1 << RDI_CFG0_BYTE_CNTR_EN;
> > + val |= 1 << RDI_CFG0_FORMAT_MEASURE_EN;
> > + val |= 1 << RDI_CFG0_TIMESTAMP_EN;
> > + val |= DECODE_FORMAT_PAYLOAD_ONLY << RDI_CFG0_DECODE_FORMAT;
> > + val |= DATA_TYPE_RAW_10BIT << RDI_CFG0_DATA_TYPE;
> > + val |= vc << RDI_CFG0_VIRTUAL_CHANNEL;
> > + val |= dt_id << RDI_CFG0_DT_ID;
> > + writel_relaxed(val, csid->base + CSID_RDI_CFG0(0));
> > +
> > + /* CSID_TIMESTAMP_STB_POST_IRQ */
> > + val = 2 << RDI_CFG1_TIMESTAMP_STB_SEL;
> > + writel_relaxed(val, csid->base + CSID_RDI_CFG1(0));
> > +
> > + val = 1;
> > + writel_relaxed(val, csid->base + CSID_RDI_FRM_DROP_PERIOD(0));
> > +
> > + val = 0;
> > + writel_relaxed(0, csid->base + CSID_RDI_FRM_DROP_PATTERN(0));
> > +
> > + val = 1;
> > + writel_relaxed(val, csid->base + CSID_RDI_IRQ_SUBSAMPLE_PERIOD(0));
> > +
> > + val = 0;
> > + writel_relaxed(val, csid->base + CSID_RDI_IRQ_SUBSAMPLE_PATTERN(0));
> > +
> > + val = 1;
> > + writel_relaxed(val, csid->base + CSID_RDI_RPP_PIX_DROP_PERIOD(0));
> > +
> > + val = 0;
> > + writel_relaxed(val, csid->base + CSID_RDI_RPP_PIX_DROP_PATTERN(0));
> > +
> > + val = 1;
> > + writel_relaxed(val, csid->base + CSID_RDI_RPP_LINE_DROP_PERIOD(0));
> > +
> > + val = 0;
> > + writel_relaxed(val, csid->base + CSID_RDI_RPP_LINE_DROP_PATTERN(0));
> > +
> > + val = 0;
> > + writel_relaxed(val, csid->base + CSID_RDI_CTRL(0));
> > +
> > + val = readl_relaxed(csid->base + CSID_RDI_CFG0(0));
> > + val |= 1 << RDI_CFG0_ENABLE;
> > + writel_relaxed(val, csid->base + CSID_RDI_CFG0(0));
> > + }
> > +
> > + if (tg->enabled) {
> > + val = enable << TPG_CTRL_TEST_EN;
> > + val |= 1 << TPG_CTRL_FS_PKT_EN;
> > + val |= 1 << TPG_CTRL_FE_PKT_EN;
> > + val |= (lane_cnt - 1) << TPG_CTRL_NUM_ACTIVE_LANES;
> > + val |= 0x64 << TPG_CTRL_CYCLES_BETWEEN_PKTS;
> > + val |= 0xA << TPG_CTRL_NUM_TRAIL_BYTES;
> > + writel_relaxed(val, csid->base + CSID_TPG_CTRL);
> > + }
> > +
> > + val = (lane_cnt - 1) << CSI2_RX_CFG0_NUM_ACTIVE_LANES;
> > + val |= csid->phy.lane_assign << CSI2_RX_CFG0_DL0_INPUT_SEL;
> > + val |= phy_sel << CSI2_RX_CFG0_PHY_NUM_SEL;
> > + writel_relaxed(val, csid->base + CSID_CSI2_RX_CFG0);
> > +
> > +
> > + val = 1 << CSI2_RX_CFG1_PACKET_ECC_CORRECTION_EN;
> > + val |= 1 << CSI2_RX_CFG1_MISR_EN;
> > + writel_relaxed(val, csid->base + CSID_CSI2_RX_CFG1); // csi2_vc_mode_shift_val ?
> > +
> > + /* error irqs start at BIT(11) */
> > + writel_relaxed(~0u, csid->base + CSID_CSI2_RX_IRQ_MASK);
> > +
> > + /* RDI irq */
> > + writel_relaxed(~0u, csid->base + CSID_TOP_IRQ_MASK);
> > +
> > + val = 1 << RDI_CTRL_HALT_CMD;
> > + writel_relaxed(val, csid->base + CSID_RDI_CTRL(0));
> > +}
> > +
> > +static int csid_configure_testgen_pattern(struct csid_device *csid, s32 val)
>
> Here (val == 0) means "testgen disabled", and (val >= 1) selects the test
> pattern: (val == 1) corresponds to CSID_PAYLOAD_MODE_INCREMENTING etc.
>
> > +{
> > + s32 regval = val - 1;
>
> - now regval contains the zero-based test pattern mode number
>
> > + if (regval > 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_170)
>
> - by excluding regval of zero you made it impossible to select
> CSID_PAYLOAD_MODE_INCREMENTING, didn't you?
> It looks like the above line of code should be:
>
> if (regval >= 0 || regval <= CSID_PAYLOAD_MODE_MAX_SUPPORTED_170)
Yep, you're right. Let me fix that.
>
> With this sorted out,
>
> Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
>
> Thanks,
> Andrey
>
> > + csid->testgen.mode = regval;
> > +
> > + return 0;
> > +}
> > +
> > +/*
> > + * csid_hw_version - CSID hardware version query
> > + * @csid: CSID device
> > + *
> > + * Return HW version or error
> > + */
> > +static u32 csid_hw_version(struct csid_device *csid)
> > +{
> > + u32 hw_version;
> > + u32 hw_gen;
> > + u32 hw_rev;
> > + u32 hw_step;
> > +
> > + hw_version = readl_relaxed(csid->base + CSID_HW_VERSION);
> > + hw_gen = (hw_version >> HW_VERSION_GENERATION) & 0xF;
> > + hw_rev = (hw_version >> HW_VERSION_REVISION) & 0xFFF;
> > + hw_step = (hw_version >> HW_VERSION_STEPPING) & 0xFFFF;
> > + dev_dbg(csid->camss->dev, "CSID HW Version = %u.%u.%u\n",
> > + hw_gen, hw_rev, hw_step);
> > +
> > + return hw_version;
> > +}
> > +
> > +/*
> > + * csid_isr - CSID module interrupt service routine
> > + * @irq: Interrupt line
> > + * @dev: CSID device
> > + *
> > + * Return IRQ_HANDLED on success
> > + */
> > +static irqreturn_t csid_isr(int irq, void *dev)
> > +{
> > + struct csid_device *csid = dev;
> > + u32 val;
> > + u8 reset_done;
> > +
> > + val = readl_relaxed(csid->base + CSID_TOP_IRQ_STATUS);
> > + writel_relaxed(val, csid->base + CSID_TOP_IRQ_CLEAR);
> > + reset_done = val & BIT(TOP_IRQ_STATUS_RESET_DONE);
> > +
> > + val = readl_relaxed(csid->base + CSID_CSI2_RX_IRQ_STATUS);
> > + writel_relaxed(val, csid->base + CSID_CSI2_RX_IRQ_CLEAR);
> > +
> > + val = readl_relaxed(csid->base + CSID_CSI2_RDIN_IRQ_STATUS(0));
> > + writel_relaxed(val, csid->base + CSID_CSI2_RDIN_IRQ_CLEAR(0));
> > +
> > + val = 1 << IRQ_CMD_CLEAR;
> > + writel_relaxed(val, csid->base + CSID_IRQ_CMD);
> > +
> > + if (reset_done)
> > + complete(&csid->reset_complete);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > +/*
> > + * csid_reset - Trigger reset on CSID module and wait to complete
> > + * @csid: CSID device
> > + *
> > + * Return 0 on success or a negative error code otherwise
> > + */
> > +static int csid_reset(struct csid_device *csid)
> > +{
> > + unsigned long time;
> > + u32 val;
> > +
> > + reinit_completion(&csid->reset_complete);
> > +
> > + writel_relaxed(1, csid->base + CSID_TOP_IRQ_CLEAR);
> > + writel_relaxed(1, csid->base + CSID_IRQ_CMD);
> > + writel_relaxed(1, csid->base + CSID_TOP_IRQ_MASK);
> > + writel_relaxed(1, csid->base + CSID_IRQ_CMD);
> > +
> > + /* preserve registers */
> > + val = 0x1e << RST_STROBES;
> > + writel_relaxed(val, csid->base + CSID_RST_STROBES);
> > +
> > + time = wait_for_completion_timeout(&csid->reset_complete,
> > + msecs_to_jiffies(CSID_RESET_TIMEOUT_MS));
> > + if (!time) {
> > + dev_err(csid->camss->dev, "CSID reset timeout\n");
> > + return -EIO;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,
> > + unsigned int match_format_idx, u32 match_code)
> > +{
> > + switch (sink_code) {
> > + case MEDIA_BUS_FMT_SBGGR10_1X10:
> > + {
> > + u32 src_code[] = {
> > + MEDIA_BUS_FMT_SBGGR10_1X10,
> > + MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
> > + };
> > +
> > + return csid_find_code(src_code, ARRAY_SIZE(src_code),
> > + match_format_idx, match_code);
> > + }
> > + case MEDIA_BUS_FMT_Y10_1X10:
> > + {
> > + u32 src_code[] = {
> > + MEDIA_BUS_FMT_Y10_1X10,
> > + MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
> > + };
> > +
> > + return csid_find_code(src_code, ARRAY_SIZE(src_code),
> > + match_format_idx, match_code);
> > + }
> > + default:
> > + if (match_format_idx > 0)
> > + return 0;
> > +
> > + return sink_code;
> > + }
> > +}
> > +
> > +static void csid_subdev_init(struct csid_device *csid)
> > +{
> > + csid->formats = csid_formats;
> > + csid->nformats = ARRAY_SIZE(csid_formats);
> > + csid->testgen.modes = csid_testgen_modes;
> > + csid->testgen.nmodes = CSID_PAYLOAD_MODE_MAX_SUPPORTED_170;
> > +}
> > +
> > +const struct csid_hw_ops csid_ops_170 = {
> > + .configure_stream = csid_configure_stream,
> > + .configure_testgen_pattern = csid_configure_testgen_pattern,
> > + .hw_version = csid_hw_version,
> > + .isr = csid_isr,
> > + .reset = csid_reset,
> > + .src_pad_code = csid_src_pad_code,
> > + .subdev_init = csid_subdev_init,
> > +};
> > diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
> > index 601bd810f2b0..294a0a9e4dfa 100644
> > --- a/drivers/media/platform/qcom/camss/camss-csid.c
> > +++ b/drivers/media/platform/qcom/camss/camss-csid.c
> > @@ -123,6 +123,8 @@ static int csid_set_clock_rates(struct csid_device *csid)
> > dev_err(dev, "clk set rate failed: %d\n", ret);
> > return ret;
> > }
> > + } else if (clock->nfreqs) {
> > + clk_set_rate(clock->clk, clock->freq[0]);
> > }
> > }
> >
> > @@ -544,6 +546,8 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
> > } else if (camss->version == CAMSS_8x96 ||
> > camss->version == CAMSS_660) {
> > csid->ops = &csid_ops_4_7;
> > + } else if (camss->version == CAMSS_845) {
> > + csid->ops = &csid_ops_170;
> > } else {
> > return -EINVAL;
> > }
> > diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
> > index d40194e2bed3..49a6b5492403 100644
> > --- a/drivers/media/platform/qcom/camss/camss-csid.h
> > +++ b/drivers/media/platform/qcom/camss/camss-csid.h
> > @@ -245,5 +245,7 @@ void msm_csid_get_csid_id(struct media_entity *entity, u8 *id);
> >
> > extern const struct csid_hw_ops csid_ops_4_1;
> > extern const struct csid_hw_ops csid_ops_4_7;
> > +extern const struct csid_hw_ops csid_ops_170;
> > +
> >
> > #endif /* QC_MSM_CAMSS_CSID_H */
> > diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> > index c4991b1f22f8..9ddc30a73868 100644
> > --- a/drivers/media/platform/qcom/camss/camss-vfe-170.c
> > +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> > @@ -274,7 +274,6 @@ static void vfe_wm_start(struct vfe_device *vfe, u8 wm, struct vfe_line *line)
> > writel_relaxed(val, vfe->base + VFE_BUS_WM_PACKER_CFG(wm)); // XXX 1 for PLAIN8?
> >
> > /* Configure stride for RDIs */
> > - //val = pix->plane_fmt[0].bytesperline;
> > val = WM_STRIDE_DEFAULT_STRIDE;
> > writel_relaxed(val, vfe->base + VFE_BUS_WM_STRIDE(wm));
> >
> > diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> > index 0e006def1996..0b1693c34fbc 100644
> > --- a/drivers/media/platform/qcom/camss/camss.c
> > +++ b/drivers/media/platform/qcom/camss/camss.c
> > @@ -465,6 +465,68 @@ static const struct resources vfe_res_660[] = {
> > }
> > };
> >
> > +static const struct resources csid_res_845[] = {
> > + /* CSID0 */
> > + {
> > + .regulator = { "vdda-csi0" },
> > + .clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
> > + "soc_ahb", "vfe0", "vfe0_src",
> > + "vfe0_cphy_rx", "csi0",
> > + "csi0_src" },
> > + .clock_rate = { { 0 },
> > + { 384000000 },
> > + { 80000000 },
> > + { 0 },
> > + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> > + { 320000000 },
> > + { 0 },
> > + { 19200000, 75000000, 384000000, 538666667 },
> > + { 384000000 } },
> > + .reg = { "csid0" },
> > + .interrupt = { "csid0" }
> > + },
> > +
> > + /* CSID1 */
> > + {
> > + .regulator = { "vdda-csi1" },
> > + .clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
> > + "soc_ahb", "vfe1", "vfe1_src",
> > + "vfe1_cphy_rx", "csi1",
> > + "csi1_src" },
> > + .clock_rate = { { 0 },
> > + { 384000000 },
> > + { 80000000 },
> > + { 0 },
> > + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> > + { 320000000 },
> > + { 0 },
> > + { 19200000, 75000000, 384000000, 538666667 },
> > + { 384000000 } },
> > + .reg = { "csid1" },
> > + .interrupt = { "csid1" }
> > + },
> > +
> > + /* CSID2 */
> > + {
> > + .regulator = { "vdda-csi2" },
> > + .clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
> > + "soc_ahb", "vfe_lite", "vfe_lite_src",
> > + "vfe_lite_cphy_rx", "csi2",
> > + "csi2_src" },
> > + .clock_rate = { { 0 },
> > + { 384000000 },
> > + { 80000000 },
> > + { 0 },
> > + { 19200000, 100000000, 320000000, 404000000, 480000000, 600000000 },
> > + { 320000000 },
> > + { 0 },
> > + { 19200000, 75000000, 384000000, 538666667 },
> > + { 384000000 } },
> > + .reg = { "csid2" },
> > + .interrupt = { "csid2" }
> > + }
> > +};
> > +
> > static const struct resources vfe_res_845[] = {
> > /* VFE0 */
> > {
> >
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 11/22] media: camss: Add support for CSIPHY hardware version Titan 170
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (8 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 10/22] media: camss: Add support for CSID hardware version Titan 170 Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-21 18:17 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 12/22] media: camss: Remove per VFE power domain toggling Robert Foss
` (10 subsequent siblings)
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Add register definitions for version 170 of the Titan architecture
and implement support for the CSIPHY subdevice.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
Changes since v3
- Sakari: Make variable const
Changes since v4
- kernel test robot: Fix warning related to const
.../qcom/camss/camss-csiphy-3ph-1-0.c | 182 ++++++++++++++++--
.../media/platform/qcom/camss/camss-csiphy.c | 66 +++++--
drivers/media/platform/qcom/camss/camss.c | 74 +++++++
3 files changed, 290 insertions(+), 32 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
index 97cb9de85031..f350c0c92362 100644
--- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
@@ -47,6 +47,105 @@
#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_SHOW_REV_ID BIT(1)
#define CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(n) (0x8b0 + 0x4 * (n))
+#define CSIPHY_DEFAULT_PARAMS 0
+#define CSIPHY_LANE_ENABLE 1
+#define CSIPHY_SETTLE_CNT_LOWER_BYTE 2
+#define CSIPHY_SETTLE_CNT_HIGHER_BYTE 3
+#define CSIPHY_DNP_PARAMS 4
+#define CSIPHY_2PH_REGS 5
+#define CSIPHY_3PH_REGS 6
+
+struct csiphy_reg_t {
+ int32_t reg_addr;
+ int32_t reg_data;
+ int32_t delay;
+ uint32_t csiphy_param_type;
+};
+
+static const struct
+csiphy_reg_t lane_regs_sdm845[5][14] = {
+ {
+ {0x0004, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x002C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0034, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x001C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+ {0x003C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0000, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0008, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
+ {0x000c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+ {0x0010, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0060, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0064, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ },
+ {
+ {0x0704, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x072C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0734, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x071C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0714, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0728, 0x04, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x073C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0700, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0708, 0x14, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
+ {0x070C, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0710, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0760, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0764, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ },
+ {
+ {0x0204, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x022C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0234, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x021C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0214, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0228, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+ {0x023C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0200, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0208, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
+ {0x020C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+ {0x0210, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0260, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0264, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ },
+ {
+ {0x0404, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x042C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0434, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x041C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0414, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0428, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+ {0x043C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0400, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0408, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
+ {0x040C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+ {0x0410, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0460, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0464, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ },
+ {
+ {0x0604, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x062C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0634, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x061C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0614, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0628, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+ {0x063C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0600, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0608, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
+ {0x060C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
+ {0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0660, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
+ {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
+ },
+};
+
static void csiphy_hw_version_read(struct csiphy_device *csiphy,
struct device *dev)
{
@@ -135,26 +234,13 @@ static u8 csiphy_settle_cnt_calc(u32 pixel_clock, u8 bpp, u8 num_lanes,
return settle_cnt;
}
-static void csiphy_lanes_enable(struct csiphy_device *csiphy,
- struct csiphy_config *cfg,
- u32 pixel_clock, u8 bpp, u8 lane_mask)
+static void csiphy_gen1_config_lanes(struct csiphy_device *csiphy,
+ struct csiphy_config *cfg,
+ u8 settle_cnt)
{
struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;
- u8 settle_cnt;
- u8 val, l = 0;
- int i;
-
- settle_cnt = csiphy_settle_cnt_calc(pixel_clock, bpp, c->num_data,
- csiphy->timer_clk_rate);
-
- val = BIT(c->clk.pos);
- for (i = 0; i < c->num_data; i++)
- val |= BIT(c->data[i].pos * 2);
-
- writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(5));
-
- val = CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B;
- writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(6));
+ int i, l = 0;
+ u8 val;
for (i = 0; i <= c->num_data; i++) {
if (i == c->num_data)
@@ -208,6 +294,66 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,
val = CSIPHY_3PH_LNn_MISC1_IS_CLKLANE;
writel_relaxed(val, csiphy->base + CSIPHY_3PH_LNn_MISC1(l));
+}
+
+static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,
+ u8 settle_cnt)
+{
+ int i, l;
+ u32 val;
+
+ for (l = 0; l < 5; l++) {
+ for (i = 0; i < 14; i++) {
+ const struct csiphy_reg_t *r = &lane_regs_sdm845[l][i];
+
+ switch (r->csiphy_param_type) {
+ case CSIPHY_SETTLE_CNT_LOWER_BYTE:
+ val = settle_cnt & 0xff;
+ break;
+ case CSIPHY_DNP_PARAMS:
+ continue;
+ default:
+ val = r->reg_data;
+ break;
+ }
+ writel_relaxed(val, csiphy->base + r->reg_addr);
+ }
+ }
+}
+
+static void csiphy_lanes_enable(struct csiphy_device *csiphy,
+ struct csiphy_config *cfg,
+ u32 pixel_clock, u8 bpp, u8 lane_mask)
+{
+ struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;
+ u8 settle_cnt;
+ u8 val;
+ int i;
+
+ settle_cnt = csiphy_settle_cnt_calc(pixel_clock, bpp, c->num_data,
+ csiphy->timer_clk_rate);
+
+ val = BIT(c->clk.pos);
+ for (i = 0; i < c->num_data; i++)
+ val |= BIT(c->data[i].pos * 2);
+
+ val = 0xd5;
+ writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(5));
+
+ val = 1;
+ writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(6));
+
+ val = 0x02;
+ writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(7));
+
+ val = 0x00;
+ writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(0));
+
+ if (csiphy->camss->version == CAMSS_8x16 ||
+ csiphy->camss->version == CAMSS_8x96)
+ csiphy_gen1_config_lanes(csiphy, cfg, settle_cnt);
+ else if (csiphy->camss->version == CAMSS_845)
+ csiphy_gen2_config_lanes(csiphy, settle_cnt);
val = 0xff;
writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(11));
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index 509c9a59c09c..e3fdc268050c 100644
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -73,6 +73,30 @@ static const struct csiphy_format csiphy_formats_8x96[] = {
{ MEDIA_BUS_FMT_Y10_1X10, 10 },
};
+static const struct csiphy_format csiphy_formats_sdm845[] = {
+ { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
+ { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
+ { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
+ { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
+ { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
+ { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
+ { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
+ { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
+ { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
+ { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
+ { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
+ { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
+ { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
+ { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
+ { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
+ { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
+ { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
+ { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
+ { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
+ { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
+ { MEDIA_BUS_FMT_Y10_1X10, 10 },
+};
+
/*
* csiphy_get_bpp - map media bus format to bits per pixel
* @formats: supported media bus formats array
@@ -257,16 +281,20 @@ static int csiphy_stream_on(struct csiphy_device *csiphy)
return -EINVAL;
}
- val = readl_relaxed(csiphy->base_clk_mux);
- if (cfg->combo_mode && (lane_mask & 0x18) == 0x18) {
- val &= ~0xf0;
- val |= cfg->csid_id << 4;
- } else {
- val &= ~0xf;
- val |= cfg->csid_id;
+ if (csiphy->base_clk_mux) {
+ val = readl_relaxed(csiphy->base_clk_mux);
+ if (cfg->combo_mode && (lane_mask & 0x18) == 0x18) {
+ val &= ~0xf0;
+ val |= cfg->csid_id << 4;
+ } else {
+ val &= ~0xf;
+ val |= cfg->csid_id;
+ }
+ writel_relaxed(val, csiphy->base_clk_mux);
+
+ /* Enforce reg write ordering between clk mux & lane enabling */
+ wmb();
}
- writel_relaxed(val, csiphy->base_clk_mux);
- wmb();
csiphy->ops->lanes_enable(csiphy, cfg, pixel_clock, bpp, lane_mask);
@@ -557,6 +585,10 @@ int msm_csiphy_subdev_init(struct camss *camss,
csiphy->ops = &csiphy_ops_3ph_1_0;
csiphy->formats = csiphy_formats_8x96;
csiphy->nformats = ARRAY_SIZE(csiphy_formats_8x96);
+ } else if (camss->version == CAMSS_845) {
+ csiphy->ops = &csiphy_ops_3ph_1_0;
+ csiphy->formats = csiphy_formats_sdm845;
+ csiphy->nformats = ARRAY_SIZE(csiphy_formats_sdm845);
} else {
return -EINVAL;
}
@@ -570,11 +602,17 @@ int msm_csiphy_subdev_init(struct camss *camss,
return PTR_ERR(csiphy->base);
}
- r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[1]);
- csiphy->base_clk_mux = devm_ioremap_resource(dev, r);
- if (IS_ERR(csiphy->base_clk_mux)) {
- dev_err(dev, "could not map memory\n");
- return PTR_ERR(csiphy->base_clk_mux);
+ if (camss->version == CAMSS_8x16 ||
+ camss->version == CAMSS_8x96) {
+ r = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+ res->reg[1]);
+ csiphy->base_clk_mux = devm_ioremap_resource(dev, r);
+ if (IS_ERR(csiphy->base_clk_mux)) {
+ dev_err(dev, "could not map memory\n");
+ return PTR_ERR(csiphy->base_clk_mux);
+ }
+ } else {
+ csiphy->base_clk_mux = NULL;
}
/* Interrupt */
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index 0b1693c34fbc..5d0479b5589c 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -465,6 +465,80 @@ static const struct resources vfe_res_660[] = {
}
};
+static const struct resources csiphy_res_845[] = {
+ /* CSIPHY0 */
+ {
+ .regulator = { NULL },
+ .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
+ "cpas_ahb", "cphy_rx_src", "csiphy0",
+ "csiphy0_timer_src", "csiphy0_timer" },
+ .clock_rate = { { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 19200000, 240000000, 269333333 } },
+ .reg = { "csiphy0" },
+ .interrupt = { "csiphy0" }
+ },
+
+ /* CSIPHY1 */
+ {
+ .regulator = { NULL },
+ .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
+ "cpas_ahb", "cphy_rx_src", "csiphy1",
+ "csiphy1_timer_src", "csiphy1_timer" },
+ .clock_rate = { { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 19200000, 240000000, 269333333 } },
+ .reg = { "csiphy1" },
+ .interrupt = { "csiphy1" }
+ },
+
+ /* CSIPHY2 */
+ {
+ .regulator = { NULL },
+ .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
+ "cpas_ahb", "cphy_rx_src", "csiphy2",
+ "csiphy2_timer_src", "csiphy2_timer" },
+ .clock_rate = { { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 19200000, 240000000, 269333333 } },
+ .reg = { "csiphy2" },
+ .interrupt = { "csiphy2" }
+ },
+
+ /* CSIPHY3 */
+ {
+ .regulator = { NULL },
+ .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
+ "cpas_ahb", "cphy_rx_src", "csiphy3",
+ "csiphy3_timer_src", "csiphy3_timer" },
+ .clock_rate = { { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 0 },
+ { 19200000, 240000000, 269333333 } },
+ .reg = { "csiphy3" },
+ .interrupt = { "csiphy3" }
+ }
+};
+
static const struct resources csid_res_845[] = {
/* CSID0 */
{
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 11/22] media: camss: Add support for CSIPHY hardware version Titan 170
2021-02-17 11:21 ` [PATCH v5 11/22] media: camss: Add support for CSIPHY " Robert Foss
@ 2021-02-21 18:17 ` Andrey Konovalov
2021-02-23 9:36 ` Robert Foss
0 siblings, 1 reply; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-21 18:17 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
On 17.02.2021 14:21, Robert Foss wrote:
> Add register definitions for version 170 of the Titan architecture
> and implement support for the CSIPHY subdevice.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
>
> Changes since v3
> - Sakari: Make variable const
>
> Changes since v4
> - kernel test robot: Fix warning related to const
>
>
> .../qcom/camss/camss-csiphy-3ph-1-0.c | 182 ++++++++++++++++--
> .../media/platform/qcom/camss/camss-csiphy.c | 66 +++++--
> drivers/media/platform/qcom/camss/camss.c | 74 +++++++
> 3 files changed, 290 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> index 97cb9de85031..f350c0c92362 100644
> --- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> +++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> @@ -47,6 +47,105 @@
> #define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_SHOW_REV_ID BIT(1)
> #define CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(n) (0x8b0 + 0x4 * (n))
>
> +#define CSIPHY_DEFAULT_PARAMS 0
> +#define CSIPHY_LANE_ENABLE 1
> +#define CSIPHY_SETTLE_CNT_LOWER_BYTE 2
> +#define CSIPHY_SETTLE_CNT_HIGHER_BYTE 3
> +#define CSIPHY_DNP_PARAMS 4
> +#define CSIPHY_2PH_REGS 5
> +#define CSIPHY_3PH_REGS 6
> +
> +struct csiphy_reg_t {
> + int32_t reg_addr;
> + int32_t reg_data;
> + int32_t delay;
> + uint32_t csiphy_param_type;
> +};
> +
> +static const struct
> +csiphy_reg_t lane_regs_sdm845[5][14] = {
> + {
> + {0x0004, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x002C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0034, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x001C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x003C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0000, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0008, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> + {0x000c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0010, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0060, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0064, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + },
> + {
> + {0x0704, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x072C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0734, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x071C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0714, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0728, 0x04, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x073C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0700, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0708, 0x14, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> + {0x070C, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0710, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0760, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0764, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + },
> + {
> + {0x0204, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x022C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0234, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x021C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0214, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0228, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x023C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0200, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0208, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> + {0x020C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0210, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0260, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0264, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + },
> + {
> + {0x0404, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x042C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0434, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x041C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0414, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0428, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x043C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0400, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0408, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> + {0x040C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0410, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0460, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0464, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + },
> + {
> + {0x0604, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x062C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0634, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x061C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0614, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0628, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x063C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0600, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0608, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> + {0x060C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> + {0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0660, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> + {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
> + },
> +};
> +
> static void csiphy_hw_version_read(struct csiphy_device *csiphy,
> struct device *dev)
> {
> @@ -135,26 +234,13 @@ static u8 csiphy_settle_cnt_calc(u32 pixel_clock, u8 bpp, u8 num_lanes,
> return settle_cnt;
> }
>
> -static void csiphy_lanes_enable(struct csiphy_device *csiphy,
> - struct csiphy_config *cfg,
> - u32 pixel_clock, u8 bpp, u8 lane_mask)
> +static void csiphy_gen1_config_lanes(struct csiphy_device *csiphy,
> + struct csiphy_config *cfg,
> + u8 settle_cnt)
> {
> struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;
> - u8 settle_cnt;
> - u8 val, l = 0;
> - int i;
> -
> - settle_cnt = csiphy_settle_cnt_calc(pixel_clock, bpp, c->num_data,
> - csiphy->timer_clk_rate);
> -
> - val = BIT(c->clk.pos);
> - for (i = 0; i < c->num_data; i++)
> - val |= BIT(c->data[i].pos * 2);
> -
> - writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(5));
> -
> - val = CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B;
> - writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(6));
> + int i, l = 0;
> + u8 val;
>
> for (i = 0; i <= c->num_data; i++) {
> if (i == c->num_data)
> @@ -208,6 +294,66 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,
>
> val = CSIPHY_3PH_LNn_MISC1_IS_CLKLANE;
> writel_relaxed(val, csiphy->base + CSIPHY_3PH_LNn_MISC1(l));
> +}
> +
> +static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,
> + u8 settle_cnt)
> +{
> + int i, l;
> + u32 val;
> +
> + for (l = 0; l < 5; l++) {
> + for (i = 0; i < 14; i++) {
> + const struct csiphy_reg_t *r = &lane_regs_sdm845[l][i];
> +
> + switch (r->csiphy_param_type) {
> + case CSIPHY_SETTLE_CNT_LOWER_BYTE:
> + val = settle_cnt & 0xff;
> + break;
> + case CSIPHY_DNP_PARAMS:
> + continue;
> + default:
> + val = r->reg_data;
> + break;
> + }
> + writel_relaxed(val, csiphy->base + r->reg_addr);
> + }
> + }
> +}
> +
> +static void csiphy_lanes_enable(struct csiphy_device *csiphy,
> + struct csiphy_config *cfg,
> + u32 pixel_clock, u8 bpp, u8 lane_mask)
> +{
> + struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;
> + u8 settle_cnt;
> + u8 val;
> + int i;
> +
> + settle_cnt = csiphy_settle_cnt_calc(pixel_clock, bpp, c->num_data,
> + csiphy->timer_clk_rate);
> +
> + val = BIT(c->clk.pos);
> + for (i = 0; i < c->num_data; i++)
> + val |= BIT(c->data[i].pos * 2);
- before your patch this "val" was written to the CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(5)
register.
In your patch you are overwriting it with the below hardcoded number:
> +
> + val = 0xd5;
- why?
Thanks,
Andrey
> + writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(5));
> +
> + val = 1;
> + writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(6));
> +
> + val = 0x02;
> + writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(7));
> +
> + val = 0x00;
> + writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(0));
> +
> + if (csiphy->camss->version == CAMSS_8x16 ||
> + csiphy->camss->version == CAMSS_8x96)
> + csiphy_gen1_config_lanes(csiphy, cfg, settle_cnt);
> + else if (csiphy->camss->version == CAMSS_845)
> + csiphy_gen2_config_lanes(csiphy, settle_cnt);
>
> val = 0xff;
> writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(11));
> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
> index 509c9a59c09c..e3fdc268050c 100644
> --- a/drivers/media/platform/qcom/camss/camss-csiphy.c
> +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
> @@ -73,6 +73,30 @@ static const struct csiphy_format csiphy_formats_8x96[] = {
> { MEDIA_BUS_FMT_Y10_1X10, 10 },
> };
>
> +static const struct csiphy_format csiphy_formats_sdm845[] = {
> + { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
> + { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
> + { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
> + { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
> + { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
> + { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
> + { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
> + { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
> + { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
> + { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
> + { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
> + { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
> + { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
> + { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
> + { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
> + { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
> + { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
> + { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
> + { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
> + { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
> + { MEDIA_BUS_FMT_Y10_1X10, 10 },
> +};
> +
> /*
> * csiphy_get_bpp - map media bus format to bits per pixel
> * @formats: supported media bus formats array
> @@ -257,16 +281,20 @@ static int csiphy_stream_on(struct csiphy_device *csiphy)
> return -EINVAL;
> }
>
> - val = readl_relaxed(csiphy->base_clk_mux);
> - if (cfg->combo_mode && (lane_mask & 0x18) == 0x18) {
> - val &= ~0xf0;
> - val |= cfg->csid_id << 4;
> - } else {
> - val &= ~0xf;
> - val |= cfg->csid_id;
> + if (csiphy->base_clk_mux) {
> + val = readl_relaxed(csiphy->base_clk_mux);
> + if (cfg->combo_mode && (lane_mask & 0x18) == 0x18) {
> + val &= ~0xf0;
> + val |= cfg->csid_id << 4;
> + } else {
> + val &= ~0xf;
> + val |= cfg->csid_id;
> + }
> + writel_relaxed(val, csiphy->base_clk_mux);
> +
> + /* Enforce reg write ordering between clk mux & lane enabling */
> + wmb();
> }
> - writel_relaxed(val, csiphy->base_clk_mux);
> - wmb();
>
> csiphy->ops->lanes_enable(csiphy, cfg, pixel_clock, bpp, lane_mask);
>
> @@ -557,6 +585,10 @@ int msm_csiphy_subdev_init(struct camss *camss,
> csiphy->ops = &csiphy_ops_3ph_1_0;
> csiphy->formats = csiphy_formats_8x96;
> csiphy->nformats = ARRAY_SIZE(csiphy_formats_8x96);
> + } else if (camss->version == CAMSS_845) {
> + csiphy->ops = &csiphy_ops_3ph_1_0;
> + csiphy->formats = csiphy_formats_sdm845;
> + csiphy->nformats = ARRAY_SIZE(csiphy_formats_sdm845);
> } else {
> return -EINVAL;
> }
> @@ -570,11 +602,17 @@ int msm_csiphy_subdev_init(struct camss *camss,
> return PTR_ERR(csiphy->base);
> }
>
> - r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[1]);
> - csiphy->base_clk_mux = devm_ioremap_resource(dev, r);
> - if (IS_ERR(csiphy->base_clk_mux)) {
> - dev_err(dev, "could not map memory\n");
> - return PTR_ERR(csiphy->base_clk_mux);
> + if (camss->version == CAMSS_8x16 ||
> + camss->version == CAMSS_8x96) {
> + r = platform_get_resource_byname(pdev, IORESOURCE_MEM,
> + res->reg[1]);
> + csiphy->base_clk_mux = devm_ioremap_resource(dev, r);
> + if (IS_ERR(csiphy->base_clk_mux)) {
> + dev_err(dev, "could not map memory\n");
> + return PTR_ERR(csiphy->base_clk_mux);
> + }
> + } else {
> + csiphy->base_clk_mux = NULL;
> }
>
> /* Interrupt */
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 0b1693c34fbc..5d0479b5589c 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -465,6 +465,80 @@ static const struct resources vfe_res_660[] = {
> }
> };
>
> +static const struct resources csiphy_res_845[] = {
> + /* CSIPHY0 */
> + {
> + .regulator = { NULL },
> + .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
> + "cpas_ahb", "cphy_rx_src", "csiphy0",
> + "csiphy0_timer_src", "csiphy0_timer" },
> + .clock_rate = { { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 19200000, 240000000, 269333333 } },
> + .reg = { "csiphy0" },
> + .interrupt = { "csiphy0" }
> + },
> +
> + /* CSIPHY1 */
> + {
> + .regulator = { NULL },
> + .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
> + "cpas_ahb", "cphy_rx_src", "csiphy1",
> + "csiphy1_timer_src", "csiphy1_timer" },
> + .clock_rate = { { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 19200000, 240000000, 269333333 } },
> + .reg = { "csiphy1" },
> + .interrupt = { "csiphy1" }
> + },
> +
> + /* CSIPHY2 */
> + {
> + .regulator = { NULL },
> + .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
> + "cpas_ahb", "cphy_rx_src", "csiphy2",
> + "csiphy2_timer_src", "csiphy2_timer" },
> + .clock_rate = { { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 19200000, 240000000, 269333333 } },
> + .reg = { "csiphy2" },
> + .interrupt = { "csiphy2" }
> + },
> +
> + /* CSIPHY3 */
> + {
> + .regulator = { NULL },
> + .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
> + "cpas_ahb", "cphy_rx_src", "csiphy3",
> + "csiphy3_timer_src", "csiphy3_timer" },
> + .clock_rate = { { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 0 },
> + { 19200000, 240000000, 269333333 } },
> + .reg = { "csiphy3" },
> + .interrupt = { "csiphy3" }
> + }
> +};
> +
> static const struct resources csid_res_845[] = {
> /* CSID0 */
> {
>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 11/22] media: camss: Add support for CSIPHY hardware version Titan 170
2021-02-21 18:17 ` Andrey Konovalov
@ 2021-02-23 9:36 ` Robert Foss
0 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-23 9:36 UTC (permalink / raw)
To: Andrey Konovalov
Cc: Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab,
Rob Herring, angelogioacchino.delregno, MSM, linux-media,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, AngeloGioacchino Del Regno, Sakari Ailus,
Nicolas Boichat, Rob Herring, Tomasz Figa,
Azam Sadiq Pasha Kapatrala Syed, Sarvesh Sridutt,
Laurent Pinchart, Jonathan Marek
On Sun, 21 Feb 2021 at 19:17, Andrey Konovalov
<andrey.konovalov@linaro.org> wrote:
>
> Hi Robert,
>
> Thank you for your patch!
>
> On 17.02.2021 14:21, Robert Foss wrote:
> > Add register definitions for version 170 of the Titan architecture
> > and implement support for the CSIPHY subdevice.
> >
> > Signed-off-by: Robert Foss <robert.foss@linaro.org>
> > ---
> >
> > Changes since v3
> > - Sakari: Make variable const
> >
> > Changes since v4
> > - kernel test robot: Fix warning related to const
> >
> >
> > .../qcom/camss/camss-csiphy-3ph-1-0.c | 182 ++++++++++++++++--
> > .../media/platform/qcom/camss/camss-csiphy.c | 66 +++++--
> > drivers/media/platform/qcom/camss/camss.c | 74 +++++++
> > 3 files changed, 290 insertions(+), 32 deletions(-)
> >
> > diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> > index 97cb9de85031..f350c0c92362 100644
> > --- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> > +++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> > @@ -47,6 +47,105 @@
> > #define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_SHOW_REV_ID BIT(1)
> > #define CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(n) (0x8b0 + 0x4 * (n))
> >
> > +#define CSIPHY_DEFAULT_PARAMS 0
> > +#define CSIPHY_LANE_ENABLE 1
> > +#define CSIPHY_SETTLE_CNT_LOWER_BYTE 2
> > +#define CSIPHY_SETTLE_CNT_HIGHER_BYTE 3
> > +#define CSIPHY_DNP_PARAMS 4
> > +#define CSIPHY_2PH_REGS 5
> > +#define CSIPHY_3PH_REGS 6
> > +
> > +struct csiphy_reg_t {
> > + int32_t reg_addr;
> > + int32_t reg_data;
> > + int32_t delay;
> > + uint32_t csiphy_param_type;
> > +};
> > +
> > +static const struct
> > +csiphy_reg_t lane_regs_sdm845[5][14] = {
> > + {
> > + {0x0004, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x002C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0034, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x001C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> > + {0x003C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0000, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0008, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> > + {0x000c, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> > + {0x0010, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0060, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0064, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + },
> > + {
> > + {0x0704, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x072C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0734, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x071C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0714, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0728, 0x04, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x073C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0700, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0708, 0x14, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> > + {0x070C, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0710, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0760, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0764, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + },
> > + {
> > + {0x0204, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x022C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0234, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x021C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0214, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0228, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> > + {0x023C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0200, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0208, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> > + {0x020C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> > + {0x0210, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0260, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0264, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + },
> > + {
> > + {0x0404, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x042C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0434, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x041C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0414, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0428, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> > + {0x043C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0400, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0408, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> > + {0x040C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> > + {0x0410, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0460, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0464, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + },
> > + {
> > + {0x0604, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x062C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0634, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x061C, 0x0A, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0614, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0628, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> > + {0x063C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0600, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0608, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
> > + {0x060C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
> > + {0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0660, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},
> > + },
> > +};
> > +
> > static void csiphy_hw_version_read(struct csiphy_device *csiphy,
> > struct device *dev)
> > {
> > @@ -135,26 +234,13 @@ static u8 csiphy_settle_cnt_calc(u32 pixel_clock, u8 bpp, u8 num_lanes,
> > return settle_cnt;
> > }
> >
> > -static void csiphy_lanes_enable(struct csiphy_device *csiphy,
> > - struct csiphy_config *cfg,
> > - u32 pixel_clock, u8 bpp, u8 lane_mask)
> > +static void csiphy_gen1_config_lanes(struct csiphy_device *csiphy,
> > + struct csiphy_config *cfg,
> > + u8 settle_cnt)
> > {
> > struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;
> > - u8 settle_cnt;
> > - u8 val, l = 0;
> > - int i;
> > -
> > - settle_cnt = csiphy_settle_cnt_calc(pixel_clock, bpp, c->num_data,
> > - csiphy->timer_clk_rate);
> > -
> > - val = BIT(c->clk.pos);
> > - for (i = 0; i < c->num_data; i++)
> > - val |= BIT(c->data[i].pos * 2);
> > -
> > - writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(5));
> > -
> > - val = CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B;
> > - writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(6));
> > + int i, l = 0;
> > + u8 val;
> >
> > for (i = 0; i <= c->num_data; i++) {
> > if (i == c->num_data)
> > @@ -208,6 +294,66 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,
> >
> > val = CSIPHY_3PH_LNn_MISC1_IS_CLKLANE;
> > writel_relaxed(val, csiphy->base + CSIPHY_3PH_LNn_MISC1(l));
> > +}
> > +
> > +static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,
> > + u8 settle_cnt)
> > +{
> > + int i, l;
> > + u32 val;
> > +
> > + for (l = 0; l < 5; l++) {
> > + for (i = 0; i < 14; i++) {
> > + const struct csiphy_reg_t *r = &lane_regs_sdm845[l][i];
> > +
> > + switch (r->csiphy_param_type) {
> > + case CSIPHY_SETTLE_CNT_LOWER_BYTE:
> > + val = settle_cnt & 0xff;
> > + break;
> > + case CSIPHY_DNP_PARAMS:
> > + continue;
> > + default:
> > + val = r->reg_data;
> > + break;
> > + }
> > + writel_relaxed(val, csiphy->base + r->reg_addr);
> > + }
> > + }
> > +}
> > +
> > +static void csiphy_lanes_enable(struct csiphy_device *csiphy,
> > + struct csiphy_config *cfg,
> > + u32 pixel_clock, u8 bpp, u8 lane_mask)
> > +{
> > + struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;
> > + u8 settle_cnt;
> > + u8 val;
> > + int i;
> > +
> > + settle_cnt = csiphy_settle_cnt_calc(pixel_clock, bpp, c->num_data,
> > + csiphy->timer_clk_rate);
> > +
> > + val = BIT(c->clk.pos);
> > + for (i = 0; i < c->num_data; i++)
> > + val |= BIT(c->data[i].pos * 2);
>
> - before your patch this "val" was written to the CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(5)
> register.
> In your patch you are overwriting it with the below hardcoded number:
>
> > +
> > + val = 0xd5;
>
> - why?
I think this is a mistake, and the computed value should be used. Let
me verify that it works as intended with the computed value.
>
> Thanks,
> Andrey
>
> > + writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(5));
> > +
> > + val = 1;
> > + writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(6));
> > +
> > + val = 0x02;
> > + writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(7));
> > +
> > + val = 0x00;
> > + writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(0));
> > +
> > + if (csiphy->camss->version == CAMSS_8x16 ||
> > + csiphy->camss->version == CAMSS_8x96)
> > + csiphy_gen1_config_lanes(csiphy, cfg, settle_cnt);
> > + else if (csiphy->camss->version == CAMSS_845)
> > + csiphy_gen2_config_lanes(csiphy, settle_cnt);
> >
> > val = 0xff;
> > writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(11));
> > diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
> > index 509c9a59c09c..e3fdc268050c 100644
> > --- a/drivers/media/platform/qcom/camss/camss-csiphy.c
> > +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
> > @@ -73,6 +73,30 @@ static const struct csiphy_format csiphy_formats_8x96[] = {
> > { MEDIA_BUS_FMT_Y10_1X10, 10 },
> > };
> >
> > +static const struct csiphy_format csiphy_formats_sdm845[] = {
> > + { MEDIA_BUS_FMT_UYVY8_2X8, 8 },
> > + { MEDIA_BUS_FMT_VYUY8_2X8, 8 },
> > + { MEDIA_BUS_FMT_YUYV8_2X8, 8 },
> > + { MEDIA_BUS_FMT_YVYU8_2X8, 8 },
> > + { MEDIA_BUS_FMT_SBGGR8_1X8, 8 },
> > + { MEDIA_BUS_FMT_SGBRG8_1X8, 8 },
> > + { MEDIA_BUS_FMT_SGRBG8_1X8, 8 },
> > + { MEDIA_BUS_FMT_SRGGB8_1X8, 8 },
> > + { MEDIA_BUS_FMT_SBGGR10_1X10, 10 },
> > + { MEDIA_BUS_FMT_SGBRG10_1X10, 10 },
> > + { MEDIA_BUS_FMT_SGRBG10_1X10, 10 },
> > + { MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
> > + { MEDIA_BUS_FMT_SBGGR12_1X12, 12 },
> > + { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
> > + { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
> > + { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
> > + { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
> > + { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
> > + { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
> > + { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
> > + { MEDIA_BUS_FMT_Y10_1X10, 10 },
> > +};
> > +
> > /*
> > * csiphy_get_bpp - map media bus format to bits per pixel
> > * @formats: supported media bus formats array
> > @@ -257,16 +281,20 @@ static int csiphy_stream_on(struct csiphy_device *csiphy)
> > return -EINVAL;
> > }
> >
> > - val = readl_relaxed(csiphy->base_clk_mux);
> > - if (cfg->combo_mode && (lane_mask & 0x18) == 0x18) {
> > - val &= ~0xf0;
> > - val |= cfg->csid_id << 4;
> > - } else {
> > - val &= ~0xf;
> > - val |= cfg->csid_id;
> > + if (csiphy->base_clk_mux) {
> > + val = readl_relaxed(csiphy->base_clk_mux);
> > + if (cfg->combo_mode && (lane_mask & 0x18) == 0x18) {
> > + val &= ~0xf0;
> > + val |= cfg->csid_id << 4;
> > + } else {
> > + val &= ~0xf;
> > + val |= cfg->csid_id;
> > + }
> > + writel_relaxed(val, csiphy->base_clk_mux);
> > +
> > + /* Enforce reg write ordering between clk mux & lane enabling */
> > + wmb();
> > }
> > - writel_relaxed(val, csiphy->base_clk_mux);
> > - wmb();
> >
> > csiphy->ops->lanes_enable(csiphy, cfg, pixel_clock, bpp, lane_mask);
> >
> > @@ -557,6 +585,10 @@ int msm_csiphy_subdev_init(struct camss *camss,
> > csiphy->ops = &csiphy_ops_3ph_1_0;
> > csiphy->formats = csiphy_formats_8x96;
> > csiphy->nformats = ARRAY_SIZE(csiphy_formats_8x96);
> > + } else if (camss->version == CAMSS_845) {
> > + csiphy->ops = &csiphy_ops_3ph_1_0;
> > + csiphy->formats = csiphy_formats_sdm845;
> > + csiphy->nformats = ARRAY_SIZE(csiphy_formats_sdm845);
> > } else {
> > return -EINVAL;
> > }
> > @@ -570,11 +602,17 @@ int msm_csiphy_subdev_init(struct camss *camss,
> > return PTR_ERR(csiphy->base);
> > }
> >
> > - r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[1]);
> > - csiphy->base_clk_mux = devm_ioremap_resource(dev, r);
> > - if (IS_ERR(csiphy->base_clk_mux)) {
> > - dev_err(dev, "could not map memory\n");
> > - return PTR_ERR(csiphy->base_clk_mux);
> > + if (camss->version == CAMSS_8x16 ||
> > + camss->version == CAMSS_8x96) {
> > + r = platform_get_resource_byname(pdev, IORESOURCE_MEM,
> > + res->reg[1]);
> > + csiphy->base_clk_mux = devm_ioremap_resource(dev, r);
> > + if (IS_ERR(csiphy->base_clk_mux)) {
> > + dev_err(dev, "could not map memory\n");
> > + return PTR_ERR(csiphy->base_clk_mux);
> > + }
> > + } else {
> > + csiphy->base_clk_mux = NULL;
> > }
> >
> > /* Interrupt */
> > diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> > index 0b1693c34fbc..5d0479b5589c 100644
> > --- a/drivers/media/platform/qcom/camss/camss.c
> > +++ b/drivers/media/platform/qcom/camss/camss.c
> > @@ -465,6 +465,80 @@ static const struct resources vfe_res_660[] = {
> > }
> > };
> >
> > +static const struct resources csiphy_res_845[] = {
> > + /* CSIPHY0 */
> > + {
> > + .regulator = { NULL },
> > + .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
> > + "cpas_ahb", "cphy_rx_src", "csiphy0",
> > + "csiphy0_timer_src", "csiphy0_timer" },
> > + .clock_rate = { { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 19200000, 240000000, 269333333 } },
> > + .reg = { "csiphy0" },
> > + .interrupt = { "csiphy0" }
> > + },
> > +
> > + /* CSIPHY1 */
> > + {
> > + .regulator = { NULL },
> > + .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
> > + "cpas_ahb", "cphy_rx_src", "csiphy1",
> > + "csiphy1_timer_src", "csiphy1_timer" },
> > + .clock_rate = { { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 19200000, 240000000, 269333333 } },
> > + .reg = { "csiphy1" },
> > + .interrupt = { "csiphy1" }
> > + },
> > +
> > + /* CSIPHY2 */
> > + {
> > + .regulator = { NULL },
> > + .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
> > + "cpas_ahb", "cphy_rx_src", "csiphy2",
> > + "csiphy2_timer_src", "csiphy2_timer" },
> > + .clock_rate = { { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 19200000, 240000000, 269333333 } },
> > + .reg = { "csiphy2" },
> > + .interrupt = { "csiphy2" }
> > + },
> > +
> > + /* CSIPHY3 */
> > + {
> > + .regulator = { NULL },
> > + .clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
> > + "cpas_ahb", "cphy_rx_src", "csiphy3",
> > + "csiphy3_timer_src", "csiphy3_timer" },
> > + .clock_rate = { { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 0 },
> > + { 19200000, 240000000, 269333333 } },
> > + .reg = { "csiphy3" },
> > + .interrupt = { "csiphy3" }
> > + }
> > +};
> > +
> > static const struct resources csid_res_845[] = {
> > /* CSID0 */
> > {
> >
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 12/22] media: camss: Remove per VFE power domain toggling
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (9 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 11/22] media: camss: Add support for CSIPHY " Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-22 11:44 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 13/22] media: camss: Enable SDM845 Robert Foss
` (9 subsequent siblings)
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
For Titan ISPs clocks fail to re-enable during vfe_get()
after any vfe has been halted and its corresponding power
domain power has been detached.
Since all of the clocks depend on all of the PDs, per
VFE PD detaching is no option for this generation of HW.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
.../media/platform/qcom/camss/camss-ispif.c | 11 ---
drivers/media/platform/qcom/camss/camss-vfe.c | 7 --
drivers/media/platform/qcom/camss/camss.c | 94 +++++++++++--------
drivers/media/platform/qcom/camss/camss.h | 12 +--
4 files changed, 60 insertions(+), 64 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
index fc121da4ab0c..b88f4025010a 100644
--- a/drivers/media/platform/qcom/camss/camss-ispif.c
+++ b/drivers/media/platform/qcom/camss/camss-ispif.c
@@ -323,14 +323,6 @@ static int ispif_reset(struct ispif_device *ispif, u8 vfe_id)
struct camss *camss = ispif->camss;
int ret;
- ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE0);
- if (ret < 0)
- return ret;
-
- ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE1);
- if (ret < 0)
- return ret;
-
ret = camss_enable_clocks(ispif->nclocks_for_reset,
ispif->clock_for_reset,
camss->dev);
@@ -343,9 +335,6 @@ static int ispif_reset(struct ispif_device *ispif, u8 vfe_id)
camss_disable_clocks(ispif->nclocks_for_reset, ispif->clock_for_reset);
- camss_pm_domain_off(camss, PM_DOMAIN_VFE0);
- camss_pm_domain_off(camss, PM_DOMAIN_VFE1);
-
return ret;
}
diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index 6fafeb8a5484..ed35f9ae9067 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -580,10 +580,6 @@ static int vfe_get(struct vfe_device *vfe)
mutex_lock(&vfe->power_lock);
if (vfe->power_count == 0) {
- ret = camss_pm_domain_on(vfe->camss, vfe->id);
- if (ret < 0)
- goto error_pm_domain;
-
ret = pm_runtime_get_sync(vfe->camss->dev);
if (ret < 0)
goto error_pm_runtime_get;
@@ -620,9 +616,7 @@ static int vfe_get(struct vfe_device *vfe)
error_pm_runtime_get:
pm_runtime_put_sync(vfe->camss->dev);
- camss_pm_domain_off(vfe->camss, vfe->id);
-error_pm_domain:
mutex_unlock(&vfe->power_lock);
return ret;
@@ -646,7 +640,6 @@ static void vfe_put(struct vfe_device *vfe)
}
camss_disable_clocks(vfe->nclocks, vfe->clock);
pm_runtime_put_sync(vfe->camss->dev);
- camss_pm_domain_off(vfe->camss, vfe->id);
}
vfe->power_count--;
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index 5d0479b5589c..3c45537b2cfb 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -774,28 +774,6 @@ int camss_get_pixel_clock(struct media_entity *entity, u32 *pixel_clock)
return 0;
}
-int camss_pm_domain_on(struct camss *camss, int id)
-{
- if (camss->version == CAMSS_8x96 ||
- camss->version == CAMSS_660) {
- camss->genpd_link[id] = device_link_add(camss->dev,
- camss->genpd[id], DL_FLAG_STATELESS |
- DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE);
-
- if (!camss->genpd_link[id])
- return -EINVAL;
- }
-
- return 0;
-}
-
-void camss_pm_domain_off(struct camss *camss, int id)
-{
- if (camss->version == CAMSS_8x96 ||
- camss->version == CAMSS_660)
- device_link_del(camss->genpd_link[id]);
-}
-
/*
* camss_of_parse_endpoint_node - Parse port endpoint node
* @dev: Device
@@ -1207,6 +1185,48 @@ static const struct media_device_ops camss_media_ops = {
.link_notify = v4l2_pipeline_link_notify,
};
+
+static int camss_configure_pd(struct camss *camss)
+{
+ int nbr_pm_domains = 0;
+ int last_pm_domain = 0;
+ int i;
+ int ret;
+
+ if (camss->version == CAMSS_8x96 ||
+ camss->version == CAMSS_660)
+ nbr_pm_domains = PM_DOMAIN_CAMSS_COUNT;
+
+ for (i = 0; i < nbr_pm_domains; i++) {
+ camss->genpd[i] = dev_pm_domain_attach_by_id(camss->dev, i);
+ if (IS_ERR(camss->genpd[i])) {
+ ret = PTR_ERR(camss->genpd[i]);
+ goto fail_pm;
+ }
+
+ camss->genpd_link[i] = device_link_add(camss->dev, camss->genpd[i],
+ DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE);
+
+ if (!camss->genpd_link[i]) {
+ dev_pm_domain_detach(camss->genpd[i], true);
+ ret = -EINVAL;
+ goto fail_pm;
+ }
+
+ last_pm_domain = i;
+ }
+
+ return 0;
+
+fail_pm:
+ for (i = 0; i < last_pm_domain; i++) {
+ device_link_del(camss->genpd_link[i]);
+ dev_pm_domain_detach(camss->genpd[i], true);
+ }
+
+ return ret;
+}
+
/*
* camss_probe - Probe CAMSS platform device
* @pdev: Pointer to CAMSS platform device
@@ -1339,20 +1359,10 @@ static int camss_probe(struct platform_device *pdev)
}
}
- if (camss->version == CAMSS_8x96 ||
- camss->version == CAMSS_660) {
- camss->genpd[PM_DOMAIN_VFE0] = dev_pm_domain_attach_by_id(
- camss->dev, PM_DOMAIN_VFE0);
- if (IS_ERR(camss->genpd[PM_DOMAIN_VFE0]))
- return PTR_ERR(camss->genpd[PM_DOMAIN_VFE0]);
-
- camss->genpd[PM_DOMAIN_VFE1] = dev_pm_domain_attach_by_id(
- camss->dev, PM_DOMAIN_VFE1);
- if (IS_ERR(camss->genpd[PM_DOMAIN_VFE1])) {
- dev_pm_domain_detach(camss->genpd[PM_DOMAIN_VFE0],
- true);
- return PTR_ERR(camss->genpd[PM_DOMAIN_VFE1]);
- }
+ ret = camss_configure_pd(camss);
+ if (ret < 0) {
+ dev_err(dev, "Failed to configure power domains: %d\n", ret);
+ return ret;
}
pm_runtime_enable(dev);
@@ -1373,6 +1383,9 @@ static int camss_probe(struct platform_device *pdev)
void camss_delete(struct camss *camss)
{
+ int nbr_pm_domains = 0;
+ int i;
+
v4l2_device_unregister(&camss->v4l2_dev);
media_device_unregister(&camss->media_dev);
media_device_cleanup(&camss->media_dev);
@@ -1380,9 +1393,12 @@ void camss_delete(struct camss *camss)
pm_runtime_disable(camss->dev);
if (camss->version == CAMSS_8x96 ||
- camss->version == CAMSS_660) {
- dev_pm_domain_detach(camss->genpd[PM_DOMAIN_VFE0], true);
- dev_pm_domain_detach(camss->genpd[PM_DOMAIN_VFE1], true);
+ camss->version == CAMSS_660)
+ nbr_pm_domains = PM_DOMAIN_CAMSS_COUNT;
+
+ for (i = 0; i < nbr_pm_domains; i++) {
+ device_link_del(camss->genpd_link[i]);
+ dev_pm_domain_detach(camss->genpd[i], true);
}
kfree(camss);
diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
index b7ad8e9f68a8..7560d85b3352 100644
--- a/drivers/media/platform/qcom/camss/camss.h
+++ b/drivers/media/platform/qcom/camss/camss.h
@@ -57,9 +57,9 @@ struct resources_ispif {
};
enum pm_domain {
- PM_DOMAIN_VFE0,
- PM_DOMAIN_VFE1,
- PM_DOMAIN_COUNT
+ PM_DOMAIN_VFE0 = 0,
+ PM_DOMAIN_VFE1 = 1,
+ PM_DOMAIN_CAMSS_COUNT = 2, /* CAMSS series of ISPs */
};
enum camss_version {
@@ -83,8 +83,8 @@ struct camss {
int vfe_num;
struct vfe_device *vfe;
atomic_t ref_count;
- struct device *genpd[PM_DOMAIN_COUNT];
- struct device_link *genpd_link[PM_DOMAIN_COUNT];
+ struct device *genpd[PM_DOMAIN_CAMSS_COUNT];
+ struct device_link *genpd_link[PM_DOMAIN_CAMSS_COUNT];
};
struct camss_camera_interface {
@@ -110,8 +110,6 @@ int camss_enable_clocks(int nclocks, struct camss_clock *clock,
void camss_disable_clocks(int nclocks, struct camss_clock *clock);
struct media_entity *camss_find_sensor(struct media_entity *entity);
int camss_get_pixel_clock(struct media_entity *entity, u32 *pixel_clock);
-int camss_pm_domain_on(struct camss *camss, int id);
-void camss_pm_domain_off(struct camss *camss, int id);
void camss_delete(struct camss *camss);
#endif /* QC_MSM_CAMSS_H */
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 12/22] media: camss: Remove per VFE power domain toggling
2021-02-17 11:21 ` [PATCH v5 12/22] media: camss: Remove per VFE power domain toggling Robert Foss
@ 2021-02-22 11:44 ` Andrey Konovalov
2021-02-24 14:53 ` Robert Foss
0 siblings, 1 reply; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-22 11:44 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
On 17.02.2021 14:21, Robert Foss wrote:
> For Titan ISPs clocks fail to re-enable during vfe_get()
> after any vfe has been halted and its corresponding power
> domain power has been detached.
OK.
> Since all of the clocks depend on all of the PDs, per
> VFE PD detaching is no option for this generation of HW.
But this patch removes camss_pm_domain_on/off calls from
vfe_get/put() for all the SOCs, not only for sdm845.
And this looks like a regression (higher power consumption)
for all the generation1 devices.
Is it possible to handle gen1 and gen2 hardware differently,
so that gen1 continued to use camss_pm_domain_on/off as
before?
Thanks,
Andrey
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
> .../media/platform/qcom/camss/camss-ispif.c | 11 ---
> drivers/media/platform/qcom/camss/camss-vfe.c | 7 --
> drivers/media/platform/qcom/camss/camss.c | 94 +++++++++++--------
> drivers/media/platform/qcom/camss/camss.h | 12 +--
> 4 files changed, 60 insertions(+), 64 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
> index fc121da4ab0c..b88f4025010a 100644
> --- a/drivers/media/platform/qcom/camss/camss-ispif.c
> +++ b/drivers/media/platform/qcom/camss/camss-ispif.c
> @@ -323,14 +323,6 @@ static int ispif_reset(struct ispif_device *ispif, u8 vfe_id)
> struct camss *camss = ispif->camss;
> int ret;
>
> - ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE0);
> - if (ret < 0)
> - return ret;
> -
> - ret = camss_pm_domain_on(camss, PM_DOMAIN_VFE1);
> - if (ret < 0)
> - return ret;
> -
> ret = camss_enable_clocks(ispif->nclocks_for_reset,
> ispif->clock_for_reset,
> camss->dev);
> @@ -343,9 +335,6 @@ static int ispif_reset(struct ispif_device *ispif, u8 vfe_id)
>
> camss_disable_clocks(ispif->nclocks_for_reset, ispif->clock_for_reset);
>
> - camss_pm_domain_off(camss, PM_DOMAIN_VFE0);
> - camss_pm_domain_off(camss, PM_DOMAIN_VFE1);
> -
> return ret;
> }
>
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
> index 6fafeb8a5484..ed35f9ae9067 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> @@ -580,10 +580,6 @@ static int vfe_get(struct vfe_device *vfe)
> mutex_lock(&vfe->power_lock);
>
> if (vfe->power_count == 0) {
> - ret = camss_pm_domain_on(vfe->camss, vfe->id);
> - if (ret < 0)
> - goto error_pm_domain;
> -
> ret = pm_runtime_get_sync(vfe->camss->dev);
> if (ret < 0)
> goto error_pm_runtime_get;
> @@ -620,9 +616,7 @@ static int vfe_get(struct vfe_device *vfe)
>
> error_pm_runtime_get:
> pm_runtime_put_sync(vfe->camss->dev);
> - camss_pm_domain_off(vfe->camss, vfe->id);
>
> -error_pm_domain:
> mutex_unlock(&vfe->power_lock);
>
> return ret;
> @@ -646,7 +640,6 @@ static void vfe_put(struct vfe_device *vfe)
> }
> camss_disable_clocks(vfe->nclocks, vfe->clock);
> pm_runtime_put_sync(vfe->camss->dev);
> - camss_pm_domain_off(vfe->camss, vfe->id);
> }
>
> vfe->power_count--;
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 5d0479b5589c..3c45537b2cfb 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -774,28 +774,6 @@ int camss_get_pixel_clock(struct media_entity *entity, u32 *pixel_clock)
> return 0;
> }
>
> -int camss_pm_domain_on(struct camss *camss, int id)
> -{
> - if (camss->version == CAMSS_8x96 ||
> - camss->version == CAMSS_660) {
> - camss->genpd_link[id] = device_link_add(camss->dev,
> - camss->genpd[id], DL_FLAG_STATELESS |
> - DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE);
> -
> - if (!camss->genpd_link[id])
> - return -EINVAL;
> - }
> -
> - return 0;
> -}
> -
> -void camss_pm_domain_off(struct camss *camss, int id)
> -{
> - if (camss->version == CAMSS_8x96 ||
> - camss->version == CAMSS_660)
> - device_link_del(camss->genpd_link[id]);
> -}
> -
> /*
> * camss_of_parse_endpoint_node - Parse port endpoint node
> * @dev: Device
> @@ -1207,6 +1185,48 @@ static const struct media_device_ops camss_media_ops = {
> .link_notify = v4l2_pipeline_link_notify,
> };
>
> +
> +static int camss_configure_pd(struct camss *camss)
> +{
> + int nbr_pm_domains = 0;
> + int last_pm_domain = 0;
> + int i;
> + int ret;
> +
> + if (camss->version == CAMSS_8x96 ||
> + camss->version == CAMSS_660)
> + nbr_pm_domains = PM_DOMAIN_CAMSS_COUNT;
> +
> + for (i = 0; i < nbr_pm_domains; i++) {
> + camss->genpd[i] = dev_pm_domain_attach_by_id(camss->dev, i);
> + if (IS_ERR(camss->genpd[i])) {
> + ret = PTR_ERR(camss->genpd[i]);
> + goto fail_pm;
> + }
> +
> + camss->genpd_link[i] = device_link_add(camss->dev, camss->genpd[i],
> + DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE);
> +
> + if (!camss->genpd_link[i]) {
> + dev_pm_domain_detach(camss->genpd[i], true);
> + ret = -EINVAL;
> + goto fail_pm;
> + }
> +
> + last_pm_domain = i;
> + }
> +
> + return 0;
> +
> +fail_pm:
> + for (i = 0; i < last_pm_domain; i++) {
> + device_link_del(camss->genpd_link[i]);
> + dev_pm_domain_detach(camss->genpd[i], true);
> + }
> +
> + return ret;
> +}
> +
> /*
> * camss_probe - Probe CAMSS platform device
> * @pdev: Pointer to CAMSS platform device
> @@ -1339,20 +1359,10 @@ static int camss_probe(struct platform_device *pdev)
> }
> }
>
> - if (camss->version == CAMSS_8x96 ||
> - camss->version == CAMSS_660) {
> - camss->genpd[PM_DOMAIN_VFE0] = dev_pm_domain_attach_by_id(
> - camss->dev, PM_DOMAIN_VFE0);
> - if (IS_ERR(camss->genpd[PM_DOMAIN_VFE0]))
> - return PTR_ERR(camss->genpd[PM_DOMAIN_VFE0]);
> -
> - camss->genpd[PM_DOMAIN_VFE1] = dev_pm_domain_attach_by_id(
> - camss->dev, PM_DOMAIN_VFE1);
> - if (IS_ERR(camss->genpd[PM_DOMAIN_VFE1])) {
> - dev_pm_domain_detach(camss->genpd[PM_DOMAIN_VFE0],
> - true);
> - return PTR_ERR(camss->genpd[PM_DOMAIN_VFE1]);
> - }
> + ret = camss_configure_pd(camss);
> + if (ret < 0) {
> + dev_err(dev, "Failed to configure power domains: %d\n", ret);
> + return ret;
> }
>
> pm_runtime_enable(dev);
> @@ -1373,6 +1383,9 @@ static int camss_probe(struct platform_device *pdev)
>
> void camss_delete(struct camss *camss)
> {
> + int nbr_pm_domains = 0;
> + int i;
> +
> v4l2_device_unregister(&camss->v4l2_dev);
> media_device_unregister(&camss->media_dev);
> media_device_cleanup(&camss->media_dev);
> @@ -1380,9 +1393,12 @@ void camss_delete(struct camss *camss)
> pm_runtime_disable(camss->dev);
>
> if (camss->version == CAMSS_8x96 ||
> - camss->version == CAMSS_660) {
> - dev_pm_domain_detach(camss->genpd[PM_DOMAIN_VFE0], true);
> - dev_pm_domain_detach(camss->genpd[PM_DOMAIN_VFE1], true);
> + camss->version == CAMSS_660)
> + nbr_pm_domains = PM_DOMAIN_CAMSS_COUNT;
> +
> + for (i = 0; i < nbr_pm_domains; i++) {
> + device_link_del(camss->genpd_link[i]);
> + dev_pm_domain_detach(camss->genpd[i], true);
> }
>
> kfree(camss);
> diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
> index b7ad8e9f68a8..7560d85b3352 100644
> --- a/drivers/media/platform/qcom/camss/camss.h
> +++ b/drivers/media/platform/qcom/camss/camss.h
> @@ -57,9 +57,9 @@ struct resources_ispif {
> };
>
> enum pm_domain {
> - PM_DOMAIN_VFE0,
> - PM_DOMAIN_VFE1,
> - PM_DOMAIN_COUNT
> + PM_DOMAIN_VFE0 = 0,
> + PM_DOMAIN_VFE1 = 1,
> + PM_DOMAIN_CAMSS_COUNT = 2, /* CAMSS series of ISPs */
> };
>
> enum camss_version {
> @@ -83,8 +83,8 @@ struct camss {
> int vfe_num;
> struct vfe_device *vfe;
> atomic_t ref_count;
> - struct device *genpd[PM_DOMAIN_COUNT];
> - struct device_link *genpd_link[PM_DOMAIN_COUNT];
> + struct device *genpd[PM_DOMAIN_CAMSS_COUNT];
> + struct device_link *genpd_link[PM_DOMAIN_CAMSS_COUNT];
> };
>
> struct camss_camera_interface {
> @@ -110,8 +110,6 @@ int camss_enable_clocks(int nclocks, struct camss_clock *clock,
> void camss_disable_clocks(int nclocks, struct camss_clock *clock);
> struct media_entity *camss_find_sensor(struct media_entity *entity);
> int camss_get_pixel_clock(struct media_entity *entity, u32 *pixel_clock);
> -int camss_pm_domain_on(struct camss *camss, int id);
> -void camss_pm_domain_off(struct camss *camss, int id);
> void camss_delete(struct camss *camss);
>
> #endif /* QC_MSM_CAMSS_H */
>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v5 12/22] media: camss: Remove per VFE power domain toggling
2021-02-22 11:44 ` Andrey Konovalov
@ 2021-02-24 14:53 ` Robert Foss
0 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-24 14:53 UTC (permalink / raw)
To: Andrey Konovalov
Cc: Andy Gross, Bjorn Andersson, Todor Tomov, Mauro Carvalho Chehab,
Rob Herring, angelogioacchino.delregno, MSM, linux-media,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-kernel, AngeloGioacchino Del Regno, Sakari Ailus,
Nicolas Boichat, Rob Herring, Tomasz Figa,
Azam Sadiq Pasha Kapatrala Syed, Sarvesh Sridutt,
Laurent Pinchart, Jonathan Marek
Hey Andrey,
>
> On 17.02.2021 14:21, Robert Foss wrote:
> > For Titan ISPs clocks fail to re-enable during vfe_get()
> > after any vfe has been halted and its corresponding power
> > domain power has been detached.
>
> OK.
>
> > Since all of the clocks depend on all of the PDs, per
> > VFE PD detaching is no option for this generation of HW.
>
> But this patch removes camss_pm_domain_on/off calls from
> vfe_get/put() for all the SOCs, not only for sdm845.
> And this looks like a regression (higher power consumption)
> for all the generation1 devices.
Yeah, that is a serious problem with the approach I picked here. The
power difference shouldn't be huge however, since the best case
scenario savings of the previous implementation was being able to
power down 1 VFE when the other one is working. If none of the VFEs is
working, nothing is powered up both in the previous implementation &
using this patch.
>
> Is it possible to handle gen1 and gen2 hardware differently,
> so that gen1 continued to use camss_pm_domain_on/off as
> before?
I hesitated going down this gen1/gen2 split here, due to how deep into
the common code some of this functionality is. Let me have another
look at this though, not having a power regression for gen1 devices
would definitely be preferable.
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 13/22] media: camss: Enable SDM845
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (10 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 12/22] media: camss: Remove per VFE power domain toggling Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-21 18:32 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 14/22] dt-bindings: media: camss: Add qcom,msm8916-camss binding Robert Foss
` (8 subsequent siblings)
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Enable support for SDM845 based Titan 170 ISPs.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
drivers/media/platform/qcom/camss/camss.c | 17 +++++++++++++++++
drivers/media/platform/qcom/camss/camss.h | 6 ++++--
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index 3c45537b2cfb..3bd3153b7905 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -894,6 +894,12 @@ static int camss_init_subdevices(struct camss *camss)
csid_res = csid_res_660;
ispif_res = &ispif_res_660;
vfe_res = vfe_res_660;
+ } else if (camss->version == CAMSS_845) {
+ csiphy_res = csiphy_res_845;
+ csid_res = csid_res_845;
+ /* Titan VFEs don't have an ISPIF */
+ ispif_res = NULL;
+ vfe_res = vfe_res_845;
} else {
return -EINVAL;
}
@@ -1196,6 +1202,8 @@ static int camss_configure_pd(struct camss *camss)
if (camss->version == CAMSS_8x96 ||
camss->version == CAMSS_660)
nbr_pm_domains = PM_DOMAIN_CAMSS_COUNT;
+ else if (camss->version == CAMSS_845)
+ nbr_pm_domains = PM_DOMAIN_TITAN_COUNT;
for (i = 0; i < nbr_pm_domains; i++) {
camss->genpd[i] = dev_pm_domain_attach_by_id(camss->dev, i);
@@ -1264,6 +1272,12 @@ static int camss_probe(struct platform_device *pdev)
camss->csiphy_num = 3;
camss->csid_num = 4;
camss->vfe_num = 2;
+ } else if (of_device_is_compatible(dev->of_node,
+ "qcom,sdm845-camss")) {
+ camss->version = CAMSS_845;
+ camss->csiphy_num = 4;
+ camss->csid_num = 3;
+ camss->vfe_num = 3;
} else {
ret = -EINVAL;
goto err_free;
@@ -1395,6 +1409,8 @@ void camss_delete(struct camss *camss)
if (camss->version == CAMSS_8x96 ||
camss->version == CAMSS_660)
nbr_pm_domains = PM_DOMAIN_CAMSS_COUNT;
+ else if (camss->version == CAMSS_845)
+ nbr_pm_domains = PM_DOMAIN_TITAN_COUNT;
for (i = 0; i < nbr_pm_domains; i++) {
device_link_del(camss->genpd_link[i]);
@@ -1428,6 +1444,7 @@ static const struct of_device_id camss_dt_match[] = {
{ .compatible = "qcom,msm8916-camss" },
{ .compatible = "qcom,msm8996-camss" },
{ .compatible = "qcom,sdm660-camss" },
+ { .compatible = "qcom,sdm845-camss" },
{ }
};
diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
index 7560d85b3352..2f853557ed16 100644
--- a/drivers/media/platform/qcom/camss/camss.h
+++ b/drivers/media/platform/qcom/camss/camss.h
@@ -60,6 +60,8 @@ enum pm_domain {
PM_DOMAIN_VFE0 = 0,
PM_DOMAIN_VFE1 = 1,
PM_DOMAIN_CAMSS_COUNT = 2, /* CAMSS series of ISPs */
+ PM_DOMAIN_VFELITE = 2, /* VFELITE / TOP GDSC */
+ PM_DOMAIN_TITAN_COUNT = 3, /* Titan series of ISPs */
};
enum camss_version {
@@ -83,8 +85,8 @@ struct camss {
int vfe_num;
struct vfe_device *vfe;
atomic_t ref_count;
- struct device *genpd[PM_DOMAIN_CAMSS_COUNT];
- struct device_link *genpd_link[PM_DOMAIN_CAMSS_COUNT];
+ struct device *genpd[PM_DOMAIN_TITAN_COUNT];
+ struct device_link *genpd_link[PM_DOMAIN_TITAN_COUNT];
};
struct camss_camera_interface {
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 13/22] media: camss: Enable SDM845
2021-02-17 11:21 ` [PATCH v5 13/22] media: camss: Enable SDM845 Robert Foss
@ 2021-02-21 18:32 ` Andrey Konovalov
0 siblings, 0 replies; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-21 18:32 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Thanks,
Andrey
On 17.02.2021 14:21, Robert Foss wrote:
> Enable support for SDM845 based Titan 170 ISPs.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
> drivers/media/platform/qcom/camss/camss.c | 17 +++++++++++++++++
> drivers/media/platform/qcom/camss/camss.h | 6 ++++--
> 2 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 3c45537b2cfb..3bd3153b7905 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -894,6 +894,12 @@ static int camss_init_subdevices(struct camss *camss)
> csid_res = csid_res_660;
> ispif_res = &ispif_res_660;
> vfe_res = vfe_res_660;
> + } else if (camss->version == CAMSS_845) {
> + csiphy_res = csiphy_res_845;
> + csid_res = csid_res_845;
> + /* Titan VFEs don't have an ISPIF */
> + ispif_res = NULL;
> + vfe_res = vfe_res_845;
> } else {
> return -EINVAL;
> }
> @@ -1196,6 +1202,8 @@ static int camss_configure_pd(struct camss *camss)
> if (camss->version == CAMSS_8x96 ||
> camss->version == CAMSS_660)
> nbr_pm_domains = PM_DOMAIN_CAMSS_COUNT;
> + else if (camss->version == CAMSS_845)
> + nbr_pm_domains = PM_DOMAIN_TITAN_COUNT;
>
> for (i = 0; i < nbr_pm_domains; i++) {
> camss->genpd[i] = dev_pm_domain_attach_by_id(camss->dev, i);
> @@ -1264,6 +1272,12 @@ static int camss_probe(struct platform_device *pdev)
> camss->csiphy_num = 3;
> camss->csid_num = 4;
> camss->vfe_num = 2;
> + } else if (of_device_is_compatible(dev->of_node,
> + "qcom,sdm845-camss")) {
> + camss->version = CAMSS_845;
> + camss->csiphy_num = 4;
> + camss->csid_num = 3;
> + camss->vfe_num = 3;
> } else {
> ret = -EINVAL;
> goto err_free;
> @@ -1395,6 +1409,8 @@ void camss_delete(struct camss *camss)
> if (camss->version == CAMSS_8x96 ||
> camss->version == CAMSS_660)
> nbr_pm_domains = PM_DOMAIN_CAMSS_COUNT;
> + else if (camss->version == CAMSS_845)
> + nbr_pm_domains = PM_DOMAIN_TITAN_COUNT;
>
> for (i = 0; i < nbr_pm_domains; i++) {
> device_link_del(camss->genpd_link[i]);
> @@ -1428,6 +1444,7 @@ static const struct of_device_id camss_dt_match[] = {
> { .compatible = "qcom,msm8916-camss" },
> { .compatible = "qcom,msm8996-camss" },
> { .compatible = "qcom,sdm660-camss" },
> + { .compatible = "qcom,sdm845-camss" },
> { }
> };
>
> diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
> index 7560d85b3352..2f853557ed16 100644
> --- a/drivers/media/platform/qcom/camss/camss.h
> +++ b/drivers/media/platform/qcom/camss/camss.h
> @@ -60,6 +60,8 @@ enum pm_domain {
> PM_DOMAIN_VFE0 = 0,
> PM_DOMAIN_VFE1 = 1,
> PM_DOMAIN_CAMSS_COUNT = 2, /* CAMSS series of ISPs */
> + PM_DOMAIN_VFELITE = 2, /* VFELITE / TOP GDSC */
> + PM_DOMAIN_TITAN_COUNT = 3, /* Titan series of ISPs */
> };
>
> enum camss_version {
> @@ -83,8 +85,8 @@ struct camss {
> int vfe_num;
> struct vfe_device *vfe;
> atomic_t ref_count;
> - struct device *genpd[PM_DOMAIN_CAMSS_COUNT];
> - struct device_link *genpd_link[PM_DOMAIN_CAMSS_COUNT];
> + struct device *genpd[PM_DOMAIN_TITAN_COUNT];
> + struct device_link *genpd_link[PM_DOMAIN_TITAN_COUNT];
> };
>
> struct camss_camera_interface {
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 14/22] dt-bindings: media: camss: Add qcom,msm8916-camss binding
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (11 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 13/22] media: camss: Enable SDM845 Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-17 11:21 ` [PATCH v5 15/22] dt-bindings: media: camss: Add qcom,msm8996-camss binding Robert Foss
` (7 subsequent siblings)
20 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Add bindings for qcom,msm8916-camss in order to support the camera
subsystem on MSM8916.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
---
Changes since v2:
- Remove redundant descriptions
- Add power domain description
- Make clock-lanes a constant
- Add max & minItems to data-lanes
- Remove ports requirement - endpoint & reg
- Rework to conform to new port schema
Changes since v4
- Rob: Added r-b
.../bindings/media/qcom,msm8916-camss.yaml | 256 ++++++++++++++++++
1 file changed, 256 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml
diff --git a/Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml b/Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml
new file mode 100644
index 000000000000..304908072d72
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml
@@ -0,0 +1,256 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/qcom,msm8916-camss.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm CAMSS ISP
+
+maintainers:
+ - Robert Foss <robert.foss@linaro.org>
+ - Todor Tomov <todor.too@gmail.com>
+
+description: |
+ The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms
+
+properties:
+ compatible:
+ const: qcom,msm8916-camss
+
+ clocks:
+ minItems: 19
+ maxItems: 19
+
+ clock-names:
+ items:
+ - const: top_ahb
+ - const: ispif_ahb
+ - const: csiphy0_timer
+ - const: csiphy1_timer
+ - const: csi0_ahb
+ - const: csi0
+ - const: csi0_phy
+ - const: csi0_pix
+ - const: csi0_rdi
+ - const: csi1_ahb
+ - const: csi1
+ - const: csi1_phy
+ - const: csi1_pix
+ - const: csi1_rdi
+ - const: ahb
+ - const: vfe0
+ - const: csi_vfe0
+ - const: vfe_ahb
+ - const: vfe_axi
+
+ interrupts:
+ minItems: 6
+ maxItems: 6
+
+ interrupt-names:
+ items:
+ - const: csiphy0
+ - const: csiphy1
+ - const: csid0
+ - const: csid1
+ - const: ispif
+ - const: vfe0
+
+ iommus:
+ maxItems: 1
+
+ power-domains:
+ items:
+ - description: VFE GDSC - Video Front End, Global Distributed Switch Controller.
+
+ ports:
+ $ref: /schemas/graph.yaml#/properties/ports
+
+ description:
+ CSI input ports.
+
+ properties:
+ port@0:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ items:
+ - const: 1
+
+ data-lanes:
+ description:
+ An array of physical data lanes indexes.
+ Position of an entry determines the logical
+ lane number, while the value of an entry
+ indicates physical lane index. Lane swapping
+ is supported. Physical lane indexes;
+ 0, 2, 3, 4.
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ port@1:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ items:
+ - const: 1
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ reg:
+ minItems: 9
+ maxItems: 9
+
+ reg-names:
+ items:
+ - const: csiphy0
+ - const: csiphy0_clk_mux
+ - const: csiphy1
+ - const: csiphy1_clk_mux
+ - const: csid0
+ - const: csid1
+ - const: ispif
+ - const: csi_clk_mux
+ - const: vfe0
+
+ vdda-supply:
+ description:
+ Definition of the regulator used as analog power supply.
+
+required:
+ - clock-names
+ - clocks
+ - compatible
+ - interrupt-names
+ - interrupts
+ - iommus
+ - power-domains
+ - reg
+ - reg-names
+ - vdda-supply
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/clock/qcom,gcc-msm8916.h>
+
+ camss: camss@1b00000 {
+ compatible = "qcom,msm8916-camss";
+
+ clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,
+ <&gcc GCC_CAMSS_ISPIF_AHB_CLK>,
+ <&gcc GCC_CAMSS_CSI0PHYTIMER_CLK>,
+ <&gcc GCC_CAMSS_CSI1PHYTIMER_CLK>,
+ <&gcc GCC_CAMSS_CSI0_AHB_CLK>,
+ <&gcc GCC_CAMSS_CSI0_CLK>,
+ <&gcc GCC_CAMSS_CSI0PHY_CLK>,
+ <&gcc GCC_CAMSS_CSI0PIX_CLK>,
+ <&gcc GCC_CAMSS_CSI0RDI_CLK>,
+ <&gcc GCC_CAMSS_CSI1_AHB_CLK>,
+ <&gcc GCC_CAMSS_CSI1_CLK>,
+ <&gcc GCC_CAMSS_CSI1PHY_CLK>,
+ <&gcc GCC_CAMSS_CSI1PIX_CLK>,
+ <&gcc GCC_CAMSS_CSI1RDI_CLK>,
+ <&gcc GCC_CAMSS_AHB_CLK>,
+ <&gcc GCC_CAMSS_VFE0_CLK>,
+ <&gcc GCC_CAMSS_CSI_VFE0_CLK>,
+ <&gcc GCC_CAMSS_VFE_AHB_CLK>,
+ <&gcc GCC_CAMSS_VFE_AXI_CLK>;
+
+ clock-names = "top_ahb",
+ "ispif_ahb",
+ "csiphy0_timer",
+ "csiphy1_timer",
+ "csi0_ahb",
+ "csi0",
+ "csi0_phy",
+ "csi0_pix",
+ "csi0_rdi",
+ "csi1_ahb",
+ "csi1",
+ "csi1_phy",
+ "csi1_pix",
+ "csi1_rdi",
+ "ahb",
+ "vfe0",
+ "csi_vfe0",
+ "vfe_ahb",
+ "vfe_axi";
+
+ interrupts = <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 79 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 51 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 55 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;
+
+ interrupt-names = "csiphy0",
+ "csiphy1",
+ "csid0",
+ "csid1",
+ "ispif",
+ "vfe0";
+
+ iommus = <&apps_iommu 3>;
+
+ power-domains = <&gcc VFE_GDSC>;
+
+ reg = <0x01b0ac00 0x200>,
+ <0x01b00030 0x4>,
+ <0x01b0b000 0x200>,
+ <0x01b00038 0x4>,
+ <0x01b08000 0x100>,
+ <0x01b08400 0x100>,
+ <0x01b0a000 0x500>,
+ <0x01b00020 0x10>,
+ <0x01b10000 0x1000>;
+
+ reg-names = "csiphy0",
+ "csiphy0_clk_mux",
+ "csiphy1",
+ "csiphy1_clk_mux",
+ "csid0",
+ "csid1",
+ "ispif",
+ "csi_clk_mux",
+ "vfe0";
+
+ vdda-supply = <®_2v8>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+
+ };
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v5 15/22] dt-bindings: media: camss: Add qcom,msm8996-camss binding
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (12 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 14/22] dt-bindings: media: camss: Add qcom,msm8916-camss binding Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-17 11:21 ` [PATCH v5 16/22] dt-bindings: media: camss: Add qcom,sdm660-camss binding Robert Foss
` (6 subsequent siblings)
20 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Add bindings for qcom,msm8996-camss in order to support the camera
subsystem on MSM8996.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
---
Changes since v2
- Rob: Add new line at end of file
- Rob: Remove redundant descriptions
- Rob: Add power domain description
- Rob: Make clock-lanes a constant
- Rob: Rework to conform to new port schema
- Add max & minItems to data-lanes
- Remove ports requirement - endpoint & reg
Changes since v4
- Rob: Added r-b
.../bindings/media/qcom,msm8996-camss.yaml | 387 ++++++++++++++++++
1 file changed, 387 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml
diff --git a/Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml b/Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml
new file mode 100644
index 000000000000..38be41e932f0
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml
@@ -0,0 +1,387 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/qcom,msm8996-camss.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm CAMSS ISP
+
+maintainers:
+ - Robert Foss <robert.foss@linaro.org>
+ - Todor Tomov <todor.too@gmail.com>
+
+description: |
+ The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms
+
+properties:
+ compatible:
+ const: qcom,msm8996-camss
+
+ clocks:
+ minItems: 36
+ maxItems: 36
+
+ clock-names:
+ items:
+ - const: top_ahb
+ - const: ispif_ahb
+ - const: csiphy0_timer
+ - const: csiphy1_timer
+ - const: csiphy2_timer
+ - const: csi0_ahb
+ - const: csi0
+ - const: csi0_phy
+ - const: csi0_pix
+ - const: csi0_rdi
+ - const: csi1_ahb
+ - const: csi1
+ - const: csi1_phy
+ - const: csi1_pix
+ - const: csi1_rdi
+ - const: csi2_ahb
+ - const: csi2
+ - const: csi2_phy
+ - const: csi2_pix
+ - const: csi2_rdi
+ - const: csi3_ahb
+ - const: csi3
+ - const: csi3_phy
+ - const: csi3_pix
+ - const: csi3_rdi
+ - const: ahb
+ - const: vfe0
+ - const: csi_vfe0
+ - const: vfe0_ahb
+ - const: vfe0_stream
+ - const: vfe1
+ - const: csi_vfe1
+ - const: vfe1_ahb
+ - const: vfe1_stream
+ - const: vfe_ahb
+ - const: vfe_axi
+
+ interrupts:
+ minItems: 10
+ maxItems: 10
+
+ interrupt-names:
+ items:
+ - const: csiphy0
+ - const: csiphy1
+ - const: csiphy2
+ - const: csid0
+ - const: csid1
+ - const: csid2
+ - const: csid3
+ - const: ispif
+ - const: vfe0
+ - const: vfe1
+
+ iommus:
+ maxItems: 4
+
+ power-domains:
+ items:
+ - description: VFE0 GDSC - Video Front End, Global Distributed Switch Controller.
+ - description: VFE1 GDSC - Video Front End, Global Distributed Switch Controller.
+
+ ports:
+ $ref: /schemas/graph.yaml#/properties/ports
+
+ description:
+ CSI input ports.
+
+ properties:
+ port@0:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ items:
+ - const: 7
+
+ data-lanes:
+ description:
+ An array of physical data lanes indexes.
+ Position of an entry determines the logical
+ lane number, while the value of an entry
+ indicates physical lane index. Lane swapping
+ is supported. Physical lane indexes are;
+ 0, 1, 2, 3
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ port@1:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ items:
+ - const: 7
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ port@2:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ items:
+ - const: 7
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ port@3:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ items:
+ - const: 7
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ reg:
+ minItems: 14
+ maxItems: 14
+
+ reg-names:
+ items:
+ - const: csiphy0
+ - const: csiphy0_clk_mux
+ - const: csiphy1
+ - const: csiphy1_clk_mux
+ - const: csiphy2
+ - const: csiphy2_clk_mux
+ - const: csid0
+ - const: csid1
+ - const: csid2
+ - const: csid3
+ - const: ispif
+ - const: csi_clk_mux
+ - const: vfe0
+ - const: vfe1
+
+ vdda-supply:
+ description:
+ Definition of the regulator used as analog power supply.
+
+required:
+ - clock-names
+ - clocks
+ - compatible
+ - interrupt-names
+ - interrupts
+ - iommus
+ - power-domains
+ - reg
+ - reg-names
+ - vdda-supply
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/clock/qcom,gcc-msm8996.h>
+ #include <dt-bindings/clock/qcom,mmcc-msm8996.h>
+
+ camss: camss@a00000 {
+ compatible = "qcom,msm8996-camss";
+
+ clocks = <&mmcc CAMSS_TOP_AHB_CLK>,
+ <&mmcc CAMSS_ISPIF_AHB_CLK>,
+ <&mmcc CAMSS_CSI0PHYTIMER_CLK>,
+ <&mmcc CAMSS_CSI1PHYTIMER_CLK>,
+ <&mmcc CAMSS_CSI2PHYTIMER_CLK>,
+ <&mmcc CAMSS_CSI0_AHB_CLK>,
+ <&mmcc CAMSS_CSI0_CLK>,
+ <&mmcc CAMSS_CSI0PHY_CLK>,
+ <&mmcc CAMSS_CSI0PIX_CLK>,
+ <&mmcc CAMSS_CSI0RDI_CLK>,
+ <&mmcc CAMSS_CSI1_AHB_CLK>,
+ <&mmcc CAMSS_CSI1_CLK>,
+ <&mmcc CAMSS_CSI1PHY_CLK>,
+ <&mmcc CAMSS_CSI1PIX_CLK>,
+ <&mmcc CAMSS_CSI1RDI_CLK>,
+ <&mmcc CAMSS_CSI2_AHB_CLK>,
+ <&mmcc CAMSS_CSI2_CLK>,
+ <&mmcc CAMSS_CSI2PHY_CLK>,
+ <&mmcc CAMSS_CSI2PIX_CLK>,
+ <&mmcc CAMSS_CSI2RDI_CLK>,
+ <&mmcc CAMSS_CSI3_AHB_CLK>,
+ <&mmcc CAMSS_CSI3_CLK>,
+ <&mmcc CAMSS_CSI3PHY_CLK>,
+ <&mmcc CAMSS_CSI3PIX_CLK>,
+ <&mmcc CAMSS_CSI3RDI_CLK>,
+ <&mmcc CAMSS_AHB_CLK>,
+ <&mmcc CAMSS_VFE0_CLK>,
+ <&mmcc CAMSS_CSI_VFE0_CLK>,
+ <&mmcc CAMSS_VFE0_AHB_CLK>,
+ <&mmcc CAMSS_VFE0_STREAM_CLK>,
+ <&mmcc CAMSS_VFE1_CLK>,
+ <&mmcc CAMSS_CSI_VFE1_CLK>,
+ <&mmcc CAMSS_VFE1_AHB_CLK>,
+ <&mmcc CAMSS_VFE1_STREAM_CLK>,
+ <&mmcc CAMSS_VFE_AHB_CLK>,
+ <&mmcc CAMSS_VFE_AXI_CLK>;
+
+ clock-names = "top_ahb",
+ "ispif_ahb",
+ "csiphy0_timer",
+ "csiphy1_timer",
+ "csiphy2_timer",
+ "csi0_ahb",
+ "csi0",
+ "csi0_phy",
+ "csi0_pix",
+ "csi0_rdi",
+ "csi1_ahb",
+ "csi1",
+ "csi1_phy",
+ "csi1_pix",
+ "csi1_rdi",
+ "csi2_ahb",
+ "csi2",
+ "csi2_phy",
+ "csi2_pix",
+ "csi2_rdi",
+ "csi3_ahb",
+ "csi3",
+ "csi3_phy",
+ "csi3_pix",
+ "csi3_rdi",
+ "ahb",
+ "vfe0",
+ "csi_vfe0",
+ "vfe0_ahb",
+ "vfe0_stream",
+ "vfe1",
+ "csi_vfe1",
+ "vfe1_ahb",
+ "vfe1_stream",
+ "vfe_ahb",
+ "vfe_axi";
+
+ interrupts = <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 79 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 80 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 296 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 297 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 298 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 299 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 309 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 314 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 315 IRQ_TYPE_EDGE_RISING>;
+
+ interrupt-names = "csiphy0",
+ "csiphy1",
+ "csiphy2",
+ "csid0",
+ "csid1",
+ "csid2",
+ "csid3",
+ "ispif",
+ "vfe0",
+ "vfe1";
+
+ iommus = <&vfe_smmu 0>,
+ <&vfe_smmu 1>,
+ <&vfe_smmu 2>,
+ <&vfe_smmu 3>;
+
+ power-domains = <&mmcc VFE0_GDSC>,
+ <&mmcc VFE1_GDSC>;
+
+ reg = <0x00a34000 0x1000>,
+ <0x00a00030 0x4>,
+ <0x00a35000 0x1000>,
+ <0x00a00038 0x4>,
+ <0x00a36000 0x1000>,
+ <0x00a00040 0x4>,
+ <0x00a30000 0x100>,
+ <0x00a30400 0x100>,
+ <0x00a30800 0x100>,
+ <0x00a30c00 0x100>,
+ <0x00a31000 0x500>,
+ <0x00a00020 0x10>,
+ <0x00a10000 0x1000>,
+ <0x00a14000 0x1000>;
+
+ reg-names = "csiphy0",
+ "csiphy0_clk_mux",
+ "csiphy1",
+ "csiphy1_clk_mux",
+ "csiphy2",
+ "csiphy2_clk_mux",
+ "csid0",
+ "csid1",
+ "csid2",
+ "csid3",
+ "ispif",
+ "csi_clk_mux",
+ "vfe0",
+ "vfe1";
+
+ vdda-supply = <®_2v8>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+ };
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v5 16/22] dt-bindings: media: camss: Add qcom,sdm660-camss binding
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (13 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 15/22] dt-bindings: media: camss: Add qcom,msm8996-camss binding Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-17 11:21 ` [PATCH v5 17/22] dt-bindings: media: camss: Add qcom,sdm845-camss binding Robert Foss
` (5 subsequent siblings)
20 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Add bindings for qcom,sdm660-camss in order to support the camera
subsystem on SDM630/660 and SDA variants.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
---
Changes since v2
- Rob: Add new line at end of file
- Rob: Remove redundant descriptions
- Rob: Add power domain description
- Rob: Make clock-lanes a constant
- Rob: Rework to conform to new port schema
- Add max & minItems to data-lanes
- Remove ports requirement - endpoint & reg
- Added Angelo as binding maintainer
- Removed Todor as binding maintainer
Changes since v3
- Rob: Added r-b
.../bindings/media/qcom,sdm660-camss.yaml | 398 ++++++++++++++++++
1 file changed, 398 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml
diff --git a/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml b/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml
new file mode 100644
index 000000000000..841a1aafdd13
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml
@@ -0,0 +1,398 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/qcom,sdm660-camss.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm CAMSS ISP
+
+maintainers:
+ - Robert Foss <robert.foss@linaro.org>
+ - AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
+
+description: |
+ The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms
+
+properties:
+ compatible:
+ const: qcom,sdm660-camss
+
+ clocks:
+ minItems: 42
+ maxItems: 42
+
+ clock-names:
+ items:
+ - const: ahb
+ - const: cphy_csid0
+ - const: cphy_csid1
+ - const: cphy_csid2
+ - const: cphy_csid3
+ - const: csi0_ahb
+ - const: csi0
+ - const: csi0_phy
+ - const: csi0_pix
+ - const: csi0_rdi
+ - const: csi1_ahb
+ - const: csi1
+ - const: csi1_phy
+ - const: csi1_pix
+ - const: csi1_rdi
+ - const: csi2_ahb
+ - const: csi2
+ - const: csi2_phy
+ - const: csi2_pix
+ - const: csi2_rdi
+ - const: csi3_ahb
+ - const: csi3
+ - const: csi3_phy
+ - const: csi3_pix
+ - const: csi3_rdi
+ - const: csiphy0_timer
+ - const: csiphy1_timer
+ - const: csiphy2_timer
+ - const: csiphy_ahb2crif
+ - const: csi_vfe0
+ - const: csi_vfe1
+ - const: ispif_ahb
+ - const: throttle_axi
+ - const: top_ahb
+ - const: vfe0_ahb
+ - const: vfe0
+ - const: vfe0_stream
+ - const: vfe1_ahb
+ - const: vfe1
+ - const: vfe1_stream
+ - const: vfe_ahb
+ - const: vfe_axi
+
+ interrupts:
+ minItems: 10
+ maxItems: 10
+
+ interrupt-names:
+ items:
+ - const: csid0
+ - const: csid1
+ - const: csid2
+ - const: csid3
+ - const: csiphy0
+ - const: csiphy1
+ - const: csiphy2
+ - const: ispif
+ - const: vfe0
+ - const: vfe1
+
+ iommus:
+ maxItems: 4
+
+ power-domains:
+ items:
+ - description: VFE0 GDSC - Video Front End, Global Distributed Switch Controller.
+ - description: VFE1 GDSC - Video Front End, Global Distributed Switch Controller.
+
+ ports:
+ $ref: /schemas/graph.yaml#/properties/ports
+
+ description:
+ CSI input ports.
+
+ properties:
+ port@0:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ items:
+ - const: 7
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ port@1:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ items:
+ - const: 7
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ port@2:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ items:
+ - const: 7
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ port@3:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ items:
+ - const: 7
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ reg:
+ minItems: 14
+ maxItems: 14
+
+ reg-names:
+ items:
+ - const: csi_clk_mux
+ - const: csid0
+ - const: csid1
+ - const: csid2
+ - const: csid3
+ - const: csiphy0
+ - const: csiphy0_clk_mux
+ - const: csiphy1
+ - const: csiphy1_clk_mux
+ - const: csiphy2
+ - const: csiphy2_clk_mux
+ - const: ispif
+ - const: vfe0
+ - const: vfe1
+
+ vdda-supply:
+ description:
+ Definition of the regulator used as analog power supply.
+
+required:
+ - clock-names
+ - clocks
+ - compatible
+ - interrupt-names
+ - interrupts
+ - iommus
+ - power-domains
+ - reg
+ - reg-names
+ - vdda-supply
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/clock/qcom,gcc-sdm660.h>
+ #include <dt-bindings/clock/qcom,mmcc-sdm660.h>
+
+ camss: camss@ca00000 {
+ compatible = "qcom,sdm660-camss";
+
+ clocks = <&mmcc CAMSS_AHB_CLK>,
+ <&mmcc CAMSS_CPHY_CSID0_CLK>,
+ <&mmcc CAMSS_CPHY_CSID1_CLK>,
+ <&mmcc CAMSS_CPHY_CSID2_CLK>,
+ <&mmcc CAMSS_CPHY_CSID3_CLK>,
+ <&mmcc CAMSS_CSI0_AHB_CLK>,
+ <&mmcc CAMSS_CSI0_CLK>,
+ <&mmcc CAMSS_CPHY_CSID0_CLK>,
+ <&mmcc CAMSS_CSI0PIX_CLK>,
+ <&mmcc CAMSS_CSI0RDI_CLK>,
+ <&mmcc CAMSS_CSI1_AHB_CLK>,
+ <&mmcc CAMSS_CSI1_CLK>,
+ <&mmcc CAMSS_CPHY_CSID1_CLK>,
+ <&mmcc CAMSS_CSI1PIX_CLK>,
+ <&mmcc CAMSS_CSI1RDI_CLK>,
+ <&mmcc CAMSS_CSI2_AHB_CLK>,
+ <&mmcc CAMSS_CSI2_CLK>,
+ <&mmcc CAMSS_CPHY_CSID2_CLK>,
+ <&mmcc CAMSS_CSI2PIX_CLK>,
+ <&mmcc CAMSS_CSI2RDI_CLK>,
+ <&mmcc CAMSS_CSI3_AHB_CLK>,
+ <&mmcc CAMSS_CSI3_CLK>,
+ <&mmcc CAMSS_CPHY_CSID3_CLK>,
+ <&mmcc CAMSS_CSI3PIX_CLK>,
+ <&mmcc CAMSS_CSI3RDI_CLK>,
+ <&mmcc CAMSS_CSI0PHYTIMER_CLK>,
+ <&mmcc CAMSS_CSI1PHYTIMER_CLK>,
+ <&mmcc CAMSS_CSI2PHYTIMER_CLK>,
+ <&mmcc CSIPHY_AHB2CRIF_CLK>,
+ <&mmcc CAMSS_CSI_VFE0_CLK>,
+ <&mmcc CAMSS_CSI_VFE1_CLK>,
+ <&mmcc CAMSS_ISPIF_AHB_CLK>,
+ <&mmcc THROTTLE_CAMSS_AXI_CLK>,
+ <&mmcc CAMSS_TOP_AHB_CLK>,
+ <&mmcc CAMSS_VFE0_AHB_CLK>,
+ <&mmcc CAMSS_VFE0_CLK>,
+ <&mmcc CAMSS_VFE0_STREAM_CLK>,
+ <&mmcc CAMSS_VFE1_AHB_CLK>,
+ <&mmcc CAMSS_VFE1_CLK>,
+ <&mmcc CAMSS_VFE1_STREAM_CLK>,
+ <&mmcc CAMSS_VFE_VBIF_AHB_CLK>,
+ <&mmcc CAMSS_VFE_VBIF_AXI_CLK>;
+
+ clock-names = "ahb",
+ "cphy_csid0",
+ "cphy_csid1",
+ "cphy_csid2",
+ "cphy_csid3",
+ "csi0_ahb",
+ "csi0",
+ "csi0_phy",
+ "csi0_pix",
+ "csi0_rdi",
+ "csi1_ahb",
+ "csi1",
+ "csi1_phy",
+ "csi1_pix",
+ "csi1_rdi",
+ "csi2_ahb",
+ "csi2",
+ "csi2_phy",
+ "csi2_pix",
+ "csi2_rdi",
+ "csi3_ahb",
+ "csi3",
+ "csi3_phy",
+ "csi3_pix",
+ "csi3_rdi",
+ "csiphy0_timer",
+ "csiphy1_timer",
+ "csiphy2_timer",
+ "csiphy_ahb2crif",
+ "csi_vfe0",
+ "csi_vfe1",
+ "ispif_ahb",
+ "throttle_axi",
+ "top_ahb",
+ "vfe0_ahb",
+ "vfe0",
+ "vfe0_stream",
+ "vfe1_ahb",
+ "vfe1",
+ "vfe1_stream",
+ "vfe_ahb",
+ "vfe_axi";
+
+ interrupts = <GIC_SPI 296 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 297 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 298 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 299 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 79 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 80 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 309 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 314 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 315 IRQ_TYPE_EDGE_RISING>;
+
+ interrupt-names = "csid0",
+ "csid1",
+ "csid2",
+ "csid3",
+ "csiphy0",
+ "csiphy1",
+ "csiphy2",
+ "ispif",
+ "vfe0",
+ "vfe1";
+
+ iommus = <&mmss_smmu 0xc00>,
+ <&mmss_smmu 0xc01>,
+ <&mmss_smmu 0xc02>,
+ <&mmss_smmu 0xc03>;
+
+ power-domains = <&mmcc CAMSS_VFE0_GDSC>,
+ <&mmcc CAMSS_VFE1_GDSC>;
+
+ reg = <0x0ca00020 0x10>,
+ <0x0ca30000 0x100>,
+ <0x0ca30400 0x100>,
+ <0x0ca30800 0x100>,
+ <0x0ca30c00 0x100>,
+ <0x0c824000 0x1000>,
+ <0x0ca00120 0x4>,
+ <0x0c825000 0x1000>,
+ <0x0ca00124 0x4>,
+ <0x0c826000 0x1000>,
+ <0x0ca00128 0x4>,
+ <0x0ca31000 0x500>,
+ <0x0ca10000 0x1000>,
+ <0x0ca14000 0x1000>;
+
+ reg-names = "csi_clk_mux",
+ "csid0",
+ "csid1",
+ "csid2",
+ "csid3",
+ "csiphy0",
+ "csiphy0_clk_mux",
+ "csiphy1",
+ "csiphy1_clk_mux",
+ "csiphy2",
+ "csiphy2_clk_mux",
+ "ispif",
+ "vfe0",
+ "vfe1";
+
+ vdda-supply = <®_2v8>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+ };
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v5 17/22] dt-bindings: media: camss: Add qcom,sdm845-camss binding
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (14 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 16/22] dt-bindings: media: camss: Add qcom,sdm660-camss binding Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-17 11:21 ` [PATCH v5 18/22] MAINTAINERS: Change CAMSS documentation to use dtschema bindings Robert Foss
` (4 subsequent siblings)
20 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Add bindings for qcom,sdm845-camss in order to support the camera
subsystem for SDM845.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
---
Changes since v2
- Rob: Removed extra empty lines at end of file
- Rob: Add new line at end of file
- Rob: Remove redundant descriptions
- Rob: Add power domain description
- Rob: Make clock-lanes a constant
- Rob: Rework to conform to new port schema
- Add max & minItems to data-lanes
- Remove ports requirement - endpoint & reg
- Add proper commit message
- Remove Todor as binding maintainer
Changes since v3
- Fixed ordering of IRQs
Changes since v4
- Rob: Added r-b
.../bindings/media/qcom,sdm845-camss.yaml | 370 ++++++++++++++++++
1 file changed, 370 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml
diff --git a/Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml b/Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml
new file mode 100644
index 000000000000..70991b2cd596
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml
@@ -0,0 +1,370 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/qcom,sdm845-camss.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm CAMSS ISP
+
+maintainers:
+ - Robert Foss <robert.foss@linaro.org>
+
+description: |
+ The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms
+
+properties:
+ compatible:
+ const: qcom,sdm845-camss
+
+ clocks:
+ minItems: 36
+ maxItems: 36
+
+ clock-names:
+ items:
+ - const: camnoc_axi
+ - const: cpas_ahb
+ - const: cphy_rx_src
+ - const: csi0
+ - const: csi0_src
+ - const: csi1
+ - const: csi1_src
+ - const: csi2
+ - const: csi2_src
+ - const: csiphy0
+ - const: csiphy0_timer
+ - const: csiphy0_timer_src
+ - const: csiphy1
+ - const: csiphy1_timer
+ - const: csiphy1_timer_src
+ - const: csiphy2
+ - const: csiphy2_timer
+ - const: csiphy2_timer_src
+ - const: csiphy3
+ - const: csiphy3_timer
+ - const: csiphy3_timer_src
+ - const: gcc_camera_ahb
+ - const: gcc_camera_axi
+ - const: slow_ahb_src
+ - const: soc_ahb
+ - const: vfe0_axi
+ - const: vfe0
+ - const: vfe0_cphy_rx
+ - const: vfe0_src
+ - const: vfe1_axi
+ - const: vfe1
+ - const: vfe1_cphy_rx
+ - const: vfe1_src
+ - const: vfe_lite
+ - const: vfe_lite_cphy_rx
+ - const: vfe_lite_src
+
+ interrupts:
+ minItems: 10
+ maxItems: 10
+
+ interrupt-names:
+ items:
+ - const: csid0
+ - const: csid1
+ - const: csid2
+ - const: csiphy0
+ - const: csiphy1
+ - const: csiphy2
+ - const: csiphy3
+ - const: vfe0
+ - const: vfe1
+ - const: vfe_lite
+
+ iommus:
+ maxItems: 4
+
+ power-domains:
+ items:
+ - description: IFE0 GDSC - Image Front End, Global Distributed Switch Controller.
+ - description: IFE1 GDSC - Image Front End, Global Distributed Switch Controller.
+ - description: Titan GDSC - Titan ISP Block, Global Distributed Switch Controller.
+
+ ports:
+ $ref: /schemas/graph.yaml#/properties/ports
+
+ description:
+ CSI input ports.
+
+ properties:
+ port@0:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ maxItems: 1
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ port@1:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ maxItems: 1
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ port@2:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ maxItems: 1
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ port@3:
+ $ref: /schemas/graph.yaml#/$defs/port-base
+ unevaluatedProperties: false
+ description:
+ Input port for receiving CSI data.
+
+ properties:
+ endpoint:
+ $ref: video-interfaces.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ clock-lanes:
+ maxItems: 1
+
+ data-lanes:
+ minItems: 1
+ maxItems: 4
+
+ required:
+ - clock-lanes
+ - data-lanes
+
+ reg:
+ minItems: 10
+ maxItems: 10
+
+ reg-names:
+ items:
+ - const: csid0
+ - const: csid1
+ - const: csid2
+ - const: csiphy0
+ - const: csiphy1
+ - const: csiphy2
+ - const: csiphy3
+ - const: vfe0
+ - const: vfe1
+ - const: vfe_lite
+
+ vdda-supply:
+ description:
+ Definition of the regulator used as analog power supply.
+
+required:
+ - clock-names
+ - clocks
+ - compatible
+ - interrupt-names
+ - interrupts
+ - iommus
+ - power-domains
+ - reg
+ - reg-names
+ - vdda-supply
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/clock/qcom,camcc-sdm845.h>
+ #include <dt-bindings/clock/qcom,gcc-sdm845.h>
+
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ camss: camss@a00000 {
+ compatible = "qcom,sdm845-camss";
+
+ clocks = <&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,
+ <&clock_camcc CAM_CC_CPAS_AHB_CLK>,
+ <&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,
+ <&clock_camcc CAM_CC_IFE_0_CSID_CLK>,
+ <&clock_camcc CAM_CC_IFE_0_CSID_CLK_SRC>,
+ <&clock_camcc CAM_CC_IFE_1_CSID_CLK>,
+ <&clock_camcc CAM_CC_IFE_1_CSID_CLK_SRC>,
+ <&clock_camcc CAM_CC_IFE_LITE_CSID_CLK>,
+ <&clock_camcc CAM_CC_IFE_LITE_CSID_CLK_SRC>,
+ <&clock_camcc CAM_CC_CSIPHY0_CLK>,
+ <&clock_camcc CAM_CC_CSI0PHYTIMER_CLK>,
+ <&clock_camcc CAM_CC_CSI0PHYTIMER_CLK_SRC>,
+ <&clock_camcc CAM_CC_CSIPHY1_CLK>,
+ <&clock_camcc CAM_CC_CSI1PHYTIMER_CLK>,
+ <&clock_camcc CAM_CC_CSI1PHYTIMER_CLK_SRC>,
+ <&clock_camcc CAM_CC_CSIPHY2_CLK>,
+ <&clock_camcc CAM_CC_CSI2PHYTIMER_CLK>,
+ <&clock_camcc CAM_CC_CSI2PHYTIMER_CLK_SRC>,
+ <&clock_camcc CAM_CC_CSIPHY3_CLK>,
+ <&clock_camcc CAM_CC_CSI3PHYTIMER_CLK>,
+ <&clock_camcc CAM_CC_CSI3PHYTIMER_CLK_SRC>,
+ <&gcc GCC_CAMERA_AHB_CLK>,
+ <&gcc GCC_CAMERA_AXI_CLK>,
+ <&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,
+ <&clock_camcc CAM_CC_SOC_AHB_CLK>,
+ <&clock_camcc CAM_CC_IFE_0_AXI_CLK>,
+ <&clock_camcc CAM_CC_IFE_0_CLK>,
+ <&clock_camcc CAM_CC_IFE_0_CPHY_RX_CLK>,
+ <&clock_camcc CAM_CC_IFE_0_CLK_SRC>,
+ <&clock_camcc CAM_CC_IFE_1_AXI_CLK>,
+ <&clock_camcc CAM_CC_IFE_1_CLK>,
+ <&clock_camcc CAM_CC_IFE_1_CPHY_RX_CLK>,
+ <&clock_camcc CAM_CC_IFE_1_CLK_SRC>,
+ <&clock_camcc CAM_CC_IFE_LITE_CLK>,
+ <&clock_camcc CAM_CC_IFE_LITE_CPHY_RX_CLK>,
+ <&clock_camcc CAM_CC_IFE_LITE_CLK_SRC>;
+
+ clock-names = "camnoc_axi",
+ "cpas_ahb",
+ "cphy_rx_src",
+ "csi0",
+ "csi0_src",
+ "csi1",
+ "csi1_src",
+ "csi2",
+ "csi2_src",
+ "csiphy0",
+ "csiphy0_timer",
+ "csiphy0_timer_src",
+ "csiphy1",
+ "csiphy1_timer",
+ "csiphy1_timer_src",
+ "csiphy2",
+ "csiphy2_timer",
+ "csiphy2_timer_src",
+ "csiphy3",
+ "csiphy3_timer",
+ "csiphy3_timer_src",
+ "gcc_camera_ahb",
+ "gcc_camera_axi",
+ "slow_ahb_src",
+ "soc_ahb",
+ "vfe0_axi",
+ "vfe0",
+ "vfe0_cphy_rx",
+ "vfe0_src",
+ "vfe1_axi",
+ "vfe1",
+ "vfe1_cphy_rx",
+ "vfe1_src",
+ "vfe_lite",
+ "vfe_lite_cphy_rx",
+ "vfe_lite_src";
+
+ interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 477 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 478 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 479 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 448 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
+
+ interrupt-names = "csid0",
+ "csid1",
+ "csid2",
+ "csiphy0",
+ "csiphy1",
+ "csiphy2",
+ "csiphy3",
+ "vfe0",
+ "vfe1",
+ "vfe_lite";
+
+ iommus = <&apps_smmu 0x0808 0x0>,
+ <&apps_smmu 0x0810 0x8>,
+ <&apps_smmu 0x0c08 0x0>,
+ <&apps_smmu 0x0c10 0x8>;
+
+ power-domains = <&clock_camcc IFE_0_GDSC>,
+ <&clock_camcc IFE_1_GDSC>,
+ <&clock_camcc TITAN_TOP_GDSC>;
+
+ reg = <0 0xacb3000 0 0x1000>,
+ <0 0xacba000 0 0x1000>,
+ <0 0xacc8000 0 0x1000>,
+ <0 0xac65000 0 0x1000>,
+ <0 0xac66000 0 0x1000>,
+ <0 0xac67000 0 0x1000>,
+ <0 0xac68000 0 0x1000>,
+ <0 0xacaf000 0 0x4000>,
+ <0 0xacb6000 0 0x4000>,
+ <0 0xacc4000 0 0x4000>;
+
+ reg-names = "csid0",
+ "csid1",
+ "csid2",
+ "csiphy0",
+ "csiphy1",
+ "csiphy2",
+ "csiphy3",
+ "vfe0",
+ "vfe1",
+ "vfe_lite";
+
+ vdda-supply = <®_2v8>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+ };
+ };
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v5 18/22] MAINTAINERS: Change CAMSS documentation to use dtschema bindings
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (15 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 17/22] dt-bindings: media: camss: Add qcom,sdm845-camss binding Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-17 11:21 ` [PATCH v5 19/22] media: dt-bindings: media: Remove qcom,camss documentation Robert Foss
` (3 subsequent siblings)
20 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Due to the complexity of describing multiple hardware generations
in one document, switch to using separate dt-bindings.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
---
MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 0da3255abb91..ed3894b653f4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14687,7 +14687,7 @@ M: Todor Tomov <todor.too@gmail.com>
L: linux-media@vger.kernel.org
S: Maintained
F: Documentation/admin-guide/media/qcom_camss.rst
-F: Documentation/devicetree/bindings/media/qcom,camss.txt
+F: Documentation/devicetree/bindings/media/*camss*
F: drivers/media/platform/qcom/camss/
QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v5 19/22] media: dt-bindings: media: Remove qcom,camss documentation
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (16 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 18/22] MAINTAINERS: Change CAMSS documentation to use dtschema bindings Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-17 11:21 ` [PATCH v5 20/22] arm64: dts: sdm845: Add CAMSS ISP node Robert Foss
` (2 subsequent siblings)
20 siblings, 0 replies; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
This documentation has been incorporated in dtschema dt-bindings
for the devices supported by CAMSS and is no longer helpful.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
---
.../devicetree/bindings/media/qcom,camss.txt | 236 ------------------
1 file changed, 236 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/media/qcom,camss.txt
diff --git a/Documentation/devicetree/bindings/media/qcom,camss.txt b/Documentation/devicetree/bindings/media/qcom,camss.txt
deleted file mode 100644
index 498234629e21..000000000000
--- a/Documentation/devicetree/bindings/media/qcom,camss.txt
+++ /dev/null
@@ -1,236 +0,0 @@
-Qualcomm Camera Subsystem
-
-* Properties
-
-- compatible:
- Usage: required
- Value type: <stringlist>
- Definition: Should contain one of:
- - "qcom,msm8916-camss"
- - "qcom,msm8996-camss"
- - "qcom,sdm660-camss"
-- reg:
- Usage: required
- Value type: <prop-encoded-array>
- Definition: Register ranges as listed in the reg-names property.
-- reg-names:
- Usage: required
- Value type: <stringlist>
- Definition: Should contain the following entries:
- - "csiphy0"
- - "csiphy0_clk_mux"
- - "csiphy1"
- - "csiphy1_clk_mux"
- - "csiphy2" (8996 only)
- - "csiphy2_clk_mux" (8996 only)
- - "csid0"
- - "csid1"
- - "csid2" (8996 only)
- - "csid3" (8996 only)
- - "ispif"
- - "csi_clk_mux"
- - "vfe0"
- - "vfe1" (8996 only)
-- interrupts:
- Usage: required
- Value type: <prop-encoded-array>
- Definition: Interrupts as listed in the interrupt-names property.
-- interrupt-names:
- Usage: required
- Value type: <stringlist>
- Definition: Should contain the following entries:
- - "csiphy0"
- - "csiphy1"
- - "csiphy2" (8996 only)
- - "csid0"
- - "csid1"
- - "csid2" (8996 only)
- - "csid3" (8996 only)
- - "ispif"
- - "vfe0"
- - "vfe1" (8996 only)
-- power-domains:
- Usage: required
- Value type: <prop-encoded-array>
- Definition: A phandle and power domain specifier pairs to the
- power domain which is responsible for collapsing
- and restoring power to the peripheral.
-- clocks:
- Usage: required
- Value type: <prop-encoded-array>
- Definition: A list of phandle and clock specifier pairs as listed
- in clock-names property.
-- clock-names:
- Usage: required
- Value type: <stringlist>
- Definition: Should contain the following entries:
- - "top_ahb"
- - "throttle_axi" (660 only)
- - "ispif_ahb"
- - "csiphy0_timer"
- - "csiphy1_timer"
- - "csiphy2_timer" (8996 only)
- - "csiphy_ahb2crif" (660 only)
- - "csi0_ahb"
- - "csi0"
- - "csi0_phy"
- - "csi0_pix"
- - "csi0_rdi"
- - "cphy_csid0" (660 only)
- - "csi1_ahb"
- - "csi1"
- - "csi1_phy"
- - "csi1_pix"
- - "csi1_rdi"
- - "cphy_csid1" (660 only)
- - "csi2_ahb" (8996 only)
- - "csi2" (8996 only)
- - "csi2_phy" (8996 only)
- - "csi2_pix" (8996 only)
- - "csi2_rdi" (8996 only)
- - "cphy_csid2" (660 only)
- - "csi3_ahb" (8996 only)
- - "csi3" (8996 only)
- - "csi3_phy" (8996 only)
- - "csi3_pix" (8996 only)
- - "csi3_rdi" (8996 only)
- - "cphy_csid3" (660 only)
- - "ahb"
- - "vfe0"
- - "csi_vfe0"
- - "vfe0_ahb", (8996 only)
- - "vfe0_stream", (8996 only)
- - "vfe1", (8996 only)
- - "csi_vfe1", (8996 only)
- - "vfe1_ahb", (8996 only)
- - "vfe1_stream", (8996 only)
- - "vfe_ahb"
- - "vfe_axi"
-- vdda-supply:
- Usage: required
- Value type: <phandle>
- Definition: A phandle to voltage supply for CSI2.
-- iommus:
- Usage: required
- Value type: <prop-encoded-array>
- Definition: A list of phandle and IOMMU specifier pairs.
-
-* Nodes
-
-- ports:
- Usage: required
- Definition: As described in video-interfaces.txt in same directory.
- Properties:
- - reg:
- Usage: required
- Value type: <u32>
- Definition: Selects CSI2 PHY interface - PHY0, PHY1
- or PHY2 (8996 only)
- Endpoint node properties:
- - clock-lanes:
- Usage: required
- Value type: <u32>
- Definition: The physical clock lane index. On 8916
- the value must always be <1> as the physical
- clock lane is lane 1. On 8996 the value must
- always be <7> as the hardware supports D-PHY
- and C-PHY, indexes are in a common set and
- D-PHY physical clock lane is labeled as 7.
- - data-lanes:
- Usage: required
- Value type: <prop-encoded-array>
- Definition: An array of physical data lanes indexes.
- Position of an entry determines the logical
- lane number, while the value of an entry
- indicates physical lane index. Lane swapping
- is supported. Physical lane indexes for
- 8916: 0, 2, 3, 4; for 8996: 0, 1, 2, 3.
-
-* An Example
-
- camss: camss@1b00000 {
- compatible = "qcom,msm8916-camss";
- reg = <0x1b0ac00 0x200>,
- <0x1b00030 0x4>,
- <0x1b0b000 0x200>,
- <0x1b00038 0x4>,
- <0x1b08000 0x100>,
- <0x1b08400 0x100>,
- <0x1b0a000 0x500>,
- <0x1b00020 0x10>,
- <0x1b10000 0x1000>;
- reg-names = "csiphy0",
- "csiphy0_clk_mux",
- "csiphy1",
- "csiphy1_clk_mux",
- "csid0",
- "csid1",
- "ispif",
- "csi_clk_mux",
- "vfe0";
- interrupts = <GIC_SPI 78 0>,
- <GIC_SPI 79 0>,
- <GIC_SPI 51 0>,
- <GIC_SPI 52 0>,
- <GIC_SPI 55 0>,
- <GIC_SPI 57 0>;
- interrupt-names = "csiphy0",
- "csiphy1",
- "csid0",
- "csid1",
- "ispif",
- "vfe0";
- power-domains = <&gcc VFE_GDSC>;
- clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,
- <&gcc GCC_CAMSS_ISPIF_AHB_CLK>,
- <&gcc GCC_CAMSS_CSI0PHYTIMER_CLK>,
- <&gcc GCC_CAMSS_CSI1PHYTIMER_CLK>,
- <&gcc GCC_CAMSS_CSI0_AHB_CLK>,
- <&gcc GCC_CAMSS_CSI0_CLK>,
- <&gcc GCC_CAMSS_CSI0PHY_CLK>,
- <&gcc GCC_CAMSS_CSI0PIX_CLK>,
- <&gcc GCC_CAMSS_CSI0RDI_CLK>,
- <&gcc GCC_CAMSS_CSI1_AHB_CLK>,
- <&gcc GCC_CAMSS_CSI1_CLK>,
- <&gcc GCC_CAMSS_CSI1PHY_CLK>,
- <&gcc GCC_CAMSS_CSI1PIX_CLK>,
- <&gcc GCC_CAMSS_CSI1RDI_CLK>,
- <&gcc GCC_CAMSS_AHB_CLK>,
- <&gcc GCC_CAMSS_VFE0_CLK>,
- <&gcc GCC_CAMSS_CSI_VFE0_CLK>,
- <&gcc GCC_CAMSS_VFE_AHB_CLK>,
- <&gcc GCC_CAMSS_VFE_AXI_CLK>;
- clock-names = "top_ahb",
- "ispif_ahb",
- "csiphy0_timer",
- "csiphy1_timer",
- "csi0_ahb",
- "csi0",
- "csi0_phy",
- "csi0_pix",
- "csi0_rdi",
- "csi1_ahb",
- "csi1",
- "csi1_phy",
- "csi1_pix",
- "csi1_rdi",
- "ahb",
- "vfe0",
- "csi_vfe0",
- "vfe_ahb",
- "vfe_axi";
- vdda-supply = <&pm8916_l2>;
- iommus = <&apps_iommu 3>;
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
- port@0 {
- reg = <0>;
- csiphy0_ep: endpoint {
- clock-lanes = <1>;
- data-lanes = <0 2>;
- remote-endpoint = <&ov5645_ep>;
- };
- };
- };
- };
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v5 20/22] arm64: dts: sdm845: Add CAMSS ISP node
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (17 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 19/22] media: dt-bindings: media: Remove qcom,camss documentation Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-21 18:39 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 21/22] arm64: dts: sdm845-db845c: Configure regulators for camss node Robert Foss
2021-02-17 11:21 ` [PATCH v5 22/22] arm64: dts: sdm845-db845c: Enable ov8856 sensor and connect to ISP Robert Foss
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Add the camss dt node for sdm845.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
arch/arm64/boot/dts/qcom/sdm845.dtsi | 135 +++++++++++++++++++++++++++
1 file changed, 135 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index bcf888381f14..4fe93c69908a 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -3911,6 +3911,141 @@ videocc: clock-controller@ab00000 {
#reset-cells = <1>;
};
+ camss: camss@a00000 {
+ compatible = "qcom,sdm845-camss";
+
+ reg = <0 0xacb3000 0 0x1000>,
+ <0 0xacba000 0 0x1000>,
+ <0 0xacc8000 0 0x1000>,
+ <0 0xac65000 0 0x1000>,
+ <0 0xac66000 0 0x1000>,
+ <0 0xac67000 0 0x1000>,
+ <0 0xac68000 0 0x1000>,
+ <0 0xacaf000 0 0x4000>,
+ <0 0xacb6000 0 0x4000>,
+ <0 0xacc4000 0 0x4000>;
+ reg-names = "csid0",
+ "csid1",
+ "csid2",
+ "csiphy0",
+ "csiphy1",
+ "csiphy2",
+ "csiphy3",
+ "vfe0",
+ "vfe1",
+ "vfe_lite";
+
+ interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 477 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 478 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 479 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 448 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "csid0",
+ "csid1",
+ "csid2",
+ "csiphy0",
+ "csiphy1",
+ "csiphy2",
+ "csiphy3",
+ "vfe0",
+ "vfe1",
+ "vfe_lite";
+
+ power-domains = <&clock_camcc IFE_0_GDSC>,
+ <&clock_camcc IFE_1_GDSC>,
+ <&clock_camcc TITAN_TOP_GDSC>;
+
+ clocks = <&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,
+ <&clock_camcc CAM_CC_CPAS_AHB_CLK>,
+ <&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,
+ <&clock_camcc CAM_CC_IFE_0_CSID_CLK>,
+ <&clock_camcc CAM_CC_IFE_0_CSID_CLK_SRC>,
+ <&clock_camcc CAM_CC_IFE_1_CSID_CLK>,
+ <&clock_camcc CAM_CC_IFE_1_CSID_CLK_SRC>,
+ <&clock_camcc CAM_CC_IFE_LITE_CSID_CLK>,
+ <&clock_camcc CAM_CC_IFE_LITE_CSID_CLK_SRC>,
+ <&clock_camcc CAM_CC_CSIPHY0_CLK>,
+ <&clock_camcc CAM_CC_CSI0PHYTIMER_CLK>,
+ <&clock_camcc CAM_CC_CSI0PHYTIMER_CLK_SRC>,
+ <&clock_camcc CAM_CC_CSIPHY1_CLK>,
+ <&clock_camcc CAM_CC_CSI1PHYTIMER_CLK>,
+ <&clock_camcc CAM_CC_CSI1PHYTIMER_CLK_SRC>,
+ <&clock_camcc CAM_CC_CSIPHY2_CLK>,
+ <&clock_camcc CAM_CC_CSI2PHYTIMER_CLK>,
+ <&clock_camcc CAM_CC_CSI2PHYTIMER_CLK_SRC>,
+ <&clock_camcc CAM_CC_CSIPHY3_CLK>,
+ <&clock_camcc CAM_CC_CSI3PHYTIMER_CLK>,
+ <&clock_camcc CAM_CC_CSI3PHYTIMER_CLK_SRC>,
+ <&gcc GCC_CAMERA_AHB_CLK>,
+ <&gcc GCC_CAMERA_AXI_CLK>,
+ <&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,
+ <&clock_camcc CAM_CC_SOC_AHB_CLK>,
+ <&clock_camcc CAM_CC_IFE_0_AXI_CLK>,
+ <&clock_camcc CAM_CC_IFE_0_CLK>,
+ <&clock_camcc CAM_CC_IFE_0_CPHY_RX_CLK>,
+ <&clock_camcc CAM_CC_IFE_0_CLK_SRC>,
+ <&clock_camcc CAM_CC_IFE_1_AXI_CLK>,
+ <&clock_camcc CAM_CC_IFE_1_CLK>,
+ <&clock_camcc CAM_CC_IFE_1_CPHY_RX_CLK>,
+ <&clock_camcc CAM_CC_IFE_1_CLK_SRC>,
+ <&clock_camcc CAM_CC_IFE_LITE_CLK>,
+ <&clock_camcc CAM_CC_IFE_LITE_CPHY_RX_CLK>,
+ <&clock_camcc CAM_CC_IFE_LITE_CLK_SRC>;
+ clock-names = "camnoc_axi",
+ "cpas_ahb",
+ "cphy_rx_src",
+ "csi0",
+ "csi0_src",
+ "csi1",
+ "csi1_src",
+ "csi2",
+ "csi2_src",
+ "csiphy0",
+ "csiphy0_timer",
+ "csiphy0_timer_src",
+ "csiphy1",
+ "csiphy1_timer",
+ "csiphy1_timer_src",
+ "csiphy2",
+ "csiphy2_timer",
+ "csiphy2_timer_src",
+ "csiphy3",
+ "csiphy3_timer",
+ "csiphy3_timer_src",
+ "gcc_camera_ahb",
+ "gcc_camera_axi",
+ "slow_ahb_src",
+ "soc_ahb",
+ "vfe0_axi",
+ "vfe0",
+ "vfe0_cphy_rx",
+ "vfe0_src",
+ "vfe1_axi",
+ "vfe1",
+ "vfe1_cphy_rx",
+ "vfe1_src",
+ "vfe_lite",
+ "vfe_lite_cphy_rx",
+ "vfe_lite_src";
+
+ iommus = <&apps_smmu 0x0808 0x0>,
+ <&apps_smmu 0x0810 0x8>,
+ <&apps_smmu 0x0c08 0x0>,
+ <&apps_smmu 0x0c10 0x8>;
+
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+ };
+
cci: cci@ac4a000 {
compatible = "qcom,sdm845-cci";
#address-cells = <1>;
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 20/22] arm64: dts: sdm845: Add CAMSS ISP node
2021-02-17 11:21 ` [PATCH v5 20/22] arm64: dts: sdm845: Add CAMSS ISP node Robert Foss
@ 2021-02-21 18:39 ` Andrey Konovalov
0 siblings, 0 replies; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-21 18:39 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Thanks,
Andrey
On 17.02.2021 14:21, Robert Foss wrote:
> Add the camss dt node for sdm845.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 135 +++++++++++++++++++++++++++
> 1 file changed, 135 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index bcf888381f14..4fe93c69908a 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -3911,6 +3911,141 @@ videocc: clock-controller@ab00000 {
> #reset-cells = <1>;
> };
>
> + camss: camss@a00000 {
> + compatible = "qcom,sdm845-camss";
> +
> + reg = <0 0xacb3000 0 0x1000>,
> + <0 0xacba000 0 0x1000>,
> + <0 0xacc8000 0 0x1000>,
> + <0 0xac65000 0 0x1000>,
> + <0 0xac66000 0 0x1000>,
> + <0 0xac67000 0 0x1000>,
> + <0 0xac68000 0 0x1000>,
> + <0 0xacaf000 0 0x4000>,
> + <0 0xacb6000 0 0x4000>,
> + <0 0xacc4000 0 0x4000>;
> + reg-names = "csid0",
> + "csid1",
> + "csid2",
> + "csiphy0",
> + "csiphy1",
> + "csiphy2",
> + "csiphy3",
> + "vfe0",
> + "vfe1",
> + "vfe_lite";
> +
> + interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 477 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 478 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 479 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 448 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
> + interrupt-names = "csid0",
> + "csid1",
> + "csid2",
> + "csiphy0",
> + "csiphy1",
> + "csiphy2",
> + "csiphy3",
> + "vfe0",
> + "vfe1",
> + "vfe_lite";
> +
> + power-domains = <&clock_camcc IFE_0_GDSC>,
> + <&clock_camcc IFE_1_GDSC>,
> + <&clock_camcc TITAN_TOP_GDSC>;
> +
> + clocks = <&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,
> + <&clock_camcc CAM_CC_CPAS_AHB_CLK>,
> + <&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,
> + <&clock_camcc CAM_CC_IFE_0_CSID_CLK>,
> + <&clock_camcc CAM_CC_IFE_0_CSID_CLK_SRC>,
> + <&clock_camcc CAM_CC_IFE_1_CSID_CLK>,
> + <&clock_camcc CAM_CC_IFE_1_CSID_CLK_SRC>,
> + <&clock_camcc CAM_CC_IFE_LITE_CSID_CLK>,
> + <&clock_camcc CAM_CC_IFE_LITE_CSID_CLK_SRC>,
> + <&clock_camcc CAM_CC_CSIPHY0_CLK>,
> + <&clock_camcc CAM_CC_CSI0PHYTIMER_CLK>,
> + <&clock_camcc CAM_CC_CSI0PHYTIMER_CLK_SRC>,
> + <&clock_camcc CAM_CC_CSIPHY1_CLK>,
> + <&clock_camcc CAM_CC_CSI1PHYTIMER_CLK>,
> + <&clock_camcc CAM_CC_CSI1PHYTIMER_CLK_SRC>,
> + <&clock_camcc CAM_CC_CSIPHY2_CLK>,
> + <&clock_camcc CAM_CC_CSI2PHYTIMER_CLK>,
> + <&clock_camcc CAM_CC_CSI2PHYTIMER_CLK_SRC>,
> + <&clock_camcc CAM_CC_CSIPHY3_CLK>,
> + <&clock_camcc CAM_CC_CSI3PHYTIMER_CLK>,
> + <&clock_camcc CAM_CC_CSI3PHYTIMER_CLK_SRC>,
> + <&gcc GCC_CAMERA_AHB_CLK>,
> + <&gcc GCC_CAMERA_AXI_CLK>,
> + <&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,
> + <&clock_camcc CAM_CC_SOC_AHB_CLK>,
> + <&clock_camcc CAM_CC_IFE_0_AXI_CLK>,
> + <&clock_camcc CAM_CC_IFE_0_CLK>,
> + <&clock_camcc CAM_CC_IFE_0_CPHY_RX_CLK>,
> + <&clock_camcc CAM_CC_IFE_0_CLK_SRC>,
> + <&clock_camcc CAM_CC_IFE_1_AXI_CLK>,
> + <&clock_camcc CAM_CC_IFE_1_CLK>,
> + <&clock_camcc CAM_CC_IFE_1_CPHY_RX_CLK>,
> + <&clock_camcc CAM_CC_IFE_1_CLK_SRC>,
> + <&clock_camcc CAM_CC_IFE_LITE_CLK>,
> + <&clock_camcc CAM_CC_IFE_LITE_CPHY_RX_CLK>,
> + <&clock_camcc CAM_CC_IFE_LITE_CLK_SRC>;
> + clock-names = "camnoc_axi",
> + "cpas_ahb",
> + "cphy_rx_src",
> + "csi0",
> + "csi0_src",
> + "csi1",
> + "csi1_src",
> + "csi2",
> + "csi2_src",
> + "csiphy0",
> + "csiphy0_timer",
> + "csiphy0_timer_src",
> + "csiphy1",
> + "csiphy1_timer",
> + "csiphy1_timer_src",
> + "csiphy2",
> + "csiphy2_timer",
> + "csiphy2_timer_src",
> + "csiphy3",
> + "csiphy3_timer",
> + "csiphy3_timer_src",
> + "gcc_camera_ahb",
> + "gcc_camera_axi",
> + "slow_ahb_src",
> + "soc_ahb",
> + "vfe0_axi",
> + "vfe0",
> + "vfe0_cphy_rx",
> + "vfe0_src",
> + "vfe1_axi",
> + "vfe1",
> + "vfe1_cphy_rx",
> + "vfe1_src",
> + "vfe_lite",
> + "vfe_lite_cphy_rx",
> + "vfe_lite_src";
> +
> + iommus = <&apps_smmu 0x0808 0x0>,
> + <&apps_smmu 0x0810 0x8>,
> + <&apps_smmu 0x0c08 0x0>,
> + <&apps_smmu 0x0c10 0x8>;
> +
> + status = "disabled";
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> + };
> +
> cci: cci@ac4a000 {
> compatible = "qcom,sdm845-cci";
> #address-cells = <1>;
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 21/22] arm64: dts: sdm845-db845c: Configure regulators for camss node
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (18 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 20/22] arm64: dts: sdm845: Add CAMSS ISP node Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-21 18:39 ` Andrey Konovalov
2021-02-17 11:21 ` [PATCH v5 22/22] arm64: dts: sdm845-db845c: Enable ov8856 sensor and connect to ISP Robert Foss
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Add regulator to camss device tree node.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index a943b3f353ce..5842ab65789c 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -1106,6 +1106,10 @@ &cci {
status = "okay";
};
+&camss {
+ vdda-supply = <&vreg_l1a_0p875>;
+};
+
&cci_i2c0 {
camera@10 {
compatible = "ovti,ov8856";
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 21/22] arm64: dts: sdm845-db845c: Configure regulators for camss node
2021-02-17 11:21 ` [PATCH v5 21/22] arm64: dts: sdm845-db845c: Configure regulators for camss node Robert Foss
@ 2021-02-21 18:39 ` Andrey Konovalov
0 siblings, 0 replies; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-21 18:39 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Thanks,
Andrey
On 17.02.2021 14:21, Robert Foss wrote:
> Add regulator to camss device tree node.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
> arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> index a943b3f353ce..5842ab65789c 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> @@ -1106,6 +1106,10 @@ &cci {
> status = "okay";
> };
>
> +&camss {
> + vdda-supply = <&vreg_l1a_0p875>;
> +};
> +
> &cci_i2c0 {
> camera@10 {
> compatible = "ovti,ov8856";
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v5 22/22] arm64: dts: sdm845-db845c: Enable ov8856 sensor and connect to ISP
2021-02-17 11:21 [PATCH v5 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
` (19 preceding siblings ...)
2021-02-17 11:21 ` [PATCH v5 21/22] arm64: dts: sdm845-db845c: Configure regulators for camss node Robert Foss
@ 2021-02-17 11:21 ` Robert Foss
2021-02-21 18:39 ` Andrey Konovalov
20 siblings, 1 reply; 48+ messages in thread
From: Robert Foss @ 2021-02-17 11:21 UTC (permalink / raw)
To: agross, bjorn.andersson, robert.foss, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat, Andrey Konovalov
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Enable camss & ov8856 DT nodes.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
Changes since v1
- Laurent: Fix subject
- Laurent: Remove redundant regulator labels
- Laurent: Remove empty line
Changes since v3
- Fixed ordering of IRQs
- Add newlines for better readability
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 5842ab65789c..d89286f6aacb 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -1108,6 +1108,21 @@ &cci {
&camss {
vdda-supply = <&vreg_l1a_0p875>;
+
+ status = "ok";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ port@0 {
+ reg = <0>;
+ csiphy0_ep: endpoint {
+ clock-lanes = <1>;
+ data-lanes = <1 2 3 4>;
+ remote-endpoint = <&ov8856_ep>;
+ };
+ };
+ };
};
&cci_i2c0 {
@@ -1139,7 +1154,7 @@ camera@10 {
avdd-supply = <&cam0_avdd_2v8>;
dvdd-supply = <&cam0_dvdd_1v2>;
- status = "disable";
+ status = "ok";
port {
ov8856_ep: endpoint {
@@ -1147,7 +1162,7 @@ ov8856_ep: endpoint {
link-frequencies = /bits/ 64
<360000000 180000000>;
data-lanes = <1 2 3 4>;
-// remote-endpoint = <&csiphy0_ep>;
+ remote-endpoint = <&csiphy0_ep>;
};
};
};
--
2.27.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v5 22/22] arm64: dts: sdm845-db845c: Enable ov8856 sensor and connect to ISP
2021-02-17 11:21 ` [PATCH v5 22/22] arm64: dts: sdm845-db845c: Enable ov8856 sensor and connect to ISP Robert Foss
@ 2021-02-21 18:39 ` Andrey Konovalov
0 siblings, 0 replies; 48+ messages in thread
From: Andrey Konovalov @ 2021-02-21 18:39 UTC (permalink / raw)
To: Robert Foss, agross, bjorn.andersson, todor.too, mchehab,
robh+dt, angelogioacchino.delregno, linux-arm-msm, linux-media,
devicetree, linux-kernel, AngeloGioacchino Del Regno,
Sakari Ailus, Nicolas Boichat
Cc: Rob Herring, Tomasz Figa, Azam Sadiq Pasha Kapatrala Syed,
Sarvesh Sridutt, Laurent Pinchart, Jonathan Marek
Hi Robert,
Thank you for your patch!
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Thanks,
Andrey
On 17.02.2021 14:21, Robert Foss wrote:
> Enable camss & ov8856 DT nodes.
>
> Signed-off-by: Robert Foss <robert.foss@linaro.org>
> ---
>
> Changes since v1
> - Laurent: Fix subject
> - Laurent: Remove redundant regulator labels
> - Laurent: Remove empty line
>
> Changes since v3
> - Fixed ordering of IRQs
> - Add newlines for better readability
>
> arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 19 +++++++++++++++++--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> index 5842ab65789c..d89286f6aacb 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> @@ -1108,6 +1108,21 @@ &cci {
>
> &camss {
> vdda-supply = <&vreg_l1a_0p875>;
> +
> + status = "ok";
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + port@0 {
> + reg = <0>;
> + csiphy0_ep: endpoint {
> + clock-lanes = <1>;
> + data-lanes = <1 2 3 4>;
> + remote-endpoint = <&ov8856_ep>;
> + };
> + };
> + };
> };
>
> &cci_i2c0 {
> @@ -1139,7 +1154,7 @@ camera@10 {
> avdd-supply = <&cam0_avdd_2v8>;
> dvdd-supply = <&cam0_dvdd_1v2>;
>
> - status = "disable";
> + status = "ok";
>
> port {
> ov8856_ep: endpoint {
> @@ -1147,7 +1162,7 @@ ov8856_ep: endpoint {
> link-frequencies = /bits/ 64
> <360000000 180000000>;
> data-lanes = <1 2 3 4>;
> -// remote-endpoint = <&csiphy0_ep>;
> + remote-endpoint = <&csiphy0_ep>;
> };
> };
> };
>
^ permalink raw reply [flat|nested] 48+ messages in thread