SMIA NVM handling improvements
Subsystems (2)
cover SMIA NVM handling improvements
Hi all,
This set removes the need for the nokia,nvm-size property, and contains small fixes and improvements as well.
Sakari Ailus (7):
smiapp: Use the BIT macro where appropriate, remove useless definition
smiapp: Fix error handling at NVM reading
smiapp: Refactor reading NVM page
smiapp: Add definitions for data transfer if capability bits
smiapp: Don't poll for NVM ready on devices that don't need it
smiapp: Support probing NVM size
dt-bindings: smia: Remove documentation of nokia,nvm-size
.../bindings/media/i2c/nokia,smia.txt | 2 - drivers/media/i2c/smiapp/smiapp-core.c | 164 ++++++++++-------- drivers/media/i2c/smiapp/smiapp-reg.h | 36 ++-- drivers/media/i2c/smiapp/smiapp.h | 3 - include/media/i2c/smiapp.h | 1 - 5 files changed, 108 insertions(+), 98 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/7 smiapp: Use the BIT macro where appropriate, remove useless definition
The BIT macro is a better way to define register bits, for 1 << bit is risky for 32-bit registers.
Also remove the definition of SMIAPP_DATA_TRANSFER_IF_1_CTRL_RD_EN which has a value of zero.
--- drivers/media/i2c/smiapp/smiapp-core.c | 3 +-- drivers/media/i2c/smiapp/smiapp-reg.h | 33 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +1 -2
@@ -986,8 +986,7 @@ static int smiapp_read_nvm(struct smiapp_sensor *sensor, rval =smiapp_write (sensor,SMIAPP_REG_U8_DATA_TRANSFER_IF_1_CTRL , -SMIAPP_DATA_TRANSFER_IF_1_CTRL_EN | -SMIAPP_DATA_TRANSFER_IF_1_CTRL_RD_EN ); +SMIAPP_DATA_TRANSFER_IF_1_CTRL_EN );if (rval) goto out;
drivers/media/i2c/smiapp/smiapp-reg.h +17 -16
@@ -11,25 +11,26 @@#ifndef __SMIAPP_REG_H_#define __SMIAPP_REG_H_ +#include <linux/bits.h> +#include "smiapp-reg-defs.h" /* Bits for above register */ -#define SMIAPP_IMAGE_ORIENTATION_HFLIP (1 << 0) -#define SMIAPP_IMAGE_ORIENTATION_VFLIP (1 << 1) - -#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_EN (1 << 0) -#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_RD_EN (0 << 1) -#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_WR_EN (1 << 1) -#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_ERR_CLEAR (1 << 2) -#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY (1 << 0) -#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_WR_READY (1 << 1) -#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_EDATA (1 << 2) -#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_EUSAGE (1 << 3) - -#define SMIAPP_SOFTWARE_RESET (1 << 0) - -#define SMIAPP_FLASH_MODE_CAPABILITY_SINGLE_STROBE (1 << 0) -#define SMIAPP_FLASH_MODE_CAPABILITY_MULTIPLE_STROBE (1 << 1) +#define SMIAPP_IMAGE_ORIENTATION_HFLIP BIT(0) +#define SMIAPP_IMAGE_ORIENTATION_VFLIP BIT(1) + +#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_EN BIT(0) +#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_WR_EN BIT(1) +#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_ERR_CLEAR BIT(2) +#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY BIT(0) +#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_WR_READY BIT(1) +#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_EDATA BIT(2) +#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_EUSAGE BIT(3) + +#define SMIAPP_SOFTWARE_RESET BIT(0) + +#define SMIAPP_FLASH_MODE_CAPABILITY_SINGLE_STROBE BIT(0) +#define SMIAPP_FLASH_MODE_CAPABILITY_MULTIPLE_STROBE BIT(1)#define SMIAPP_DPHY_CTRL_AUTOMATIC 0/* DPHY control based on REQUESTED_LINK_BIT_RATE_MBPS */
Signature · 1 line
2.20.1
PATCH 2/7 smiapp: Fix error handling at NVM reading
In reply to Sakari AilusIf NVM reading failed, the device was left powered on. Fix that.
--- drivers/media/i2c/smiapp/smiapp-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/i2c/smiapp/smiapp-core.c +2 -1
@@ -2326,11 +2326,12 @@ smiapp_sysfs_nvm_read(struct device *dev, struct device_attribute *attr,if (rval <0 ) {if (rval != -EBUSY && rval != -EAGAIN )pm_runtime_set_active (&client->dev); -pm_runtime_put (&client->dev); +pm_runtime_put_noidle (&client->dev);return -ENODEV ; }if (smiapp_read_nvm (sensor, sensor->nvm)) { +pm_runtime_put (&client->dev);dev_err (&client->dev,"nvm read failed\n" );return -ENODEV ; }
Signature · 1 line
2.20.1
PATCH 3/7 smiapp: Refactor reading NVM page
In reply to Sakari AilusSplit out reading a single NVM page into a separate function.
--- drivers/media/i2c/smiapp/smiapp-core.c | 83 ++++++++++++++------------ 1 file changed, 46 insertions(+), 37 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +46 -37
@@ -970,56 +970,65 @@ static int smiapp_update_mode(struct smiapp_sensor *sensor)* SMIA++ NVM handling * */ -static int smiapp_read_nvm (struct smiapp_sensor *sensor, -unsigned char *nvm) + +static int smiapp_read_nvm_page (struct smiapp_sensor *sensor,u32 p,u8 *nvm) { -u32 i, s, p, np, v; -int rval =0 , rval2; +unsigned int i; +int rval; - np = sensor->nvm_size /SMIAPP_NVM_PAGE_SIZE ; -for (p =0 ; p < np; p++) { - rval =smiapp_write ( + rval =smiapp_write (sensor, +SMIAPP_REG_U8_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 ); +if (rval) +return rval; + +for (i =1000 ; i >0 ; i--) { +u32 s; + + rval =smiapp_read ( sensor, -SMIAPP_REG_U8_DATA_TRANSFER_IF_1_PAGE_SELECT , p); -if (rval) - goto out; +SMIAPP_REG_U8_DATA_TRANSFER_IF_1_STATUS , &s); - rval =smiapp_write (sensor, -SMIAPP_REG_U8_DATA_TRANSFER_IF_1_CTRL , -SMIAPP_DATA_TRANSFER_IF_1_CTRL_EN );if (rval) - goto out; +return rval; -for (i =1000 ; i >0 ; i--) { - rval =smiapp_read ( - sensor, -SMIAPP_REG_U8_DATA_TRANSFER_IF_1_STATUS , &s); +if (s &SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY ) +break ; + } +if (!i) +return -ETIMEDOUT ; -if (rval) - goto out; +for (i =0 ; i <SMIAPP_NVM_PAGE_SIZE ; i++) { +u32 v; -if (s &SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY ) -break ; + rval =smiapp_read (sensor, +SMIAPP_REG_U8_DATA_TRANSFER_IF_1_DATA_0 + i, + &v); +if (rval) +return rval; - } -if (!i) { - rval = -ETIMEDOUT ; - goto out; - } + *nvm++ = v; + } -for (i =0 ; i <SMIAPP_NVM_PAGE_SIZE ; i++) { - rval =smiapp_read ( - sensor, -SMIAPP_REG_U8_DATA_TRANSFER_IF_1_DATA_0 + i, - &v); -if (rval) - goto out; +return 0 ; +} - *nvm++ = v; - } +static int smiapp_read_nvm (struct smiapp_sensor *sensor, +unsigned char *nvm) +{ +u32 p, np; +int rval =0 , rval2; + + np = sensor->nvm_size /SMIAPP_NVM_PAGE_SIZE ; +for (p =0 ; p < np && !rval; p++) { + rval =smiapp_read_nvm_page (sensor, p, nvm); + nvm +=SMIAPP_NVM_PAGE_SIZE ; } -out: rval2 =smiapp_write (sensor,SMIAPP_REG_U8_DATA_TRANSFER_IF_1_CTRL ,0 );if (rval <0 )return rval;
Signature · 1 line
2.20.1
PATCH 4/7 smiapp: Add definitions for data transfer if capability bits
In reply to Sakari AilusThe data transfer capability register was defined but its bits were not. Do that now.
--- drivers/media/i2c/smiapp/smiapp-reg.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/i2c/smiapp/smiapp-reg.h +3 -0
@@ -27,6 +27,9 @@#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_EDATA BIT(2)#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_EUSAGE BIT(3) +#define SMIAPP_DATA_TRANSFER_IF_CAPABILITY_SUPPORTED BIT(0) +#define SMIAPP_DATA_TRANSFER_IF_CAPABILITY_POLL BIT(2) +#define SMIAPP_SOFTWARE_RESET BIT(0)#define SMIAPP_FLASH_MODE_CAPABILITY_SINGLE_STROBE BIT(0)
Signature · 1 line
2.20.1
PATCH 5/7 smiapp: Don't poll for NVM ready on devices that don't need it
In reply to Sakari AilusOnly some devices require polling for NVM ready. Do the polling only on devices that need it.
--- drivers/media/i2c/smiapp/smiapp-core.c | 28 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 11 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +17 -11
@@ -986,21 +986,27 @@ static int smiapp_read_nvm_page(struct smiapp_sensor *sensor, u32 p, u8 *nvm)if (rval)return rval; -for (i =1000 ; i >0 ; i--) { -u32 s; +if (sensor->limits[SMIAPP_LIMIT_DATA_TRANSFER_IF_CAPABILITY ] & +SMIAPP_DATA_TRANSFER_IF_CAPABILITY_POLL ) { +for (i =1000 ; i >0 ; i--) { +u32 s; - rval =smiapp_read ( - sensor, -SMIAPP_REG_U8_DATA_TRANSFER_IF_1_STATUS , &s); + rval =smiapp_read ( + sensor, +SMIAPP_REG_U8_DATA_TRANSFER_IF_1_STATUS , + &s); -if (rval) -return rval; +if (rval) +return rval; -if (s &SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY ) -break ; +if (s &SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY ) +break ; + + } + +if (!i) +return -ETIMEDOUT ; } -if (!i) -return -ETIMEDOUT ;for (i =0 ; i <SMIAPP_NVM_PAGE_SIZE ; i++) {u32 v;
Signature · 1 line
2.20.1
PATCH 6/7 smiapp: Support probing NVM size
In reply to Sakari AilusThe interface supports probing for the NVM size but this was not implemented in the driver. Do that now.
This will also make nokia,nvm-size property redundant.
--- drivers/media/i2c/smiapp/smiapp-core.c | 103 ++++++++++++------------- drivers/media/i2c/smiapp/smiapp.h | 3 - include/media/i2c/smiapp.h | 1 - 3 files changed, 50 insertions(+), 57 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +50 -53
@@ -971,10 +971,14 @@ static int smiapp_update_mode(struct smiapp_sensor *sensor)* */ -static int smiapp_read_nvm_page (struct smiapp_sensor *sensor,u32 p,u8 *nvm) +static int smiapp_read_nvm_page (struct smiapp_sensor *sensor,u32 p,u8 *nvm, +u8 *status) {unsigned int i;int rval; +u32 s; + + *status =0 ; rval =smiapp_write (sensor,SMIAPP_REG_U8_DATA_TRANSFER_IF_1_PAGE_SELECT , p);
@@ -986,10 +990,21 @@ static int smiapp_read_nvm_page(struct smiapp_sensor *sensor, u32 p, u8 *nvm)if (rval)return rval; + rval =smiapp_read (sensor,SMIAPP_REG_U8_DATA_TRANSFER_IF_1_STATUS , + &s); +if (rval) +return rval; + +if (s &SMIAPP_DATA_TRANSFER_IF_1_STATUS_EUSAGE ) { + *status = s; +return -ENODATA ; + } +if (sensor->limits[SMIAPP_LIMIT_DATA_TRANSFER_IF_CAPABILITY ] &SMIAPP_DATA_TRANSFER_IF_CAPABILITY_POLL ) {for (i =1000 ; i >0 ; i--) { -u32 s; +if (s &SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY ) +break ; rval = smiapp_read( sensor,
@@ -998,10 +1013,6 @@ static int smiapp_read_nvm_page(struct smiapp_sensor *sensor, u32 p, u8 *nvm)if (rval)return rval; - -if (s &SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY ) -break ; - }if (!i)
@@ -1023,23 +1034,27 @@ static int smiapp_read_nvm_page(struct smiapp_sensor *sensor, u32 p, u8 *nvm)return 0 ; } -static int smiapp_read_nvm (struct smiapp_sensor *sensor, -unsigned char *nvm) +static int smiapp_read_nvm (struct smiapp_sensor *sensor,unsigned char *nvm, +size_t nvm_size) { -u32 p, np; +u8 status =0 ; +u32 p;int rval =0 , rval2; - np = sensor->nvm_size /SMIAPP_NVM_PAGE_SIZE ; -for (p =0 ; p < np && !rval; p++) { - rval =smiapp_read_nvm_page (sensor, p, nvm); +for (p =0 ; p < nvm_size /SMIAPP_NVM_PAGE_SIZE && !rval; p++) { + rval =smiapp_read_nvm_page (sensor, p, nvm, &status); nvm +=SMIAPP_NVM_PAGE_SIZE ; } +if (rval == -ENODATA && + status &SMIAPP_DATA_TRANSFER_IF_1_STATUS_EUSAGE ) + rval =0 ; + rval2 =smiapp_write (sensor,SMIAPP_REG_U8_DATA_TRANSFER_IF_1_CTRL ,0 );if (rval <0 )return rval;else -return rval2; +return rval2 ?: p *SMIAPP_NVM_PAGE_SIZE ; }/*
@@ -2326,42 +2341,34 @@ smiapp_sysfs_nvm_read(struct device *dev, struct device_attribute *attr,struct v4l2_subdev *subdev =i2c_get_clientdata (to_i2c_client (dev));struct i2c_client *client =v4l2_get_subdevdata (subdev);struct smiapp_sensor *sensor =to_smiapp_sensor (subdev); -unsigned int nbytes; +int rval;if (!sensor->dev_init_done)return -EBUSY ; -if (!sensor->nvm_size) { -int rval; - -/* NVM not read yet - read it now */ - sensor->nvm_size = sensor->hwcfg->nvm_size; + 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 -ENODEV ; + } - 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 -ENODEV ; - } + rval =smiapp_read_nvm (sensor, buf,PAGE_SIZE ); +if (rval <0 ) { +pm_runtime_put (&client->dev); +dev_err (&client->dev,"nvm read failed\n" ); +return -ENODEV ; + } -if (smiapp_read_nvm (sensor, sensor->nvm)) { -pm_runtime_put (&client->dev); -dev_err (&client->dev,"nvm read failed\n" ); -return -ENODEV ; - } +pm_runtime_mark_last_busy (&client->dev); +pm_runtime_put_autosuspend (&client->dev); -pm_runtime_mark_last_busy (&client->dev); -pm_runtime_put_autosuspend (&client->dev); - }/* * NVM is still way below a PAGE_SIZE, so we can safely * assume this for now. */ - nbytes = min_t(unsigned int, sensor->nvm_size, PAGE_SIZE); -memcpy (buf, sensor->nvm, nbytes); - -return nbytes; +return rval; } static DEVICE_ATTR(nvm, S_IRUGO, smiapp_sysfs_nvm_read, NULL);
@@ -2825,16 +2832,13 @@ static struct smiapp_hwconfig *smiapp_get_hwconfig(struct device *dev) } } -/* NVM size is not mandatory */ -fwnode_property_read_u32 (fwnode,"nokia,nvm-size" , &hwcfg->nvm_size); - rval =fwnode_property_read_u32 (dev_fwnode (dev),"clock-frequency" , &hwcfg->ext_clk);if (rval)dev_info (dev,"can't get clock-frequency\n" ); -dev_dbg (dev,"nvm %d, clk %d, mode %d\n" , - hwcfg->nvm_size, hwcfg->ext_clk, hwcfg->csi_signalling_mode); +dev_dbg (dev,"clk %d, mode %d\n" , hwcfg->ext_clk, + hwcfg->csi_signalling_mode);if (!bus_cfg.nr_of_link_frequencies) {dev_warn (dev,"no link frequencies defined\n" );
@@ -3018,17 +3022,10 @@ static int smiapp_probe(struct i2c_client *client) rval = -ENOENT ; goto out_power_off; } -/* SMIA++ NVM initialization - it will be read from the sensor -* when it is first requested by userspace. -*/ -if (sensor->minfo.smiapp_version && sensor->hwcfg->nvm_size) { - sensor->nvm =devm_kzalloc (&client->dev, - sensor->hwcfg->nvm_size,GFP_KERNEL ); -if (sensor->nvm ==NULL ) { - rval = -ENOMEM ; - goto out_cleanup; - } +if (sensor->minfo.smiapp_version && + sensor->limits[SMIAPP_LIMIT_DATA_TRANSFER_IF_CAPABILITY ] & +SMIAPP_DATA_TRANSFER_IF_CAPABILITY_SUPPORTED ) {if (device_create_file (&client->dev, &dev_attr_nvm) !=0 ) {dev_err (&client->dev,"sysfs nvm entry failed\n" ); rval = -EBUSY ;
drivers/media/i2c/smiapp/smiapp.h +0 -3
@@ -208,9 +208,6 @@ struct smiapp_sensor {bool dev_init_done;u8 compressed_min_bpp; -u8 *nvm;/* nvm memory buffer */ -unsigned int nvm_size;/* bytes */ -struct smiapp_module_info minfo;struct smiapp_pll pll;
include/media/i2c/smiapp.h +0 -1
@@ -49,7 +49,6 @@ struct smiapp_hwconfig {unsigned short i2c_addr_dfl;/* Default i2c addr */ unsigned short i2c_addr_alt;/* Alternate i2c addr */ -uint32_t nvm_size;/* bytes */ uint32_t ext_clk;/* sensor external clk */ unsigned int lanes;/* Number of CSI-2 lanes */
Signature · 1 line
2.20.1
PATCH 7/7 dt-bindings: smia: Remove documentation of nokia,nvm-size
In reply to Sakari AilusThe nokia,nvm-size property was used to tell the size of the NVM memory accessible through the sensor's register interface. However, while the size isn't directly readable through the sensor's register interface, it can be detected reading the NVM memory until the selected page is no longer available.
Thus remove this property.
--- Documentation/devicetree/bindings/media/i2c/nokia,smia.txt | 2 -- 1 file changed, 2 deletions(-)
Documentation/devicetree/bindings/media/i2c/nokia,smia.txt +0 -2
@@ -24,8 +24,6 @@ Mandatory properties Optional properties ------------------- -- nokia,nvm-size: The size of the NVM, in bytes. If the size is not given, - the NVM contents will not be read. - reset-gpios: XSHUTDOWN GPIO - flash-leds: See ../video-interfaces.txt - lens-focus: See ../video-interfaces.txt
Signature · 1 line
2.20.1
Re: [PATCH 7/7] dt-bindings: smia: Remove documentation of nokia,nvm-size
Quoted 6 lines · Sakari Ailus
The nokia,nvm-size property was used to tell the size of the NVM memory accessible through the sensor's register interface. However, while the size isn't directly readable through the sensor's register interface, it can be detected reading the NVM memory until the selected page is no longer available.
Quoted 7 lines
Thus remove this property.
Signed-off-by Sakari Ailus <[email protected]>--- Documentation/devicetree/bindings/media/i2c/nokia,smia.txt | 2 -- 1 file changed, 2 deletions(-)