CCS driver
Sakari Ailus
maintainerv2 cover CCS driver
Hello everyone,
Here's a set of patches that turn the existing SMIA driver into a MIPI CCS driver while maintaining SMIA support. A number of bugs in the existing code are fixed in this set, too.
The changes at this point are primarily focused on dealing with new mandatory driver features related to PLL configuration (as CCS allows for much more variation there) and things such as integer conversion from U16.U16 format instead of float. There are some other new features as well such as digital gain and support for getting device specific analogue gain coefficients.
A new feature in CCS is CCS static data which makes it possible to obtain sensor's capabilities and limits from a file chosen based on sensor identification. CCS static data is used also for storing MSR registers so supporting new, CCS compliant devices requires no driver changes.
Note that the library as well as the register definitions are dual licensed under GNU GPL v2 OR BSD 3-clause licenses for use outside the Linux kernel.
Also DT bindings are updated accordingly and converted to YAML format.
More information on MIPI CCS can be found here:
<URL:https://www.mipi.org/specifications/camera-command-set>
Comments are welcome.
since v1 (DT bindings):
- Remove DT vendor prefix, use vendor-less compatible string
- Add spec version specific compatible strings together with the generic one
- Add VCore and VIO regulators
- Fix rotation property description
- Use less verbose definition of data-lanes property
- Remove CSI-1 bus; this isn't really there, the old stuff is all CCP2
- Make bus-type a required property
- Use additionalProperties: false on the device
- Fix the example (change compatible string, remove nokia,nvm leftover property)
- Fix MAINTAINERS
since v1 (driver):
- Generate register and limit definitions from source
- Style fixes in ccs-pll.c
- Use correct MODULE_LICENSE in ccs-pll.c
- Support for VCore and VIO regulators
- Remove extra delays from power-up sequence
- Adapt to parsing changes in v4l2_fwnode_endpoint_alloc_parse(), i.e. call it just once. This also fixes parsing bus-type-less DT binaries.
- Fix MAINTAINERS
Sakari Ailus (106):
smiapp: Generate CCS register definitions and limits
smiapp: Use CCS register flags
smiapp: Calculate CCS limit offsets and limit buffer size
smiapp: Remove macros for defining registers, merge definitions
smiapp: Add macros for accessing CCS registers
smiapp: Use MIPI CCS version and manufacturer ID information
smiapp: Read CCS limit values
smiapp: Switch to CCS limits
smiapp: Obtain frame descriptor from CCS limits
smiapp: Use CCS limits in reading data format descriptors
smiapp: Use CCS limits in reading binning capabilities
smiapp: Use CCS registers
smiapp: Remove quirk function for writing a single 8-bit register
smiapp: Rename register access functions
smiapp: Internal rename to CCS
smiapp: Differentiate CCS sensors from SMIA in subdev naming
smiapp: Rename as "ccs"
ccs: Remove profile concept
ccs: Give all subdevs a function
dt-bindings: nokia,smia: Fix link-frequencies documentation
dt-bindings: nokia,smia: Make vana-supply optional
dt-bindings: nokia,smia: Remove nokia,nvm-size property
dt-bindings: nokia,smia: Convert to YAML
dt-bindings: nokia,smia: Use better active polarity for reset
dt-bindings: nokia,smia: Amend SMIA bindings with MIPI CCS support
dt-bindings: mipi-ccs: Add bus-type for C-PHY support
ccs: Request for "reset" GPIO
ccs: Add MIPI CCS compatible strings
ccs: Remove the I²C ID table
ccs: Remove remaining support for platform data
ccs: Make hwcfg part of the device specific struct
ccs: Fix obtaining bus information from firmware
ccs: Add CCS static data parser library
ccs: Combine revision number major and minor into one
ccs: Read CCS static data from firmware binaries
ccs: Stop reading arrays after the first zero
ccs: The functions to get compose or crop rectangle never return NULL
ccs: Replace somewhat harsh internal checks based on BUG with WARN_ON
ccs: Refactor register reading a little
ccs: Make real to integer number conversion optional
ccs: Move limit value real to integer conversion from read to access
time
ccs: Read ireal numbers correctly
smiapp-pll: Rename as ccs-pll
ccs-pll: Fix MODULE_LICENSE
ccs: Change my e-mail address
ccs: Add support for manufacturer regs from sensor and module files
ccs: Use static data read-only registers
ccs: Clean up runtime PM usage
ccs: Wrap long lines, unwrap short ones
ccs: Add device compatible identifiers for telling SMIA and CCS apart
ccs: Use longer pre-I²C sleep for CCS compliant devices
ccs: Remove unnecessary delays from power-up sequence
dt-bindings: mipi,ccs: Don't mention vana voltage
dt-bindings: mipi,ccs: Add vcore and vio supplies
ccs: Use all regulators
ccs-pll: Don't use div_u64 to divide a 32-bit number
ccs-pll: Split limits and PLL configuration into front and back parts
ccs-pll: Use correct VT divisor for calculating VT SYS divisor
ccs-pll: End search if there are no better values available
ccs-pll: Remove parallel bus support
ccs-pll: Differentiate between CSI-2 D-PHY and C-PHY
ccs-pll: Move the flags field down, away from 8-bit fields
ccs-pll: Document the structs in the header as well as the function
ccs-pll: Use the BIT macro
ccs-pll: Begin calculation from OP system clock frequency
ccs-pll: Fix condition for pre-PLL divider lower bound
ccs-pll: Avoid overflow in pre-PLL divisor lower bound search
ccs-pll: Fix comment on check against maximum PLL multiplier
ccs-pll: Fix check for PLL multiplier upper bound
ccs-pll: Use explicit 32-bit unsigned type
ccs-pll: Add support for lane speed model
ccs: Add support for lane speed model
ccs-pll: Add support for decoupled OP domain calculation
ccs-pll: Add support for extended input PLL clock divider
ccs-pll: Support two cycles per pixel on OP domain
ccs-pll: Add support flexible OP PLL pixel clock divider
ccs-pll: Add sanity checks
ccs-pll: Add C-PHY support
ccs-pll: Split off VT subtree calculation
ccs-pll: Check for derating and overrating, support non-derating
sensors
ccs-pll: Better separate OP and VT sub-tree calculation
ccs-pll: Print relevant information on PLL tree
ccs-pll: Rework bounds checks
ccs-pll: Make VT divisors 16-bit
ccs-pll: Fix VT post-PLL divisor calculation
ccs-pll: Separate VT divisor limit calculation from the rest
ccs-pll: Add trivial dual PLL support
ccs: Dual PLL support
ccs-pll: Add support for DDR OP system and pixel clocks
ccs: Add support for DDR OP SYS and OP PIX clocks
ccs: Print written register values
ccs-pll: Print pixel rates
ccs: Add support for obtaining C-PHY configuration from firmware
ccs: Add digital gain support
ccs: Add support for old-style SMIA digital gain
ccs: Remove analogue gain field
ccs: Only add analogue gain control if the device supports it
v4l: uapi: Add user control base for CCS controls
v4l: uapi: ccs: Add controls for analogue gain constants
ccs: Add support for analogue gain coefficient controls
v4l: uapi: ccs: Add controls for CCS alternative analogue gain
ccs: Add support for alternate analogue global gain
ccs: Add debug prints for MSR registers
v4l: uapi: ccs: Add CCS controls for shading correction
ccs: Add shading correction and luminance correction level controls
ccs: Add CCS ACPI device ID
.../bindings/media/i2c/mipi-ccs.yaml | 135 +
.../bindings/media/i2c/nokia,smia.txt | 66 -
MAINTAINERS | 21 +-
drivers/media/i2c/Kconfig | 4 +-
drivers/media/i2c/Makefile | 4 +-
drivers/media/i2c/{smiapp-pll.c => ccs-pll.c} | 1012 ++++---
drivers/media/i2c/{smiapp-pll.h => ccs-pll.h} | 196 +-
drivers/media/i2c/{smiapp => ccs}/Kconfig | 9 +-
drivers/media/i2c/{smiapp => ccs}/Makefile | 18 +-
.../{smiapp/smiapp-core.c => ccs/ccs-core.c} | 2426 ++++++++++-------
drivers/media/i2c/ccs/ccs-data-defs.h | 215 ++
drivers/media/i2c/ccs/ccs-data.c | 949 +++++++
drivers/media/i2c/ccs/ccs-data.h | 116 +
drivers/media/i2c/ccs/ccs-os.h | 15 +
.../smiapp-quirk.c => ccs/ccs-quirk.c} | 105 +-
.../smiapp-quirk.h => ccs/ccs-quirk.h} | 54 +-
.../smiapp-regs.c => ccs/ccs-reg-access.c} | 296 +-
.../smiapp-regs.h => ccs/ccs-reg-access.h} | 40 +-
drivers/media/i2c/ccs/ccs-regs.txt | 1041 +++++++
.../media/i2c/{smiapp/smiapp.h => ccs/ccs.h} | 185 +-
drivers/media/i2c/ccs/mk-ccs-regs | 405 +++
.../smiapp-reg.h => ccs/smiapp-reg-defs.h} | 502 +++-
drivers/media/i2c/smiapp/smiapp-limits.c | 118 -
drivers/media/i2c/smiapp/smiapp-limits.h | 114 -
drivers/media/i2c/smiapp/smiapp-reg-defs.h | 489 ----
include/uapi/linux/ccs.h | 21 +
include/uapi/linux/v4l2-controls.h | 6 +
27 files changed, 6166 insertions(+), 2396 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
delete mode 100644 Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
rename drivers/media/i2c/{smiapp-pll.c => ccs-pll.c} (16%)
rename drivers/media/i2c/{smiapp-pll.h => ccs-pll.h} (18%)
rename drivers/media/i2c/{smiapp => ccs}/Kconfig (48%)
rename drivers/media/i2c/{smiapp => ccs}/Makefile (14%)
rename drivers/media/i2c/{smiapp/smiapp-core.c => ccs/ccs-core.c} (43%)
create mode 100644 drivers/media/i2c/ccs/ccs-data-defs.h
create mode 100644 drivers/media/i2c/ccs/ccs-data.c
create mode 100644 drivers/media/i2c/ccs/ccs-data.h
create mode 100644 drivers/media/i2c/ccs/ccs-os.h
rename drivers/media/i2c/{smiapp/smiapp-quirk.c => ccs/ccs-quirk.c} (63%)
rename drivers/media/i2c/{smiapp/smiapp-quirk.h => ccs/ccs-quirk.h} (53%)
rename drivers/media/i2c/{smiapp/smiapp-regs.c => ccs/ccs-reg-access.c} (37%)
rename drivers/media/i2c/{smiapp/smiapp-regs.h => ccs/ccs-reg-access.h} (16%)
create mode 100644 drivers/media/i2c/ccs/ccs-regs.txt
rename drivers/media/i2c/{smiapp/smiapp.h => ccs/ccs.h} (52%)
create mode 100644 drivers/media/i2c/ccs/mk-ccs-regs
rename drivers/media/i2c/{smiapp/smiapp-reg.h => ccs/smiapp-reg-defs.h} (10%)
delete mode 100644 drivers/media/i2c/smiapp/smiapp-limits.c
delete mode 100644 drivers/media/i2c/smiapp/smiapp-limits.h
delete mode 100644 drivers/media/i2c/smiapp/smiapp-reg-defs.h
create mode 100644 include/uapi/linux/ccs.hSignature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 1/106 smiapp: Generate CCS register definitions and limits
Add register definitions of the MIPI CCS 1.1 standard.
The CCS driver makes extended use of device's capability registers that are dependent on CCS version. This involves having an in-memory data structure for limit and capability information, creating that data structure and accessing it.
The register definitions as well as the definitions of this data structure are generated from a text file using a Perl script. Do the generation here and so avoid making manual, error-prone changes to the several generated files.
Also add ccs-os.h header that contains Linux headers to be included.
--- drivers/media/i2c/smiapp/Makefile | 15 +- drivers/media/i2c/smiapp/ccs-os.h | 15 + drivers/media/i2c/smiapp/ccs-regs.txt | 1041 +++++++++++++++++++++++++ drivers/media/i2c/smiapp/mk-ccs-regs | 405 ++++++++++ 4 files changed, 1475 insertions(+), 1 deletion(-) create mode 100644 drivers/media/i2c/smiapp/ccs-os.h create mode 100644 drivers/media/i2c/smiapp/ccs-regs.txt create mode 100644 drivers/media/i2c/smiapp/mk-ccs-regs
drivers/media/i2c/smiapp/Makefile +14 -1
@@ -1,6 +1,19 @@ # SPDX-License-Identifier: GPL-2.0-only smiapp-objs += smiapp-core.o smiapp-regs.o \ - smiapp-quirk.o smiapp-limits.o + smiapp-quirk.o smiapp-limits.o \ + ccs-limits.o obj-$(CONFIG_VIDEO_SMIAPP) += smiapp.o ccflags-y += -I $(srctree)/drivers/media/i2c + +quiet_cmd_perlgen = PERL $(src)/mk-ccs-regs + cmd_perlgen = $(PERL) $(src)/mk-ccs-regs -e $(obj)/ccs-regs.h \ + -L $(obj)/ccs-limits.h -l $(obj)/ccs-limits.c \ + -c $(src)/ccs-regs.txt + +$(obj)/ccs-limits.c: $(src)/ccs-regs.txt + $(call cmd,perlgen) + +$(obj)/ccs-regs.h $(obj)/ccs-limits.h: $(obj)/ccs-limits.c + +clean-files: $(obj)/ccs-regs.h $(obj)/ccs-limits.h $(obj)/ccs-limits.c
drivers/media/i2c/smiapp/ccs-os.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright 2020 Intel Corporation */ + +#include <linux/device.h> +#include <linux/errno.h> +#include <linux/limits.h> +#include <linux/mm.h> +#include <linux/slab.h> +#include <linux/types.h> + +typedef struct device *printf_ctx ; +#define os_printf dev_dbg +#define os_calloc (size) kvcalloc(1, size, GFP_KERNEL) +#define os_free kvfree +#define align2 ALIGN
drivers/media/i2c/smiapp/ccs-regs.txt new file +1041 -0
1,041 lines not on this page · raw message
drivers/media/i2c/smiapp/mk-ccs-regs new file +405 -0
405 lines not on this page · raw message
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 2/106 smiapp: Use CCS register flags
Use the CCS register flags instead of the old smia flags. The new flags include the register width information that was separate from the register flags previously.
--- drivers/media/i2c/smiapp/smiapp-reg-defs.h | 8 ++++---- drivers/media/i2c/smiapp/smiapp-regs.c | 20 +++++++++++++------- drivers/media/i2c/smiapp/smiapp-regs.h | 13 ++++--------- 3 files changed, 21 insertions(+), 20 deletions(-)
drivers/media/i2c/smiapp/smiapp-reg-defs.h +4 -4
@@ -7,11 +7,11 @@* Copyright (C) 2011--2012 Nokia Corporation * Contact: Sakari Ailus <[email protected]> */ -#define SMIAPP_REG_MK_U8 (r) ((SMIAPP_REG_8BIT << 16) | (r)) -#define SMIAPP_REG_MK_U16 (r) ((SMIAPP_REG_16BIT << 16) | (r)) -#define SMIAPP_REG_MK_U32 (r) ((SMIAPP_REG_32BIT << 16) | (r)) +#define SMIAPP_REG_MK_U8 (r) (r) +#define SMIAPP_REG_MK_U16 (r) (CCS_FL_16BIT | (r)) +#define SMIAPP_REG_MK_U32 (r) (CCS_FL_32BIT | (r)) -#define SMIAPP_REG_MK_F32 (r) (SMIAPP_REG_FLAG_FLOAT | (SMIAPP_REG_32BIT << 16) | (r)) +#define SMIAPP_REG_MK_F32 (r) (CCS_FL_FLOAT_IREAL | CCS_FL_32BIT | (r))#define SMIAPP_REG_U16_MODEL_ID SMIAPP_REG_MK_U16(0x0000)#define SMIAPP_REG_U8_REVISION_NUMBER_MAJOR SMIAPP_REG_MK_U8(0x0002)
drivers/media/i2c/smiapp/smiapp-regs.c +13 -7
@@ -133,6 +133,16 @@ static int ____smiapp_read_8only(struct smiapp_sensor *sensor, u16 reg,return 0 ; } +unsigned int ccs_reg_width (u32 reg) +{ +if (reg &CCS_FL_16BIT ) +return sizeof (uint16_t ); +if (reg &CCS_FL_32BIT ) +return sizeof (uint32_t ); + +return sizeof (uint8_t ); +} +/* * Read a 8/16/32-bit i2c register. The value is returned in 'val'. * Returns zero if successful, or non-zero otherwise.
@@ -141,13 +151,9 @@ static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val, bool only8) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd); -u8 len =SMIAPP_REG_WIDTH (reg); +unsigned int len =ccs_reg_width (reg);int rval; -if (len !=SMIAPP_REG_8BIT && len !=SMIAPP_REG_16BIT - && len !=SMIAPP_REG_32BIT ) -return -EINVAL ; -if (!only8) rval =____smiapp_read (sensor,SMIAPP_REG_ADDR (reg), len, val);else
@@ -156,7 +162,7 @@ static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val,if (rval <0 )return rval; -if (reg &SMIAPP_REG_FLAG_FLOAT ) +if (reg &CCS_FL_FLOAT_IREAL ) *val =float_to_u32_mul_1000000 (client, *val);return 0 ;
@@ -204,7 +210,7 @@ int smiapp_write_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 val)struct i2c_msg msg;unsigned char data[6 ];unsigned int retries; -u8 len =SMIAPP_REG_WIDTH (reg); +unsigned int len =ccs_reg_width (reg);int r;if (len >sizeof (data) -2 )
drivers/media/i2c/smiapp/smiapp-regs.h +4 -9
@@ -14,16 +14,9 @@#include <linux/i2c.h> #include <linux/types.h> -#define SMIAPP_REG_ADDR (reg) ((u16)reg) -#define SMIAPP_REG_WIDTH (reg) ((u8)(reg >> 16)) -#define SMIAPP_REG_FLAGS (reg) ((u8)(reg >> 24)) - -/* Use upper 8 bits of the type field for flags */ -#define SMIAPP_REG_FLAG_FLOAT (1 << 24) +#include "ccs-regs.h" -#define SMIAPP_REG_8BIT 1 -#define SMIAPP_REG_16BIT 2 -#define SMIAPP_REG_32BIT 4 +#define SMIAPP_REG_ADDR (reg) ((u16)reg)struct smiapp_sensor ;
@@ -33,4 +26,6 @@ int smiapp_read_8only(struct smiapp_sensor *sensor, u32 reg, u32 *val);int smiapp_write_no_quirk (struct smiapp_sensor *sensor,u32 reg,u32 val);int smiapp_write (struct smiapp_sensor *sensor,u32 reg,u32 val); +unsigned int ccs_reg_width (u32 reg); +#endif
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 3/106 smiapp: Calculate CCS limit offsets and limit buffer size
In reply to Sakari AilusCalculate the limit offsets and the size of the limit buffer. CCS limits are read into this buffer, and the offsets are helpful in accessing the information in it.
--- drivers/media/i2c/smiapp/smiapp-core.c | 40 +++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)
drivers/media/i2c/smiapp/smiapp-core.c +39 -1
@@ -27,6 +27,7 @@#include <media/v4l2-fwnode.h> #include <media/v4l2-device.h> +#include "ccs-limits.h" #include "smiapp.h" #define SMIAPP_ALIGN_DIM (dim, flags) \
@@ -34,6 +35,11 @@ ? ALIGN((dim), 2) \ : (dim) & ~1) +struct ccs_limit_offset { +u16 lim; +u16 info; +} ccs_limit_offsets[CCS_L_LAST +1 ]; +/* * smiapp_module_idents - supported camera modules */
@@ -3166,7 +3172,39 @@ static struct i2c_driver smiapp_i2c_driver = { .id_table = smiapp_id_table, }; -module_i2c_driver (smiapp_i2c_driver); +static int smiapp_module_init (void ) +{ +unsigned int i, l; + +for (i =0 , l =0 ; ccs_limits[i].size && l <CCS_L_LAST ; i++) { +if (!(ccs_limits[i].flags &CCS_L_FL_SAME_REG )) { + ccs_limit_offsets[l +1 ].lim = +ALIGN (ccs_limit_offsets[l].lim + + ccs_limits[i].size, +ccs_reg_width (ccs_limits[i +1 ].reg)); + ccs_limit_offsets[l].info = i; + l++; + }else { + ccs_limit_offsets[l].lim += ccs_limits[i].size; + } + } + +if (WARN_ON (ccs_limits[i].size)) +return -EINVAL ; + +if (WARN_ON (l !=CCS_L_LAST )) +return -EINVAL ; + +return i2c_register_driver (THIS_MODULE , &smiapp_i2c_driver); +} + +static void smiapp_module_cleanup (void ) +{ +i2c_del_driver (&smiapp_i2c_driver); +} + +module_init (smiapp_module_init); +module_exit (smiapp_module_cleanup);MODULE_AUTHOR ("Sakari Ailus <[email protected]>" );MODULE_DESCRIPTION ("Generic SMIA/SMIA++ camera module driver" );
Signature · 1 line
2.27.0
Re: [PATCH v2 003/106] smiapp: Calculate CCS limit offsets and limit buffer size
Em Wed, 7 Oct 2020 11:44:23 +0300
Sakari Ailus <[email protected]> escreveu:
Quoted 22 lines
Calculate the limit offsets and the size of the limit buffer. CCS limits are read into this buffer, and the offsets are helpful in accessing the information in it.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/smiapp/smiapp-core.c | 40 +++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)drivers/media/i2c/smiapp/smiapp-core.c +1
-0@@ -27,6 +27,7 @@#include <media/v4l2-fwnode.h> #include <media/v4l2-device.h> +#include "ccs-limits.h" #include "smiapp.h" #define SMIAPP_ALIGN_DIM (dim, flags) \
drivers/media/i2c/smiapp/smiapp-core.c line 42
Quoted 8 lines
drivers/media/i2c/smiapp/smiapp-core.c +5
-0@@ -34,6 +35,11 @@ ? ALIGN((dim), 2) \ : (dim) & ~1) +struct ccs_limit_offset { +u16 lim; +u16 info; +} ccs_limit_offsets[CCS_L_LAST +1 ]; +
Hmm... that sounds weird.
As you're declaring the struct inside smiapp-core.c, this should be static...
Quoted 17 lines
drivers/media/i2c/smiapp/smiapp-core.c +9
-1/* * smiapp_module_idents - supported camera modules */ @@ -3166,7 +3172,39 @@ static struct i2c_driver smiapp_i2c_driver = { .id_table = smiapp_id_table, }; -module_i2c_driver (smiapp_i2c_driver); +static int smiapp_module_init (void ) +{ +unsigned int i, l; + +for (i =0 , l =0 ; ccs_limits[i].size && l <CCS_L_LAST ; i++) { +if (!(ccs_limits[i].flags &CCS_L_FL_SAME_REG )) { + ccs_limit_offsets[l +1 ].lim = + ALIGN(ccs_limit_offsets[l].lim + + ccs_limits[i].size,
drivers/media/i2c/smiapp/smiapp-core.c static struct i2c_driver smiapp_i2c_driver = { · line 3193
Quoted 10 lines
drivers/media/i2c/smiapp/smiapp-core.c +10
-0+ ccs_reg_width(ccs_limits[i + 1].reg)); + ccs_limit_offsets[l].info = i; + l++; + }else { + ccs_limit_offsets[l].lim += ccs_limits[i].size; + } + } + +if (WARN_ON (ccs_limits[i].size)) +return -EINVAL ;
... yet, this is the only place where this is used.
It sounds to me that you should move the var to be inside this function,
e. g. changing the above to:
struct ccs_limit_offset {
u16 lim;
u16 info;
};static int smiapp_module_init(void)
{
struct ccs_limit_offset ccs_limit_offsets[CCS_L_LAST + 1];
unsigned int i, l;Quoted 7 lines
drivers/media/i2c/smiapp/smiapp-core.c +7
-0+ +if (WARN_ON (l !=CCS_L_LAST )) +return -EINVAL ; + +return i2c_register_driver (THIS_MODULE , &smiapp_i2c_driver); +} +
drivers/media/i2c/smiapp/smiapp-core.c static struct i2c_driver smiapp_i2c_driver = { · line 3210
Quoted 10 lines
drivers/media/i2c/smiapp/smiapp-core.c +7
-0+static void smiapp_module_cleanup (void ) +{ +i2c_del_driver (&smiapp_i2c_driver); +} + +module_init (smiapp_module_init); +module_exit (smiapp_module_cleanup);MODULE_AUTHOR ("Sakari Ailus <[email protected]>" );MODULE_DESCRIPTION ("Generic SMIA/SMIA++ camera module driver" );
Thanks,
Mauro
Re: [PATCH v2 003/106] smiapp: Calculate CCS limit offsets and limit buffer size
Em Thu, 5 Nov 2020 08:43:38 +0100
Mauro Carvalho Chehab <[email protected]> escreveu:
Quoted 78 lines
Em Wed, 7 Oct 2020 11:44:23 +0300
Sakari Ailus <[email protected]> escreveu:Quoted 22 lines
Calculate the limit offsets and the size of the limit buffer. CCS limits are read into this buffer, and the offsets are helpful in accessing the information in it.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/smiapp/smiapp-core.c | 40 +++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)drivers/media/i2c/smiapp/smiapp-core.c +1
-0@@ -27,6 +27,7 @@#include <media/v4l2-fwnode.h> #include <media/v4l2-device.h> +#include "ccs-limits.h" #include "smiapp.h" #define SMIAPP_ALIGN_DIM (dim, flags) \drivers/media/i2c/smiapp/smiapp-core.c line 42
Quoted 8 lines
drivers/media/i2c/smiapp/smiapp-core.c +5
-0@@ -34,6 +35,11 @@ ? ALIGN((dim), 2) \ : (dim) & ~1) +struct ccs_limit_offset { +u16 lim; +u16 info; +} ccs_limit_offsets[CCS_L_LAST +1 ]; +Hmm... that sounds weird.
As you're declaring the struct inside
smiapp-core.c, this should be static...Quoted 17 lines
drivers/media/i2c/smiapp/smiapp-core.c +9
-1/* * smiapp_module_idents - supported camera modules */ @@ -3166,7 +3172,39 @@ static struct i2c_driver smiapp_i2c_driver = { .id_table = smiapp_id_table, }; -module_i2c_driver (smiapp_i2c_driver); +static int smiapp_module_init (void ) +{ +unsigned int i, l; + +for (i =0 , l =0 ; ccs_limits[i].size && l <CCS_L_LAST ; i++) { +if (!(ccs_limits[i].flags &CCS_L_FL_SAME_REG )) { + ccs_limit_offsets[l +1 ].lim = + ALIGN(ccs_limit_offsets[l].lim + + ccs_limits[i].size,drivers/media/i2c/smiapp/smiapp-core.c static struct i2c_driver smiapp_i2c_driver = { · line 3193
Quoted 10 lines
drivers/media/i2c/smiapp/smiapp-core.c +10
-0+ ccs_reg_width(ccs_limits[i + 1].reg)); + ccs_limit_offsets[l].info = i; + l++; + }else { + ccs_limit_offsets[l].lim += ccs_limits[i].size; + } + } + +if (WARN_ON (ccs_limits[i].size)) +return -EINVAL ;... yet, this is the only place where this is used.
It sounds to me that you should move the var to be inside this function,
e. g. changing the above to:
struct ccs_limit_offset { u16 lim; u16 info; };
Quoted 4 lines
static int
smiapp_module_init(void){ struct ccs_limit_offset ccs_limit_offsets[CCS_L_LAST + 1]; unsigned int i, l;
Ok, it sounds that you start using this on patch 007/106.
So, it sounds that you should just need to add "static" to its definition.
Quoted 17 lines
Quoted 17 lines
drivers/media/i2c/smiapp/smiapp-core.c +14
-0+ +if (WARN_ON (l !=CCS_L_LAST )) +return -EINVAL ; + +return i2c_register_driver (THIS_MODULE , &smiapp_i2c_driver); +} + +static void smiapp_module_cleanup (void ) +{ +i2c_del_driver (&smiapp_i2c_driver); +} + +module_init (smiapp_module_init); +module_exit (smiapp_module_cleanup);
Quoted 7 lines
drivers/media/i2c/smiapp/smiapp-core.c static struct i2c_driver smiapp_i2c_driver = { · line 3210
Quoted 2 lines
drivers/media/i2c/smiapp/smiapp-core.c +0
-0MODULE_AUTHOR ("Sakari Ailus <[email protected]>" );MODULE_DESCRIPTION ("Generic SMIA/SMIA++ camera module driver" );Thanks,
Mauro
Thanks,
Mauro
Sakari Ailus
maintainerRe: [PATCH v2 003/106] smiapp: Calculate CCS limit offsets and limit buffer size
Hi Mauro,
Quoted 9 lines · Mauro Carvalho Chehab
Quoted 4 lines
static int
smiapp_module_init(void){ struct ccs_limit_offset ccs_limit_offsets[CCS_L_LAST + 1]; unsigned int i, l;Ok, it sounds that you start using this on patch 007/106.
So, it sounds that you should just need to add "static" to its definition.
Agreed, I'll add that for v3.
Signature · 1 line
Sakari Ailus
Sakari Ailus
maintainerPATCH v2 4/106 smiapp: Remove macros for defining registers, merge definitions
In reply to Sakari AilusRemove macros for defining new SMIA registers, instead put the register flags to the register definition itself. Also move the register flags to the same file.
This is not expected to be updated but rather left there as a reference.
--- drivers/media/i2c/smiapp/smiapp-quirk.c | 2 +- drivers/media/i2c/smiapp/smiapp-reg-defs.h | 1046 +++++++++++--------- drivers/media/i2c/smiapp/smiapp-reg.h | 116 --- drivers/media/i2c/smiapp/smiapp.h | 2 +- 4 files changed, 570 insertions(+), 596 deletions(-) delete mode 100644 drivers/media/i2c/smiapp/smiapp-reg.h
drivers/media/i2c/smiapp/smiapp-quirk.c +1 -1
@@ -14,7 +14,7 @@static int smiapp_write_8 (struct smiapp_sensor *sensor,u16 reg,u8 val) { -return smiapp_write (sensor,SMIAPP_REG_MK_U8 (reg), val); +return smiapp_write (sensor, reg, val); } static int smiapp_write_8s(struct smiapp_sensor *sensor,
drivers/media/i2c/smiapp/smiapp-reg-defs.h +568 -478
1,051 lines not on this page · raw message
drivers/media/i2c/smiapp/smiapp-reg.h deleted +0 -116
116 lines not on this page · raw message
drivers/media/i2c/smiapp/smiapp.h +1 -1
@@ -16,7 +16,7 @@#include <media/v4l2-subdev.h> #include "smiapp-pll.h" -#include "smiapp-reg.h" +#include "smiapp-reg-defs.h" #include "smiapp-regs.h" #include "smiapp-quirk.h"
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 5/106 smiapp: Add macros for accessing CCS registers
In reply to Sakari AilusAdd two helper macros for reading and writing the CCS registers as defined in ccs-regs.h.
--- drivers/media/i2c/smiapp/smiapp-regs.h | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/i2c/smiapp/smiapp-regs.h +6 -0
@@ -28,4 +28,10 @@ int smiapp_write(struct smiapp_sensor *sensor, u32 reg, u32 val);unsigned int ccs_reg_width (u32 reg); +#define ccs_read (sensor, reg_name, val) \ + smiapp_read(sensor, CCS_R_##reg_name, val) + +#define ccs_write (sensor, reg_name, val) \ + smiapp_write(sensor, CCS_R_##reg_name, val) +#endif
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 6/106 smiapp: Use MIPI CCS version and manufacturer ID information
In reply to Sakari AilusRead MIPI CCS manufacturer and version information, and use the CCS IDs over SMIA whenever they are set.
--- drivers/media/i2c/smiapp/smiapp-core.c | 76 +++++++++++++++++++------- drivers/media/i2c/smiapp/smiapp.h | 20 ++++--- 2 files changed, 68 insertions(+), 28 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +56 -20
@@ -2356,9 +2356,14 @@ smiapp_sysfs_ident_read(struct device *dev, struct device_attribute *attr,struct smiapp_sensor *sensor =to_smiapp_sensor (subdev);struct smiapp_module_info *minfo = &sensor->minfo; -return snprintf (buf,PAGE_SIZE ,"%2.2x%4.4x%2.2x\n" , - minfo->manufacturer_id, minfo->model_id, - minfo->revision_number_major) +1 ; +if (minfo->mipi_manufacturer_id) +return snprintf (buf,PAGE_SIZE ,"%4.4x%4.4x%2.2x\n" , + minfo->mipi_manufacturer_id, minfo->model_id, + minfo->revision_number_major) +1 ; +else +return snprintf (buf,PAGE_SIZE ,"%2.2x%4.4x%2.2x\n" , + minfo->smia_manufacturer_id, minfo->model_id, + minfo->revision_number_major) +1 ; } static DEVICE_ATTR(ident, S_IRUGO, smiapp_sysfs_ident_read, NULL);
@@ -2377,8 +2382,11 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor) minfo->name =SMIAPP_NAME ;/* Module info */ - rval =smiapp_read_8only (sensor,SMIAPP_REG_U8_MANUFACTURER_ID , - &minfo->manufacturer_id); + rval =ccs_read (sensor,MODULE_MANUFACTURER_ID , + &minfo->mipi_manufacturer_id); +if (!rval && !minfo->mipi_manufacturer_id) + rval =smiapp_read_8only (sensor,SMIAPP_REG_U8_MANUFACTURER_ID , + &minfo->smia_manufacturer_id);if (!rval) rval =smiapp_read_8only (sensor,SMIAPP_REG_U16_MODEL_ID , &minfo->model_id);
@@ -2404,9 +2412,12 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor)/* Sensor info */ if (!rval) + rval =ccs_read (sensor,SENSOR_MANUFACTURER_ID , + &minfo->sensor_mipi_manufacturer_id); +if (!rval && !minfo->sensor_mipi_manufacturer_id) rval =smiapp_read_8only (sensor,SMIAPP_REG_U8_SENSOR_MANUFACTURER_ID , - &minfo->sensor_manufacturer_id); + &minfo->sensor_smia_manufacturer_id);if (!rval) rval = smiapp_read_8only(sensor, SMIAPP_REG_U16_SENSOR_MODEL_ID,
@@ -2422,9 +2433,11 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor)/* SMIA */ if (!rval) + rval =ccs_read (sensor,MIPI_CCS_VERSION , &minfo->ccs_version); +if (!rval && !minfo->ccs_version) rval =smiapp_read_8only (sensor,SMIAPP_REG_U8_SMIA_VERSION , &minfo->smia_version); -if (!rval) +if (!rval && !minfo->ccs_version) rval =smiapp_read_8only (sensor,SMIAPP_REG_U8_SMIAPP_VERSION , &minfo->smiapp_version);
@@ -2433,38 +2446,62 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor)return -ENODEV ; } -dev_dbg (&client->dev,"module 0x%2.2x-0x%4.4x\n" , - minfo->manufacturer_id, minfo->model_id); +if (minfo->mipi_manufacturer_id) +dev_dbg (&client->dev,"MIPI CCS module 0x%4.4x-0x%4.4x\n" , + minfo->mipi_manufacturer_id, minfo->model_id); +else +dev_dbg (&client->dev,"SMIA module 0x%2.2x-0x%4.4x\n" , + minfo->smia_manufacturer_id, minfo->model_id);dev_dbg (&client->dev,"module revision 0x%2.2x-0x%2.2x date %2.2d-%2.2d-%2.2d\n" , minfo->revision_number_major, minfo->revision_number_minor, minfo->module_year, minfo->module_month, minfo->module_day); -dev_dbg (&client->dev,"sensor 0x%2.2x-0x%4.4x\n" , - minfo->sensor_manufacturer_id, minfo->sensor_model_id); +if (minfo->sensor_mipi_manufacturer_id) +dev_dbg (&client->dev,"MIPI CCS sensor 0x%4.4x-0x%4.4x\n" , + minfo->sensor_mipi_manufacturer_id, + minfo->sensor_model_id); +else +dev_dbg (&client->dev,"SMIA sensor 0x%2.2x-0x%4.4x\n" , + minfo->sensor_smia_manufacturer_id, + minfo->sensor_model_id);dev_dbg (&client->dev,"sensor revision 0x%2.2x firmware version 0x%2.2x\n" , minfo->sensor_revision_number, minfo->sensor_firmware_version); -dev_dbg (&client->dev,"smia version %2.2d smiapp version %2.2d\n" , - minfo->smia_version, minfo->smiapp_version); +if (minfo->ccs_version) +dev_dbg (&client->dev,"MIPI CCS version %u.%u" , + (minfo->ccs_version &CCS_MIPI_CCS_VERSION_MAJOR_MASK ) + >>CCS_MIPI_CCS_VERSION_MAJOR_SHIFT , + (minfo->ccs_version &CCS_MIPI_CCS_VERSION_MINOR_MASK )); +else +dev_dbg (&client->dev, +"smia version %2.2d smiapp version %2.2d\n" , + minfo->smia_version, minfo->smiapp_version);/* * Some modules have bad data in the lvalues below. Hope the * rvalues have better stuff. The lvalues are module * parameters whereas the rvalues are sensor parameters. */ -if (!minfo->manufacturer_id && !minfo->model_id) { - minfo->manufacturer_id = minfo->sensor_manufacturer_id; +if (minfo->sensor_smia_manufacturer_id && + !minfo->smia_manufacturer_id && !minfo->model_id) { + minfo->smia_manufacturer_id = + minfo->sensor_smia_manufacturer_id; minfo->model_id = minfo->sensor_model_id; minfo->revision_number_major = minfo->sensor_revision_number; }for (i =0 ; i <ARRAY_SIZE (smiapp_module_idents); i++) { -if (smiapp_module_idents[i].manufacturer_id - != minfo->manufacturer_id) +if (smiapp_module_idents[i].mipi_manufacturer_id && + smiapp_module_idents[i].mipi_manufacturer_id + != minfo->mipi_manufacturer_id) +continue ; +if (smiapp_module_idents[i].smia_manufacturer_id && + smiapp_module_idents[i].smia_manufacturer_id + != minfo->smia_manufacturer_id)continue ;if (smiapp_module_idents[i].model_id != minfo->model_id)continue ;
@@ -2488,9 +2525,8 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor)dev_warn (&client->dev,"no quirks for this module; let's hope it's fully compliant\n" ); -dev_dbg (&client->dev,"the sensor is called %s, ident %2.2x%4.4x%2.2x\n" , - minfo->name, minfo->manufacturer_id, minfo->model_id, - minfo->revision_number_major); +dev_dbg (&client->dev,"the sensor is called %s\n" , + minfo->name);return 0 ; }
drivers/media/i2c/smiapp/smiapp.h +12 -8
@@ -91,8 +91,9 @@ struct smiapp_quirk;#define SMIAPP_MODULE_IDENT_FLAG_REV_LE (1 << 0)struct smiapp_module_ident { -u8 manufacturer_id; +u16 mipi_manufacturer_id;u16 model_id; +u8 smia_manufacturer_id;u8 revision_number_major;u8 flags;
@@ -102,7 +103,8 @@ struct smiapp_module_ident { };struct smiapp_module_info { -u32 manufacturer_id; +u32 smia_manufacturer_id; +u32 mipi_manufacturer_id;u32 model_id;u32 revision_number_major;u32 revision_number_minor;
@@ -111,13 +113,15 @@ struct smiapp_module_info {u32 module_month;u32 module_day; -u32 sensor_manufacturer_id; +u32 sensor_smia_manufacturer_id; +u32 sensor_mipi_manufacturer_id;u32 sensor_model_id;u32 sensor_revision_number;u32 sensor_firmware_version;u32 smia_version;u32 smiapp_version; +u32 ccs_version;u32 smiapp_profile;
@@ -126,7 +130,7 @@ struct smiapp_module_info { };#define SMIAPP_IDENT_FQ (manufacturer, model, rev, fl, _name, _quirk) \ - { .manufacturer_id = manufacturer, \ + { .smia_manufacturer_id = manufacturer, \ .model_id = model, \ .revision_number_major = rev, \ .flags = fl, \
@@ -134,7 +138,7 @@ struct smiapp_module_info { .quirk = _quirk, }#define SMIAPP_IDENT_LQ (manufacturer, model, rev, _name, _quirk) \ - { .manufacturer_id = manufacturer, \ + { .smia_manufacturer_id = manufacturer, \ .model_id = model, \ .revision_number_major = rev, \ .flags = SMIAPP_MODULE_IDENT_FLAG_REV_LE, \
@@ -142,14 +146,14 @@ struct smiapp_module_info { .quirk = _quirk, }#define SMIAPP_IDENT_L (manufacturer, model, rev, _name) \ - { .manufacturer_id = manufacturer, \ + { .smia_manufacturer_id = manufacturer, \ .model_id = model, \ .revision_number_major = rev, \ .flags = SMIAPP_MODULE_IDENT_FLAG_REV_LE, \ .name = _name, }#define SMIAPP_IDENT_Q (manufacturer, model, rev, _name, _quirk) \ - { .manufacturer_id = manufacturer, \ + { .smia_manufacturer_id = manufacturer, \ .model_id = model, \ .revision_number_major = rev, \ .flags = 0, \
@@ -157,7 +161,7 @@ struct smiapp_module_info { .quirk = _quirk, }#define SMIAPP_IDENT (manufacturer, model, rev, _name) \ - { .manufacturer_id = manufacturer, \ + { .smia_manufacturer_id = manufacturer, \ .model_id = model, \ .revision_number_major = rev, \ .flags = 0, \
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 7/106 smiapp: Read CCS limit values
In reply to Sakari AilusRead limit and capability values into a driver allocated buffer. This will later replace (most of) the existing SMIA limits.
--- drivers/media/i2c/smiapp/smiapp-core.c | 177 ++++++++++++++++++++++++- drivers/media/i2c/smiapp/smiapp.h | 4 + 2 files changed, 176 insertions(+), 5 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +172 -5
@@ -28,6 +28,7 @@#include <media/v4l2-device.h> #include "ccs-limits.h" +#include "ccs-regs.h" #include "smiapp.h" #define SMIAPP_ALIGN_DIM (dim, flags) \
@@ -102,6 +103,164 @@ static int smiapp_read_all_smia_limits(struct smiapp_sensor *sensor)return 0 ; } +static void ccs_assign_limit (void *ptr,unsigned int width,u32 val) +{ +switch (width) { +case sizeof (u8): + *(u8 *)ptr = val; +break ; +case sizeof (u16): + *(u16 *)ptr = val; +break ; +case sizeof (u32): + *(u32 *)ptr = val; +break ; + } +} + +static int ccs_limit_ptr (struct smiapp_sensor *sensor,unsigned int limit, +unsigned int offset,void **__ptr) +{ +const struct ccs_limit *linfo; + +if (WARN_ON (limit >=CCS_L_LAST )) +return -EINVAL ; + + linfo = &ccs_limits[ccs_limit_offsets[limit].info]; + +if (WARN_ON (!sensor->ccs_limits) || +WARN_ON (offset +ccs_reg_width (linfo->reg) > + ccs_limit_offsets[limit +1 ].lim)) +return -EINVAL ; + + *__ptr = sensor->ccs_limits + ccs_limit_offsets[limit].lim + offset; + +return 0 ; +} + +void ccs_replace_limit (struct smiapp_sensor *sensor, +unsigned int limit,unsigned int offset,u32 val) +{ +struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd); +const struct ccs_limit *linfo; +void *ptr; +int ret; + + ret =ccs_limit_ptr (sensor, limit, offset, &ptr); +if (ret) +return ; + + linfo = &ccs_limits[ccs_limit_offsets[limit].info]; + +dev_dbg (&client->dev,"quirk: 0x%8.8x \"%s\" %u = %d, 0x%x\n" , + linfo->reg, linfo->name, offset, val, val); + +ccs_assign_limit (ptr,ccs_reg_width (linfo->reg), val); +} + +static u32 ccs_get_limit (struct smiapp_sensor *sensor, +unsigned int limit,unsigned int offset) +{ +void *ptr; +int ret; + + ret =ccs_limit_ptr (sensor, limit, offset, &ptr); +if (ret) +return 0 ; + +switch (ccs_reg_width (ccs_limits[ccs_limit_offsets[limit].info].reg)) { +case sizeof (u8): +return *(u8 *)ptr; +case sizeof (u16): +return *(u16 *)ptr; +case sizeof (u32): +return *(u32 *)ptr; + } + +WARN_ON (1 ); + +return 0 ; +} + +#define CCS_LIM (sensor, limit) \ + ccs_get_limit(sensor, CCS_L_##limit, 0) + +#define CCS_LIM_AT (sensor, limit, offset) \ + ccs_get_limit(sensor, CCS_L_##limit, CCS_L_##limit##_OFFSET(offset)) + +static int ccs_read_all_limits (struct smiapp_sensor *sensor) +{ +struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd); +void *ptr, *alloc, *end; +unsigned int i, l; +int ret; + +kfree (sensor->ccs_limits); + sensor->ccs_limits =NULL ; + + alloc =kzalloc (ccs_limit_offsets[CCS_L_LAST ].lim,GFP_KERNEL ); +if (!alloc) +return -ENOMEM ; + + end = alloc + ccs_limit_offsets[CCS_L_LAST ].lim; + +for (i =0 , l =0 , ptr = alloc; ccs_limits[i].size; i++) { +u32 reg = ccs_limits[i].reg; +unsigned int width =ccs_reg_width (reg); +unsigned int j; + +if (l ==CCS_L_LAST ) { +dev_err (&client->dev, +"internal error --- end of limit array\n" ); + ret = -EINVAL ; + goto out_err; + } + +for (j =0 ; j < ccs_limits[i].size / width; + j++, reg += width, ptr += width) { +u32 val; + + ret =smiapp_read (sensor, reg, &val); +if (ret) + goto out_err; + +if (ptr + width > end) { +dev_err (&client->dev, +"internal error --- no room for regs\n" ); + ret = -EINVAL ; + goto out_err; + } + +ccs_assign_limit (ptr, width, val); + +dev_dbg (&client->dev,"0x%8.8x \"%s\" = %u, 0x%x\n" , + reg, ccs_limits[i].name, val, val); + } + +if (ccs_limits[i].flags &CCS_L_FL_SAME_REG ) +continue ; + + l++; + ptr = alloc + ccs_limit_offsets[l].lim; + } + +if (l !=CCS_L_LAST ) { +dev_err (&client->dev, +"internal error --- insufficient limits\n" ); + ret = -EINVAL ; + goto out_err; + } + + sensor->ccs_limits = alloc; + +return 0 ; + +out_err: +kfree (alloc); + +return ret; +} +static int smiapp_read_frame_fmt (struct smiapp_sensor *sensor) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);
@@ -2970,10 +3129,14 @@ static int smiapp_probe(struct i2c_client *client) goto out_power_off; } + rval =ccs_read_all_limits (sensor); +if (rval) + goto out_power_off; + rval =smiapp_read_frame_fmt (sensor);if (rval) { rval = -ENODEV ; - goto out_power_off; + goto out_free_ccs_limits; }/*
@@ -2997,7 +3160,7 @@ static int smiapp_probe(struct i2c_client *client) rval =smiapp_call_quirk (sensor, limits);if (rval) {dev_err (&client->dev,"limits quirks failed\n" ); - goto out_power_off; + goto out_free_ccs_limits; }if (SMIA_LIM (sensor,BINNING_CAPABILITY )) {
@@ -3007,7 +3170,7 @@ static int smiapp_probe(struct i2c_client *client) SMIAPP_REG_U8_BINNING_SUBTYPES, &val);if (rval <0 ) { rval = -ENODEV ; - goto out_power_off; + goto out_free_ccs_limits; } sensor->nbinning_subtypes =min_t (u8, val,SMIAPP_BINNING_SUBTYPES );
@@ -3017,7 +3180,7 @@ static int smiapp_probe(struct i2c_client *client) sensor, SMIAPP_REG_U8_BINNING_TYPE_n(i), &val);if (rval <0 ) { rval = -ENODEV ; - goto out_power_off; + goto out_free_ccs_limits; } sensor->binning_subtypes[i] = *(struct smiapp_binning_subtype *)&val;
@@ -3033,7 +3196,7 @@ static int smiapp_probe(struct i2c_client *client)if (device_create_file (&client->dev, &dev_attr_ident) !=0 ) {dev_err (&client->dev,"sysfs ident entry creation failed\n" ); rval = -ENOENT ; - goto out_power_off; + goto out_free_ccs_limits; } if (sensor->minfo.smiapp_version &&
@@ -3150,6 +3313,9 @@ static int smiapp_probe(struct i2c_client *client) out_cleanup:smiapp_cleanup (sensor); +out_free_ccs_limits: +kfree (sensor->ccs_limits); + out_power_off:smiapp_power_off (&client->dev);mutex_destroy (&sensor->mutex);
@@ -3176,6 +3342,7 @@ static int smiapp_remove(struct i2c_client *client) }smiapp_cleanup (sensor);mutex_destroy (&sensor->mutex); +kfree (sensor->ccs_limits);return 0 ; }
drivers/media/i2c/smiapp/smiapp.h +4 -0
@@ -228,6 +228,7 @@ struct smiapp_sensor {struct clk *ext_clk;struct gpio_desc *xshutdown;u32 limits[SMIAPP_LIMIT_LAST ]; +void *ccs_limits;u8 nbinning_subtypes;struct smiapp_binning_subtype binning_subtypes[SMIAPP_BINNING_SUBTYPES ];u32 mbus_frame_fmts;
@@ -281,4 +282,7 @@ struct smiapp_sensor {#define to_smiapp_sensor (_sd) \ (to_smiapp_subdev(_sd)->sensor) +void ccs_replace_limit (struct smiapp_sensor *sensor, +unsigned int limit,unsigned int offset,u32 val); +#endif /* __SMIAPP_PRIV_H_ */
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 8/106 smiapp: Switch to CCS limits
In reply to Sakari AilusUse the CCS limit definitions instead of the SMIA ones. This allows accessing CCS capabilities where needed as well as dropping the old SMIA limits.
--- drivers/media/i2c/smiapp/Makefile | 3 +- drivers/media/i2c/smiapp/smiapp-core.c | 255 ++++++++++------------- drivers/media/i2c/smiapp/smiapp-limits.c | 118 ----------- drivers/media/i2c/smiapp/smiapp-limits.h | 114 ---------- drivers/media/i2c/smiapp/smiapp-quirk.c | 25 +-- drivers/media/i2c/smiapp/smiapp-quirk.h | 3 - drivers/media/i2c/smiapp/smiapp.h | 10 - 7 files changed, 113 insertions(+), 415 deletions(-) delete mode 100644 drivers/media/i2c/smiapp/smiapp-limits.c delete mode 100644 drivers/media/i2c/smiapp/smiapp-limits.h
drivers/media/i2c/smiapp/Makefile +1 -2
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only smiapp-objs += smiapp-core.o smiapp-regs.o \ - smiapp-quirk.o smiapp-limits.o \ - ccs-limits.o + smiapp-quirk.o ccs-limits.o obj-$(CONFIG_VIDEO_SMIAPP) += smiapp.o ccflags-y += -I $(srctree)/drivers/media/i2c
drivers/media/i2c/smiapp/smiapp-core.c +105 -150
451 lines not on this page · raw message
drivers/media/i2c/smiapp/smiapp-limits.c deleted +0 -118
118 lines not on this page · raw message
drivers/media/i2c/smiapp/smiapp-limits.h deleted +0 -114
114 lines not on this page · raw message
drivers/media/i2c/smiapp/smiapp-quirk.c +7 -18
@@ -10,6 +10,8 @@#include <linux/delay.h> +#include "ccs-limits.h" +#include "smiapp.h" static int smiapp_write_8 (struct smiapp_sensor *sensor,u16 reg,u8 val)
@@ -36,17 +38,6 @@ static int smiapp_write_8s(struct smiapp_sensor *sensor,return 0 ; } -void smiapp_replace_limit (struct smiapp_sensor *sensor, -u32 limit,u32 val) -{ -struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd); - -dev_dbg (&client->dev,"quirk: 0x%8.8x \"%s\" = %d, 0x%x\n" , - smiapp_reg_limits[limit].addr, - smiapp_reg_limits[limit].what, val, val); - sensor->limits[limit] = val; -} -static int jt8ew9_limits (struct smiapp_sensor *sensor) {if (sensor->minfo.revision_number_major <0x03 )
@@ -54,9 +45,8 @@ static int jt8ew9_limits(struct smiapp_sensor *sensor)/* Below 24 gain doesn't have effect at all, */ /* but ~59 is needed for full dynamic range */ -smiapp_replace_limit (sensor,SMIAPP_LIMIT_ANALOGUE_GAIN_CODE_MIN ,59 ); -smiapp_replace_limit ( - sensor,SMIAPP_LIMIT_ANALOGUE_GAIN_CODE_MAX ,6000 ); +ccs_replace_limit (sensor,CCS_L_ANALOG_GAIN_CODE_MIN ,0 ,59 ); +ccs_replace_limit (sensor,CCS_L_ANALOG_GAIN_CODE_MAX ,0 ,6000 );return 0 ; }
@@ -126,9 +116,8 @@ const struct smiapp_quirk smiapp_imx125es_quirk = {static int jt8ev1_limits (struct smiapp_sensor *sensor) { -smiapp_replace_limit (sensor,SMIAPP_LIMIT_X_ADDR_MAX ,4271 ); -smiapp_replace_limit (sensor, -SMIAPP_LIMIT_MIN_LINE_BLANKING_PCK_BIN ,184 ); +ccs_replace_limit (sensor,CCS_L_X_ADDR_MAX ,0 ,4271 ); +ccs_replace_limit (sensor,CCS_L_MIN_LINE_BLANKING_PCK_BIN ,0 ,184 );return 0 ; }
@@ -221,7 +210,7 @@ const struct smiapp_quirk smiapp_jt8ev1_quirk = {static int tcm8500md_limits (struct smiapp_sensor *sensor) { -smiapp_replace_limit (sensor,SMIAPP_LIMIT_MIN_PLL_IP_FREQ_HZ ,2700000 ); +ccs_replace_limit (sensor,CCS_L_MIN_PLL_IP_CLK_FREQ_MHZ ,0 ,2700000 );return 0 ; }
drivers/media/i2c/smiapp/smiapp-quirk.h +0 -3
@@ -55,9 +55,6 @@ struct smiapp_reg_8 {u8 val; }; -void smiapp_replace_limit (struct smiapp_sensor *sensor, -u32 limit,u32 val); -#define SMIAPP_MK_QUIRK_REG_8 (_reg, _val) \ { \ .reg = (u16)_reg, \
drivers/media/i2c/smiapp/smiapp.h +0 -10
@@ -84,8 +84,6 @@ struct smiapp_hwconfig {struct smiapp_flash_strobe_parms *strobe_setup; }; -#include "smiapp-limits.h" -struct smiapp_quirk ;#define SMIAPP_MODULE_IDENT_FLAG_REV_LE (1 << 0)
@@ -167,13 +165,6 @@ struct smiapp_module_info { .flags = 0, \ .name = _name, } -struct smiapp_reg_limits { -u32 addr; -char *what; -}; - -extern struct smiapp_reg_limits smiapp_reg_limits[]; -struct smiapp_csi_data_format {u32 code;u8 width;
@@ -227,7 +218,6 @@ struct smiapp_sensor {struct regulator *vana;struct clk *ext_clk;struct gpio_desc *xshutdown; -u32 limits[SMIAPP_LIMIT_LAST ];void *ccs_limits;u8 nbinning_subtypes;struct smiapp_binning_subtype binning_subtypes[SMIAPP_BINNING_SUBTYPES ];
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 9/106 smiapp: Obtain frame descriptor from CCS limits
In reply to Sakari AilusObtain the frame descriptor from the CCS limits, instead of reading them directly from the frame descriptor registers.
--- drivers/media/i2c/smiapp/smiapp-core.c | 70 +++++++++++--------------- 1 file changed, 30 insertions(+), 40 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +30 -40
@@ -228,34 +228,29 @@ static int ccs_read_all_limits(struct smiapp_sensor *sensor)static int smiapp_read_frame_fmt (struct smiapp_sensor *sensor) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd); -u32 fmt_model_type, fmt_model_subtype, ncol_desc, nrow_desc; +u8 fmt_model_type, fmt_model_subtype, ncol_desc, nrow_desc;unsigned int i;int pixel_count =0 ;int line_count =0 ; -int rval; - - rval =smiapp_read (sensor,SMIAPP_REG_U8_FRAME_FORMAT_MODEL_TYPE , - &fmt_model_type); -if (rval) -return rval; - rval =smiapp_read (sensor,SMIAPP_REG_U8_FRAME_FORMAT_MODEL_SUBTYPE , - &fmt_model_subtype); -if (rval) -return rval; + fmt_model_type =CCS_LIM (sensor,FRAME_FORMAT_MODEL_TYPE ); + fmt_model_subtype =CCS_LIM (sensor,FRAME_FORMAT_MODEL_SUBTYPE ); ncol_desc = (fmt_model_subtype - &SMIAPP_FRAME_FORMAT_MODEL_SUBTYPE_NCOLS_MASK ) - >>SMIAPP_FRAME_FORMAT_MODEL_SUBTYPE_NCOLS_SHIFT ; + &CCS_FRAME_FORMAT_MODEL_SUBTYPE_COLUMNS_MASK ) + >>CCS_FRAME_FORMAT_MODEL_SUBTYPE_COLUMNS_SHIFT ; nrow_desc = fmt_model_subtype - &SMIAPP_FRAME_FORMAT_MODEL_SUBTYPE_NROWS_MASK ; + &CCS_FRAME_FORMAT_MODEL_SUBTYPE_ROWS_MASK ;dev_dbg (&client->dev,"format_model_type %s\n" , - fmt_model_type ==SMIAPP_FRAME_FORMAT_MODEL_TYPE_2BYTE + fmt_model_type ==CCS_FRAME_FORMAT_MODEL_TYPE_2_BYTE ?"2 byte" : - fmt_model_type ==SMIAPP_FRAME_FORMAT_MODEL_TYPE_4BYTE + fmt_model_type ==CCS_FRAME_FORMAT_MODEL_TYPE_4_BYTE ?"4 byte" :"is simply bad" ); +dev_dbg (&client->dev,"%u column and %u row descriptors\n" , + ncol_desc, nrow_desc); +for (i =0 ; i < ncol_desc + nrow_desc; i++) {u32 desc;u32 pixelcode;
@@ -264,29 +259,24 @@ static int smiapp_read_frame_fmt(struct smiapp_sensor *sensor)char *what;u32 reg; -if (fmt_model_type ==SMIAPP_FRAME_FORMAT_MODEL_TYPE_2BYTE ) { - reg =SMIAPP_REG_U16_FRAME_FORMAT_DESCRIPTOR_2 (i); - rval =smiapp_read (sensor, reg, &desc); -if (rval) -return rval; +if (fmt_model_type ==CCS_FRAME_FORMAT_MODEL_TYPE_2_BYTE ) { + desc =CCS_LIM_AT (sensor,FRAME_FORMAT_DESCRIPTOR , i); pixelcode = (desc - &SMIAPP_FRAME_FORMAT_DESC_2_PIXELCODE_MASK ) - >>SMIAPP_FRAME_FORMAT_DESC_2_PIXELCODE_SHIFT ; - pixels = desc &SMIAPP_FRAME_FORMAT_DESC_2_PIXELS_MASK ; + &CCS_FRAME_FORMAT_DESCRIPTOR_PCODE_MASK ) + >>CCS_FRAME_FORMAT_DESCRIPTOR_PCODE_SHIFT ; + pixels = desc &CCS_FRAME_FORMAT_DESCRIPTOR_PIXELS_MASK ; }else if (fmt_model_type - ==SMIAPP_FRAME_FORMAT_MODEL_TYPE_4BYTE ) { - reg =SMIAPP_REG_U32_FRAME_FORMAT_DESCRIPTOR_4 (i); - rval =smiapp_read (sensor, reg, &desc); -if (rval) -return rval; + ==CCS_FRAME_FORMAT_MODEL_TYPE_4_BYTE ) { + desc =CCS_LIM_AT (sensor,FRAME_FORMAT_DESCRIPTOR_4 , i); pixelcode = (desc - &SMIAPP_FRAME_FORMAT_DESC_4_PIXELCODE_MASK ) - >>SMIAPP_FRAME_FORMAT_DESC_4_PIXELCODE_SHIFT ; - pixels = desc &SMIAPP_FRAME_FORMAT_DESC_4_PIXELS_MASK ; + &CCS_FRAME_FORMAT_DESCRIPTOR_4_PCODE_MASK ) + >>CCS_FRAME_FORMAT_DESCRIPTOR_4_PCODE_SHIFT ; + pixels = desc & +CCS_FRAME_FORMAT_DESCRIPTOR_4_PIXELS_MASK ; }else { dev_dbg(&client->dev, "invalid frame format model type %d\n",
@@ -300,19 +290,19 @@ static int smiapp_read_frame_fmt(struct smiapp_sensor *sensor) which ="rows" ;switch (pixelcode) { -case SMIAPP_FRAME_FORMAT_DESC_PIXELCODE_EMBEDDED : +case CCS_FRAME_FORMAT_DESCRIPTOR_PCODE_EMBEDDED : what ="embedded" ;break ; -case SMIAPP_FRAME_FORMAT_DESC_PIXELCODE_DUMMY : +case CCS_FRAME_FORMAT_DESCRIPTOR_PCODE_DUMMY_PIXEL : what ="dummy" ;break ; -case SMIAPP_FRAME_FORMAT_DESC_PIXELCODE_BLACK : +case CCS_FRAME_FORMAT_DESCRIPTOR_PCODE_BLACK_PIXEL : what ="black" ;break ; -case SMIAPP_FRAME_FORMAT_DESC_PIXELCODE_DARK : +case CCS_FRAME_FORMAT_DESCRIPTOR_PCODE_DARK_PIXEL : what ="dark" ;break ; -case SMIAPP_FRAME_FORMAT_DESC_PIXELCODE_VISIBLE : +case CCS_FRAME_FORMAT_DESCRIPTOR_PCODE_VISIBLE_PIXEL : what ="visible" ;break ;default :
@@ -326,7 +316,7 @@ static int smiapp_read_frame_fmt(struct smiapp_sensor *sensor)if (i < ncol_desc) {if (pixelcode == -SMIAPP_FRAME_FORMAT_DESC_PIXELCODE_VISIBLE ) +CCS_FRAME_FORMAT_DESCRIPTOR_PCODE_VISIBLE_PIXEL ) sensor->visible_pixel_start = pixel_count; pixel_count += pixels;continue ;
@@ -334,13 +324,13 @@ static int smiapp_read_frame_fmt(struct smiapp_sensor *sensor)/* Handle row descriptors */ switch (pixelcode) { -case SMIAPP_FRAME_FORMAT_DESC_PIXELCODE_EMBEDDED : +case CCS_FRAME_FORMAT_DESCRIPTOR_PCODE_EMBEDDED :if (sensor->embedded_end)break ; sensor->embedded_start = line_count; sensor->embedded_end = line_count + pixels;break ; -case SMIAPP_FRAME_FORMAT_DESC_PIXELCODE_VISIBLE : +case CCS_FRAME_FORMAT_DESCRIPTOR_PCODE_VISIBLE_PIXEL : sensor->image_start = line_count;break ; }
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 10/106 smiapp: Use CCS limits in reading data format descriptors
In reply to Sakari AilusThe CCS limits have the information so use it instead.
--- drivers/media/i2c/smiapp/smiapp-core.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +9 -13
@@ -842,10 +842,7 @@ static int smiapp_get_mbus_formats(struct smiapp_sensor *sensor)unsigned int i, pixel_order;int rval; - rval =smiapp_read ( - sensor,SMIAPP_REG_U8_DATA_FORMAT_MODEL_TYPE , &type); -if (rval) -return rval; + type =CCS_LIM (sensor,DATA_FORMAT_MODEL_TYPE );dev_dbg (&client->dev,"data_format_model_type %d\n" , type);
@@ -863,11 +860,11 @@ static int smiapp_get_mbus_formats(struct smiapp_sensor *sensor) pixel_order_str[pixel_order]);switch (type) { -case SMIAPP_DATA_FORMAT_MODEL_TYPE_NORMAL : +case CCS_DATA_FORMAT_MODEL_TYPE_NORMAL : n =SMIAPP_DATA_FORMAT_MODEL_TYPE_NORMAL_N ;break ; -case SMIAPP_DATA_FORMAT_MODEL_TYPE_EXTENDED : - n =SMIAPP_DATA_FORMAT_MODEL_TYPE_EXTENDED_N ; +case CCS_DATA_FORMAT_MODEL_TYPE_EXTENDED : + n =CCS_LIM_DATA_FORMAT_DESCRIPTOR_MAX_N +1 ;break ;default :return -EINVAL ;
@@ -879,11 +876,7 @@ static int smiapp_get_mbus_formats(struct smiapp_sensor *sensor)for (i =0 ; i < n; i++) {unsigned int fmt, j; - rval =smiapp_read ( - sensor, -SMIAPP_REG_U16_DATA_FORMAT_DESCRIPTOR (i), &fmt); -if (rval) -return rval; + fmt =CCS_LIM_AT (sensor,DATA_FORMAT_DESCRIPTOR , i);dev_dbg (&client->dev,"%u: bpp %u, compressed %u\n" , i, fmt >>8 , (u8 )fmt);
@@ -895,7 +888,10 @@ static int smiapp_get_mbus_formats(struct smiapp_sensor *sensor)if (f->pixel_order !=SMIAPP_PIXEL_ORDER_GRBG )continue ; -if (f->width != fmt >>8 || f->compressed != (u8 )fmt) +if (f->width != fmt >> +CCS_DATA_FORMAT_DESCRIPTOR_UNCOMPRESSED_SHIFT || + f->compressed != + (fmt &CCS_DATA_FORMAT_DESCRIPTOR_COMPRESSED_MASK ))continue ;dev_dbg (&client->dev,"jolly good! %d\n" , j);
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 11/106 smiapp: Use CCS limits in reading binning capabilities
In reply to Sakari AilusUse CCS limits for obtaining binning capabilities and subtypes.
--- drivers/media/i2c/smiapp/smiapp-core.c | 27 +++++++++----------------- 1 file changed, 9 insertions(+), 18 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +9 -18
@@ -3105,26 +3105,17 @@ static int smiapp_probe(struct i2c_client *client) }if (CCS_LIM (sensor,BINNING_CAPABILITY )) { -u32 val; - - rval =smiapp_read (sensor, -SMIAPP_REG_U8_BINNING_SUBTYPES , &val); -if (rval <0 ) { - rval = -ENODEV ; - goto out_free_ccs_limits; - } - sensor->nbinning_subtypes =min_t (u8, val, -SMIAPP_BINNING_SUBTYPES ); + sensor->nbinning_subtypes = +min_t (u8,CCS_LIM (sensor,BINNING_SUB_TYPES ), +CCS_LIM_BINNING_SUB_TYPE_MAX_N );for (i =0 ; i < sensor->nbinning_subtypes; i++) { - rval =smiapp_read ( - sensor,SMIAPP_REG_U8_BINNING_TYPE_n (i), &val); -if (rval <0 ) { - rval = -ENODEV ; - goto out_free_ccs_limits; - } - sensor->binning_subtypes[i] = - *(struct smiapp_binning_subtype *)&val; + sensor->binning_subtypes[i].horizontal = +CCS_LIM_AT (sensor,BINNING_SUB_TYPE , i) >> +CCS_BINNING_SUB_TYPE_COLUMN_SHIFT ; + sensor->binning_subtypes[i].vertical = +CCS_LIM_AT (sensor,BINNING_SUB_TYPE , i) & +CCS_BINNING_SUB_TYPE_ROW_MASK ; dev_dbg(&client->dev, "binning %xx%x\n", sensor->binning_subtypes[i].horizontal,
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 12/106 smiapp: Use CCS registers
In reply to Sakari AilusSwitch to CCS standard registers where they exist. The still relevant SMIA registers are left as-is and the redundant ones are removed.
--- drivers/media/i2c/smiapp/smiapp-core.c | 272 +++++++++++-------------- drivers/media/i2c/smiapp/smiapp.h | 4 +- 2 files changed, 118 insertions(+), 158 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +115 -157
@@ -28,7 +28,6 @@#include <media/v4l2-device.h> #include "ccs-limits.h" -#include "ccs-regs.h" #include "smiapp.h" #define SMIAPP_ALIGN_DIM (dim, flags) \
@@ -357,40 +356,34 @@ static int smiapp_pll_configure(struct smiapp_sensor *sensor)struct smiapp_pll *pll = &sensor->pll;int rval; - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_VT_PIX_CLK_DIV , pll->vt.pix_clk_div); + rval =ccs_write (sensor,VT_PIX_CLK_DIV , pll->vt.pix_clk_div);if (rval <0 )return rval; - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_VT_SYS_CLK_DIV , pll->vt.sys_clk_div); + rval =ccs_write (sensor,VT_SYS_CLK_DIV , pll->vt.sys_clk_div);if (rval <0 )return rval; - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_PRE_PLL_CLK_DIV , pll->pre_pll_clk_div); + rval =ccs_write (sensor,PRE_PLL_CLK_DIV , pll->pre_pll_clk_div);if (rval <0 )return rval; - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_PLL_MULTIPLIER , pll->pll_multiplier); + rval =ccs_write (sensor,PLL_MULTIPLIER , pll->pll_multiplier);if (rval <0 )return rval;/* Lane op clock ratio does not apply here. */ - rval =smiapp_write ( - sensor,SMIAPP_REG_U32_REQUESTED_LINK_BIT_RATE_MBPS , -DIV_ROUND_UP (pll->op.sys_clk_freq_hz,1000000 /256 /256 )); + rval =ccs_write (sensor,REQUESTED_LINK_RATE , +DIV_ROUND_UP (pll->op.sys_clk_freq_hz, +1000000 /256 /256 ));if (rval <0 || sensor->minfo.smiapp_profile ==SMIAPP_PROFILE_0 )return rval; - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_OP_PIX_CLK_DIV , pll->op.pix_clk_div); + rval =ccs_write (sensor,OP_PIX_CLK_DIV , pll->op.pix_clk_div);if (rval <0 )return rval; -return smiapp_write ( - sensor,SMIAPP_REG_U16_OP_SYS_CLK_DIV , pll->op.sys_clk_div); +return ccs_write (sensor,OP_SYS_CLK_DIV , pll->op.sys_clk_div); } static int smiapp_pll_try(struct smiapp_sensor *sensor,
@@ -522,10 +515,10 @@ static u32 smiapp_pixel_order(struct smiapp_sensor *sensor)if (sensor->hflip) {if (sensor->hflip->val) - flip |=SMIAPP_IMAGE_ORIENTATION_HFLIP ; + flip |=CCS_IMAGE_ORIENTATION_HORIZONTAL_MIRROR ;if (sensor->vflip->val) - flip |=SMIAPP_IMAGE_ORIENTATION_VFLIP ; + flip |=CCS_IMAGE_ORIENTATION_VERTICAL_FLIP ; } flip ^= sensor->hvflip_inv_mask;
@@ -585,10 +578,10 @@ static int smiapp_set_ctrl(struct v4l2_ctrl *ctrl)return -EBUSY ;if (sensor->hflip->val) - orient |=SMIAPP_IMAGE_ORIENTATION_HFLIP ; + orient |=CCS_IMAGE_ORIENTATION_HORIZONTAL_MIRROR ;if (sensor->vflip->val) - orient |=SMIAPP_IMAGE_ORIENTATION_VFLIP ; + orient |=CCS_IMAGE_ORIENTATION_VERTICAL_FLIP ; orient ^= sensor->hvflip_inv_mask;
@@ -633,60 +626,50 @@ static int smiapp_set_ctrl(struct v4l2_ctrl *ctrl)switch (ctrl->id) {case V4L2_CID_ANALOGUE_GAIN : - rval =smiapp_write ( - sensor, -SMIAPP_REG_U16_ANALOGUE_GAIN_CODE_GLOBAL , ctrl->val); + rval =ccs_write (sensor,ANALOG_GAIN_CODE_GLOBAL , ctrl->val);break ;case V4L2_CID_EXPOSURE : - rval =smiapp_write ( - sensor, -SMIAPP_REG_U16_COARSE_INTEGRATION_TIME , ctrl->val); + rval =ccs_write (sensor,COARSE_INTEGRATION_TIME , ctrl->val);break ;case V4L2_CID_HFLIP :case V4L2_CID_VFLIP : - rval =smiapp_write (sensor,SMIAPP_REG_U8_IMAGE_ORIENTATION , - orient); + rval =ccs_write (sensor,IMAGE_ORIENTATION , orient);break ;case V4L2_CID_VBLANK : - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_FRAME_LENGTH_LINES , - sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC ].height - + ctrl->val); + rval =ccs_write (sensor,FRAME_LENGTH_LINES , + sensor->pixel_array->crop[ +SMIAPP_PA_PAD_SRC ].height + + ctrl->val);break ;case V4L2_CID_HBLANK : - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_LINE_LENGTH_PCK , - sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC ].width - + ctrl->val); + rval =ccs_write (sensor,LINE_LENGTH_PCK , + sensor->pixel_array->crop[ +SMIAPP_PA_PAD_SRC ].width + + ctrl->val);break ;case V4L2_CID_TEST_PATTERN : - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_TEST_PATTERN_MODE , ctrl->val); + rval =ccs_write (sensor,TEST_PATTERN_MODE , ctrl->val);break ;case V4L2_CID_TEST_PATTERN_RED : - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_TEST_DATA_RED , ctrl->val); + rval =ccs_write (sensor,TEST_DATA_RED , ctrl->val);break ;case V4L2_CID_TEST_PATTERN_GREENR : - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_TEST_DATA_GREENR , ctrl->val); + rval =ccs_write (sensor,TEST_DATA_GREENR , ctrl->val);break ;case V4L2_CID_TEST_PATTERN_BLUE : - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_TEST_DATA_BLUE , ctrl->val); + rval =ccs_write (sensor,TEST_DATA_BLUE , ctrl->val);break ;case V4L2_CID_TEST_PATTERN_GREENB : - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_TEST_DATA_GREENB , ctrl->val); + rval =ccs_write (sensor,TEST_DATA_GREENB , ctrl->val);break ;case V4L2_CID_PIXEL_RATE :
@@ -846,8 +829,7 @@ static int smiapp_get_mbus_formats(struct smiapp_sensor *sensor)dev_dbg (&client->dev,"data_format_model_type %d\n" , type); - rval =smiapp_read (sensor,SMIAPP_REG_U8_PIXEL_ORDER , - &pixel_order); + rval =ccs_read (sensor,PIXEL_ORDER , &pixel_order);if (rval)return rval;
@@ -1054,22 +1036,20 @@ static int smiapp_read_nvm_page(struct smiapp_sensor *sensor, u32 p, u8 *nvm, *status =0 ; - rval =smiapp_write (sensor, -SMIAPP_REG_U8_DATA_TRANSFER_IF_1_PAGE_SELECT , p); + rval =ccs_write (sensor,DATA_TRANSFER_IF_1_PAGE_SELECT , p);if (rval)return rval; - rval =smiapp_write (sensor,SMIAPP_REG_U8_DATA_TRANSFER_IF_1_CTRL , -SMIAPP_DATA_TRANSFER_IF_1_CTRL_EN ); + rval =ccs_write (sensor,DATA_TRANSFER_IF_1_CTRL , +CCS_DATA_TRANSFER_IF_1_CTRL_ENABLE );if (rval)return rval; - rval =smiapp_read (sensor,SMIAPP_REG_U8_DATA_TRANSFER_IF_1_STATUS , - &s); + rval =ccs_read (sensor,DATA_TRANSFER_IF_1_STATUS , &s);if (rval)return rval; -if (s &SMIAPP_DATA_TRANSFER_IF_1_STATUS_EUSAGE ) { +if (s &CCS_DATA_TRANSFER_IF_1_STATUS_IMPROPER_IF_USAGE ) { *status = s;return -ENODATA ; }
@@ -1077,14 +1057,10 @@ static int smiapp_read_nvm_page(struct smiapp_sensor *sensor, u32 p, u8 *nvm,if (CCS_LIM (sensor,DATA_TRANSFER_IF_CAPABILITY ) &CCS_DATA_TRANSFER_IF_CAPABILITY_POLLING ) {for (i =1000 ; i >0 ; i--) { -if (s &SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY ) +if (s &CCS_DATA_TRANSFER_IF_1_STATUS_READ_IF_READY )break ; - rval =smiapp_read ( - sensor, -SMIAPP_REG_U8_DATA_TRANSFER_IF_1_STATUS , - &s); - + rval =ccs_read (sensor,DATA_TRANSFER_IF_1_STATUS , &s);if (rval)return rval; }
@@ -1093,12 +1069,10 @@ static int smiapp_read_nvm_page(struct smiapp_sensor *sensor, u32 p, u8 *nvm,return -ETIMEDOUT ; } -for (i =0 ; i <SMIAPP_NVM_PAGE_SIZE ; i++) { +for (i =0 ; i <=CCS_LIM_DATA_TRANSFER_IF_1_DATA_MAX_P ; i++) {u32 v; - rval =smiapp_read (sensor, -SMIAPP_REG_U8_DATA_TRANSFER_IF_1_DATA_0 + i, - &v); + rval =ccs_read (sensor,DATA_TRANSFER_IF_1_DATA (i), &v);if (rval)return rval;
@@ -1115,20 +1089,21 @@ static int smiapp_read_nvm(struct smiapp_sensor *sensor, unsigned char *nvm,u32 p;int rval =0 , rval2; -for (p =0 ; p < nvm_size /SMIAPP_NVM_PAGE_SIZE && !rval; p++) { +for (p =0 ; p < nvm_size / (CCS_LIM_DATA_TRANSFER_IF_1_DATA_MAX_P +1 ) + && !rval; p++) { rval =smiapp_read_nvm_page (sensor, p, nvm, &status); - nvm +=SMIAPP_NVM_PAGE_SIZE ; + nvm +=CCS_LIM_DATA_TRANSFER_IF_1_DATA_MAX_P +1 ; }if (rval == -ENODATA && - status &SMIAPP_DATA_TRANSFER_IF_1_STATUS_EUSAGE ) + status &CCS_DATA_TRANSFER_IF_1_STATUS_IMPROPER_IF_USAGE ) rval =0 ; - rval2 =smiapp_write (sensor,SMIAPP_REG_U8_DATA_TRANSFER_IF_1_CTRL ,0 ); + rval2 =ccs_write (sensor,DATA_TRANSFER_IF_1_CTRL ,0 );if (rval <0 )return rval;else -return rval2 ?: p *SMIAPP_NVM_PAGE_SIZE ; +return rval2 ?: p * (CCS_LIM_DATA_TRANSFER_IF_1_DATA_MAX_P +1 ); }/*
@@ -1144,16 +1119,15 @@ static int smiapp_change_cci_addr(struct smiapp_sensor *sensor) client->addr = sensor->hwcfg->i2c_addr_dfl; - rval =smiapp_write (sensor, -SMIAPP_REG_U8_CCI_ADDRESS_CONTROL , - sensor->hwcfg->i2c_addr_alt <<1 ); + rval =ccs_write (sensor,CCI_ADDRESS_CTRL , + sensor->hwcfg->i2c_addr_alt <<1 );if (rval)return rval; client->addr = sensor->hwcfg->i2c_addr_alt;/* verify addr change went ok */ - rval =smiapp_read (sensor,SMIAPP_REG_U8_CCI_ADDRESS_CONTROL , &val); + rval =ccs_read (sensor,CCI_ADDRESS_CTRL , &val);if (rval)return rval;
@@ -1259,34 +1233,30 @@ static int smiapp_setup_flash_strobe(struct smiapp_sensor *sensor) strobe_width_high_rs = (tmp + strobe_adjustment -1 ) / strobe_adjustment; - rval =smiapp_write (sensor,SMIAPP_REG_U8_FLASH_MODE_RS , - strobe_setup->mode); + rval =ccs_write (sensor,FLASH_MODE_RS , strobe_setup->mode);if (rval <0 ) goto out; - rval =smiapp_write (sensor,SMIAPP_REG_U8_FLASH_STROBE_ADJUSTMENT , - strobe_adjustment); + rval =ccs_write (sensor,FLASH_STROBE_ADJUSTMENT , strobe_adjustment);if (rval <0 ) goto out; - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_TFLASH_STROBE_WIDTH_HIGH_RS_CTRL , - strobe_width_high_rs); + rval =ccs_write (sensor,TFLASH_STROBE_WIDTH_HIGH_RS_CTRL , + strobe_width_high_rs);if (rval <0 ) goto out; - rval =smiapp_write (sensor,SMIAPP_REG_U16_TFLASH_STROBE_DELAY_RS_CTRL , - strobe_setup->strobe_delay); + rval =ccs_write (sensor,TFLASH_STROBE_DELAY_RS_CTRL , + strobe_setup->strobe_delay);if (rval <0 ) goto out; - rval =smiapp_write (sensor,SMIAPP_REG_U16_FLASH_STROBE_START_POINT , - strobe_setup->stobe_start_point); + rval =ccs_write (sensor,FLASH_STROBE_START_POINT , + strobe_setup->stobe_start_point);if (rval <0 ) goto out; - rval =smiapp_write (sensor,SMIAPP_REG_U8_FLASH_TRIGGER_RS , - strobe_setup->trigger); + rval =ccs_write (sensor,FLASH_TRIGGER_RS , strobe_setup->trigger); out: sensor->hwcfg->strobe_setup->trigger =0 ;
@@ -1349,8 +1319,7 @@ static int smiapp_power_on(struct device *dev) } } - rval =smiapp_write (sensor,SMIAPP_REG_U8_SOFTWARE_RESET , -SMIAPP_SOFTWARE_RESET ); + rval =ccs_write (sensor,SOFTWARE_RESET ,CCS_SOFTWARE_RESET_ON );if (rval <0 ) {dev_err (dev,"software reset failed\n" ); goto out_cci_addr_fail;
@@ -1364,45 +1333,42 @@ static int smiapp_power_on(struct device *dev) } } - rval =smiapp_write (sensor,SMIAPP_REG_U16_COMPRESSION_MODE , -SMIAPP_COMPRESSION_MODE_SIMPLE_PREDICTOR ); + rval =ccs_write (sensor,COMPRESSION_MODE , +CCS_COMPRESSION_MODE_DPCM_PCM_SIMPLE );if (rval) {dev_err (dev,"compression mode set failed\n" ); goto out_cci_addr_fail; } - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_EXTCLK_FREQUENCY_MHZ , - sensor->hwcfg->ext_clk / (1000000 / (1 <<8 ))); + rval =ccs_write (sensor,EXTCLK_FREQUENCY_MHZ , + sensor->hwcfg->ext_clk / (1000000 / (1 <<8 )));if (rval) {dev_err (dev,"extclk frequency set failed\n" ); goto out_cci_addr_fail; } - rval =smiapp_write (sensor,SMIAPP_REG_U8_CSI_LANE_MODE , - sensor->hwcfg->lanes -1 ); + rval =ccs_write (sensor,CSI_LANE_MODE , sensor->hwcfg->lanes -1 );if (rval) {dev_err (dev,"csi lane mode set failed\n" ); goto out_cci_addr_fail; } - rval =smiapp_write (sensor,SMIAPP_REG_U8_FAST_STANDBY_CTRL , -SMIAPP_FAST_STANDBY_CTRL_IMMEDIATE ); + rval =ccs_write (sensor,FAST_STANDBY_CTRL , +CCS_FAST_STANDBY_CTRL_FRAME_TRUNCATION );if (rval) {dev_err (dev,"fast standby set failed\n" ); goto out_cci_addr_fail; } - rval =smiapp_write (sensor,SMIAPP_REG_U8_CSI_SIGNALLING_MODE , - sensor->hwcfg->csi_signalling_mode); + rval =ccs_write (sensor,CSI_SIGNALING_MODE , + sensor->hwcfg->csi_signalling_mode);if (rval) {dev_err (dev,"csi signalling mode set failed\n" ); goto out_cci_addr_fail; }/* DPHY control done by sensor based on requested link rate */ - rval =smiapp_write (sensor,SMIAPP_REG_U8_DPHY_CTRL , -SMIAPP_DPHY_CTRL_UI ); + rval =ccs_write (sensor,PHY_CTRL ,CCS_PHY_CTRL_UI );if (rval <0 ) goto out_cci_addr_fail;
@@ -1439,9 +1405,7 @@ static int smiapp_power_off(struct device *dev)* will fail. So do a soft reset explicitly here. */ if (sensor->hwcfg->i2c_addr_alt) -smiapp_write (sensor, -SMIAPP_REG_U8_SOFTWARE_RESET , -SMIAPP_SOFTWARE_RESET ); +ccs_write (sensor,SOFTWARE_RESET ,CCS_SOFTWARE_RESET_ON );gpiod_set_value (sensor->xshutdown,0 );clk_disable_unprepare (sensor->ext_clk);
@@ -1464,9 +1428,9 @@ static int smiapp_start_streaming(struct smiapp_sensor *sensor)mutex_lock (&sensor->mutex); - rval =smiapp_write (sensor,SMIAPP_REG_U16_CSI_DATA_FORMAT , - (sensor->csi_format->width <<8 ) | - sensor->csi_format->compressed); + rval =ccs_write (sensor,CSI_DATA_FORMAT , + (sensor->csi_format->width <<8 ) | + sensor->csi_format->compressed);if (rval) goto out;
@@ -1479,14 +1443,13 @@ static int smiapp_start_streaming(struct smiapp_sensor *sensor) (sensor->binning_horizontal <<4 ) | sensor->binning_vertical; - rval =smiapp_write ( - sensor,SMIAPP_REG_U8_BINNING_TYPE , binning_type); + rval =ccs_write (sensor,BINNING_TYPE , binning_type);if (rval <0 ) goto out; binning_mode =1 ; } - rval =smiapp_write (sensor,SMIAPP_REG_U8_BINNING_MODE , binning_mode); + rval =ccs_write (sensor,BINNING_MODE , binning_mode);if (rval <0 ) goto out;
@@ -1496,26 +1459,26 @@ static int smiapp_start_streaming(struct smiapp_sensor *sensor) goto out;/* Analog crop start coordinates */ - rval =smiapp_write (sensor,SMIAPP_REG_U16_X_ADDR_START , - sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC ].left); + rval =ccs_write (sensor,X_ADDR_START , + sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC ].left);if (rval <0 ) goto out; - rval =smiapp_write (sensor,SMIAPP_REG_U16_Y_ADDR_START , - sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC ].top); + rval =ccs_write (sensor,Y_ADDR_START , + sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC ].top);if (rval <0 ) goto out;/* Analog crop end coordinates */ - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_X_ADDR_END , + rval =ccs_write ( + sensor,X_ADDR_END , sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC ].left + sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC ].width -1 );if (rval <0 ) goto out; - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_Y_ADDR_END , + rval =ccs_write ( + sensor,Y_ADDR_END , sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC ].top + sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC ].height -1 );if (rval <0 )
@@ -1529,26 +1492,26 @@ static int smiapp_start_streaming(struct smiapp_sensor *sensor)/* Digital crop */ if (CCS_LIM (sensor,DIGITAL_CROP_CAPABILITY ) ==CCS_DIGITAL_CROP_CAPABILITY_INPUT_CROP ) { - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_DIGITAL_CROP_X_OFFSET , + rval =ccs_write ( + sensor,DIGITAL_CROP_X_OFFSET , sensor->scaler->crop[SMIAPP_PAD_SINK ].left);if (rval <0 ) goto out; - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_DIGITAL_CROP_Y_OFFSET , + rval =ccs_write ( + sensor,DIGITAL_CROP_Y_OFFSET , sensor->scaler->crop[SMIAPP_PAD_SINK ].top);if (rval <0 ) goto out; - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_DIGITAL_CROP_IMAGE_WIDTH , + rval =ccs_write ( + sensor,DIGITAL_CROP_IMAGE_WIDTH , sensor->scaler->crop[SMIAPP_PAD_SINK ].width);if (rval <0 ) goto out; - rval =smiapp_write ( - sensor,SMIAPP_REG_U16_DIGITAL_CROP_IMAGE_HEIGHT , + rval =ccs_write ( + sensor,DIGITAL_CROP_IMAGE_HEIGHT , sensor->scaler->crop[SMIAPP_PAD_SINK ].height);if (rval <0 ) goto out;
@@ -1557,24 +1520,22 @@ static int smiapp_start_streaming(struct smiapp_sensor *sensor)/* Scaling */ if (CCS_LIM (sensor,SCALING_CAPABILITY ) !=CCS_SCALING_CAPABILITY_NONE ) { - rval =smiapp_write (sensor,SMIAPP_REG_U16_SCALING_MODE , - sensor->scaling_mode); + rval =ccs_write (sensor,SCALING_MODE , sensor->scaling_mode);if (rval <0 ) goto out; - rval =smiapp_write (sensor,SMIAPP_REG_U16_SCALE_M , - sensor->scale_m); + rval =ccs_write (sensor,SCALE_M , sensor->scale_m);if (rval <0 ) goto out; }/* Output size from sensor */ - rval =smiapp_write (sensor,SMIAPP_REG_U16_X_OUTPUT_SIZE , - sensor->src->crop[SMIAPP_PAD_SRC ].width); + rval =ccs_write (sensor,X_OUTPUT_SIZE , + sensor->src->crop[SMIAPP_PAD_SRC ].width);if (rval <0 ) goto out; - rval =smiapp_write (sensor,SMIAPP_REG_U16_Y_OUTPUT_SIZE , - sensor->src->crop[SMIAPP_PAD_SRC ].height); + rval =ccs_write (sensor,Y_OUTPUT_SIZE , + sensor->src->crop[SMIAPP_PAD_SRC ].height);if (rval <0 ) goto out;
@@ -1594,8 +1555,7 @@ static int smiapp_start_streaming(struct smiapp_sensor *sensor) goto out; } - rval =smiapp_write (sensor,SMIAPP_REG_U8_MODE_SELECT , -SMIAPP_MODE_SELECT_STREAMING ); + rval =ccs_write (sensor,MODE_SELECT ,CCS_MODE_SELECT_STREAMING ); out:mutex_unlock (&sensor->mutex);
@@ -1609,8 +1569,7 @@ static int smiapp_stop_streaming(struct smiapp_sensor *sensor)int rval;mutex_lock (&sensor->mutex); - rval =smiapp_write (sensor,SMIAPP_REG_U8_MODE_SELECT , -SMIAPP_MODE_SELECT_SOFTWARE_STANDBY ); + rval =ccs_write (sensor,MODE_SELECT ,CCS_MODE_SELECT_SOFTWARE_STANDBY );if (rval) goto out;
@@ -1828,7 +1787,7 @@ static void smiapp_propagate(struct v4l2_subdev *subdev, sensor->scale_m =CCS_LIM (sensor,SCALER_N_MIN ); sensor->scaling_mode = -SMIAPP_SCALING_MODE_NONE ; +CCS_SCALING_MODE_NO_SCALING ; }else if (ssd == sensor->binner) { sensor->binning_horizontal =1 ; sensor->binning_vertical =1 ;
@@ -2063,7 +2022,7 @@ static void smiapp_set_compose_scaler(struct v4l2_subdev *subdev,struct smiapp_sensor *sensor =to_smiapp_sensor (subdev);u32 min, max, a, b, max_m;u32 scale_m =CCS_LIM (sensor,SCALER_N_MIN ); -int mode =SMIAPP_SCALING_MODE_HORIZONTAL ; +int mode =CCS_SCALING_MODE_HORIZONTAL ;u32 try[4 ];u32 ntry =0 ;unsigned int i;
@@ -2123,7 +2082,7 @@ static void smiapp_set_compose_scaler(struct v4l2_subdev *subdev,if (this > best) { scale_m = try[i]; - mode =SMIAPP_SCALING_MODE_HORIZONTAL ; + mode =CCS_SCALING_MODE_HORIZONTAL ; best = this; }
@@ -2494,26 +2453,24 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor) rval =smiapp_read_8only (sensor,SMIAPP_REG_U8_MANUFACTURER_ID , &minfo->smia_manufacturer_id);if (!rval) - rval =smiapp_read_8only (sensor,SMIAPP_REG_U16_MODEL_ID , + rval =smiapp_read_8only (sensor,CCS_R_MODULE_MODEL_ID , &minfo->model_id);if (!rval) rval =smiapp_read_8only (sensor, -SMIAPP_REG_U8_REVISION_NUMBER_MAJOR , +CCS_R_MODULE_REVISION_NUMBER_MAJOR , &minfo->revision_number_major);if (!rval) rval =smiapp_read_8only (sensor, -SMIAPP_REG_U8_REVISION_NUMBER_MINOR , +CCS_R_MODULE_REVISION_NUMBER_MINOR , &minfo->revision_number_minor);if (!rval) - rval =smiapp_read_8only (sensor, -SMIAPP_REG_U8_MODULE_DATE_YEAR , + rval =smiapp_read_8only (sensor,CCS_R_MODULE_DATE_YEAR , &minfo->module_year);if (!rval) - rval =smiapp_read_8only (sensor, -SMIAPP_REG_U8_MODULE_DATE_MONTH , + rval =smiapp_read_8only (sensor,CCS_R_MODULE_DATE_MONTH , &minfo->module_month);if (!rval) - rval =smiapp_read_8only (sensor,SMIAPP_REG_U8_MODULE_DATE_DAY , + rval =smiapp_read_8only (sensor,CCS_R_MODULE_DATE_DAY , &minfo->module_day);/* Sensor info */
@@ -2522,19 +2479,19 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor) &minfo->sensor_mipi_manufacturer_id);if (!rval && !minfo->sensor_mipi_manufacturer_id) rval =smiapp_read_8only (sensor, -SMIAPP_REG_U8_SENSOR_MANUFACTURER_ID , +CCS_R_SENSOR_MANUFACTURER_ID , &minfo->sensor_smia_manufacturer_id);if (!rval) rval =smiapp_read_8only (sensor, -SMIAPP_REG_U16_SENSOR_MODEL_ID , +CCS_R_SENSOR_MODEL_ID , &minfo->sensor_model_id);if (!rval) rval =smiapp_read_8only (sensor, -SMIAPP_REG_U8_SENSOR_REVISION_NUMBER , +CCS_R_SENSOR_REVISION_NUMBER , &minfo->sensor_revision_number);if (!rval) rval =smiapp_read_8only (sensor, -SMIAPP_REG_U8_SENSOR_FIRMWARE_VERSION , +CCS_R_SENSOR_FIRMWARE_VERSION , &minfo->sensor_firmware_version);/* SMIA */
@@ -2919,7 +2876,7 @@ static struct smiapp_hwconfig *smiapp_get_hwconfig(struct device *dev)switch (bus_cfg.bus_type) {case V4L2_MBUS_CSI2_DPHY : - hwcfg->csi_signalling_mode =SMIAPP_CSI_SIGNALLING_MODE_CSI2 ; + hwcfg->csi_signalling_mode =CCS_CSI_SIGNALING_MODE_CSI_2_DPHY ; hwcfg->lanes = bus_cfg.bus.mipi_csi2.num_data_lanes;break ;case V4L2_MBUS_CCP2 :
@@ -3095,8 +3052,9 @@ static int smiapp_probe(struct i2c_client *client)*/ if (sensor->hwcfg->module_board_orient ==SMIAPP_MODULE_BOARD_ORIENT_180 ) - sensor->hvflip_inv_mask =SMIAPP_IMAGE_ORIENTATION_HFLIP | -SMIAPP_IMAGE_ORIENTATION_VFLIP ; + sensor->hvflip_inv_mask = +CCS_IMAGE_ORIENTATION_HORIZONTAL_MIRROR | +CCS_IMAGE_ORIENTATION_VERTICAL_FLIP ; rval =smiapp_call_quirk (sensor, limits);if (rval) {
drivers/media/i2c/smiapp/smiapp.h +3 -1
@@ -15,6 +15,8 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h> +#include "ccs-regs.h" +#include "smiapp-pll.h" #include "smiapp-reg-defs.h" #include "smiapp-regs.h"
@@ -220,7 +222,7 @@ struct smiapp_sensor {struct gpio_desc *xshutdown;void *ccs_limits;u8 nbinning_subtypes; -struct smiapp_binning_subtype binning_subtypes[SMIAPP_BINNING_SUBTYPES ]; +struct smiapp_binning_subtype binning_subtypes[CCS_LIM_BINNING_SUB_TYPE_MAX_N +1 ];u32 mbus_frame_fmts;const struct smiapp_csi_data_format *csi_format;const struct smiapp_csi_data_format *internal_csi_format;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 13/106 smiapp: Remove quirk function for writing a single 8-bit register
In reply to Sakari AilusThis function is no longer needed as the smiapp_write() function can be used to write 8-bit registers with plain register addresses.
--- drivers/media/i2c/smiapp/smiapp-quirk.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/media/i2c/smiapp/smiapp-quirk.c +5 -10
@@ -14,11 +14,6 @@#include "smiapp.h" -static int smiapp_write_8 (struct smiapp_sensor *sensor,u16 reg,u8 val) -{ -return smiapp_write (sensor, reg, val); -} -static int smiapp_write_8s (struct smiapp_sensor *sensor,const struct smiapp_reg_8 *regs,int len) {
@@ -26,7 +21,7 @@ static int smiapp_write_8s(struct smiapp_sensor *sensor,int rval;for (; len >0 ; len--, regs++) { - rval =smiapp_write_8 (sensor, regs->reg, regs->val); + rval =smiapp_write (sensor, regs->reg, regs->val);if (rval <0 ) { dev_err(&client->dev, "error %d writing reg 0x%4.4x, val 0x%2.2x",
@@ -170,7 +165,7 @@ static int jt8ev1_post_poweron(struct smiapp_sensor *sensor)static int jt8ev1_pre_streamon (struct smiapp_sensor *sensor) { -return smiapp_write_8 (sensor,0x3328 ,0x00 ); +return smiapp_write (sensor,0x3328 ,0x00 ); }static int jt8ev1_post_streamoff (struct smiapp_sensor *sensor)
@@ -178,7 +173,7 @@ static int jt8ev1_post_streamoff(struct smiapp_sensor *sensor)int rval;/* Workaround: allows fast standby to work properly */ - rval =smiapp_write_8 (sensor,0x3205 ,0x04 ); + rval =smiapp_write (sensor,0x3205 ,0x04 );if (rval <0 )return rval;
@@ -186,11 +181,11 @@ static int jt8ev1_post_streamoff(struct smiapp_sensor *sensor)usleep_range (2000 ,2050 );/* Restore it */ - rval =smiapp_write_8 (sensor,0x3205 ,0x00 ); + rval =smiapp_write (sensor,0x3205 ,0x00 );if (rval <0 )return rval; -return smiapp_write_8 (sensor,0x3328 ,0x80 ); +return smiapp_write (sensor,0x3328 ,0x80 ); }static int jt8ev1_init (struct smiapp_sensor *sensor)
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 14/106 smiapp: Rename register access functions
In reply to Sakari AilusRename register access functions by changing smiapp to ccs.
The functions operating on register addresses have "addr" appended to the name.
--- drivers/media/i2c/smiapp/smiapp-core.c | 67 +++++++++++++------------ drivers/media/i2c/smiapp/smiapp-quirk.c | 22 ++++---- drivers/media/i2c/smiapp/smiapp-regs.c | 47 ++++++++--------- drivers/media/i2c/smiapp/smiapp-regs.h | 14 +++--- 4 files changed, 76 insertions(+), 74 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +34 -33
@@ -180,7 +180,7 @@ static int ccs_read_all_limits(struct smiapp_sensor *sensor) j++, reg += width, ptr += width) {u32 val; - ret =smiapp_read (sensor, reg, &val); + ret =ccs_read_addr (sensor, reg, &val);if (ret) goto out_err;
@@ -2450,59 +2450,60 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor) rval =ccs_read (sensor,MODULE_MANUFACTURER_ID , &minfo->mipi_manufacturer_id);if (!rval && !minfo->mipi_manufacturer_id) - rval =smiapp_read_8only (sensor,SMIAPP_REG_U8_MANUFACTURER_ID , - &minfo->smia_manufacturer_id); + rval =ccs_read_addr_8only (sensor, +SMIAPP_REG_U8_MANUFACTURER_ID , + &minfo->smia_manufacturer_id);if (!rval) - rval =smiapp_read_8only (sensor,CCS_R_MODULE_MODEL_ID , - &minfo->model_id); + rval =ccs_read_addr_8only (sensor,CCS_R_MODULE_MODEL_ID , + &minfo->model_id);if (!rval) - rval =smiapp_read_8only (sensor, -CCS_R_MODULE_REVISION_NUMBER_MAJOR , - &minfo->revision_number_major); + rval =ccs_read_addr_8only (sensor, +CCS_R_MODULE_REVISION_NUMBER_MAJOR , + &minfo->revision_number_major);if (!rval) - rval =smiapp_read_8only (sensor, -CCS_R_MODULE_REVISION_NUMBER_MINOR , - &minfo->revision_number_minor); + rval =ccs_read_addr_8only (sensor, +CCS_R_MODULE_REVISION_NUMBER_MINOR , + &minfo->revision_number_minor);if (!rval) - rval =smiapp_read_8only (sensor,CCS_R_MODULE_DATE_YEAR , - &minfo->module_year); + rval =ccs_read_addr_8only (sensor,CCS_R_MODULE_DATE_YEAR , + &minfo->module_year);if (!rval) - rval =smiapp_read_8only (sensor,CCS_R_MODULE_DATE_MONTH , - &minfo->module_month); + rval =ccs_read_addr_8only (sensor,CCS_R_MODULE_DATE_MONTH , + &minfo->module_month);if (!rval) - rval =smiapp_read_8only (sensor,CCS_R_MODULE_DATE_DAY , - &minfo->module_day); + rval =ccs_read_addr_8only (sensor,CCS_R_MODULE_DATE_DAY , + &minfo->module_day);/* Sensor info */ if (!rval) rval =ccs_read (sensor,SENSOR_MANUFACTURER_ID , &minfo->sensor_mipi_manufacturer_id);if (!rval && !minfo->sensor_mipi_manufacturer_id) - rval =smiapp_read_8only (sensor, -CCS_R_SENSOR_MANUFACTURER_ID , - &minfo->sensor_smia_manufacturer_id); + rval =ccs_read_addr_8only (sensor, +CCS_R_SENSOR_MANUFACTURER_ID , + &minfo->sensor_smia_manufacturer_id);if (!rval) - rval =smiapp_read_8only (sensor, -CCS_R_SENSOR_MODEL_ID , - &minfo->sensor_model_id); + rval =ccs_read_addr_8only (sensor, +CCS_R_SENSOR_MODEL_ID , + &minfo->sensor_model_id);if (!rval) - rval =smiapp_read_8only (sensor, -CCS_R_SENSOR_REVISION_NUMBER , - &minfo->sensor_revision_number); + rval =ccs_read_addr_8only (sensor, +CCS_R_SENSOR_REVISION_NUMBER , + &minfo->sensor_revision_number);if (!rval) - rval =smiapp_read_8only (sensor, -CCS_R_SENSOR_FIRMWARE_VERSION , - &minfo->sensor_firmware_version); + rval =ccs_read_addr_8only (sensor, +CCS_R_SENSOR_FIRMWARE_VERSION , + &minfo->sensor_firmware_version);/* SMIA */ if (!rval) rval =ccs_read (sensor,MIPI_CCS_VERSION , &minfo->ccs_version);if (!rval && !minfo->ccs_version) - rval =smiapp_read_8only (sensor,SMIAPP_REG_U8_SMIA_VERSION , - &minfo->smia_version); + rval =ccs_read_addr_8only (sensor,SMIAPP_REG_U8_SMIA_VERSION , + &minfo->smia_version);if (!rval && !minfo->ccs_version) - rval =smiapp_read_8only (sensor,SMIAPP_REG_U8_SMIAPP_VERSION , - &minfo->smiapp_version); + rval =ccs_read_addr_8only (sensor,SMIAPP_REG_U8_SMIAPP_VERSION , + &minfo->smiapp_version);if (rval) {dev_err (&client->dev,"sensor detection failed\n" );
drivers/media/i2c/smiapp/smiapp-quirk.c +11 -11
@@ -14,14 +14,14 @@#include "smiapp.h" -static int smiapp_write_8s (struct smiapp_sensor *sensor, -const struct smiapp_reg_8 *regs,int len) +static int ccs_write_addr_8s (struct smiapp_sensor *sensor, +const struct smiapp_reg_8 *regs,int len) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);int rval;for (; len >0 ; len--, regs++) { - rval =smiapp_write (sensor, regs->reg, regs->val); + rval =ccs_write_addr (sensor, regs->reg, regs->val);if (rval <0 ) { dev_err(&client->dev, "error %d writing reg 0x%4.4x, val 0x%2.2x",
@@ -81,7 +81,7 @@ static int jt8ew9_post_poweron(struct smiapp_sensor *sensor) }; -return smiapp_write_8s (sensor, regs,ARRAY_SIZE (regs)); +return ccs_write_addr_8s (sensor, regs,ARRAY_SIZE (regs)); }const struct smiapp_quirk smiapp_jt8ew9_quirk = {
@@ -102,7 +102,7 @@ static int imx125es_post_poweron(struct smiapp_sensor *sensor) { 0x3b08, 0x8c }, }; -return smiapp_write_8s (sensor, regs,ARRAY_SIZE (regs)); +return ccs_write_addr_8s (sensor, regs,ARRAY_SIZE (regs)); }const struct smiapp_quirk smiapp_imx125es_quirk = {
@@ -148,13 +148,13 @@ static int jt8ev1_post_poweron(struct smiapp_sensor *sensor) { 0x30b0, 0x01 }, }; - rval =smiapp_write_8s (sensor, regs,ARRAY_SIZE (regs)); + rval =ccs_write_addr_8s (sensor, regs,ARRAY_SIZE (regs));if (rval <0 )return rval;switch (sensor->hwcfg->ext_clk) {case 9600000 : -return smiapp_write_8s (sensor, regs_96, +return ccs_write_addr_8s (sensor, regs_96,ARRAY_SIZE (regs_96));default : dev_warn(&client->dev, "no MSRs for %d Hz ext_clk\n",
@@ -165,7 +165,7 @@ static int jt8ev1_post_poweron(struct smiapp_sensor *sensor)static int jt8ev1_pre_streamon (struct smiapp_sensor *sensor) { -return smiapp_write (sensor,0x3328 ,0x00 ); +return ccs_write_addr (sensor,0x3328 ,0x00 ); }static int jt8ev1_post_streamoff (struct smiapp_sensor *sensor)
@@ -173,7 +173,7 @@ static int jt8ev1_post_streamoff(struct smiapp_sensor *sensor)int rval;/* Workaround: allows fast standby to work properly */ - rval =smiapp_write (sensor,0x3205 ,0x04 ); + rval =ccs_write_addr (sensor,0x3205 ,0x04 );if (rval <0 )return rval;
@@ -181,11 +181,11 @@ static int jt8ev1_post_streamoff(struct smiapp_sensor *sensor)usleep_range (2000 ,2050 );/* Restore it */ - rval =smiapp_write (sensor,0x3205 ,0x00 ); + rval =ccs_write_addr (sensor,0x3205 ,0x00 );if (rval <0 )return rval; -return smiapp_write (sensor,0x3328 ,0x80 ); +return ccs_write_addr (sensor,0x3328 ,0x80 ); }static int jt8ev1_init (struct smiapp_sensor *sensor)
drivers/media/i2c/smiapp/smiapp-regs.c +24 -23
115 lines not on this page · raw message
drivers/media/i2c/smiapp/smiapp-regs.h +7 -7
@@ -20,18 +20,18 @@struct smiapp_sensor ; -int smiapp_read_no_quirk (struct smiapp_sensor *sensor,u32 reg,u32 *val); -int smiapp_read (struct smiapp_sensor *sensor,u32 reg,u32 *val); -int smiapp_read_8only (struct smiapp_sensor *sensor,u32 reg,u32 *val); -int smiapp_write_no_quirk (struct smiapp_sensor *sensor,u32 reg,u32 val); -int smiapp_write (struct smiapp_sensor *sensor,u32 reg,u32 val); +int ccs_read_addr_no_quirk (struct smiapp_sensor *sensor,u32 reg,u32 *val); +int ccs_read_addr (struct smiapp_sensor *sensor,u32 reg,u32 *val); +int ccs_read_addr_8only (struct smiapp_sensor *sensor,u32 reg,u32 *val); +int ccs_write_addr_no_quirk (struct smiapp_sensor *sensor,u32 reg,u32 val); +int ccs_write_addr (struct smiapp_sensor *sensor,u32 reg,u32 val);unsigned int ccs_reg_width (u32 reg);#define ccs_read (sensor, reg_name, val) \ - smiapp_read(sensor, CCS_R_##reg_name, val) + ccs_read_addr(sensor, CCS_R_##reg_name, val)#define ccs_write (sensor, reg_name, val) \ - smiapp_write(sensor, CCS_R_##reg_name, val) + ccs_write_addr(sensor, CCS_R_##reg_name, val)#endif
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 15/106 smiapp: Internal rename to CCS
In reply to Sakari AilusRename internal names to reflect the driver's new reference. The module name remains the same.
Also fix trivial coding style issues on the way related to e.g. alignment changes due to the rename.
---
drivers/media/i2c/smiapp/Makefile | 4 +-
.../i2c/smiapp/{smiapp-core.c => ccs-core.c} | 888 +++++++++---------
.../smiapp/{smiapp-quirk.c => ccs-quirk.c} | 43 +-
.../smiapp/{smiapp-quirk.h => ccs-quirk.h} | 46 +-
.../{smiapp-regs.c => ccs-reg-access.c} | 41 +-
.../{smiapp-regs.h => ccs-reg-access.h} | 16 +-
drivers/media/i2c/smiapp/{smiapp.h => ccs.h} | 124 +--
7 files changed, 576 insertions(+), 586 deletions(-)
rename drivers/media/i2c/smiapp/{smiapp-core.c => ccs-core.c} (75%)
rename drivers/media/i2c/smiapp/{smiapp-quirk.c => ccs-quirk.c} (83%)
rename drivers/media/i2c/smiapp/{smiapp-quirk.h => ccs-quirk.h} (59%)
rename drivers/media/i2c/smiapp/{smiapp-regs.c => ccs-reg-access.c} (79%)
rename drivers/media/i2c/smiapp/{smiapp-regs.h => ccs-reg-access.h} (55%)
rename drivers/media/i2c/smiapp/{smiapp.h => ccs.h} (65%)drivers/media/i2c/smiapp/Makefile +2 -2
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -smiapp-objs += smiapp-core.o smiapp-regs.o \ - smiapp-quirk.o ccs-limits.o +smiapp-objs += ccs-core.o ccs-reg-access.o \ + ccs-quirk.o ccs-limits.o obj-$(CONFIG_VIDEO_SMIAPP) += smiapp.o ccflags-y += -I $(srctree)/drivers/media/i2c
drivers/media/i2c/smiapp/ccs-core.c renamed from drivers/media/i2c/smiapp/smiapp-core.c +441 -447
2,057 lines not on this page · raw message
drivers/media/i2c/smiapp/ccs-quirk.c renamed from drivers/media/i2c/smiapp/smiapp-quirk.c +21 -22
138 lines not on this page · raw message
drivers/media/i2c/smiapp/ccs-quirk.h renamed from drivers/media/i2c/smiapp/smiapp-quirk.h +23 -23
85 lines not on this page · raw message
drivers/media/i2c/smiapp/ccs-reg-access.c renamed from drivers/media/i2c/smiapp/smiapp-regs.c +19 -22
128 lines not on this page · raw message
drivers/media/i2c/smiapp/ccs-reg-access.h renamed from drivers/media/i2c/smiapp/smiapp-regs.h +8 -8
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* include/media/smiapp/smiapp-regs.h +* include/media/smiapp/ccs-regs.h * * Generic driver for SMIA/SMIA++ compliant camera modules *
@@ -16,15 +16,15 @@#include "ccs-regs.h" -#define SMIAPP_REG_ADDR (reg) ((u16)reg) +#define CCS_REG_ADDR (reg) ((u16)reg) -struct smiapp_sensor ; +struct ccs_sensor ; -int ccs_read_addr_no_quirk (struct smiapp_sensor *sensor,u32 reg,u32 *val); -int ccs_read_addr (struct smiapp_sensor *sensor,u32 reg,u32 *val); -int ccs_read_addr_8only (struct smiapp_sensor *sensor,u32 reg,u32 *val); -int ccs_write_addr_no_quirk (struct smiapp_sensor *sensor,u32 reg,u32 val); -int ccs_write_addr (struct smiapp_sensor *sensor,u32 reg,u32 val); +int ccs_read_addr_no_quirk (struct ccs_sensor *sensor,u32 reg,u32 *val); +int ccs_read_addr (struct ccs_sensor *sensor,u32 reg,u32 *val); +int ccs_read_addr_8only (struct ccs_sensor *sensor,u32 reg,u32 *val); +int ccs_write_addr_no_quirk (struct ccs_sensor *sensor,u32 reg,u32 val); +int ccs_write_addr (struct ccs_sensor *sensor,u32 reg,u32 val);unsigned int ccs_reg_width (u32 reg);
drivers/media/i2c/smiapp/ccs.h renamed from drivers/media/i2c/smiapp/smiapp.h +62 -62
273 lines not on this page · raw message
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 16/106 smiapp: Differentiate CCS sensors from SMIA in subdev naming
In reply to Sakari AilusCall CCS compliant sensors as "ccs" instead of "smiapp" in absence of a device specific name. This is done based on the value of the manufacturer ID register that is only present in CCS.
--- drivers/media/i2c/smiapp/ccs-core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/media/i2c/smiapp/ccs-core.c +5 -4
@@ -2437,8 +2437,6 @@ static int ccs_identify_module(struct ccs_sensor *sensor)unsigned int i;int rval =0 ; - minfo->name =SMIAPP_NAME ; -/* Module info */ rval =ccs_read (sensor,MODULE_MANUFACTURER_ID , &minfo->mipi_manufacturer_id);
@@ -2528,15 +2526,18 @@ static int ccs_identify_module(struct ccs_sensor *sensor)"sensor revision 0x%2.2x firmware version 0x%2.2x\n" , minfo->sensor_revision_number, minfo->sensor_firmware_version); -if (minfo->ccs_version) +if (minfo->ccs_version) {dev_dbg (&client->dev,"MIPI CCS version %u.%u" , (minfo->ccs_version &CCS_MIPI_CCS_VERSION_MAJOR_MASK ) >>CCS_MIPI_CCS_VERSION_MAJOR_SHIFT , (minfo->ccs_version &CCS_MIPI_CCS_VERSION_MINOR_MASK )); -else + minfo->name =CCS_NAME ; + }else {dev_dbg (&client->dev,"smia version %2.2d smiapp version %2.2d\n" , minfo->smia_version, minfo->smiapp_version); + minfo->name =SMIAPP_NAME ; + }/* * Some modules have bad data in the lvalues below. Hope the
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 17/106 smiapp: Rename as "ccs"
In reply to Sakari AilusRename the "smiapp" driver as "ccs". MIPI CCS is the contemporary standard for raw Bayer camera sensors. The driver retains support for the SMIA++ and SMIA compliant camera sensors. A module alias is added for old user space using "smiapp" module name.
Add Intel copyright while at it.
---
MAINTAINERS | 20 +++++++++----------
drivers/media/i2c/Kconfig | 2 +-
drivers/media/i2c/Makefile | 2 +-
drivers/media/i2c/{smiapp => ccs}/Kconfig | 7 ++++---
drivers/media/i2c/{smiapp => ccs}/Makefile | 4 ++--
drivers/media/i2c/{smiapp => ccs}/ccs-core.c | 6 ++++--
drivers/media/i2c/{smiapp => ccs}/ccs-os.h | 0
drivers/media/i2c/{smiapp => ccs}/ccs-quirk.c | 5 +++--
drivers/media/i2c/{smiapp => ccs}/ccs-quirk.h | 5 +++--
.../i2c/{smiapp => ccs}/ccs-reg-access.c | 5 +++--
.../i2c/{smiapp => ccs}/ccs-reg-access.h | 5 +++--
.../media/i2c/{smiapp => ccs}/ccs-regs.txt | 0
drivers/media/i2c/{smiapp => ccs}/ccs.h | 3 ++-
drivers/media/i2c/{smiapp => ccs}/mk-ccs-regs | 0
.../i2c/{smiapp => ccs}/smiapp-reg-defs.h | 3 ++-
15 files changed, 38 insertions(+), 29 deletions(-)
rename drivers/media/i2c/{smiapp => ccs}/Kconfig (55%)
rename drivers/media/i2c/{smiapp => ccs}/Makefile (85%)
rename drivers/media/i2c/{smiapp => ccs}/ccs-core.c (99%)
rename drivers/media/i2c/{smiapp => ccs}/ccs-os.h (100%)
rename drivers/media/i2c/{smiapp => ccs}/ccs-quirk.c (97%)
rename drivers/media/i2c/{smiapp => ccs}/ccs-quirk.h (94%)
rename drivers/media/i2c/{smiapp => ccs}/ccs-reg-access.c (97%)
rename drivers/media/i2c/{smiapp => ccs}/ccs-reg-access.h (86%)
rename drivers/media/i2c/{smiapp => ccs}/ccs-regs.txt (100%)
rename drivers/media/i2c/{smiapp => ccs}/ccs.h (98%)
rename drivers/media/i2c/{smiapp => ccs}/mk-ccs-regs (100%)
rename drivers/media/i2c/{smiapp => ccs}/smiapp-reg-defs.h (99%)MAINTAINERS +10 -10
@@ -11560,6 +11560,16 @@ M: Oliver Neukum <[email protected]> S: Maintained F: drivers/usb/image/microtek.* +MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER +M: Sakari Ailus <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/devicetree/bindings/media/i2c/nokia,smia.txt +F: drivers/media/i2c/ccs/ +F: drivers/media/i2c/smiapp-pll.c +F: drivers/media/i2c/smiapp-pll.h +F: include/uapi/linux/smiapp.h + MIPS M: Thomas Bogendoerfer <[email protected]> L: [email protected]
@@ -15957,16 +15967,6 @@ S: Maintained F: drivers/firmware/smccc/ F: include/linux/arm-smccc.h -SMIA AND SMIA++ IMAGE SENSOR DRIVER -M: Sakari Ailus <[email protected]> -L: [email protected] -S: Maintained -F: Documentation/devicetree/bindings/media/i2c/nokia,smia.txt -F: drivers/media/i2c/smiapp-pll.c -F: drivers/media/i2c/smiapp-pll.h -F: drivers/media/i2c/smiapp/ -F: include/uapi/linux/smiapp.h - SMM665 HARDWARE MONITOR DRIVER M: Guenter Roeck <[email protected]> L: [email protected]
drivers/media/i2c/Kconfig +1 -1
@@ -1233,7 +1233,7 @@ config VIDEO_S5K5BAF This is a V4L2 sensor driver for Samsung S5K5BAF 2M camera sensor with an embedded SoC image signal processor. -source "drivers/media/i2c/smiapp/Kconfig" +source "drivers/media/i2c/ccs/Kconfig" source "drivers/media/i2c/et8ek8/Kconfig" config VIDEO_S5C73M3
drivers/media/i2c/Makefile +1 -1
@@ -2,7 +2,7 @@ msp3400-objs := msp3400-driver.o msp3400-kthreads.o obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o -obj-$(CONFIG_VIDEO_SMIAPP) += smiapp/ +obj-$(CONFIG_VIDEO_CCS) += ccs/ obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/ obj-$(CONFIG_VIDEO_CX25840) += cx25840/ obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/
drivers/media/i2c/ccs/Kconfig renamed from drivers/media/i2c/smiapp/Kconfig +4 -3
@@ -1,10 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-only -config VIDEO_SMIAPP - tristate "SMIA++/SMIA sensor support" +config VIDEO_CCS + tristate "MIPI CCS/SMIA++/SMIA sensor support" depends on I2C && VIDEO_V4L2 && HAVE_CLK select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select VIDEO_SMIAPP_PLL select V4L2_FWNODE help - This is a generic driver for SMIA++/SMIA camera modules. + This is a generic driver for MIPI CCS, SMIA++ and SMIA compliant + camera sensors.
drivers/media/i2c/ccs/Makefile renamed from drivers/media/i2c/smiapp/Makefile +2 -2
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only -smiapp-objs += ccs-core.o ccs-reg-access.o \ +ccs-objs += ccs-core.o ccs-reg-access.o \ ccs-quirk.o ccs-limits.o -obj-$(CONFIG_VIDEO_SMIAPP) += smiapp.o +obj-$(CONFIG_VIDEO_CCS) += ccs.o ccflags-y += -I $(srctree)/drivers/media/i2c
drivers/media/i2c/ccs/ccs-core.c renamed from drivers/media/i2c/smiapp/ccs-core.c +4 -2
@@ -1,9 +1,10 @@// SPDX-License-Identifier: GPL-2.0-only /* -* drivers/media/i2c/smiapp/ccs-core.c +* drivers/media/i2c/ccs/ccs-core.c * -* Generic driver for SMIA/SMIA++ compliant camera modules +* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors * +* Copyright (C) 2020 Intel Corporation * Copyright (C) 2010--2012 Nokia Corporation * Contact: Sakari Ailus <[email protected]> *
@@ -3298,3 +3299,4 @@ module_exit(ccs_module_cleanup);MODULE_AUTHOR ("Sakari Ailus <[email protected]>" );MODULE_DESCRIPTION ("Generic MIPI CCS/SMIA/SMIA++ camera sensor driver" );MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("smiapp" );
drivers/media/i2c/ccs/ccs-os.h renamed from drivers/media/i2c/smiapp/ccs-os.h +0 -0
drivers/media/i2c/ccs/ccs-quirk.c renamed from drivers/media/i2c/smiapp/ccs-quirk.c +3 -2
@@ -1,9 +1,10 @@// SPDX-License-Identifier: GPL-2.0-only /* -* drivers/media/i2c/smiapp/ccs-quirk.c +* drivers/media/i2c/ccs/ccs-quirk.c * -* Generic driver for SMIA/SMIA++ compliant camera modules +* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors * +* Copyright (C) 2020 Intel Corporation * Copyright (C) 2011--2012 Nokia Corporation * Contact: Sakari Ailus <[email protected]> */
drivers/media/i2c/ccs/ccs-quirk.h renamed from drivers/media/i2c/smiapp/ccs-quirk.h +3 -2
@@ -1,9 +1,10 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* drivers/media/i2c/smiapp/ccs-quirk.h +* drivers/media/i2c/ccs/ccs-quirk.h * -* Generic driver for SMIA/SMIA++ compliant camera modules +* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors * +* Copyright (C) 2020 Intel Corporation * Copyright (C) 2011--2012 Nokia Corporation * Contact: Sakari Ailus <[email protected]> */
drivers/media/i2c/ccs/ccs-reg-access.c renamed from drivers/media/i2c/smiapp/ccs-reg-access.c +3 -2
@@ -1,9 +1,10 @@// SPDX-License-Identifier: GPL-2.0-only /* -* drivers/media/i2c/smiapp/ccs-regs.c +* drivers/media/i2c/ccs/ccs-reg-access.c * -* Generic driver for SMIA/SMIA++ compliant camera modules +* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors * +* Copyright (C) 2020 Intel Corporation * Copyright (C) 2011--2012 Nokia Corporation * Contact: Sakari Ailus <[email protected]> */
drivers/media/i2c/ccs/ccs-reg-access.h renamed from drivers/media/i2c/smiapp/ccs-reg-access.h +3 -2
@@ -1,9 +1,10 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* include/media/smiapp/ccs-regs.h +* include/media/ccs/ccs-reg-access.h * -* Generic driver for SMIA/SMIA++ compliant camera modules +* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors * +* Copyright (C) 2020 Intel Corporation * Copyright (C) 2011--2012 Nokia Corporation * Contact: Sakari Ailus <[email protected]> */
drivers/media/i2c/ccs/ccs-regs.txt renamed from drivers/media/i2c/smiapp/ccs-regs.txt +0 -0
drivers/media/i2c/ccs/ccs.h renamed from drivers/media/i2c/smiapp/ccs.h +2 -1
@@ -2,8 +2,9 @@/* * drivers/media/i2c/smiapp/ccs.h * -* Generic driver for SMIA/SMIA++ compliant camera modules +* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors * +* Copyright (C) 2020 Intel Corporation * Copyright (C) 2010--2012 Nokia Corporation * Contact: Sakari Ailus <[email protected]> */
drivers/media/i2c/ccs/mk-ccs-regs renamed from drivers/media/i2c/smiapp/mk-ccs-regs +0 -0
drivers/media/i2c/ccs/smiapp-reg-defs.h renamed from drivers/media/i2c/smiapp/smiapp-reg-defs.h +2 -1
@@ -2,8 +2,9 @@/* * drivers/media/i2c/smiapp/smiapp-reg-defs.h * -* Generic driver for SMIA/SMIA++ compliant camera modules +* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors * +* Copyright (C) 2020 Intel Corporation * Copyright (C) 2011--2012 Nokia Corporation * Contact: Sakari Ailus <[email protected]> */
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 18/106 ccs: Remove profile concept
In reply to Sakari AilusThe driver doesn't do anything tangible with profiles. Remove the notion, and use the capabilities directly.
--- drivers/media/i2c/ccs/ccs-core.c | 23 ++++++----------------- drivers/media/i2c/ccs/ccs.h | 2 -- 2 files changed, 6 insertions(+), 19 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +6 -17
@@ -377,7 +377,7 @@ static int ccs_pll_configure(struct ccs_sensor *sensor) rval =ccs_write (sensor,REQUESTED_LINK_RATE ,DIV_ROUND_UP (pll->op.sys_clk_freq_hz,1000000 /256 /256 )); -if (rval <0 || sensor->minfo.smiapp_profile ==SMIAPP_PROFILE_0 ) +if (rval <0 || sensor->pll.flags &SMIAPP_PLL_FLAG_NO_OP_CLOCKS )return rval; rval =ccs_write (sensor,OP_PIX_CLK_DIV , pll->op.pix_clk_div);
@@ -3096,23 +3096,17 @@ static int ccs_probe(struct i2c_client *client) } } -/* We consider this as profile 0 sensor if any of these are zero. */ if (!CCS_LIM (sensor,MIN_OP_SYS_CLK_DIV ) || !CCS_LIM (sensor,MAX_OP_SYS_CLK_DIV ) || !CCS_LIM (sensor,MIN_OP_PIX_CLK_DIV ) || !CCS_LIM (sensor,MAX_OP_PIX_CLK_DIV )) { - sensor->minfo.smiapp_profile =SMIAPP_PROFILE_0 ; +/* No OP clock branch */ + sensor->pll.flags |=SMIAPP_PLL_FLAG_NO_OP_CLOCKS ; }else if (CCS_LIM (sensor,SCALING_CAPABILITY ) - !=CCS_SCALING_CAPABILITY_NONE ) { -if (CCS_LIM (sensor,SCALING_CAPABILITY ) - ==CCS_SCALING_CAPABILITY_HORIZONTAL ) - sensor->minfo.smiapp_profile =SMIAPP_PROFILE_1 ; -else - sensor->minfo.smiapp_profile =SMIAPP_PROFILE_2 ; - sensor->scaler = &sensor->ssds[sensor->ssds_used]; - sensor->ssds_used++; - }else if (CCS_LIM (sensor,DIGITAL_CROP_CAPABILITY ) + !=CCS_SCALING_CAPABILITY_NONE || +CCS_LIM (sensor,DIGITAL_CROP_CAPABILITY ) ==CCS_DIGITAL_CROP_CAPABILITY_INPUT_CROP ) { +/* We have a scaler or digital crop. */ sensor->scaler = &sensor->ssds[sensor->ssds_used]; sensor->ssds_used++; }
@@ -3128,16 +3122,11 @@ static int ccs_probe(struct i2c_client *client) sensor->pll.csi2.lanes = sensor->hwcfg->lanes; sensor->pll.ext_clk_freq_hz = sensor->hwcfg->ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN ); -/* Profile 0 sensors have no separate OP clock branch. */ -if (sensor->minfo.smiapp_profile ==SMIAPP_PROFILE_0 ) - sensor->pll.flags |=SMIAPP_PLL_FLAG_NO_OP_CLOCKS ;ccs_create_subdev (sensor, sensor->scaler," scaler" ,2 );ccs_create_subdev (sensor, sensor->binner," binner" ,2 );ccs_create_subdev (sensor, sensor->pixel_array," pixel_array" ,1 ); -dev_dbg (&client->dev,"profile %d\n" , sensor->minfo.smiapp_profile); - sensor->pixel_array->sd.entity.function =MEDIA_ENT_F_CAM_SENSOR ; rval =ccs_init_controls (sensor);
drivers/media/i2c/ccs/ccs.h +0 -2
@@ -124,8 +124,6 @@ struct ccs_module_info {u32 smiapp_version;u32 ccs_version; -u32 smiapp_profile; -char *name;const struct ccs_quirk *quirk; };
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 19/106 ccs: Give all subdevs a function
In reply to Sakari AilusThis removes a warning at driver probe time telling that one or two entities have no function set. The function used for both the binner and scaler is the scaler.
--- drivers/media/i2c/ccs/ccs-core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +8 -6
@@ -2685,7 +2685,7 @@ static void ccs_cleanup(struct ccs_sensor *sensor)static void ccs_create_subdev (struct ccs_sensor *sensor,struct ccs_subdev *ssd,const char *name, -unsigned short num_pads) +unsigned short num_pads,u32 function) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);
@@ -2696,6 +2696,7 @@ static void ccs_create_subdev(struct ccs_sensor *sensor,v4l2_subdev_init (&ssd->sd, &ccs_ops); ssd->sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; + ssd->sd.entity.function = function; ssd->sensor = sensor; ssd->npads = num_pads;
@@ -3123,11 +3124,12 @@ static int ccs_probe(struct i2c_client *client) sensor->pll.ext_clk_freq_hz = sensor->hwcfg->ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN ); -ccs_create_subdev (sensor, sensor->scaler," scaler" ,2 ); -ccs_create_subdev (sensor, sensor->binner," binner" ,2 ); -ccs_create_subdev (sensor, sensor->pixel_array," pixel_array" ,1 ); - - sensor->pixel_array->sd.entity.function =MEDIA_ENT_F_CAM_SENSOR ; +ccs_create_subdev (sensor, sensor->scaler," scaler" ,2 , +MEDIA_ENT_F_CAM_SENSOR ); +ccs_create_subdev (sensor, sensor->binner," binner" ,2 , +MEDIA_ENT_F_PROC_VIDEO_SCALER ); +ccs_create_subdev (sensor, sensor->pixel_array," pixel_array" ,1 , +MEDIA_ENT_F_PROC_VIDEO_SCALER ); rval =ccs_init_controls (sensor);if (rval <0 )
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 27/106 ccs: Request for "reset" GPIO
In reply to Sakari AilusThe DT bindings documented "reset-gpios" property but the driver never made use of it. Instead it used a GPIO called "xshutdown", with apprently wrong polarity.
Fix this by requesting "reset" GPIO with the right polarity first, and if that fails, then request "xshutdown" GPIO with the old polarity. This way it works for new users as expected while if someone, somewhere, depended on "xshutdown" GPIO, that continues to work as well.
--- drivers/media/i2c/ccs/ccs-core.c | 14 ++++++++++++-- drivers/media/i2c/ccs/ccs.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +12 -2
@@ -1295,6 +1295,7 @@ static int ccs_power_on(struct device *dev) }usleep_range (1000 ,1000 ); +gpiod_set_value (sensor->reset,0 );gpiod_set_value (sensor->xshutdown,1 ); sleep =SMIAPP_RESET_DELAY (sensor->hwcfg->ext_clk);
@@ -1381,6 +1382,7 @@ static int ccs_power_on(struct device *dev)return 0 ; out_cci_addr_fail: +gpiod_set_value (sensor->reset,1 );gpiod_set_value (sensor->xshutdown,0 );clk_disable_unprepare (sensor->ext_clk);
@@ -1407,6 +1409,7 @@ static int ccs_power_off(struct device *dev)if (sensor->hwcfg->i2c_addr_alt)ccs_write (sensor,SOFTWARE_RESET ,CCS_SOFTWARE_RESET_ON ); +gpiod_set_value (sensor->reset,1 );gpiod_set_value (sensor->xshutdown,0 );clk_disable_unprepare (sensor->ext_clk);usleep_range (5000 ,5000 );
@@ -3008,8 +3011,15 @@ static int ccs_probe(struct i2c_client *client)return -EINVAL ; } - sensor->xshutdown =devm_gpiod_get_optional (&client->dev,"xshutdown" , -GPIOD_OUT_LOW ); + sensor->reset =devm_gpiod_get_optional (&client->dev,"reset" , +GPIOD_OUT_HIGH ); +if (IS_ERR (sensor->reset)) +return PTR_ERR (sensor->reset); +/* Support old users that may have used "xshutdown" property. */ +if (!sensor->reset) + sensor->xshutdown =devm_gpiod_get_optional (&client->dev, +"xshutdown" , +GPIOD_OUT_LOW );if (IS_ERR (sensor->xshutdown))return PTR_ERR (sensor->xshutdown);
drivers/media/i2c/ccs/ccs.h +1 -0
@@ -219,6 +219,7 @@ struct ccs_sensor {struct regulator *vana;struct clk *ext_clk;struct gpio_desc *xshutdown; +struct gpio_desc *reset;void *ccs_limits;u8 nbinning_subtypes;struct ccs_binning_subtype binning_subtypes[CCS_LIM_BINNING_SUB_TYPE_MAX_N +1 ];
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 28/106 ccs: Add MIPI CCS compatible strings
In reply to Sakari AilusAdd "mipi-ccs-1.0" and "mipi-ccs-1.1" compatible strings to the CCS driver.
--- drivers/media/i2c/ccs/ccs-core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/i2c/ccs/ccs-core.c +3 -0
@@ -3236,6 +3236,9 @@ static int ccs_remove(struct i2c_client *client) }static const struct of_device_id ccs_of_table[] = { + { .compatible ="mipi-ccs-1.1" }, + { .compatible ="mipi-ccs-1.0" }, + { .compatible ="mipi-ccs" }, { .compatible ="nokia,smia" }, { }, };
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 29/106 ccs: Remove the I²C ID table
In reply to Sakari AilusThe I²C ID table is no longer needed; remove it.
--- drivers/media/i2c/ccs/ccs-core.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +0 -7
@@ -3244,12 +3244,6 @@ static const struct of_device_id ccs_of_table[] = { };MODULE_DEVICE_TABLE (of, ccs_of_table); -static const struct i2c_device_id ccs_id_table[] = { - {SMIAPP_NAME ,0 }, - { }, -}; -MODULE_DEVICE_TABLE (i2c, ccs_id_table); -static const struct dev_pm_ops ccs_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(ccs_suspend, ccs_resume)SET_RUNTIME_PM_OPS (ccs_power_off, ccs_power_on,NULL )
@@ -3263,7 +3257,6 @@ static struct i2c_driver ccs_i2c_driver = { }, .probe_new = ccs_probe, .remove = ccs_remove, - .id_table = ccs_id_table, };static int ccs_module_init (void )
Signature · 1 line
2.27.0
Re: [PATCH v2 029/106] ccs: Remove the I²C ID table
Em Wed, 7 Oct 2020 11:44:42 +0300
Sakari Ailus <[email protected]> escreveu:
Quoted 1 line
The I²C ID table is no longer needed; remove it.
Why not? Please provide more information.
In summary, please change the description in order to answer the following questions:
For OF-based drivers, removing I2C probing won't cause any harm, as the patch is keeping css_of_able, but wouldn't it affect other drivers that could, for example, be using ACPI, instead?
Or is this driver incompatible with other probing methods?
Quoted 24 lines
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/ccs/ccs-core.c | 7 ------- 1 file changed, 7 deletions(-)drivers/media/i2c/ccs/ccs-core.c +0
-6@@ -3244,12 +3244,6 @@ static const struct of_device_id ccs_of_table[] = { };MODULE_DEVICE_TABLE (of, ccs_of_table); -static const struct i2c_device_id ccs_id_table[] = { - {SMIAPP_NAME ,0 }, - { }, -}; -MODULE_DEVICE_TABLE (i2c, ccs_id_table); -static const struct dev_pm_ops ccs_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(ccs_suspend, ccs_resume)SET_RUNTIME_PM_OPS (ccs_power_off, ccs_power_on,NULL )
drivers/media/i2c/ccs/ccs-core.c static struct i2c_driver ccs_i2c_driver = { · line 3262
Quoted 7 lines
drivers/media/i2c/ccs/ccs-core.c +0
-1@@ -3263,7 +3257,6 @@ static struct i2c_driver ccs_i2c_driver = { }, .probe_new = ccs_probe, .remove = ccs_remove, - .id_table = ccs_id_table, };static int ccs_module_init (void )
Thanks,
Mauro
Sakari Ailus
maintainerRe: [PATCH v2 029/106] ccs: Remove the I²C ID table
Hi Mauro,
Quoted 7 lines · Mauro Carvalho Chehab
Em Wed, 7 Oct 2020 11:44:42 +0300
Sakari Ailus <[email protected]> escreveu:Quoted 1 line
The I²C ID table is no longer needed; remove it.
Why not? Please provide more information.
Quoted 8 lines
In summary, please change the description in order to answer the following questions:
For OF-based drivers, removing I2C probing won't cause any harm, as the patch is keeping
css_of_able, but wouldn't it affect other drivers that could, for example, be using ACPI, instead?Or is this driver incompatible with other probing methods?
ACPI doesn't need this anymore. It did though.
Platform data support has been (gradually) removed so I believe this can be removed, too. If someone can show it has a purpose, I don't have objections to reverting this later either.
Signature · 3 lines
Regards, Sakari Ailus
Sakari Ailus
maintainerPATCH v2 30/106 ccs: Remove remaining support for platform data
In reply to Sakari AilusNo need to support platform data; remove support for conveying hardware configuration that way.
--- drivers/media/i2c/ccs/ccs-core.c | 3 --- 1 file changed, 3 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +0 -3
@@ -2854,9 +2854,6 @@ static struct ccs_hwconfig *ccs_get_hwconfig(struct device *dev)int i;int rval; -if (!fwnode) -return dev->platform_data; - ep =fwnode_graph_get_next_endpoint (fwnode,NULL );if (!ep)return NULL ;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 31/106 ccs: Make hwcfg part of the device specific struct
In reply to Sakari AilusThere's no need to allocate the hardware configuration struct separately. Put it in struct ccs_sensor.
--- drivers/media/i2c/ccs/ccs-core.c | 94 ++++++++++++++++--------------- drivers/media/i2c/ccs/ccs-quirk.c | 4 +- drivers/media/i2c/ccs/ccs.h | 2 +- 3 files changed, 51 insertions(+), 49 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +48 -46
@@ -803,7 +803,7 @@ static int ccs_init_late_controls(struct ccs_sensor *sensor) sensor->link_freq =v4l2_ctrl_new_int_menu ( &sensor->src->ctrl_handler, &ccs_ctrl_ops,V4L2_CID_LINK_FREQ ,__fls (*valid_link_freqs), -__ffs (*valid_link_freqs), sensor->hwcfg->op_sys_clock); +__ffs (*valid_link_freqs), sensor->hwcfg.op_sys_clock);return sensor->src->ctrl_handler.error; }
@@ -916,8 +916,8 @@ static int ccs_get_mbus_formats(struct ccs_sensor *sensor) pll->bits_per_pixel = f->compressed; -for (j =0 ; sensor->hwcfg->op_sys_clock[j]; j++) { - pll->link_freq = sensor->hwcfg->op_sys_clock[j]; +for (j =0 ; sensor->hwcfg.op_sys_clock[j]; j++) { + pll->link_freq = sensor->hwcfg.op_sys_clock[j]; rval =ccs_pll_try (sensor, pll); dev_dbg(&client->dev, "link freq %u Hz, bpp %u %s\n",
@@ -1117,21 +1117,21 @@ static int ccs_change_cci_addr(struct ccs_sensor *sensor)int rval;u32 val; - client->addr = sensor->hwcfg->i2c_addr_dfl; + client->addr = sensor->hwcfg.i2c_addr_dfl; rval =ccs_write (sensor,CCI_ADDRESS_CTRL , - sensor->hwcfg->i2c_addr_alt <<1 ); + sensor->hwcfg.i2c_addr_alt <<1 );if (rval)return rval; - client->addr = sensor->hwcfg->i2c_addr_alt; + client->addr = sensor->hwcfg.i2c_addr_alt;/* verify addr change went ok */ rval =ccs_read (sensor,CCI_ADDRESS_CTRL , &val);if (rval)return rval; -if (val != sensor->hwcfg->i2c_addr_alt <<1 ) +if (val != sensor->hwcfg.i2c_addr_alt <<1 )return -ENODEV ;return 0 ;
@@ -1145,13 +1145,13 @@ static int ccs_change_cci_addr(struct ccs_sensor *sensor)static int ccs_setup_flash_strobe (struct ccs_sensor *sensor) {struct ccs_flash_strobe_parms *strobe_setup; -unsigned int ext_freq = sensor->hwcfg->ext_clk; +unsigned int ext_freq = sensor->hwcfg.ext_clk;u32 tmp;u32 strobe_adjustment;u32 strobe_width_high_rs;int rval; - strobe_setup = sensor->hwcfg->strobe_setup; + strobe_setup = sensor->hwcfg.strobe_setup;/* * How to calculate registers related to strobe length. Please
@@ -1259,7 +1259,7 @@ static int ccs_setup_flash_strobe(struct ccs_sensor *sensor) rval =ccs_write (sensor,FLASH_TRIGGER_RS , strobe_setup->trigger); out: - sensor->hwcfg->strobe_setup->trigger =0 ; + sensor->hwcfg.strobe_setup->trigger =0 ;return rval; }
@@ -1298,7 +1298,7 @@ static int ccs_power_on(struct device *dev)gpiod_set_value (sensor->reset,0 );gpiod_set_value (sensor->xshutdown,1 ); - sleep =SMIAPP_RESET_DELAY (sensor->hwcfg->ext_clk); + sleep =SMIAPP_RESET_DELAY (sensor->hwcfg.ext_clk);usleep_range (sleep, sleep);/*
@@ -1312,7 +1312,7 @@ static int ccs_power_on(struct device *dev)* is found. */ -if (sensor->hwcfg->i2c_addr_alt) { +if (sensor->hwcfg.i2c_addr_alt) { rval =ccs_change_cci_addr (sensor);if (rval) {dev_err (dev,"cci address change error\n" );
@@ -1326,7 +1326,7 @@ static int ccs_power_on(struct device *dev) goto out_cci_addr_fail; } -if (sensor->hwcfg->i2c_addr_alt) { +if (sensor->hwcfg.i2c_addr_alt) { rval =ccs_change_cci_addr (sensor);if (rval) {dev_err (dev,"cci address change error\n" );
@@ -1342,13 +1342,13 @@ static int ccs_power_on(struct device *dev) } rval =ccs_write (sensor,EXTCLK_FREQUENCY_MHZ , - sensor->hwcfg->ext_clk / (1000000 / (1 <<8 ))); + sensor->hwcfg.ext_clk / (1000000 / (1 <<8 )));if (rval) {dev_err (dev,"extclk frequency set failed\n" ); goto out_cci_addr_fail; } - rval =ccs_write (sensor,CSI_LANE_MODE , sensor->hwcfg->lanes -1 ); + rval =ccs_write (sensor,CSI_LANE_MODE , sensor->hwcfg.lanes -1 );if (rval) {dev_err (dev,"csi lane mode set failed\n" ); goto out_cci_addr_fail;
@@ -1362,7 +1362,7 @@ static int ccs_power_on(struct device *dev) } rval =ccs_write (sensor,CSI_SIGNALING_MODE , - sensor->hwcfg->csi_signalling_mode); + sensor->hwcfg.csi_signalling_mode);if (rval) {dev_err (dev,"csi signalling mode set failed\n" ); goto out_cci_addr_fail;
@@ -1406,7 +1406,7 @@ static int ccs_power_off(struct device *dev)* really see a power off and next time the cci address change * will fail. So do a soft reset explicitly here. */ -if (sensor->hwcfg->i2c_addr_alt) +if (sensor->hwcfg.i2c_addr_alt)ccs_write (sensor,SOFTWARE_RESET ,CCS_SOFTWARE_RESET_ON );gpiod_set_value (sensor->reset,1 );
@@ -1545,8 +1545,8 @@ static int ccs_start_streaming(struct ccs_sensor *sensor)if (CCS_LIM (sensor,FLASH_MODE_CAPABILITY ) & (CCS_FLASH_MODE_CAPABILITY_SINGLE_STROBE |SMIAPP_FLASH_MODE_CAPABILITY_MULTIPLE_STROBE ) && - sensor->hwcfg->strobe_setup !=NULL && - sensor->hwcfg->strobe_setup->trigger !=0 ) { + sensor->hwcfg.strobe_setup !=NULL && + sensor->hwcfg.strobe_setup->trigger !=0 ) { rval =ccs_setup_flash_strobe (sensor);if (rval) goto out;
@@ -2844,9 +2844,9 @@ static int __maybe_unused ccs_resume(struct device *dev)return rval; } -static struct ccs_hwconfig *ccs_get_hwconfig (struct device *dev) +static int ccs_get_hwconfig (struct ccs_sensor *sensor,struct device *dev) { -struct ccs_hwconfig *hwcfg; +struct ccs_hwconfig *hwcfg = &sensor->hwcfg;struct v4l2_fwnode_endpoint bus_cfg = { .bus_type =0 };struct fwnode_handle *ep;struct fwnode_handle *fwnode =dev_fwnode (dev);
@@ -2856,7 +2856,7 @@ static struct ccs_hwconfig *ccs_get_hwconfig(struct device *dev) ep =fwnode_graph_get_next_endpoint (fwnode,NULL );if (!ep) -return NULL ; +return -ENODEV ; bus_cfg.bus_type =V4L2_MBUS_CSI2_DPHY ; rval =v4l2_fwnode_endpoint_alloc_parse (ep, &bus_cfg);
@@ -2868,10 +2868,6 @@ static struct ccs_hwconfig *ccs_get_hwconfig(struct device *dev)if (rval) goto out_err; - hwcfg =devm_kzalloc (dev,sizeof (*hwcfg),GFP_KERNEL ); -if (!hwcfg) - goto out_err; -switch (bus_cfg.bus_type) {case V4L2_MBUS_CSI2_DPHY : hwcfg->csi_signalling_mode =CCS_CSI_SIGNALING_MODE_CSI_2_DPHY ;
@@ -2885,6 +2881,7 @@ static struct ccs_hwconfig *ccs_get_hwconfig(struct device *dev)break ;default :dev_err (dev,"unsupported bus %u\n" , bus_cfg.bus_type); + rval = -EINVAL ; goto out_err; }
@@ -2901,6 +2898,7 @@ static struct ccs_hwconfig *ccs_get_hwconfig(struct device *dev)break ;default :dev_err (dev,"invalid rotation %u\n" , rotation); + rval = -EINVAL ; goto out_err; } }
@@ -2915,14 +2913,17 @@ static struct ccs_hwconfig *ccs_get_hwconfig(struct device *dev)if (!bus_cfg.nr_of_link_frequencies) {dev_warn (dev,"no link frequencies defined\n" ); + rval = -EINVAL ; goto out_err; } hwcfg->op_sys_clock =devm_kcalloc ( dev, bus_cfg.nr_of_link_frequencies +1 /* guardian */ ,sizeof (*hwcfg->op_sys_clock),GFP_KERNEL ); -if (!hwcfg->op_sys_clock) +if (!hwcfg->op_sys_clock) { + rval = -ENOMEM ; goto out_err; + }for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++) { hwcfg->op_sys_clock[i] = bus_cfg.link_frequencies[i];
@@ -2931,29 +2932,30 @@ static struct ccs_hwconfig *ccs_get_hwconfig(struct device *dev)v4l2_fwnode_endpoint_free (&bus_cfg);fwnode_handle_put (ep); -return hwcfg; + +return 0 ; out_err:v4l2_fwnode_endpoint_free (&bus_cfg);fwnode_handle_put (ep); -return NULL ; + +return rval; }static int ccs_probe (struct i2c_client *client) {struct ccs_sensor *sensor; -struct ccs_hwconfig *hwcfg =ccs_get_hwconfig (&client->dev);unsigned int i;int rval; -if (hwcfg ==NULL ) -return -ENODEV ; - sensor =devm_kzalloc (&client->dev,sizeof (*sensor),GFP_KERNEL );if (sensor ==NULL )return -ENOMEM ; - sensor->hwcfg = hwcfg; + rval =ccs_get_hwconfig (sensor, &client->dev); +if (rval) +return rval; + sensor->src = &sensor->ssds[sensor->ssds_used];v4l2_i2c_subdev_init (&sensor->src->sd, client, &ccs_ops);
@@ -2976,33 +2978,33 @@ static int ccs_probe(struct i2c_client *client) }if (sensor->ext_clk) { -if (sensor->hwcfg->ext_clk) { +if (sensor->hwcfg.ext_clk) {unsigned long rate; rval =clk_set_rate (sensor->ext_clk, - sensor->hwcfg->ext_clk); + sensor->hwcfg.ext_clk);if (rval <0 ) {dev_err (&client->dev,"unable to set clock freq to %u\n" , - sensor->hwcfg->ext_clk); + sensor->hwcfg.ext_clk);return rval; } rate =clk_get_rate (sensor->ext_clk); -if (rate != sensor->hwcfg->ext_clk) { +if (rate != sensor->hwcfg.ext_clk) {dev_err (&client->dev,"can't set clock freq, asked for %u but got %lu\n" , - sensor->hwcfg->ext_clk, rate); + sensor->hwcfg.ext_clk, rate);return rval; } }else { - sensor->hwcfg->ext_clk =clk_get_rate (sensor->ext_clk); + sensor->hwcfg.ext_clk =clk_get_rate (sensor->ext_clk);dev_dbg (&client->dev,"obtained clock freq %u\n" , - sensor->hwcfg->ext_clk); + sensor->hwcfg.ext_clk); } - }else if (sensor->hwcfg->ext_clk) { + }else if (sensor->hwcfg.ext_clk) {dev_dbg (&client->dev,"assuming clock freq %u\n" , - sensor->hwcfg->ext_clk); + sensor->hwcfg.ext_clk); }else {dev_err (&client->dev,"unable to obtain clock freq\n" );return -EINVAL ;
@@ -3055,7 +3057,7 @@ static int ccs_probe(struct i2c_client *client)* * Rotation also changes the bayer pattern. */ -if (sensor->hwcfg->module_board_orient == +if (sensor->hwcfg.module_board_orient ==CCS_MODULE_BOARD_ORIENT_180 ) sensor->hvflip_inv_mask = CCS_IMAGE_ORIENTATION_HORIZONTAL_MIRROR |
@@ -3127,8 +3129,8 @@ static int ccs_probe(struct i2c_client *client)/* prepare PLL configuration input values */ sensor->pll.bus_type =SMIAPP_PLL_BUS_TYPE_CSI2 ; - sensor->pll.csi2.lanes = sensor->hwcfg->lanes; - sensor->pll.ext_clk_freq_hz = sensor->hwcfg->ext_clk; + sensor->pll.csi2.lanes = sensor->hwcfg.lanes; + sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN ); ccs_create_subdev(sensor, sensor->scaler, " scaler", 2,
drivers/media/i2c/ccs/ccs-quirk.c +2 -2
@@ -152,13 +152,13 @@ static int jt8ev1_post_poweron(struct ccs_sensor *sensor)if (rval <0 )return rval; -switch (sensor->hwcfg->ext_clk) { +switch (sensor->hwcfg.ext_clk) {case 9600000 :return ccs_write_addr_8s (sensor, regs_96,ARRAY_SIZE (regs_96));default :dev_warn (&client->dev,"no MSRs for %d Hz ext_clk\n" , - sensor->hwcfg->ext_clk); + sensor->hwcfg.ext_clk);return 0 ; } }
drivers/media/i2c/ccs/ccs.h +1 -1
@@ -215,7 +215,7 @@ struct ccs_sensor {struct ccs_subdev *binner;struct ccs_subdev *scaler;struct ccs_subdev *pixel_array; -struct ccs_hwconfig *hwcfg; +struct ccs_hwconfig hwcfg;struct regulator *vana;struct clk *ext_clk;struct gpio_desc *xshutdown;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 32/106 ccs: Fix obtaining bus information from firmware
In reply to Sakari AilusLet v4l2_fwnode_endpoint_alloc_parse to figure out the type of the data bus. As the old bindings did not require the "bus-type" property, we need to rely on guessing between CSI-2 D-PHY and CCP2. Setting the type to CSI-2 D-PHY will parse just that and succeed even if no data-lanes are set.
Also add a comment on the matter to the driver to avoid breaking this in the future.
--- drivers/media/i2c/ccs/ccs-core.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +6 -7
@@ -2847,7 +2847,7 @@ static int __maybe_unused ccs_resume(struct device *dev)static int ccs_get_hwconfig (struct ccs_sensor *sensor,struct device *dev) {struct ccs_hwconfig *hwcfg = &sensor->hwcfg; -struct v4l2_fwnode_endpoint bus_cfg = { .bus_type =0 }; +struct v4l2_fwnode_endpoint bus_cfg = { .bus_type =V4L2_MBUS_UNKNOWN };struct fwnode_handle *ep;struct fwnode_handle *fwnode =dev_fwnode (dev);u32 rotation;
@@ -2858,13 +2858,11 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev)if (!ep)return -ENODEV ; - bus_cfg.bus_type =V4L2_MBUS_CSI2_DPHY ; +/* +* Note that we do need to rely on detecting the bus type between CSI-2 +* D-PHY and CCP2 as the old bindings did not require it. +*/ rval =v4l2_fwnode_endpoint_alloc_parse (ep, &bus_cfg); -if (rval == -ENXIO ) { - bus_cfg = (struct v4l2_fwnode_endpoint ) - { .bus_type =V4L2_MBUS_CCP2 }; - rval =v4l2_fwnode_endpoint_alloc_parse (ep, &bus_cfg); - }if (rval) goto out_err;
@@ -2873,6 +2871,7 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev) hwcfg->csi_signalling_mode =CCS_CSI_SIGNALING_MODE_CSI_2_DPHY ; hwcfg->lanes = bus_cfg.bus.mipi_csi2.num_data_lanes;break ; +case V4L2_MBUS_CSI1 :case V4L2_MBUS_CCP2 : hwcfg->csi_signalling_mode = (bus_cfg.bus.mipi_csi1.strobe) ? SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE :
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 33/106 ccs: Add CCS static data parser library
In reply to Sakari AilusAdd a parser library for parsing the CCS static data format.
The library may be also compiled in user space as the format has uses also in the user space. Therefore it is dual licensed under the 3-clause BSD license as well.
--- drivers/media/i2c/ccs/Makefile | 2 +- drivers/media/i2c/ccs/ccs-data-defs.h | 215 ++++++ drivers/media/i2c/ccs/ccs-data.c | 949 ++++++++++++++++++++++++++ drivers/media/i2c/ccs/ccs-data.h | 116 ++++ 4 files changed, 1281 insertions(+), 1 deletion(-) create mode 100644 drivers/media/i2c/ccs/ccs-data-defs.h create mode 100644 drivers/media/i2c/ccs/ccs-data.c create mode 100644 drivers/media/i2c/ccs/ccs-data.h
drivers/media/i2c/ccs/Makefile +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only ccs-objs += ccs-core.o ccs-reg-access.o \ - ccs-quirk.o ccs-limits.o + ccs-quirk.o ccs-limits.o ccs-data.o obj-$(CONFIG_VIDEO_CCS) += ccs.o ccflags-y += -I $(srctree)/drivers/media/i2c
drivers/media/i2c/ccs/ccs-data-defs.h new file +215 -0
215 lines not on this page · raw message
drivers/media/i2c/ccs/ccs-data.c new file +949 -0
949 lines not on this page · raw message
drivers/media/i2c/ccs/ccs-data.h new file +116 -0
116 lines not on this page · raw message
Signature · 1 line
2.27.0
Re: [PATCH v2 033/106] ccs: Add CCS static data parser library
Em Wed, 7 Oct 2020 11:44:46 +0300
Sakari Ailus <[email protected]> escreveu:
Quoted 240 lines
Add a parser library for parsing the CCS static data format.
The library may be also compiled in user space as the format has uses also in the user space. Therefore it is dual licensed under the 3-clause BSD license as well.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/ccs/Makefile | 2 +- drivers/media/i2c/ccs/ccs-data-defs.h | 215 ++++++ drivers/media/i2c/ccs/ccs-data.c | 949 ++++++++++++++++++++++++++ drivers/media/i2c/ccs/ccs-data.h | 116 ++++ 4 files changed, 1281 insertions(+), 1 deletion(-) create mode 100644 drivers/media/i2c/ccs/ccs-data-defs.h create mode 100644 drivers/media/i2c/ccs/ccs-data.c create mode 100644 drivers/media/i2c/ccs/ccs-data.hdrivers/media/i2c/ccs/Makefile +1
-1@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only ccs-objs += ccs-core.o ccs-reg-access.o \ - ccs-quirk.o ccs-limits.o + ccs-quirk.o ccs-limits.o ccs-data.o obj-$(CONFIG_VIDEO_CCS) += ccs.o ccflags-y += -I $(srctree)/drivers/media/i2cdrivers/media/i2c/ccs/ccs-data-defs.h new file +205
-0@@ -0,0 +1,215 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* Copyright 2019--2020 Intel Corporation */ + +#ifndef __CCS_DATA_DEFS_H__ +#define __CCS_DATA_DEFS_H__ + +#include "ccs-data.h" + +#define CCS_STATIC_DATA_VERSION 0 + +enum __ccs_data_length_specifier_id { + CCS_DATA_LENGTH_SPECIFIER_1 = 0, + CCS_DATA_LENGTH_SPECIFIER_2 = 1, + CCS_DATA_LENGTH_SPECIFIER_3 = 2 +}; +#define CCS_DATA_LENGTH_SPECIFIER_SIZE_SHIFT 6 + +struct __ccs_data_length_specifier { + uint8_t length; +} __attribute__((packed)); + +struct __ccs_data_length_specifier2 { + uint8_t length[2]; +} __attribute__((packed)); + +struct __ccs_data_length_specifier3 { + uint8_t length[3]; +} __attribute__((packed)); + +struct __ccs_data_block { + uint8_t id; + struct __ccs_data_length_specifier length; +} __attribute__((packed)); + +#define CCS_DATA_BLOCK_HEADER_ID_VERSION_SHIFT 5 + +struct __ccs_data_block3 { + uint8_t id; + struct __ccs_data_length_specifier2 length; +} __attribute__((packed)); + +struct __ccs_data_block4 { + uint8_t id; + struct __ccs_data_length_specifier3 length; +} __attribute__((packed)); + +enum __ccs_data_block_id { + CCS_DATA_BLOCK_ID_DUMMY = 1, + CCS_DATA_BLOCK_ID_DATA_VERSION = 2, + CCS_DATA_BLOCK_ID_SENSOR_READ_ONLY_REGS = 3, + CCS_DATA_BLOCK_ID_MODULE_READ_ONLY_REGS = 4, + CCS_DATA_BLOCK_ID_SENSOR_MANUFACTURER_REGS = 5, + CCS_DATA_BLOCK_ID_MODULE_MANUFACTURER_REGS = 6, + CCS_DATA_BLOCK_ID_SENSOR_RULE_BASED_BLOCK = 32, + CCS_DATA_BLOCK_ID_MODULE_RULE_BASED_BLOCK = 33, + CCS_DATA_BLOCK_ID_SENSOR_PDAF_PIXEL_LOCATION = 36, + CCS_DATA_BLOCK_ID_MODULE_PDAF_PIXEL_LOCATION = 37, + CCS_DATA_BLOCK_ID_LICENSE = 40, + CCS_DATA_BLOCK_ID_END = 127, +}; + +struct __ccs_data_block_version { + uint8_t static_data_version_major[2]; + uint8_t static_data_version_minor[2]; + uint8_t year[2]; + uint8_t month; + uint8_t day; +} __attribute__((packed)); + +struct __ccs_data_block_regs { + uint8_t reg_len; +} __attribute__((packed)); + +#define CCS_DATA_BLOCK_REGS_ADDR_MASK 0x07 +#define CCS_DATA_BLOCK_REGS_LEN_SHIFT 3 +#define CCS_DATA_BLOCK_REGS_LEN_MASK 0x38 +#define CCS_DATA_BLOCK_REGS_SEL_SHIFT 6 +enum ccs_data_block_regs_sel { + CCS_DATA_BLOCK_REGS_SEL_REGS = 0, + CCS_DATA_BLOCK_REGS_SEL_REGS2 = 1, + CCS_DATA_BLOCK_REGS_SEL_REGS3 = 2, +}; + +struct __ccs_data_block_regs2 { + uint8_t reg_len; + uint8_t addr; +} __attribute__((packed)); + +#define CCS_DATA_BLOCK_REGS_2_ADDR_MASK 0x01 +#define CCS_DATA_BLOCK_REGS_2_LEN_SHIFT 1 +#define CCS_DATA_BLOCK_REGS_2_LEN_MASK 0x3e + +struct __ccs_data_block_regs3 { + uint8_t reg_len; + uint8_t addr[2]; +} __attribute__((packed)); + +#define CCS_DATA_BLOCK_REGS_3_LEN_MASK 0x3f + +enum __ccs_data_ffd_pixelcode { + CCS_DATA_BLOCK_FFD_PIXELCODE_EMBEDDED = 1, + CCS_DATA_BLOCK_FFD_PIXELCODE_DUMMY = 2, + CCS_DATA_BLOCK_FFD_PIXELCODE_BLACK = 3, + CCS_DATA_BLOCK_FFD_PIXELCODE_DARK = 4, + CCS_DATA_BLOCK_FFD_PIXELCODE_VISIBLE = 5, + CCS_DATA_BLOCK_FFD_PIXELCODE_MS_0 = 8, + CCS_DATA_BLOCK_FFD_PIXELCODE_MS_1 = 9, + CCS_DATA_BLOCK_FFD_PIXELCODE_MS_2 = 10, + CCS_DATA_BLOCK_FFD_PIXELCODE_MS_3 = 11, + CCS_DATA_BLOCK_FFD_PIXELCODE_MS_4 = 12, + CCS_DATA_BLOCK_FFD_PIXELCODE_MS_5 = 13, + CCS_DATA_BLOCK_FFD_PIXELCODE_MS_6 = 14, + CCS_DATA_BLOCK_FFD_PIXELCODE_TOP_OB = 16, + CCS_DATA_BLOCK_FFD_PIXELCODE_BOTTOM_OB = 17, + CCS_DATA_BLOCK_FFD_PIXELCODE_LEFT_OB = 18, + CCS_DATA_BLOCK_FFD_PIXELCODE_RIGHT_OB = 19, + CCS_DATA_BLOCK_FFD_PIXELCODE_TOP_LEFT_OB = 20, + CCS_DATA_BLOCK_FFD_PIXELCODE_TOP_RIGHT_OB = 21, + CCS_DATA_BLOCK_FFD_PIXELCODE_BOTTOM_LEFT_OB = 22, + CCS_DATA_BLOCK_FFD_PIXELCODE_BOTTOM_RIGHT_OB = 23, + CCS_DATA_BLOCK_FFD_PIXELCODE_TOTAL = 24, + CCS_DATA_BLOCK_FFD_PIXELCODE_TOP_PDAF = 32, + CCS_DATA_BLOCK_FFD_PIXELCODE_BOTTOM_PDAF = 33, + CCS_DATA_BLOCK_FFD_PIXELCODE_LEFT_PDAF = 34, + CCS_DATA_BLOCK_FFD_PIXELCODE_RIGHT_PDAF = 35, + CCS_DATA_BLOCK_FFD_PIXELCODE_TOP_LEFT_PDAF = 36, + CCS_DATA_BLOCK_FFD_PIXELCODE_TOP_RIGHT_PDAF = 37, + CCS_DATA_BLOCK_FFD_PIXELCODE_BOTTOM_LEFT_PDAF = 38, + CCS_DATA_BLOCK_FFD_PIXELCODE_BOTTOM_RIGHT_PDAF = 39, + CCS_DATA_BLOCK_FFD_PIXELCODE_SEPARATED_PDAF = 40, + CCS_DATA_BLOCK_FFD_PIXELCODE_ORIGINAL_ORDER_PDAF = 41, + CCS_DATA_BLOCK_FFD_PIXELCODE_VENDOR_PDAF = 41, +}; + +struct __ccs_data_block_ffd_entry { + uint8_t pixelcode; + uint8_t reserved; + uint8_t value[2]; +} __attribute__((packed)); + +struct __ccs_data_block_ffd { + uint8_t num_column_descs; + uint8_t num_row_descs; +} __attribute__((packed)); + +enum __ccs_data_block_rule_id { + CCS_DATA_BLOCK_RULE_ID_IF = 1, + CCS_DATA_BLOCK_RULE_ID_READ_ONLY_REGS = 2, + CCS_DATA_BLOCK_RULE_ID_FFD = 3, + CCS_DATA_BLOCK_RULE_ID_MSR = 4, + CCS_DATA_BLOCK_RULE_ID_PDAF_READOUT = 5, +}; + +struct __ccs_data_block_rule_if { + uint8_t addr[2]; + uint8_t value; + uint8_t mask; +} __attribute__((packed)); + +enum __ccs_data_block_pdaf_readout_order{ + CCS_DATA_BLOCK_PDAF_READOUT_ORDER_ORIGINAL = 1, + CCS_DATA_BLOCK_PDAF_READOUT_ORDER_SEPARATE_WITHIN_LINE = 2, + CCS_DATA_BLOCK_PDAF_READOUT_ORDER_SEPARATE_TYPES_SEPARATE_LINES = 3, +}; + +struct __ccs_data_block_pdaf_readout { + uint8_t pdaf_readout_info_reserved; + uint8_t pdaf_readout_info_order; +} __attribute__((packed)); + +struct __ccs_data_block_pdaf_pix_loc_block_desc { + uint8_t block_type_id; + uint8_t repeat_x[2]; +} __attribute__((packed)); + +struct __ccs_data_block_pdaf_pix_loc_block_desc_group { + uint8_t num_block_descs[2]; + uint8_t repeat_y; +} __attribute__((packed)); + +enum __ccs_data_block_pdaf_pix_loc_pixel_type { + CCS_DATA_PDAF_PIXEL_TYPE_LEFT_SEPARATED = 0, + CCS_DATA_PDAF_PIXEL_TYPE_RIGHT_SEPARATED = 1, + CCS_DATA_PDAF_PIXEL_TYPE_TOP_SEPARATED = 2, + CCS_DATA_PDAF_PIXEL_TYPE_BOTTOM_SEPARATED = 3, + CCS_DATA_PDAF_PIXEL_TYPE_LEFT_SIDE_BY_SIDE = 4, + CCS_DATA_PDAF_PIXEL_TYPE_RIGHT_SIDE_BY_SIDE = 5, + CCS_DATA_PDAF_PIXEL_TYPE_TOP_SIDE_BY_SIDE = 6, + CCS_DATA_PDAF_PIXEL_TYPE_BOTTOM_SIDE_BY_SIDE = 7, + CCS_DATA_PDAF_PIXEL_TYPE_TOP_LEFT = 8, + CCS_DATA_PDAF_PIXEL_TYPE_TOP_RIGHT = 9, + CCS_DATA_PDAF_PIXEL_TYPE_BOTTOM_LEFT = 10, + CCS_DATA_PDAF_PIXEL_TYPE_BOTTOM_RIGHT = 11, +}; + +struct __ccs_data_block_pdaf_pix_loc_pixel_desc { + uint8_t pixel_type; + uint8_t small_offset_x; + uint8_t small_offset_y; +} __attribute__((packed)); + +struct __ccs_data_block_pdaf_pix_loc { + uint8_t main_offset_x[2]; + uint8_t main_offset_y[2]; + uint8_t global_pdaf_type;
drivers/media/i2c/ccs/ccs-data-defs.h line 215
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data-defs.h new file +10
-0+uint8_t block_width; +uint8_t block_height; +uint8_t num_block_desc_groups[2 ]; +} __attribute__((packed)); + +struct __ccs_data_block_end { +uint8_t crc[4 ]; +} __attribute__((packed)); + +#endif /* __CCS_DATA_DEFS_H__ */
Nitpick: why all the above struct/enums start with "__"?
Quoted 22 lines
drivers/media/i2c/ccs/ccs-data.c new file +16
-0@@ -0,0 +1,949 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright 2019--2020 Intel Corporation */ + +#include "ccs-os.h" + +#include "ccs-data-defs.h" + +struct bin_container { +void *base; +void *now; +void *end; +size_t size; +}; + +static uint32_t u8_arr_to_u32 (const uint8_t *arr,unsigned int size) +{
drivers/media/i2c/ccs/ccs-data.c line 26
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +10
-0+unsigned int i; +uint32_t value = arr[0 ]; + +for (i =1 ; i < size; i++) { + value <<=8 ; + value += arr[i]; + } + +return value; +}
Why don't you use, instead, the macros inside include/linux/byteorder/generic.h? It sounds that there's just one place where this helper function seems to make some sense.
Quoted 71 lines
drivers/media/i2c/ccs/ccs-data.c new file +71
-0+ +static void *bin_alloc (struct bin_container *bin,size_t len) +{ +void *ptr; + + len =align2 (len,8 ); + +if (bin->end - bin->now < len) +return NULL ; + + ptr = bin->now; + bin->now += len; + +return ptr; +} + +static void bin_reserve (struct bin_container *bin,size_t len) +{ + bin->size +=align2 (len,8 ); +} + +static int bin_backing_alloc (struct bin_container *bin) +{ + bin->base = bin->now =os_calloc (bin->size); +if (!bin->base) +return -ENOMEM ; + + bin->end = bin->base + bin->size; + +return 0 ; +} + +#define is_contained (var, endp) \ + (sizeof(*var) <= (endp) - (void *)(var)) +#define has_headroom (ptr, headroom, endp) \ + ((headroom) <= (endp) - (void *)(ptr)) +#define is_contained_with_headroom (var, headroom, endp) \ + (sizeof(*var) + (headroom) <= (endp) - (void *)(var)) + +static int +ccs_data_parse_length_specifier (const struct __ccs_data_length_specifier *__len, +size_t *__hlen,size_t *__plen, +const void *endp) +{ +size_t hlen, plen; + +if (!is_contained (__len, endp)) +return -ENODATA ; + +switch (__len->length >>CCS_DATA_LENGTH_SPECIFIER_SIZE_SHIFT ) { +case CCS_DATA_LENGTH_SPECIFIER_1 : + hlen =sizeof (*__len); + plen = __len->length & + ((1 <<CCS_DATA_LENGTH_SPECIFIER_SIZE_SHIFT ) -1 ); +break ; + +case CCS_DATA_LENGTH_SPECIFIER_2 : { +struct __ccs_data_length_specifier2 *__len2 = (void *)__len; + +if (!is_contained (__len2, endp)) +return -ENODATA ; + + hlen =sizeof (*__len2); + plen = ((size_t ) + (__len2->length[0 ] & + ((1 <<CCS_DATA_LENGTH_SPECIFIER_SIZE_SHIFT ) -1 )) + <<8 ) + __len2->length[1 ]; +break ; + } +case CCS_DATA_LENGTH_SPECIFIER_3 : { +struct __ccs_data_length_specifier3 *__len3 = (void *)__len;
drivers/media/i2c/ccs/ccs-data.c
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +10
-0+ +if (!is_contained (__len3, endp)) +return -ENODATA ; + + hlen =sizeof (*__len3); + plen = ((size_t ) + (__len3->length[0 ] & + ((1 <<CCS_DATA_LENGTH_SPECIFIER_SIZE_SHIFT ) -1 )) + <<16 ) +u8_arr_to_u32 (&__len3->length[1 ], +sizeof (__len3->length) -1 );
That perhaps is the only place where the macro might make some sense, but still it just makes the above code more obscure.
It sounds to me that the logic would be clearer if you write the logic there directly. Maybe something similar to:
plen = (__len3->length[0] & (1 << CCS_DATA_LENGTH_SPECIFIER_SIZE_SHIFT) - 1))) << 16; plen += __be16_to_cpu(&__len3->length[1]);
(I'm assuming that length has 24 bits on the above).
Btw, no matter on what case, the first 6 bits are encoded the same way. So, maybe you could do something like this:
plen = (__len3->length[0] & (1 << CCS_DATA_LENGTH_SPECIFIER_SIZE_SHIFT) - 1)));
switch (__len->length >> CCS_DATA_LENGTH_SPECIFIER_SIZE_SHIFT) {
case CCS_DATA_LENGTH_SPECIFIER_1:
...
break;
case CCS_DATA_LENGTH_SPECIFIER_2: {
...
plen = (plen << 8) + __len2->length[1];
break;
}
case CCS_DATA_LENGTH_SPECIFIER_3: {
...
plen = (plen << 16) + __be16_to_cpu(&__len3->length[1]);
break;In order to make easier for people to understand about how this is encoded.
Quoted 43 lines
drivers/media/i2c/ccs/ccs-data.c new file +43
-0+ } +default : +return -EINVAL ; + } + +if (!has_headroom (__len, hlen + plen, endp)) +return -ENODATA ; + + *__hlen = hlen; + *__plen = plen; + +return 0 ; +} + +static uint8_t +ccs_data_parse_format_version (const struct __ccs_data_block *block) +{ +return block->id >>CCS_DATA_BLOCK_HEADER_ID_VERSION_SHIFT ; +} + +static uint8_t ccs_data_parse_block_id (const struct __ccs_data_block *block, +bool is_first) +{ +if (!is_first) +return block->id; + +return block->id & ((1 <<CCS_DATA_BLOCK_HEADER_ID_VERSION_SHIFT ) -1 ); +} + +static int ccs_data_parse_version (struct bin_container *bin, +struct ccs_data_container *ccsdata, +const void *payload,const void *endp) +{ +const struct __ccs_data_block_version *v = payload; +struct ccs_data_block_version *vv; + +if (v +1 != endp) +return -ENODATA ; + +if (!bin->base) { +bin_reserve (bin,sizeof (*ccsdata->version)); +return 0 ; + }
drivers/media/i2c/ccs/ccs-data.c line 159
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +9
-0+ + ccsdata->version =bin_alloc (bin,sizeof (*ccsdata->version)); +if (!ccsdata->version) +return -ENOMEM ; + + vv = ccsdata->version; + vv->version_major =u8_arr_to_u32 (v->static_data_version_major,2 ); + vv->version_minor =u8_arr_to_u32 (v->static_data_version_minor,2 ); + vv->date_year =u8_arr_to_u32 (v->year,2 );
Please use the right endiannes macro here - I guess it is be16_to_cpu(), right)?
Quoted 5 lines
drivers/media/i2c/ccs/ccs-data.c new file +5
-0+ vv->date_month = v->month; + vv->date_day = v->day; + +return 0 ; +}
drivers/media/i2c/ccs/ccs-data.c line 172
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +8
-0+ +static void print_ccs_data_version (printf_ctx fh, +struct ccs_data_block_version *v) +{ +os_printf (fh, +"static data version %4.4x.%4.4x, date %4.4u-%2.2u-%2.2u\n" , + v->version_major, v->version_minor, + v->date_year, v->date_month, v->date_day);
Oh, no! yet another printf macro defined somewhere...
I missed this on patch 001/106:
+typedef struct device * printf_ctx; +#define os_printf dev_dbg
Please don't do that!
It is a way clearer if you do, instead:
static void print_ccs_data_version(struct device *dev,
struct ccs_data_block_version *v)
{
dev_dbg(dev,
"static data version %4.4x.%4.4x, date %4.4u-%2.2u-%2.2u\n",
v->version_major, v->version_minor,
v->date_year, v->date_month, v->date_day);
}Please also do that at the other parts of the driver that use those.
Quoted 17 lines
drivers/media/i2c/ccs/ccs-data.c new file +17
-0+} + +static int ccs_data_block_parse_header (const struct __ccs_data_block *block, +bool is_first,unsigned int *__block_id, +const void **payload, +const struct __ccs_data_block **next_block, +const void *endp,printf_ctx fh, +bool verbose) +{ +size_t plen, hlen; +uint8_t block_id; +int rval; + +if (!is_contained (block, endp)) +return -ENODATA ; + + rval = ccs_data_parse_length_specifier(&block->length, &hlen, &plen,
drivers/media/i2c/ccs/ccs-data.c line 199
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +10
-0+ endp); +if (rval <0 ) +return rval; + + block_id =ccs_data_parse_block_id (block, is_first); + +if (verbose) +os_printf (fh, +"Block ID 0x%2.2x, header length %zu, payload length %zu\n" , + block_id, hlen, plen);
Why do you need to check for verbose? This is already usind dev_dbg(), so it needs to be already enabled via dynamic printk. No need to have a driver-specific var to also enable it.
Just get rid of "verbose" here and on all other places inside this driver for good.
Quoted 49 lines
drivers/media/i2c/ccs/ccs-data.c new file +49
-0+ +if (!has_headroom (&block->length, hlen + plen, endp)) +return -ENODATA ; + +if (__block_id) + *__block_id = block_id; + +if (payload) + *payload = (void *)&block->length + hlen; + +if (next_block) + *next_block = (void *)&block->length + hlen + plen; + +return 0 ; +} + +static int ccs_data_parse_regs (struct bin_container *bin, +struct ccs_reg **__regs, +size_t *__num_regs,const void *payload, +const void *endp,printf_ctx fh) +{ +struct ccs_reg *regs_base, *regs; +size_t num_regs =0 ; +uint16_t addr =0 ; + +if (bin->base && __regs) { + regs = regs_base =bin_alloc (bin,sizeof (*regs) * *__num_regs); +if (!regs) +return -ENOMEM ; + } + +while (payload < endp && num_regs <INT_MAX ) { +const struct __ccs_data_block_regs *r = payload; +size_t len; +const void *data; + +if (!is_contained (r, endp)) +return -ENODATA ; + +switch (r->reg_len >>CCS_DATA_BLOCK_REGS_SEL_SHIFT ) { +case CCS_DATA_BLOCK_REGS_SEL_REGS : + addr += r->reg_len &CCS_DATA_BLOCK_REGS_ADDR_MASK ; + len = ((r->reg_len &CCS_DATA_BLOCK_REGS_LEN_MASK ) + >>CCS_DATA_BLOCK_REGS_LEN_SHIFT ) +1 ; + +if (!is_contained_with_headroom (r, len, endp)) +return -ENODATA ; + + data = r +1 ;
drivers/media/i2c/ccs/ccs-data.c line 258
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +10
-0+break ; +case CCS_DATA_BLOCK_REGS_SEL_REGS2 : { +const struct __ccs_data_block_regs2 *r2 = payload; + +if (!is_contained (r2, endp)) +return -ENODATA ; + + addr += ((uint16_t )(r2->reg_len & +CCS_DATA_BLOCK_REGS_2_ADDR_MASK ) <<8 ) + + r2->addr;
Same as before: please use endiannes macros for all such conversions.
Quoted 6 lines
drivers/media/i2c/ccs/ccs-data.c new file +6
-0+ len = ((r2->reg_len &CCS_DATA_BLOCK_REGS_2_LEN_MASK ) + >>CCS_DATA_BLOCK_REGS_2_LEN_SHIFT ) +1 ; + +if (!is_contained_with_headroom (r2, len, endp)) +return -ENODATA ; +
drivers/media/i2c/ccs/ccs-data.c line 274
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +10
-0+ data = r2 +1 ; +break ; + } +case CCS_DATA_BLOCK_REGS_SEL_REGS3 : { +const struct __ccs_data_block_regs3 *r3 = payload; + +if (!is_contained (r3, endp)) +return -ENODATA ; + + addr =u8_arr_to_u32 (r3->addr,sizeof (r3->addr));
Please use the right endiannes macro here.
Quoted 57 lines
drivers/media/i2c/ccs/ccs-data.c new file +57
-0+ len = (r3->reg_len &CCS_DATA_BLOCK_REGS_3_LEN_MASK ) +1 ; + +if (!is_contained_with_headroom (r3, len, endp)) +return -ENODATA ; + + data = r3 +1 ; +break ; + } +default : +return -EINVAL ; + } + + num_regs++; + +if (!bin->base) { +bin_reserve (bin, len); + }else if (__regs) { + regs->addr = addr; + regs->len = len; + regs->value =bin_alloc (bin, len); +if (!regs->value) +return -ENOMEM ; + +memcpy (regs->value, data, len); + regs++; + } + + addr += len; + payload = data + len; + } + +if (!bin->base) +bin_reserve (bin,sizeof (*regs) * num_regs); + +if (__num_regs) + *__num_regs = num_regs; + +if (bin->base && __regs) + *__regs = regs_base; + +return 0 ; +} + +static int ccs_data_parse_reg_rules (struct bin_container *bin, +struct ccs_reg **__regs, +size_t *__num_regs, +const void *payload, +const void *endp,printf_ctx fh) +{ +int rval; + +if (!bin->base) +return ccs_data_parse_regs (bin,NULL ,NULL , payload, endp, fh); + + rval =ccs_data_parse_regs (bin,NULL , __num_regs, payload, endp, fh); +if (rval) +return rval;
drivers/media/i2c/ccs/ccs-data.c line 341
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +10
-0+ +return ccs_data_parse_regs (bin, __regs, __num_regs, payload, endp, + fh); +} + +static void assign_ffd_entry (struct ccs_frame_format_desc *desc, +const struct __ccs_data_block_ffd_entry *ent) +{ + desc->pixelcode = ent->pixelcode; + desc->value =u8_arr_to_u32 (ent->value,sizeof (ent->value));
Please use the right endiannes macro here.
Quoted 153 lines
drivers/media/i2c/ccs/ccs-data.c new file +153
-0+} + +static int ccs_data_parse_ffd (struct bin_container *bin, +struct ccs_frame_format_descs **ffd, +const void *payload, +const void *endp,printf_ctx fh) +{ +const struct __ccs_data_block_ffd *__ffd = payload; +const struct __ccs_data_block_ffd_entry *__entry; +unsigned int i; + +if (!is_contained (__ffd, endp)) +return -ENODATA ; + +if ((void *)__ffd +sizeof (*__ffd) + + ((uint32_t )__ffd->num_column_descs + + (uint32_t )__ffd->num_row_descs) * +sizeof (struct __ccs_data_block_ffd_entry ) != endp) +return -ENODATA ; + +if (!bin->base) { +bin_reserve (bin,sizeof (**ffd)); +bin_reserve (bin, __ffd->num_column_descs * +sizeof (struct ccs_frame_format_desc )); +bin_reserve (bin, __ffd->num_row_descs * +sizeof (struct ccs_frame_format_desc )); + +return 0 ; + } + + *ffd =bin_alloc (bin,sizeof (**ffd)); +if (!*ffd) +return -ENOMEM ; + + (*ffd)->num_column_descs = __ffd->num_column_descs; + (*ffd)->num_row_descs = __ffd->num_row_descs; + __entry = (void *)(__ffd +1 ); + + (*ffd)->column_descs =bin_alloc (bin, __ffd->num_column_descs * +sizeof (*(*ffd)->column_descs)); +if (!(*ffd)->column_descs) +return -ENOMEM ; + +for (i =0 ; i < __ffd->num_column_descs; i++, __entry++) +assign_ffd_entry (&(*ffd)->column_descs[i], __entry); + + (*ffd)->row_descs =bin_alloc (bin, __ffd->num_row_descs * +sizeof (*(*ffd)->row_descs)); +if (!(*ffd)->row_descs) +return -ENOMEM ; + +for (i =0 ; i < __ffd->num_row_descs; i++, __entry++) +assign_ffd_entry (&(*ffd)->row_descs[i], __entry); + +if (__entry != endp) +return -EPROTO ; + +return 0 ; +} + +static int ccs_data_parse_pdaf_readout (struct bin_container *bin, +struct ccs_pdaf_readout **pdaf_readout, +const void *payload, +const void *endp,printf_ctx fh) +{ +const struct __ccs_data_block_pdaf_readout *__pdaf = payload; + +if (!is_contained (__pdaf, endp)) +return -ENODATA ; + +if (!bin->base) { +bin_reserve (bin,sizeof (**pdaf_readout)); + }else { + *pdaf_readout =bin_alloc (bin,sizeof (**pdaf_readout)); +if (!*pdaf_readout) +return -ENOMEM ; + + (*pdaf_readout)->pdaf_readout_info_order = + __pdaf->pdaf_readout_info_order; + } + +return ccs_data_parse_ffd (bin, !bin->base ?NULL : &(*pdaf_readout)->ffd, + __pdaf +1 , endp, fh); +} + +static int ccs_data_parse_rules (struct bin_container *bin, +struct ccs_rule **__rules, +size_t *__num_rules,const void *payload, +const void *endp,printf_ctx fh) +{ +struct ccs_rule *rules_base, *rules =NULL , *next_rule; +size_t num_rules =0 ; +const void *__next_rule = payload; +int rval; + +if (bin->base) { + rules_base = next_rule = +bin_alloc (bin,sizeof (*rules) * *__num_rules); +if (!rules_base) +return -ENOMEM ; + } + +while (__next_rule < endp) { +size_t rule_hlen, rule_plen, rule_plen2; +const uint8_t *__rule_type; +const void *rule_payload; + +/* Size of a single rule */ + rval =ccs_data_parse_length_specifier (__next_rule, &rule_hlen, + &rule_plen, endp); + +if (rval <0 ) +return rval; + + __rule_type = __next_rule + rule_hlen; + +if (!is_contained (__rule_type, endp)) +return -ENODATA ; + + rule_payload = __rule_type +1 ; + rule_plen2 = rule_plen -sizeof (*__rule_type); + +switch (*__rule_type) { +case CCS_DATA_BLOCK_RULE_ID_IF : { +const struct __ccs_data_block_rule_if *__if_rules = + rule_payload; +const size_t __num_if_rules = + rule_plen2 /sizeof (*__if_rules); +struct ccs_if_rule *if_rule; + +if (!has_headroom (__if_rules, +sizeof (*__if_rules) * __num_if_rules, + rule_payload + rule_plen2)) +return -ENODATA ; + +/* Also check there is no extra data */ +if (__if_rules + __num_if_rules != + rule_payload + rule_plen2) +return -EINVAL ; + +if (!bin->base) { +bin_reserve (bin, +sizeof (*if_rule) * + __num_if_rules); + num_rules++; + }else { +unsigned int i; + + rules = next_rule; + next_rule++; + + if_rule = bin_alloc(bin, + sizeof(*if_rule) *
drivers/media/i2c/ccs/ccs-data.c line 504
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +10
-0+ __num_if_rules); +if (!if_rule) +return -ENOMEM ; + +for (i =0 ; i < __num_if_rules; i++) { + if_rule[i].addr = +u8_arr_to_u32 ( + __if_rules[i].addr, +sizeof (__if_rules[i]. + addr));
Please use the right endiannes macro here.
Quoted 80 lines
drivers/media/i2c/ccs/ccs-data.c new file +80
-0+ if_rule[i].value = __if_rules[i].value; + if_rule[i].mask = __if_rules[i].mask; + } + + rules->if_rules = if_rule; + rules->num_if_rules = __num_if_rules; + } +break ; + } +case CCS_DATA_BLOCK_RULE_ID_READ_ONLY_REGS : + rval =ccs_data_parse_reg_rules (bin, &rules->read_only_regs, + &rules->num_read_only_regs, + rule_payload, + rule_payload + rule_plen2, + fh); +if (rval) +return rval; +break ; +case CCS_DATA_BLOCK_RULE_ID_FFD : + rval =ccs_data_parse_ffd (bin, &rules->frame_format, + rule_payload, + rule_payload + rule_plen2, + fh); +if (rval) +return rval; +break ; +case CCS_DATA_BLOCK_RULE_ID_MSR : + rval =ccs_data_parse_reg_rules (bin, + &rules->manufacturer_regs, + &rules->num_manufacturer_regs, + rule_payload, + rule_payload + rule_plen2, + fh); +if (rval) +return rval; +break ; +case CCS_DATA_BLOCK_RULE_ID_PDAF_READOUT : + rval =ccs_data_parse_pdaf_readout (bin, + &rules->pdaf_readout, + rule_payload, + rule_payload + rule_plen2, + fh); +if (rval) +return rval; +break ; +default : +os_printf (fh, +"Don't know how to handle rule type %u!\n" , + *__rule_type); +return -EINVAL ; + } + __next_rule = __next_rule + rule_hlen + rule_plen; + } + +if (!bin->base) { +bin_reserve (bin,sizeof (*rules) * num_rules); + *__num_rules = num_rules; + }else { + *__rules = rules_base; + } + +return 0 ; +} + +static int ccs_data_parse_pdaf (struct bin_container *bin,struct ccs_pdaf_pix_loc **pdaf, +const void *payload,const void *endp, +printf_ctx fh) +{ +const struct __ccs_data_block_pdaf_pix_loc *__pdaf = payload; +const struct __ccs_data_block_pdaf_pix_loc_block_desc_group *__bdesc_group; +const struct __ccs_data_block_pdaf_pix_loc_pixel_desc *__pixel_desc; +unsigned int i; +uint16_t num_block_desc_groups; +uint8_t max_block_type_id =0 ; +const uint8_t *__num_pixel_descs; + +if (!is_contained (__pdaf, endp)) +return -ENODATA ; + +if (bin->base) {
drivers/media/i2c/ccs/ccs-data.c line 594
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +10
-0+ *pdaf =bin_alloc (bin,sizeof (**pdaf)); +if (!*pdaf) +return -ENOMEM ; + }else { +bin_reserve (bin,sizeof (**pdaf)); + } + + num_block_desc_groups = +u8_arr_to_u32 (__pdaf->num_block_desc_groups, +sizeof (__pdaf->num_block_desc_groups));
Please use the right endiannes macro here.
drivers/media/i2c/ccs/ccs-data.c line 602
Quoted 9 lines
drivers/media/i2c/ccs/ccs-data.c new file +8
-0+ +if (bin->base) { + (*pdaf)->main_offset_x = +u8_arr_to_u32 (__pdaf->main_offset_x, +sizeof (__pdaf->main_offset_x)); + (*pdaf)->main_offset_y = +u8_arr_to_u32 (__pdaf->main_offset_y, +sizeof (__pdaf->main_offset_y));
Please use the right endiannes macro here.
Quoted 21 lines
drivers/media/i2c/ccs/ccs-data.c new file +21
-0+ (*pdaf)->global_pdaf_type = __pdaf->global_pdaf_type; + (*pdaf)->block_width = __pdaf->block_width; + (*pdaf)->block_height = __pdaf->block_height; + (*pdaf)->num_block_desc_groups = num_block_desc_groups; + } + + __bdesc_group = (const void *)(__pdaf +1 ); + +if (bin->base) { + (*pdaf)->block_desc_groups = +bin_alloc (bin, +sizeof (struct ccs_pdaf_pix_loc_block_desc_group ) * + num_block_desc_groups); +if (!(*pdaf)->block_desc_groups) +return -ENOMEM ; + }else { +bin_reserve (bin,sizeof (struct ccs_pdaf_pix_loc_block_desc_group ) * + num_block_desc_groups); + } + +for (i =0 ; i < num_block_desc_groups; i++) {
drivers/media/i2c/ccs/ccs-data.c line 633
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +10
-0+const struct __ccs_data_block_pdaf_pix_loc_block_desc *__bdesc; +uint16_t num_block_descs; +unsigned int j; + +if (!is_contained (__bdesc_group, endp)) +return -ENODATA ; + + num_block_descs = +u8_arr_to_u32 (__bdesc_group->num_block_descs, +sizeof (__bdesc_group->num_block_descs));
Please use the right endiannes macro here.
Quoted 29 lines
drivers/media/i2c/ccs/ccs-data.c new file +29
-0+ +if (bin->base) { + (*pdaf)->block_desc_groups[i].repeat_y = + __bdesc_group->repeat_y; + (*pdaf)->block_desc_groups[i].num_block_descs = + num_block_descs; + } + + __bdesc = (const void *)(__bdesc_group +1 ); + +if (bin->base) { + (*pdaf)->block_desc_groups[i].block_descs = +bin_alloc (bin, +sizeof (struct ccs_pdaf_pix_loc_block_desc ) * + num_block_descs); +if (!(*pdaf)->block_desc_groups[i].block_descs) +return -ENOMEM ; + }else { +bin_reserve (bin,sizeof (struct ccs_pdaf_pix_loc_block_desc ) * + num_block_descs); + } + +for (j =0 ; j < num_block_descs; j++, __bdesc++) { +struct ccs_pdaf_pix_loc_block_desc *bdesc; + +if (!is_contained (__bdesc, endp)) +return -ENODATA ; + +if (max_block_type_id <= __bdesc->block_type_id)
drivers/media/i2c/ccs/ccs-data.c line 672
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.c new file +10
-0+ max_block_type_id = __bdesc->block_type_id +1 ; + +if (!bin->base) +continue ; + + bdesc = &(*pdaf)->block_desc_groups[i].block_descs[j]; + + bdesc->repeat_x =u8_arr_to_u32 ( + __bdesc->repeat_x, +sizeof (__bdesc->repeat_x));
Please use the right endiannes macro here.
Quoted 389 lines
drivers/media/i2c/ccs/ccs-data.c new file +277
-0+ +if (__bdesc->block_type_id >= num_block_descs) +return -EINVAL ; + + bdesc->block_type_id = __bdesc->block_type_id; + } + + __bdesc_group = (const void *)__bdesc; + } + + __num_pixel_descs = (const void *)__bdesc_group; + +if (bin->base) { + (*pdaf)->pixel_desc_groups = +bin_alloc (bin, +sizeof (struct ccs_pdaf_pix_loc_pixel_desc_group ) * + max_block_type_id); +if (!(*pdaf)->pixel_desc_groups) +return -ENOMEM ; + (*pdaf)->num_pixel_desc_grups = max_block_type_id; + }else { +bin_reserve (bin,sizeof (struct ccs_pdaf_pix_loc_pixel_desc_group ) * + max_block_type_id); + } + +for (i =0 ; i < max_block_type_id; i++) { +struct ccs_pdaf_pix_loc_pixel_desc_group *pdgroup; +unsigned int j; + +if (!is_contained (__num_pixel_descs, endp)) +return -ENODATA ; + +if (bin->base) { + pdgroup = &(*pdaf)->pixel_desc_groups[i]; + pdgroup->descs = +bin_alloc (bin, +sizeof (struct ccs_pdaf_pix_loc_pixel_desc ) * + *__num_pixel_descs); +if (!pdgroup->descs) +return -ENOMEM ; + pdgroup->num_descs = *__num_pixel_descs; + }else { +bin_reserve (bin,sizeof (struct ccs_pdaf_pix_loc_pixel_desc ) * + *__num_pixel_descs); + } + + __pixel_desc = (const void *)(__num_pixel_descs +1 ); + +for (j =0 ; j < *__num_pixel_descs; j++, __pixel_desc++) { +struct ccs_pdaf_pix_loc_pixel_desc *pdesc; + +if (!is_contained (__pixel_desc, endp)) +return -ENODATA ; + +if (!bin->base) +continue ; + + pdesc = &pdgroup->descs[j]; + pdesc->pixel_type = __pixel_desc->pixel_type; + pdesc->small_offset_x = __pixel_desc->small_offset_x; + pdesc->small_offset_y = __pixel_desc->small_offset_y; + } + + __num_pixel_descs = (const void *)(__pixel_desc +1 ); + } + +return 0 ; +} + +static int ccs_data_parse_license (struct bin_container *bin, +char **__license, +size_t *__license_length, +const void *payload,const void *endp) +{ +size_t size = endp - payload; +char *license; + +if (!bin->base) { +bin_reserve (bin, size); +return 0 ; + } + + license =bin_alloc (bin, size); +if (!license) +return -ENOMEM ; + +memcpy (license, payload, size); + + *__license = license; + *__license_length = size; + +return 0 ; +} + +static int ccs_data_parse_end (bool *end,const void *payload,const void *endp, +printf_ctx fh) +{ +const struct __ccs_data_block_end *__end = payload; + +if (__end +1 != endp) { +os_printf (fh,"Invalid end block length %u\n" , + (unsigned int )(endp - payload)); +return -ENODATA ; + } + + *end = true; + +return 0 ; +} + +static int __ccs_data_parse (struct bin_container *bin, +struct ccs_data_container *ccsdata, +const void *data,size_t len,printf_ctx fh, +bool verbose) +{ +const struct __ccs_data_block *block = data; +const struct __ccs_data_block *endp = data + len; +unsigned int version; +bool is_first = true; +int rval; + + version =ccs_data_parse_format_version (block); +if (version !=CCS_STATIC_DATA_VERSION ) { +os_printf (fh,"Don't know how to handle version %u\n" , version); +return -EINVAL ; + } + +if (verbose) +os_printf (fh,"Parsing CCS static data version %u\n" , version); + +if (!bin->base) + *ccsdata = (struct ccs_data_container ){0 }; + +while (block < endp) { +const struct __ccs_data_block *next_block; +unsigned int block_id; +const void *payload; + + rval =ccs_data_block_parse_header (block, is_first, &block_id, + &payload, &next_block, endp, + fh, + bin->base ? false : verbose); + +if (rval <0 ) +return rval; + +switch (block_id) { +case CCS_DATA_BLOCK_ID_DUMMY : +break ; +case CCS_DATA_BLOCK_ID_DATA_VERSION : + rval =ccs_data_parse_version (bin, ccsdata, payload, + next_block); +if (rval <0 ) +return rval; +break ; +case CCS_DATA_BLOCK_ID_SENSOR_READ_ONLY_REGS : + rval =ccs_data_parse_regs ( + bin, &ccsdata->sensor_read_only_regs, + &ccsdata->num_sensor_read_only_regs, payload, + next_block, fh); +if (rval <0 ) +return rval; +break ; +case CCS_DATA_BLOCK_ID_SENSOR_MANUFACTURER_REGS : + rval =ccs_data_parse_regs ( + bin, &ccsdata->sensor_manufacturer_regs, + &ccsdata->num_sensor_manufacturer_regs, payload, + next_block, fh); +if (rval <0 ) +return rval; +break ; +case CCS_DATA_BLOCK_ID_MODULE_READ_ONLY_REGS : + rval =ccs_data_parse_regs ( + bin, &ccsdata->module_read_only_regs, + &ccsdata->num_module_read_only_regs, payload, + next_block, fh); +if (rval <0 ) +return rval; +break ; +case CCS_DATA_BLOCK_ID_MODULE_MANUFACTURER_REGS : + rval =ccs_data_parse_regs ( + bin, &ccsdata->module_manufacturer_regs, + &ccsdata->num_module_manufacturer_regs, payload, + next_block, fh); +if (rval <0 ) +return rval; +break ; +case CCS_DATA_BLOCK_ID_SENSOR_PDAF_PIXEL_LOCATION : + rval =ccs_data_parse_pdaf (bin, &ccsdata->sensor_pdaf, + payload, next_block, fh); +if (rval <0 ) +return rval; +break ; +case CCS_DATA_BLOCK_ID_MODULE_PDAF_PIXEL_LOCATION : + rval =ccs_data_parse_pdaf (bin, &ccsdata->module_pdaf, + payload, next_block, fh); +if (rval <0 ) +return rval; +break ; +case CCS_DATA_BLOCK_ID_SENSOR_RULE_BASED_BLOCK : + rval =ccs_data_parse_rules ( + bin, &ccsdata->sensor_rules, + &ccsdata->num_sensor_rules, payload, next_block, + fh); +if (rval <0 ) +return rval; +break ; +case CCS_DATA_BLOCK_ID_MODULE_RULE_BASED_BLOCK : + rval =ccs_data_parse_rules ( + bin, &ccsdata->module_rules, + &ccsdata->num_module_rules, payload, next_block, + fh); +if (rval <0 ) +return rval; +break ; +case CCS_DATA_BLOCK_ID_LICENSE : + rval =ccs_data_parse_license (bin, &ccsdata->license, + &ccsdata->license_length, + payload, next_block); +if (rval <0 ) +return rval; +break ; +case CCS_DATA_BLOCK_ID_END : + rval =ccs_data_parse_end (&ccsdata->end, payload, + next_block, fh); +if (rval <0 ) +return rval; +break ; +default : +os_printf (fh,"WARNING: not handling block ID 0x%2.2x\n" , + block_id); + } + + block = next_block; + is_first = false; + } + +return 0 ; +} + +int ccs_data_parse (struct ccs_data_container *ccsdata, +const void *data,size_t len,printf_ctx fh,bool verbose) +{ +struct bin_container bin = {0 }; +int rval; + + rval =__ccs_data_parse (&bin, ccsdata, data, len, fh, verbose); +if (rval) +return rval; + + rval =bin_backing_alloc (&bin); +if (rval) +return rval; + + rval =__ccs_data_parse (&bin, ccsdata, data, len, fh, false); +if (rval) + goto out_free; + +if (verbose && ccsdata->version) +print_ccs_data_version (fh, ccsdata->version); + +if (bin.now != bin.end) { + rval = -EPROTO ; +os_printf (fh,"parsing mismatch; base %p; now %p; end %p\n" , + bin.base, bin.now, bin.end); + goto out_free; + } + + ccsdata->backing = bin.base; + +return 0 ; + +out_free: +os_free (bin.base); + +return rval; +}drivers/media/i2c/ccs/ccs-data.h new file +106
-0@@ -0,0 +1,116 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* Copyright 2019--2020 Intel Corporation */ + +#ifndef __CCS_DATA_H__ +#define __CCS_DATA_H__ + +#include "ccs-os.h" + +struct ccs_data_block_version { + uint16_t version_major; + uint16_t version_minor; + uint16_t date_year; + uint8_t date_month; + uint8_t date_day; +}; + +struct ccs_reg { + uint16_t addr; + uint16_t len; + uint8_t *value; +}; + +struct ccs_if_rule { + uint16_t addr; + uint8_t value; + uint8_t mask; +}; + +struct ccs_frame_format_desc { + uint8_t pixelcode; + uint16_t value; +}; + +struct ccs_frame_format_descs { + uint8_t num_column_descs; + uint8_t num_row_descs; + struct ccs_frame_format_desc *column_descs; + struct ccs_frame_format_desc *row_descs; +}; + +struct ccs_pdaf_readout { + uint8_t pdaf_readout_info_order; + struct ccs_frame_format_descs *ffd; +}; + +struct ccs_rule { + size_t num_if_rules; + struct ccs_if_rule *if_rules; + size_t num_read_only_regs; + struct ccs_reg *read_only_regs; + size_t num_manufacturer_regs; + struct ccs_reg *manufacturer_regs; + struct ccs_frame_format_descs *frame_format; + struct ccs_pdaf_readout *pdaf_readout; +}; + +struct ccs_pdaf_pix_loc_block_desc { + uint8_t block_type_id; + uint16_t repeat_x; +}; + +struct ccs_pdaf_pix_loc_block_desc_group { + uint8_t repeat_y; + uint16_t num_block_descs; + struct ccs_pdaf_pix_loc_block_desc *block_descs; +}; + +struct ccs_pdaf_pix_loc_pixel_desc { + uint8_t pixel_type; + uint8_t small_offset_x; + uint8_t small_offset_y; +}; + +struct ccs_pdaf_pix_loc_pixel_desc_group { + uint8_t num_descs; + struct ccs_pdaf_pix_loc_pixel_desc *descs; +}; + +struct ccs_pdaf_pix_loc { + uint16_t main_offset_x; + uint16_t main_offset_y; + uint8_t global_pdaf_type; + uint8_t block_width; + uint8_t block_height; + uint16_t num_block_desc_groups; + struct ccs_pdaf_pix_loc_block_desc_group *block_desc_groups; + uint8_t num_pixel_desc_grups; + struct ccs_pdaf_pix_loc_pixel_desc_group *pixel_desc_groups; +}; + +struct ccs_data_container { + struct ccs_data_block_version *version; + size_t num_sensor_read_only_regs; + struct ccs_reg *sensor_read_only_regs; + size_t num_sensor_manufacturer_regs; + struct ccs_reg *sensor_manufacturer_regs; + size_t num_sensor_rules; + struct ccs_rule *sensor_rules; + size_t num_module_read_only_regs; + struct ccs_reg *module_read_only_regs; + size_t num_module_manufacturer_regs; + struct ccs_reg *module_manufacturer_regs; + size_t num_module_rules; + struct ccs_rule *module_rules; + struct ccs_pdaf_pix_loc *sensor_pdaf; + struct ccs_pdaf_pix_loc *module_pdaf;
drivers/media/i2c/ccs/ccs-data.h line 116
Quoted 10 lines
drivers/media/i2c/ccs/ccs-data.h new file +10
-0+size_t license_length; +char *license; +bool end; + void *backing; +}; + +int ccs_data_parse (struct ccs_data_container *ccsdata,const void *data, +size_t len,printf_ctx fh,bool verbose); + +#endif /* __CCS_DATA_H__ */
Thanks,
Mauro
Sakari Ailus
maintainerRe: [PATCH v2 033/106] ccs: Add CCS static data parser library
Hi Mauro,
Thanks for the review.
On Thu, Nov 05, 2020 at 11:50:32AM +0100, Mauro Carvalho Chehab wrote:
...
Quoted 7 lines
drivers/media/i2c/ccs/ccs-data-defs.h line 215
Quoted 5 lines
drivers/media/i2c/ccs/ccs-data-defs.h new file +5
-0+struct __ccs_data_block_end { +uint8_t crc[4 ]; +} __attribute__((packed)); + +#endif /* __CCS_DATA_DEFS_H__ */ Nitpick: why all the above struct/enums start with "__"?
We have two sets of data structure: those that are related to the binary file format (these, so they're packed) as well as the in-kernel representation. So I've used the underscores to designate these are the binary format ones. They're only used in ccs-data.c.
Signature · 3 lines
Kind regards, Sakari Ailus
Re: [PATCH v2 033/106] ccs: Add CCS static data parser library
Em Thu, 5 Nov 2020 13:18:07 +0200
Sakari Ailus <[email protected]> escreveu:
Quoted 16 lines
Hi Mauro,
Thanks for the review.
On Thu, Nov 05, 2020 at 11:50:32AM +0100, Mauro Carvalho Chehab wrote:
...
Quoted 7 lines
drivers/media/i2c/ccs/ccs-data-defs.h line 215
Quoted 5 lines
drivers/media/i2c/ccs/ccs-data-defs.h new file +5
-0+struct __ccs_data_block_end { +uint8_t crc[4 ]; +} __attribute__((packed)); + +#endif /* __CCS_DATA_DEFS_H__ */ Nitpick: why all the above struct/enums start with "__"?
Quoted 5 lines
We have two sets of data structure: those that are related to the binary file format (these, so they're packed) as well as the in-kernel representation. So I've used the underscores to designate these are the binary format ones. They're only used in
ccs-data.c.
Ok for me, but, IMHO, you should document it somewhere about such convention.
Thanks,
Mauro
Sakari Ailus
maintainerRe: [PATCH v2 033/106] ccs: Add CCS static data parser library
Quoted 19 lines · Mauro Carvalho Chehab
Em Thu, 5 Nov 2020 13:18:07 +0200
Sakari Ailus <[email protected]> escreveu:Quoted 16 lines
Hi Mauro,
Thanks for the review.
On Thu, Nov 05, 2020 at 11:50:32AM +0100, Mauro Carvalho Chehab wrote:
...
Quoted 7 lines
drivers/media/i2c/ccs/ccs-data-defs.h line 215
Quoted 5 lines
drivers/media/i2c/ccs/ccs-data-defs.h new file +5
-0+struct __ccs_data_block_end { +uint8_t crc[4 ]; +} __attribute__((packed)); + +#endif /* __CCS_DATA_DEFS_H__ */ Nitpick: why all the above struct/enums start with "__"?
Quoted 8 lines
Quoted 5 lines
We have two sets of data structure: those that are related to the binary file format (these, so they're packed) as well as the in-kernel representation. So I've used the underscores to designate these are the binary format ones. They're only used in
ccs-data.c.Ok for me, but, IMHO, you should document it somewhere about such convention.
I've added descriptions to the two headers that contain the definitions. That might not hurt elsewhere either, at least for the added files.
Signature · 1 line
Sakari Ailus
Sakari Ailus
maintainerPATCH v2 34/106 ccs: Combine revision number major and minor into one
In reply to Sakari AilusThe module revision number major and minor are both 8 bits while the sensor revision number is 16 bits. Combine the module revision into one number.
This also adds printing the lowest 8 bits of the module version through the sysfs attribute.
--- drivers/media/i2c/ccs/ccs-core.c | 25 ++++++++++++++----------- drivers/media/i2c/ccs/ccs-quirk.c | 2 +- drivers/media/i2c/ccs/ccs.h | 3 +-- 3 files changed, 16 insertions(+), 14 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +14 -11
@@ -2421,11 +2421,11 @@ ccs_sysfs_ident_read(struct device *dev, struct device_attribute *attr,if (minfo->mipi_manufacturer_id)return snprintf (buf,PAGE_SIZE ,"%4.4x%4.4x%2.2x\n" , minfo->mipi_manufacturer_id, minfo->model_id, - minfo->revision_number_major) +1 ; + minfo->revision_number) +1 ;else return snprintf (buf,PAGE_SIZE ,"%2.2x%4.4x%2.2x\n" , minfo->smia_manufacturer_id, minfo->model_id, - minfo->revision_number_major) +1 ; + minfo->revision_number) +1 ; } static DEVICE_ATTR(ident, S_IRUGO, ccs_sysfs_ident_read, NULL);
@@ -2439,6 +2439,7 @@ static int ccs_identify_module(struct ccs_sensor *sensor)struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);struct ccs_module_info *minfo = &sensor->minfo;unsigned int i; +u32 rev;int rval =0 ;/* Module info */
@@ -2454,11 +2455,13 @@ static int ccs_identify_module(struct ccs_sensor *sensor)if (!rval) rval =ccs_read_addr_8only (sensor,CCS_R_MODULE_REVISION_NUMBER_MAJOR , - &minfo->revision_number_major); -if (!rval) + &rev); +if (!rval) { rval =ccs_read_addr_8only (sensor,CCS_R_MODULE_REVISION_NUMBER_MINOR , - &minfo->revision_number_minor); + &minfo->revision_number); + minfo->revision_number |= rev <<8 ; + }if (!rval) rval =ccs_read_addr_8only (sensor,CCS_R_MODULE_DATE_YEAR , &minfo->module_year);
@@ -2513,9 +2516,9 @@ static int ccs_identify_module(struct ccs_sensor *sensor) minfo->smia_manufacturer_id, minfo->model_id);dev_dbg (&client->dev, -"module revision 0x%2.2x-0x%2.2x date %2.2d-%2.2d-%2.2d\n" , - minfo->revision_number_major, minfo->revision_number_minor, - minfo->module_year, minfo->module_month, minfo->module_day); +"module revision 0x%4.4x date %2.2d-%2.2d-%2.2d\n" , + minfo->revision_number, minfo->module_year, minfo->module_month, + minfo->module_day);if (minfo->sensor_mipi_manufacturer_id) dev_dbg(&client->dev, "MIPI CCS sensor 0x%4.4x-0x%4.4x\n",
@@ -2553,7 +2556,7 @@ static int ccs_identify_module(struct ccs_sensor *sensor) minfo->smia_manufacturer_id = minfo->sensor_smia_manufacturer_id; minfo->model_id = minfo->sensor_model_id; - minfo->revision_number_major = minfo->sensor_revision_number; + minfo->revision_number = minfo->sensor_revision_number; }for (i =0 ; i <ARRAY_SIZE (ccs_module_idents); i++) {
@@ -2570,11 +2573,11 @@ static int ccs_identify_module(struct ccs_sensor *sensor)if (ccs_module_idents[i].flags &CCS_MODULE_IDENT_FLAG_REV_LE ) {if (ccs_module_idents[i].revision_number_major - < minfo->revision_number_major) + < (minfo->revision_number >>8 ))continue ; }else {if (ccs_module_idents[i].revision_number_major - != minfo->revision_number_major) + != (minfo->revision_number >>8 ))continue ; }
drivers/media/i2c/ccs/ccs-quirk.c +1 -1
@@ -35,7 +35,7 @@ static int ccs_write_addr_8s(struct ccs_sensor *sensor,static int jt8ew9_limits (struct ccs_sensor *sensor) { -if (sensor->minfo.revision_number_major <0x03 ) +if (sensor->minfo.revision_number <0x0300 ) sensor->frame_skip =1 ;/* Below 24 gain doesn't have effect at all, */
drivers/media/i2c/ccs/ccs.h +1 -2
@@ -107,8 +107,7 @@ struct ccs_module_info {u32 smia_manufacturer_id;u32 mipi_manufacturer_id;u32 model_id; -u32 revision_number_major; -u32 revision_number_minor; +u32 revision_number;u32 module_year;u32 module_month;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 35/106 ccs: Read CCS static data from firmware binaries
In reply to Sakari AilusRead the CCS static data for sensors and modules. The files are expected to be found in "ccs" directory.
--- drivers/media/i2c/ccs/ccs-core.c | 30 ++++++++++++++++++++++++++++++ drivers/media/i2c/ccs/ccs.h | 2 ++ 2 files changed, 32 insertions(+)
drivers/media/i2c/ccs/ccs-core.c +30 -0
@@ -16,6 +16,7 @@#include <linux/clk.h> #include <linux/delay.h> #include <linux/device.h> +#include <linux/firmware.h> #include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <linux/module.h>
@@ -2947,6 +2948,8 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev)static int ccs_probe (struct i2c_client *client) {struct ccs_sensor *sensor; +const struct firmware *fw; +char filename[40 ];unsigned int i;int rval;
@@ -3036,6 +3039,31 @@ static int ccs_probe(struct i2c_client *client) goto out_power_off; } +WARN_ON (snprintf (filename,sizeof (filename), +"ccs/ccs-sensor-%4.4x-%4.4x-%4.4x.fw" , + sensor->minfo.sensor_mipi_manufacturer_id, + sensor->minfo.sensor_model_id, + sensor->minfo.sensor_revision_number) >= +sizeof (filename)); + rval =request_firmware (&fw, filename, &client->dev); +if (!rval) { +ccs_data_parse (&sensor->sdata, fw->data, fw->size, &client->dev, + true); +release_firmware (fw); + } + +WARN_ON (snprintf (filename,sizeof (filename), +"ccs/ccs-module-%4.4x-%4.4x-%4.4x.fw" , + sensor->minfo.mipi_manufacturer_id, + sensor->minfo.model_id, + sensor->minfo.revision_number) >=sizeof (filename)); + rval =request_firmware (&fw, filename, &client->dev); +if (!rval) { +ccs_data_parse (&sensor->mdata, fw->data, fw->size, &client->dev, + true); +release_firmware (fw); + } + rval =ccs_read_all_limits (sensor);if (rval) goto out_power_off;
@@ -3232,6 +3260,8 @@ static int ccs_remove(struct i2c_client *client)ccs_cleanup (sensor);mutex_destroy (&sensor->mutex);kfree (sensor->ccs_limits); +kvfree (sensor->sdata.backing); +kvfree (sensor->mdata.backing);return 0 ; }
drivers/media/i2c/ccs/ccs.h +2 -0
@@ -16,6 +16,7 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h> +#include "ccs-data.h" #include "ccs-quirk.h" #include "ccs-regs.h" #include "ccs-reg-access.h"
@@ -227,6 +228,7 @@ struct ccs_sensor {const struct ccs_csi_data_format *internal_csi_format;u32 default_mbus_frame_fmts;int default_pixel_order; +struct ccs_data_container sdata, mdata;u8 binning_horizontal;u8 binning_vertical;
Signature · 1 line
2.27.0
Re: [PATCH v2 035/106] ccs: Read CCS static data from firmware binaries
Em Wed, 7 Oct 2020 11:44:48 +0300
Sakari Ailus <[email protected]> escreveu:
Quoted 31 lines
Read the CCS static data for sensors and modules. The files are expected to be found in "ccs" directory.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/ccs/ccs-core.c | 30 ++++++++++++++++++++++++++++++ drivers/media/i2c/ccs/ccs.h | 2 ++ 2 files changed, 32 insertions(+)drivers/media/i2c/ccs/ccs-core.c +3
-0@@ -16,6 +16,7 @@#include <linux/clk.h> #include <linux/delay.h> #include <linux/device.h> +#include <linux/firmware.h> #include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <linux/module.h> @@ -2947,6 +2948,8 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev)static int ccs_probe (struct i2c_client *client) {struct ccs_sensor *sensor; +const struct firmware *fw; +char filename[40 ];unsigned int i;int rval;
drivers/media/i2c/ccs/ccs-core.c static int ccs_probe(struct i2c_client *client) · line 3047
Quoted 9 lines
drivers/media/i2c/ccs/ccs-core.c +6
-0@@ -3036,6 +3039,31 @@ static int ccs_probe(struct i2c_client *client) goto out_power_off; } +WARN_ON (snprintf (filename,sizeof (filename), +"ccs/ccs-sensor-%4.4x-%4.4x-%4.4x.fw" , + sensor->minfo.sensor_mipi_manufacturer_id, + sensor->minfo.sensor_model_id, + sensor->minfo.sensor_revision_number) >= +sizeof (filename));
Nitpick: better to do something like:
int len; len = snprintf(filename, sizeof(filename), "ccs/ccs-sensor-%4.4x-%4.4x-%4.4x.fw", sensor->minfo.sensor_mipi_manufacturer_id, sensor->minfo.sensor_model_id, sensor->minfo.sensor_revision_number); if (WARN_ON(len >= sizeof(filename)) return -ENOMEM;
drivers/media/i2c/ccs/ccs-core.c static int ccs_probe(struct i2c_client *client) · line 3059
Quoted 12 lines
drivers/media/i2c/ccs/ccs-core.c +12
-0+ rval =request_firmware (&fw, filename, &client->dev); +if (!rval) { +ccs_data_parse (&sensor->sdata, fw->data, fw->size, &client->dev, + true); +release_firmware (fw); + } + +WARN_ON (snprintf (filename,sizeof (filename), +"ccs/ccs-module-%4.4x-%4.4x-%4.4x.fw" , + sensor->minfo.mipi_manufacturer_id, + sensor->minfo.model_id, + sensor->minfo.revision_number) >=sizeof (filename));
Same here.
Quoted 32 lines
drivers/media/i2c/ccs/ccs-core.c +9
-0+ rval =request_firmware (&fw, filename, &client->dev); +if (!rval) { +ccs_data_parse (&sensor->mdata, fw->data, fw->size, &client->dev, + true); +release_firmware (fw); + } + rval =ccs_read_all_limits (sensor);if (rval) goto out_power_off;@@ -3232,6 +3260,8 @@ static int ccs_remove(struct i2c_client *client)ccs_cleanup (sensor);mutex_destroy (&sensor->mutex);kfree (sensor->ccs_limits); +kvfree (sensor->sdata.backing); +kvfree (sensor->mdata.backing);return 0 ; }drivers/media/i2c/ccs/ccs.h +1
-0@@ -16,6 +16,7 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h> +#include "ccs-data.h" #include "ccs-quirk.h" #include "ccs-regs.h" #include "ccs-reg-access.h"
drivers/media/i2c/ccs/ccs.h struct ccs_sensor { · line 234
Quoted 7 lines
drivers/media/i2c/ccs/ccs.h +1
-0@@ -227,6 +228,7 @@ struct ccs_sensor {const struct ccs_csi_data_format *internal_csi_format;u32 default_mbus_frame_fmts;int default_pixel_order; +struct ccs_data_container sdata, mdata;u8 binning_horizontal;u8 binning_vertical;
Thanks,
Mauro
Sakari Ailus
maintainerPATCH v2 36/106 ccs: Stop reading arrays after the first zero
In reply to Sakari AilusThe register arrays have a certain size but not all the entries will be relevant. In practice reading can be stopped after encountering a zero value in the array. Do that to avoid extra reads.
--- drivers/media/i2c/ccs/ccs-core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/i2c/ccs/ccs-core.c +3 -0
@@ -193,6 +193,9 @@ static int ccs_read_all_limits(struct ccs_sensor *sensor) goto out_err; } +if (!val && j) +break ; +ccs_assign_limit (ptr, width, val); dev_dbg(&client->dev, "0x%8.8x \"%s\" = %u, 0x%x\n",
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 37/106 ccs: The functions to get compose or crop rectangle never return NULL
In reply to Sakari AilusThe NULL check is not needed as the functions do not return NULL. Remove the check (and BUG).
--- drivers/media/i2c/ccs/ccs-core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +2 -6
@@ -1760,16 +1760,12 @@ static void ccs_get_crop_compose(struct v4l2_subdev *subdev, *comps = &ssd->compose; }else {if (crops) { -for (i =0 ; i < subdev->entity.num_pads; i++) { +for (i =0 ; i < subdev->entity.num_pads; i++) crops[i] =v4l2_subdev_get_try_crop (subdev, cfg, i); -BUG_ON (!crops[i]); - } } -if (comps) { +if (comps) *comps =v4l2_subdev_get_try_compose (subdev, cfg,CCS_PAD_SINK ); -BUG_ON (!*comps); - } } }
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 38/106 ccs: Replace somewhat harsh internal checks based on BUG with WARN_ON
In reply to Sakari AilusIf an internal driver error was encountered, BUG was issued. Instead, do less harsh WARN_ON_ONCE and try to manage with the consequences.
--- drivers/media/i2c/ccs/ccs-core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +5 -4
@@ -540,6 +540,10 @@ static void ccs_update_mbus_formats(struct ccs_sensor *sensor)to_csi_format_idx (sensor->internal_csi_format) & ~3 ;unsigned int pixel_order =ccs_pixel_order (sensor); +if (WARN_ON_ONCE (max (internal_csi_format_idx, csi_format_idx) + + pixel_order >=ARRAY_SIZE (ccs_csi_data_formats))) +return ; + sensor->mbus_frame_fmts = sensor->default_mbus_frame_fmts << pixel_order; sensor->csi_format =
@@ -548,9 +552,6 @@ static void ccs_update_mbus_formats(struct ccs_sensor *sensor) &ccs_csi_data_formats[internal_csi_format_idx + pixel_order]; -BUG_ON (max (internal_csi_format_idx, csi_format_idx) + pixel_order - >=ARRAY_SIZE (ccs_csi_data_formats)); -dev_dbg (&client->dev,"new pixel order %s\n" , pixel_order_str[pixel_order]); }
@@ -1800,7 +1801,7 @@ static void ccs_propagate(struct v4l2_subdev *subdev, *crops[CCS_PAD_SRC ] = *comp;break ;default : -BUG (); +WARN_ON_ONCE (1 ); } }
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 39/106 ccs: Refactor register reading a little
In reply to Sakari AilusRework quirk and 8-bit only access functions with a single function that takes arguments. This is later extensible to support yet more flags.
--- drivers/media/i2c/ccs/ccs-reg-access.c | 37 ++++++++++++-------------- 1 file changed, 17 insertions(+), 20 deletions(-)
drivers/media/i2c/ccs/ccs-reg-access.c +17 -20
@@ -168,39 +168,36 @@ static int __ccs_read_addr(struct ccs_sensor *sensor, u32 reg, u32 *val,return 0 ; } -int ccs_read_addr_no_quirk (struct ccs_sensor *sensor,u32 reg,u32 *val) -{ -return __ccs_read_addr ( - sensor, reg, val, -ccs_needs_quirk (sensor,CCS_QUIRK_FLAG_8BIT_READ_ONLY )); -} - -static int ccs_read_addr_quirk (struct ccs_sensor *sensor,u32 reg,u32 *val, -bool force8) +static int ccs_read_addr_raw (struct ccs_sensor *sensor,u32 reg,u32 *val, +bool force8,bool quirk) {int rval; - *val =0 ; - rval =ccs_call_quirk (sensor, reg_access, false, ®, val); -if (rval == -ENOIOCTLCMD ) -return 0 ; -if (rval <0 ) -return rval; +if (quirk) { + *val =0 ; + rval =ccs_call_quirk (sensor, reg_access, false, ®, val); +if (rval == -ENOIOCTLCMD ) +return 0 ; +if (rval <0 ) +return rval; -if (force8) -return __ccs_read_addr (sensor, reg, val, true); +if (force8) +return __ccs_read_addr (sensor, reg, val, true); + } -return ccs_read_addr_no_quirk (sensor, reg, val); +return __ccs_read_addr (sensor, reg, val, +ccs_needs_quirk (sensor, +CCS_QUIRK_FLAG_8BIT_READ_ONLY )); }int ccs_read_addr (struct ccs_sensor *sensor,u32 reg,u32 *val) { -return ccs_read_addr_quirk (sensor, reg, val, false); +return ccs_read_addr_raw (sensor, reg, val, false, true); }int ccs_read_addr_8only (struct ccs_sensor *sensor,u32 reg,u32 *val) { -return ccs_read_addr_quirk (sensor, reg, val, true); +return ccs_read_addr_raw (sensor, reg, val, true, true); }int ccs_write_addr_no_quirk (struct ccs_sensor *sensor,u32 reg,u32 val)
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 40/106 ccs: Make real to integer number conversion optional
In reply to Sakari AilusThe limit values will be raw soon, and the conversion takes place later on. Prepare for that.
--- drivers/media/i2c/ccs/ccs-reg-access.c | 35 +++++++++++++++++++------- drivers/media/i2c/ccs/ccs-reg-access.h | 2 ++ 2 files changed, 28 insertions(+), 9 deletions(-)
drivers/media/i2c/ccs/ccs-reg-access.c +26 -9
@@ -143,14 +143,23 @@ unsigned int ccs_reg_width(u32 reg)return sizeof (uint8_t ); } +u32 ccs_reg_conv (struct ccs_sensor *sensor,u32 reg,u32 val) +{ +struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd); + +if (reg &CCS_FL_FLOAT_IREAL ) + val =float_to_u32_mul_1000000 (client, val); + +return val; +} +/* * Read a 8/16/32-bit i2c register. The value is returned in 'val'. * Returns zero if successful, or non-zero otherwise. */ static int __ccs_read_addr (struct ccs_sensor *sensor,u32 reg,u32 *val, -bool only8) +bool only8,bool conv) { -struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);unsigned int len =ccs_reg_width (reg);int rval;
@@ -162,14 +171,16 @@ static int __ccs_read_addr(struct ccs_sensor *sensor, u32 reg, u32 *val,if (rval <0 )return rval; -if (reg &CCS_FL_FLOAT_IREAL ) - *val =float_to_u32_mul_1000000 (client, *val); +if (!conv) +return 0 ; + + *val =ccs_reg_conv (sensor, reg, *val);return 0 ; }static int ccs_read_addr_raw (struct ccs_sensor *sensor,u32 reg,u32 *val, -bool force8,bool quirk) +bool force8,bool quirk,bool conv) {int rval;
@@ -182,22 +193,28 @@ static int ccs_read_addr_raw(struct ccs_sensor *sensor, u32 reg, u32 *val,return rval;if (force8) -return __ccs_read_addr (sensor, reg, val, true); +return __ccs_read_addr (sensor, reg, val, true, conv); }return __ccs_read_addr (sensor, reg, val,ccs_needs_quirk (sensor, -CCS_QUIRK_FLAG_8BIT_READ_ONLY )); +CCS_QUIRK_FLAG_8BIT_READ_ONLY ), + conv); }int ccs_read_addr (struct ccs_sensor *sensor,u32 reg,u32 *val) { -return ccs_read_addr_raw (sensor, reg, val, false, true); +return ccs_read_addr_raw (sensor, reg, val, false, true, true); }int ccs_read_addr_8only (struct ccs_sensor *sensor,u32 reg,u32 *val) { -return ccs_read_addr_raw (sensor, reg, val, true, true); +return ccs_read_addr_raw (sensor, reg, val, true, true, true); +} + +int ccs_read_addr_noconv (struct ccs_sensor *sensor,u32 reg,u32 *val) +{ +return ccs_read_addr_raw (sensor, reg, val, false, true, false); }int ccs_write_addr_no_quirk (struct ccs_sensor *sensor,u32 reg,u32 val)
drivers/media/i2c/ccs/ccs-reg-access.h +2 -0
@@ -24,10 +24,12 @@ struct ccs_sensor;int ccs_read_addr_no_quirk (struct ccs_sensor *sensor,u32 reg,u32 *val);int ccs_read_addr (struct ccs_sensor *sensor,u32 reg,u32 *val);int ccs_read_addr_8only (struct ccs_sensor *sensor,u32 reg,u32 *val); +int ccs_read_addr_noconv (struct ccs_sensor *sensor,u32 reg,u32 *val);int ccs_write_addr_no_quirk (struct ccs_sensor *sensor,u32 reg,u32 val);int ccs_write_addr (struct ccs_sensor *sensor,u32 reg,u32 val);unsigned int ccs_reg_width (u32 reg); +u32 ccs_reg_conv (struct ccs_sensor *sensor,u32 reg,u32 val);#define ccs_read (sensor, reg_name, val) \ ccs_read_addr(sensor, CCS_R_##reg_name, val)
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 41/106 ccs: Move limit value real to integer conversion from read to access time
In reply to Sakari AilusInstead of converting the limit values at register read time, do that at access time instead.
--- drivers/media/i2c/ccs/ccs-core.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +12 -7
@@ -124,6 +124,7 @@ static u32 ccs_get_limit(struct ccs_sensor *sensor, unsigned int limit, unsigned int offset) { void *ptr; +u32 val;int ret; ret =ccs_limit_ptr (sensor, limit, offset, &ptr);
@@ -132,16 +133,20 @@ static u32 ccs_get_limit(struct ccs_sensor *sensor,switch (ccs_reg_width (ccs_limits[ccs_limit_offsets[limit].info].reg)) {case sizeof (u8): -return *(u8 *)ptr; + val = *(u8 *)ptr; +break ;case sizeof (u16): -return *(u16 *)ptr; + val = *(u16 *)ptr; +break ;case sizeof (u32): -return *(u32 *)ptr; + val = *(u32 *)ptr; +break ; +default : +WARN_ON (1 ); +return 0 ; } -WARN_ON (1 ); - -return 0 ; +return ccs_reg_conv (sensor, ccs_limits[limit].reg, val); }#define CCS_LIM (sensor, limit) \
@@ -182,7 +187,7 @@ static int ccs_read_all_limits(struct ccs_sensor *sensor) j++, reg += width, ptr += width) {u32 val; - ret =ccs_read_addr (sensor, reg, &val); + ret =ccs_read_addr_noconv (sensor, reg, &val);if (ret) goto out_err;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 42/106 ccs: Read ireal numbers correctly
In reply to Sakari AilusSome limit values are available in q16.q16 format, referred to as 32-bit unsigned ireal in CCS. Read these correctly.
--- drivers/media/i2c/ccs/ccs-core.c | 10 ++-------- drivers/media/i2c/ccs/ccs-reg-access.c | 23 +++++++++++++++++++++-- drivers/media/i2c/ccs/ccs.h | 9 +++++++++ 3 files changed, 32 insertions(+), 10 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +2 -8
@@ -120,8 +120,8 @@ void ccs_replace_limit(struct ccs_sensor *sensor,ccs_assign_limit (ptr,ccs_reg_width (linfo->reg), val); } -static u32 ccs_get_limit (struct ccs_sensor *sensor, -unsigned int limit,unsigned int offset) +u32 ccs_get_limit (struct ccs_sensor *sensor,unsigned int limit, +unsigned int offset) {void *ptr;u32 val;
@@ -149,12 +149,6 @@ static u32 ccs_get_limit(struct ccs_sensor *sensor,return ccs_reg_conv (sensor, ccs_limits[limit].reg, val); } -#define CCS_LIM (sensor, limit) \ - ccs_get_limit(sensor, CCS_L_##limit, 0) - -#define CCS_LIM_AT (sensor, limit, offset) \ - ccs_get_limit(sensor, CCS_L_##limit, CCS_L_##limit##_OFFSET(offset)) -static int ccs_read_all_limits (struct ccs_sensor *sensor) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);
drivers/media/i2c/ccs/ccs-reg-access.c +21 -2
@@ -15,6 +15,7 @@#include <linux/i2c.h> #include "ccs.h" +#include "ccs-limits.h" static uint32_t float_to_u32_mul_1000000 (struct i2c_client *client,uint32_t phloat)
@@ -143,12 +144,30 @@ unsigned int ccs_reg_width(u32 reg)return sizeof (uint8_t ); } +static u32 ireal32_to_u32_mul_1000000 (struct i2c_client *client,u32 val) +{ +if (val >>10 >U32_MAX /15625 ) { +dev_warn (&client->dev,"value %u overflows!\n" , val); +return U32_MAX ; + } + +return ((val >>10 ) *15625 ) + + (val &GENMASK (9 ,0 )) *15625 /1024 ; +} +u32 ccs_reg_conv (struct ccs_sensor *sensor,u32 reg,u32 val) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd); -if (reg &CCS_FL_FLOAT_IREAL ) - val =float_to_u32_mul_1000000 (client, val); +if (reg &CCS_FL_FLOAT_IREAL ) { +if (CCS_LIM (sensor,CLOCK_CAPA_TYPE_CAPABILITY ) & +CCS_CLOCK_CAPA_TYPE_CAPABILITY_IREAL ) + val =ireal32_to_u32_mul_1000000 (client, val); +else + val =float_to_u32_mul_1000000 (client, val); + }else if (reg &CCS_FL_IREAL ) { + val =ireal32_to_u32_mul_1000000 (client, val); + }return val; }
drivers/media/i2c/ccs/ccs.h +9 -0
@@ -17,6 +17,7 @@#include <media/v4l2-subdev.h> #include "ccs-data.h" +#include "ccs-limits.h" #include "ccs-quirk.h" #include "ccs-regs.h" #include "ccs-reg-access.h"
@@ -50,6 +51,12 @@#define CCS_DFL_I2C_ADDR (0x20 >> 1)/* Default I2C Address */ #define CCS_ALT_I2C_ADDR (0x6e >> 1)/* Alternate I2C Address */ +#define CCS_LIM (sensor, limit) \ + ccs_get_limit(sensor, CCS_L_##limit, 0) + +#define CCS_LIM_AT (sensor, limit, offset) \ + ccs_get_limit(sensor, CCS_L_##limit, CCS_L_##limit##_OFFSET(offset)) +/* * Sometimes due to board layout considerations the camera module can be * mounted rotated. The typical rotation used is 180 degrees which can be
@@ -277,5 +284,7 @@ struct ccs_sensor {void ccs_replace_limit (struct ccs_sensor *sensor,unsigned int limit,unsigned int offset,u32 val); +u32 ccs_get_limit (struct ccs_sensor *sensor,unsigned int limit, +unsigned int offset);#endif /* __CCS_H__ */
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 43/106 smiapp-pll: Rename as ccs-pll
In reply to Sakari AilusMIPI CCS replaces SMIA and SMIA++ as the current standard. CCS brings new features while existing functionality will be supported. Rename the smiapp-pll as ccs-pll accordingly.
Also add Intel copyright to the files.
---
MAINTAINERS | 4 +-
drivers/media/i2c/Kconfig | 2 +-
drivers/media/i2c/Makefile | 2 +-
drivers/media/i2c/{smiapp-pll.c => ccs-pll.c} | 60 +++++++++----------
drivers/media/i2c/{smiapp-pll.h => ccs-pll.h} | 40 ++++++-------
drivers/media/i2c/ccs/Kconfig | 2 +-
drivers/media/i2c/ccs/ccs-core.c | 18 +++---
drivers/media/i2c/ccs/ccs-quirk.c | 2 +-
drivers/media/i2c/ccs/ccs.h | 4 +-
9 files changed, 66 insertions(+), 68 deletions(-)
rename drivers/media/i2c/{smiapp-pll.c => ccs-pll.c} (90%)
rename drivers/media/i2c/{smiapp-pll.h => ccs-pll.h} (68%)MAINTAINERS +2 -2
@@ -11566,8 +11566,8 @@ L: [email protected] S: Maintained F: Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml F: drivers/media/i2c/ccs/ -F: drivers/media/i2c/smiapp-pll.c -F: drivers/media/i2c/smiapp-pll.h +F: drivers/media/i2c/ccs-pll.c +F: drivers/media/i2c/ccs-pll.h F: include/uapi/linux/smiapp.h MIPS
drivers/media/i2c/Kconfig +1 -1
@@ -722,7 +722,7 @@ menu "Camera sensor devices" config VIDEO_APTINA_PLL tristate -config VIDEO_SMIAPP_PLL +config VIDEO_CCS_PLL tristate config VIDEO_HI556
drivers/media/i2c/Makefile +1 -1
@@ -104,7 +104,7 @@ obj-$(CONFIG_VIDEO_S5C73M3) += s5c73m3/ obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o obj-$(CONFIG_VIDEO_LM3560) += lm3560.o obj-$(CONFIG_VIDEO_LM3646) += lm3646.o -obj-$(CONFIG_VIDEO_SMIAPP_PLL) += smiapp-pll.o +obj-$(CONFIG_VIDEO_CCS_PLL) += ccs-pll.o obj-$(CONFIG_VIDEO_AK881X) += ak881x.o obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o obj-$(CONFIG_VIDEO_I2C) += video-i2c.o
drivers/media/i2c/ccs-pll.c renamed from drivers/media/i2c/smiapp-pll.c +29 -31
153 lines not on this page · raw message
drivers/media/i2c/ccs-pll.h renamed from drivers/media/i2c/smiapp-pll.h +20 -20
@@ -1,32 +1,33 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* drivers/media/i2c/smiapp-pll.h +* drivers/media/i2c/ccs-pll.h * -* Generic driver for SMIA/SMIA++ compliant camera modules +* Generic MIPI CCS/SMIA/SMIA++ PLL calculator * +* Copyright (C) 2020 Intel Corporation * Copyright (C) 2012 Nokia Corporation * Contact: Sakari Ailus <[email protected]> */ -#ifndef SMIAPP_PLL_H -#define SMIAPP_PLL_H +#ifndef CCS_PLL_H +#define CCS_PLL_H /* CSI-2 or CCP-2 */ -#define SMIAPP_PLL_BUS_TYPE_CSI2 0x00 -#define SMIAPP_PLL_BUS_TYPE_PARALLEL 0x01 +#define CCS_PLL_BUS_TYPE_CSI2 0x00 +#define CCS_PLL_BUS_TYPE_PARALLEL 0x01 /* op pix clock is for all lanes in total normally */ -#define SMIAPP_PLL_FLAG_OP_PIX_CLOCK_PER_LANE (1 << 0) -#define SMIAPP_PLL_FLAG_NO_OP_CLOCKS (1 << 1) +#define CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE (1 << 0) +#define CCS_PLL_FLAG_NO_OP_CLOCKS (1 << 1) -struct smiapp_pll_branch { +struct ccs_pll_branch { uint16_t sys_clk_div; uint16_t pix_clk_div; uint32_t sys_clk_freq_hz; uint32_t pix_clk_freq_hz; }; -struct smiapp_pll { +struct ccs_pll { /* input values */ uint8_t bus_type; union {
@@ -51,14 +52,14 @@ struct smiapp_pll {uint16_t pll_multiplier;uint32_t pll_ip_clk_freq_hz;uint32_t pll_op_clk_freq_hz; -struct smiapp_pll_branch vt; -struct smiapp_pll_branch op; +struct ccs_pll_branch vt; +struct ccs_pll_branch op;uint32_t pixel_rate_csi;uint32_t pixel_rate_pixel_array; }; -struct smiapp_pll_branch_limits { +struct ccs_pll_branch_limits {uint16_t min_sys_clk_div;uint16_t max_sys_clk_div;uint32_t min_sys_clk_freq_hz;
@@ -69,7 +70,7 @@ struct smiapp_pll_branch_limits {uint32_t max_pix_clk_freq_hz; }; -struct smiapp_pll_limits { +struct ccs_pll_limits {/* Strict PLL limits */ uint32_t min_ext_clk_freq_hz;uint32_t max_ext_clk_freq_hz;
@@ -82,8 +83,8 @@ struct smiapp_pll_limits {uint32_t min_pll_op_freq_hz;uint32_t max_pll_op_freq_hz; -struct smiapp_pll_branch_limits vt; -struct smiapp_pll_branch_limits op; +struct ccs_pll_branch_limits vt; +struct ccs_pll_branch_limits op;/* Other relevant limits */ uint32_t min_line_length_pck_bin;
@@ -92,8 +93,7 @@ struct smiapp_pll_limits {struct device ; -int smiapp_pll_calculate (struct device *dev, -const struct smiapp_pll_limits *limits, -struct smiapp_pll *pll); +int ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *limits, +struct ccs_pll *pll); -#endif /* SMIAPP_PLL_H */ +#endif /* CCS_PLL_H */
drivers/media/i2c/ccs/Kconfig +1 -1
@@ -4,7 +4,7 @@ config VIDEO_CCS depends on I2C && VIDEO_V4L2 && HAVE_CLK select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API - select VIDEO_SMIAPP_PLL + select VIDEO_CCS_PLL select V4L2_FWNODE help This is a generic driver for MIPI CCS, SMIA++ and SMIA compliant
drivers/media/i2c/ccs/ccs-core.c +9 -9
@@ -357,7 +357,7 @@ static int ccs_read_frame_fmt(struct ccs_sensor *sensor)static int ccs_pll_configure (struct ccs_sensor *sensor) { -struct smiapp_pll *pll = &sensor->pll; +struct ccs_pll *pll = &sensor->pll;int rval; rval =ccs_write (sensor,VT_PIX_CLK_DIV , pll->vt.pix_clk_div);
@@ -380,7 +380,7 @@ static int ccs_pll_configure(struct ccs_sensor *sensor) rval =ccs_write (sensor,REQUESTED_LINK_RATE ,DIV_ROUND_UP (pll->op.sys_clk_freq_hz,1000000 /256 /256 )); -if (rval <0 || sensor->pll.flags &SMIAPP_PLL_FLAG_NO_OP_CLOCKS ) +if (rval <0 || sensor->pll.flags &CCS_PLL_FLAG_NO_OP_CLOCKS )return rval; rval =ccs_write (sensor,OP_PIX_CLK_DIV , pll->op.pix_clk_div);
@@ -390,10 +390,10 @@ static int ccs_pll_configure(struct ccs_sensor *sensor)return ccs_write (sensor,OP_SYS_CLK_DIV , pll->op.sys_clk_div); } -static int ccs_pll_try (struct ccs_sensor *sensor,struct smiapp_pll *pll) +static int ccs_pll_try (struct ccs_sensor *sensor,struct ccs_pll *pll) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd); -struct smiapp_pll_limits lim = { +struct ccs_pll_limits lim = { .min_pre_pll_clk_div =CCS_LIM (sensor,MIN_PRE_PLL_CLK_DIV ), .max_pre_pll_clk_div =CCS_LIM (sensor,MAX_PRE_PLL_CLK_DIV ), .min_pll_ip_freq_hz =CCS_LIM (sensor,MIN_PLL_IP_CLK_FREQ_MHZ ),
@@ -425,12 +425,12 @@ static int ccs_pll_try(struct ccs_sensor *sensor, struct smiapp_pll *pll) .min_line_length_pck = CCS_LIM(sensor, MIN_LINE_LENGTH_PCK), }; -return smiapp_pll_calculate (&client->dev, &lim, pll); +return ccs_pll_calculate (&client->dev, &lim, pll); }static int ccs_pll_update (struct ccs_sensor *sensor) { -struct smiapp_pll *pll = &sensor->pll; +struct ccs_pll *pll = &sensor->pll;int rval; pll->binning_horizontal = sensor->binning_horizontal;
@@ -823,7 +823,7 @@ static void ccs_free_controls(struct ccs_sensor *sensor)static int ccs_get_mbus_formats (struct ccs_sensor *sensor) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd); -struct smiapp_pll *pll = &sensor->pll; +struct ccs_pll *pll = &sensor->pll;u8 compressed_max_bpp =0 ;unsigned int type, n;unsigned int i, pixel_order;
@@ -3140,7 +3140,7 @@ static int ccs_probe(struct i2c_client *client) !CCS_LIM(sensor, MIN_OP_PIX_CLK_DIV) || !CCS_LIM(sensor, MAX_OP_PIX_CLK_DIV)) {/* No OP clock branch */ - sensor->pll.flags |=SMIAPP_PLL_FLAG_NO_OP_CLOCKS ; + sensor->pll.flags |=CCS_PLL_FLAG_NO_OP_CLOCKS ; } else if (CCS_LIM(sensor, SCALING_CAPABILITY) != CCS_SCALING_CAPABILITY_NONE || CCS_LIM(sensor, DIGITAL_CROP_CAPABILITY)
@@ -3157,7 +3157,7 @@ static int ccs_probe(struct i2c_client *client) sensor->scale_m =CCS_LIM (sensor,SCALER_N_MIN );/* prepare PLL configuration input values */ - sensor->pll.bus_type =SMIAPP_PLL_BUS_TYPE_CSI2 ; + sensor->pll.bus_type =CCS_PLL_BUS_TYPE_CSI2 ; sensor->pll.csi2.lanes = sensor->hwcfg.lanes; sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN );
drivers/media/i2c/ccs/ccs-quirk.c +1 -1
@@ -190,7 +190,7 @@ static int jt8ev1_post_streamoff(struct ccs_sensor *sensor)static int jt8ev1_init (struct ccs_sensor *sensor) { - sensor->pll.flags |=SMIAPP_PLL_FLAG_OP_PIX_CLOCK_PER_LANE ; + sensor->pll.flags |=CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE ;return 0 ; }
drivers/media/i2c/ccs/ccs.h +2 -2
@@ -21,7 +21,7 @@#include "ccs-quirk.h" #include "ccs-regs.h" #include "ccs-reg-access.h" -#include "../smiapp-pll.h" +#include "../ccs-pll.h" #include "smiapp-reg-defs.h" /*
@@ -256,7 +256,7 @@ struct ccs_sensor {struct ccs_module_info minfo; -struct smiapp_pll pll; +struct ccs_pll pll;/* Is a default format supported for a given BPP? */ unsigned long *valid_link_freqs;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 44/106 ccs-pll: Fix MODULE_LICENSE
In reply to Sakari AilusChange MODULE_LICENSE to "GPL v2" as indicated by the SPDX tag.
--- drivers/media/i2c/ccs-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ccs-pll.c +1 -1
@@ -477,4 +477,4 @@ EXPORT_SYMBOL_GPL(ccs_pll_calculate);MODULE_AUTHOR ("Sakari Ailus <[email protected]>" );MODULE_DESCRIPTION ("Generic MIPI CCS/SMIA/SMIA++ PLL calculator" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 45/106 ccs: Change my e-mail address
In reply to Sakari AilusUse my @linux.intel.com e-mail address in the CCS driver.
--- drivers/media/i2c/ccs-pll.c | 4 ++-- drivers/media/i2c/ccs-pll.h | 2 +- drivers/media/i2c/ccs/ccs-core.c | 6 +++--- drivers/media/i2c/ccs/ccs-quirk.c | 2 +- drivers/media/i2c/ccs/ccs-quirk.h | 2 +- drivers/media/i2c/ccs/ccs-reg-access.c | 2 +- drivers/media/i2c/ccs/ccs-reg-access.h | 2 +- drivers/media/i2c/ccs/ccs.h | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-)
drivers/media/i2c/ccs-pll.c +2 -2
@@ -6,7 +6,7 @@* * Copyright (C) 2020 Intel Corporation * Copyright (C) 2011--2012 Nokia Corporation -* Contact: Sakari Ailus <[email protected]> +* Contact: Sakari Ailus <[email protected]> */ #include <linux/device.h>
@@ -475,6 +475,6 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits, }EXPORT_SYMBOL_GPL (ccs_pll_calculate); -MODULE_AUTHOR ("Sakari Ailus <[email protected]>" ); +MODULE_AUTHOR ("Sakari Ailus <[email protected]>" );MODULE_DESCRIPTION ("Generic MIPI CCS/SMIA/SMIA++ PLL calculator" );MODULE_LICENSE ("GPL v2" );
drivers/media/i2c/ccs-pll.h +1 -1
@@ -6,7 +6,7 @@* * Copyright (C) 2020 Intel Corporation * Copyright (C) 2012 Nokia Corporation -* Contact: Sakari Ailus <[email protected]> +* Contact: Sakari Ailus <[email protected]> */ #ifndef CCS_PLL_H
drivers/media/i2c/ccs/ccs-core.c +3 -3
@@ -6,7 +6,7 @@* * Copyright (C) 2020 Intel Corporation * Copyright (C) 2010--2012 Nokia Corporation -* Contact: Sakari Ailus <[email protected]> +* Contact: Sakari Ailus <[email protected]> * * Based on smiapp driver by Vimarsh Zutshi * Based on jt8ev1.c by Vimarsh Zutshi
@@ -1162,7 +1162,7 @@ static int ccs_setup_flash_strobe(struct ccs_sensor *sensor)* do not change, or if you do at least know what you're * doing. :-) * -* Sakari Ailus <[email protected]> 2010-10-25 +* Sakari Ailus <[email protected]> 2010-10-25 * * flash_strobe_length [us] / 10^6 = (tFlash_strobe_width_ctrl * / EXTCLK freq [Hz]) * flash_strobe_adjustment
@@ -3323,7 +3323,7 @@ static void ccs_module_cleanup(void)module_init (ccs_module_init);module_exit (ccs_module_cleanup); -MODULE_AUTHOR ("Sakari Ailus <[email protected]>" ); +MODULE_AUTHOR ("Sakari Ailus <[email protected]>" );MODULE_DESCRIPTION ("Generic MIPI CCS/SMIA/SMIA++ camera sensor driver" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("smiapp" );
drivers/media/i2c/ccs/ccs-quirk.c +1 -1
@@ -6,7 +6,7 @@* * Copyright (C) 2020 Intel Corporation * Copyright (C) 2011--2012 Nokia Corporation -* Contact: Sakari Ailus <[email protected]> +* Contact: Sakari Ailus <[email protected]> */ #include <linux/delay.h>
drivers/media/i2c/ccs/ccs-quirk.h +1 -1
@@ -6,7 +6,7 @@* * Copyright (C) 2020 Intel Corporation * Copyright (C) 2011--2012 Nokia Corporation -* Contact: Sakari Ailus <[email protected]> +* Contact: Sakari Ailus <[email protected]> */ #ifndef __CCS_QUIRK__
drivers/media/i2c/ccs/ccs-reg-access.c +1 -1
@@ -6,7 +6,7 @@* * Copyright (C) 2020 Intel Corporation * Copyright (C) 2011--2012 Nokia Corporation -* Contact: Sakari Ailus <[email protected]> +* Contact: Sakari Ailus <[email protected]> */ #include <asm/unaligned.h>
drivers/media/i2c/ccs/ccs-reg-access.h +1 -1
@@ -6,7 +6,7 @@* * Copyright (C) 2020 Intel Corporation * Copyright (C) 2011--2012 Nokia Corporation -* Contact: Sakari Ailus <[email protected]> +* Contact: Sakari Ailus <[email protected]> */ #ifndef SMIAPP_REGS_H
drivers/media/i2c/ccs/ccs.h +1 -1
@@ -6,7 +6,7 @@* * Copyright (C) 2020 Intel Corporation * Copyright (C) 2010--2012 Nokia Corporation -* Contact: Sakari Ailus <[email protected]> +* Contact: Sakari Ailus <[email protected]> */ #ifndef __CCS_H__
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 46/106 ccs: Add support for manufacturer regs from sensor and module files
In reply to Sakari AilusWrite manufacturer specific registers (MSRs) from file to the sensor on sensor power-on.
--- drivers/media/i2c/ccs/ccs-core.c | 23 +++++++ drivers/media/i2c/ccs/ccs-reg-access.c | 94 ++++++++++++++++++++------ drivers/media/i2c/ccs/ccs-reg-access.h | 2 + 3 files changed, 97 insertions(+), 22 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +23 -0
@@ -1272,6 +1272,21 @@ static int ccs_setup_flash_strobe(struct ccs_sensor *sensor)* Power management */ +static int ccs_write_msr_regs (struct ccs_sensor *sensor) +{ +int rval; + + rval =ccs_write_data_regs (sensor, + sensor->sdata.sensor_manufacturer_regs, + sensor->sdata.num_sensor_manufacturer_regs); +if (rval) +return rval; + +return ccs_write_data_regs (sensor, + sensor->mdata.module_manufacturer_regs, + sensor->mdata.num_module_manufacturer_regs); +} +static int ccs_power_on (struct device *dev) {struct v4l2_subdev *subdev =dev_get_drvdata (dev);
@@ -1377,6 +1392,10 @@ static int ccs_power_on(struct device *dev)if (rval <0 ) goto out_cci_addr_fail; + rval =ccs_write_msr_regs (sensor); +if (rval) + goto out_cci_addr_fail; + rval =ccs_call_quirk (sensor, post_poweron);if (rval) {dev_err (dev,"post_poweron quirks failed\n" );
@@ -3205,6 +3224,10 @@ static int ccs_probe(struct i2c_client *client)if (rval <0 ) goto out_media_entity_cleanup; + rval =ccs_write_msr_regs (sensor); +if (rval) + goto out_media_entity_cleanup; +pm_runtime_set_active (&client->dev);pm_runtime_get_noresume (&client->dev);pm_runtime_enable (&client->dev);
drivers/media/i2c/ccs/ccs-reg-access.c +72 -22
114 lines not on this page · raw message
drivers/media/i2c/ccs/ccs-reg-access.h +2 -0
@@ -27,6 +27,8 @@ int ccs_read_addr_8only(struct ccs_sensor *sensor, u32 reg, u32 *val);int ccs_read_addr_noconv (struct ccs_sensor *sensor,u32 reg,u32 *val);int ccs_write_addr_no_quirk (struct ccs_sensor *sensor,u32 reg,u32 val);int ccs_write_addr (struct ccs_sensor *sensor,u32 reg,u32 val); +int ccs_write_data_regs (struct ccs_sensor *sensor,struct ccs_reg *regs, +size_t num_regs);unsigned int ccs_reg_width (u32 reg);u32 ccs_reg_conv (struct ccs_sensor *sensor,u32 reg,u32 val);
Signature · 1 line
2.27.0
Re: [PATCH v2 046/106] ccs: Add support for manufacturer regs from sensor and module files
Em Wed, 7 Oct 2020 11:44:59 +0300
Sakari Ailus <[email protected]> escreveu:
Quoted 70 lines
Write manufacturer specific registers (MSRs) from file to the sensor on sensor power-on.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/ccs/ccs-core.c | 23 +++++++ drivers/media/i2c/ccs/ccs-reg-access.c | 94 ++++++++++++++++++++------ drivers/media/i2c/ccs/ccs-reg-access.h | 2 + 3 files changed, 97 insertions(+), 22 deletions(-)drivers/media/i2c/ccs/ccs-core.c +23
-0@@ -1272,6 +1272,21 @@ static int ccs_setup_flash_strobe(struct ccs_sensor *sensor)* Power management */ +static int ccs_write_msr_regs (struct ccs_sensor *sensor) +{ +int rval; + + rval =ccs_write_data_regs (sensor, + sensor->sdata.sensor_manufacturer_regs, + sensor->sdata.num_sensor_manufacturer_regs); +if (rval) +return rval; + +return ccs_write_data_regs (sensor, + sensor->mdata.module_manufacturer_regs, + sensor->mdata.num_module_manufacturer_regs); +} +static int ccs_power_on (struct device *dev) {struct v4l2_subdev *subdev =dev_get_drvdata (dev);@@ -1377,6 +1392,10 @@ static int ccs_power_on(struct device *dev)if (rval <0 ) goto out_cci_addr_fail; + rval =ccs_write_msr_regs (sensor); +if (rval) + goto out_cci_addr_fail; + rval =ccs_call_quirk (sensor, post_poweron);if (rval) {dev_err (dev,"post_poweron quirks failed\n" );@@ -3205,6 +3224,10 @@ static int ccs_probe(struct i2c_client *client)if (rval <0 ) goto out_media_entity_cleanup; + rval =ccs_write_msr_regs (sensor); +if (rval) + goto out_media_entity_cleanup; +pm_runtime_set_active (&client->dev);pm_runtime_get_noresume (&client->dev);pm_runtime_enable (&client->dev);drivers/media/i2c/ccs/ccs-reg-access.c +4
-0@@ -236,12 +236,38 @@ int ccs_read_addr_noconv(struct ccs_sensor *sensor, u32 reg, u32 *val)return ccs_read_addr_raw (sensor, reg, val, false, true, false); } +static int ccs_write_retry (struct i2c_client *client,struct i2c_msg *msg) +{ +unsigned int retries; +int r;
drivers/media/i2c/ccs/ccs-reg-access.c int ccs_read_addr_noconv(struct ccs_sensor *sensor, u32 reg, u32 *val) · line 252
Quoted 10 lines
drivers/media/i2c/ccs/ccs-reg-access.c +10
-0+ +for (retries =0 ; retries <5 ; retries++) { +/* +* Due to unknown reason sensor stops responding. This +* loop is a temporaty solution until the root cause +* is found. +*/ + r =i2c_transfer (client->adapter, msg,1 ); +if (r !=1 ) { +usleep_range (2000 ,2000 );
Huh? Does it need to sleep precisely for 2000 us?
Quoted 104 lines
drivers/media/i2c/ccs/ccs-reg-access.c +58
-22+continue ; + } + +if (retries) +dev_err (&client->dev, +"sensor i2c stall encountered. retries: %d\n" , + retries); +return 0 ; + } + +return r; +} +int ccs_write_addr_no_quirk (struct ccs_sensor *sensor,u32 reg,u32 val) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);struct i2c_msg msg;unsigned char data[6 ]; -unsigned int retries;unsigned int len =ccs_reg_width (reg);int r;@@ -256,27 +282,11 @@ int ccs_write_addr_no_quirk(struct ccs_sensor *sensor, u32 reg, u32 val)put_unaligned_be16 (CCS_REG_ADDR (reg), data);put_unaligned_be32 (val << (8 * (sizeof (val) - len)), data +2 ); -for (retries =0 ; retries <5 ; retries++) { -/* -* Due to unknown reason sensor stops responding. This -* loop is a temporaty solution until the root cause -* is found. -*/ - r =i2c_transfer (client->adapter, &msg,1 ); -if (r ==1 ) { -if (retries) -dev_err (&client->dev, -"sensor i2c stall encountered. retries: %d\n" , - retries); -return 0 ; - } - -usleep_range (2000 ,2000 ); - } - -dev_err (&client->dev, -"wrote 0x%x to offset 0x%x error %d\n" , val, -CCS_REG_ADDR (reg), r); + r =ccs_write_retry (client, &msg); +if (r) +dev_err (&client->dev, +"wrote 0x%x to offset 0x%x error %d\n" , val, +CCS_REG_ADDR (reg), r);return r; }@@ -297,3 +307,43 @@ int ccs_write_addr(struct ccs_sensor *sensor, u32 reg, u32 val)return ccs_write_addr_no_quirk (sensor, reg, val); } + +#define MAX_WRITE_LEN 32U + +int ccs_write_data_regs (struct ccs_sensor *sensor,struct ccs_reg *regs, +size_t num_regs) +{ +struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd); +unsigned char buf[2 +MAX_WRITE_LEN ]; +struct i2c_msg msg = { + .addr = client->addr, + .buf = buf, + }; +size_t i; + +for (i =0 ; i < num_regs; i++, regs++) { +unsigned char *regdata = regs->value; +unsigned int j; + +for (j =0 ; j < regs->len; + j += msg.len -2 , regdata += msg.len -2 ) { +int rval; + + msg.len =min (regs->len - j,MAX_WRITE_LEN ); + +put_unaligned_be16 (regs->addr + j, buf); +memcpy (buf +2 , regdata, msg.len); + msg.len +=2 ; + + rval =ccs_write_retry (client, &msg); +if (rval) { +dev_err (&client->dev, +"error writing %u octets to address 0x%4.4x\n" , + msg.len, regs->addr + j); +return rval; + } + } + } + +return 0 ; +}drivers/media/i2c/ccs/ccs-reg-access.h +0
-0
drivers/media/i2c/ccs/ccs-reg-access.h int ccs_read_addr_8only(struct ccs_sensor *sensor, u32 reg, u32 *val); · line 34
Quoted 8 lines
drivers/media/i2c/ccs/ccs-reg-access.h +2
-0@@ -27,6 +27,8 @@ int ccs_read_addr_8only(struct ccs_sensor *sensor, u32 reg, u32 *val);int ccs_read_addr_noconv (struct ccs_sensor *sensor,u32 reg,u32 *val);int ccs_write_addr_no_quirk (struct ccs_sensor *sensor,u32 reg,u32 val);int ccs_write_addr (struct ccs_sensor *sensor,u32 reg,u32 val); +int ccs_write_data_regs (struct ccs_sensor *sensor,struct ccs_reg *regs, +size_t num_regs);unsigned int ccs_reg_width (u32 reg);u32 ccs_reg_conv (struct ccs_sensor *sensor,u32 reg,u32 val);
Thanks,
Mauro
Sakari Ailus
maintainerRe: [PATCH v2 046/106] ccs: Add support for manufacturer regs from sensor and module files
Hi Mauro,
Thanks for the review.
Quoted 2 lines · Mauro Carvalho Chehab
Em Wed, 7 Oct 2020 11:44:59 +0300
Sakari Ailus <[email protected]> escreveu:
...
Quoted 8 lines
Quoted 8 lines
drivers/media/i2c/ccs/ccs-reg-access.c +0
-0@@ -236,12 +236,38 @@ int ccs_read_addr_noconv(struct ccs_sensor *sensor, u32 reg, u32 *val)return ccs_read_addr_raw (sensor, reg, val, false, true, false); }
Quoted 16 lines
Quoted 4 lines
drivers/media/i2c/ccs/ccs-reg-access.c +4
-0+static int ccs_write_retry (struct i2c_client *client,struct i2c_msg *msg) +{ +unsigned int retries; +int r;drivers/media/i2c/ccs/ccs-reg-access.c int ccs_read_addr_noconv(struct ccs_sensor *sensor, u32 reg, u32 *val) · line 252
Quoted 10 lines
drivers/media/i2c/ccs/ccs-reg-access.c +10
-0+ +for (retries =0 ; retries <5 ; retries++) { +/* +* Due to unknown reason sensor stops responding. This +* loop is a temporaty solution until the root cause +* is found. +*/ + r =i2c_transfer (client->adapter, msg,1 ); +if (r !=1 ) { +usleep_range (2000 ,2000 );Huh? Does it need to sleep precisely for 2000 us?
I believe this one does not, indeed. I'll make it a range, but add a separate patch for it as this patch just moves the code form one place to another.
Signature · 1 line
Sakari Ailus
Re: [PATCH v2 046/106] ccs: Add support for manufacturer regs from sensor and module files
Em Thu, 5 Nov 2020 13:56:01 +0200
Sakari Ailus <[email protected]> escreveu:
Quoted 35 lines
Hi Mauro,
Thanks for the review.
Quoted 2 lines · Mauro Carvalho Chehab
Em Wed, 7 Oct 2020 11:44:59 +0300
Sakari Ailus <[email protected]> escreveu:...
Quoted 8 lines
Quoted 8 lines
drivers/media/i2c/ccs/ccs-reg-access.c +0
-0@@ -236,12 +236,38 @@ int ccs_read_addr_noconv(struct ccs_sensor *sensor, u32 reg, u32 *val)return ccs_read_addr_raw (sensor, reg, val, false, true, false); }Quoted 16 lines
Quoted 4 lines
drivers/media/i2c/ccs/ccs-reg-access.c +4
-0+static int ccs_write_retry (struct i2c_client *client,struct i2c_msg *msg) +{ +unsigned int retries; +int r;drivers/media/i2c/ccs/ccs-reg-access.c int ccs_read_addr_noconv(struct ccs_sensor *sensor, u32 reg, u32 *val) · line 252
Quoted 10 lines
drivers/media/i2c/ccs/ccs-reg-access.c +10
-0+ +for (retries =0 ; retries <5 ; retries++) { +/* +* Due to unknown reason sensor stops responding. This +* loop is a temporaty solution until the root cause +* is found. +*/ + r =i2c_transfer (client->adapter, msg,1 ); +if (r !=1 ) { +usleep_range (2000 ,2000 );Huh? Does it need to sleep precisely for 2000 us?
Quoted 3 lines
I believe this one does not, indeed. I'll make it a range, but add a separate patch for it as this patch just moves the code form one place to another.
Ok.
Quoted 1 line
Thanks,
Mauro
Sakari Ailus
maintainerPATCH v2 47/106 ccs: Use static data read-only registers
In reply to Sakari AilusAccess read-only registers from CCS static data.
--- drivers/media/i2c/ccs/ccs-reg-access.c | 64 ++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 4 deletions(-)
drivers/media/i2c/ccs/ccs-reg-access.c +60 -4
@@ -198,11 +198,67 @@ static int __ccs_read_addr(struct ccs_sensor *sensor, u32 reg, u32 *val,return 0 ; } +static int __ccs_read_data (struct ccs_reg *regs,size_t num_regs, +u32 reg,u32 *val) +{ +unsigned int width =ccs_reg_width (reg); +size_t i; + +for (i =0 ; i < num_regs; i++, regs++) { +uint8_t *data; + +if (regs->addr + regs->len <CCS_REG_ADDR (reg) + width) +continue ; + +if (regs->addr >CCS_REG_ADDR (reg)) +break ; + + data = ®s->value[CCS_REG_ADDR (reg) - regs->addr]; + +switch (width) { +case sizeof (uint8_t ): + *val = *data; +break ; +case sizeof (uint16_t ): + *val =get_unaligned_be16 (data); +break ; +case sizeof (uint32_t ): + *val =get_unaligned_be32 (data); +break ; +default : +WARN_ON (1 ); +return -EINVAL ; + } + +return 0 ; + } + +return -ENOENT ; +} + +static int ccs_read_data (struct ccs_sensor *sensor,u32 reg,u32 *val) +{ +if (!__ccs_read_data (sensor->sdata.sensor_read_only_regs, + sensor->sdata.num_sensor_read_only_regs, + reg, val)) +return 0 ; + +return __ccs_read_data (sensor->mdata.module_read_only_regs, + sensor->mdata.num_module_read_only_regs, + reg, val); +} +static int ccs_read_addr_raw (struct ccs_sensor *sensor,u32 reg,u32 *val, -bool force8,bool quirk,bool conv) +bool force8,bool quirk,bool conv,bool data) {int rval; +if (data) { + rval =ccs_read_data (sensor, reg, val); +if (!rval) +return 0 ; + } +if (quirk) { *val =0 ; rval =ccs_call_quirk (sensor, reg_access, false, ®, val);
@@ -223,17 +279,17 @@ static int ccs_read_addr_raw(struct ccs_sensor *sensor, u32 reg, u32 *val,int ccs_read_addr (struct ccs_sensor *sensor,u32 reg,u32 *val) { -return ccs_read_addr_raw (sensor, reg, val, false, true, true); +return ccs_read_addr_raw (sensor, reg, val, false, true, true, true); }int ccs_read_addr_8only (struct ccs_sensor *sensor,u32 reg,u32 *val) { -return ccs_read_addr_raw (sensor, reg, val, true, true, true); +return ccs_read_addr_raw (sensor, reg, val, true, true, true, true); }int ccs_read_addr_noconv (struct ccs_sensor *sensor,u32 reg,u32 *val) { -return ccs_read_addr_raw (sensor, reg, val, false, true, false); +return ccs_read_addr_raw (sensor, reg, val, false, true, false, true); }static int ccs_write_retry (struct i2c_client *client,struct i2c_msg *msg)
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 48/106 ccs: Clean up runtime PM usage
In reply to Sakari AilusIf pm_runtime_get_sync() fails, there's no need to set the device active again. Also, in the same case to return the usage_count to zero, pm_runtime_put_noidle() is enough.
--- drivers/media/i2c/ccs/ccs-core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +2 -5
@@ -1619,8 +1619,6 @@ static int ccs_pm_get_init(struct ccs_sensor *sensor) rval =pm_runtime_get_sync (&client->dev);if (rval <0 ) { -if (rval != -EBUSY && rval != -EAGAIN ) -pm_runtime_set_active (&client->dev);pm_runtime_put_noidle (&client->dev);return rval;
@@ -2836,9 +2834,8 @@ static int __maybe_unused ccs_suspend(struct device *dev) rval =pm_runtime_get_sync (dev);if (rval <0 ) { -if (rval != -EBUSY && rval != -EAGAIN ) -pm_runtime_set_active (&client->dev); -pm_runtime_put (dev); +pm_runtime_put_noidle (dev); +return -EAGAIN ; }
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 49/106 ccs: Wrap long lines, unwrap short ones
In reply to Sakari AilusOver the years (and renaming) some lines that may well be wrapped ended up being over 80 characters, likewise there are shorter lines that can be merged. Do that.
--- drivers/media/i2c/ccs/ccs-core.c | 45 +++++++++++++------------------- 1 file changed, 18 insertions(+), 27 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +18 -27
@@ -651,8 +651,7 @@ static int ccs_set_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_HBLANK : rval =ccs_write (sensor,LINE_LENGTH_PCK , - sensor->pixel_array->crop[ -CCS_PA_PAD_SRC ].width + sensor->pixel_array->crop[CCS_PA_PAD_SRC ].width + ctrl->val);break ;
@@ -983,15 +982,13 @@ static void ccs_update_blanking(struct ccs_sensor *sensor) min =max_t (int,CCS_LIM (sensor,MIN_FRAME_BLANKING_LINES ), - min_fll - - sensor->pixel_array->crop[CCS_PA_PAD_SRC ].height); + min_fll - sensor->pixel_array->crop[CCS_PA_PAD_SRC ].height); max = max_fll - sensor->pixel_array->crop[CCS_PA_PAD_SRC ].height;__v4l2_ctrl_modify_range (vblank, min, max, vblank->step, min); min =max_t (int, - min_llp - - sensor->pixel_array->crop[CCS_PA_PAD_SRC ].width, + min_llp - sensor->pixel_array->crop[CCS_PA_PAD_SRC ].width, min_lbp); max = max_llp - sensor->pixel_array->crop[CCS_PA_PAD_SRC ].width;
@@ -1778,7 +1775,8 @@ static void ccs_get_crop_compose(struct v4l2_subdev *subdev, }else {if (crops) {for (i =0 ; i < subdev->entity.num_pads; i++) - crops[i] =v4l2_subdev_get_try_crop (subdev, cfg, i); + crops[i] =v4l2_subdev_get_try_crop (subdev, + cfg, i); }if (comps) *comps = v4l2_subdev_get_try_compose(subdev, cfg,
@@ -1803,8 +1801,7 @@ static void ccs_propagate(struct v4l2_subdev *subdev, comp->height = crops[CCS_PAD_SINK ]->height;if (which ==V4L2_SUBDEV_FORMAT_ACTIVE ) {if (ssd == sensor->scaler) { - sensor->scale_m = -CCS_LIM (sensor,SCALER_N_MIN ); + sensor->scale_m =CCS_LIM (sensor,SCALER_N_MIN ); sensor->scaling_mode =CCS_SCALING_MODE_NO_SCALING ; }else if (ssd == sensor->binner) {
@@ -2230,9 +2227,11 @@ static int ccs_set_crop(struct v4l2_subdev *subdev,if (sel->pad == ssd->sink_pad) { _r.left =0 ; _r.top =0 ; - _r.width =v4l2_subdev_get_try_format (subdev, cfg, sel->pad) + _r.width =v4l2_subdev_get_try_format (subdev, cfg, + sel->pad) ->width; - _r.height =v4l2_subdev_get_try_format (subdev, cfg, sel->pad) + _r.height =v4l2_subdev_get_try_format (subdev, cfg, + sel->pad) ->height; src_size = &_r; }else {
@@ -2350,11 +2349,9 @@ static int ccs_set_selection(struct v4l2_subdev *subdev, sel->r.width =CCS_ALIGN_DIM (sel->r.width, sel->flags); sel->r.height =CCS_ALIGN_DIM (sel->r.height, sel->flags); - sel->r.width = max_t(unsigned int, -CCS_LIM (sensor,MIN_X_OUTPUT_SIZE ), + sel->r.width = max_t(unsigned int, CCS_LIM(sensor, MIN_X_OUTPUT_SIZE), sel->r.width); - sel->r.height = max_t(unsigned int, -CCS_LIM (sensor,MIN_Y_OUTPUT_SIZE ), + sel->r.height = max_t(unsigned int, CCS_LIM(sensor, MIN_Y_OUTPUT_SIZE), sel->r.height);switch (sel->target) {
@@ -2607,8 +2604,7 @@ static int ccs_identify_module(struct ccs_sensor *sensor)dev_warn (&client->dev,"no quirks for this module; let's hope it's fully compliant\n" ); -dev_dbg (&client->dev,"the sensor is called %s\n" , - minfo->name); +dev_dbg (&client->dev,"the sensor is called %s\n" , minfo->name);return 0 ; }
@@ -2628,19 +2624,15 @@ static int ccs_register_subdev(struct ccs_sensor *sensor,if (!sink_ssd)return 0 ; - rval =media_entity_pads_init (&ssd->sd.entity, - ssd->npads, ssd->pads); + rval =media_entity_pads_init (&ssd->sd.entity, ssd->npads, ssd->pads);if (rval) { -dev_err (&client->dev, -"media_entity_pads_init failed\n" ); +dev_err (&client->dev,"media_entity_pads_init failed\n" );return rval; } - rval =v4l2_device_register_subdev (sensor->src->sd.v4l2_dev, - &ssd->sd); + rval =v4l2_device_register_subdev (sensor->src->sd.v4l2_dev, &ssd->sd);if (rval) { -dev_err (&client->dev, -"v4l2_device_register_subdev failed\n" ); +dev_err (&client->dev,"v4l2_device_register_subdev failed\n" );return rval; }
@@ -2648,8 +2640,7 @@ static int ccs_register_subdev(struct ccs_sensor *sensor, &sink_ssd->sd.entity, sink_pad, link_flags);if (rval) { -dev_err (&client->dev, -"media_create_pad_link failed\n" ); +dev_err (&client->dev,"media_create_pad_link failed\n" );v4l2_device_unregister_subdev (&ssd->sd);return rval; }
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 50/106 ccs: Add device compatible identifiers for telling SMIA and CCS apart
In reply to Sakari AilusAdd device data specific to DT compatible ID to tell SMIA and CCS devices apart already in power-up.
--- drivers/media/i2c/ccs/ccs-core.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +16 -4
@@ -59,6 +59,12 @@ static const struct ccs_module_ident ccs_module_idents[] = { CCS_IDENT_LQ(0x10, 0x4241, -1, "imx125es", &smiapp_imx125es_quirk), }; +#define CCS_DEVICE_FLAG_IS_SMIA BIT(0) + +struct ccs_device { +unsigned char flags; +}; +/* * * Dynamic Capability Identification
@@ -3276,11 +3282,17 @@ static int ccs_remove(struct i2c_client *client)return 0 ; } +static const struct ccs_device smia_device = { + .flags =CCS_DEVICE_FLAG_IS_SMIA , +}; + +static const struct ccs_device ccs_device = {}; +static const struct of_device_id ccs_of_table[] = { - { .compatible ="mipi-ccs-1.1" }, - { .compatible ="mipi-ccs-1.0" }, - { .compatible ="mipi-ccs" }, - { .compatible ="nokia,smia" }, + { .compatible ="mipi-ccs-1.1" , .data = &ccs_device }, + { .compatible ="mipi-ccs-1.0" , .data = &ccs_device }, + { .compatible ="mipi-ccs" , .data = &ccs_device }, + { .compatible ="nokia,smia" , .data = &smia_device }, { }, };MODULE_DEVICE_TABLE (of, ccs_of_table);
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 51/106 ccs: Use longer pre-I²C sleep for CCS compliant devices
In reply to Sakari AilusLonger idle period is required on I²C bus before the first transaction after lifting xshutdown.
--- drivers/media/i2c/ccs/ccs-core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/media/i2c/ccs/ccs-core.c +6 -1
@@ -1300,6 +1300,7 @@ static int ccs_power_on(struct device *dev)*/ struct ccs_sensor *sensor = container_of(ssd, struct ccs_sensor, ssds[0]); +const struct ccs_device *ccsdev =device_get_match_data (dev);unsigned int sleep;int rval;
@@ -1320,7 +1321,11 @@ static int ccs_power_on(struct device *dev)gpiod_set_value (sensor->reset,0 );gpiod_set_value (sensor->xshutdown,1 ); - sleep =SMIAPP_RESET_DELAY (sensor->hwcfg.ext_clk); +if (ccsdev->flags &CCS_DEVICE_FLAG_IS_SMIA ) + sleep =SMIAPP_RESET_DELAY (sensor->hwcfg.ext_clk); +else + sleep =5000 ; +usleep_range (sleep, sleep);/*
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 52/106 ccs: Remove unnecessary delays from power-up sequence
In reply to Sakari AilusSMIA nor CCS need these delays; remove them.
--- drivers/media/i2c/ccs/ccs-core.c | 2 -- 1 file changed, 2 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +0 -2
@@ -1309,14 +1309,12 @@ static int ccs_power_on(struct device *dev)dev_err (dev,"failed to enable vana regulator\n" );return rval; } -usleep_range (1000 ,1000 ); rval =clk_prepare_enable (sensor->ext_clk);if (rval <0 ) {dev_dbg (dev,"failed to enable xclk\n" ); goto out_xclk_fail; } -usleep_range (1000 ,1000 );gpiod_set_value (sensor->reset,0 );gpiod_set_value (sensor->xshutdown,1 );
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 55/106 ccs: Use all regulators
In reply to Sakari AilusUse regulators vio and vcore besides vana. The regulators were always there but on many boards they've been hard wired. Control them explicitly now.
--- drivers/media/i2c/ccs/ccs-core.c | 30 +++++++++++++++++++++++------- drivers/media/i2c/ccs/ccs.h | 2 +- 2 files changed, 24 insertions(+), 8 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +23 -7
@@ -65,6 +65,8 @@ struct ccs_device {unsigned char flags; }; +static const char *const ccs_regulators[] = {"vcore" ,"vio" ,"vana" }; +/* * * Dynamic Capability Identification
@@ -1304,7 +1306,8 @@ static int ccs_power_on(struct device *dev)unsigned int sleep;int rval; - rval =regulator_enable (sensor->vana); + rval =regulator_bulk_enable (ARRAY_SIZE (ccs_regulators), + sensor->regulators);if (rval) {dev_err (dev,"failed to enable vana regulator\n" );return rval;
@@ -1416,7 +1419,8 @@ static int ccs_power_on(struct device *dev)clk_disable_unprepare (sensor->ext_clk); out_xclk_fail: -regulator_disable (sensor->vana); +regulator_bulk_disable (ARRAY_SIZE (ccs_regulators), + sensor->regulators);return rval; }
@@ -1442,7 +1446,8 @@ static int ccs_power_off(struct device *dev)gpiod_set_value (sensor->xshutdown,0 );clk_disable_unprepare (sensor->ext_clk);usleep_range (5000 ,5000 ); -regulator_disable (sensor->vana); +regulator_bulk_disable (ARRAY_SIZE (ccs_regulators), + sensor->regulators); sensor->streaming = false;return 0 ;
@@ -2981,10 +2986,21 @@ static int ccs_probe(struct i2c_client *client)v4l2_i2c_subdev_init (&sensor->src->sd, client, &ccs_ops); sensor->src->sd.internal_ops = &ccs_internal_src_ops; - sensor->vana =devm_regulator_get (&client->dev,"vana" ); -if (IS_ERR (sensor->vana)) { -dev_err (&client->dev,"could not get regulator for vana\n" ); -return PTR_ERR (sensor->vana); + sensor->regulators =devm_kcalloc (&client->dev, +ARRAY_SIZE (ccs_regulators), +sizeof (*sensor->regulators), +GFP_KERNEL ); +if (!sensor->regulators) +return -ENOMEM ; + +for (i =0 ; i <ARRAY_SIZE (ccs_regulators); i++) + sensor->regulators[i].supply = ccs_regulators[i]; + + rval =devm_regulator_bulk_get (&client->dev,ARRAY_SIZE (ccs_regulators), + sensor->regulators); +if (rval) { +dev_err (&client->dev,"could not get regulators\n" ); +return rval; } sensor->ext_clk =devm_clk_get (&client->dev,NULL );
drivers/media/i2c/ccs/ccs.h +1 -1
@@ -223,7 +223,7 @@ struct ccs_sensor {struct ccs_subdev *scaler;struct ccs_subdev *pixel_array;struct ccs_hwconfig hwcfg; -struct regulator *vana; +struct regulator_bulk_data *regulators;struct clk *ext_clk;struct gpio_desc *xshutdown;struct gpio_desc *reset;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 56/106 ccs-pll: Don't use div_u64 to divide a 32-bit number
In reply to Sakari Ailuspll->pll_op_clk_freq is a 32-bit number. It does not need div_u64 to divide it.
--- drivers/media/i2c/ccs-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ccs-pll.c +1 -1
@@ -445,7 +445,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits, min_pre_pll_clk_div, max_pre_pll_clk_div); i =gcd (pll->pll_op_clk_freq_hz, pll->ext_clk_freq_hz); - mul =div_u64 (pll->pll_op_clk_freq_hz, i); + mul = pll->pll_op_clk_freq_hz / i; div = pll->ext_clk_freq_hz / i;dev_dbg (dev,"mul %u / div %u\n" , mul, div);
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 57/106 ccs-pll: Split limits and PLL configuration into front and back parts
In reply to Sakari AilusThe CCS spec supports a lot of variation in the PLL. Split the PLL in front and back parts to better prepare for supporting it.
Also use CCS compliant naming for IP and OP PLL frequencies (i.e. include "clk" in the name).
--- drivers/media/i2c/ccs-pll.c | 282 ++++++++++++++++--------------- drivers/media/i2c/ccs-pll.h | 44 +++-- drivers/media/i2c/ccs/ccs-core.c | 71 ++++---- 3 files changed, 209 insertions(+), 188 deletions(-)
drivers/media/i2c/ccs-pll.c +146 -136
@@ -53,65 +53,68 @@ static int bounds_check(struct device *dev, uint32_t val,static void print_pll (struct device *dev,struct ccs_pll *pll) { -dev_dbg (dev,"pre_pll_clk_div\t%u\n" , pll->pre_pll_clk_div); -dev_dbg (dev,"pll_multiplier \t%u\n" , pll->pll_multiplier); +dev_dbg (dev,"pre_pll_clk_div\t%u\n" , pll->vt_fr.pre_pll_clk_div); +dev_dbg (dev,"pll_multiplier \t%u\n" , pll->vt_fr.pll_multiplier);if (!(pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS )) { -dev_dbg (dev,"op_sys_clk_div \t%u\n" , pll->op.sys_clk_div); -dev_dbg (dev,"op_pix_clk_div \t%u\n" , pll->op.pix_clk_div); +dev_dbg (dev,"op_sys_clk_div \t%u\n" , pll->op_bk.sys_clk_div); +dev_dbg (dev,"op_pix_clk_div \t%u\n" , pll->op_bk.pix_clk_div); } -dev_dbg (dev,"vt_sys_clk_div \t%u\n" , pll->vt.sys_clk_div); -dev_dbg (dev,"vt_pix_clk_div \t%u\n" , pll->vt.pix_clk_div); +dev_dbg (dev,"vt_sys_clk_div \t%u\n" , pll->vt_bk.sys_clk_div); +dev_dbg (dev,"vt_pix_clk_div \t%u\n" , pll->vt_bk.pix_clk_div);dev_dbg (dev,"ext_clk_freq_hz \t%u\n" , pll->ext_clk_freq_hz); -dev_dbg (dev,"pll_ip_clk_freq_hz \t%u\n" , pll->pll_ip_clk_freq_hz); -dev_dbg (dev,"pll_op_clk_freq_hz \t%u\n" , pll->pll_op_clk_freq_hz); +dev_dbg (dev,"pll_ip_clk_freq_hz \t%u\n" , pll->vt_fr.pll_ip_clk_freq_hz); +dev_dbg (dev,"pll_op_clk_freq_hz \t%u\n" , pll->vt_fr.pll_op_clk_freq_hz);if (!(pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS )) {dev_dbg (dev,"op_sys_clk_freq_hz \t%u\n" , - pll->op.sys_clk_freq_hz); + pll->op_bk.sys_clk_freq_hz);dev_dbg (dev,"op_pix_clk_freq_hz \t%u\n" , - pll->op.pix_clk_freq_hz); + pll->op_bk.pix_clk_freq_hz); } -dev_dbg (dev,"vt_sys_clk_freq_hz \t%u\n" , pll->vt.sys_clk_freq_hz); -dev_dbg (dev,"vt_pix_clk_freq_hz \t%u\n" , pll->vt.pix_clk_freq_hz); +dev_dbg (dev,"vt_sys_clk_freq_hz \t%u\n" , pll->vt_bk.sys_clk_freq_hz); +dev_dbg (dev,"vt_pix_clk_freq_hz \t%u\n" , pll->vt_bk.pix_clk_freq_hz); }static int check_all_bounds (struct device *dev, -const struct ccs_pll_limits *limits, -const struct ccs_pll_branch_limits *op_limits, -struct ccs_pll *pll,struct ccs_pll_branch *op_pll) +const struct ccs_pll_limits *lim, +const struct ccs_pll_branch_limits_fr *op_lim_fr, +const struct ccs_pll_branch_limits_bk *op_lim_bk, +struct ccs_pll *pll, +struct ccs_pll_branch_fr *op_pll_fr, +struct ccs_pll_branch_bk *op_pll_bk) {int rval; - rval =bounds_check (dev, pll->pll_ip_clk_freq_hz, - limits->min_pll_ip_freq_hz, - limits->max_pll_ip_freq_hz, + rval =bounds_check (dev, op_pll_fr->pll_ip_clk_freq_hz, + op_lim_fr->min_pll_ip_clk_freq_hz, + op_lim_fr->max_pll_ip_clk_freq_hz,"pll_ip_clk_freq_hz" );if (!rval) rval =bounds_check ( - dev, pll->pll_multiplier, - limits->min_pll_multiplier, limits->max_pll_multiplier, -"pll_multiplier" ); + dev, op_pll_fr->pll_multiplier, + op_lim_fr->min_pll_multiplier, + op_lim_fr->max_pll_multiplier,"pll_multiplier" );if (!rval) rval =bounds_check ( - dev, pll->pll_op_clk_freq_hz, - limits->min_pll_op_freq_hz, limits->max_pll_op_freq_hz, -"pll_op_clk_freq_hz" ); + dev, op_pll_fr->pll_op_clk_freq_hz, + op_lim_fr->min_pll_op_clk_freq_hz, + op_lim_fr->max_pll_op_clk_freq_hz,"pll_op_clk_freq_hz" );if (!rval) rval =bounds_check ( - dev, op_pll->sys_clk_div, - op_limits->min_sys_clk_div, op_limits->max_sys_clk_div, + dev, op_pll_bk->sys_clk_div, + op_lim_bk->min_sys_clk_div, op_lim_bk->max_sys_clk_div,"op_sys_clk_div" );if (!rval) rval =bounds_check ( - dev, op_pll->sys_clk_freq_hz, - op_limits->min_sys_clk_freq_hz, - op_limits->max_sys_clk_freq_hz, + dev, op_pll_bk->sys_clk_freq_hz, + op_lim_bk->min_sys_clk_freq_hz, + op_lim_bk->max_sys_clk_freq_hz,"op_sys_clk_freq_hz" );if (!rval) rval =bounds_check ( - dev, op_pll->pix_clk_freq_hz, - op_limits->min_pix_clk_freq_hz, - op_limits->max_pix_clk_freq_hz, + dev, op_pll_bk->pix_clk_freq_hz, + op_lim_bk->min_pix_clk_freq_hz, + op_lim_bk->max_pix_clk_freq_hz,"op_pix_clk_freq_hz" );/*
@@ -123,15 +126,15 @@ static int check_all_bounds(struct device *dev,if (!rval) rval =bounds_check ( - dev, pll->vt.sys_clk_freq_hz, - limits->vt.min_sys_clk_freq_hz, - limits->vt.max_sys_clk_freq_hz, + dev, pll->vt_bk.sys_clk_freq_hz, + lim->vt_bk.min_sys_clk_freq_hz, + lim->vt_bk.max_sys_clk_freq_hz,"vt_sys_clk_freq_hz" );if (!rval) rval =bounds_check ( - dev, pll->vt.pix_clk_freq_hz, - limits->vt.min_pix_clk_freq_hz, - limits->vt.max_pix_clk_freq_hz, + dev, pll->vt_bk.pix_clk_freq_hz, + lim->vt_bk.min_pix_clk_freq_hz, + lim->vt_bk.max_pix_clk_freq_hz,"vt_pix_clk_freq_hz" );return rval;
@@ -149,10 +152,12 @@ static int check_all_bounds(struct device *dev,* @return Zero on success, error code on error. */ static int -__ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *limits, -const struct ccs_pll_branch_limits *op_limits, -struct ccs_pll *pll,struct ccs_pll_branch *op_pll, -uint32_t mul,uint32_t div,uint32_t lane_op_clock_ratio) +__ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *lim, +const struct ccs_pll_branch_limits_fr *op_lim_fr, +const struct ccs_pll_branch_limits_bk *op_lim_bk, +struct ccs_pll *pll,struct ccs_pll_branch_fr *op_pll_fr, +struct ccs_pll_branch_bk *op_pll_bk,uint32_t mul, +uint32_t div,uint32_t lane_op_clock_ratio) {uint32_t sys_div;uint32_t best_pix_div =INT_MAX >>1 ;
@@ -173,42 +178,42 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits,* Get pre_pll_clk_div so that our pll_op_clk_freq_hz won't be * too high. */ -dev_dbg (dev,"pre_pll_clk_div %u\n" , pll->pre_pll_clk_div); +dev_dbg (dev,"op_pre_pll_clk_div %u\n" , op_pll_fr->pre_pll_clk_div);/* Don't go above max pll multiplier. */ - more_mul_max = limits->max_pll_multiplier / mul; -dev_dbg (dev,"more_mul_max: max_pll_multiplier check: %u\n" , + more_mul_max = op_lim_fr->max_pll_multiplier / mul; +dev_dbg (dev,"more_mul_max: max_op_pll_multiplier check: %u\n" , more_mul_max);/* Don't go above max pll op frequency. */ more_mul_max =min_t (uint32_t, more_mul_max, - limits->max_pll_op_freq_hz - / (pll->ext_clk_freq_hz / pll->pre_pll_clk_div * mul)); -dev_dbg (dev,"more_mul_max: max_pll_op_freq_hz check: %u\n" , + op_lim_fr->max_pll_op_clk_freq_hz + / (pll->ext_clk_freq_hz / op_pll_fr->pre_pll_clk_div * mul)); +dev_dbg (dev,"more_mul_max: max_pll_op_clk_freq_hz check: %u\n" , more_mul_max);/* Don't go above the division capability of op sys clock divider. */ more_mul_max =min (more_mul_max, - op_limits->max_sys_clk_div * pll->pre_pll_clk_div + op_lim_bk->max_sys_clk_div * op_pll_fr->pre_pll_clk_div / div);dev_dbg (dev,"more_mul_max: max_op_sys_clk_div check: %u\n" , more_mul_max);/* Ensure we won't go above min_pll_multiplier. */ more_mul_max =min (more_mul_max, -DIV_ROUND_UP (limits->max_pll_multiplier, mul)); +DIV_ROUND_UP (op_lim_fr->max_pll_multiplier, mul));dev_dbg (dev,"more_mul_max: min_pll_multiplier check: %u\n" , more_mul_max); -/* Ensure we won't go below min_pll_op_freq_hz. */ - more_mul_min =DIV_ROUND_UP (limits->min_pll_op_freq_hz, - pll->ext_clk_freq_hz / pll->pre_pll_clk_div - * mul); -dev_dbg (dev,"more_mul_min: min_pll_op_freq_hz check: %u\n" , +/* Ensure we won't go below min_pll_op_clk_freq_hz. */ + more_mul_min =DIV_ROUND_UP (op_lim_fr->min_pll_op_clk_freq_hz, + pll->ext_clk_freq_hz / + op_pll_fr->pre_pll_clk_div * mul); +dev_dbg (dev,"more_mul_min: min_op_pll_op_clk_freq_hz check: %u\n" , more_mul_min);/* Ensure we won't go below min_pll_multiplier. */ more_mul_min =max (more_mul_min, -DIV_ROUND_UP (limits->min_pll_multiplier, mul)); -dev_dbg (dev,"more_mul_min: min_pll_multiplier check: %u\n" , +DIV_ROUND_UP (op_lim_fr->min_pll_multiplier, mul)); +dev_dbg (dev,"more_mul_min: min_op_pll_multiplier check: %u\n" , more_mul_min);if (more_mul_min > more_mul_max) {
@@ -217,9 +222,9 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits,return -EINVAL ; } - more_mul_factor =lcm (div, pll->pre_pll_clk_div) / div; + more_mul_factor =lcm (div, op_pll_fr->pre_pll_clk_div) / div;dev_dbg (dev,"more_mul_factor: %u\n" , more_mul_factor); - more_mul_factor =lcm (more_mul_factor, op_limits->min_sys_clk_div); + more_mul_factor =lcm (more_mul_factor, op_lim_bk->min_sys_clk_div);dev_dbg (dev,"more_mul_factor: min_op_sys_clk_div: %d\n" , more_mul_factor); i =roundup (more_mul_min, more_mul_factor);
@@ -232,25 +237,25 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits,return -EINVAL ; } - pll->pll_multiplier = mul * i; - op_pll->sys_clk_div = div * i / pll->pre_pll_clk_div; -dev_dbg (dev,"op_sys_clk_div: %u\n" , op_pll->sys_clk_div); + op_pll_fr->pll_multiplier = mul * i; + op_pll_bk->sys_clk_div = div * i / op_pll_fr->pre_pll_clk_div; +dev_dbg (dev,"op_sys_clk_div: %u\n" , op_pll_bk->sys_clk_div); - pll->pll_ip_clk_freq_hz = pll->ext_clk_freq_hz - / pll->pre_pll_clk_div; + op_pll_fr->pll_ip_clk_freq_hz = pll->ext_clk_freq_hz + / op_pll_fr->pre_pll_clk_div; - pll->pll_op_clk_freq_hz = pll->pll_ip_clk_freq_hz - * pll->pll_multiplier; + op_pll_fr->pll_op_clk_freq_hz = op_pll_fr->pll_ip_clk_freq_hz + * op_pll_fr->pll_multiplier;/* Derive pll_op_clk_freq_hz. */ - op_pll->sys_clk_freq_hz = - pll->pll_op_clk_freq_hz / op_pll->sys_clk_div; + op_pll_bk->sys_clk_freq_hz = + op_pll_fr->pll_op_clk_freq_hz / op_pll_bk->sys_clk_div; - op_pll->pix_clk_div = pll->bits_per_pixel; -dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll->pix_clk_div); + op_pll_bk->pix_clk_div = pll->bits_per_pixel; +dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll_bk->pix_clk_div); - op_pll->pix_clk_freq_hz = - op_pll->sys_clk_freq_hz / op_pll->pix_clk_div; + op_pll_bk->pix_clk_freq_hz = + op_pll_bk->sys_clk_freq_hz / op_pll_bk->pix_clk_div;if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) {/* No OP clocks --- VT clocks are used instead. */
@@ -264,7 +269,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits,* should run at higher clock rate, so smaller divisor is used * on video timing side. */ -if (limits->min_line_length_pck_bin > limits->min_line_length_pck +if (lim->min_line_length_pck_bin > lim->min_line_length_pck / pll->binning_horizontal) vt_op_binning_div = pll->binning_horizontal;else
@@ -283,28 +288,28 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits,* Find absolute limits for the factor of vt divider. */ dev_dbg (dev,"scale_m: %u\n" , pll->scale_m); - min_vt_div =DIV_ROUND_UP (op_pll->pix_clk_div * op_pll->sys_clk_div - * pll->scale_n, + min_vt_div =DIV_ROUND_UP (op_pll_bk->pix_clk_div + * op_pll_bk->sys_clk_div * pll->scale_n, lane_op_clock_ratio * vt_op_binning_div * pll->scale_m);/* Find smallest and biggest allowed vt divisor. */ dev_dbg (dev,"min_vt_div: %u\n" , min_vt_div); min_vt_div =max (min_vt_div, -DIV_ROUND_UP (pll->pll_op_clk_freq_hz, - limits->vt.max_pix_clk_freq_hz)); +DIV_ROUND_UP (op_pll_fr->pll_op_clk_freq_hz, + lim->vt_bk.max_pix_clk_freq_hz));dev_dbg (dev,"min_vt_div: max_vt_pix_clk_freq_hz: %u\n" , min_vt_div); min_vt_div =max_t (uint32_t, min_vt_div, - limits->vt.min_pix_clk_div - * limits->vt.min_sys_clk_div); + lim->vt_bk.min_pix_clk_div + * lim->vt_bk.min_sys_clk_div);dev_dbg (dev,"min_vt_div: min_vt_clk_div: %u\n" , min_vt_div); - max_vt_div = limits->vt.max_sys_clk_div * limits->vt.max_pix_clk_div; + max_vt_div = lim->vt_bk.max_sys_clk_div * lim->vt_bk.max_pix_clk_div;dev_dbg (dev,"max_vt_div: %u\n" , max_vt_div); max_vt_div =min (max_vt_div, -DIV_ROUND_UP (pll->pll_op_clk_freq_hz, - limits->vt.min_pix_clk_freq_hz)); +DIV_ROUND_UP (op_pll_fr->pll_op_clk_freq_hz, + lim->vt_bk.min_pix_clk_freq_hz));dev_dbg (dev,"max_vt_div: min_vt_pix_clk_freq_hz: %u\n" , max_vt_div);
@@ -312,28 +317,28 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits,* Find limitsits for sys_clk_div. Not all values are possible * with all values of pix_clk_div. */ - min_sys_div = limits->vt.min_sys_clk_div; + min_sys_div = lim->vt_bk.min_sys_clk_div;dev_dbg (dev,"min_sys_div: %u\n" , min_sys_div); min_sys_div =max (min_sys_div,DIV_ROUND_UP (min_vt_div, - limits->vt.max_pix_clk_div)); + lim->vt_bk.max_pix_clk_div));dev_dbg (dev,"min_sys_div: max_vt_pix_clk_div: %u\n" , min_sys_div); min_sys_div =max (min_sys_div, - pll->pll_op_clk_freq_hz - / limits->vt.max_sys_clk_freq_hz); + op_pll_fr->pll_op_clk_freq_hz + / lim->vt_bk.max_sys_clk_freq_hz);dev_dbg (dev,"min_sys_div: max_pll_op_clk_freq_hz: %u\n" , min_sys_div); min_sys_div =clk_div_even_up (min_sys_div);dev_dbg (dev,"min_sys_div: one or even: %u\n" , min_sys_div); - max_sys_div = limits->vt.max_sys_clk_div; + max_sys_div = lim->vt_bk.max_sys_clk_div;dev_dbg (dev,"max_sys_div: %u\n" , max_sys_div); max_sys_div =min (max_sys_div,DIV_ROUND_UP (max_vt_div, - limits->vt.min_pix_clk_div)); + lim->vt_bk.min_pix_clk_div));dev_dbg (dev,"max_sys_div: min_vt_pix_clk_div: %u\n" , max_sys_div); max_sys_div =min (max_sys_div, -DIV_ROUND_UP (pll->pll_op_clk_freq_hz, - limits->vt.min_pix_clk_freq_hz)); +DIV_ROUND_UP (op_pll_fr->pll_op_clk_freq_hz, + lim->vt_bk.min_pix_clk_freq_hz));dev_dbg (dev,"max_sys_div: min_vt_pix_clk_freq_hz: %u\n" , max_sys_div);/*
@@ -348,13 +353,13 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits, sys_div += 2 - (sys_div & 1)) {uint16_t pix_div =DIV_ROUND_UP (vt_div, sys_div); -if (pix_div < limits->vt.min_pix_clk_div - || pix_div > limits->vt.max_pix_clk_div) { +if (pix_div < lim->vt_bk.min_pix_clk_div + || pix_div > lim->vt_bk.max_pix_clk_div) {dev_dbg (dev,"pix_div %u too small or too big (%u--%u)\n" , pix_div, - limits->vt.min_pix_clk_div, - limits->vt.max_pix_clk_div); + lim->vt_bk.min_pix_clk_div, + lim->vt_bk.max_pix_clk_div);continue ; }
@@ -367,29 +372,32 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits,break ; } - pll->vt.sys_clk_div =DIV_ROUND_UP (min_vt_div, best_pix_div); - pll->vt.pix_clk_div = best_pix_div; + pll->vt_bk.sys_clk_div =DIV_ROUND_UP (min_vt_div, best_pix_div); + pll->vt_bk.pix_clk_div = best_pix_div; - pll->vt.sys_clk_freq_hz = - pll->pll_op_clk_freq_hz / pll->vt.sys_clk_div; - pll->vt.pix_clk_freq_hz = - pll->vt.sys_clk_freq_hz / pll->vt.pix_clk_div; + pll->vt_bk.sys_clk_freq_hz = + op_pll_fr->pll_op_clk_freq_hz / pll->vt_bk.sys_clk_div; + pll->vt_bk.pix_clk_freq_hz = + pll->vt_bk.sys_clk_freq_hz / pll->vt_bk.pix_clk_div; out_skip_vt_calc: pll->pixel_rate_csi = - op_pll->pix_clk_freq_hz * lane_op_clock_ratio; - pll->pixel_rate_pixel_array = pll->vt.pix_clk_freq_hz; + op_pll_bk->pix_clk_freq_hz * lane_op_clock_ratio; + pll->pixel_rate_pixel_array = pll->vt_bk.pix_clk_freq_hz; -return check_all_bounds (dev, limits, op_limits, pll, op_pll); +return check_all_bounds (dev, lim, op_lim_fr, op_lim_bk, pll, op_pll_fr, + op_pll_bk); } -int ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *limits, +int ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *lim,struct ccs_pll *pll) { -const struct ccs_pll_branch_limits *op_limits = &limits->op; -struct ccs_pll_branch *op_pll = &pll->op; -uint16_t min_pre_pll_clk_div; -uint16_t max_pre_pll_clk_div; +const struct ccs_pll_branch_limits_fr *op_lim_fr = &lim->vt_fr; +const struct ccs_pll_branch_limits_bk *op_lim_bk = &lim->op_bk; +struct ccs_pll_branch_fr *op_pll_fr = &pll->vt_fr; +struct ccs_pll_branch_bk *op_pll_bk = &pll->op_bk; +uint16_t min_op_pre_pll_clk_div; +uint16_t max_op_pre_pll_clk_div;uint32_t lane_op_clock_ratio;uint32_t mul, div;unsigned int i;
@@ -401,8 +409,9 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits,* instead. The OP values are ignored for the rest of * the PLL calculation. */ - op_limits = &limits->vt; - op_pll = &pll->vt; + op_lim_fr = &lim->vt_fr; + op_lim_bk = &lim->vt_bk; + op_pll_bk = &pll->vt_bk; }if (pll->flags &CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE )
@@ -417,11 +426,11 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits,switch (pll->bus_type) {case CCS_PLL_BUS_TYPE_CSI2 :/* CSI transfers 2 bits per clock per lane; thus times 2 */ - pll->pll_op_clk_freq_hz = pll->link_freq *2 + op_pll_fr->pll_op_clk_freq_hz = pll->link_freq *2 * (pll->csi2.lanes / lane_op_clock_ratio);break ;case CCS_PLL_BUS_TYPE_PARALLEL : - pll->pll_op_clk_freq_hz = pll->link_freq * pll->bits_per_pixel + op_pll_fr->pll_op_clk_freq_hz = pll->link_freq * pll->bits_per_pixel /DIV_ROUND_UP (pll->bits_per_pixel, pll->parallel.bus_width);break ;
@@ -429,39 +438,40 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *limits,return -EINVAL ; } -/* Figure out limits for pre-pll divider based on extclk */ -dev_dbg (dev,"min / max pre_pll_clk_div: %u / %u\n" , - limits->min_pre_pll_clk_div, limits->max_pre_pll_clk_div); - max_pre_pll_clk_div = -min_t (uint16_t, limits->max_pre_pll_clk_div, +/* Figure out limits for OP pre-pll divider based on extclk */ +dev_dbg (dev,"min / max op_pre_pll_clk_div: %u / %u\n" , + op_lim_fr->min_pre_pll_clk_div, op_lim_fr->max_pre_pll_clk_div); + max_op_pre_pll_clk_div = +min_t (uint16_t, op_lim_fr->max_pre_pll_clk_div,clk_div_even (pll->ext_clk_freq_hz / - limits->min_pll_ip_freq_hz)); - min_pre_pll_clk_div = -max_t (uint16_t, limits->min_pre_pll_clk_div, + op_lim_fr->min_pll_ip_clk_freq_hz)); + min_op_pre_pll_clk_div = +max_t (uint16_t, op_lim_fr->min_pre_pll_clk_div,clk_div_even_up (DIV_ROUND_UP (pll->ext_clk_freq_hz, - limits->max_pll_ip_freq_hz))); -dev_dbg (dev,"pre-pll check: min / max pre_pll_clk_div: %u / %u\n" , - min_pre_pll_clk_div, max_pre_pll_clk_div); + op_lim_fr->max_pll_ip_clk_freq_hz))); +dev_dbg (dev,"pre-pll check: min / max op_pre_pll_clk_div: %u / %u\n" , + min_op_pre_pll_clk_div, max_op_pre_pll_clk_div); - i =gcd (pll->pll_op_clk_freq_hz, pll->ext_clk_freq_hz); - mul = pll->pll_op_clk_freq_hz / i; + i =gcd (op_pll_fr->pll_op_clk_freq_hz, pll->ext_clk_freq_hz); + mul = op_pll_fr->pll_op_clk_freq_hz / i; div = pll->ext_clk_freq_hz / i;dev_dbg (dev,"mul %u / div %u\n" , mul, div); - min_pre_pll_clk_div = -max_t (uint16_t, min_pre_pll_clk_div, + min_op_pre_pll_clk_div = +max_t (uint16_t, min_op_pre_pll_clk_div,clk_div_even_up (DIV_ROUND_UP (mul * pll->ext_clk_freq_hz, - limits->max_pll_op_freq_hz))); -dev_dbg (dev,"pll_op check: min / max pre_pll_clk_div: %u / %u\n" , - min_pre_pll_clk_div, max_pre_pll_clk_div); - -for (pll->pre_pll_clk_div = min_pre_pll_clk_div; - pll->pre_pll_clk_div <= max_pre_pll_clk_div; - pll->pre_pll_clk_div +=2 - (pll->pre_pll_clk_div &1 )) { - rval =__ccs_pll_calculate (dev, limits, op_limits, pll, op_pll, - mul, div, lane_op_clock_ratio); + op_lim_fr->max_pll_op_clk_freq_hz))); +dev_dbg (dev,"pll_op check: min / max op_pre_pll_clk_div: %u / %u\n" , + min_op_pre_pll_clk_div, max_op_pre_pll_clk_div); + +for (op_pll_fr->pre_pll_clk_div = min_op_pre_pll_clk_div; + op_pll_fr->pre_pll_clk_div <= max_op_pre_pll_clk_div; + op_pll_fr->pre_pll_clk_div +=2 - (op_pll_fr->pre_pll_clk_div &1 )) { + rval =__ccs_pll_calculate (dev, lim, op_lim_fr, op_lim_bk, pll, + op_pll_fr, op_pll_bk, mul, div, + lane_op_clock_ratio);if (rval)continue ;
drivers/media/i2c/ccs-pll.h +26 -18
68 lines not on this page · raw message
drivers/media/i2c/ccs/ccs-core.c +37 -34
104 lines not on this page · raw message
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 58/106 ccs-pll: Use correct VT divisor for calculating VT SYS divisor
In reply to Sakari AilusUse the correct video timing divisor to calculate the SYS divisor. Instead of the current value, the minimum was used. This could have resulted in a too low SYS divisor.
--- drivers/media/i2c/ccs-pll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/i2c/ccs-pll.c +2 -2
@@ -365,14 +365,14 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,/* Check if this one is better. */ if (pix_div * sys_div - <=roundup (min_vt_div, best_pix_div)) + <=roundup (vt_div, best_pix_div)) best_pix_div = pix_div; }if (best_pix_div <INT_MAX >>1 )break ; } - pll->vt_bk.sys_clk_div =DIV_ROUND_UP (min_vt_div, best_pix_div); + pll->vt_bk.sys_clk_div =DIV_ROUND_UP (vt_div, best_pix_div); pll->vt_bk.pix_clk_div = best_pix_div; pll->vt_bk.sys_clk_freq_hz =
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 59/106 ccs-pll: End search if there are no better values available
In reply to Sakari AilusThe VT divisor search can be ended if we've already found the value that corresponds exactly the total divisor, as there are no better (lower) values available.
--- drivers/media/i2c/ccs-pll.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/media/i2c/ccs-pll.c +8 -2
@@ -352,6 +352,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, sys_div <= max_sys_div; sys_div += 2 - (sys_div & 1)) {uint16_t pix_div =DIV_ROUND_UP (vt_div, sys_div); +uint16_t rounded_div;if (pix_div < lim->vt_bk.min_pix_clk_div || pix_div > lim->vt_bk.max_pix_clk_div) {
@@ -363,10 +364,15 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,continue ; } + rounded_div =roundup (vt_div, best_pix_div); +/* Check if this one is better. */ -if (pix_div * sys_div - <=roundup (vt_div, best_pix_div)) +if (pix_div * sys_div <= rounded_div) best_pix_div = pix_div; + +/* Bail out if we've already found the best value. */ +if (vt_div == rounded_div) +break ; }if (best_pix_div <INT_MAX >>1 )break ;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 60/106 ccs-pll: Remove parallel bus support
In reply to Sakari AilusThe parallel bus PLL calculation has no users. Remove it.
--- drivers/media/i2c/ccs-pll.c | 5 ----- drivers/media/i2c/ccs-pll.h | 14 ++++---------- 2 files changed, 4 insertions(+), 15 deletions(-)
drivers/media/i2c/ccs-pll.c +0 -5
@@ -435,11 +435,6 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, op_pll_fr->pll_op_clk_freq_hz = pll->link_freq *2 * (pll->csi2.lanes / lane_op_clock_ratio);break ; -case CCS_PLL_BUS_TYPE_PARALLEL : - op_pll_fr->pll_op_clk_freq_hz = pll->link_freq * pll->bits_per_pixel - /DIV_ROUND_UP (pll->bits_per_pixel, - pll->parallel.bus_width); -break ;default :return -EINVAL ; }
drivers/media/i2c/ccs-pll.h +4 -10
@@ -13,8 +13,7 @@#define CCS_PLL_H /* CSI-2 or CCP-2 */ -#define CCS_PLL_BUS_TYPE_CSI2 0x00 -#define CCS_PLL_BUS_TYPE_PARALLEL 0x01 +#define CCS_PLL_BUS_TYPE_CSI2 0x00/* op pix clock is for all lanes in total normally */ #define CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE (1 << 0)
@@ -37,14 +36,9 @@ struct ccs_pll_branch_bk {struct ccs_pll {/* input values */ uint8_t bus_type; -union { -struct { -uint8_t lanes; - } csi2; -struct { -uint8_t bus_width; - } parallel; - }; +struct { +uint8_t lanes; + } csi2;unsigned long flags;uint8_t binning_horizontal;uint8_t binning_vertical;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 61/106 ccs-pll: Differentiate between CSI-2 D-PHY and C-PHY
In reply to Sakari AilusDifferentiate between CSI-2 D-PHY and C-PHY. This does not yet include support for C-PHY.
--- drivers/media/i2c/ccs-pll.c | 2 +- drivers/media/i2c/ccs-pll.h | 3 ++- drivers/media/i2c/ccs/ccs-core.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/media/i2c/ccs-pll.c +1 -1
@@ -430,7 +430,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, pll->binning_vertical);switch (pll->bus_type) { -case CCS_PLL_BUS_TYPE_CSI2 : +case CCS_PLL_BUS_TYPE_CSI2_DPHY :/* CSI transfers 2 bits per clock per lane; thus times 2 */ op_pll_fr->pll_op_clk_freq_hz = pll->link_freq *2 * (pll->csi2.lanes / lane_op_clock_ratio);
drivers/media/i2c/ccs-pll.h +2 -1
@@ -13,7 +13,8 @@#define CCS_PLL_H /* CSI-2 or CCP-2 */ -#define CCS_PLL_BUS_TYPE_CSI2 0x00 +#define CCS_PLL_BUS_TYPE_CSI2_DPHY 0x00 +#define CCS_PLL_BUS_TYPE_CSI2_CPHY 0x01/* op pix clock is for all lanes in total normally */ #define CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE (1 << 0)
drivers/media/i2c/ccs/ccs-core.c +1 -1
@@ -3192,7 +3192,7 @@ static int ccs_probe(struct i2c_client *client) sensor->scale_m =CCS_LIM (sensor,SCALER_N_MIN );/* prepare PLL configuration input values */ - sensor->pll.bus_type =CCS_PLL_BUS_TYPE_CSI2 ; + sensor->pll.bus_type =CCS_PLL_BUS_TYPE_CSI2_DPHY ; sensor->pll.csi2.lanes = sensor->hwcfg.lanes; sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN );
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 62/106 ccs-pll: Move the flags field down, away from 8-bit fields
In reply to Sakari AilusThis way the struct will use less memory, with better packing and no waste due to unsigned long.
--- drivers/media/i2c/ccs-pll.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ccs-pll.h +1 -1
@@ -40,12 +40,12 @@ struct ccs_pll {struct {uint8_t lanes; } csi2; -unsigned long flags;uint8_t binning_horizontal;uint8_t binning_vertical;uint8_t scale_m;uint8_t scale_n;uint8_t bits_per_pixel; +uint16_t flags;uint32_t link_freq;uint32_t ext_clk_freq_hz;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 63/106 ccs-pll: Document the structs in the header as well as the function
In reply to Sakari AilusThe CCS pll is used by the CCS driver at the moment, but documenting the interface makes sense. It's non-trivial and the calculator could be used elsewhere.
--- drivers/media/i2c/ccs-pll.h | 88 +++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)
drivers/media/i2c/ccs-pll.h +88 -0
@@ -20,6 +20,16 @@#define CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE (1 << 0)#define CCS_PLL_FLAG_NO_OP_CLOCKS (1 << 1) +/** +* struct ccs_pll_branch_fr - CCS PLL configuration (front) +* +* A single branch front-end of the CCS PLL tree. +* +* @pre_pll_clk_div: Pre-PLL clock divisor +* @pll_multiplier: PLL multiplier +* @pll_ip_freq_hz: PLL input clock frequency +* @pll_op_freq_hz: PLL output clock frequency +*/ struct ccs_pll_branch_fr {uint16_t pre_pll_clk_div;uint16_t pll_multiplier;
@@ -27,6 +37,16 @@ struct ccs_pll_branch_fr {uint32_t pll_op_clk_freq_hz; }; +/** +* struct ccs_pll_branch_bk - CCS PLL configuration (back) +* +* A single branch back-end of the CCS PLL tree. +* +* @sys_clk_div: System clock divider +* @pix_clk_div: Pixel clock divider +* @sys_clk_freq_hz: System clock frequency +* @pix_clk_freq_hz: Pixel clock frequency +*/ struct ccs_pll_branch_bk {uint16_t sys_clk_div;uint16_t pix_clk_div;
@@ -34,6 +54,29 @@ struct ccs_pll_branch_bk {uint32_t pix_clk_freq_hz; }; +/** +* struct ccs_pll - Full CCS PLL configuration +* +* All information required to calculate CCS PLL configuration. +* +* @bus_type: Type of the data bus, CCS_PLL_BUS_TYPE_* (input) +* @csi2.lanes: The number of the CSI-2 data lanes (input) +* @binning_vertical: Vertical binning factor (input) +* @binning_horizontal: Horizontal binning factor (input) +* @scale_m: Downscaling factor, M component, [16, max] (input) +* @scale_n: Downscaling factor, N component, typically 16 (input) +* @bits_per_pixel: Bits per pixel on the output data bus (input) +* @flags: CCS_PLL_FLAG_* (input) +* @link_freq: Chosen link frequency (input) +* @ext_clk_freq_hz: External clock frequency, i.e. the sensor's input clock +* (input) +* @vt_fr: Video timing front-end configuration (output) +* @vt_bk: Video timing back-end configuration (output) +* @op_bk: Operational timing back-end configuration (output) +* @pixel_rate_csi: Pixel rate on the output data bus (output) +* @pixel_rate_pixel_array: Nominal pixel rate in the sensor's pixel array +* (output) +*/ struct ccs_pll {/* input values */ uint8_t bus_type;
@@ -58,6 +101,18 @@ struct ccs_pll {uint32_t pixel_rate_pixel_array; }; +/** +* struct ccs_pll_branch_limits_fr - CCS PLL front-end limits +* +* @min_pre_pll_clk_div: Minimum pre-PLL clock divider +* @max_pre_pll_clk_div: Maximum pre-PLL clock divider +* @min_pll_ip_freq_hz: Minimum PLL input clock frequency +* @max_pll_ip_freq_hz: Maximum PLL input clock frequency +* @min_pll_multiplier: Minimum PLL multiplier +* @max_pll_multiplier: Maximum PLL multiplier +* @min_pll_op_freq_hz: Minimum PLL output clock frequency +* @max_pll_op_freq_hz: Maximum PLL output clock frequency +*/ struct ccs_pll_branch_limits_fr {uint16_t min_pre_pll_clk_div;uint16_t max_pre_pll_clk_div;
@@ -69,6 +124,18 @@ struct ccs_pll_branch_limits_fr {uint32_t max_pll_op_clk_freq_hz; }; +/** +* struct ccs_pll_branch_limits_bk - CCS PLL back-end limits +* +* @min_sys_clk_div: Minimum system clock divider +* @max_sys_clk_div: Maximum system clock divider +* @min_sys_clk_freq_hz: Minimum system clock frequency +* @max_sys_clk_freq_hz: Maximum system clock frequency +* @min_pix_clk_div: Minimum pixel clock divider +* @max_pix_clk_div: Maximum pixel clock divider +* @min_pix_clk_freq_hz: Minimum pixel clock frequency +* @max_pix_clk_freq_hz: Maximum pixel clock frequency +*/ struct ccs_pll_branch_limits_bk {uint16_t min_sys_clk_div;uint16_t max_sys_clk_div;
@@ -80,6 +147,17 @@ struct ccs_pll_branch_limits_bk {uint32_t max_pix_clk_freq_hz; }; +/** +* struct ccs_pll_limits - CCS PLL limits +* +* @min_ext_clk_freq_hz: Minimum external clock frequency +* @max_ext_clk_freq_hz: Maximum external clock frequency +* @vt_fr: Video timing front-end limits +* @vt_bk: Video timing back-end limits +* @op_bk: Operational timing back-end limits +* @min_line_length_pck_bin: Minimum line length in pixels, with binning +* @min_line_length_pck: Minimum line length in pixels without binning +*/ struct ccs_pll_limits {/* Strict PLL limits */ uint32_t min_ext_clk_freq_hz;
@@ -96,6 +174,16 @@ struct ccs_pll_limits {struct device ; +/** +* ccs_pll_calculate - Calculate CCS PLL configuration based on input parameters +* +* @dev: Device pointer, used for printing messages +* @limits: Limits specific to the sensor +* @pll: Given PLL configuration +* +* Calculate the CCS PLL configuration based on the limits as well as given +* device specific, system specific or user configured input data. +*/ int ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *limits,struct ccs_pll *pll);
Signature · 1 line
2.27.0
Re: [PATCH v2 063/106] ccs-pll: Document the structs in the header as well as the function
Em Wed, 7 Oct 2020 11:45:14 +0300
Sakari Ailus <[email protected]> escreveu:
Quoted 3 lines
The CCS pll is used by the CCS driver at the moment, but documenting the interface makes sense. It's non-trivial and the calculator could be used elsewhere.
LFTM.
It could make sense to add a .. kernel-doc:: markup at the documentation somewhere.
Regards,
Mauro
Quoted 137 lines
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/ccs-pll.h | 88 +++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)drivers/media/i2c/ccs-pll.h +81
-0@@ -20,6 +20,16 @@#define CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE (1 << 0)#define CCS_PLL_FLAG_NO_OP_CLOCKS (1 << 1) +/** +* struct ccs_pll_branch_fr - CCS PLL configuration (front) +* +* A single branch front-end of the CCS PLL tree. +* +* @pre_pll_clk_div: Pre-PLL clock divisor +* @pll_multiplier: PLL multiplier +* @pll_ip_freq_hz: PLL input clock frequency +* @pll_op_freq_hz: PLL output clock frequency +*/ struct ccs_pll_branch_fr {uint16_t pre_pll_clk_div;uint16_t pll_multiplier;@@ -27,6 +37,16 @@ struct ccs_pll_branch_fr {uint32_t pll_op_clk_freq_hz; }; +/** +* struct ccs_pll_branch_bk - CCS PLL configuration (back) +* +* A single branch back-end of the CCS PLL tree. +* +* @sys_clk_div: System clock divider +* @pix_clk_div: Pixel clock divider +* @sys_clk_freq_hz: System clock frequency +* @pix_clk_freq_hz: Pixel clock frequency +*/ struct ccs_pll_branch_bk {uint16_t sys_clk_div;uint16_t pix_clk_div;@@ -34,6 +54,29 @@ struct ccs_pll_branch_bk {uint32_t pix_clk_freq_hz; }; +/** +* struct ccs_pll - Full CCS PLL configuration +* +* All information required to calculate CCS PLL configuration. +* +* @bus_type: Type of the data bus, CCS_PLL_BUS_TYPE_* (input) +* @csi2.lanes: The number of the CSI-2 data lanes (input) +* @binning_vertical: Vertical binning factor (input) +* @binning_horizontal: Horizontal binning factor (input) +* @scale_m: Downscaling factor, M component, [16, max] (input) +* @scale_n: Downscaling factor, N component, typically 16 (input) +* @bits_per_pixel: Bits per pixel on the output data bus (input) +* @flags: CCS_PLL_FLAG_* (input) +* @link_freq: Chosen link frequency (input) +* @ext_clk_freq_hz: External clock frequency, i.e. the sensor's input clock +* (input) +* @vt_fr: Video timing front-end configuration (output) +* @vt_bk: Video timing back-end configuration (output) +* @op_bk: Operational timing back-end configuration (output) +* @pixel_rate_csi: Pixel rate on the output data bus (output) +* @pixel_rate_pixel_array: Nominal pixel rate in the sensor's pixel array +* (output) +*/ struct ccs_pll {/* input values */ uint8_t bus_type;@@ -58,6 +101,18 @@ struct ccs_pll {uint32_t pixel_rate_pixel_array; }; +/** +* struct ccs_pll_branch_limits_fr - CCS PLL front-end limits +* +* @min_pre_pll_clk_div: Minimum pre-PLL clock divider +* @max_pre_pll_clk_div: Maximum pre-PLL clock divider +* @min_pll_ip_freq_hz: Minimum PLL input clock frequency +* @max_pll_ip_freq_hz: Maximum PLL input clock frequency +* @min_pll_multiplier: Minimum PLL multiplier +* @max_pll_multiplier: Maximum PLL multiplier +* @min_pll_op_freq_hz: Minimum PLL output clock frequency +* @max_pll_op_freq_hz: Maximum PLL output clock frequency +*/ struct ccs_pll_branch_limits_fr {uint16_t min_pre_pll_clk_div;uint16_t max_pre_pll_clk_div;@@ -69,6 +124,18 @@ struct ccs_pll_branch_limits_fr {uint32_t max_pll_op_clk_freq_hz; }; +/** +* struct ccs_pll_branch_limits_bk - CCS PLL back-end limits +* +* @min_sys_clk_div: Minimum system clock divider +* @max_sys_clk_div: Maximum system clock divider +* @min_sys_clk_freq_hz: Minimum system clock frequency +* @max_sys_clk_freq_hz: Maximum system clock frequency +* @min_pix_clk_div: Minimum pixel clock divider +* @max_pix_clk_div: Maximum pixel clock divider +* @min_pix_clk_freq_hz: Minimum pixel clock frequency +* @max_pix_clk_freq_hz: Maximum pixel clock frequency +*/ struct ccs_pll_branch_limits_bk {uint16_t min_sys_clk_div;uint16_t max_sys_clk_div;@@ -80,6 +147,17 @@ struct ccs_pll_branch_limits_bk {uint32_t max_pix_clk_freq_hz; }; +/** +* struct ccs_pll_limits - CCS PLL limits +* +* @min_ext_clk_freq_hz: Minimum external clock frequency +* @max_ext_clk_freq_hz: Maximum external clock frequency +* @vt_fr: Video timing front-end limits +* @vt_bk: Video timing back-end limits +* @op_bk: Operational timing back-end limits +* @min_line_length_pck_bin: Minimum line length in pixels, with binning +* @min_line_length_pck: Minimum line length in pixels without binning +*/ struct ccs_pll_limits {/* Strict PLL limits */ uint32_t min_ext_clk_freq_hz;@@ -96,6 +174,16 @@ struct ccs_pll_limits {struct device ; +/** +* ccs_pll_calculate - Calculate CCS PLL configuration based on input parameters +*
drivers/media/i2c/ccs-pll.h struct ccs_pll_limits { · line 189
Quoted 10 lines
drivers/media/i2c/ccs-pll.h +7
-0+* @dev: Device pointer, used for printing messages +* @limits: Limits specific to the sensor +* @pll: Given PLL configuration +* +* Calculate the CCS PLL configuration based on the limits as well as given +* device specific, system specific or user configured input data. +*/ int ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *limits,struct ccs_pll *pll);
Thanks,
Mauro
Sakari Ailus
maintainerRe: [PATCH v2 063/106] ccs-pll: Document the structs in the header as well as the function
Hi Mauro,
Quoted 11 lines · Mauro Carvalho Chehab
Em Wed, 7 Oct 2020 11:45:14 +0300
Sakari Ailus <[email protected]> escreveu:Quoted 3 lines
The CCS pll is used by the CCS driver at the moment, but documenting the interface makes sense. It's non-trivial and the calculator could be used elsewhere.
LFTM.
It could make sense to add a .. kernel-doc:: markup at the documentation somewhere.
Thanks for the comments.
I've added additional patch later in the set to add this to the documentation build.
Signature · 1 line
Sakari Ailus
Sakari Ailus
maintainerPATCH v2 64/106 ccs-pll: Use the BIT macro
In reply to Sakari AilusUse the BIT macro for setting individual bits.
--- drivers/media/i2c/ccs-pll.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/i2c/ccs-pll.h +5 -2
@@ -12,13 +12,16 @@#ifndef CCS_PLL_H #define CCS_PLL_H +#include <linux/bits.h> +/* CSI-2 or CCP-2 */ #define CCS_PLL_BUS_TYPE_CSI2_DPHY 0x00#define CCS_PLL_BUS_TYPE_CSI2_CPHY 0x01 +/* Old SMIA and implementation specific flags */ /* op pix clock is for all lanes in total normally */ -#define CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE (1 << 0) -#define CCS_PLL_FLAG_NO_OP_CLOCKS (1 << 1) +#define CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE BIT(0) +#define CCS_PLL_FLAG_NO_OP_CLOCKS BIT(1)/** * struct ccs_pll_branch_fr - CCS PLL configuration (front)
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 65/106 ccs-pll: Begin calculation from OP system clock frequency
In reply to Sakari AilusThe OP system clock frequency defines the CSI-2 bus clock frequency, not the PLL output clock frequency. Both values were overwritten in the end, but the wrong limit value was used for the OP system clock frequency, possibly leading to too high frequencies being used.
Also remove now duplicated calculation of OP system clock frequency later in the PLL calculator.
--- drivers/media/i2c/ccs-pll.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/media/i2c/ccs-pll.c +4 -8
@@ -247,10 +247,6 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, op_pll_fr->pll_op_clk_freq_hz = op_pll_fr->pll_ip_clk_freq_hz * op_pll_fr->pll_multiplier; -/* Derive pll_op_clk_freq_hz. */ - op_pll_bk->sys_clk_freq_hz = - op_pll_fr->pll_op_clk_freq_hz / op_pll_bk->sys_clk_div; - op_pll_bk->pix_clk_div = pll->bits_per_pixel;dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll_bk->pix_clk_div);
@@ -432,7 +428,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,switch (pll->bus_type) {case CCS_PLL_BUS_TYPE_CSI2_DPHY :/* CSI transfers 2 bits per clock per lane; thus times 2 */ - op_pll_fr->pll_op_clk_freq_hz = pll->link_freq *2 + op_pll_bk->sys_clk_freq_hz = pll->link_freq *2 * (pll->csi2.lanes / lane_op_clock_ratio);break ;default :
@@ -454,8 +450,8 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,dev_dbg (dev,"pre-pll check: min / max op_pre_pll_clk_div: %u / %u\n" , min_op_pre_pll_clk_div, max_op_pre_pll_clk_div); - i =gcd (op_pll_fr->pll_op_clk_freq_hz, pll->ext_clk_freq_hz); - mul = op_pll_fr->pll_op_clk_freq_hz / i; + i =gcd (op_pll_bk->sys_clk_freq_hz, pll->ext_clk_freq_hz); + mul = op_pll_bk->sys_clk_freq_hz / i; div = pll->ext_clk_freq_hz / i;dev_dbg (dev,"mul %u / div %u\n" , mul, div);
@@ -463,7 +459,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,max_t (uint16_t, min_op_pre_pll_clk_div,clk_div_even_up (DIV_ROUND_UP (mul * pll->ext_clk_freq_hz, - op_lim_fr->max_pll_op_clk_freq_hz))); + op_lim_bk->max_sys_clk_freq_hz)));dev_dbg (dev,"pll_op check: min / max op_pre_pll_clk_div: %u / %u\n" , min_op_pre_pll_clk_div, max_op_pre_pll_clk_div);
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 66/106 ccs-pll: Fix condition for pre-PLL divider lower bound
In reply to Sakari AilusThe lower bound of the pre-PLL divider was calculated based on OP SYS clock frequency which is also affected by the OP SYS clock divider. This is wrong. The right clock frequency is that of the PLL output clock.
--- drivers/media/i2c/ccs-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ccs-pll.c +1 -1
@@ -459,7 +459,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,max_t (uint16_t, min_op_pre_pll_clk_div,clk_div_even_up (DIV_ROUND_UP (mul * pll->ext_clk_freq_hz, - op_lim_bk->max_sys_clk_freq_hz))); + op_lim_fr->max_pll_op_clk_freq_hz)));dev_dbg (dev,"pll_op check: min / max op_pre_pll_clk_div: %u / %u\n" , min_op_pre_pll_clk_div, max_op_pre_pll_clk_div);
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 67/106 ccs-pll: Avoid overflow in pre-PLL divisor lower bound search
In reply to Sakari AilusThe external clock frequency times the PLL multiplier may exceed the value range of 32-bit unsigned integers. Instead perform the same calculation y using two divisions.
The result has some potential to be different, but that's ok: this number is used to limit the range of pre-PLL divisors to find optimal values. So the effect of the rare case of a different result here would mean an invalid pre-PLL divisor is tried. That will be found out a little later in any case.
Also guard against dividing by zero if the external clock frequency is higher than the maximum OP PLL output clock --- a rather improbable case.
--- drivers/media/i2c/ccs-pll.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/media/i2c/ccs-pll.c +9 -2
@@ -40,6 +40,11 @@ static inline uint32_t is_one_or_even(uint32_t a)return 1 ; } +static inline uint32_t one_or_more (uint32_t a) +{ +return a ?:1 ; +} +static int bounds_check (struct device *dev,uint32_t val,uint32_t min,uint32_t max,char *str) {
@@ -458,8 +463,10 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, min_op_pre_pll_clk_div =max_t (uint16_t, min_op_pre_pll_clk_div,clk_div_even_up ( -DIV_ROUND_UP (mul * pll->ext_clk_freq_hz, - op_lim_fr->max_pll_op_clk_freq_hz))); + mul / +one_or_more ( +DIV_ROUND_UP (op_lim_fr->max_pll_op_clk_freq_hz, + pll->ext_clk_freq_hz))));dev_dbg (dev,"pll_op check: min / max op_pre_pll_clk_div: %u / %u\n" , min_op_pre_pll_clk_div, max_op_pre_pll_clk_div);
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 68/106 ccs-pll: Fix comment on check against maximum PLL multiplier
In reply to Sakari AilusThe comment is about minimum PLL multiplier but the related check really deals with the maximum PLL multiplier.
--- drivers/media/i2c/ccs-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ccs-pll.c +1 -1
@@ -203,7 +203,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, / div);dev_dbg (dev,"more_mul_max: max_op_sys_clk_div check: %u\n" , more_mul_max); -/* Ensure we won't go above min_pll_multiplier. */ +/* Ensure we won't go above max_pll_multiplier. */ more_mul_max =min (more_mul_max,DIV_ROUND_UP (op_lim_fr->max_pll_multiplier, mul)); dev_dbg(dev, "more_mul_max: min_pll_multiplier check: %u\n",
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 69/106 ccs-pll: Fix check for PLL multiplier upper bound
In reply to Sakari AilusThe additional multiplier (for higher VT timing) of the PLL multiplier was checked against the upper limit but the result was rounded up, possibly producing too high additional multiplier. Round down instead to keep within hardware limits.
--- drivers/media/i2c/ccs-pll.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/i2c/ccs-pll.c +1 -2
@@ -204,8 +204,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,dev_dbg (dev,"more_mul_max: max_op_sys_clk_div check: %u\n" , more_mul_max);/* Ensure we won't go above max_pll_multiplier. */ - more_mul_max =min (more_mul_max, -DIV_ROUND_UP (op_lim_fr->max_pll_multiplier, mul)); + more_mul_max =min (more_mul_max, op_lim_fr->max_pll_multiplier / mul);dev_dbg (dev,"more_mul_max: min_pll_multiplier check: %u\n" , more_mul_max);
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 70/106 ccs-pll: Use explicit 32-bit unsigned type
In reply to Sakari AilusUse uint32_t instead of unsigned int for a variable that contains explicitly 32-bit numbers.
--- drivers/media/i2c/ccs-pll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/i2c/ccs-pll.c +2 -2
@@ -177,7 +177,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,uint32_t more_mul_factor;uint32_t min_vt_div, max_vt_div, vt_div;uint32_t min_sys_div, max_sys_div; -unsigned int i; +uint32_t i;/* * Get pre_pll_clk_div so that our pll_op_clk_freq_hz won't be
@@ -406,7 +406,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,uint16_t max_op_pre_pll_clk_div;uint32_t lane_op_clock_ratio;uint32_t mul, div; -unsigned int i; +uint32_t i;int rval = -EINVAL ;if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) {
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 71/106 ccs-pll: Add support for lane speed model
In reply to Sakari AilusCCS PLL includes a capability to calculate the VT clocks on per-lane basis. Add support for this feature.
Move calculation of the pixel rate on the CSI-2 bus early in the function as everything needed to calculate it is already available.
--- drivers/media/i2c/ccs-pll.c | 36 +++++++++++++++++++++++++----------- drivers/media/i2c/ccs-pll.h | 6 ++++++ 2 files changed, 31 insertions(+), 11 deletions(-)
drivers/media/i2c/ccs-pll.c +25 -11
@@ -251,11 +251,12 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, op_pll_fr->pll_op_clk_freq_hz = op_pll_fr->pll_ip_clk_freq_hz * op_pll_fr->pll_multiplier; - op_pll_bk->pix_clk_div = pll->bits_per_pixel; -dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll_bk->pix_clk_div); - + op_pll_bk->pix_clk_div = pll->bits_per_pixel + * pll->op_lanes / pll->csi2.lanes; op_pll_bk->pix_clk_freq_hz = op_pll_bk->sys_clk_freq_hz / op_pll_bk->pix_clk_div; +dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll_bk->pix_clk_div); +if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) {/* No OP clocks --- VT clocks are used instead. */
@@ -283,15 +284,16 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,* divisors. One must make sure that horizontal blanking is * enough to accommodate the CSI-2 sync codes. * -* Take scaling factor into account as well. +* Take scaling factor and number of VT lanes into account as well. * * Find absolute limits for the factor of vt divider. */ dev_dbg (dev,"scale_m: %u\n" , pll->scale_m); min_vt_div =DIV_ROUND_UP (op_pll_bk->pix_clk_div - * op_pll_bk->sys_clk_div * pll->scale_n, - lane_op_clock_ratio * vt_op_binning_div - * pll->scale_m); + * op_pll_bk->sys_clk_div * pll->scale_n + * pll->vt_lanes, + pll->op_lanes * vt_op_binning_div + * pll->scale_m * lane_op_clock_ratio);/* Find smallest and biggest allowed vt divisor. */ dev_dbg (dev,"min_vt_div: %u\n" , min_vt_div);
@@ -387,9 +389,8 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, pll->vt_bk.sys_clk_freq_hz / pll->vt_bk.pix_clk_div; out_skip_vt_calc: - pll->pixel_rate_csi = - op_pll_bk->pix_clk_freq_hz * lane_op_clock_ratio; - pll->pixel_rate_pixel_array = pll->vt_bk.pix_clk_freq_hz; + pll->pixel_rate_pixel_array = + pll->vt_bk.pix_clk_freq_hz * pll->vt_lanes;return check_all_bounds (dev, lim, op_lim_fr, op_lim_bk, pll, op_pll_fr, op_pll_bk);
@@ -409,6 +410,13 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,uint32_t i;int rval = -EINVAL ; +if (!(pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL )) { + pll->op_lanes =1 ; + pll->vt_lanes =1 ; + } +dev_dbg (dev,"vt_lanes: %u\n" , pll->vt_lanes); +dev_dbg (dev,"op_lanes: %u\n" , pll->op_lanes); +if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) {/* * If there's no OP PLL at all, use the VT values
@@ -433,12 +441,18 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,case CCS_PLL_BUS_TYPE_CSI2_DPHY :/* CSI transfers 2 bits per clock per lane; thus times 2 */ op_pll_bk->sys_clk_freq_hz = pll->link_freq *2 - * (pll->csi2.lanes / lane_op_clock_ratio); + * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? +1 : pll->csi2.lanes) / lane_op_clock_ratio;break ;default :return -EINVAL ; } + pll->pixel_rate_csi = + op_pll_bk->pix_clk_freq_hz + * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? + pll->csi2.lanes :1 ) * lane_op_clock_ratio; +/* Figure out limits for OP pre-pll divider based on extclk */ dev_dbg (dev,"min / max op_pre_pll_clk_div: %u / %u\n" , op_lim_fr->min_pre_pll_clk_div, op_lim_fr->max_pre_pll_clk_div);
drivers/media/i2c/ccs-pll.h +6 -0
@@ -22,6 +22,8 @@/* op pix clock is for all lanes in total normally */ #define CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE BIT(0)#define CCS_PLL_FLAG_NO_OP_CLOCKS BIT(1) +/* CCS PLL flags */ +#define CCS_PLL_FLAG_LANE_SPEED_MODEL BIT(2)/** * struct ccs_pll_branch_fr - CCS PLL configuration (front)
@@ -63,6 +65,8 @@ struct ccs_pll_branch_bk {* All information required to calculate CCS PLL configuration. * * @bus_type: Type of the data bus, CCS_PLL_BUS_TYPE_* (input) +* @op_lanes: Number of operational lanes (input) +* @vt_lanes: Number of video timing lanes (input) * @csi2.lanes: The number of the CSI-2 data lanes (input) * @binning_vertical: Vertical binning factor (input) * @binning_horizontal: Horizontal binning factor (input)
@@ -83,6 +87,8 @@ struct ccs_pll_branch_bk {struct ccs_pll {/* input values */ uint8_t bus_type; +uint8_t op_lanes; +uint8_t vt_lanes;struct {uint8_t lanes; } csi2;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 72/106 ccs: Add support for lane speed model
In reply to Sakari AilusConvey the relevant PLL flags to the PLL calculator. Also the lane speed model affects how the link rate is calculated on the CSI-2 bus, as the rate is total of all lanes.
--- drivers/media/i2c/ccs/ccs-core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/media/i2c/ccs/ccs-core.c +10 -1
@@ -387,7 +387,9 @@ static int ccs_pll_configure(struct ccs_sensor *sensor)/* Lane op clock ratio does not apply here. */ rval =ccs_write (sensor,REQUESTED_LINK_RATE ,DIV_ROUND_UP (pll->op_bk.sys_clk_freq_hz, -1000000 /256 /256 )); +1000000 /256 /256 ) * + (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? + sensor->pll.csi2.lanes :1 ));if (rval <0 || sensor->pll.flags &CCS_PLL_FLAG_NO_OP_CLOCKS )return rval;
@@ -3194,6 +3196,13 @@ static int ccs_probe(struct i2c_client *client)/* prepare PLL configuration input values */ sensor->pll.bus_type =CCS_PLL_BUS_TYPE_CSI2_DPHY ; sensor->pll.csi2.lanes = sensor->hwcfg.lanes; +if (CCS_LIM (sensor,CLOCK_CALCULATION ) & +CCS_CLOCK_CALCULATION_LANE_SPEED ) { + sensor->pll.vt_lanes = +CCS_LIM (sensor,NUM_OF_VT_LANES ) +1 ; + sensor->pll.op_lanes = sensor->pll.vt_lanes; + sensor->pll.flags |=CCS_PLL_FLAG_LANE_SPEED_MODEL ; + } sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN );
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 73/106 ccs-pll: Add support for decoupled OP domain calculation
In reply to Sakari AilusAdd support for decoupled OP domain clock calculation. This means that the number of VT and OP domain clocks are no longer dependent on the number of CSI-2 lanes in the lane speed mode.
The support also replaces the existing quirk flag to calculate OP domain clocks per lane.
Also support decoupled OP domain calculation in the CCS driver.
--- drivers/media/i2c/ccs-pll.c | 22 +++++++--------------- drivers/media/i2c/ccs-pll.h | 1 + drivers/media/i2c/ccs/ccs-core.c | 14 +++++++++++--- drivers/media/i2c/ccs/ccs-quirk.c | 5 ++++- 4 files changed, 23 insertions(+), 19 deletions(-)
drivers/media/i2c/ccs-pll.c +7 -15
@@ -162,7 +162,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,const struct ccs_pll_branch_limits_bk *op_lim_bk, struct ccs_pll *pll, struct ccs_pll_branch_fr *op_pll_fr, struct ccs_pll_branch_bk *op_pll_bk, uint32_t mul, - uint32_t div, uint32_t lane_op_clock_ratio) + uint32_t div) { uint32_t sys_div;uint32_t best_pix_div =INT_MAX >>1 ;
@@ -194,7 +194,8 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,min_t (uint32_t, more_mul_max, op_lim_fr->max_pll_op_clk_freq_hz - / (pll->ext_clk_freq_hz / op_pll_fr->pre_pll_clk_div * mul)); + / (pll->ext_clk_freq_hz / + op_pll_fr->pre_pll_clk_div * mul));dev_dbg (dev,"more_mul_max: max_pll_op_clk_freq_hz check: %u\n" , more_mul_max);/* Don't go above the division capability of op sys clock divider. */
@@ -257,7 +258,6 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, op_pll_bk->sys_clk_freq_hz / op_pll_bk->pix_clk_div;dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll_bk->pix_clk_div); -if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) {/* No OP clocks --- VT clocks are used instead. */ goto out_skip_vt_calc;
@@ -293,7 +293,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,* op_pll_bk->sys_clk_div * pll->scale_n * pll->vt_lanes, pll->op_lanes * vt_op_binning_div -* pll->scale_m * lane_op_clock_ratio); +* pll->scale_m); /* Find smallest and biggest allowed vt divisor. */ dev_dbg (dev,"min_vt_div: %u\n" , min_vt_div);
@@ -405,7 +405,6 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,struct ccs_pll_branch_bk *op_pll_bk = &pll->op_bk;uint16_t min_op_pre_pll_clk_div;uint16_t max_op_pre_pll_clk_div; -uint32_t lane_op_clock_ratio;uint32_t mul, div;uint32_t i;int rval = -EINVAL ;
@@ -428,12 +427,6 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, op_pll_bk = &pll->vt_bk; } -if (pll->flags &CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE ) - lane_op_clock_ratio = pll->csi2.lanes; -else - lane_op_clock_ratio =1 ; -dev_dbg (dev,"lane_op_clock_ratio: %u\n" , lane_op_clock_ratio); -dev_dbg (dev,"binning: %ux%u\n" , pll->binning_horizontal, pll->binning_vertical);
@@ -442,7 +435,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,/* CSI transfers 2 bits per clock per lane; thus times 2 */ op_pll_bk->sys_clk_freq_hz = pll->link_freq *2 * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? -1 : pll->csi2.lanes) / lane_op_clock_ratio; +1 : pll->csi2.lanes);break ;default :return -EINVAL ;
@@ -451,7 +444,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, pll->pixel_rate_csi = op_pll_bk->pix_clk_freq_hz * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? - pll->csi2.lanes :1 ) * lane_op_clock_ratio; + pll->csi2.lanes :1 );/* Figure out limits for OP pre-pll divider based on extclk */ dev_dbg(dev, "min / max op_pre_pll_clk_div: %u / %u\n",
@@ -487,8 +480,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, op_pll_fr->pre_pll_clk_div <= max_op_pre_pll_clk_div; op_pll_fr->pre_pll_clk_div += 2 - (op_pll_fr->pre_pll_clk_div & 1)) { rval =__ccs_pll_calculate (dev, lim, op_lim_fr, op_lim_bk, pll, - op_pll_fr, op_pll_bk, mul, div, - lane_op_clock_ratio); + op_pll_fr, op_pll_bk, mul, div);if (rval)continue ;
drivers/media/i2c/ccs-pll.h +1 -0
@@ -24,6 +24,7 @@#define CCS_PLL_FLAG_NO_OP_CLOCKS BIT(1)/* CCS PLL flags */ #define CCS_PLL_FLAG_LANE_SPEED_MODEL BIT(2) +#define CCS_PLL_FLAG_LINK_DECOUPLED BIT(3)/** * struct ccs_pll_branch_fr - CCS PLL configuration (front)
drivers/media/i2c/ccs/ccs-core.c +11 -3
@@ -3198,10 +3198,18 @@ static int ccs_probe(struct i2c_client *client) sensor->pll.csi2.lanes = sensor->hwcfg.lanes;if (CCS_LIM (sensor,CLOCK_CALCULATION ) &CCS_CLOCK_CALCULATION_LANE_SPEED ) { - sensor->pll.vt_lanes = -CCS_LIM (sensor,NUM_OF_VT_LANES ) +1 ; - sensor->pll.op_lanes = sensor->pll.vt_lanes; sensor->pll.flags |=CCS_PLL_FLAG_LANE_SPEED_MODEL ; +if (CCS_LIM (sensor,CLOCK_CALCULATION ) & +CCS_CLOCK_CALCULATION_LINK_DECOUPLED ) { + sensor->pll.vt_lanes = +CCS_LIM (sensor,NUM_OF_VT_LANES ) +1 ; + sensor->pll.op_lanes = +CCS_LIM (sensor,NUM_OF_OP_LANES ) +1 ; + sensor->pll.flags |=CCS_PLL_FLAG_LINK_DECOUPLED ; + }else { + sensor->pll.vt_lanes = sensor->pll.csi2.lanes; + sensor->pll.op_lanes = sensor->pll.csi2.lanes; + } } sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN );
drivers/media/i2c/ccs/ccs-quirk.c +4 -1
@@ -190,7 +190,10 @@ static int jt8ev1_post_streamoff(struct ccs_sensor *sensor)static int jt8ev1_init (struct ccs_sensor *sensor) { - sensor->pll.flags |=CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE ; + sensor->pll.flags |=CCS_PLL_FLAG_LANE_SPEED_MODEL | +CCS_PLL_FLAG_LINK_DECOUPLED ; + sensor->pll.vt_lanes =1 ; + sensor->pll.op_lanes = sensor->pll.csi2.lanes;return 0 ; }
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 74/106 ccs-pll: Add support for extended input PLL clock divider
In reply to Sakari AilusCCS allows odd PLL dividers other than 1, granted that the corresponding capability bit is set. Support this both in the PLL calculator and the CCS driver.
--- drivers/media/i2c/ccs-pll.c | 4 +++- drivers/media/i2c/ccs-pll.h | 1 + drivers/media/i2c/ccs/ccs-core.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/media/i2c/ccs-pll.c +3 -1
@@ -478,7 +478,9 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,for (op_pll_fr->pre_pll_clk_div = min_op_pre_pll_clk_div; op_pll_fr->pre_pll_clk_div <= max_op_pre_pll_clk_div; - op_pll_fr->pre_pll_clk_div +=2 - (op_pll_fr->pre_pll_clk_div &1 )) { + op_pll_fr->pre_pll_clk_div += + (pll->flags &CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER ) ?1 : +2 - (op_pll_fr->pre_pll_clk_div &1 )) { rval =__ccs_pll_calculate (dev, lim, op_lim_fr, op_lim_bk, pll, op_pll_fr, op_pll_bk, mul, div);if (rval)
drivers/media/i2c/ccs-pll.h +1 -0
@@ -25,6 +25,7 @@/* CCS PLL flags */ #define CCS_PLL_FLAG_LANE_SPEED_MODEL BIT(2)#define CCS_PLL_FLAG_LINK_DECOUPLED BIT(3) +#define CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER BIT(4)/** * struct ccs_pll_branch_fr - CCS PLL configuration (front)
drivers/media/i2c/ccs/ccs-core.c +3 -0
@@ -3211,6 +3211,9 @@ static int ccs_probe(struct i2c_client *client) sensor->pll.op_lanes = sensor->pll.csi2.lanes; } } +if (CCS_LIM (sensor,CLOCK_TREE_PLL_CAPABILITY ) & +CCS_CLOCK_TREE_PLL_CAPABILITY_EXT_DIVIDER ) + sensor->pll.flags |=CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER ; sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN );
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 75/106 ccs-pll: Support two cycles per pixel on OP domain
In reply to Sakari AilusThe l parameter defines the number of clock cycles to process a single pixel per OP lane. It is calculated based on a new register op_bits_per_lane.
--- drivers/media/i2c/ccs-pll.c | 19 +++++++++++++------ drivers/media/i2c/ccs-pll.h | 2 ++ drivers/media/i2c/ccs/ccs-core.c | 1 + 3 files changed, 16 insertions(+), 6 deletions(-)
drivers/media/i2c/ccs-pll.c +13 -6
@@ -162,7 +162,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,const struct ccs_pll_branch_limits_bk *op_lim_bk, struct ccs_pll *pll, struct ccs_pll_branch_fr *op_pll_fr, struct ccs_pll_branch_bk *op_pll_bk, uint32_t mul, - uint32_t div) + uint32_t div, uint32_t l) { uint32_t sys_div;uint32_t best_pix_div =INT_MAX >>1 ;
@@ -252,10 +252,15 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, op_pll_fr->pll_op_clk_freq_hz = op_pll_fr->pll_ip_clk_freq_hz * op_pll_fr->pll_multiplier; - op_pll_bk->pix_clk_div = pll->bits_per_pixel - * pll->op_lanes / pll->csi2.lanes; +if (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ) + op_pll_bk->pix_clk_div = pll->bits_per_pixel + * pll->op_lanes / pll->csi2.lanes / l; +else + op_pll_bk->pix_clk_div = pll->bits_per_pixel / l; + op_pll_bk->pix_clk_freq_hz = op_pll_bk->sys_clk_freq_hz / op_pll_bk->pix_clk_div; +dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll_bk->pix_clk_div);if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) {
@@ -291,7 +296,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,dev_dbg (dev,"scale_m: %u\n" , pll->scale_m); min_vt_div =DIV_ROUND_UP (op_pll_bk->pix_clk_div * op_pll_bk->sys_clk_div * pll->scale_n - * pll->vt_lanes, + * pll->vt_lanes * l, pll->op_lanes * vt_op_binning_div * pll->scale_m);
@@ -406,6 +411,8 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,uint16_t min_op_pre_pll_clk_div;uint16_t max_op_pre_pll_clk_div;uint32_t mul, div; +uint32_t l = (!pll->op_bits_per_lane || + pll->op_bits_per_lane >= pll->bits_per_pixel) ?1 :2 ;uint32_t i;int rval = -EINVAL ;
@@ -444,7 +451,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, pll->pixel_rate_csi = op_pll_bk->pix_clk_freq_hz * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? - pll->csi2.lanes :1 ); + pll->csi2.lanes :1 ) / l;/* Figure out limits for OP pre-pll divider based on extclk */ dev_dbg(dev, "min / max op_pre_pll_clk_div: %u / %u\n",
@@ -482,7 +489,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, (pll->flags & CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER) ? 1 : 2 - (op_pll_fr->pre_pll_clk_div & 1)) { rval =__ccs_pll_calculate (dev, lim, op_lim_fr, op_lim_bk, pll, - op_pll_fr, op_pll_bk, mul, div); + op_pll_fr, op_pll_bk, mul, div, l);if (rval)continue ;
drivers/media/i2c/ccs-pll.h +2 -0
@@ -75,6 +75,7 @@ struct ccs_pll_branch_bk {* @scale_m: Downscaling factor, M component, [16, max] (input) * @scale_n: Downscaling factor, N component, typically 16 (input) * @bits_per_pixel: Bits per pixel on the output data bus (input) +* @op_bits_per_lane: Number of bits per OP lane (input) * @flags: CCS_PLL_FLAG_* (input) * @link_freq: Chosen link frequency (input) * @ext_clk_freq_hz: External clock frequency, i.e. the sensor's input clock
@@ -99,6 +100,7 @@ struct ccs_pll {uint8_t scale_m;uint8_t scale_n;uint8_t bits_per_pixel; +uint8_t op_bits_per_lane;uint16_t flags;uint32_t link_freq;uint32_t ext_clk_freq_hz;
drivers/media/i2c/ccs/ccs-core.c +1 -0
@@ -3214,6 +3214,7 @@ static int ccs_probe(struct i2c_client *client)if (CCS_LIM (sensor,CLOCK_TREE_PLL_CAPABILITY ) &CCS_CLOCK_TREE_PLL_CAPABILITY_EXT_DIVIDER ) sensor->pll.flags |=CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER ; + sensor->pll.op_bits_per_lane =CCS_LIM (sensor,OP_BITS_PER_LANE ); sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN );
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 76/106 ccs-pll: Add support flexible OP PLL pixel clock divider
In reply to Sakari AilusFlexible OP PLL pixel clock divider allows a higher OP pixel clock than what the bus can transfer. This generally makes it easier to select pixel clock dividers.
This changes how the pixel rate on the bus and minimum VT divisor are calculated, as the pixel rate is no longer directly determined by the OP pixel clock and the number of the lanes.
Also add a sanity check for sensors that do not support flexible OP PLL pixel clock divider. This could have caused the PLL calculator to come up with an invalid configuration for those devices.
--- drivers/media/i2c/ccs-pll.c | 26 +++++++++++++++++++------- drivers/media/i2c/ccs-pll.h | 1 + drivers/media/i2c/ccs/ccs-core.c | 4 +++- 3 files changed, 23 insertions(+), 8 deletions(-)
drivers/media/i2c/ccs-pll.c +19 -7
@@ -294,11 +294,11 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,* Find absolute limits for the factor of vt divider. */ dev_dbg (dev,"scale_m: %u\n" , pll->scale_m); - min_vt_div =DIV_ROUND_UP (op_pll_bk->pix_clk_div - * op_pll_bk->sys_clk_div * pll->scale_n - * pll->vt_lanes * l, - pll->op_lanes * vt_op_binning_div - * pll->scale_m); + min_vt_div =DIV_ROUND_UP (pll->bits_per_pixel * op_pll_bk->sys_clk_div + * pll->scale_n * pll->vt_lanes, + (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? + pll->csi2.lanes :1 ) + * vt_op_binning_div * pll->scale_m);/* Find smallest and biggest allowed vt divisor. */ dev_dbg (dev,"min_vt_div: %u\n" , min_vt_div);
@@ -420,6 +420,18 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, pll->op_lanes =1 ; pll->vt_lanes =1 ; } + +/* +* Make sure op_pix_clk_div will be integer --- unless flexible +* op_pix_clk_div is supported +*/ +if (!(pll->flags &CCS_PLL_FLAG_FLEXIBLE_OP_PIX_CLK_DIV ) && + (pll->bits_per_pixel * pll->op_lanes) % (pll->csi2.lanes * l)) { +dev_dbg (dev,"op_pix_clk_div not an integer (bpp %u, op lanes %u, lanes %u, l %u)\n" , + pll->bits_per_pixel, pll->op_lanes, pll->csi2.lanes, l); +return -EINVAL ; + } +dev_dbg (dev,"vt_lanes: %u\n" , pll->vt_lanes);dev_dbg (dev,"op_lanes: %u\n" , pll->op_lanes);
@@ -449,9 +461,9 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, } pll->pixel_rate_csi = - op_pll_bk->pix_clk_freq_hz + op_pll_bk->sys_clk_freq_hz * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? - pll->csi2.lanes :1 ) / l; + pll->csi2.lanes :1 ) / pll->bits_per_pixel / l;/* Figure out limits for OP pre-pll divider based on extclk */ dev_dbg(dev, "min / max op_pre_pll_clk_div: %u / %u\n",
drivers/media/i2c/ccs-pll.h +1 -0
@@ -26,6 +26,7 @@#define CCS_PLL_FLAG_LANE_SPEED_MODEL BIT(2)#define CCS_PLL_FLAG_LINK_DECOUPLED BIT(3)#define CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER BIT(4) +#define CCS_PLL_FLAG_FLEXIBLE_OP_PIX_CLK_DIV BIT(5)/** * struct ccs_pll_branch_fr - CCS PLL configuration (front)
drivers/media/i2c/ccs/ccs-core.c +3 -1
@@ -30,7 +30,6 @@#include <media/v4l2-device.h> #include "ccs.h" -#include "ccs-limits.h" #define CCS_ALIGN_DIM (dim, flags) \ ((flags) & V4L2_SEL_FLAG_GE \
@@ -3214,6 +3213,9 @@ static int ccs_probe(struct i2c_client *client)if (CCS_LIM (sensor,CLOCK_TREE_PLL_CAPABILITY ) &CCS_CLOCK_TREE_PLL_CAPABILITY_EXT_DIVIDER ) sensor->pll.flags |=CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER ; +if (CCS_LIM (sensor,CLOCK_TREE_PLL_CAPABILITY ) & +CCS_CLOCK_TREE_PLL_CAPABILITY_FLEXIBLE_OP_PIX_CLK_DIV ) + sensor->pll.flags |=CCS_PLL_FLAG_FLEXIBLE_OP_PIX_CLK_DIV ; sensor->pll.op_bits_per_lane =CCS_LIM (sensor,OP_BITS_PER_LANE ); sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN );
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 77/106 ccs-pll: Add sanity checks
In reply to Sakari AilusAdd sanity checks for fields that could cause division by zero.
--- drivers/media/i2c/ccs-pll.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/media/i2c/ccs-pll.c +9 -0
@@ -421,6 +421,15 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, pll->vt_lanes =1 ; } +if (!pll->op_lanes || !pll->vt_lanes || !pll->bits_per_pixel || + !pll->ext_clk_freq_hz || !pll->link_freq || !pll->scale_m || + !op_lim_fr->min_pll_ip_clk_freq_hz || + !op_lim_fr->max_pll_ip_clk_freq_hz || + !op_lim_fr->min_pll_op_clk_freq_hz || + !op_lim_fr->max_pll_op_clk_freq_hz || + !op_lim_bk->max_sys_clk_div || !op_lim_fr->max_pll_multiplier) +return -EINVAL ; +/* * Make sure op_pix_clk_div will be integer --- unless flexible * op_pix_clk_div is supported
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 78/106 ccs-pll: Add C-PHY support
In reply to Sakari AilusAdd C-PHY support for the CCS PLL calculator.
--- drivers/media/i2c/ccs-pll.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-)
drivers/media/i2c/ccs-pll.c +26 -9
@@ -145,6 +145,10 @@ static int check_all_bounds(struct device *dev,return rval; } +#define CPHY_CONST 7 +#define DPHY_CONST 16 +#define PHY_CONST_DIV 16 +/* * Heuristically guess the PLL tree for a given common multiplier and * divisor. Begin with the operational timing and continue to video
@@ -162,7 +166,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,const struct ccs_pll_branch_limits_bk *op_lim_bk, struct ccs_pll *pll, struct ccs_pll_branch_fr *op_pll_fr, struct ccs_pll_branch_bk *op_pll_bk, uint32_t mul, - uint32_t div, uint32_t l) + uint32_t div, uint32_t l, bool cphy, uint32_t phy_const) { uint32_t sys_div;uint32_t best_pix_div =INT_MAX >>1 ;
@@ -254,9 +258,11 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,if (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ) op_pll_bk->pix_clk_div = pll->bits_per_pixel - * pll->op_lanes / pll->csi2.lanes / l; + * pll->op_lanes * phy_const + /PHY_CONST_DIV / pll->csi2.lanes / l;else - op_pll_bk->pix_clk_div = pll->bits_per_pixel / l; + op_pll_bk->pix_clk_div = + pll->bits_per_pixel * phy_const /PHY_CONST_DIV / l; op_pll_bk->pix_clk_freq_hz = op_pll_bk->sys_clk_freq_hz / op_pll_bk->pix_clk_div;
@@ -295,10 +301,11 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,*/ dev_dbg (dev,"scale_m: %u\n" , pll->scale_m); min_vt_div =DIV_ROUND_UP (pll->bits_per_pixel * op_pll_bk->sys_clk_div - * pll->scale_n * pll->vt_lanes, + * pll->scale_n * pll->vt_lanes * phy_const, (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? pll->csi2.lanes :1 ) - * vt_op_binning_div * pll->scale_m); + * vt_op_binning_div * pll->scale_m + *PHY_CONST_DIV );/* Find smallest and biggest allowed vt divisor. */ dev_dbg (dev,"min_vt_div: %u\n" , min_vt_div);
@@ -408,6 +415,8 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,const struct ccs_pll_branch_limits_bk *op_lim_bk = &lim->op_bk;struct ccs_pll_branch_fr *op_pll_fr = &pll->vt_fr;struct ccs_pll_branch_bk *op_pll_bk = &pll->op_bk; +bool cphy = pll->bus_type ==CCS_PLL_BUS_TYPE_CSI2_CPHY ; +uint32_t phy_const = cphy ?CPHY_CONST :DPHY_CONST ;uint16_t min_op_pre_pll_clk_div;uint16_t max_op_pre_pll_clk_div;uint32_t mul, div;
@@ -465,14 +474,21 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ?1 : pll->csi2.lanes);break ; +case CCS_PLL_BUS_TYPE_CSI2_CPHY : + op_pll_bk->sys_clk_freq_hz = + pll->link_freq + * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? +1 : pll->csi2.lanes); +break ;default :return -EINVAL ; } pll->pixel_rate_csi = - op_pll_bk->sys_clk_freq_hz - * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? - pll->csi2.lanes :1 ) / pll->bits_per_pixel / l; +div_u64 ((uint64_t )op_pll_bk->sys_clk_freq_hz + * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? + pll->csi2.lanes :1 ) *PHY_CONST_DIV , + phy_const * pll->bits_per_pixel * l);/* Figure out limits for OP pre-pll divider based on extclk */ dev_dbg(dev, "min / max op_pre_pll_clk_div: %u / %u\n",
@@ -510,7 +526,8 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, (pll->flags & CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER) ? 1 : 2 - (op_pll_fr->pre_pll_clk_div & 1)) { rval =__ccs_pll_calculate (dev, lim, op_lim_fr, op_lim_bk, pll, - op_pll_fr, op_pll_bk, mul, div, l); + op_pll_fr, op_pll_bk, mul, div, l, + cphy, phy_const);if (rval)continue ;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 79/106 ccs-pll: Split off VT subtree calculation
In reply to Sakari AilusSplit off the VT sub clock tree calculation from the rest, into its own function. Also call the op_pll_fr argument pll_fr, since soon these may not be OP tree values.
This paves way for additional features in the future such as dual PLL support.
--- drivers/media/i2c/ccs-pll.c | 255 ++++++++++++++++++------------------ 1 file changed, 131 insertions(+), 124 deletions(-)
drivers/media/i2c/ccs-pll.c +131 -124
@@ -149,130 +149,18 @@ static int check_all_bounds(struct device *dev,#define DPHY_CONST 16#define PHY_CONST_DIV 16 -/* -* Heuristically guess the PLL tree for a given common multiplier and -* divisor. Begin with the operational timing and continue to video -* timing once operational timing has been verified. -* -* @mul is the PLL multiplier and @div is the common divisor -* (pre_pll_clk_div and op_sys_clk_div combined). The final PLL -* multiplier will be a multiple of @mul. -* -* @return Zero on success, error code on error. -*/ -static int -__ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *lim, -const struct ccs_pll_branch_limits_fr *op_lim_fr, -const struct ccs_pll_branch_limits_bk *op_lim_bk, -struct ccs_pll *pll,struct ccs_pll_branch_fr *op_pll_fr, -struct ccs_pll_branch_bk *op_pll_bk,uint32_t mul, -uint32_t div,uint32_t l,bool cphy,uint32_t phy_const) +static void +__ccs_pll_calculate_vt (struct device *dev,const struct ccs_pll_limits *lim, +const struct ccs_pll_branch_limits_bk *op_lim_bk, +struct ccs_pll *pll,struct ccs_pll_branch_fr *pll_fr, +struct ccs_pll_branch_bk *op_pll_bk,bool cphy, +uint32_t phy_const) {uint32_t sys_div;uint32_t best_pix_div =INT_MAX >>1 ;uint32_t vt_op_binning_div; -/* -* Higher multipliers (and divisors) are often required than -* necessitated by the external clock and the output clocks. -* There are limits for all values in the clock tree. These -* are the minimum and maximum multiplier for mul. -*/ -uint32_t more_mul_min, more_mul_max; -uint32_t more_mul_factor;uint32_t min_vt_div, max_vt_div, vt_div;uint32_t min_sys_div, max_sys_div; -uint32_t i; - -/* -* Get pre_pll_clk_div so that our pll_op_clk_freq_hz won't be -* too high. -*/ -dev_dbg (dev,"op_pre_pll_clk_div %u\n" , op_pll_fr->pre_pll_clk_div); - -/* Don't go above max pll multiplier. */ - more_mul_max = op_lim_fr->max_pll_multiplier / mul; -dev_dbg (dev,"more_mul_max: max_op_pll_multiplier check: %u\n" , - more_mul_max); -/* Don't go above max pll op frequency. */ - more_mul_max = -min_t (uint32_t, - more_mul_max, - op_lim_fr->max_pll_op_clk_freq_hz - / (pll->ext_clk_freq_hz / - op_pll_fr->pre_pll_clk_div * mul)); -dev_dbg (dev,"more_mul_max: max_pll_op_clk_freq_hz check: %u\n" , - more_mul_max); -/* Don't go above the division capability of op sys clock divider. */ - more_mul_max =min (more_mul_max, - op_lim_bk->max_sys_clk_div * op_pll_fr->pre_pll_clk_div - / div); -dev_dbg (dev,"more_mul_max: max_op_sys_clk_div check: %u\n" , - more_mul_max); -/* Ensure we won't go above max_pll_multiplier. */ - more_mul_max =min (more_mul_max, op_lim_fr->max_pll_multiplier / mul); -dev_dbg (dev,"more_mul_max: min_pll_multiplier check: %u\n" , - more_mul_max); - -/* Ensure we won't go below min_pll_op_clk_freq_hz. */ - more_mul_min =DIV_ROUND_UP (op_lim_fr->min_pll_op_clk_freq_hz, - pll->ext_clk_freq_hz / - op_pll_fr->pre_pll_clk_div * mul); -dev_dbg (dev,"more_mul_min: min_op_pll_op_clk_freq_hz check: %u\n" , - more_mul_min); -/* Ensure we won't go below min_pll_multiplier. */ - more_mul_min =max (more_mul_min, -DIV_ROUND_UP (op_lim_fr->min_pll_multiplier, mul)); -dev_dbg (dev,"more_mul_min: min_op_pll_multiplier check: %u\n" , - more_mul_min); - -if (more_mul_min > more_mul_max) { -dev_dbg (dev, -"unable to compute more_mul_min and more_mul_max\n" ); -return -EINVAL ; - } - - more_mul_factor =lcm (div, op_pll_fr->pre_pll_clk_div) / div; -dev_dbg (dev,"more_mul_factor: %u\n" , more_mul_factor); - more_mul_factor =lcm (more_mul_factor, op_lim_bk->min_sys_clk_div); -dev_dbg (dev,"more_mul_factor: min_op_sys_clk_div: %d\n" , - more_mul_factor); - i =roundup (more_mul_min, more_mul_factor); -if (!is_one_or_even (i)) - i <<=1 ; - -dev_dbg (dev,"final more_mul: %u\n" , i); -if (i > more_mul_max) { -dev_dbg (dev,"final more_mul is bad, max %u\n" , more_mul_max); -return -EINVAL ; - } - - op_pll_fr->pll_multiplier = mul * i; - op_pll_bk->sys_clk_div = div * i / op_pll_fr->pre_pll_clk_div; -dev_dbg (dev,"op_sys_clk_div: %u\n" , op_pll_bk->sys_clk_div); - - op_pll_fr->pll_ip_clk_freq_hz = pll->ext_clk_freq_hz - / op_pll_fr->pre_pll_clk_div; - - op_pll_fr->pll_op_clk_freq_hz = op_pll_fr->pll_ip_clk_freq_hz - * op_pll_fr->pll_multiplier; - -if (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ) - op_pll_bk->pix_clk_div = pll->bits_per_pixel - * pll->op_lanes * phy_const - /PHY_CONST_DIV / pll->csi2.lanes / l; -else - op_pll_bk->pix_clk_div = - pll->bits_per_pixel * phy_const /PHY_CONST_DIV / l; - - op_pll_bk->pix_clk_freq_hz = - op_pll_bk->sys_clk_freq_hz / op_pll_bk->pix_clk_div; - -dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll_bk->pix_clk_div); - -if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) { -/* No OP clocks --- VT clocks are used instead. */ - goto out_skip_vt_calc; - }/* * Some sensors perform analogue binning and some do this
@@ -310,7 +198,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,/* Find smallest and biggest allowed vt divisor. */ dev_dbg (dev,"min_vt_div: %u\n" , min_vt_div); min_vt_div =max (min_vt_div, -DIV_ROUND_UP (op_pll_fr->pll_op_clk_freq_hz, +DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, lim->vt_bk.max_pix_clk_freq_hz));dev_dbg (dev,"min_vt_div: max_vt_pix_clk_freq_hz: %u\n" , min_vt_div);
@@ -322,7 +210,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, max_vt_div = lim->vt_bk.max_sys_clk_div * lim->vt_bk.max_pix_clk_div;dev_dbg (dev,"max_vt_div: %u\n" , max_vt_div); max_vt_div =min (max_vt_div, -DIV_ROUND_UP (op_pll_fr->pll_op_clk_freq_hz, +DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, lim->vt_bk.min_pix_clk_freq_hz));dev_dbg (dev,"max_vt_div: min_vt_pix_clk_freq_hz: %u\n" , max_vt_div);
@@ -338,7 +226,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, lim->vt_bk.max_pix_clk_div));dev_dbg (dev,"min_sys_div: max_vt_pix_clk_div: %u\n" , min_sys_div); min_sys_div =max (min_sys_div, - op_pll_fr->pll_op_clk_freq_hz + pll_fr->pll_op_clk_freq_hz / lim->vt_bk.max_sys_clk_freq_hz);dev_dbg (dev,"min_sys_div: max_pll_op_clk_freq_hz: %u\n" , min_sys_div); min_sys_div =clk_div_even_up (min_sys_div);
@@ -351,7 +239,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, lim->vt_bk.min_pix_clk_div));dev_dbg (dev,"max_sys_div: min_vt_pix_clk_div: %u\n" , max_sys_div); max_sys_div =min (max_sys_div, -DIV_ROUND_UP (op_pll_fr->pll_op_clk_freq_hz, +DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, lim->vt_bk.min_pix_clk_freq_hz));dev_dbg (dev,"max_sys_div: min_vt_pix_clk_freq_hz: %u\n" , max_sys_div);
@@ -396,11 +284,130 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, pll->vt_bk.pix_clk_div = best_pix_div; pll->vt_bk.sys_clk_freq_hz = - op_pll_fr->pll_op_clk_freq_hz / pll->vt_bk.sys_clk_div; + pll_fr->pll_op_clk_freq_hz / pll->vt_bk.sys_clk_div; pll->vt_bk.pix_clk_freq_hz = pll->vt_bk.sys_clk_freq_hz / pll->vt_bk.pix_clk_div; +} + +/* +* Heuristically guess the PLL tree for a given common multiplier and +* divisor. Begin with the operational timing and continue to video +* timing once operational timing has been verified. +* +* @mul is the PLL multiplier and @div is the common divisor +* (pre_pll_clk_div and op_sys_clk_div combined). The final PLL +* multiplier will be a multiple of @mul. +* +* @return Zero on success, error code on error. +*/ +static int +__ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *lim, +const struct ccs_pll_branch_limits_fr *op_lim_fr, +const struct ccs_pll_branch_limits_bk *op_lim_bk, +struct ccs_pll *pll,struct ccs_pll_branch_fr *op_pll_fr, +struct ccs_pll_branch_bk *op_pll_bk,uint32_t mul, +uint32_t div,uint32_t l,bool cphy,uint32_t phy_const) +{ +/* +* Higher multipliers (and divisors) are often required than +* necessitated by the external clock and the output clocks. +* There are limits for all values in the clock tree. These +* are the minimum and maximum multiplier for mul. +*/ +uint32_t more_mul_min, more_mul_max; +uint32_t more_mul_factor; +uint32_t i; + +/* +* Get pre_pll_clk_div so that our pll_op_clk_freq_hz won't be +* too high. +*/ +dev_dbg (dev,"op_pre_pll_clk_div %u\n" , op_pll_fr->pre_pll_clk_div); + +/* Don't go above max pll multiplier. */ + more_mul_max = op_lim_fr->max_pll_multiplier / mul; +dev_dbg (dev,"more_mul_max: max_op_pll_multiplier check: %u\n" , + more_mul_max); +/* Don't go above max pll op frequency. */ + more_mul_max = +min_t (uint32_t, + more_mul_max, + op_lim_fr->max_pll_op_clk_freq_hz + / (pll->ext_clk_freq_hz / + op_pll_fr->pre_pll_clk_div * mul)); +dev_dbg (dev,"more_mul_max: max_pll_op_clk_freq_hz check: %u\n" , + more_mul_max); +/* Don't go above the division capability of op sys clock divider. */ + more_mul_max =min (more_mul_max, + op_lim_bk->max_sys_clk_div * op_pll_fr->pre_pll_clk_div + / div); +dev_dbg (dev,"more_mul_max: max_op_sys_clk_div check: %u\n" , + more_mul_max); +/* Ensure we won't go above max_pll_multiplier. */ + more_mul_max =min (more_mul_max, op_lim_fr->max_pll_multiplier / mul); +dev_dbg (dev,"more_mul_max: min_pll_multiplier check: %u\n" , + more_mul_max); + +/* Ensure we won't go below min_pll_op_clk_freq_hz. */ + more_mul_min =DIV_ROUND_UP (op_lim_fr->min_pll_op_clk_freq_hz, + pll->ext_clk_freq_hz / + op_pll_fr->pre_pll_clk_div * mul); +dev_dbg (dev,"more_mul_min: min_op_pll_op_clk_freq_hz check: %u\n" , + more_mul_min); +/* Ensure we won't go below min_pll_multiplier. */ + more_mul_min =max (more_mul_min, +DIV_ROUND_UP (op_lim_fr->min_pll_multiplier, mul)); +dev_dbg (dev,"more_mul_min: min_op_pll_multiplier check: %u\n" , + more_mul_min); + +if (more_mul_min > more_mul_max) { +dev_dbg (dev, +"unable to compute more_mul_min and more_mul_max\n" ); +return -EINVAL ; + } + + more_mul_factor =lcm (div, op_pll_fr->pre_pll_clk_div) / div; +dev_dbg (dev,"more_mul_factor: %u\n" , more_mul_factor); + more_mul_factor =lcm (more_mul_factor, op_lim_bk->min_sys_clk_div); +dev_dbg (dev,"more_mul_factor: min_op_sys_clk_div: %d\n" , + more_mul_factor); + i =roundup (more_mul_min, more_mul_factor); +if (!is_one_or_even (i)) + i <<=1 ; + +dev_dbg (dev,"final more_mul: %u\n" , i); +if (i > more_mul_max) { +dev_dbg (dev,"final more_mul is bad, max %u\n" , more_mul_max); +return -EINVAL ; + } + + op_pll_fr->pll_multiplier = mul * i; + op_pll_bk->sys_clk_div = div * i / op_pll_fr->pre_pll_clk_div; +dev_dbg (dev,"op_sys_clk_div: %u\n" , op_pll_bk->sys_clk_div); + + op_pll_fr->pll_ip_clk_freq_hz = pll->ext_clk_freq_hz + / op_pll_fr->pre_pll_clk_div; + + op_pll_fr->pll_op_clk_freq_hz = op_pll_fr->pll_ip_clk_freq_hz + * op_pll_fr->pll_multiplier; + +if (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ) + op_pll_bk->pix_clk_div = pll->bits_per_pixel + * pll->op_lanes * phy_const + /PHY_CONST_DIV / pll->csi2.lanes / l; +else + op_pll_bk->pix_clk_div = + pll->bits_per_pixel * phy_const /PHY_CONST_DIV / l; + + op_pll_bk->pix_clk_freq_hz = + op_pll_bk->sys_clk_freq_hz / op_pll_bk->pix_clk_div; + +dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll_bk->pix_clk_div); + +if (!(pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS )) +__ccs_pll_calculate_vt (dev, lim, op_lim_bk, pll, op_pll_fr, + op_pll_bk, cphy, phy_const); -out_skip_vt_calc: pll->pixel_rate_pixel_array = pll->vt_bk.pix_clk_freq_hz * pll->vt_lanes;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 80/106 ccs-pll: Check for derating and overrating, support non-derating sensors
In reply to Sakari AilusSome sensors support derating (VT domain speed faster than OP) or overrating (VT domain speed slower than OP). While this was supported for the driver, the hardware support for the feature was never verified. Do that now, and for those devices without that support, VT and OP speeds have to match.
--- drivers/media/i2c/ccs-pll.c | 84 +++++++++++++++++++++----------- drivers/media/i2c/ccs-pll.h | 2 + drivers/media/i2c/ccs/ccs-core.c | 7 +++ 3 files changed, 64 insertions(+), 29 deletions(-)
drivers/media/i2c/ccs-pll.c +55 -29
@@ -142,6 +142,18 @@ static int check_all_bounds(struct device *dev, lim->vt_bk.max_pix_clk_freq_hz, "vt_pix_clk_freq_hz"); +if (!(pll->flags &CCS_PLL_FLAG_FIFO_DERATING ) && + pll->pixel_rate_pixel_array > pll->pixel_rate_csi) { +dev_dbg (dev,"device does not support derating\n" ); +return -EINVAL ; + } + +if (!(pll->flags &CCS_PLL_FLAG_FIFO_OVERRATING ) && + pll->pixel_rate_pixel_array < pll->pixel_rate_csi) { +dev_dbg (dev,"device does not support overrating\n" ); +return -EINVAL ; + } +return rval; }
@@ -163,37 +175,51 @@ __ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,uint32_t min_sys_div, max_sys_div;/* -* Some sensors perform analogue binning and some do this -* digitally. The ones doing this digitally can be roughly be -* found out using this formula. The ones doing this digitally -* should run at higher clock rate, so smaller divisor is used -* on video timing side. +* Find out whether a sensor supports derating. If it does not, VT and +* OP domains are required to run at the same pixel rate. */ -if (lim->min_line_length_pck_bin > lim->min_line_length_pck - / pll->binning_horizontal) - vt_op_binning_div = pll->binning_horizontal; -else - vt_op_binning_div =1 ; -dev_dbg (dev,"vt_op_binning_div: %u\n" , vt_op_binning_div); +if (!(pll->flags &CCS_PLL_FLAG_FIFO_DERATING )) { + min_vt_div = + op_pll_bk->sys_clk_div * op_pll_bk->pix_clk_div + * pll->vt_lanes * phy_const + / pll->op_lanes /PHY_CONST_DIV ; + }else { +/* +* Some sensors perform analogue binning and some do this +* digitally. The ones doing this digitally can be roughly be +* found out using this formula. The ones doing this digitally +* should run at higher clock rate, so smaller divisor is used +* on video timing side. +*/ +if (lim->min_line_length_pck_bin > lim->min_line_length_pck + / pll->binning_horizontal) + vt_op_binning_div = pll->binning_horizontal; +else + vt_op_binning_div =1 ; +dev_dbg (dev,"vt_op_binning_div: %u\n" , vt_op_binning_div); -/* -* Profile 2 supports vt_pix_clk_div E [4, 10] -* -* Horizontal binning can be used as a base for difference in -* divisors. One must make sure that horizontal blanking is -* enough to accommodate the CSI-2 sync codes. -* -* Take scaling factor and number of VT lanes into account as well. -* -* Find absolute limits for the factor of vt divider. -*/ -dev_dbg (dev,"scale_m: %u\n" , pll->scale_m); - min_vt_div =DIV_ROUND_UP (pll->bits_per_pixel * op_pll_bk->sys_clk_div - * pll->scale_n * pll->vt_lanes * phy_const, - (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? - pll->csi2.lanes :1 ) - * vt_op_binning_div * pll->scale_m - *PHY_CONST_DIV ); +/* +* Profile 2 supports vt_pix_clk_div E [4, 10] +* +* Horizontal binning can be used as a base for difference in +* divisors. One must make sure that horizontal blanking is +* enough to accommodate the CSI-2 sync codes. +* +* Take scaling factor and number of VT lanes into account as well. +* +* Find absolute limits for the factor of vt divider. +*/ +dev_dbg (dev,"scale_m: %u\n" , pll->scale_m); + min_vt_div = +DIV_ROUND_UP (pll->bits_per_pixel + * op_pll_bk->sys_clk_div * pll->scale_n + * pll->vt_lanes * phy_const, + (pll->flags & +CCS_PLL_FLAG_LANE_SPEED_MODEL ? + pll->csi2.lanes :1 ) + * vt_op_binning_div * pll->scale_m + *PHY_CONST_DIV ); + }/* Find smallest and biggest allowed vt divisor. */ dev_dbg (dev,"min_vt_div: %u\n" , min_vt_div);
drivers/media/i2c/ccs-pll.h +2 -0
@@ -27,6 +27,8 @@#define CCS_PLL_FLAG_LINK_DECOUPLED BIT(3)#define CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER BIT(4)#define CCS_PLL_FLAG_FLEXIBLE_OP_PIX_CLK_DIV BIT(5) +#define CCS_PLL_FLAG_FIFO_DERATING BIT(6) +#define CCS_PLL_FLAG_FIFO_OVERRATING BIT(7)/** * struct ccs_pll_branch_fr - CCS PLL configuration (front)
drivers/media/i2c/ccs/ccs-core.c +7 -0
@@ -3216,6 +3216,13 @@ static int ccs_probe(struct i2c_client *client)if (CCS_LIM (sensor,CLOCK_TREE_PLL_CAPABILITY ) &CCS_CLOCK_TREE_PLL_CAPABILITY_FLEXIBLE_OP_PIX_CLK_DIV ) sensor->pll.flags |=CCS_PLL_FLAG_FLEXIBLE_OP_PIX_CLK_DIV ; +if (CCS_LIM (sensor,FIFO_SUPPORT_CAPABILITY ) & +CCS_FIFO_SUPPORT_CAPABILITY_DERATING ) + sensor->pll.flags |=CCS_PLL_FLAG_FIFO_DERATING ; +if (CCS_LIM (sensor,FIFO_SUPPORT_CAPABILITY ) & +CCS_FIFO_SUPPORT_CAPABILITY_DERATING_OVERRATING ) + sensor->pll.flags |=CCS_PLL_FLAG_FIFO_DERATING | +CCS_PLL_FLAG_FIFO_OVERRATING ; sensor->pll.op_bits_per_lane =CCS_LIM (sensor,OP_BITS_PER_LANE ); sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk; sensor->pll.scale_n =CCS_LIM (sensor,SCALER_N_MIN );
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 81/106 ccs-pll: Better separate OP and VT sub-tree calculation
In reply to Sakari AilusBetter separate OP PLL branch calculation from VT branch calculation.
--- drivers/media/i2c/ccs-pll.c | 54 +++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 23 deletions(-)
drivers/media/i2c/ccs-pll.c +31 -23
@@ -162,11 +162,11 @@ static int check_all_bounds(struct device *dev,#define PHY_CONST_DIV 16static void -__ccs_pll_calculate_vt (struct device *dev,const struct ccs_pll_limits *lim, -const struct ccs_pll_branch_limits_bk *op_lim_bk, -struct ccs_pll *pll,struct ccs_pll_branch_fr *pll_fr, -struct ccs_pll_branch_bk *op_pll_bk,bool cphy, -uint32_t phy_const) +ccs_pll_calculate_vt (struct device *dev,const struct ccs_pll_limits *lim, +const struct ccs_pll_branch_limits_bk *op_lim_bk, +struct ccs_pll *pll,struct ccs_pll_branch_fr *pll_fr, +struct ccs_pll_branch_bk *op_pll_bk,bool cphy, +uint32_t phy_const) {uint32_t sys_div;uint32_t best_pix_div =INT_MAX >>1 ;
@@ -174,6 +174,9 @@ __ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,uint32_t min_vt_div, max_vt_div, vt_div;uint32_t min_sys_div, max_sys_div; +if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) + goto out_calc_pixel_rate; +/* * Find out whether a sensor supports derating. If it does not, VT and * OP domains are required to run at the same pixel rate.
@@ -313,6 +316,10 @@ __ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim, pll_fr->pll_op_clk_freq_hz / pll->vt_bk.sys_clk_div; pll->vt_bk.pix_clk_freq_hz = pll->vt_bk.sys_clk_freq_hz / pll->vt_bk.pix_clk_div; + +out_calc_pixel_rate: + pll->pixel_rate_pixel_array = + pll->vt_bk.pix_clk_freq_hz * pll->vt_lanes; }/*
@@ -327,12 +334,12 @@ __ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,* @return Zero on success, error code on error. */ static int -__ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *lim, -const struct ccs_pll_branch_limits_fr *op_lim_fr, -const struct ccs_pll_branch_limits_bk *op_lim_bk, -struct ccs_pll *pll,struct ccs_pll_branch_fr *op_pll_fr, -struct ccs_pll_branch_bk *op_pll_bk,uint32_t mul, -uint32_t div,uint32_t l,bool cphy,uint32_t phy_const) +ccs_pll_calculate_op (struct device *dev,const struct ccs_pll_limits *lim, +const struct ccs_pll_branch_limits_fr *op_lim_fr, +const struct ccs_pll_branch_limits_bk *op_lim_bk, +struct ccs_pll *pll,struct ccs_pll_branch_fr *op_pll_fr, +struct ccs_pll_branch_bk *op_pll_bk,uint32_t mul, +uint32_t div,uint32_t l,bool cphy,uint32_t phy_const) {/* * Higher multipliers (and divisors) are often required than
@@ -430,15 +437,7 @@ __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll_bk->pix_clk_div); -if (!(pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS )) -__ccs_pll_calculate_vt (dev, lim, op_lim_bk, pll, op_pll_fr, - op_pll_bk, cphy, phy_const); - - pll->pixel_rate_pixel_array = - pll->vt_bk.pix_clk_freq_hz * pll->vt_lanes; - -return check_all_bounds (dev, lim, op_lim_fr, op_lim_bk, pll, op_pll_fr, - op_pll_bk); +return 0 ; } int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,
@@ -558,13 +557,22 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, op_pll_fr->pre_pll_clk_div += (pll->flags & CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER) ? 1 : 2 - (op_pll_fr->pre_pll_clk_div & 1)) { - rval =__ccs_pll_calculate (dev, lim, op_lim_fr, op_lim_bk, pll, - op_pll_fr, op_pll_bk, mul, div, l, - cphy, phy_const); + rval =ccs_pll_calculate_op (dev, lim, op_lim_fr, op_lim_bk, pll, + op_pll_fr, op_pll_bk, mul, div, l, + cphy, phy_const); +if (rval) +continue ; + +ccs_pll_calculate_vt (dev, lim, op_lim_bk, pll, op_pll_fr, + op_pll_bk, cphy, phy_const); + + rval =check_all_bounds (dev, lim, op_lim_fr, op_lim_bk, pll, + op_pll_fr, op_pll_bk);if (rval)continue ;print_pll (dev, pll); +return 0 ; }
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 82/106 ccs-pll: Print relevant information on PLL tree
In reply to Sakari AilusPrint information on PLL tree configuration based on the flags. This also adds support for printing dual PLL trees, and better separates between OP and VT PLL trees.
--- drivers/media/i2c/ccs-pll.c | 85 ++++++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 19 deletions(-)
drivers/media/i2c/ccs-pll.c +66 -19
@@ -56,28 +56,75 @@ static int bounds_check(struct device *dev, uint32_t val,return -EINVAL ; } -static void print_pll (struct device *dev,struct ccs_pll *pll) +#define PLL_OP 1 +#define PLL_VT 2 + +static const char *pll_string (unsigned int which) { -dev_dbg (dev,"pre_pll_clk_div\t%u\n" , pll->vt_fr.pre_pll_clk_div); -dev_dbg (dev,"pll_multiplier \t%u\n" , pll->vt_fr.pll_multiplier); -if (!(pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS )) { -dev_dbg (dev,"op_sys_clk_div \t%u\n" , pll->op_bk.sys_clk_div); -dev_dbg (dev,"op_pix_clk_div \t%u\n" , pll->op_bk.pix_clk_div); +switch (which) { +case PLL_OP : +return "op" ; +case PLL_VT : +return "vt" ; } -dev_dbg (dev,"vt_sys_clk_div \t%u\n" , pll->vt_bk.sys_clk_div); -dev_dbg (dev,"vt_pix_clk_div \t%u\n" , pll->vt_bk.pix_clk_div); - -dev_dbg (dev,"ext_clk_freq_hz \t%u\n" , pll->ext_clk_freq_hz); -dev_dbg (dev,"pll_ip_clk_freq_hz \t%u\n" , pll->vt_fr.pll_ip_clk_freq_hz); -dev_dbg (dev,"pll_op_clk_freq_hz \t%u\n" , pll->vt_fr.pll_op_clk_freq_hz); -if (!(pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS )) { -dev_dbg (dev,"op_sys_clk_freq_hz \t%u\n" , - pll->op_bk.sys_clk_freq_hz); -dev_dbg (dev,"op_pix_clk_freq_hz \t%u\n" , - pll->op_bk.pix_clk_freq_hz); + +return NULL ; +} + +#define PLL_FL (f) CCS_PLL_FLAG_##f + +static void print_pll (struct device *dev,struct ccs_pll *pll) +{ +const struct { +struct ccs_pll_branch_fr *fr; +struct ccs_pll_branch_bk *bk; +unsigned int which; + } branches[] = { + { &pll->vt_fr, &pll->vt_bk,PLL_VT }, + {NULL , &pll->op_bk,PLL_OP } + }, *br; +unsigned int i; + +dev_dbg (dev,"ext_clk_freq_hz\t\t%u\n" , pll->ext_clk_freq_hz); + +for (i =0 , br = branches; i <ARRAY_SIZE (branches); i++, br++) { +const char *s =pll_string (br->which); + +if (br->which ==PLL_VT ) { +dev_dbg (dev,"%s_pre_pll_clk_div\t\t%u\n" , s, + br->fr->pre_pll_clk_div); +dev_dbg (dev,"%s_pll_multiplier\t\t%u\n" , s, + br->fr->pll_multiplier); + +dev_dbg (dev,"%s_pll_ip_clk_freq_hz\t%u\n" , s, + br->fr->pll_ip_clk_freq_hz); +dev_dbg (dev,"%s_pll_op_clk_freq_hz\t%u\n" , s, + br->fr->pll_op_clk_freq_hz); + } + +if (!(pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) || + br->which ==PLL_VT ) { +dev_dbg (dev,"%s_sys_clk_div\t\t%u\n" , s, + br->bk->sys_clk_div); +dev_dbg (dev,"%s_pix_clk_div\t\t%u\n" , s, + br->bk->pix_clk_div); + +dev_dbg (dev,"%s_sys_clk_freq_hz\t%u\n" , s, + br->bk->sys_clk_freq_hz); +dev_dbg (dev,"%s_pix_clk_freq_hz\t%u\n" , s, + br->bk->pix_clk_freq_hz); + } } -dev_dbg (dev,"vt_sys_clk_freq_hz \t%u\n" , pll->vt_bk.sys_clk_freq_hz); -dev_dbg (dev,"vt_pix_clk_freq_hz \t%u\n" , pll->vt_bk.pix_clk_freq_hz); + +dev_dbg (dev,"flags%s%s%s%s%s%s\n" , + pll->flags &PLL_FL (LANE_SPEED_MODEL ) ?" lane-speed" :"" , + pll->flags &PLL_FL (LINK_DECOUPLED ) ?" link-decoupled" :"" , + pll->flags &PLL_FL (EXT_IP_PLL_DIVIDER ) ? +" ext-ip-pll-divider" :"" , + pll->flags &PLL_FL (FLEXIBLE_OP_PIX_CLK_DIV ) ? +" flexible-op-pix-div" :"" , + pll->flags &PLL_FL (FIFO_DERATING ) ?" fifo-derating" :"" , + pll->flags &PLL_FL (FIFO_OVERRATING ) ?" fifo-overrating" :"" ); } static int check_all_bounds(struct device *dev,
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 83/106 ccs-pll: Rework bounds checks
In reply to Sakari AilusRefactor bounds checks so that the caller can decide what to check. This allows doing the checks early, when the values are available.
This also adds front OP PLL configuration and limits.
--- drivers/media/i2c/ccs-pll.c | 148 ++++++++++++++++++++++-------------- drivers/media/i2c/ccs-pll.h | 2 + 2 files changed, 93 insertions(+), 57 deletions(-)
drivers/media/i2c/ccs-pll.c +91 -57
@@ -46,12 +46,14 @@ static inline uint32_t one_or_more(uint32_t a) }static int bounds_check (struct device *dev,uint32_t val, -uint32_t min,uint32_t max,char *str) +uint32_t min,uint32_t max,const char *prefix, +char *str) {if (val >= min && val <= max)return 0 ; -dev_dbg (dev,"%s out of bounds: %d (%d--%d)\n" , str, val, min, max); +dev_dbg (dev,"%s_%s out of bounds: %d (%d--%d)\n" , prefix, + str, val, min, max);return -EINVAL ; }
@@ -81,7 +83,7 @@ static void print_pll(struct device *dev, struct ccs_pll *pll)unsigned int which; } branches[] = { { &pll->vt_fr, &pll->vt_bk, PLL_VT }, - { NULL, &pll->op_bk, PLL_OP } + { &pll->op_fr, &pll->op_bk, PLL_OP } }, *br;unsigned int i;
@@ -127,68 +129,90 @@ static void print_pll(struct device *dev, struct ccs_pll *pll) pll->flags & PLL_FL(FIFO_OVERRATING) ? " fifo-overrating" : ""); } -static int check_all_bounds (struct device *dev, -const struct ccs_pll_limits *lim, -const struct ccs_pll_branch_limits_fr *op_lim_fr, -const struct ccs_pll_branch_limits_bk *op_lim_bk, -struct ccs_pll *pll, -struct ccs_pll_branch_fr *op_pll_fr, -struct ccs_pll_branch_bk *op_pll_bk) +static int check_fr_bounds (struct device *dev, +const struct ccs_pll_limits *lim, +struct ccs_pll *pll,unsigned int which) { +const struct ccs_pll_branch_limits_fr *lim_fr; +struct ccs_pll_branch_fr *pll_fr; +const char *s =pll_string (which);int rval; - rval =bounds_check (dev, op_pll_fr->pll_ip_clk_freq_hz, - op_lim_fr->min_pll_ip_clk_freq_hz, - op_lim_fr->max_pll_ip_clk_freq_hz, -"pll_ip_clk_freq_hz" ); -if (!rval) - rval =bounds_check ( - dev, op_pll_fr->pll_multiplier, - op_lim_fr->min_pll_multiplier, - op_lim_fr->max_pll_multiplier,"pll_multiplier" ); -if (!rval) - rval =bounds_check ( - dev, op_pll_fr->pll_op_clk_freq_hz, - op_lim_fr->min_pll_op_clk_freq_hz, - op_lim_fr->max_pll_op_clk_freq_hz,"pll_op_clk_freq_hz" ); +if (which ==PLL_OP ) { + lim_fr = &lim->op_fr; + pll_fr = &pll->op_fr; + }else { + lim_fr = &lim->vt_fr; + pll_fr = &pll->vt_fr; + } + + rval =bounds_check (dev, pll_fr->pre_pll_clk_div, + lim_fr->min_pre_pll_clk_div, + lim_fr->max_pre_pll_clk_div, s,"pre_pll_clk_div" ); +if (!rval) - rval =bounds_check ( - dev, op_pll_bk->sys_clk_div, - op_lim_bk->min_sys_clk_div, op_lim_bk->max_sys_clk_div, -"op_sys_clk_div" ); + rval =bounds_check (dev, pll_fr->pll_ip_clk_freq_hz, + lim_fr->min_pll_ip_clk_freq_hz, + lim_fr->max_pll_ip_clk_freq_hz, + s,"pll_ip_clk_freq_hz" );if (!rval) - rval =bounds_check ( - dev, op_pll_bk->sys_clk_freq_hz, - op_lim_bk->min_sys_clk_freq_hz, - op_lim_bk->max_sys_clk_freq_hz, -"op_sys_clk_freq_hz" ); + rval =bounds_check (dev, pll_fr->pll_multiplier, + lim_fr->min_pll_multiplier, + lim_fr->max_pll_multiplier, + s,"pll_multiplier" );if (!rval) - rval =bounds_check ( - dev, op_pll_bk->pix_clk_freq_hz, - op_lim_bk->min_pix_clk_freq_hz, - op_lim_bk->max_pix_clk_freq_hz, -"op_pix_clk_freq_hz" ); + rval =bounds_check (dev, pll_fr->pll_op_clk_freq_hz, + lim_fr->min_pll_op_clk_freq_hz, + lim_fr->max_pll_op_clk_freq_hz, + s,"pll_op_clk_freq_hz" ); -/* -* If there are no OP clocks, the VT clocks are contained in -* the OP clock struct. -*/ -if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) -return rval; +return rval; +} + +static int check_bk_bounds (struct device *dev, +const struct ccs_pll_limits *lim, +struct ccs_pll *pll,unsigned int which) +{ +const struct ccs_pll_branch_limits_bk *lim_bk; +struct ccs_pll_branch_bk *pll_bk; +const char *s =pll_string (which); +int rval; + +if (which ==PLL_OP ) { +if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) +return 0 ; + lim_bk = &lim->op_bk; + pll_bk = &pll->op_bk; + }else { + lim_bk = &lim->vt_bk; + pll_bk = &pll->vt_bk; + } + + rval =bounds_check (dev, pll_bk->sys_clk_div, + lim_bk->min_sys_clk_div, + lim_bk->max_sys_clk_div, s,"op_sys_clk_div" ); +if (!rval) + rval =bounds_check (dev, pll_bk->sys_clk_freq_hz, + lim_bk->min_sys_clk_freq_hz, + lim_bk->max_sys_clk_freq_hz, + s,"sys_clk_freq_hz" );if (!rval) - rval =bounds_check ( - dev, pll->vt_bk.sys_clk_freq_hz, - lim->vt_bk.min_sys_clk_freq_hz, - lim->vt_bk.max_sys_clk_freq_hz, -"vt_sys_clk_freq_hz" ); + rval =bounds_check (dev, pll_bk->sys_clk_div, + lim_bk->min_sys_clk_div, + lim_bk->max_sys_clk_div, + s,"sys_clk_div" );if (!rval) - rval =bounds_check ( - dev, pll->vt_bk.pix_clk_freq_hz, - lim->vt_bk.min_pix_clk_freq_hz, - lim->vt_bk.max_pix_clk_freq_hz, -"vt_pix_clk_freq_hz" ); + rval =bounds_check (dev, pll_bk->pix_clk_freq_hz, + lim_bk->min_pix_clk_freq_hz, + lim_bk->max_pix_clk_freq_hz, + s,"pix_clk_freq_hz" ); + +return rval; +} +static int check_ext_bounds (struct device *dev,struct ccs_pll *pll) +{if (!(pll->flags &CCS_PLL_FLAG_FIFO_DERATING ) && pll->pixel_rate_pixel_array > pll->pixel_rate_csi) {dev_dbg (dev,"device does not support derating\n" );
@@ -201,7 +225,7 @@ static int check_all_bounds(struct device *dev,return -EINVAL ; } -return rval; +return 0 ; }#define CPHY_CONST 7
@@ -610,11 +634,21 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,if (rval)continue ; + rval =check_fr_bounds (dev, lim, pll,PLL_VT ); +if (rval) +continue ; + + rval =check_bk_bounds (dev, lim, pll,PLL_OP ); +if (rval) +continue ; +ccs_pll_calculate_vt (dev, lim, op_lim_bk, pll, op_pll_fr, op_pll_bk, cphy, phy_const); - rval =check_all_bounds (dev, lim, op_lim_fr, op_lim_bk, pll, - op_pll_fr, op_pll_bk); + rval =check_bk_bounds (dev, lim, pll,PLL_VT ); +if (rval) +continue ; + rval =check_ext_bounds (dev, pll);if (rval)continue ;
drivers/media/i2c/ccs-pll.h +2 -0
@@ -111,6 +111,7 @@ struct ccs_pll {/* output values */ struct ccs_pll_branch_fr vt_fr;struct ccs_pll_branch_bk vt_bk; +struct ccs_pll_branch_fr op_fr;struct ccs_pll_branch_bk op_bk;uint32_t pixel_rate_csi;
@@ -181,6 +182,7 @@ struct ccs_pll_limits {struct ccs_pll_branch_limits_fr vt_fr;struct ccs_pll_branch_limits_bk vt_bk; +struct ccs_pll_branch_limits_fr op_fr;struct ccs_pll_branch_limits_bk op_bk;/* Other relevant limits */
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 84/106 ccs-pll: Make VT divisors 16-bit
In reply to Sakari AilusMake VT divisors 16-bit unsigned numbers. They don't need 32 bits after all.
--- drivers/media/i2c/ccs-pll.c | 51 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 26 deletions(-)
drivers/media/i2c/ccs-pll.c +25 -26
@@ -239,11 +239,11 @@ ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim, struct ccs_pll_branch_bk *op_pll_bk, bool cphy, uint32_t phy_const) { - uint32_t sys_div; -uint32_t best_pix_div =INT_MAX >>1 ; -uint32_t vt_op_binning_div; -uint32_t min_vt_div, max_vt_div, vt_div; -uint32_t min_sys_div, max_sys_div; + uint16_t sys_div; +uint16_t best_pix_div =SHRT_MAX >>1 ; +uint16_t vt_op_binning_div; +uint16_t min_vt_div, max_vt_div, vt_div; +uint16_t min_sys_div, max_sys_div;if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) goto out_calc_pixel_rate;
@@ -297,20 +297,19 @@ ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,/* Find smallest and biggest allowed vt divisor. */ dev_dbg (dev,"min_vt_div: %u\n" , min_vt_div); - min_vt_div =max (min_vt_div, -DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, - lim->vt_bk.max_pix_clk_freq_hz)); + min_vt_div =max_t (uint16_t, min_vt_div, +DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, + lim->vt_bk.max_pix_clk_freq_hz));dev_dbg (dev,"min_vt_div: max_vt_pix_clk_freq_hz: %u\n" , min_vt_div); - min_vt_div =max_t (uint32_t, min_vt_div, - lim->vt_bk.min_pix_clk_div - * lim->vt_bk.min_sys_clk_div); + min_vt_div =max_t (uint16_t, min_vt_div, lim->vt_bk.min_pix_clk_div + * lim->vt_bk.min_sys_clk_div);dev_dbg (dev,"min_vt_div: min_vt_clk_div: %u\n" , min_vt_div); max_vt_div = lim->vt_bk.max_sys_clk_div * lim->vt_bk.max_pix_clk_div;dev_dbg (dev,"max_vt_div: %u\n" , max_vt_div); - max_vt_div =min (max_vt_div, -DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, + max_vt_div =min_t (uint16_t, max_vt_div, +DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, lim->vt_bk.min_pix_clk_freq_hz));dev_dbg (dev,"max_vt_div: min_vt_pix_clk_freq_hz: %u\n" , max_vt_div);
@@ -321,26 +320,26 @@ ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,*/ min_sys_div = lim->vt_bk.min_sys_clk_div;dev_dbg (dev,"min_sys_div: %u\n" , min_sys_div); - min_sys_div =max (min_sys_div, -DIV_ROUND_UP (min_vt_div, - lim->vt_bk.max_pix_clk_div)); + min_sys_div =max_t (uint16_t, min_sys_div, +DIV_ROUND_UP (min_vt_div, + lim->vt_bk.max_pix_clk_div));dev_dbg (dev,"min_sys_div: max_vt_pix_clk_div: %u\n" , min_sys_div); - min_sys_div =max (min_sys_div, - pll_fr->pll_op_clk_freq_hz - / lim->vt_bk.max_sys_clk_freq_hz); + min_sys_div =max_t (uint16_t, min_sys_div, + pll_fr->pll_op_clk_freq_hz + / lim->vt_bk.max_sys_clk_freq_hz);dev_dbg (dev,"min_sys_div: max_pll_op_clk_freq_hz: %u\n" , min_sys_div); min_sys_div =clk_div_even_up (min_sys_div);dev_dbg (dev,"min_sys_div: one or even: %u\n" , min_sys_div); max_sys_div = lim->vt_bk.max_sys_clk_div;dev_dbg (dev,"max_sys_div: %u\n" , max_sys_div); - max_sys_div =min (max_sys_div, -DIV_ROUND_UP (max_vt_div, - lim->vt_bk.min_pix_clk_div)); + max_sys_div =min_t (uint16_t, max_sys_div, +DIV_ROUND_UP (max_vt_div, + lim->vt_bk.min_pix_clk_div));dev_dbg (dev,"max_sys_div: min_vt_pix_clk_div: %u\n" , max_sys_div); - max_sys_div =min (max_sys_div, -DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, - lim->vt_bk.min_pix_clk_freq_hz)); + max_sys_div =min_t (uint16_t, max_sys_div, +DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, + lim->vt_bk.min_pix_clk_freq_hz));dev_dbg (dev,"max_sys_div: min_vt_pix_clk_freq_hz: %u\n" , max_sys_div);/*
@@ -376,7 +375,7 @@ ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,if (vt_div == rounded_div)break ; } -if (best_pix_div <INT_MAX >>1 ) +if (best_pix_div <SHRT_MAX >>1 )break ; }
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 85/106 ccs-pll: Fix VT post-PLL divisor calculation
In reply to Sakari AilusThe PLL calculator only searched even total divisor values apart from one, but this is wrong: the total divisor is odd in cases where system divisor is one. Fix this by including odd total PLL values where system divisor is one to the search.
--- drivers/media/i2c/ccs-pll.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/media/i2c/ccs-pll.c +7 -5
@@ -347,14 +347,16 @@ ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,* into a value which is not smaller than div, the desired * divisor. */ -for (vt_div = min_vt_div; vt_div <= max_vt_div; - vt_div +=2 - (vt_div &1 )) { -for (sys_div = min_sys_div; - sys_div <= max_sys_div; +for (vt_div = min_vt_div; vt_div <= max_vt_div; vt_div++) { +uint16_t __max_sys_div = vt_div &1 ?1 : max_sys_div; + +for (sys_div = min_sys_div; sys_div <= __max_sys_div; sys_div +=2 - (sys_div &1 )) { -uint16_t pix_div =DIV_ROUND_UP (vt_div, sys_div); +uint16_t pix_div;uint16_t rounded_div; + pix_div =DIV_ROUND_UP (vt_div, sys_div); +if (pix_div < lim->vt_bk.min_pix_clk_div || pix_div > lim->vt_bk.max_pix_clk_div) { dev_dbg(dev,
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 86/106 ccs-pll: Separate VT divisor limit calculation from the rest
In reply to Sakari AilusSeparate VT divisor limit calculation from the rest of the VT PLL branch calculation. This way it can be used for dual PLL support as well.
--- drivers/media/i2c/ccs-pll.c | 64 +++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 27 deletions(-)
drivers/media/i2c/ccs-pll.c +37 -27
@@ -228,6 +228,41 @@ static int check_ext_bounds(struct device *dev, struct ccs_pll *pll)return 0 ; } +static void +ccs_pll_find_vt_sys_div (struct device *dev,const struct ccs_pll_limits *lim, +struct ccs_pll *pll,struct ccs_pll_branch_fr *pll_fr, +uint16_t min_vt_div,uint16_t max_vt_div, +uint16_t *min_sys_div,uint16_t *max_sys_div) +{ +/* +* Find limits for sys_clk_div. Not all values are possible with all +* values of pix_clk_div. +*/ + *min_sys_div = lim->vt_bk.min_sys_clk_div; +dev_dbg (dev,"min_sys_div: %u\n" , *min_sys_div); + *min_sys_div =max_t (uint16_t, *min_sys_div, +DIV_ROUND_UP (min_vt_div, + lim->vt_bk.max_pix_clk_div)); +dev_dbg (dev,"min_sys_div: max_vt_pix_clk_div: %u\n" , *min_sys_div); + *min_sys_div =max_t (uint16_t, *min_sys_div, + pll_fr->pll_op_clk_freq_hz + / lim->vt_bk.max_sys_clk_freq_hz); +dev_dbg (dev,"min_sys_div: max_pll_op_clk_freq_hz: %u\n" , *min_sys_div); + *min_sys_div =clk_div_even_up (*min_sys_div); +dev_dbg (dev,"min_sys_div: one or even: %u\n" , *min_sys_div); + + *max_sys_div = lim->vt_bk.max_sys_clk_div; +dev_dbg (dev,"max_sys_div: %u\n" , *max_sys_div); + *max_sys_div =min_t (uint16_t, *max_sys_div, +DIV_ROUND_UP (max_vt_div, + lim->vt_bk.min_pix_clk_div)); +dev_dbg (dev,"max_sys_div: min_vt_pix_clk_div: %u\n" , *max_sys_div); + *max_sys_div =min_t (uint16_t, *max_sys_div, +DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, + lim->vt_bk.min_pix_clk_freq_hz)); +dev_dbg (dev,"max_sys_div: min_vt_pix_clk_freq_hz: %u\n" , *max_sys_div); +} +#define CPHY_CONST 7#define DPHY_CONST 16#define PHY_CONST_DIV 16
@@ -314,33 +349,8 @@ ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,dev_dbg (dev,"max_vt_div: min_vt_pix_clk_freq_hz: %u\n" , max_vt_div); -/* -* Find limitsits for sys_clk_div. Not all values are possible -* with all values of pix_clk_div. -*/ - min_sys_div = lim->vt_bk.min_sys_clk_div; -dev_dbg (dev,"min_sys_div: %u\n" , min_sys_div); - min_sys_div =max_t (uint16_t, min_sys_div, -DIV_ROUND_UP (min_vt_div, - lim->vt_bk.max_pix_clk_div)); -dev_dbg (dev,"min_sys_div: max_vt_pix_clk_div: %u\n" , min_sys_div); - min_sys_div =max_t (uint16_t, min_sys_div, - pll_fr->pll_op_clk_freq_hz - / lim->vt_bk.max_sys_clk_freq_hz); -dev_dbg (dev,"min_sys_div: max_pll_op_clk_freq_hz: %u\n" , min_sys_div); - min_sys_div =clk_div_even_up (min_sys_div); -dev_dbg (dev,"min_sys_div: one or even: %u\n" , min_sys_div); - - max_sys_div = lim->vt_bk.max_sys_clk_div; -dev_dbg (dev,"max_sys_div: %u\n" , max_sys_div); - max_sys_div =min_t (uint16_t, max_sys_div, -DIV_ROUND_UP (max_vt_div, - lim->vt_bk.min_pix_clk_div)); -dev_dbg (dev,"max_sys_div: min_vt_pix_clk_div: %u\n" , max_sys_div); - max_sys_div =min_t (uint16_t, max_sys_div, -DIV_ROUND_UP (pll_fr->pll_op_clk_freq_hz, - lim->vt_bk.min_pix_clk_freq_hz)); -dev_dbg (dev,"max_sys_div: min_vt_pix_clk_freq_hz: %u\n" , max_sys_div); +ccs_pll_find_vt_sys_div (dev, lim, pll, pll_fr, min_vt_div, + max_vt_div, &min_sys_div, &max_sys_div);/* * Find pix_div such that a legal pix_div * sys_div results
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 87/106 ccs-pll: Add trivial dual PLL support
In reply to Sakari AilusAdd support for sensors that have separate VT and OP domain PLLs.
This support is trivial in the sense that it aims for the same VT pixel rate than that on the CSI-2 bus. The vast majority of sensors is better supported by higher frequencies in VT domain in binned and possibly scaled configurations.
--- drivers/media/i2c/ccs-pll.c | 217 ++++++++++++++++++++++++++++++++---- drivers/media/i2c/ccs-pll.h | 1 + 2 files changed, 196 insertions(+), 22 deletions(-)
drivers/media/i2c/ccs-pll.c +195 -22
@@ -92,7 +92,8 @@ static void print_pll(struct device *dev, struct ccs_pll *pll)for (i =0 , br = branches; i <ARRAY_SIZE (branches); i++, br++) {const char *s =pll_string (br->which); -if (br->which ==PLL_VT ) { +if (pll->flags &CCS_PLL_FLAG_DUAL_PLL || + br->which ==PLL_VT ) {dev_dbg (dev,"%s_pre_pll_clk_div\t\t%u\n" , s, br->fr->pre_pll_clk_div); dev_dbg(dev, "%s_pll_multiplier\t\t%u\n", s,
@@ -118,7 +119,7 @@ static void print_pll(struct device *dev, struct ccs_pll *pll) } } - dev_dbg(dev, "flags%s%s%s%s%s%s\n", + dev_dbg(dev, "flags%s%s%s%s%s%s%s\n", pll->flags & PLL_FL(LANE_SPEED_MODEL) ? " lane-speed" : "", pll->flags & PLL_FL(LINK_DECOUPLED) ? " link-decoupled" : "", pll->flags & PLL_FL(EXT_IP_PLL_DIVIDER) ?
@@ -126,7 +127,8 @@ static void print_pll(struct device *dev, struct ccs_pll *pll) pll->flags &PLL_FL (FLEXIBLE_OP_PIX_CLK_DIV ) ?" flexible-op-pix-div" :"" , pll->flags &PLL_FL (FIFO_DERATING ) ?" fifo-derating" :"" , - pll->flags & PLL_FL(FIFO_OVERRATING) ? " fifo-overrating" : ""); + pll->flags &PLL_FL (FIFO_OVERRATING ) ?" fifo-overrating" :"" , + pll->flags & PLL_FL(DUAL_PLL) ? " dual-pll" : ""); } static int check_fr_bounds(struct device *dev,
@@ -267,6 +269,152 @@ ccs_pll_find_vt_sys_div(struct device *dev, const struct ccs_pll_limits *lim,#define DPHY_CONST 16#define PHY_CONST_DIV 16 +static inline int +__ccs_pll_calculate_vt_tree (struct device *dev, +const struct ccs_pll_limits *lim, +struct ccs_pll *pll,uint32_t mul,uint32_t div) +{ +const struct ccs_pll_branch_limits_fr *lim_fr = &lim->vt_fr; +const struct ccs_pll_branch_limits_bk *lim_bk = &lim->vt_bk; +struct ccs_pll_branch_fr *pll_fr = &pll->vt_fr; +struct ccs_pll_branch_bk *pll_bk = &pll->vt_bk; +uint32_t more_mul; +uint16_t best_pix_div =SHRT_MAX >>1 , best_div; +uint16_t vt_div, min_sys_div, max_sys_div, sys_div; + + pll_fr->pll_ip_clk_freq_hz = + pll->ext_clk_freq_hz / pll_fr->pre_pll_clk_div; + +dev_dbg (dev,"vt_pll_ip_clk_freq_hz %u\n" , pll_fr->pll_ip_clk_freq_hz); + + more_mul =one_or_more (DIV_ROUND_UP (lim_fr->min_pll_op_clk_freq_hz, + pll_fr->pll_ip_clk_freq_hz * mul)); + +dev_dbg (dev,"more_mul: %u\n" , more_mul); + more_mul *=DIV_ROUND_UP (lim_fr->min_pll_multiplier, mul * more_mul); +dev_dbg (dev,"more_mul2: %u\n" , more_mul); + + pll_fr->pll_multiplier = mul * more_mul; + +if (pll_fr->pll_multiplier * pll_fr->pll_ip_clk_freq_hz > + lim_fr->max_pll_op_clk_freq_hz) +return -EINVAL ; + + pll_fr->pll_op_clk_freq_hz = + pll_fr->pll_ip_clk_freq_hz * pll_fr->pll_multiplier; + + vt_div = div * more_mul; + +ccs_pll_find_vt_sys_div (dev, lim, pll, pll_fr, vt_div, vt_div, + &min_sys_div, &max_sys_div); + + max_sys_div = (vt_div &1 ) ?1 : max_sys_div; + +dev_dbg (dev,"vt min/max_sys_div: %u,%u\n" , min_sys_div, max_sys_div); + +for (sys_div = min_sys_div; sys_div <= max_sys_div; + sys_div +=2 - (sys_div &1 )) { +uint16_t pix_div; + +if (vt_div % sys_div) +continue ; + + pix_div = vt_div / sys_div; + +if (pix_div < lim_bk->min_pix_clk_div || + pix_div > lim_bk->max_pix_clk_div) { +dev_dbg (dev, +"pix_div %u too small or too big (%u--%u)\n" , + pix_div, + lim_bk->min_pix_clk_div, + lim_bk->max_pix_clk_div); +continue ; + } + +if (pix_div * sys_div <= best_div) { + best_pix_div = pix_div; + best_div = pix_div * sys_div; + } + } +if (best_pix_div ==SHRT_MAX >>1 ) +return -EINVAL ; + + pll_bk->sys_clk_div = best_div / best_pix_div; + pll_bk->pix_clk_div = best_pix_div; + + pll_bk->sys_clk_freq_hz = + pll_fr->pll_op_clk_freq_hz / pll_bk->sys_clk_div; + pll_bk->pix_clk_freq_hz = + pll_bk->sys_clk_freq_hz / pll_bk->pix_clk_div; + + pll->pixel_rate_pixel_array = + pll_bk->pix_clk_freq_hz * pll->vt_lanes; + +return 0 ; +} + +static int ccs_pll_calculate_vt_tree (struct device *dev, +const struct ccs_pll_limits *lim, +struct ccs_pll *pll) +{ +const struct ccs_pll_branch_limits_fr *lim_fr = &lim->vt_fr; +struct ccs_pll_branch_fr *pll_fr = &pll->vt_fr; +uint16_t min_pre_pll_clk_div = lim_fr->min_pre_pll_clk_div; +uint16_t max_pre_pll_clk_div = lim_fr->max_pre_pll_clk_div; +uint32_t pre_mul, pre_div; + + pre_div =gcd (pll->pixel_rate_csi, + pll->ext_clk_freq_hz * pll->vt_lanes); + pre_mul = pll->pixel_rate_csi / pre_div; + pre_div = pll->ext_clk_freq_hz * pll->vt_lanes / pre_div; + +/* Make sure PLL input frequency is within limits */ + max_pre_pll_clk_div = +min_t (uint16_t, max_pre_pll_clk_div, +DIV_ROUND_UP (pll->ext_clk_freq_hz, + lim_fr->min_pll_ip_clk_freq_hz)); + + min_pre_pll_clk_div =max_t (uint16_t, min_pre_pll_clk_div, + pll->ext_clk_freq_hz / + lim_fr->max_pll_ip_clk_freq_hz); + +dev_dbg (dev,"vt min/max_pre_pll_clk_div: %u,%u\n" , + min_pre_pll_clk_div, max_pre_pll_clk_div); + +for (pll_fr->pre_pll_clk_div = min_pre_pll_clk_div; + pll_fr->pre_pll_clk_div <= max_pre_pll_clk_div; + pll_fr->pre_pll_clk_div += + (pll->flags &CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER ) ?1 : +2 - (pll_fr->pre_pll_clk_div &1 )) { +uint32_t mul, div; +int rval; + + div =gcd (pre_mul * pll_fr->pre_pll_clk_div, pre_div); + mul = pre_mul * pll_fr->pre_pll_clk_div / div; + div = pre_div / div; + +dev_dbg (dev,"vt pre-div/mul/div: %u,%u,%u\n" , + pll_fr->pre_pll_clk_div, mul, div); + + rval =__ccs_pll_calculate_vt_tree (dev, lim, pll, + mul, div); +if (rval) +continue ; + + rval =check_fr_bounds (dev, lim, pll,PLL_VT ); +if (rval) +continue ; + + rval =check_bk_bounds (dev, lim, pll,PLL_VT ); +if (rval) +continue ; + +return 0 ; + } + +return -EINVAL ; +} + static void ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim, const struct ccs_pll_branch_limits_bk *op_lim_bk,
@@ -525,10 +673,10 @@ ccs_pll_calculate_op(struct device *dev, const struct ccs_pll_limits *lim,int ccs_pll_calculate (struct device *dev,const struct ccs_pll_limits *lim,struct ccs_pll *pll) { -const struct ccs_pll_branch_limits_fr *op_lim_fr = &lim->vt_fr; -const struct ccs_pll_branch_limits_bk *op_lim_bk = &lim->op_bk; -struct ccs_pll_branch_fr *op_pll_fr = &pll->vt_fr; -struct ccs_pll_branch_bk *op_pll_bk = &pll->op_bk; +const struct ccs_pll_branch_limits_fr *op_lim_fr; +const struct ccs_pll_branch_limits_bk *op_lim_bk; +struct ccs_pll_branch_fr *op_pll_fr; +struct ccs_pll_branch_bk *op_pll_bk;bool cphy = pll->bus_type ==CCS_PLL_BUS_TYPE_CSI2_CPHY ;uint32_t phy_const = cphy ?CPHY_CONST :DPHY_CONST ;uint16_t min_op_pre_pll_clk_div;
@@ -544,6 +692,28 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, pll->vt_lanes =1 ; } +if (pll->flags &CCS_PLL_FLAG_DUAL_PLL ) { + op_lim_fr = &lim->op_fr; + op_lim_bk = &lim->op_bk; + op_pll_fr = &pll->op_fr; + op_pll_bk = &pll->op_bk; + }else if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) { +/* +* If there's no OP PLL at all, use the VT values +* instead. The OP values are ignored for the rest of +* the PLL calculation. +*/ + op_lim_fr = &lim->vt_fr; + op_lim_bk = &lim->vt_bk; + op_pll_fr = &pll->vt_fr; + op_pll_bk = &pll->vt_bk; + }else { + op_lim_fr = &lim->vt_fr; + op_lim_bk = &lim->op_bk; + op_pll_fr = &pll->vt_fr; + op_pll_bk = &pll->op_bk; + } + if (!pll->op_lanes || !pll->vt_lanes || !pll->bits_per_pixel || !pll->ext_clk_freq_hz || !pll->link_freq || !pll->scale_m || !op_lim_fr->min_pll_ip_clk_freq_hz ||
@@ -567,17 +737,6 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,dev_dbg (dev,"vt_lanes: %u\n" , pll->vt_lanes);dev_dbg (dev,"op_lanes: %u\n" , pll->op_lanes); -if (pll->flags &CCS_PLL_FLAG_NO_OP_CLOCKS ) { -/* -* If there's no OP PLL at all, use the VT values -* instead. The OP values are ignored for the rest of -* the PLL calculation. -*/ - op_lim_fr = &lim->vt_fr; - op_lim_bk = &lim->vt_bk; - op_pll_bk = &pll->vt_bk; - } -dev_dbg (dev,"binning: %ux%u\n" , pll->binning_horizontal, pll->binning_vertical);
@@ -653,6 +812,9 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,if (rval)continue ; +if (pll->flags &CCS_PLL_FLAG_DUAL_PLL ) +break ; +ccs_pll_calculate_vt (dev, lim, op_lim_bk, pll, op_pll_fr, op_pll_bk, cphy, phy_const);
@@ -663,14 +825,25 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,if (rval)continue ; -print_pll (dev, pll); +break ; + } + +if (rval) { +dev_dbg (dev,"unable to compute pre_pll divisor\n" ); -return 0 ; +return rval; } -dev_dbg (dev,"unable to compute pre_pll divisor\n" ); +if (pll->flags &CCS_PLL_FLAG_DUAL_PLL ) { + rval =ccs_pll_calculate_vt_tree (dev, lim, pll); -return rval; +if (rval) +return rval; + } + +print_pll (dev, pll); + +return 0 ; }EXPORT_SYMBOL_GPL (ccs_pll_calculate);
drivers/media/i2c/ccs-pll.h +1 -0
@@ -29,6 +29,7 @@#define CCS_PLL_FLAG_FLEXIBLE_OP_PIX_CLK_DIV BIT(5)#define CCS_PLL_FLAG_FIFO_DERATING BIT(6)#define CCS_PLL_FLAG_FIFO_OVERRATING BIT(7) +#define CCS_PLL_FLAG_DUAL_PLL BIT(8)/** * struct ccs_pll_branch_fr - CCS PLL configuration (front)
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 88/106 ccs: Dual PLL support
In reply to Sakari AilusAdd support for sensors that either require dual PLL or support single or dual PLL but use dual PLL as default.
Use sensor default configuration for sensors that support both modes.
--- drivers/media/i2c/ccs-pll.c | 9 +++++-- drivers/media/i2c/ccs/ccs-core.c | 45 +++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 3 deletions(-)
drivers/media/i2c/ccs-pll.c +7 -2
@@ -331,7 +331,10 @@ __ccs_pll_calculate_vt_tree(struct device *dev,continue ; } -if (pix_div * sys_div <= best_div) { +dev_dbg (dev,"sys/pix/best_pix: %u,%u,%u\n" , sys_div, pix_div, + best_pix_div); + +if (pix_div * sys_div <= best_pix_div) { best_pix_div = pix_div; best_div = pix_div * sys_div; }
@@ -804,7 +807,9 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,if (rval)continue ; - rval =check_fr_bounds (dev, lim, pll,PLL_VT ); + rval =check_fr_bounds (dev, lim, pll, + pll->flags &CCS_PLL_FLAG_DUAL_PLL ? +PLL_OP :PLL_VT );if (rval)continue ;
drivers/media/i2c/ccs/ccs-core.c +44 -1
63 lines not on this page · raw message
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 89/106 ccs-pll: Add support for DDR OP system and pixel clocks
In reply to Sakari AilusAdd support for dual data rate operational system and pixel clocks. This is implemented using two PLL flags.
--- drivers/media/i2c/ccs-pll.c | 64 +++++++++++++++++++++++++------------ drivers/media/i2c/ccs-pll.h | 2 ++ 2 files changed, 46 insertions(+), 20 deletions(-)
drivers/media/i2c/ccs-pll.c +44 -20
@@ -119,7 +119,7 @@ static void print_pll(struct device *dev, struct ccs_pll *pll) } } - dev_dbg(dev, "flags%s%s%s%s%s%s%s\n", + dev_dbg(dev, "flags%s%s%s%s%s%s%s%s%s\n", pll->flags & PLL_FL(LANE_SPEED_MODEL) ? " lane-speed" : "", pll->flags & PLL_FL(LINK_DECOUPLED) ? " link-decoupled" : "", pll->flags & PLL_FL(EXT_IP_PLL_DIVIDER) ?
@@ -128,7 +128,19 @@ static void print_pll(struct device *dev, struct ccs_pll *pll) " flexible-op-pix-div" : "", pll->flags &PLL_FL (FIFO_DERATING ) ?" fifo-derating" :"" , pll->flags &PLL_FL (FIFO_OVERRATING ) ?" fifo-overrating" :"" , - pll->flags & PLL_FL(DUAL_PLL) ? " dual-pll" : ""); + pll->flags &PLL_FL (DUAL_PLL ) ?" dual-pll" :"" , + pll->flags &PLL_FL (OP_SYS_DDR ) ?" op-sys-ddr" :"" , + pll->flags & PLL_FL(OP_PIX_DDR) ? " op-pix-ddr" : ""); +} + +static uint32_t op_sys_ddr (uint32_t flags) +{ +return flags &CCS_PLL_FLAG_OP_SYS_DDR ?1 :0 ; +} + +static uint32_t op_pix_ddr (uint32_t flags) +{ +return flags &CCS_PLL_FLAG_OP_PIX_DDR ?1 :0 ; } static int check_fr_bounds(struct device *dev,
@@ -441,8 +453,8 @@ ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,if (!(pll->flags &CCS_PLL_FLAG_FIFO_DERATING )) { min_vt_div = op_pll_bk->sys_clk_div * op_pll_bk->pix_clk_div - * pll->vt_lanes * phy_const - / pll->op_lanes /PHY_CONST_DIV ; + * pll->vt_lanes * phy_const / pll->op_lanes + / (PHY_CONST_DIV <<op_pix_ddr (pll->flags)); }else {/* * Some sensors perform analogue binning and some do this
@@ -478,7 +490,7 @@ ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,CCS_PLL_FLAG_LANE_SPEED_MODEL ? pll->csi2.lanes : 1) * vt_op_binning_div * pll->scale_m - * PHY_CONST_DIV); + * PHY_CONST_DIV << op_pix_ddr(pll->flags)); }/* Find smallest and biggest allowed vt divisor. */
@@ -572,7 +584,8 @@ ccs_pll_calculate_op(struct device *dev, const struct ccs_pll_limits *lim,const struct ccs_pll_branch_limits_bk *op_lim_bk, struct ccs_pll *pll, struct ccs_pll_branch_fr *op_pll_fr, struct ccs_pll_branch_bk *op_pll_bk, uint32_t mul, - uint32_t div, uint32_t l, bool cphy, uint32_t phy_const) + uint32_t div, uint32_t op_sys_clk_freq_hz_sdr, uint32_t l, + bool cphy, uint32_t phy_const) {/* * Higher multipliers (and divisors) are often required than
@@ -658,15 +671,22 @@ ccs_pll_calculate_op(struct device *dev, const struct ccs_pll_limits *lim, * op_pll_fr->pll_multiplier;if (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ) - op_pll_bk->pix_clk_div = pll->bits_per_pixel - * pll->op_lanes * phy_const - /PHY_CONST_DIV / pll->csi2.lanes / l; + op_pll_bk->pix_clk_div = + (pll->bits_per_pixel + * pll->op_lanes * (phy_const <<op_sys_ddr (pll->flags)) + /PHY_CONST_DIV / pll->csi2.lanes / l) + >>op_pix_ddr (pll->flags);else op_pll_bk->pix_clk_div = - pll->bits_per_pixel * phy_const /PHY_CONST_DIV / l; + (pll->bits_per_pixel + * (phy_const <<op_sys_ddr (pll->flags)) + /PHY_CONST_DIV / l) >>op_pix_ddr (pll->flags); op_pll_bk->pix_clk_freq_hz = - op_pll_bk->sys_clk_freq_hz / op_pll_bk->pix_clk_div; + (op_sys_clk_freq_hz_sdr >>op_pix_ddr (pll->flags)) + / op_pll_bk->pix_clk_div; + op_pll_bk->sys_clk_freq_hz = + op_sys_clk_freq_hz_sdr >>op_sys_ddr (pll->flags);dev_dbg (dev,"op_pix_clk_div: %u\n" , op_pll_bk->pix_clk_div);
@@ -682,6 +702,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,struct ccs_pll_branch_bk *op_pll_bk;bool cphy = pll->bus_type ==CCS_PLL_BUS_TYPE_CSI2_CPHY ;uint32_t phy_const = cphy ?CPHY_CONST :DPHY_CONST ; +uint32_t op_sys_clk_freq_hz_sdr;uint16_t min_op_pre_pll_clk_div;uint16_t max_op_pre_pll_clk_div;uint32_t mul, div;
@@ -731,7 +752,8 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,* op_pix_clk_div is supported */ if (!(pll->flags &CCS_PLL_FLAG_FLEXIBLE_OP_PIX_CLK_DIV ) && - (pll->bits_per_pixel * pll->op_lanes) % (pll->csi2.lanes * l)) { + (pll->bits_per_pixel * pll->op_lanes) % + (pll->csi2.lanes * l <<op_pix_ddr (pll->flags))) {dev_dbg (dev,"op_pix_clk_div not an integer (bpp %u, op lanes %u, lanes %u, l %u)\n" , pll->bits_per_pixel, pll->op_lanes, pll->csi2.lanes, l);return -EINVAL ;
@@ -746,12 +768,12 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,switch (pll->bus_type) {case CCS_PLL_BUS_TYPE_CSI2_DPHY :/* CSI transfers 2 bits per clock per lane; thus times 2 */ - op_pll_bk->sys_clk_freq_hz = pll->link_freq *2 + op_sys_clk_freq_hz_sdr = pll->link_freq *2 * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ?1 : pll->csi2.lanes);break ;case CCS_PLL_BUS_TYPE_CSI2_CPHY : - op_pll_bk->sys_clk_freq_hz = + op_sys_clk_freq_hz_sdr = pll->link_freq * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ?1 : pll->csi2.lanes);
@@ -761,7 +783,7 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, } pll->pixel_rate_csi = -div_u64 ((uint64_t )op_pll_bk->sys_clk_freq_hz +div_u64 ((uint64_t )op_sys_clk_freq_hz_sdr * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? pll->csi2.lanes :1 ) *PHY_CONST_DIV , phy_const * pll->bits_per_pixel * l);
@@ -781,9 +803,10 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,dev_dbg (dev,"pre-pll check: min / max op_pre_pll_clk_div: %u / %u\n" , min_op_pre_pll_clk_div, max_op_pre_pll_clk_div); - i =gcd (op_pll_bk->sys_clk_freq_hz, pll->ext_clk_freq_hz); - mul = op_pll_bk->sys_clk_freq_hz / i; - div = pll->ext_clk_freq_hz / i; + i =gcd (op_sys_clk_freq_hz_sdr, + pll->ext_clk_freq_hz <<op_pix_ddr (pll->flags)); + mul = op_sys_clk_freq_hz_sdr / i; + div = (pll->ext_clk_freq_hz <<op_pix_ddr (pll->flags)) / i;dev_dbg (dev,"mul %u / div %u\n" , mul, div); min_op_pre_pll_clk_div =
@@ -802,8 +825,9 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim, (pll->flags & CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER) ? 1 : 2 - (op_pll_fr->pre_pll_clk_div & 1)) { rval =ccs_pll_calculate_op (dev, lim, op_lim_fr, op_lim_bk, pll, - op_pll_fr, op_pll_bk, mul, div, l, - cphy, phy_const); + op_pll_fr, op_pll_bk, mul, div, + op_sys_clk_freq_hz_sdr, l, cphy, + phy_const);if (rval)continue ;
drivers/media/i2c/ccs-pll.h +2 -0
@@ -30,6 +30,8 @@#define CCS_PLL_FLAG_FIFO_DERATING BIT(6)#define CCS_PLL_FLAG_FIFO_OVERRATING BIT(7)#define CCS_PLL_FLAG_DUAL_PLL BIT(8) +#define CCS_PLL_FLAG_OP_SYS_DDR BIT(9) +#define CCS_PLL_FLAG_OP_PIX_DDR BIT(10)/** * struct ccs_pll_branch_fr - CCS PLL configuration (front)
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 90/106 ccs: Add support for DDR OP SYS and OP PIX clocks
In reply to Sakari AilusSupport dual data rate operational system and pixel clocks by conveying the flags to the PLL calculator and updating how the link rate is calculated.
--- drivers/media/i2c/ccs/ccs-core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/media/i2c/ccs/ccs-core.c +8 -1
@@ -388,7 +388,8 @@ static int ccs_pll_configure(struct ccs_sensor *sensor)DIV_ROUND_UP (pll->op_bk.sys_clk_freq_hz,1000000 /256 /256 ) * (pll->flags &CCS_PLL_FLAG_LANE_SPEED_MODEL ? - sensor->pll.csi2.lanes : 1)); + sensor->pll.csi2.lanes :1 ) << + (pll->flags & CCS_PLL_FLAG_OP_SYS_DDR ? 1 : 0));if (rval <0 || sensor->pll.flags &CCS_PLL_FLAG_NO_OP_CLOCKS )return rval;
@@ -3265,6 +3266,12 @@ static int ccs_probe(struct i2c_client *client) }else { sensor->pll.flags |=CCS_PLL_FLAG_DUAL_PLL ; } +if (CCS_LIM (sensor,CLOCK_CALCULATION ) & +CCS_CLOCK_CALCULATION_DUAL_PLL_OP_SYS_DDR ) + sensor->pll.flags |=CCS_PLL_FLAG_OP_SYS_DDR ; +if (CCS_LIM (sensor,CLOCK_CALCULATION ) & +CCS_CLOCK_CALCULATION_DUAL_PLL_OP_PIX_DDR ) + sensor->pll.flags |=CCS_PLL_FLAG_OP_PIX_DDR ; } sensor->pll.op_bits_per_lane =CCS_LIM (sensor,OP_BITS_PER_LANE ); sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 91/106 ccs: Print written register values
In reply to Sakari AilusThis helps debugging register writes.
--- drivers/media/i2c/ccs/ccs-reg-access.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/i2c/ccs/ccs-reg-access.c +4 -0
@@ -338,6 +338,10 @@ int ccs_write_addr_no_quirk(struct ccs_sensor *sensor, u32 reg, u32 val)put_unaligned_be16 (CCS_REG_ADDR (reg), data);put_unaligned_be32 (val << (8 * (sizeof (val) - len)), data +2 ); +dev_dbg (&client->dev,"writing reg 0x%4.4x value 0x%*.*x (%u)\n" , +CCS_REG_ADDR (reg),ccs_reg_width (reg) <<1 , +ccs_reg_width (reg) <<1 , val, val); + r =ccs_write_retry (client, &msg);if (r) dev_err(&client->dev,
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 92/106 ccs-pll: Print pixel rates
In reply to Sakari AilusPrint pixel rates on CSI-2 bus as well as in pixel array as the variation allowed in PLL capabilities makes this non-trivial to figure out otherwise.
--- drivers/media/i2c/ccs-pll.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/ccs-pll.c +5 -0
@@ -119,6 +119,11 @@ static void print_pll(struct device *dev, struct ccs_pll *pll) } } +dev_dbg (dev,"pixel rate in pixel array:\t%u\n" , + pll->pixel_rate_pixel_array); +dev_dbg (dev,"pixel rate on CSI-2 bus:\t%u\n" , + pll->pixel_rate_csi); + dev_dbg(dev, "flags%s%s%s%s%s%s%s%s%s\n", pll->flags & PLL_FL(LANE_SPEED_MODEL) ? " lane-speed" : "", pll->flags & PLL_FL(LINK_DECOUPLED) ? " link-decoupled" : "",
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 93/106 ccs: Add support for obtaining C-PHY configuration from firmware
In reply to Sakari AilusTry parsing the firmware also as C-PHY. Do this only after D-PHY as older firmware may not explicitly specify bus-type in which case D-PHY is the default.
--- drivers/media/i2c/ccs/ccs-core.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/i2c/ccs/ccs-core.c +4 -0
@@ -2926,6 +2926,10 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev) hwcfg->csi_signalling_mode =CCS_CSI_SIGNALING_MODE_CSI_2_DPHY ; hwcfg->lanes = bus_cfg.bus.mipi_csi2.num_data_lanes;break ; +case V4L2_MBUS_CSI2_CPHY : + hwcfg->csi_signalling_mode =CCS_CSI_SIGNALING_MODE_CSI_2_CPHY ; + hwcfg->lanes = bus_cfg.bus.mipi_csi2.num_data_lanes; +break ;case V4L2_MBUS_CSI1 :case V4L2_MBUS_CCP2 : hwcfg->csi_signalling_mode = (bus_cfg.bus.mipi_csi1.strobe) ?
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 94/106 ccs: Add digital gain support
In reply to Sakari AilusCCS supports global (all-component) digital gain. Add support for it.
--- drivers/media/i2c/ccs/ccs-core.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/media/i2c/ccs/ccs-core.c +16 -1
@@ -671,6 +671,11 @@ static int ccs_set_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_ANALOGUE_GAIN : rval =ccs_write (sensor,ANALOG_GAIN_CODE_GLOBAL , ctrl->val); +break ; + +case V4L2_CID_DIGITAL_GAIN : + rval =ccs_write (sensor,DIGITAL_GAIN_GLOBAL , ctrl->val); +break ;case V4L2_CID_EXPOSURE : rval =ccs_write (sensor,COARSE_INTEGRATION_TIME , ctrl->val);
@@ -740,7 +745,7 @@ static int ccs_init_controls(struct ccs_sensor *sensor)struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);int rval; - rval =v4l2_ctrl_handler_init (&sensor->pixel_array->ctrl_handler,12 ); + rval =v4l2_ctrl_handler_init (&sensor->pixel_array->ctrl_handler,13 );if (rval)return rval;
@@ -754,6 +759,16 @@ static int ccs_init_controls(struct ccs_sensor *sensor)max (CCS_LIM (sensor,ANALOG_GAIN_CODE_STEP ),1U ), CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN)); +if (CCS_LIM (sensor,DIGITAL_GAIN_CAPABILITY ) == +CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ) +v4l2_ctrl_new_std (&sensor->pixel_array->ctrl_handler, + &ccs_ctrl_ops,V4L2_CID_DIGITAL_GAIN , +CCS_LIM (sensor,DIGITAL_GAIN_MIN ), +CCS_LIM (sensor,DIGITAL_GAIN_MAX ), +max (CCS_LIM (sensor,DIGITAL_GAIN_STEP_SIZE ), +1U ), +0x100 ); +/* Exposure limits will be updated soon, use just something here. */ sensor->exposure = v4l2_ctrl_new_std( &sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops,
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 95/106 ccs: Add support for old-style SMIA digital gain
In reply to Sakari AilusSMIA only has per-component digital gain. Add support for it.
--- drivers/media/i2c/ccs/ccs-core.c | 33 +++++++++++++++++++++++-- drivers/media/i2c/ccs/smiapp-reg-defs.h | 2 ++ 2 files changed, 33 insertions(+), 2 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +31 -2
@@ -674,7 +674,34 @@ static int ccs_set_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_DIGITAL_GAIN : - rval =ccs_write (sensor,DIGITAL_GAIN_GLOBAL , ctrl->val); +if (CCS_LIM (sensor,DIGITAL_GAIN_CAPABILITY ) == +CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ) { + rval =ccs_write (sensor,DIGITAL_GAIN_GLOBAL , + ctrl->val); +break ; + } + + rval =ccs_write_addr (sensor, +SMIAPP_REG_U16_DIGITAL_GAIN_GREENR , + ctrl->val); +if (rval) +break ; + + rval =ccs_write_addr (sensor, +SMIAPP_REG_U16_DIGITAL_GAIN_RED , + ctrl->val); +if (rval) +break ; + + rval =ccs_write_addr (sensor, +SMIAPP_REG_U16_DIGITAL_GAIN_BLUE , + ctrl->val); +if (rval) +break ; + + rval =ccs_write_addr (sensor, +SMIAPP_REG_U16_DIGITAL_GAIN_GREENB , + ctrl->val);break ;case V4L2_CID_EXPOSURE :
@@ -760,7 +787,9 @@ static int ccs_init_controls(struct ccs_sensor *sensor) CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN));if (CCS_LIM (sensor,DIGITAL_GAIN_CAPABILITY ) == -CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ) +CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL || +CCS_LIM (sensor,DIGITAL_GAIN_CAPABILITY ) == +SMIAPP_DIGITAL_GAIN_CAPABILITY_PER_CHANNEL ) v4l2_ctrl_new_std(&sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops, V4L2_CID_DIGITAL_GAIN, CCS_LIM(sensor, DIGITAL_GAIN_MIN),
drivers/media/i2c/ccs/smiapp-reg-defs.h +2 -0
@@ -535,6 +535,8 @@#define SMIAPP_DIGITAL_CROP_CAPABILITY_NONE 0#define SMIAPP_DIGITAL_CROP_CAPABILITY_INPUT_CROP 1 +#define SMIAPP_DIGITAL_GAIN_CAPABILITY_PER_CHANNEL 1 +#define SMIAPP_BINNING_CAPABILITY_NO 0#define SMIAPP_BINNING_CAPABILITY_YES 1
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 96/106 ccs: Remove analogue gain field
In reply to Sakari AilusThe analogue gain control was stored to the device specific struct but was never used. Remove it.
--- drivers/media/i2c/ccs/ccs-core.c | 13 ++++++------- drivers/media/i2c/ccs/ccs.h | 1 - 2 files changed, 6 insertions(+), 8 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +6 -7
@@ -778,13 +778,12 @@ static int ccs_init_controls(struct ccs_sensor *sensor) sensor->pixel_array->ctrl_handler.lock = &sensor->mutex; - sensor->analog_gain =v4l2_ctrl_new_std ( - &sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops, -V4L2_CID_ANALOGUE_GAIN , -CCS_LIM (sensor,ANALOG_GAIN_CODE_MIN ), -CCS_LIM (sensor,ANALOG_GAIN_CODE_MAX ), -max (CCS_LIM (sensor,ANALOG_GAIN_CODE_STEP ),1U ), -CCS_LIM (sensor,ANALOG_GAIN_CODE_MIN )); +v4l2_ctrl_new_std (&sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops, +V4L2_CID_ANALOGUE_GAIN , +CCS_LIM (sensor,ANALOG_GAIN_CODE_MIN ), +CCS_LIM (sensor,ANALOG_GAIN_CODE_MAX ), +max (CCS_LIM (sensor,ANALOG_GAIN_CODE_STEP ),1U ), +CCS_LIM (sensor,ANALOG_GAIN_CODE_MIN )); if (CCS_LIM(sensor, DIGITAL_GAIN_CAPABILITY) == CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ||
drivers/media/i2c/ccs/ccs.h +0 -1
@@ -262,7 +262,6 @@ struct ccs_sensor {unsigned long *valid_link_freqs;/* Pixel array controls */ -struct v4l2_ctrl *analog_gain;struct v4l2_ctrl *exposure;struct v4l2_ctrl *hflip;struct v4l2_ctrl *vflip;
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 97/106 ccs: Only add analogue gain control if the device supports it
In reply to Sakari AilusSome devices do not implement analogue gain this way. Only add the control when a device does have the support.
--- drivers/media/i2c/ccs/ccs-core.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +10 -6
@@ -778,12 +778,16 @@ static int ccs_init_controls(struct ccs_sensor *sensor) sensor->pixel_array->ctrl_handler.lock = &sensor->mutex; -v4l2_ctrl_new_std (&sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops, -V4L2_CID_ANALOGUE_GAIN , -CCS_LIM (sensor,ANALOG_GAIN_CODE_MIN ), -CCS_LIM (sensor,ANALOG_GAIN_CODE_MAX ), -max (CCS_LIM (sensor,ANALOG_GAIN_CODE_STEP ),1U ), -CCS_LIM (sensor,ANALOG_GAIN_CODE_MIN )); +switch (CCS_LIM (sensor,ANALOG_GAIN_CAPABILITY )) { +case CCS_ANALOG_GAIN_CAPABILITY_GLOBAL : +v4l2_ctrl_new_std (&sensor->pixel_array->ctrl_handler, + &ccs_ctrl_ops,V4L2_CID_ANALOGUE_GAIN , +CCS_LIM (sensor,ANALOG_GAIN_CODE_MIN ), +CCS_LIM (sensor,ANALOG_GAIN_CODE_MAX ), +max (CCS_LIM (sensor,ANALOG_GAIN_CODE_STEP ), +1U ), +CCS_LIM (sensor,ANALOG_GAIN_CODE_MIN )); + } if (CCS_LIM(sensor, DIGITAL_GAIN_CAPABILITY) == CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ||
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 98/106 v4l: uapi: Add user control base for CCS controls
In reply to Sakari AilusAdd a control base for CCS controls, and reserve 128 controls. Luckily these numbers are cheap.
--- include/uapi/linux/v4l2-controls.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/uapi/linux/v4l2-controls.h +6 -0
@@ -198,6 +198,12 @@ enum v4l2_colorfx {*/ #define V4L2_CID_USER_ATMEL_ISC_BASE (V4L2_CID_USER_BASE + 0x10c0) +/* +* The base for MIPI CCS driver controls. +* We reserve 128 controls for this driver. +*/ +#define V4L2_CID_USER_CCS_BASE (V4L2_CID_USER_BASE + 0x10e0) +/* MPEG-class control IDs */ /* The MPEG controls are applicable to all codec controls * and the 'MPEG' part of the define is historical */
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 99/106 v4l: uapi: ccs: Add controls for analogue gain constants
In reply to Sakari AilusAdd a V4L2 controls for analogue gai constants required to control analogue gain. The values are device specific and thus need to be obtained from the driver.
--- MAINTAINERS | 1 + include/uapi/linux/ccs.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 include/uapi/linux/ccs.h
MAINTAINERS +1 -0
@@ -11569,6 +11569,7 @@ F: drivers/media/i2c/ccs/ F: drivers/media/i2c/ccs-pll.c F: drivers/media/i2c/ccs-pll.h F: include/uapi/linux/smiapp.h +F: include/uapi/linux/ccs.h MIPS M: Thomas Bogendoerfer <[email protected]>
include/uapi/linux/ccs.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only AND BSD-3-Clause */ +/* Copyright (C) 2020 Intel Corporation */ + +#ifndef __UAPI_CCS_H__ +#define __UAPI_CCS_H__ + +#include <linux/videodev2.h> + +#define V4L2_CID_CCS_ANALOGUE_GAIN_M0 (V4L2_CID_USER_CCS_BASE + 1) +#define V4L2_CID_CCS_ANALOGUE_GAIN_C0 (V4L2_CID_USER_CCS_BASE + 2) +#define V4L2_CID_CCS_ANALOGUE_GAIN_M1 (V4L2_CID_USER_CCS_BASE + 3) +#define V4L2_CID_CCS_ANALOGUE_GAIN_C1 (V4L2_CID_USER_CCS_BASE + 4) + +#endif
Signature · 1 line
2.27.0
Re: [PATCH v2 099/106] v4l: uapi: ccs: Add controls for analogue gain constants
Quoted 1 line · Sakari Ailus
Add a V4L2 controls for analogue gai constants required to control
gai -> gain
Quoted 30 lines
analogue gain. The values are device specific and thus need to be obtained from the driver.
Signed-off-by Sakari Ailus <[email protected]>--- MAINTAINERS | 1 + include/uapi/linux/ccs.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 include/uapi/linux/ccs.hMAINTAINERS +1
-0@@ -11569,6 +11569,7 @@ F: drivers/media/i2c/ccs/ F: drivers/media/i2c/ccs-pll.c F: drivers/media/i2c/ccs-pll.h F: include/uapi/linux/smiapp.h +F: include/uapi/linux/ccs.h MIPS M: Thomas Bogendoerfer <[email protected]>include/uapi/linux/ccs.h new file +2
-0@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only AND BSD-3-Clause */ +/* Copyright (C) 2020 Intel Corporation */
include/uapi/linux/ccs.h line 12
Quoted 10 lines
include/uapi/linux/ccs.h new file +10
-0+ +#ifndef __UAPI_CCS_H__ +#define __UAPI_CCS_H__ + +#include <linux/videodev2.h> + +#define V4L2_CID_CCS_ANALOGUE_GAIN_M0 (V4L2_CID_USER_CCS_BASE + 1) +#define V4L2_CID_CCS_ANALOGUE_GAIN_C0 (V4L2_CID_USER_CCS_BASE + 2) +#define V4L2_CID_CCS_ANALOGUE_GAIN_M1 (V4L2_CID_USER_CCS_BASE + 3) +#define V4L2_CID_CCS_ANALOGUE_GAIN_C1 (V4L2_CID_USER_CCS_BASE + 4)
Please document these controls. Ditto for the later patches that add more of these controls.
This header is a good place to put the documentation.
Regards,
Hans
Quoted 3 lines
include/uapi/linux/ccs.h new file +2
-0+ +#endif
Sakari Ailus
maintainerRe: [PATCH v2 099/106] v4l: uapi: ccs: Add controls for analogue gain constants
Hi Hans,
Quoted 49 lines · Hans Verkuil
Quoted 1 line · Sakari Ailus
Add a V4L2 controls for analogue gai constants required to control
gai -> gain
Quoted 30 lines
analogue gain. The values are device specific and thus need to be obtained from the driver.
Signed-off-by Sakari Ailus <[email protected]>--- MAINTAINERS | 1 + include/uapi/linux/ccs.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 include/uapi/linux/ccs.hMAINTAINERS +1
-0@@ -11569,6 +11569,7 @@ F: drivers/media/i2c/ccs/ F: drivers/media/i2c/ccs-pll.c F: drivers/media/i2c/ccs-pll.h F: include/uapi/linux/smiapp.h +F: include/uapi/linux/ccs.h MIPS M: Thomas Bogendoerfer <[email protected]>include/uapi/linux/ccs.h new file +2
-0@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only AND BSD-3-Clause */ +/* Copyright (C) 2020 Intel Corporation */ include/uapi/linux/ccs.h line 12
Quoted 10 lines
include/uapi/linux/ccs.h new file +10
-0+ +#ifndef __UAPI_CCS_H__ +#define __UAPI_CCS_H__ + +#include <linux/videodev2.h> + +#define V4L2_CID_CCS_ANALOGUE_GAIN_M0 (V4L2_CID_USER_CCS_BASE + 1) +#define V4L2_CID_CCS_ANALOGUE_GAIN_C0 (V4L2_CID_USER_CCS_BASE + 2) +#define V4L2_CID_CCS_ANALOGUE_GAIN_M1 (V4L2_CID_USER_CCS_BASE + 3) +#define V4L2_CID_CCS_ANALOGUE_GAIN_C1 (V4L2_CID_USER_CCS_BASE + 4)Please document these controls. Ditto for the later patches that add more of these controls.
Quoted 1 line
This header is a good place to put the documentation.
Yes, I'll add that for v3.
Signature · 1 line
Sakari Ailus
Re: [PATCH v2 099/106] v4l: uapi: ccs: Add controls for analogue gain constants
In reply to Sakari AilusQuoted 29 lines · Sakari Ailus
Add a V4L2 controls for analogue gai constants required to control analogue gain. The values are device specific and thus need to be obtained from the driver.
Signed-off-by Sakari Ailus <[email protected]>--- MAINTAINERS | 1 + include/uapi/linux/ccs.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 include/uapi/linux/ccs.hMAINTAINERS +1
-0@@ -11569,6 +11569,7 @@ F: drivers/media/i2c/ccs/ F: drivers/media/i2c/ccs-pll.c F: drivers/media/i2c/ccs-pll.h F: include/uapi/linux/smiapp.h +F: include/uapi/linux/ccs.h MIPS M: Thomas Bogendoerfer <[email protected]>include/uapi/linux/ccs.h new file +0
-0
include/uapi/linux/ccs.h line 5
Quoted 5 lines
include/uapi/linux/ccs.h new file +5
-0@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only AND BSD-3-Clause */ +/* Copyright (C) 2020 Intel Corporation */ + +#ifndef __UAPI_CCS_H__ +#define __UAPI_CCS_H__
What does CCS stand for? Provide a reference to the standard as well.
Just looking at this header doesn't give you any clue as to what it related to.
Regards,
Hans
Quoted 10 lines
include/uapi/linux/ccs.h new file +9
-0+ +#include <linux/videodev2.h> + +#define V4L2_CID_CCS_ANALOGUE_GAIN_M0 (V4L2_CID_USER_CCS_BASE + 1) +#define V4L2_CID_CCS_ANALOGUE_GAIN_C0 (V4L2_CID_USER_CCS_BASE + 2) +#define V4L2_CID_CCS_ANALOGUE_GAIN_M1 (V4L2_CID_USER_CCS_BASE + 3) +#define V4L2_CID_CCS_ANALOGUE_GAIN_C1 (V4L2_CID_USER_CCS_BASE + 4) + +#endif
Sakari Ailus
maintainerRe: [PATCH v2 099/106] v4l: uapi: ccs: Add controls for analogue gain constants
Hi Hans,
Quoted 38 lines · Hans Verkuil
Quoted 29 lines · Sakari Ailus
Add a V4L2 controls for analogue gai constants required to control analogue gain. The values are device specific and thus need to be obtained from the driver.
Signed-off-by Sakari Ailus <[email protected]>--- MAINTAINERS | 1 + include/uapi/linux/ccs.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 include/uapi/linux/ccs.hMAINTAINERS +1
-0@@ -11569,6 +11569,7 @@ F: drivers/media/i2c/ccs/ F: drivers/media/i2c/ccs-pll.c F: drivers/media/i2c/ccs-pll.h F: include/uapi/linux/smiapp.h +F: include/uapi/linux/ccs.h MIPS M: Thomas Bogendoerfer <[email protected]>include/uapi/linux/ccs.h new file +0
-0include/uapi/linux/ccs.h line 5
Quoted 5 lines
include/uapi/linux/ccs.h new file +5
-0@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only AND BSD-3-Clause */ +/* Copyright (C) 2020 Intel Corporation */ + +#ifndef __UAPI_CCS_H__ +#define __UAPI_CCS_H__What does CCS stand for? Provide a reference to the standard as well.
Quoted 2 lines
Just looking at this header doesn't give you any clue as to what it related to.
I'll add references to driver documentation I'm about to write to address Mauro's review comments. CCS stands for Camera Command Set.
The spec can be found here:
<URL:https://www.mipi.org/specifications/camera-command-set>
Signature · 3 lines
Regards, Sakari Ailus
Sakari Ailus
maintainerPATCH v2 100/106 ccs: Add support for analogue gain coefficient controls
In reply to Sakari AilusAdd four controls for reading CCS analogue gain coefficients. The values are constants that are device specific.
--- drivers/media/i2c/ccs/ccs-core.c | 38 ++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +36 -2
@@ -28,6 +28,7 @@#include <linux/v4l2-mediabus.h> #include <media/v4l2-fwnode.h> #include <media/v4l2-device.h> +#include <uapi/linux/ccs.h> #include "ccs.h"
@@ -772,14 +773,46 @@ static int ccs_init_controls(struct ccs_sensor *sensor)struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);int rval; - rval =v4l2_ctrl_handler_init (&sensor->pixel_array->ctrl_handler,13 ); + rval =v4l2_ctrl_handler_init (&sensor->pixel_array->ctrl_handler,17 );if (rval)return rval; sensor->pixel_array->ctrl_handler.lock = &sensor->mutex;switch (CCS_LIM (sensor,ANALOG_GAIN_CAPABILITY )) { -case CCS_ANALOG_GAIN_CAPABILITY_GLOBAL : +case CCS_ANALOG_GAIN_CAPABILITY_GLOBAL : { +struct { +const char *name; +u32 id; +s32 value; + }const gain_ctrls[] = { + {"Analogue Gain m0" ,V4L2_CID_CCS_ANALOGUE_GAIN_M0 , +CCS_LIM (sensor,ANALOG_GAIN_M0 ), }, + {"Analogue Gain c0" ,V4L2_CID_CCS_ANALOGUE_GAIN_C0 , +CCS_LIM (sensor,ANALOG_GAIN_C0 ), }, + {"Analogue Gain m1" ,V4L2_CID_CCS_ANALOGUE_GAIN_M1 , +CCS_LIM (sensor,ANALOG_GAIN_M1 ), }, + {"Analogue Gain c1" ,V4L2_CID_CCS_ANALOGUE_GAIN_C1 , +CCS_LIM (sensor,ANALOG_GAIN_C1 ), }, + }; +struct v4l2_ctrl_config ctrl_cfg = { + .type =V4L2_CTRL_TYPE_INTEGER , + .ops = &ccs_ctrl_ops, + .flags =V4L2_CTRL_FLAG_READ_ONLY , + .step =1 , + }; +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (gain_ctrls); i++) { + ctrl_cfg.name = gain_ctrls[i].name; + ctrl_cfg.id = gain_ctrls[i].id; + ctrl_cfg.min = ctrl_cfg.max = ctrl_cfg.def = + gain_ctrls[i].value; + +v4l2_ctrl_new_custom (&sensor->pixel_array->ctrl_handler, + &ctrl_cfg,NULL ); + } + v4l2_ctrl_new_std(&sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops, V4L2_CID_ANALOGUE_GAIN, CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN),
@@ -788,6 +821,7 @@ static int ccs_init_controls(struct ccs_sensor *sensor) 1U), CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN)); } + } if (CCS_LIM(sensor, DIGITAL_GAIN_CAPABILITY) == CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ||
Signature · 1 line
2.27.0
Re: [PATCH v2 100/106] ccs: Add support for analogue gain coefficient controls
Quoted 25 lines · Sakari Ailus
Add four controls for reading CCS analogue gain coefficients. The values are constants that are device specific.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/ccs/ccs-core.c | 38 ++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)drivers/media/i2c/ccs/ccs-core.c +1
-1@@ -28,6 +28,7 @@#include <linux/v4l2-mediabus.h> #include <media/v4l2-fwnode.h> #include <media/v4l2-device.h> +#include <uapi/linux/ccs.h> #include "ccs.h" @@ -772,14 +773,46 @@ static int ccs_init_controls(struct ccs_sensor *sensor)struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);int rval; - rval =v4l2_ctrl_handler_init (&sensor->pixel_array->ctrl_handler,13 );
drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 784
Quoted 10 lines
drivers/media/i2c/ccs/ccs-core.c +3
-1+ rval =v4l2_ctrl_handler_init (&sensor->pixel_array->ctrl_handler,17 );if (rval)return rval; sensor->pixel_array->ctrl_handler.lock = &sensor->mutex;switch (CCS_LIM (sensor,ANALOG_GAIN_CAPABILITY )) { -case CCS_ANALOG_GAIN_CAPABILITY_GLOBAL : +case CCS_ANALOG_GAIN_CAPABILITY_GLOBAL : { + struct {
Can this be static?
drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 789
Quoted 5 lines
drivers/media/i2c/ccs/ccs-core.c +5
-0+const char *name; +u32 id; +s32 value; + } const gain_ctrls[] = { + {"Analogue Gain m0" ,V4L2_CID_CCS_ANALOGUE_GAIN_M0 ,
Why lower case 'm0/1' and 'c0/1'? It looks odd.
Quoted 4 lines
drivers/media/i2c/ccs/ccs-core.c +4
-0+ CCS_LIM(sensor, ANALOG_GAIN_M0), }, + {"Analogue Gain c0" ,V4L2_CID_CCS_ANALOGUE_GAIN_C0 , + CCS_LIM(sensor, ANALOG_GAIN_C0), }, + { "Analogue Gain m1", V4L2_CID_CCS_ANALOGUE_GAIN_M1,
drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 803
Quoted 10 lines
drivers/media/i2c/ccs/ccs-core.c +10
-0+ CCS_LIM(sensor, ANALOG_GAIN_M1), }, + {"Analogue Gain c1" ,V4L2_CID_CCS_ANALOGUE_GAIN_C1 , + CCS_LIM(sensor, ANALOG_GAIN_C1), }, + }; +struct v4l2_ctrl_config ctrl_cfg = { + .type =V4L2_CTRL_TYPE_INTEGER , + .ops = &ccs_ctrl_ops, + .flags =V4L2_CTRL_FLAG_READ_ONLY , + .step =1 , + };
This looks a bit weird. Most drivers just define each control separately in a static const struct v4l2_ctrl_config, then add them with v4l2_ctrl_new_custom.
Now the control definition data is split up in two data structures.
It's not wrong, it is just non-standard, and a bit harder to review.
Quoted 17 lines
drivers/media/i2c/ccs/ccs-core.c +12
-0+unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (gain_ctrls); i++) { + ctrl_cfg.name = gain_ctrls[i].name; + ctrl_cfg.id = gain_ctrls[i].id; + ctrl_cfg.min = ctrl_cfg.max = ctrl_cfg.def = + gain_ctrls[i].value; + +v4l2_ctrl_new_custom (&sensor->pixel_array->ctrl_handler, + &ctrl_cfg,NULL ); + } + v4l2_ctrl_new_std(&sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops, V4L2_CID_ANALOGUE_GAIN, CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN),
drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 827
Quoted 7 lines
drivers/media/i2c/ccs/ccs-core.c +1
-0@@ -788,6 +821,7 @@ static int ccs_init_controls(struct ccs_sensor *sensor) 1U), CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN)); } + } if (CCS_LIM(sensor, DIGITAL_GAIN_CAPABILITY) == CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ||
Regards,
Hans
Re: [PATCH v2 100/106] ccs: Add support for analogue gain coefficient controls
Quoted 30 lines · Hans Verkuil
Quoted 29 lines · Sakari Ailus
Add four controls for reading CCS analogue gain coefficients. The values are constants that are device specific.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/ccs/ccs-core.c | 38 ++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)drivers/media/i2c/ccs/ccs-core.c +2
-1@@ -28,6 +28,7 @@#include <linux/v4l2-mediabus.h> #include <media/v4l2-fwnode.h> #include <media/v4l2-device.h> +#include <uapi/linux/ccs.h> #include "ccs.h" @@ -772,14 +773,46 @@ static int ccs_init_controls(struct ccs_sensor *sensor)struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);int rval; - rval =v4l2_ctrl_handler_init (&sensor->pixel_array->ctrl_handler,13 ); + rval =v4l2_ctrl_handler_init (&sensor->pixel_array->ctrl_handler,17 );if (rval)return rval;
Quoted 8 lines
drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 784
Quoted 6 lines
drivers/media/i2c/ccs/ccs-core.c +2
-1sensor->pixel_array->ctrl_handler.lock = &sensor->mutex;switch (CCS_LIM (sensor,ANALOG_GAIN_CAPABILITY )) { -case CCS_ANALOG_GAIN_CAPABILITY_GLOBAL : +case CCS_ANALOG_GAIN_CAPABILITY_GLOBAL : { + struct {Can this be static?
Ah, no. The value is sensor dependent. Sorry, ignore this.
Quoted 27 lines
drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 789
Quoted 6 lines
drivers/media/i2c/ccs/ccs-core.c +5
-0+const char *name; +u32 id; +s32 value; + } const gain_ctrls[] = { + {"Analogue Gain m0" ,V4L2_CID_CCS_ANALOGUE_GAIN_M0 ,Why lower case 'm0/1' and 'c0/1'? It looks odd.
Quoted 4 lines
drivers/media/i2c/ccs/ccs-core.c +4
-0+ CCS_LIM(sensor, ANALOG_GAIN_M0), }, + {"Analogue Gain c0" ,V4L2_CID_CCS_ANALOGUE_GAIN_C0 , + CCS_LIM(sensor, ANALOG_GAIN_C0), }, + { "Analogue Gain m1", V4L2_CID_CCS_ANALOGUE_GAIN_M1,drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 803
Quoted 10 lines
drivers/media/i2c/ccs/ccs-core.c +10
-0+ CCS_LIM(sensor, ANALOG_GAIN_M1), }, + {"Analogue Gain c1" ,V4L2_CID_CCS_ANALOGUE_GAIN_C1 , + CCS_LIM(sensor, ANALOG_GAIN_C1), }, + }; +struct v4l2_ctrl_config ctrl_cfg = { + .type =V4L2_CTRL_TYPE_INTEGER , + .ops = &ccs_ctrl_ops, + .flags =V4L2_CTRL_FLAG_READ_ONLY , + .step =1 , + };This looks a bit weird. Most drivers just define each control separately in a static const struct
v4l2_ctrl_config, then add them withv4l2_ctrl_new_custom.
Quoted 3 lines
Now the control definition data is split up in two data structures.
It's not wrong, it is just non-standard, and a bit harder to review.
Ignore this as well, it's because some values aren't constant.
Regards,
Hans
Quoted 30 lines
Quoted 18 lines
drivers/media/i2c/ccs/ccs-core.c +12
-0+unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (gain_ctrls); i++) { + ctrl_cfg.name = gain_ctrls[i].name; + ctrl_cfg.id = gain_ctrls[i].id; + ctrl_cfg.min = ctrl_cfg.max = ctrl_cfg.def = + gain_ctrls[i].value; + +v4l2_ctrl_new_custom (&sensor->pixel_array->ctrl_handler, + &ctrl_cfg,NULL ); + } + v4l2_ctrl_new_std(&sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops, V4L2_CID_ANALOGUE_GAIN, CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN),drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 827
Quoted 7 lines
drivers/media/i2c/ccs/ccs-core.c +1
-0@@ -788,6 +821,7 @@ static int ccs_init_controls(struct ccs_sensor *sensor) 1U), CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN)); } + } if (CCS_LIM(sensor, DIGITAL_GAIN_CAPABILITY) == CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ||Regards,
Hans
Sakari Ailus
maintainerRe: [PATCH v2 100/106] ccs: Add support for analogue gain coefficient controls
In reply to Hans VerkuilHi Hans,
Thank you for the review!
Quoted 30 lines · Hans Verkuil
Quoted 29 lines · Sakari Ailus
Add four controls for reading CCS analogue gain coefficients. The values are constants that are device specific.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/ccs/ccs-core.c | 38 ++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)drivers/media/i2c/ccs/ccs-core.c +2
-1@@ -28,6 +28,7 @@#include <linux/v4l2-mediabus.h> #include <media/v4l2-fwnode.h> #include <media/v4l2-device.h> +#include <uapi/linux/ccs.h> #include "ccs.h" @@ -772,14 +773,46 @@ static int ccs_init_controls(struct ccs_sensor *sensor)struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);int rval; - rval =v4l2_ctrl_handler_init (&sensor->pixel_array->ctrl_handler,13 ); + rval =v4l2_ctrl_handler_init (&sensor->pixel_array->ctrl_handler,17 );if (rval)return rval;
Quoted 8 lines
drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 784
Quoted 6 lines
drivers/media/i2c/ccs/ccs-core.c +2
-1sensor->pixel_array->ctrl_handler.lock = &sensor->mutex;switch (CCS_LIM (sensor,ANALOG_GAIN_CAPABILITY )) { -case CCS_ANALOG_GAIN_CAPABILITY_GLOBAL : +case CCS_ANALOG_GAIN_CAPABILITY_GLOBAL : { + struct {Can this be static?
CCS_LIM(sensor, ...) translates to a value that is specific to a given model of a camera sensor, it's not a constant.
Quoted 8 lines
drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 789
Quoted 6 lines
drivers/media/i2c/ccs/ccs-core.c +5
-0+const char *name; +u32 id; +s32 value; + } const gain_ctrls[] = { + {"Analogue Gain m0" ,V4L2_CID_CCS_ANALOGUE_GAIN_M0 ,Why lower case 'm0/1' and 'c0/1'? It looks odd.
The spec uses lower case to refer to [cm][01].
I can use upper case if you prefer though.
Quoted 48 lines
Quoted 5 lines
drivers/media/i2c/ccs/ccs-core.c +4
-0+ CCS_LIM(sensor, ANALOG_GAIN_M0), }, + {"Analogue Gain c0" ,V4L2_CID_CCS_ANALOGUE_GAIN_C0 , + CCS_LIM(sensor, ANALOG_GAIN_C0), }, + { "Analogue Gain m1", V4L2_CID_CCS_ANALOGUE_GAIN_M1,drivers/media/i2c/ccs/ccs-core.c static int ccs_init_controls(struct ccs_sensor *sensor) · line 803
Quoted 10 lines
drivers/media/i2c/ccs/ccs-core.c +10
-0+ CCS_LIM(sensor, ANALOG_GAIN_M1), }, + {"Analogue Gain c1" ,V4L2_CID_CCS_ANALOGUE_GAIN_C1 , + CCS_LIM(sensor, ANALOG_GAIN_C1), }, + }; +struct v4l2_ctrl_config ctrl_cfg = { + .type =V4L2_CTRL_TYPE_INTEGER , + .ops = &ccs_ctrl_ops, + .flags =V4L2_CTRL_FLAG_READ_ONLY , + .step =1 , + };This looks a bit weird. Most drivers just define each control separately in a static const struct
v4l2_ctrl_config, then add them withv4l2_ctrl_new_custom.Now the control definition data is split up in two data structures.
It's not wrong, it is just non-standard, and a bit harder to review.
Quoted 24 lines
drivers/media/i2c/ccs/ccs-core.c +13
-0+unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (gain_ctrls); i++) { + ctrl_cfg.name = gain_ctrls[i].name; + ctrl_cfg.id = gain_ctrls[i].id; + ctrl_cfg.min = ctrl_cfg.max = ctrl_cfg.def = + gain_ctrls[i].value; + +v4l2_ctrl_new_custom (&sensor->pixel_array->ctrl_handler, + &ctrl_cfg,NULL ); + } + v4l2_ctrl_new_std(&sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops, V4L2_CID_ANALOGUE_GAIN, CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN),@@ -788,6 +821,7 @@ static int ccs_init_controls(struct ccs_sensor *sensor) 1U), CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN)); } + } if (CCS_LIM(sensor, DIGITAL_GAIN_CAPABILITY) == CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ||
Signature · 3 lines
Regards, Sakari Ailus
Sakari Ailus
maintainerPATCH v2 101/106 v4l: uapi: ccs: Add controls for CCS alternative analogue gain
In reply to Sakari AilusAdd two new controls for alternative analogue gain some CCS compliant camera sensors support.
--- include/uapi/linux/ccs.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/ccs.h +2 -0
@@ -10,5 +10,7 @@#define V4L2_CID_CCS_ANALOGUE_GAIN_C0 (V4L2_CID_USER_CCS_BASE + 2)#define V4L2_CID_CCS_ANALOGUE_GAIN_M1 (V4L2_CID_USER_CCS_BASE + 3)#define V4L2_CID_CCS_ANALOGUE_GAIN_C1 (V4L2_CID_USER_CCS_BASE + 4) +#define V4L2_CID_CCS_ANALOGUE_LINEAR_GAIN (V4L2_CID_USER_CCS_BASE + 5) +#define V4L2_CID_CCS_ANALOGUE_EXPONENTIAL_GAIN (V4L2_CID_USER_CCS_BASE + 6)#endif
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 102/106 ccs: Add support for alternate analogue global gain
In reply to Sakari AilusThe CCS spec defines an alternative implementation for global analogue gain. Add support for that in the driver.
--- drivers/media/i2c/ccs/ccs-core.c | 55 ++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)
drivers/media/i2c/ccs/ccs-core.c +55 -0
@@ -674,6 +674,17 @@ static int ccs_set_ctrl(struct v4l2_ctrl *ctrl)break ; +case V4L2_CID_CCS_ANALOGUE_LINEAR_GAIN : + rval =ccs_write (sensor,ANALOG_LINEAR_GAIN_GLOBAL , ctrl->val); + +break ; + +case V4L2_CID_CCS_ANALOGUE_EXPONENTIAL_GAIN : + rval =ccs_write (sensor,ANALOG_EXPONENTIAL_GAIN_GLOBAL , + ctrl->val); + +break ; +case V4L2_CID_DIGITAL_GAIN :if (CCS_LIM (sensor,DIGITAL_GAIN_CAPABILITY ) ==CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL ) {
@@ -820,6 +831,50 @@ static int ccs_init_controls(struct ccs_sensor *sensor)max (CCS_LIM (sensor,ANALOG_GAIN_CODE_STEP ),1U ), CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN)); + } +break ; + +case CCS_ANALOG_GAIN_CAPABILITY_ALTERNATE_GLOBAL : { +struct { +const char *name; +u32 id; +u16 min, max, step; + }const gain_ctrls[] = { + { +"Analogue Linear Gain" , +V4L2_CID_CCS_ANALOGUE_LINEAR_GAIN , +CCS_LIM (sensor,ANALOG_LINEAR_GAIN_MIN ), +CCS_LIM (sensor,ANALOG_LINEAR_GAIN_MAX ), +max (CCS_LIM (sensor, +ANALOG_LINEAR_GAIN_STEP_SIZE ), +1U ), + }, + { +"Analogue Exponential Gain" , +V4L2_CID_CCS_ANALOGUE_EXPONENTIAL_GAIN , +CCS_LIM (sensor,ANALOG_EXPONENTIAL_GAIN_MIN ), +CCS_LIM (sensor,ANALOG_EXPONENTIAL_GAIN_MAX ), +max (CCS_LIM (sensor, +ANALOG_EXPONENTIAL_GAIN_STEP_SIZE ), +1U ), + }, + }; +struct v4l2_ctrl_config ctrl_cfg = { + .type =V4L2_CTRL_TYPE_INTEGER , + .ops = &ccs_ctrl_ops, + }; +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (gain_ctrls); i++) { + ctrl_cfg.name = gain_ctrls[i].name; + ctrl_cfg.min = ctrl_cfg.def = gain_ctrls[i].min; + ctrl_cfg.max = gain_ctrls[i].max; + ctrl_cfg.step = gain_ctrls[i].step; + ctrl_cfg.id = gain_ctrls[i].id; + +v4l2_ctrl_new_custom (&sensor->pixel_array->ctrl_handler, + &ctrl_cfg,NULL ); + } } }
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 103/106 ccs: Add debug prints for MSR registers
In reply to Sakari AilusAlso print out MSR registers written to the sensor. This isn't entirely optimal as the debug strings are produced even if they're not used but that isn't really a grave issue --- the I²C bus is very slow anyway.
--- drivers/media/i2c/ccs/ccs-reg-access.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/media/i2c/ccs/ccs-reg-access.c +8 -0
@@ -387,12 +387,20 @@ int ccs_write_data_regs(struct ccs_sensor *sensor, struct ccs_reg *regs,for (j =0 ; j < regs->len; j += msg.len -2 , regdata += msg.len -2 ) { +char printbuf[(MAX_WRITE_LEN <<1 ) +1 /* nil */ ] = + {0 };int rval; msg.len =min (regs->len - j,MAX_WRITE_LEN ); +bin2hex (printbuf, regdata, msg.len); +dev_dbg (&client->dev, +"writing msr reg 0x%4.4x value 0x%s\n" , + regs->addr + j, printbuf); +put_unaligned_be16 (regs->addr + j, buf);memcpy (buf +2 , regdata, msg.len); + msg.len +=2 ; rval =ccs_write_retry (client, &msg);
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 104/106 v4l: uapi: ccs: Add CCS controls for shading correction
In reply to Sakari AilusAdd V4L2 controls for controlling CCS lens shading correction as well as conveying its capabilities.
--- include/uapi/linux/ccs.h | 5 +++++ 1 file changed, 5 insertions(+)
include/uapi/linux/ccs.h +5 -0
@@ -12,5 +12,10 @@#define V4L2_CID_CCS_ANALOGUE_GAIN_C1 (V4L2_CID_USER_CCS_BASE + 4)#define V4L2_CID_CCS_ANALOGUE_LINEAR_GAIN (V4L2_CID_USER_CCS_BASE + 5)#define V4L2_CID_CCS_ANALOGUE_EXPONENTIAL_GAIN (V4L2_CID_USER_CCS_BASE + 6) +#define V4L2_CID_CCS_SHADING_CORRECTION_CAPABILITY (V4L2_CID_USER_CCS_BASE + 7) +#define V4L2_CCS_SHADING_CORRECTION_COLOUR (1U << 0) +#define V4L2_CCS_SHADING_CORRECTION_LUMINANCE (1U << 1) +#define V4L2_CID_CCS_SHADING_CORRECTION (V4L2_CID_USER_CCS_BASE + 8) +#define V4L2_CID_CCS_LUMINANCE_SHADING_CORRECTION (V4L2_CID_USER_CCS_BASE + 9)#endif
Signature · 1 line
2.27.0
Sakari Ailus
maintainerPATCH v2 105/106 ccs: Add shading correction and luminance correction level controls
In reply to Sakari AilusAdd controls for supporting lens shading correction.
--- drivers/media/i2c/ccs/ccs-core.c | 74 ++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+)
drivers/media/i2c/ccs/ccs-core.c +74 -0
@@ -757,6 +757,25 @@ static int ccs_set_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_TEST_PATTERN_GREENB : rval =ccs_write (sensor,TEST_DATA_GREENB , ctrl->val); +break ; +case V4L2_CID_CCS_SHADING_CORRECTION : +if (!(CCS_LIM (sensor,SHADING_CORRECTION_CAPABILITY ) & + (CCS_SHADING_CORRECTION_CAPABILITY_COLOR_SHADING | +CCS_SHADING_CORRECTION_CAPABILITY_LUMINANCE_CORRECTION ))) +break ; + + rval =ccs_write (sensor,SHADING_CORRECTION_EN , + ctrl->val ?CCS_SHADING_CORRECTION_EN_ENABLE : +0 ); + +break ; +case V4L2_CID_CCS_LUMINANCE_SHADING_CORRECTION : +if (!(CCS_LIM (sensor,SHADING_CORRECTION_CAPABILITY ) & +CCS_SHADING_CORRECTION_CAPABILITY_LUMINANCE_CORRECTION )) +break ; + + rval =ccs_write (sensor,LUMINANCE_CORRECTION_LEVEL , ctrl->val); +break ;case V4L2_CID_PIXEL_RATE :/* For v4l2_ctrl_s_ctrl_int64() used internally. */
@@ -878,6 +897,61 @@ static int ccs_init_controls(struct ccs_sensor *sensor) } } +if (CCS_LIM (sensor,SHADING_CORRECTION_CAPABILITY ) & +CCS_SHADING_CORRECTION_CAPABILITY_COLOR_SHADING ) { +const struct v4l2_ctrl_config ctrl_cfg = { + .name ="Shading Correction" , + .type =V4L2_CTRL_TYPE_BOOLEAN , + .id =V4L2_CID_CCS_SHADING_CORRECTION , + .ops = &ccs_ctrl_ops, + .max =1 , + .step =1 , + }; + +v4l2_ctrl_new_custom (&sensor->pixel_array->ctrl_handler, + &ctrl_cfg,NULL ); + } + +if (CCS_LIM (sensor,SHADING_CORRECTION_CAPABILITY ) & +CCS_SHADING_CORRECTION_CAPABILITY_LUMINANCE_CORRECTION ) { +const struct v4l2_ctrl_config ctrl_cfg = { + .name ="Luminance Shading Correction" , + .type =V4L2_CTRL_TYPE_BOOLEAN , + .id =V4L2_CID_CCS_LUMINANCE_SHADING_CORRECTION , + .ops = &ccs_ctrl_ops, + .max =255 , + .step =1 , + .def =128 , + }; + +v4l2_ctrl_new_custom (&sensor->pixel_array->ctrl_handler, + &ctrl_cfg,NULL ); + } + +if (CCS_LIM (sensor,SHADING_CORRECTION_CAPABILITY ) & + (CCS_SHADING_CORRECTION_CAPABILITY_COLOR_SHADING | +CCS_SHADING_CORRECTION_CAPABILITY_LUMINANCE_CORRECTION )) { +u32 val = + ((CCS_LIM (sensor,SHADING_CORRECTION_CAPABILITY ) & +CCS_SHADING_CORRECTION_CAPABILITY_COLOR_SHADING ) ? +V4L2_CCS_SHADING_CORRECTION_COLOUR :0 ) | + ((CCS_LIM (sensor,SHADING_CORRECTION_CAPABILITY ) & +CCS_SHADING_CORRECTION_CAPABILITY_LUMINANCE_CORRECTION ) ? +V4L2_CCS_SHADING_CORRECTION_LUMINANCE :0 ); +const struct v4l2_ctrl_config ctrl_cfg = { + .name ="Shading Correction Capability" , + .type =V4L2_CTRL_TYPE_BITMASK , + .id =V4L2_CID_CCS_SHADING_CORRECTION_CAPABILITY , + .ops = &ccs_ctrl_ops, + .max = val, + .def = val, + .flags =V4L2_CTRL_FLAG_READ_ONLY , + }; + +v4l2_ctrl_new_custom (&sensor->pixel_array->ctrl_handler, + &ctrl_cfg,NULL ); + } +if (CCS_LIM (sensor,DIGITAL_GAIN_CAPABILITY ) ==CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL || CCS_LIM(sensor, DIGITAL_GAIN_CAPABILITY) ==
Signature · 1 line
2.27.0