staging: gasket: Fix sparse "incorrect type in assignment" warnings.

PATCH Superseded Laurence Rochfort 3 participants 6 messages Oct 4, 2018 – Oct 15, 2018 Staging

lore

Share & tools

lore

Laurence Rochfort

author

2018-10-04 17:46 UTC #0 lore raw

PATCH 1/1 staging: gasket: Fix sparse "incorrect type in assignment" warnings.

Silence the below sparse warnings by casting betwen u8 __iomem *, and void *.

warning: incorrect type in assignment (different address spaces)
expected unsigned char [noderef] [usertype] <asn:2>*virt_base got void *[assigned] mem
warning: incorrect type in argument 3 (different address spaces)
expected void *cpu_addr
got unsigned char [noderef] [usertype] <asn:2>*virt_base

Signed-off-by Laurence Rochfort <[email protected]>

---
 drivers/staging/gasket/gasket_page_table.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

drivers/staging/gasket/gasket_page_table.c +5 -5

index d4c5f8a..7f5e5b3 100644
@@ -1278,7 +1278,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 				 dma_addr_t *dma_address, u64 index)
 {
 	dma_addr_t handle;
-	void *mem;
+	u8 __iomem *mem;
 	int j;
 	unsigned int num_pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
 	const struct gasket_driver_desc *driver_desc =

@@ -1290,7 +1290,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 	if (num_pages == 0)
 		return -EINVAL;
 
-	mem = dma_alloc_coherent(gasket_get_device(gasket_dev),
+	mem = (u8 __iomem *)dma_alloc_coherent(gasket_get_device(gasket_dev),
 				 num_pages * PAGE_SIZE, &handle, 0);
 	if (!mem)
 		goto nomem;

@@ -1325,7 +1325,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 nomem:
 	if (mem) {
 		dma_free_coherent(gasket_get_device(gasket_dev),
-				  num_pages * PAGE_SIZE, mem, handle);
+				  num_pages * PAGE_SIZE, (void __force *)mem, handle);
 	}
 
 	if (gasket_dev->page_table[index]->coherent_pages) {

@@ -1353,7 +1353,7 @@ int gasket_free_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 	if (gasket_dev->coherent_buffer.length_bytes) {
 		dma_free_coherent(gasket_get_device(gasket_dev),
 				  gasket_dev->coherent_buffer.length_bytes,
-				  gasket_dev->coherent_buffer.virt_base,
+				  (void __force *)gasket_dev->coherent_buffer.virt_base,
 				  gasket_dev->coherent_buffer.phys_base);
 		gasket_dev->coherent_buffer.length_bytes = 0;
 		gasket_dev->coherent_buffer.virt_base = NULL;

@@ -1372,7 +1372,7 @@ void gasket_free_coherent_memory_all(
 	if (gasket_dev->coherent_buffer.length_bytes) {
 		dma_free_coherent(gasket_get_device(gasket_dev),
 				  gasket_dev->coherent_buffer.length_bytes,
-				  gasket_dev->coherent_buffer.virt_base,
+				  (void __force *)gasket_dev->coherent_buffer.virt_base,
 				  gasket_dev->coherent_buffer.phys_base);
 		gasket_dev->coherent_buffer.length_bytes = 0;
 		gasket_dev->coherent_buffer.virt_base = NULL;

Signature · 1 line

2.9.5

Greg Kroah-Hartman

maintainer

2018-10-09 13:13 UTC #1 lore raw

Quoted 47 lines · Laurence Rochfort

Silence the below sparse warnings by casting betwen u8 __iomem *, and void *.

Signed-off-by Laurence Rochfort <[email protected]>

---
 drivers/staging/gasket/gasket_page_table.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

drivers/staging/gasket/gasket_page_table.c +3 -3

index d4c5f8a..7f5e5b3 100644
@@ -1278,7 +1278,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 				 dma_addr_t *dma_address, u64 index)
 {
 	dma_addr_t handle;
-	void *mem;
+	u8 __iomem *mem;
 	int j;
 	unsigned int num_pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
 	const struct gasket_driver_desc *driver_desc =

@@ -1290,7 +1290,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 	if (num_pages == 0)
 		return -EINVAL;
 
-	mem = dma_alloc_coherent(gasket_get_device(gasket_dev),
+	mem = (u8 __iomem *)dma_alloc_coherent(gasket_get_device(gasket_dev),
 				 num_pages * PAGE_SIZE, &handle, 0);
 	if (!mem)
 		goto nomem;

@@ -1325,7 +1325,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 nomem:
 	if (mem) {
 		dma_free_coherent(gasket_get_device(gasket_dev),
-				  num_pages * PAGE_SIZE, mem, handle);
+				  num_pages * PAGE_SIZE, (void __force *)mem, handle);
 	}
 
 	if (gasket_dev->page_table[index]->coherent_pages) {

drivers/staging/gasket/gasket_page_table.c int gasket_free_coherent_memory(struct gasket_dev *gasket_dev, u64 size, · line 1356

Quoted 5 lines

drivers/staging/gasket/gasket_page_table.c +1 -1

@@ -1353,7 +1353,7 @@ int gasket_free_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 	if (gasket_dev->coherent_buffer.length_bytes) {
 		dma_free_coherent(gasket_get_device(gasket_dev),
 				  gasket_dev->coherent_buffer.length_bytes,
-				  gasket_dev->coherent_buffer.virt_base,
+				  (void __force *)gasket_dev->coherent_buffer.virt_base,

We should not have to "force" anything here. Something feels wrong in the definition of these variable types...

thanks,

greg k-h

Laurence Rochfort

author

2018-10-10 13:53 UTC #2 lore raw

Quoted 46 lines · Greg Kroah-Hartman

Quoted 45 lines · Laurence Rochfort

Silence the below sparse warnings by casting betwen u8 __iomem *, and void *.

Signed-off-by Laurence Rochfort <[email protected]>

---
 drivers/staging/gasket/gasket_page_table.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

drivers/staging/gasket/gasket_page_table.c +3 -3

index d4c5f8a..7f5e5b3 100644
@@ -1278,7 +1278,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 				 dma_addr_t *dma_address, u64 index)
 {
 	dma_addr_t handle;
-	void *mem;
+	u8 __iomem *mem;
 	int j;
 	unsigned int num_pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
 	const struct gasket_driver_desc *driver_desc =

@@ -1290,7 +1290,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 	if (num_pages == 0)
 		return -EINVAL;
 
-	mem = dma_alloc_coherent(gasket_get_device(gasket_dev),
+	mem = (u8 __iomem *)dma_alloc_coherent(gasket_get_device(gasket_dev),
 				 num_pages * PAGE_SIZE, &handle, 0);
 	if (!mem)
 		goto nomem;

@@ -1325,7 +1325,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 nomem:
 	if (mem) {
 		dma_free_coherent(gasket_get_device(gasket_dev),
-				  num_pages * PAGE_SIZE, mem, handle);
+				  num_pages * PAGE_SIZE, (void __force *)mem, handle);
 	}

Quoted 10 lines

drivers/staging/gasket/gasket_page_table.c int gasket_free_coherent_memory(struct gasket_dev *gasket_dev, u64 size, · line 1356
Quoted 7 lines
drivers/staging/gasket/gasket_page_table.c +1 -1
 	if (gasket_dev->page_table[index]->coherent_pages) {
@@ -1353,7 +1353,7 @@ int gasket_free_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 	if (gasket_dev->coherent_buffer.length_bytes) {
 		dma_free_coherent(gasket_get_device(gasket_dev),
 				  gasket_dev->coherent_buffer.length_bytes,
-				  gasket_dev->coherent_buffer.virt_base,
+				  (void __force *)gasket_dev->coherent_buffer.virt_base,
We should not have to "force" anything here. Something feels wrong in the definition of these variable types...

From bde80ff6bdab740d838210aa3e664c8901b2142a Mon Sep 17 00:00:00 2001
From: Laurence Rochfort <[email protected]>
Date: Thu, 4 Oct 2018 18:42:26 +0100
Subject: [PATCH v2] staging: gasket: Fix sparse "incorrect type in assignment"
warnings.

Correct the coherent buffer data type and memory space cookie.

sparse errors were being generated when passing virt_base to dma_alloc_coherent().

Signed-off-by Laurence Rochfort <[email protected]>

---
Changes in v2:
- Correct data type rather than forcing type coersion, as per gkh

 drivers/staging/gasket/gasket_core.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/gasket/gasket_core.h +1 -1

index 275fd0b..9d09678 100644
@@ -231,7 +231,7 @@ struct gasket_coherent_buffer_desc {
 /* Coherent buffer structure. */
 struct gasket_coherent_buffer {
 	/* Virtual base address. */
-	u8 __iomem *virt_base;
+	void *virt_base;
 
 	/* Physical base address. */
 	ulong phys_base;

Signature · 1 line

2.9.5

Greg Kroah-Hartman

maintainer

2018-10-10 14:25 UTC #3 lore raw

Quoted 58 lines · Laurence Rochfort

Quoted 56 lines · Greg Kroah-Hartman
Quoted 47 lines · Laurence Rochfort
Silence the below sparse warnings by casting betwen u8 __iomem *, and void *.
warning: incorrect type in assignment (different address spaces)
expected unsigned char [noderef] [usertype] <asn:2>*virt_base got void *[assigned] mem
warning: incorrect type in argument 3 (different address spaces)
expected void *cpu_addr
got unsigned char [noderef] [usertype] <asn:2>*virt_base
Signed-off-by Laurence Rochfort <[email protected]>
---
 drivers/staging/gasket/gasket_page_table.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/gasket/gasket_page_table.c +3 -3
index d4c5f8a..7f5e5b3 100644
@@ -1278,7 +1278,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 				 dma_addr_t *dma_address, u64 index)
 {
 	dma_addr_t handle;
-	void *mem;
+	u8 __iomem *mem;
 	int j;
 	unsigned int num_pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
 	const struct gasket_driver_desc *driver_desc =
@@ -1290,7 +1290,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 	if (num_pages == 0)
 		return -EINVAL;
 
-	mem = dma_alloc_coherent(gasket_get_device(gasket_dev),
+	mem = (u8 __iomem *)dma_alloc_coherent(gasket_get_device(gasket_dev),
 				 num_pages * PAGE_SIZE, &handle, 0);
 	if (!mem)
 		goto nomem;
@@ -1325,7 +1325,7 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 nomem:
 	if (mem) {
 		dma_free_coherent(gasket_get_device(gasket_dev),
-				  num_pages * PAGE_SIZE, mem, handle);
+				  num_pages * PAGE_SIZE, (void __force *)mem, handle);
 	}
 
 	if (gasket_dev->page_table[index]->coherent_pages) {
drivers/staging/gasket/gasket_page_table.c int gasket_free_coherent_memory(struct gasket_dev *gasket_dev, u64 size, · line 1356
Quoted 5 lines
drivers/staging/gasket/gasket_page_table.c +1 -1
@@ -1353,7 +1353,7 @@ int gasket_free_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
 	if (gasket_dev->coherent_buffer.length_bytes) {
 		dma_free_coherent(gasket_get_device(gasket_dev),
 				  gasket_dev->coherent_buffer.length_bytes,
-				  gasket_dev->coherent_buffer.virt_base,
+				  (void __force *)gasket_dev->coherent_buffer.virt_base,
We should not have to "force" anything here. Something feels wrong in the definition of these variable types...

Quoted 7 lines

Quoted 1 line
From bde80ff6bdab740d838210aa3e664c8901b2142a Mon Sep 17 00:00:00 2001
From: Laurence Rochfort <[email protected]>
Date: Thu, 4 Oct 2018 18:42:26 +0100
Subject: [PATCH v2] staging: gasket: Fix sparse "incorrect type in assignment"
warnings.
Correct the coherent buffer data type and memory space cookie.

Why have you attached a patch? I can't do anything with that.

And it seems wrong as well, are you sure about this change?

greg k-h

Laurence Rochfort

author

2018-10-10 21:15 UTC #4 lore raw

PATCH v3 1/1 staging: gasket: Fix sparse "incorrect type in assignment" warnings.

Remove the coherent buffer __iomem cookie because the buffer is allocated from dma_alloc_coherent().

Signed-off-by Laurence Rochfort <[email protected]>

---
Changes in v3:
- Just remove the __iommem cookie, don't alter type.

 drivers/staging/gasket/gasket_core.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/gasket/gasket_core.h +1 -1

index 275fd0b..e62adcd 100644
@@ -231,7 +231,7 @@ struct gasket_coherent_buffer_desc {
 /* Coherent buffer structure. */
 struct gasket_coherent_buffer {
 	/* Virtual base address. */
-	u8 __iomem *virt_base;
+	u8 *virt_base;
 
 	/* Physical base address. */
 	ulong phys_base;

Signature · 1 line

2.9.5

Todd Poynor

Reviewed-by on v3 1/1

2018-10-15 18:42 UTC #5 lore raw

Quoted 33 lines · Laurence Rochfort

Remove the coherent buffer __iomem cookie because the buffer is allocated from dma_alloc_coherent().
warning: incorrect type in assignment (different address spaces)
expected unsigned char [noderef] [usertype] <asn:2>*virt_base got void *[assigned] mem
warning: incorrect type in argument 3 (different address spaces)
expected void *cpu_addr
got unsigned char [noderef] [usertype] <asn:2>*virt_base
Signed-off-by Laurence Rochfort <[email protected]>
---
Changes in v3:
- Just remove the __iommem cookie, don't alter type.
 drivers/staging/gasket/gasket_core.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/gasket/gasket_core.h +1 -2
index 275fd0b..e62adcd 100644
@@ -231,7 +231,7 @@ struct gasket_coherent_buffer_desc {
 /* Coherent buffer structure. */
 struct gasket_coherent_buffer {
        /* Virtual base address. */
-       u8 __iomem *virt_base;
+       u8 *virt_base;
 
        /* Physical base address. */
        ulong phys_base;
--

Quoted 1 line

2.9.5

Reviewed-by Todd Poynor <[email protected]>

Thanks!