Commit 2f908577 authored by Vladimir Lypak's avatar Vladimir Lypak Committed by Mauro Carvalho Chehab

media: qcom: camss: Fix overflows in clock rate calculations

Because of u32 type being used to store pixel clock rate, expression used
to calculate pipeline clocks (pixel_clock * bpp) produces wrong value due
to integer overflow. This patch changes data type used to store, pass and
retrieve pixel_clock from u32 to u64 to make this mistake less likely to
be repeated in the future.
Signed-off-by: default avatarVladimir Lypak <junak.pub@gmail.com>
Acked-by: default avatarRobert Foss <robert.foss@linaro.org>
Signed-off-by: default avatarAndrey Konovalov <andrey.konovalov@linaro.org>
Reviewed-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 78c2cc28
...@@ -1112,7 +1112,7 @@ static inline void vfe_isr_halt_ack(struct vfe_device *vfe) ...@@ -1112,7 +1112,7 @@ static inline void vfe_isr_halt_ack(struct vfe_device *vfe)
static int vfe_set_clock_rates(struct vfe_device *vfe) static int vfe_set_clock_rates(struct vfe_device *vfe)
{ {
struct device *dev = vfe->camss->dev; struct device *dev = vfe->camss->dev;
u32 pixel_clock[MSM_VFE_LINE_NUM]; u64 pixel_clock[MSM_VFE_LINE_NUM];
int i, j; int i, j;
int ret; int ret;
...@@ -1194,7 +1194,7 @@ static int vfe_set_clock_rates(struct vfe_device *vfe) ...@@ -1194,7 +1194,7 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
*/ */
static int vfe_check_clock_rates(struct vfe_device *vfe) static int vfe_check_clock_rates(struct vfe_device *vfe)
{ {
u32 pixel_clock[MSM_VFE_LINE_NUM]; u64 pixel_clock[MSM_VFE_LINE_NUM];
int i, j; int i, j;
int ret; int ret;
......
...@@ -578,7 +578,7 @@ s64 camss_get_link_freq(struct media_entity *entity, unsigned int bpp, ...@@ -578,7 +578,7 @@ s64 camss_get_link_freq(struct media_entity *entity, unsigned int bpp,
* *
* Return 0 on success or a negative error code otherwise * Return 0 on success or a negative error code otherwise
*/ */
int camss_get_pixel_clock(struct media_entity *entity, u32 *pixel_clock) int camss_get_pixel_clock(struct media_entity *entity, u64 *pixel_clock)
{ {
struct media_entity *sensor; struct media_entity *sensor;
struct v4l2_subdev *subdev; struct v4l2_subdev *subdev;
......
...@@ -110,7 +110,7 @@ void camss_disable_clocks(int nclocks, struct camss_clock *clock); ...@@ -110,7 +110,7 @@ void camss_disable_clocks(int nclocks, struct camss_clock *clock);
struct media_entity *camss_find_sensor(struct media_entity *entity); struct media_entity *camss_find_sensor(struct media_entity *entity);
s64 camss_get_link_freq(struct media_entity *entity, unsigned int bpp, s64 camss_get_link_freq(struct media_entity *entity, unsigned int bpp,
unsigned int lanes); unsigned int lanes);
int camss_get_pixel_clock(struct media_entity *entity, u32 *pixel_clock); int camss_get_pixel_clock(struct media_entity *entity, u64 *pixel_clock);
int camss_pm_domain_on(struct camss *camss, int id); int camss_pm_domain_on(struct camss *camss, int id);
void camss_pm_domain_off(struct camss *camss, int id); void camss_pm_domain_off(struct camss *camss, int id);
void camss_delete(struct camss *camss); void camss_delete(struct camss *camss);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment