| Message ID | 20201223195110.2264558-1-mkl@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/etnaviv: dump: fix sparse warnings | expand |
Am Mittwoch, dem 23.12.2020 um 20:51 +0100 schrieb Marc Kleine-Budde: > This patch fixes the following sparse warnings, by adding the missing endianess > conversion functions. > > > etnaviv/etnaviv_dump.c:78:26: warning: restricted __le32 degrades to integer > > etnaviv/etnaviv_dump.c:88:26: warning: incorrect type in assignment (different base types) > > etnaviv/etnaviv_dump.c:88:26: expected restricted __le32 [usertype] reg > > etnaviv/etnaviv_dump.c:88:26: got unsigned short const > > etnaviv/etnaviv_dump.c:89:28: warning: incorrect type in assignment (different base types) > > etnaviv/etnaviv_dump.c:89:28: expected restricted __le32 [usertype] value > > etnaviv/etnaviv_dump.c:89:28: got unsigned int > > etnaviv/etnaviv_dump.c:210:43: warning: incorrect type in assignment (different base types) > > etnaviv/etnaviv_dump.c:210:43: expected restricted __le32 > > etnaviv/etnaviv_dump.c:210:43: got long Thanks, I've added this patch to my etnaviv/next branch. Regards, Lucas > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > --- > drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c > index 706af0304ca4..f418e0b75772 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c > @@ -75,7 +75,7 @@ static void etnaviv_core_dump_header(struct core_dump_iterator *iter, > hdr->file_size = cpu_to_le32(data_end - iter->data); > > > > > iter->hdr++; > - iter->data += hdr->file_size; > + iter->data += le32_to_cpu(hdr->file_size); > } > > > > > static void etnaviv_core_dump_registers(struct core_dump_iterator *iter, > @@ -85,8 +85,8 @@ static void etnaviv_core_dump_registers(struct core_dump_iterator *iter, > unsigned int i; > > > > > for (i = 0; i < ARRAY_SIZE(etnaviv_dump_registers); i++, reg++) { > - reg->reg = etnaviv_dump_registers[i]; > - reg->value = gpu_read(gpu, etnaviv_dump_registers[i]); > + reg->reg = cpu_to_le32(etnaviv_dump_registers[i]); > + reg->value = cpu_to_le32(gpu_read(gpu, etnaviv_dump_registers[i])); > } > > > > > etnaviv_core_dump_header(iter, ETDUMP_BUF_REG, reg); > @@ -207,7 +207,7 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit) > if (!IS_ERR(pages)) { > int j; > > > > > - iter.hdr->data[0] = bomap - bomap_start; > + iter.hdr->data[0] = cpu_to_le32((bomap - bomap_start)); > > > > > for (j = 0; j < obj->base.size >> PAGE_SHIFT; j++) > *bomap++ = cpu_to_le64(page_to_phys(*pages++));
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c index 706af0304ca4..f418e0b75772 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c @@ -75,7 +75,7 @@ static void etnaviv_core_dump_header(struct core_dump_iterator *iter, hdr->file_size = cpu_to_le32(data_end - iter->data); iter->hdr++; - iter->data += hdr->file_size; + iter->data += le32_to_cpu(hdr->file_size); } static void etnaviv_core_dump_registers(struct core_dump_iterator *iter, @@ -85,8 +85,8 @@ static void etnaviv_core_dump_registers(struct core_dump_iterator *iter, unsigned int i; for (i = 0; i < ARRAY_SIZE(etnaviv_dump_registers); i++, reg++) { - reg->reg = etnaviv_dump_registers[i]; - reg->value = gpu_read(gpu, etnaviv_dump_registers[i]); + reg->reg = cpu_to_le32(etnaviv_dump_registers[i]); + reg->value = cpu_to_le32(gpu_read(gpu, etnaviv_dump_registers[i])); } etnaviv_core_dump_header(iter, ETDUMP_BUF_REG, reg); @@ -207,7 +207,7 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit) if (!IS_ERR(pages)) { int j; - iter.hdr->data[0] = bomap - bomap_start; + iter.hdr->data[0] = cpu_to_le32((bomap - bomap_start)); for (j = 0; j < obj->base.size >> PAGE_SHIFT; j++) *bomap++ = cpu_to_le64(page_to_phys(*pages++));
This patch fixes the following sparse warnings, by adding the missing endianess conversion functions. | etnaviv/etnaviv_dump.c:78:26: warning: restricted __le32 degrades to integer | etnaviv/etnaviv_dump.c:88:26: warning: incorrect type in assignment (different base types) | etnaviv/etnaviv_dump.c:88:26: expected restricted __le32 [usertype] reg | etnaviv/etnaviv_dump.c:88:26: got unsigned short const | etnaviv/etnaviv_dump.c:89:28: warning: incorrect type in assignment (different base types) | etnaviv/etnaviv_dump.c:89:28: expected restricted __le32 [usertype] value | etnaviv/etnaviv_dump.c:89:28: got unsigned int | etnaviv/etnaviv_dump.c:210:43: warning: incorrect type in assignment (different base types) | etnaviv/etnaviv_dump.c:210:43: expected restricted __le32 | etnaviv/etnaviv_dump.c:210:43: got long Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)