2023-04-04 12:46:07

by Simon Horman

Subject: [PATCH] remoteproc: pru: remove always true check positive unsigned value

In both cases they type of da is u32. And PRU_PDRAM_DA is 0.
So the check da >= PRU_PDRAM_DA is always true and can be removed.

Flagged by Smatch:

drivers/remoteproc/pru_rproc.c:660 pru_d_da_to_va() warn: always true condition '(da >= 0) => (0-u32max >= 0)'
drivers/remoteproc/pru_rproc.c:709 pru_i_da_to_va() warn: always true condition '(da >= 0) => (0-u32max >= 0)'

No functional changes intended.
Compile tested only.

Reported-by: kernel test robot <[email protected]>
Link: https://www.spinics.net/lists/kernel/msg4025983.html
Signed-off-by: Simon Horman <[email protected]>
---
drivers/remoteproc/pru_rproc.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
index b76db7fa693d..095f66130f48 100644
--- a/drivers/remoteproc/pru_rproc.c
+++ b/drivers/remoteproc/pru_rproc.c
@@ -657,7 +657,7 @@ static void *pru_d_da_to_va(struct pru_rproc *pru, u32 da, size_t len)
swap(dram0, dram1);
shrd_ram = pruss->mem_regions[PRUSS_MEM_SHRD_RAM2];

- if (da >= PRU_PDRAM_DA && da + len <= PRU_PDRAM_DA + dram0.size) {
+ if (da + len <= PRU_PDRAM_DA + dram0.size) {
offset = da - PRU_PDRAM_DA;
va = (__force void *)(dram0.va + offset);
} else if (da >= PRU_SDRAM_DA &&
@@ -706,8 +706,7 @@ static void *pru_i_da_to_va(struct pru_rproc *pru, u32 da, size_t len)
*/
da &= 0xfffff;

- if (da >= PRU_IRAM_DA &&
- da + len <= PRU_IRAM_DA + pru->mem_regions[PRU_IOMEM_IRAM].size) {
+ if (da + len <= PRU_IRAM_DA + pru->mem_regions[PRU_IOMEM_IRAM].size) {
offset = da - PRU_IRAM_DA;
va = (__force void *)(pru->mem_regions[PRU_IOMEM_IRAM].va +
offset);

2023-04-04 13:11:24

by Mukesh Ojha

Subject: Re: [PATCH] remoteproc: pru: remove always true check positive unsigned value

On 4/4/2023 6:14 PM, Simon Horman wrote:
> In both cases they type of da is u32. And PRU_PDRAM_DA is 0.
> So the check da >= PRU_PDRAM_DA is always true and can be removed.
>
> Flagged by Smatch:
>
> drivers/remoteproc/pru_rproc.c:660 pru_d_da_to_va() warn: always true condition '(da >= 0) => (0-u32max >= 0)'
> drivers/remoteproc/pru_rproc.c:709 pru_i_da_to_va() warn: always true condition '(da >= 0) => (0-u32max >= 0)'
>
> No functional changes intended.
> Compile tested only.
>
> Reported-by: kernel test robot <[email protected]>
> Link: https://www.spinics.net/lists/kernel/msg4025983.html
> Signed-off-by: Simon Horman <[email protected]>
> ---
> drivers/remoteproc/pru_rproc.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
> index b76db7fa693d..095f66130f48 100644
> --- a/drivers/remoteproc/pru_rproc.c
> +++ b/drivers/remoteproc/pru_rproc.c
> @@ -657,7 +657,7 @@ static void *pru_d_da_to_va(struct pru_rproc *pru, u32 da, size_t len)
> swap(dram0, dram1);
> shrd_ram = pruss->mem_regions[PRUSS_MEM_SHRD_RAM2];
>
> - if (da >= PRU_PDRAM_DA && da + len <= PRU_PDRAM_DA + dram0.size) {
> + if (da + len <= PRU_PDRAM_DA + dram0.size) {
> offset = da - PRU_PDRAM_DA;
> va = (__force void *)(dram0.va + offset);
> } else if (da >= PRU_SDRAM_DA &&
> @@ -706,8 +706,7 @@ static void *pru_i_da_to_va(struct pru_rproc *pru, u32 da, size_t len)
> */
> da &= 0xfffff;
>
> - if (da >= PRU_IRAM_DA &&
> - da + len <= PRU_IRAM_DA + pru->mem_regions[PRU_IOMEM_IRAM].size) {
> + if (da + len <= PRU_IRAM_DA + pru->mem_regions[PRU_IOMEM_IRAM].size) {
> offset = da - PRU_IRAM_DA;
> va = (__force void *)(pru->mem_regions[PRU_IOMEM_IRAM].va +

LGTM.
Reviewed-by: Mukesh Ojha <[email protected]>


--Mukesh
> offset);
>

2023-04-05 17:04:00

by Mathieu Poirier

Subject: Re: [PATCH] remoteproc: pru: remove always true check positive unsigned value

On Tue, Apr 04, 2023 at 02:44:53PM +0200, Simon Horman wrote:
> In both cases they type of da is u32. And PRU_PDRAM_DA is 0.
> So the check da >= PRU_PDRAM_DA is always true and can be removed.
>
> Flagged by Smatch:
>
> drivers/remoteproc/pru_rproc.c:660 pru_d_da_to_va() warn: always true condition '(da >= 0) => (0-u32max >= 0)'
> drivers/remoteproc/pru_rproc.c:709 pru_i_da_to_va() warn: always true condition '(da >= 0) => (0-u32max >= 0)'
>
> No functional changes intended.
> Compile tested only.
>
> Reported-by: kernel test robot <[email protected]>
> Link: https://www.spinics.net/lists/kernel/msg4025983.html
> Signed-off-by: Simon Horman <[email protected]>
> ---
> drivers/remoteproc/pru_rproc.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>

Applied

Thanks,
Mathieu


> diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
> index b76db7fa693d..095f66130f48 100644
> --- a/drivers/remoteproc/pru_rproc.c
> +++ b/drivers/remoteproc/pru_rproc.c
> @@ -657,7 +657,7 @@ static void *pru_d_da_to_va(struct pru_rproc *pru, u32 da, size_t len)
> swap(dram0, dram1);
> shrd_ram = pruss->mem_regions[PRUSS_MEM_SHRD_RAM2];
>
> - if (da >= PRU_PDRAM_DA && da + len <= PRU_PDRAM_DA + dram0.size) {
> + if (da + len <= PRU_PDRAM_DA + dram0.size) {
> offset = da - PRU_PDRAM_DA;
> va = (__force void *)(dram0.va + offset);
> } else if (da >= PRU_SDRAM_DA &&
> @@ -706,8 +706,7 @@ static void *pru_i_da_to_va(struct pru_rproc *pru, u32 da, size_t len)
> */
> da &= 0xfffff;
>
> - if (da >= PRU_IRAM_DA &&
> - da + len <= PRU_IRAM_DA + pru->mem_regions[PRU_IOMEM_IRAM].size) {
> + if (da + len <= PRU_IRAM_DA + pru->mem_regions[PRU_IOMEM_IRAM].size) {
> offset = da - PRU_IRAM_DA;
> va = (__force void *)(pru->mem_regions[PRU_IOMEM_IRAM].va +
> offset);
>