Skip to contentSkip to conversation

net: cadence_gem: fix compilation error when debug is on

PATCH In review Ramon Fried 2 participants 5 messages Jun 15, 2019 – Apr 13, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 net: cadence_gem: fix compilation error when debug is on

defining CADENCE_GEM_ERR_DEBUG causes compilation
errors, fix that.

---
v2: change %lx to HWADDR_PRIx and %lx to %zdx
v3: change %zdx to %zx

 hw/net/cadence_gem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
hw/net/cadence_gem.c +3 -3
index 7f63411430..ecee22525c 100644
@@ -982,8 +982,8 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
             return -1;
         }
 
-        DB_PRINT("copy %d bytes to 0x%x\n", MIN(bytes_to_copy, rxbufsize),
-                rx_desc_get_buffer(s->rx_desc[q]));
+        DB_PRINT("copy %d bytes to 0x%" HWADDR_PRIx "\n", MIN(bytes_to_copy, rxbufsize),
+                rx_desc_get_buffer(s, s->rx_desc[q]));
 
         /* Copy packet data to emulated DMA buffer */
         address_space_write(&s->dma_as, rx_desc_get_buffer(s, s->rx_desc[q]) +
@@ -1156,7 +1156,7 @@ static void gem_transmit(CadenceGEMState *s)
             if (tx_desc_get_length(desc) > sizeof(tx_packet) -
                                                (p - tx_packet)) {
                 DB_PRINT("TX descriptor @ 0x%x too large: size 0x%x space " \
-                         "0x%x\n", (unsigned)packet_desc_addr,
+                         "0x%zx\n", (unsigned)packet_desc_addr,
                          (unsigned)tx_desc_get_length(desc),
                          sizeof(tx_packet) - (p - tx_packet));
                 break;
Signature · 1 line
2.21.0
Reviewed-by Tested-by on v3 1/1
#1 lore raw

Hi Ramon,

Quoted 28 lines · Ramon Fried

defining CADENCE_GEM_ERR_DEBUG causes compilation
errors, fix that.

---
v2: change %lx to HWADDR_PRIx and %lx to %zdx
v3: change %zdx to %zx

 hw/net/cadence_gem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
hw/net/cadence_gem.c +2 -2
index 7f63411430..ecee22525c 100644
@@ -982,8 +982,8 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
             return -1;
         }
 
-        DB_PRINT("copy %d bytes to 0x%x\n", MIN(bytes_to_copy, rxbufsize),
-                rx_desc_get_buffer(s->rx_desc[q]));
+        DB_PRINT("copy %d bytes to 0x%" HWADDR_PRIx "\n", MIN(bytes_to_copy, rxbufsize),
+                rx_desc_get_buffer(s, s->rx_desc[q]));
 
         /* Copy packet data to emulated DMA buffer */
         address_space_write(&s->dma_as, rx_desc_get_buffer(s, s->rx_desc[q]) +

hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1162

Quoted 8 lines
hw/net/cadence_gem.c +1 -1
@@ -1156,7 +1156,7 @@ static void gem_transmit(CadenceGEMState *s)
             if (tx_desc_get_length(desc) > sizeof(tx_packet) -
                                                (p - tx_packet)) {
                 DB_PRINT("TX descriptor @ 0x%x too large: size 0x%x space " \
-                         "0x%x\n", (unsigned)packet_desc_addr,
+                         "0x%zx\n", (unsigned)packet_desc_addr,
                          (unsigned)tx_desc_get_length(desc),
                          sizeof(tx_packet) - (p - tx_packet));
                 break;

I still get an error when trying to build on 32bit host with CADENCE_GEM_ERR_DEBUG enabled (pre-existing to your patch):

CC hw/net/cadence_gem.o
./hw/net/cadence_gem.c: In function 'gem_receive':
./hw/net/cadence_gem.c:973:14: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'size_t {aka unsigned int}' [-Werror=format=]

     DB_PRINT("config bufsize: %d packet size: %ld\n", rxbufsize, size);
              ^
./hw/net/cadence_gem.c:38:24: note: in definition of macro 'DB_PRINT'
     fprintf(stderr, ## __VA_ARGS__); \
                        ^

cc1: all warnings being treated as errors ./rules.mak:69: recipe for target 'hw/net/cadence_gem.o' failed
make: *** [hw/net/cadence_gem.o] Error 1

However the 64bit host is indeed fixed, so I'm fine with your patch:

Regards,

Phil.

#2 lore raw
Quoted 62 lines · Philippe Mathieu-Daudé

Hi Ramon,

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc,

Quoted 16 lines · Ramon Fried

defining CADENCE_GEM_ERR_DEBUG causes compilation
errors, fix that.

---
v2: change %lx to HWADDR_PRIx and %lx to %zdx
v3: change %zdx to %zx

 hw/net/cadence_gem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
hw/net/cadence_gem.c +0 -0
index 7f63411430..ecee22525c 100644
@@ -982,8 +982,8 @@ static ssize_t gem_receive(NetClientState *nc,

const uint8_t *buf, size_t size)

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)

Quoted 4 lines
hw/net/cadence_gem.c +0 -1
             return -1;
         }
 
-        DB_PRINT("copy %d bytes to 0x%x\n", MIN(bytes_to_copy,

rxbufsize),

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, · line 985

Quoted 2 lines
hw/net/cadence_gem.c +1 -1
-                rx_desc_get_buffer(s->rx_desc[q]));
+        DB_PRINT("copy %d bytes to 0x%" HWADDR_PRIx "\n",

MIN(bytes_to_copy, rxbufsize),

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)

Quoted 4 lines
hw/net/cadence_gem.c +1 -0
+                rx_desc_get_buffer(s, s->rx_desc[q]));
 
         /* Copy packet data to emulated DMA buffer */
         address_space_write(&s->dma_as, rx_desc_get_buffer(s,

s->rx_desc[q]) +

hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1158

Quoted 4 lines
hw/net/cadence_gem.c +0 -0
@@ -1156,7 +1156,7 @@ static void gem_transmit(CadenceGEMState *s)
             if (tx_desc_get_length(desc) > sizeof(tx_packet) -
                                                (p - tx_packet)) {
                 DB_PRINT("TX descriptor @ 0x%x too large: size 0x%x

space " \

hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1162

Quoted 6 lines
hw/net/cadence_gem.c +1 -1
-                         "0x%x\n", (unsigned)packet_desc_addr,
+                         "0x%zx\n", (unsigned)packet_desc_addr,
                          (unsigned)tx_desc_get_length(desc),
                          sizeof(tx_packet) - (p - tx_packet));
                 break;

I still get an error when trying to build on 32bit host with CADENCE_GEM_ERR_DEBUG enabled (pre-existing to your patch):

CC hw/net/cadence_gem.o
./hw/net/cadence_gem.c: In function 'gem_receive':
./hw/net/cadence_gem.c:973:14: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'size_t {aka unsigned int}' [-Werror=format=]
DB_PRINT("config bufsize: %d packet size: %ld\n", rxbufsize, size);

             ^
./hw/net/cadence_gem.c:38:24: note: in definition of macro 'DB_PRINT'
    fprintf(stderr, ## __VA_ARGS__); \
                       ^

cc1: all warnings being treated as errors ./rules.mak:69: recipe for target 'hw/net/cadence_gem.o' failed
make: *** [hw/net/cadence_gem.o] Error 1

Quoted 7 lines

However the 64bit host is indeed fixed, so I'm fine with your patch:

Regards,

Phil.

Thanks!

Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
#3 lore raw

Hi.
Just noticed that this patch didn't hit master.
Got lost ?

Thanks,
Ramon.

Quoted 77 lines · Ramon Fried
Quoted 62 lines · Philippe Mathieu-Daudé

Hi Ramon,

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc,

Quoted 16 lines · Ramon Fried

defining CADENCE_GEM_ERR_DEBUG causes compilation
errors, fix that.

---
v2: change %lx to HWADDR_PRIx and %lx to %zdx
v3: change %zdx to %zx

 hw/net/cadence_gem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
hw/net/cadence_gem.c +0 -0
index 7f63411430..ecee22525c 100644
@@ -982,8 +982,8 @@ static ssize_t gem_receive(NetClientState *nc,

const uint8_t *buf, size_t size)

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)

Quoted 4 lines
hw/net/cadence_gem.c +0 -1
             return -1;
         }
 
-        DB_PRINT("copy %d bytes to 0x%x\n", MIN(bytes_to_copy,

rxbufsize),

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, · line 985

Quoted 2 lines
hw/net/cadence_gem.c +1 -1
-                rx_desc_get_buffer(s->rx_desc[q]));
+        DB_PRINT("copy %d bytes to 0x%" HWADDR_PRIx "\n",

MIN(bytes_to_copy, rxbufsize),

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)

Quoted 4 lines
hw/net/cadence_gem.c +1 -0
+                rx_desc_get_buffer(s, s->rx_desc[q]));
 
         /* Copy packet data to emulated DMA buffer */
         address_space_write(&s->dma_as, rx_desc_get_buffer(s,

s->rx_desc[q]) +

hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1158

Quoted 4 lines
hw/net/cadence_gem.c +0 -0
@@ -1156,7 +1156,7 @@ static void gem_transmit(CadenceGEMState *s)
             if (tx_desc_get_length(desc) > sizeof(tx_packet) -
                                                (p - tx_packet)) {
                 DB_PRINT("TX descriptor @ 0x%x too large: size 0x%x

space " \

hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1162

Quoted 6 lines
hw/net/cadence_gem.c +1 -1
-                         "0x%x\n", (unsigned)packet_desc_addr,
+                         "0x%zx\n", (unsigned)packet_desc_addr,
                          (unsigned)tx_desc_get_length(desc),
                          sizeof(tx_packet) - (p - tx_packet));
                 break;

I still get an error when trying to build on 32bit host with CADENCE_GEM_ERR_DEBUG enabled (pre-existing to your patch):

CC hw/net/cadence_gem.o
./hw/net/cadence_gem.c: In function 'gem_receive':
./hw/net/cadence_gem.c:973:14: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'size_t {aka unsigned int}' [-Werror=format=]
DB_PRINT("config bufsize: %d packet size: %ld\n", rxbufsize, size);

             ^
./hw/net/cadence_gem.c:38:24: note: in definition of macro 'DB_PRINT'
    fprintf(stderr, ## __VA_ARGS__); \
                       ^

cc1: all warnings being treated as errors ./rules.mak:69: recipe for target 'hw/net/cadence_gem.o' failed
make: *** [hw/net/cadence_gem.o] Error 1

Quoted 7 lines

However the 64bit host is indeed fixed, so I'm fine with your patch:

Regards,

Phil.

Thanks!

--
Sent from my Android device with K-9 Mail. Please excuse my brevity.

#4 lore raw

False alarm, exact same patch was merged by someone else.

Quoted 86 lines · Ramon Fried

Hi.
Just noticed that this patch didn't hit master.
Got lost ?

Thanks,
Ramon.

Quoted 77 lines · Ramon Fried
Quoted 62 lines · Philippe Mathieu-Daudé

Hi Ramon,

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc,

Quoted 16 lines · Ramon Fried

defining CADENCE_GEM_ERR_DEBUG causes compilation
errors, fix that.

---
v2: change %lx to HWADDR_PRIx and %lx to %zdx
v3: change %zdx to %zx

 hw/net/cadence_gem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
hw/net/cadence_gem.c +0 -0
index 7f63411430..ecee22525c 100644
@@ -982,8 +982,8 @@ static ssize_t gem_receive(NetClientState *nc,

const uint8_t *buf, size_t size)

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)

Quoted 4 lines
hw/net/cadence_gem.c +0 -1
             return -1;
         }
 
-        DB_PRINT("copy %d bytes to 0x%x\n", MIN(bytes_to_copy,

rxbufsize),

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, · line 985

Quoted 2 lines
hw/net/cadence_gem.c +1 -1
-                rx_desc_get_buffer(s->rx_desc[q]));
+        DB_PRINT("copy %d bytes to 0x%" HWADDR_PRIx "\n",

MIN(bytes_to_copy, rxbufsize),

hw/net/cadence_gem.c static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)

Quoted 4 lines
hw/net/cadence_gem.c +1 -0
+                rx_desc_get_buffer(s, s->rx_desc[q]));
 
         /* Copy packet data to emulated DMA buffer */
         address_space_write(&s->dma_as, rx_desc_get_buffer(s,

s->rx_desc[q]) +

hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1158

Quoted 4 lines
hw/net/cadence_gem.c +0 -0
@@ -1156,7 +1156,7 @@ static void gem_transmit(CadenceGEMState *s)
             if (tx_desc_get_length(desc) > sizeof(tx_packet) -
                                                (p - tx_packet)) {
                 DB_PRINT("TX descriptor @ 0x%x too large: size 0x%x

space " \

hw/net/cadence_gem.c static void gem_transmit(CadenceGEMState *s) · line 1162

Quoted 6 lines
hw/net/cadence_gem.c +1 -1
-                         "0x%x\n", (unsigned)packet_desc_addr,
+                         "0x%zx\n", (unsigned)packet_desc_addr,
                          (unsigned)tx_desc_get_length(desc),
                          sizeof(tx_packet) - (p - tx_packet));
                 break;

I still get an error when trying to build on 32bit host with CADENCE_GEM_ERR_DEBUG enabled (pre-existing to your patch):

CC hw/net/cadence_gem.o
./hw/net/cadence_gem.c: In function 'gem_receive':
./hw/net/cadence_gem.c:973:14: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'size_t {aka unsigned int}' [-Werror=format=]
DB_PRINT("config bufsize: %d packet size: %ld\n", rxbufsize, size);

             ^
./hw/net/cadence_gem.c:38:24: note: in definition of macro 'DB_PRINT'
    fprintf(stderr, ## __VA_ARGS__); \
                       ^

cc1: all warnings being treated as errors ./rules.mak:69: recipe for target 'hw/net/cadence_gem.o' failed
make: *** [hw/net/cadence_gem.o] Error 1

Quoted 7 lines

However the 64bit host is indeed fixed, so I'm fine with your patch:

Regards,

Phil.

Thanks!

--
Sent from my Android device with K-9 Mail. Please excuse my brevity.