xen/serial: scif: Rework how the parameters are found
PATCH 1/1 xen/serial: scif: Rework how the parameters are found
From: Julien Grall <[email protected]>
clang 11 will throw the following error while build Xen:
scif-uart.c:333:33: error: cast to smaller integer type 'enum port_types' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]
uart->params = &port_params[(enum port_types)match->data];
^~~~~~~~~~~~~~~~~~~~~~~~~~~~The error can be prevented by directly storing a pointer to the port parameters rather than the a cast of the port type.
---
Only build tested as I don't have the HW.
--- xen/drivers/char/scif-uart.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
xen/drivers/char/scif-uart.c +3 -3
@@ -286,8 +286,8 @@ static struct uart_driver __read_mostly scif_uart_driver = {static const struct dt_device_match scif_uart_dt_match[]__initconst = { - { .compatible ="renesas,scif" , .data = (void *)SCIF_PORT }, - { .compatible ="renesas,scifa" , .data = (void *)SCIFA_PORT }, + { .compatible ="renesas,scif" , .data = &port_params[SCIF_PORT ] }, + { .compatible ="renesas,scifa" , .data = &port_params[SCIFA_PORT ] }, {/* sentinel */ }, };
@@ -330,7 +330,7 @@ static int __init scif_uart_init(struct dt_device_node *dev, match =dt_match_node (scif_uart_dt_match, dev);ASSERT ( match ); - uart->params = &port_params[(enum port_types )match->data]; + uart->params = match->data; uart->vuart.base_addr = addr; uart->vuart.size = size;
Signature · 1 line
2.17.1
On 24.12.20 18:50, Julien Grall wrote:
Hi Julien
Quoted 8 lines
From: Julien Grall <[email protected]>
clang 11 will throw the following error while build Xen:
scif-uart.c:333:33: error: cast to smaller integer type 'enum
port_types' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]uart->params = &port_params[(enum port_types)match->data]; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 8 lines
The error can be prevented by directly storing a pointer to the port parameters rather than the a cast of the port type.
Signed-off-by Julien Grall <[email protected]>---
Only build tested as I don't have the HW.
I don't have an access to the SCIFA based HW at the moment, but on Gen3 H3 SoC (SCIF) it works.
Quoted 28 lines
--- xen/drivers/char/scif-uart.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)xen/drivers/char/scif-uart.c +3
-3@@ -286,8 +286,8 @@ static struct uart_driver __read_mostly scif_uart_driver = {static const struct dt_device_match scif_uart_dt_match[]__initconst = { - { .compatible ="renesas,scif" , .data = (void *)SCIF_PORT }, - { .compatible ="renesas,scifa" , .data = (void *)SCIFA_PORT }, + { .compatible ="renesas,scif" , .data = &port_params[SCIF_PORT ] }, + { .compatible ="renesas,scifa" , .data = &port_params[SCIFA_PORT ] }, {/* sentinel */ }, };@@ -330,7 +330,7 @@ static int __init scif_uart_init(struct dt_device_node *dev, match =dt_match_node (scif_uart_dt_match, dev);ASSERT ( match ); - uart->params = &port_params[(enum port_types )match->data]; + uart->params = match->data; uart->vuart.base_addr = addr; uart->vuart.size = size;
Signature · 3 lines
Regards, Oleksandr Tyshchenko
Quoted 4 lines · Julien Grall
From: Julien Grall <[email protected]>
clang 11 will throw the following error while build Xen:
Quoted 8 lines
scif-uart.c:333:33: error: cast to smaller integer type 'enum
port_types' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]uart->params = &port_params[(enum port_types)match->data]; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~The error can be prevented by directly storing a pointer to the port parameters rather than the a cast of the port type.
Signed-off-by Julien Grall <[email protected]>
Quoted 34 lines
---
Only build tested as I don't have the HW.
--- xen/drivers/char/scif-uart.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)xen/drivers/char/scif-uart.c +3
-3@@ -286,8 +286,8 @@ static struct uart_driver __read_mostly scif_uart_driver = {static const struct dt_device_match scif_uart_dt_match[]__initconst = { - { .compatible ="renesas,scif" , .data = (void *)SCIF_PORT }, - { .compatible ="renesas,scifa" , .data = (void *)SCIFA_PORT }, + { .compatible ="renesas,scif" , .data = &port_params[SCIF_PORT ] }, + { .compatible ="renesas,scifa" , .data = &port_params[SCIFA_PORT ] }, {/* sentinel */ }, };@@ -330,7 +330,7 @@ static int __init scif_uart_init(struct dt_device_node *dev, match =dt_match_node (scif_uart_dt_match, dev);ASSERT ( match ); - uart->params = &port_params[(enum port_types )match->data]; + uart->params = match->data; uart->vuart.base_addr = addr; uart->vuart.size = size;Signature · 1 line
2.17.1