<div dir="ltr"><div dir="ltr">On Fri, Jan 3, 2020 at 1:51 PM Christian Mauderer <<a href="mailto:list@c-mauderer.de">list@c-mauderer.de</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 03/01/2020 04:50, Niteesh wrote:<br>
> On Fri, Jan 3, 2020 at 2:26 AM Christian Mauderer <<a href="mailto:list@c-mauderer.de" target="_blank">list@c-mauderer.de</a><br>
> <mailto:<a href="mailto:list@c-mauderer.de" target="_blank">list@c-mauderer.de</a>>> wrote:<br>
> <br>
> Sorry, it seems I missed some parts in the last mail. Beneath that I<br>
> caused a misunderstanding again.<br>
> <br>
> On 02/01/2020 20:08, G S Niteesh wrote:<br>
> > Replaced the older console api with newer FDT based<br>
> > console driver.<br>
> > Replaces the custom pl011 driver with RTEMS arm-pl011<br>
> > driver.<br>
> > ---<br>
> > bsps/arm/raspberrypi/console/console-config.c | 156 ++++++++++++----<br>
> > bsps/arm/raspberrypi/console/console_select.c | 114 ------------<br>
> > bsps/arm/raspberrypi/console/fbcons.c | 78 ++++----<br>
> > bsps/arm/raspberrypi/console/usart.c | 167<br>
> ------------------<br>
> > bsps/arm/raspberrypi/include/bsp.h | 6 +<br>
> > bsps/arm/raspberrypi/include/bsp/fbcons.h | 17 +-<br>
> > .../arm/raspberrypi/include/bsp/raspberrypi.h | 53 ++----<br>
> > bsps/arm/raspberrypi/include/bsp/usart.h | 5 +-<br>
> > bsps/arm/raspberrypi/start/bspstart.c | 15 ++<br>
> > c/src/lib/libbsp/arm/raspberrypi/Makefile.am | 7 +-<br>
> > c/src/lib/libbsp/arm/raspberrypi/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> <<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>> | 13 ++<br>
> > 11 files changed, 225 insertions(+), 406 deletions(-)<br>
> > delete mode 100644 bsps/arm/raspberrypi/console/console_select.c<br>
> > delete mode 100644 bsps/arm/raspberrypi/console/usart.c<br>
> ><br>
> > diff --git a/bsps/arm/raspberrypi/console/console-config.c<br>
> b/bsps/arm/raspberrypi/console/console-config.c<br>
> > index d2186c918b..c306db439b 100644<br>
> > --- a/bsps/arm/raspberrypi/console/console-config.c<br>
> > +++ b/bsps/arm/raspberrypi/console/console-config.c<br>
> > @@ -19,50 +19,140 @@<br>
> > */<br>
> > <br>
> > #include <rtems/bspIo.h><br>
> > -<br>
> > -#include <libchip/serial.h><br>
> > +#include <rtems/console.h><br>
> > +#include <rtems/sysinit.h><br>
> > <br>
> > #include <bspopts.h><br>
> > -#include <bsp/irq.h><br>
> > -#include <bsp/usart.h><br>
> > +#include <bsp.h><br>
> > #include <bsp/raspberrypi.h><br>
> > +#include <bsp/usart.h><br>
> > +#include <bsp/arm-pl011.h><br>
> > #include <bsp/fbcons.h><br>
> > +#include <bsp/console-termios.h><br>
> > +#include <bsp/fdt.h><br>
> > +#include <bsp/fatal.h><br>
> > +<br>
> > +#include <libfdt.h><br>
> > +#include <libchip/serial.h><br>
> > +<br>
> > +arm_pl011_context pl011_context;<br>
> > +<br>
> > +rpi_fb_context fb_context;<br>
> > +<br>
> > +static void output_char_serial(char c)<br>
> > +{<br>
> > + arm_pl011_write_polled(&pl011_context.base, c);<br>
> > +}<br>
> > +<br>
> > +void output_char_fb(char c)<br>
> > +{<br>
> > + fbcons_write_polled(&fb_context.base, c);<br>
> > +}<br>
> > +<br>
> > +static void init_ctx_arm_pl011(<br>
> > + const void *fdt,<br>
> > + int node<br>
> > +)<br>
> > +{<br>
> > + arm_pl011_context *ctx = &pl011_context;<br>
> > + rtems_termios_device_context_initialize(&ctx->base, "UART");<br>
> > + ctx->regs = raspberrypi_get_reg_of_node(fdt, node);<br>
> > +}<br>
> > +<br>
> > +static void register_fb( void )<br>
> > +{<br>
> > + if (fbcons_probe(&fb_context.base) == true) {<br>
> > + rtems_termios_device_install(<br>
> > + "/dev/fbcons",<br>
> > + &fbcons_fns,<br>
> > + NULL,<br>
> > + &fb_context.base);<br>
> > + }<br>
> > +}<br>
> > <br>
> > -console_tbl Console_Configuration_Ports [] = {<br>
> > - {<br>
> > - .sDeviceName = "/dev/ttyS0",<br>
> > - .deviceType = SERIAL_CUSTOM,<br>
> > - .pDeviceFns = &bcm2835_usart_fns,<br>
> > - .deviceProbe = NULL,<br>
> > - .pDeviceFlow = NULL,<br>
> > - .ulCtrlPort1 = BCM2835_UART0_BASE,<br>
> > - .ulCtrlPort2 = 0,<br>
> > - .ulClock = USART0_DEFAULT_BAUD,<br>
> > - .ulIntVector = BCM2835_IRQ_ID_UART<br>
> > - },<br>
> > - {<br>
> > - .sDeviceName ="/dev/fbcons",<br>
> > - .deviceType = SERIAL_CUSTOM,<br>
> > - .pDeviceFns = &fbcons_fns,<br>
> > - .deviceProbe = fbcons_probe,<br>
> > - .pDeviceFlow = NULL,<br>
> > - },<br>
> > -};<br>
> > -<br>
> > -#define PORT_COUNT \<br>
> > - (sizeof(Console_Configuration_Ports) \<br>
> > - / sizeof(Console_Configuration_Ports [0]))<br>
> > -<br>
> > -unsigned long Console_Configuration_Count = PORT_COUNT;<br>
> > +static void console_select( void )<br>
> > +{<br>
> > + const char *opt;<br>
> > + const void *fdt;<br>
> > + const char *console;<br>
> > + int node;<br>
> > +<br>
> > + fdt = bsp_fdt_get();<br>
> > + node = fdt_path_offset(fdt, "/chosen");<br>
> > +<br>
> > + console = fdt_getprop(fdt, node, "stdout-path", NULL);<br>
> <br>
> Sorry that I missed that on your earlier patch:<br>
> <br>
> I had a look at all the "chosen" nodes in the dtb files here:<br>
> <br>
> <a href="https://github.com/raspberrypi/firmware/tree/0c01dbefba45a08c47f8538d5a071a0fba6b7e83/boot" rel="noreferrer" target="_blank">https://github.com/raspberrypi/firmware/tree/0c01dbefba45a08c47f8538d5a071a0fba6b7e83/boot</a><br>
> <br>
> <br>
> I was using the dtb file from freeBSD, that one had the chosen node.<br>
> <a href="https://github.com/freebsd/freebsd/blob/41655e1cf1451b788f6437c91ec74bcecd2192b7/sys/gnu/dts/arm/bcm283x.dtsi#L31" rel="noreferrer" target="_blank">https://github.com/freebsd/freebsd/blob/41655e1cf1451b788f6437c91ec74bcecd2192b7/sys/gnu/dts/arm/bcm283x.dtsi#L31</a><br>
> But there is no standalone DTB file from freeBSD, we have to build it so<br>
> I'll move to the DTB<br>
> that you mentioned, since it's more commonly used. <br>
<br>
OK. How did you change that? Did you remove it (like suggested) or do<br>
you search for some other node?<br></blockquote><div>I removed it. We no more search for console in stdout-path. </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
> <br>
> <br>
> None of these had a property called stdout-path. Where did you find it?<br>
> Beneath that: It seems that you just check whether the property is there<br>
> without checking the value a few lines further down. Why?<br>
> <br>
> If there is no special reason, I would suggest to just completely remove<br>
> the fdt from here and only parse the cmdline. If it is not "fbcons" just<br>
> default to the /dev/ttyS0.<br>
> <br>
> > +<br>
> > + opt = rpi_cmdline_get_arg("--console=");<br>
> > +<br>
> > + if ( opt ) {<br>
> > + if ( strncmp( opt, "fbcons", sizeof( "fbcons" ) - 1 ) == 0 ) {<br>
> > + if ( rpi_video_is_initialized() > 0 ) {<br>
> > + BSP_output_char = output_char_fb;<br>
> > + link("/dev/fbcons", CONSOLE_DEVICE_NAME);<br>
> > + return ;<br>
> > + }<br>
> > + }else{<br>
> > + if ( console == NULL ){<br>
> > + bsp_fatal( BSP_FATAL_CONSOLE_NO_DEV );<br>
> > + }<br>
> > + link("/dev/S0", CONSOLE_DEVICE_NAME);<br>
> <br>
> Typo: That should be "/dev/ttyS0". Maybe use a #define for that. You are<br>
> using the same string twice. Same could be true for "/dev/fbcons".<br>
> <br>
> #define UART0 "/dev/ttyS0"<br>
> #define FBCONS "/dev/fbcons"<br>
> replace the strings.<br>
<br>
If the defines are in this C file, that is OK. If you put them into some<br>
header please prefix them with RASPBERRYPI_.<br>
<br>
> <br>
> > + }<br>
> > + }<br>
> > + BSP_output_char = output_char_serial;<br>
> > +}<br>
> > +<br>
> > +static void uart_probe(void)<br>
> > +{<br>
> > + static bool initialized = false;<br>
> > + const void *fdt;<br>
> > + int node;<br>
> > +<br>
> > + if ( initialized ) {<br>
> > + return ;<br>
> > + }<br>
> > +<br>
> > + fdt = bsp_fdt_get();<br>
> > + node = fdt_node_offset_by_compatible(fdt, -1,<br>
> "brcm,bcm2835-pl011");<br>
> > +<br>
> > + init_ctx_arm_pl011(fdt, node);<br>
> > +<br>
> > + initialized = true;<br>
> > +}<br>
> > <br>
> > static void output_char(char c)<br>
> > {<br>
> > - const console_fns *con =<br>
> > - Console_Configuration_Ports [Console_Port_Minor].pDeviceFns;<br>
> > + uart_probe();<br>
> > + output_char_serial(c);<br>
> > +}<br>
> > +<br>
> > +rtems_status_code console_initialize(<br>
> > + rtems_device_major_number major,<br>
> > + rtems_device_minor_number minor,<br>
> > + void *arg<br>
> > +)<br>
> > +{<br>
> > + rtems_termios_initialize();<br>
> > +<br>
> > + uart_probe();<br>
> > +<br>
> > + rtems_termios_device_install( "/dev/ttyS0",<br>
> > + &arm_pl011_fns,<br>
> > + NULL,<br>
> > + &pl011_context.base<br>
> > + );<br>
> <br>
> If you are touching the patch again (due to the ones further up): Please<br>
> move the rtems_termios_device_install line to uart_probe().<br>
> register_fb() registers it's own serial device so uart_probe should too.<br>
> <br>
> I tried that before, it doesn't work. Maybe the system is not<br>
> initialized enough to<br>
> register a device. The first call to uart_probe is from bspstart.c to<br>
> print board information<br>
> that causes these issues.<br>
> <br>
<br>
OK. Missed that call. In that case it's OK like it is.<br>
<br>
> <br>
> > + register_fb();<br>
> > <br>
> > - con->deviceWritePolled((int) Console_Port_Minor, c);<br>
> > + console_select();<br>
> > +<br>
> > + return RTEMS_SUCCESSFUL;<br>
> > }<br>
> > <br>
> > BSP_output_char_function_type BSP_output_char = output_char;<br>
> > <br>
> > BSP_polling_getchar_function_type BSP_poll_char = NULL;<br>
> > +<br>
> > +RTEMS_SYSINIT_ITEM(<br>
> > + uart_probe,<br>
> > + RTEMS_SYSINIT_BSP_START,<br>
> > + RTEMS_SYSINIT_ORDER_LAST<br>
> > +);<br>
> > \ No newline at end of file<br>
> > diff --git a/bsps/arm/raspberrypi/console/console_select.c<br>
> b/bsps/arm/raspberrypi/console/console_select.c<br>
> > deleted file mode 100644<br>
> > index bd246ca868..0000000000<br>
> > --- a/bsps/arm/raspberrypi/console/console_select.c<br>
> > +++ /dev/null<br>
> > @@ -1,114 +0,0 @@<br>
> > -/**<br>
> > - * @file<br>
> > - *<br>
> > - * @ingroup raspberrypi_console<br>
> > - *<br>
> > - * @brief console select<br>
> > - */<br>
> > -<br>
> > -/*<br>
> > - * Copyright (c) 2015 Yang Qiao<br>
> > - *<br>
> > - * The license and distribution terms for this file may be<br>
> > - * found in the file LICENSE in this distribution or at<br>
> > - *<br>
> > - * <a href="http://www.rtems.org/license/LICENSE" rel="noreferrer" target="_blank">http://www.rtems.org/license/LICENSE</a><br>
> > - *<br>
> > - */<br>
> > -<br>
> > -#include <bsp.h><br>
> > -#include <bsp/fatal.h><br>
> > -#include <rtems/libio.h><br>
> > -#include <stdlib.h><br>
> > -#include <string.h><br>
> > -#include <assert.h><br>
> > -#include <termios.h><br>
> > -<br>
> > -#include <rtems/termiostypes.h><br>
> > -#include <libchip/serial.h><br>
> > -#include "../../shared/dev/serial/legacy-console.h"<br>
> > -#include <bsp/rpi-fb.h><br>
> > -<br>
> > -rtems_device_minor_number BSPPrintkPort = 0;<br>
> > -<br>
> > -/*<br>
> > - * Method to return true if the device associated with the<br>
> > - * minor number probs available.<br>
> > - */<br>
> > -static bool bsp_Is_Available( rtems_device_minor_number minor )<br>
> > -{<br>
> > - console_tbl *cptr = Console_Port_Tbl[ minor ];<br>
> > -<br>
> > - /*<br>
> > - * First perform the configuration dependent probe, then the<br>
> > - * device dependent probe<br>
> > - */<br>
> > - if ( ( !cptr->deviceProbe || cptr->deviceProbe( minor ) ) &&<br>
> > - cptr->pDeviceFns->deviceProbe( minor ) ) {<br>
> > - return true;<br>
> > - }<br>
> > -<br>
> > - return false;<br>
> > -}<br>
> > -<br>
> > -/*<br>
> > - * Method to return the first available device.<br>
> > - */<br>
> > -static rtems_device_minor_number bsp_First_Available_Device( void )<br>
> > -{<br>
> > - rtems_device_minor_number minor;<br>
> > -<br>
> > - for ( minor = 0; minor < Console_Port_Count; minor++ ) {<br>
> > - console_tbl *cptr = Console_Port_Tbl[ minor ];<br>
> > -<br>
> > - /*<br>
> > - * First perform the configuration dependent probe, then the<br>
> > - * device dependent probe<br>
> > - */<br>
> > -<br>
> > - if ( ( !cptr->deviceProbe || cptr->deviceProbe( minor ) ) &&<br>
> > - cptr->pDeviceFns->deviceProbe( minor ) ) {<br>
> > - return minor;<br>
> > - }<br>
> > - }<br>
> > -<br>
> > - /*<br>
> > - * Error No devices were found. We will want to bail here.<br>
> > - */<br>
> > - bsp_fatal( BSP_FATAL_CONSOLE_NO_DEV );<br>
> > -}<br>
> > -<br>
> > -void bsp_console_select( void )<br>
> > -{<br>
> > - /*<br>
> > - * Reset Console_Port_Minor and<br>
> > - * BSPPrintkPort here if desired.<br>
> > - *<br>
> > - * This default version allows the bsp to set these<br>
> > - * values at creation and will not touch them again<br>
> > - * unless the selected port number is not available.<br>
> > - */<br>
> > - const char *opt;<br>
> > -<br>
> > - Console_Port_Minor = BSP_CONSOLE_UART0;<br>
> > - BSPPrintkPort = BSP_CONSOLE_UART0;<br>
> > -<br>
> > - opt = rpi_cmdline_get_arg( "--console=" );<br>
> > -<br>
> > - if ( opt ) {<br>
> > - if ( strncmp( opt, "fbcons", sizeof( "fbcons" ) - 1 ) == 0 ) {<br>
> > - if ( rpi_video_is_initialized() > 0 ) {<br>
> > - Console_Port_Minor = BSP_CONSOLE_FB;<br>
> > - BSPPrintkPort = BSP_CONSOLE_FB;<br>
> > - }<br>
> > - }<br>
> > - }<br>
> > -<br>
> > - /*<br>
> > - * If the device that was selected isn't available then<br>
> > - * let the user know and select the first available device.<br>
> > - */<br>
> > - if ( !bsp_Is_Available( Console_Port_Minor ) ) {<br>
> > - Console_Port_Minor = bsp_First_Available_Device();<br>
> > - }<br>
> > -}<br>
> > diff --git a/bsps/arm/raspberrypi/console/fbcons.c<br>
> b/bsps/arm/raspberrypi/console/fbcons.c<br>
> > index 3669ba458d..0c0a5087ce 100644<br>
> > --- a/bsps/arm/raspberrypi/console/fbcons.c<br>
> > +++ b/bsps/arm/raspberrypi/console/fbcons.c<br>
> > @@ -18,6 +18,7 @@<br>
> > <br>
> > #include <rtems.h><br>
> > #include <rtems/libio.h><br>
> > +#include <rtems/termiostypes.h><br>
> > <br>
> > #include <stdlib.h><br>
> > <br>
> > @@ -29,15 +30,6 @@<br>
> > #include <bsp/vc.h><br>
> > #include <bsp/rpi-fb.h><br>
> > <br>
> > -/*<br>
> > - * fbcons_init<br>
> > - *<br>
> > - * This function initializes the fb console to a quiecsent state.<br>
> > - */<br>
> > -static void fbcons_init( int minor )<br>
> > -{<br>
> > -}<br>
> > -<br>
> > /*<br>
> > * fbcons_open<br>
> > *<br>
> > @@ -45,13 +37,14 @@ static void fbcons_init( int minor )<br>
> > *<br>
> > * Default state is 9600 baud, 8 bits, No parity, and 1 stop bit.<br>
> > */<br>
> > -static int fbcons_open(<br>
> > - int major,<br>
> > - int minor,<br>
> > - void *arg<br>
> > +static bool fbcons_open(<br>
> > + struct rtems_termios_tty *tty,<br>
> > + rtems_termios_device_context *base,<br>
> > + struct termios *term,<br>
> > + rtems_libio_open_close_args_t *args<br>
> > )<br>
> > {<br>
> > - return RTEMS_SUCCESSFUL;<br>
> > + return true;<br>
> > }<br>
> > <br>
> > /*<br>
> > @@ -59,13 +52,12 @@ static int fbcons_open(<br>
> > *<br>
> > * This function shuts down the requested port.<br>
> > */<br>
> > -static int fbcons_close(<br>
> > - int major,<br>
> > - int minor,<br>
> > - void *arg<br>
> > +static void fbcons_close(<br>
> > + struct rtems_termios_tty *tty,<br>
> > + rtems_termios_device_context *base,<br>
> > + rtems_libio_open_close_args_t *args<br>
> > )<br>
> > {<br>
> > - return ( RTEMS_SUCCESSFUL );<br>
> > }<br>
> > <br>
> > /*<br>
> > @@ -73,8 +65,8 @@ static int fbcons_close(<br>
> > *<br>
> > * This routine polls out the requested character.<br>
> > */<br>
> > -static void fbcons_write_polled(<br>
> > - int minor,<br>
> > +void fbcons_write_polled(<br>
> > + rtems_termios_device_context *base,<br>
> > char c<br>
> > )<br>
> > {<br>
> > @@ -90,8 +82,8 @@ static void fbcons_write_polled(<br>
> > * Console Termios output entry point when using polled output.<br>
> > *<br>
> > */<br>
> > -static ssize_t fbcons_write_support_polled(<br>
> > - int minor,<br>
> > +static void fbcons_write_support_polled(<br>
> > + rtems_termios_device_context *base,<br>
> > const char *buf,<br>
> > size_t len<br>
> > )<br>
> > @@ -102,14 +94,9 @@ static ssize_t fbcons_write_support_polled(<br>
> > * poll each byte in the string out of the port.<br>
> > */<br>
> > while ( nwrite < len ) {<br>
> > - fbcons_write_polled( minor, *buf++ );<br>
> > + fbcons_write_polled( base, *buf++ );<br>
> > nwrite++;<br>
> > }<br>
> > -<br>
> > - /*<br>
> > - * return the number of bytes written.<br>
> > - */<br>
> > - return nwrite;<br>
> > }<br>
> > <br>
> > /*<br>
> > @@ -117,7 +104,9 @@ static ssize_t fbcons_write_support_polled(<br>
> > *<br>
> > * Console Termios polling input entry point.<br>
> > */<br>
> > -static int fbcons_inbyte_nonblocking_polled( int minor )<br>
> > +static int fbcons_inbyte_nonblocking_polled(<br>
> > + rtems_termios_device_context *base<br>
> > +)<br>
> > {<br>
> > // if( rtems_kbpoll() ) {<br>
> > // int c = getch();<br>
> > @@ -133,15 +122,17 @@ static int fbcons_inbyte_nonblocking_polled(<br>
> int minor )<br>
> > * This function sets the UART channel to reflect the requested<br>
> termios<br>
> > * port settings.<br>
> > */<br>
> > -static int fbcons_set_attributes(<br>
> > - int minor,<br>
> > +static bool fbcons_set_attributes(<br>
> > + rtems_termios_device_context *base,<br>
> > const struct termios *t<br>
> > )<br>
> > {<br>
> > - return 0;<br>
> > + return true;<br>
> > }<br>
> > <br>
> > -bool fbcons_probe( int minor )<br>
> > +bool fbcons_probe(<br>
> > + rtems_termios_device_context *context<br>
> > +)<br>
> > {<br>
> > // rtems_status_code status;<br>
> > static bool firstTime = true;<br>
> > @@ -163,15 +154,12 @@ bool fbcons_probe( int minor )<br>
> > return ret;<br>
> > }<br>
> > <br>
> > -const console_fns fbcons_fns =<br>
> > +const rtems_termios_device_handler fbcons_fns =<br>
> > {<br>
> > - .deviceProbe = libchip_serial_default_probe, /* deviceProbe */<br>
> > - .deviceFirstOpen = fbcons_open, /*<br>
> deviceFirstOpen */<br>
> > - .deviceLastClose = fbcons_close, /*<br>
> deviceLastClose */<br>
> > - .deviceRead = fbcons_inbyte_nonblocking_polled, /* deviceRead */<br>
> > - .deviceWrite = fbcons_write_support_polled, /* deviceWrite */<br>
> > - .deviceInitialize = fbcons_init, /*<br>
> deviceInitialize */<br>
> > - .deviceWritePolled = fbcons_write_polled, /*<br>
> deviceWritePolled */<br>
> > - .deviceSetAttributes = fbcons_set_attributes, /*<br>
> deviceSetAttributes */<br>
> > - .deviceOutputUsesInterrupts = FALSE, /*<br>
> deviceOutputUsesInterrupts*/<br>
> > -};<br>
> > + .first_open = fbcons_open,<br>
> > + .last_close = fbcons_close,<br>
> > + .poll_read = fbcons_inbyte_nonblocking_polled,<br>
> > + .write = fbcons_write_support_polled,<br>
> > + .set_attributes = fbcons_set_attributes,<br>
> > + .mode = TERMIOS_POLLED<br>
> > +};<br>
> > \ No newline at end of file<br>
> > diff --git a/bsps/arm/raspberrypi/console/usart.c<br>
> b/bsps/arm/raspberrypi/console/usart.c<br>
> > deleted file mode 100644<br>
> > index 25fb523621..0000000000<br>
> > --- a/bsps/arm/raspberrypi/console/usart.c<br>
> > +++ /dev/null<br>
> > @@ -1,167 +0,0 @@<br>
> > -/**<br>
> > - * @file<br>
> > - *<br>
> > - * @ingroup raspberrypi_usart<br>
> > - *<br>
> > - * @brief USART support.<br>
> > - */<br>
> > -<br>
> > -/*<br>
> > - * Copyright (c) 2013 Alan Cudmore<br>
> > - *<br>
> > - * The license and distribution terms for this file may be<br>
> > - * found in the file LICENSE in this distribution or at<br>
> > - *<br>
> > - * <a href="http://www.rtems.org/license/LICENSE" rel="noreferrer" target="_blank">http://www.rtems.org/license/LICENSE</a><br>
> > - *<br>
> > - */<br>
> > -<br>
> > -#include <libchip/sersupp.h><br>
> > -<br>
> > -#include <bsp.h><br>
> > -#include <bsp/irq.h><br>
> > -#include <bsp/usart.h><br>
> > -#include <bsp/raspberrypi.h><br>
> > -#include <rtems/bspIo.h><br>
> > -<br>
> > -static void usart_delay(uint32_t n)<br>
> > -{<br>
> > - volatile uint32_t i = 0;<br>
> > -<br>
> > - for(i = 0; i < n; i++)<br>
> > - ;<br>
> > -}<br>
> > -<br>
> > -#if 0<br>
> > -/*<br>
> > - * These will be useful when the driver supports interrupt<br>
> driven IO.<br>
> > - */<br>
> > -static rtems_vector_number usart_get_irq_number(const console_tbl<br>
> *ct)<br>
> > -{<br>
> > - return ct->ulIntVector;<br>
> > -}<br>
> > -<br>
> > -static uint32_t usart_get_baud(const console_tbl *ct)<br>
> > -{<br>
> > - return ct->ulClock;<br>
> > -}<br>
> > -#endif<br>
> > -<br>
> > -static void usart_set_baud(int minor, int baud)<br>
> > -{<br>
> > - /*<br>
> > - * Nothing for now<br>
> > - */<br>
> > - return;<br>
> > -}<br>
> > -<br>
> > -static void usart_initialize(int minor)<br>
> > -{<br>
> > - unsigned int gpio_reg;<br>
> > -<br>
> > - /*<br>
> > - ** Program GPIO pins for UART 0<br>
> > - */<br>
> > - gpio_reg = BCM2835_REG(BCM2835_GPIO_GPFSEL1);<br>
> > - gpio_reg &= ~(7<<12); /* gpio14 */<br>
> > - gpio_reg |= (4<<12); /* alt0 */<br>
> > - gpio_reg &= ~(7<<15); /* gpio15 */<br>
> > - gpio_reg |= (4<<15); /* alt0 */<br>
> > - BCM2835_REG(BCM2835_GPIO_GPFSEL1) = gpio_reg;<br>
> > -<br>
> > - BCM2835_REG(BCM2835_GPIO_GPPUD) = 0;<br>
> > - usart_delay(150);<br>
> > - BCM2835_REG(BCM2835_GPIO_GPPUDCLK0) = (1<<14)|(1<<15);<br>
> > - usart_delay(150);<br>
> > - BCM2835_REG(BCM2835_GPIO_GPPUDCLK0) = 0;<br>
> > -<br>
> > - /*<br>
> > - ** Init the PL011 UART<br>
> > - */<br>
> > - BCM2835_REG(BCM2835_UART0_CR) = 0;<br>
> > - BCM2835_REG(BCM2835_UART0_ICR) = 0x7FF;<br>
> > - BCM2835_REG(BCM2835_UART0_IMSC) = 0;<br>
> > - BCM2835_REG(BCM2835_UART0_IBRD) = 1;<br>
> > - BCM2835_REG(BCM2835_UART0_FBRD) = 40;<br>
> > - BCM2835_REG(BCM2835_UART0_LCRH) = 0x70;<br>
> > - BCM2835_REG(BCM2835_UART0_RSRECR) = 0;<br>
> > -<br>
> > - BCM2835_REG(BCM2835_UART0_CR) = 0x301;<br>
> > -<br>
> > - BCM2835_REG(BCM2835_UART0_IMSC) = BCM2835_UART0_IMSC_RX;<br>
> > -<br>
> > - usart_set_baud(minor, 115000);<br>
> > -}<br>
> > -<br>
> > -static int usart_first_open(int major, int minor, void *arg)<br>
> > -{<br>
> > - rtems_libio_open_close_args_t *oc =<br>
> (rtems_libio_open_close_args_t *) arg;<br>
> > - struct rtems_termios_tty *tty = (struct rtems_termios_tty *)<br>
> oc->iop->data1;<br>
> > - const console_tbl *ct = Console_Port_Tbl [minor];<br>
> > - console_data *cd = &Console_Port_Data [minor];<br>
> > -<br>
> > - cd->termios_data = tty;<br>
> > - rtems_termios_set_initial_baud(tty, ct->ulClock);<br>
> > -<br>
> > - return 0;<br>
> > -}<br>
> > -<br>
> > -static int usart_last_close(int major, int minor, void *arg)<br>
> > -{<br>
> > - return 0;<br>
> > -}<br>
> > -<br>
> > -static int usart_read_polled(int minor)<br>
> > -{<br>
> > - if (minor == 0) {<br>
> > - if (((BCM2835_REG(BCM2835_UART0_FR)) & BCM2835_UART0_FR_RXFE)<br>
> == 0) {<br>
> > - return((BCM2835_REG(BCM2835_UART0_DR)) & 0xFF );<br>
> > - } else {<br>
> > - return -1;<br>
> > - }<br>
> > - } else {<br>
> > - printk("Unknown console minor number: %d\n", minor);<br>
> > - return -1;<br>
> > - }<br>
> > -}<br>
> > -<br>
> > -static void usart_write_polled(int minor, char c)<br>
> > -{<br>
> > - while (1) {<br>
> > - if ((BCM2835_REG(BCM2835_UART0_FR) & BCM2835_UART0_FR_TXFF)<br>
> == 0)<br>
> > - break;<br>
> > - }<br>
> > - BCM2835_REG(BCM2835_UART0_DR) = c;<br>
> > -}<br>
> > -<br>
> > -static ssize_t usart_write_support_polled(<br>
> > - int minor,<br>
> > - const char *s,<br>
> > - size_t n<br>
> > -)<br>
> > -{<br>
> > - ssize_t i = 0;<br>
> > -<br>
> > - for (i = 0; i < n; ++i) {<br>
> > - usart_write_polled(minor, s [i]);<br>
> > - }<br>
> > -<br>
> > - return n;<br>
> > -}<br>
> > -<br>
> > -static int usart_set_attributes(int minor, const struct termios<br>
> *term)<br>
> > -{<br>
> > - return -1;<br>
> > -}<br>
> > -<br>
> > -const console_fns bcm2835_usart_fns = {<br>
> > - .deviceProbe = libchip_serial_default_probe,<br>
> > - .deviceFirstOpen = usart_first_open,<br>
> > - .deviceLastClose = usart_last_close,<br>
> > - .deviceRead = usart_read_polled,<br>
> > - .deviceWrite = usart_write_support_polled,<br>
> > - .deviceInitialize = usart_initialize,<br>
> > - .deviceWritePolled = usart_write_polled,<br>
> > - .deviceSetAttributes = usart_set_attributes,<br>
> > - .deviceOutputUsesInterrupts = false<br>
> > -};<br>
> > diff --git a/bsps/arm/raspberrypi/include/bsp.h<br>
> b/bsps/arm/raspberrypi/include/bsp.h<br>
> > index 1075cb1771..190dd16184 100644<br>
> > --- a/bsps/arm/raspberrypi/include/bsp.h<br>
> > +++ b/bsps/arm/raspberrypi/include/bsp.h<br>
> > @@ -41,6 +41,10 @@ extern "C" {<br>
> > <br>
> > #define BSP_FEATURE_IRQ_EXTENSION<br>
> > <br>
> > +#if BSP_START_COPY_FDT_FROM_U_BOOT<br>
> > +#define BSP_FDT_IS_SUPPORTED<br>
> > +#endif<br>
> > +<br>
> <br>
> That's where I have caused a misunderstanding: I didn't want that you<br>
> change the description of the commit. Please move enabling FDT to a<br>
> separate patch that only enables FDT. You patch set will then have two<br>
> patches. First one that has only this four lines and the ones further<br>
> below that enable FDT (marked with FDT-PATCH).<br>
> <br>
> One patch should only do one thing. That makes it simpler to find and<br>
> rework patches that introduce bugs. Your patch currently does two things<br>
> at the same time:<br>
> <br>
> - Enable FDT for this BSP.<br>
> - Rework console to work with the FDT.<br>
> <br>
> If unsure how to split an existing patch: A short guide is here:<br>
> <br>
> <a href="https://stackoverflow.com/a/6217314/2229658" rel="noreferrer" target="_blank">https://stackoverflow.com/a/6217314/2229658</a><br>
> <br>
> I already lost changes when rebasing. Therefore I suggest to create a<br>
> branch first and only do a rebase on that. In the worst case you can go<br>
> back to the original branch and throw away the rebase branch.<br>
> <br>
> > #define RPI_L2_CACHE_ENABLE 1<br>
> > <br>
> > #define BSP_GPIO_PIN_COUNT 32<br>
> > @@ -50,6 +54,8 @@ extern "C" {<br>
> > #define BSP_CONSOLE_UART0 0<br>
> > #define BSP_CONSOLE_FB 1<br>
> > <br>
> > +void *raspberrypi_get_reg_of_node(const void *fdt, int node);<br>
> > +<br>
> > void rpi_init_cmdline(void);<br>
> > const char *rpi_cmdline_get_cached(void);<br>
> > const char *rpi_cmdline_get_raw(void);<br>
> > diff --git a/bsps/arm/raspberrypi/include/bsp/fbcons.h<br>
> b/bsps/arm/raspberrypi/include/bsp/fbcons.h<br>
> > index d0e126699a..9de75ee5a4 100644<br>
> > --- a/bsps/arm/raspberrypi/include/bsp/fbcons.h<br>
> > +++ b/bsps/arm/raspberrypi/include/bsp/fbcons.h<br>
> > @@ -33,12 +33,25 @@ extern "C" {<br>
> > <br>
> > #define FB_CONSOLE 0x50492835<br>
> > <br>
> > -bool fbcons_probe( int minor );<br>
> > +bool fbcons_probe(<br>
> > + rtems_termios_device_context *base<br>
> > + );<br>
> > +<br>
> > +void fbcons_write_polled(<br>
> > + rtems_termios_device_context *base,<br>
> > + char c<br>
> > +);<br>
> > +<br>
> > +void output_char_fb(char c);<br>
> > +<br>
> > +typedef struct {<br>
> > + rtems_termios_device_context base;<br>
> > +} rpi_fb_context ;<br>
> > <br>
> > /*<br>
> > * Driver function table<br>
> > */<br>
> > -extern const console_fns fbcons_fns;<br>
> > +extern const rtems_termios_device_handler fbcons_fns;<br>
> > <br>
> > #ifdef __cplusplus<br>
> > }<br>
> > diff --git a/bsps/arm/raspberrypi/include/bsp/raspberrypi.h<br>
> b/bsps/arm/raspberrypi/include/bsp/raspberrypi.h<br>
> > index 40c80cf408..b7061a9ff4 100644<br>
> > --- a/bsps/arm/raspberrypi/include/bsp/raspberrypi.h<br>
> > +++ b/bsps/arm/raspberrypi/include/bsp/raspberrypi.h<br>
> > @@ -24,6 +24,7 @@<br>
> > #include <bspopts.h><br>
> > #include <stdint.h><br>
> > #include <bsp/utility.h><br>
> > +#include <rtems/termiostypes.h><br>
> > <br>
> > /**<br>
> > * @defgroup raspberrypi_reg Register Definitions<br>
> > @@ -53,13 +54,25 @@<br>
> > */<br>
> > <br>
> > #if (BSP_IS_RPI2 == 1)<br>
> > - #define RPI_PERIPHERAL_BASE 0x3F000000<br>
> > + #define RPI_PERIPHERAL_BASE 0x3F000000<br>
> > + #define BASE_OFFSET 0X3F000000<br>
> > #else<br>
> > - #define RPI_PERIPHERAL_BASE 0x20000000<br>
> > + #define RPI_PERIPHERAL_BASE 0x20000000<br>
> > + #define BASE_OFFSET 0X5E000000<br>
> > #endif<br>
> > <br>
> > #define RPI_PERIPHERAL_SIZE 0x01000000<br>
> > <br>
> > +/**<br>
> > + * @name Bus to Physical address translation<br>
> > + * Macro.<br>
> > + * @{<br>
> > + */<br>
> > +<br>
> > +#define BUS_TO_PHY(x) ((x) - BASE_OFFSET)<br>
> > +<br>
> > +/** @} */<br>
> > +<br>
> > /**<br>
> > * @name Internal ARM Timer Registers<br>
> > *<br>
> > @@ -184,42 +197,6 @@<br>
> > <br>
> > /** @} */<br>
> > <br>
> > -/**<br>
> > - * @name UART 0 (PL011) Registers<br>
> > - *<br>
> > - * @{<br>
> > - */<br>
> > -<br>
> > -#define BCM2835_UART0_BASE (RPI_PERIPHERAL_BASE + 0x201000)<br>
> > -<br>
> > -#define BCM2835_UART0_DR (BCM2835_UART0_BASE + 0x00)<br>
> > -#define BCM2835_UART0_RSRECR (BCM2835_UART0_BASE + 0x04)<br>
> > -#define BCM2835_UART0_FR (BCM2835_UART0_BASE + 0x18)<br>
> > -#define BCM2835_UART0_ILPR (BCM2835_UART0_BASE + 0x20)<br>
> > -#define BCM2835_UART0_IBRD (BCM2835_UART0_BASE + 0x24)<br>
> > -#define BCM2835_UART0_FBRD (BCM2835_UART0_BASE + 0x28)<br>
> > -#define BCM2835_UART0_LCRH (BCM2835_UART0_BASE + 0x2C)<br>
> > -#define BCM2835_UART0_CR (BCM2835_UART0_BASE + 0x30)<br>
> > -#define BCM2835_UART0_IFLS (BCM2835_UART0_BASE + 0x34)<br>
> > -#define BCM2835_UART0_IMSC (BCM2835_UART0_BASE + 0x38)<br>
> > -#define BCM2835_UART0_RIS (BCM2835_UART0_BASE + 0x3C)<br>
> > -#define BCM2835_UART0_MIS (BCM2835_UART0_BASE + 0x40)<br>
> > -#define BCM2835_UART0_ICR (BCM2835_UART0_BASE + 0x44)<br>
> > -#define BCM2835_UART0_DMACR (BCM2835_UART0_BASE + 0x48)<br>
> > -#define BCM2835_UART0_ITCR (BCM2835_UART0_BASE + 0x80)<br>
> > -#define BCM2835_UART0_ITIP (BCM2835_UART0_BASE + 0x84)<br>
> > -#define BCM2835_UART0_ITOP (BCM2835_UART0_BASE + 0x88)<br>
> > -#define BCM2835_UART0_TDR (BCM2835_UART0_BASE + 0x8C)<br>
> > -<br>
> > -#define BCM2835_UART0_MIS_RX 0x10<br>
> > -#define BCM2835_UART0_MIS_TX 0x20<br>
> > -#define BCM2835_UART0_IMSC_RX 0x10<br>
> > -#define BCM2835_UART0_IMSC_TX 0x20<br>
> > -#define BCM2835_UART0_FR_RXFE 0x10<br>
> > -#define BCM2835_UART0_FR_TXFF 0x20<br>
> > -#define BCM2835_UART0_ICR_RX 0x10<br>
> > -#define BCM2835_UART0_ICR_TX 0x20<br>
> > -<br>
> > /** @} */<br>
> > <br>
> > /**<br>
> > diff --git a/bsps/arm/raspberrypi/include/bsp/usart.h<br>
> b/bsps/arm/raspberrypi/include/bsp/usart.h<br>
> > index d3e710c5e9..abbf53626c 100644<br>
> > --- a/bsps/arm/raspberrypi/include/bsp/usart.h<br>
> > +++ b/bsps/arm/raspberrypi/include/bsp/usart.h<br>
> > @@ -32,9 +32,8 @@<br>
> > extern "C" {<br>
> > #endif /* __cplusplus */<br>
> > <br>
> > -#define USART0_DEFAULT_BAUD 115000<br>
> > -<br>
> > -extern const console_fns bcm2835_usart_fns;<br>
> > +#define PL011_DEFAULT_BAUD 115000<br>
> > +#define BCM2835_PL011_BASE (RPI_PERIPHERAL_BASE + 0x201000)<br>
> > <br>
> > #ifdef __cplusplus<br>
> > }<br>
> > diff --git a/bsps/arm/raspberrypi/start/bspstart.c<br>
> b/bsps/arm/raspberrypi/start/bspstart.c<br>
> > index 6ff286f840..49896e4d47 100644<br>
> > --- a/bsps/arm/raspberrypi/start/bspstart.c<br>
> > +++ b/bsps/arm/raspberrypi/start/bspstart.c<br>
> > @@ -24,6 +24,8 @@<br>
> > #include <bsp/raspberrypi.h><br>
> > #include <bsp/vc.h><br>
> > <br>
> > +#include <libfdt.h><br>
> > +<br>
> > static const struct {<br>
> > uint32_t code;<br>
> > const char* label;<br>
> > @@ -86,6 +88,19 @@ static const char* rpi_mem[] =<br>
> > <br>
> > #define NUMOF(_s) (sizeof(_s) / sizeof(_s[0]))<br>
> > <br>
> > +void *raspberrypi_get_reg_of_node(const void *fdt, int node)<br>
> > +{<br>
> > + int len;<br>
> > + const uint32_t *val;<br>
> > +<br>
> > + val = fdt_getprop(fdt, node, "reg", &len);<br>
> > + if (val == NULL || len < 4) {<br>
> > + return NULL;<br>
> > + }<br>
> > +<br>
> > + return (BUS_TO_PHY((void *) fdt32_to_cpu(val[0])));<br>
> > +}<br>
> > +<br>
> > void bsp_start(void)<br>
> > {<br>
> > bcm2835_get_board_spec_entries spec = { 0 };<br>
> > diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am<br>
> b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am<br>
> > index 11a22f89e3..70b19178b4 100644<br>
> > --- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am<br>
> > +++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am<br>
> > @@ -42,6 +42,7 @@ librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/shared/start/bspfatal-default.c<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/shared/dev/cpucounter/cpucounterfrequency.c<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c<br>
> > librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c<br>
> > +librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/shared/start/bsp-fdt.c<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/shared/start/stackalloc.c<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c<br>
> > @@ -63,14 +64,12 @@ librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/shared/cp15/arm-cp15-set-exc<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/raspberrypi/irq/irq.c<br>
> > <br>
> > # Console<br>
> > -librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/shared/dev/serial/legacy-console.c<br>
> > -librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/shared/dev/serial/legacy-console-control.c<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/raspberrypi/console/console-config.c<br>
> > -librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/raspberrypi/console/console_select.c<br>
> > -librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/raspberrypi/console/usart.c<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/raspberrypi/console/fb.c<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/raspberrypi/console/fbcons.c<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/raspberrypi/console/outch.c<br>
> > +librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/shared/dev/serial/console-termios.c<br>
> > +librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/shared/serial/arm-pl011.c<br>
> > <br>
> > # Mailbox<br>
> > librtemsbsp_a_SOURCES +=<br>
> ../../../../../../bsps/arm/raspberrypi/start/mailbox.c<br>
> > diff --git a/c/src/lib/libbsp/arm/raspberrypi/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> <<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>><br>
> b/c/src/lib/libbsp/arm/raspberrypi/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> <<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>><br>
> > index 452aa4d029..b1aa0bf417 100644<br>
> > --- a/c/src/lib/libbsp/arm/raspberrypi/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> <<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>><br>
> > +++ b/c/src/lib/libbsp/arm/raspberrypi/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> <<a href="http://configure.ac" rel="noreferrer" target="_blank">http://configure.ac</a>><br>
> > @@ -15,6 +15,19 @@ RTEMS_CANONICAL_TARGET_CPU<br>
> > AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])<br>
> > RTEMS_BSP_CONFIGURE<br>
> > <br>
> <br>
> These lines should go to FDT-PATCH too.<br>
> vvvvvvv<br>
> <br>
> > +RTEMS_BSPOPTS_SET([BSP_START_COPY_FDT_FROM_U_BOOT],[*],[1])<br>
> > +RTEMS_BSPOPTS_HELP([BSP_START_COPY_FDT_FROM_U_BOOT],[copy the<br>
> U-Boot provided FDT to an internal storage])<br>
> > +<br>
> > +RTEMS_BSPOPTS_SET([BSP_FDT_BLOB_SIZE_MAX],[*],[262144])<br>
> > +RTEMS_BSPOPTS_HELP([BSP_FDT_BLOB_SIZE_MAX],[maximum size of the<br>
> FDT blob in bytes])<br>
> > +<br>
> > +RTEMS_BSPOPTS_SET([BSP_FDT_BLOB_READ_ONLY],[*],[1])<br>
> > +RTEMS_BSPOPTS_HELP([BSP_FDT_BLOB_READ_ONLY],[place the FDT blob<br>
> into the read-only data area])<br>
> > +<br>
> > +RTEMS_BSPOPTS_SET([BSP_FDT_BLOB_COPY_TO_READ_ONLY_LOAD_AREA],[*],[1])<br>
> ><br>
> +RTEMS_BSPOPTS_HELP([BSP_FDT_BLOB_COPY_TO_READ_ONLY_LOAD_AREA],[copy<br>
> the FDT blob into the read-only load area via bsp_fdt_copy()])<br>
> > +<br>
> > +<br>
> <br>
> ^^^^^^^<br>
> <br>
> <br>
> > RTEMS_BSPOPTS_SET([BSP_START_RESET_VECTOR],[*],[])<br>
> > RTEMS_BSPOPTS_HELP([BSP_START_RESET_VECTOR],[reset vector address<br>
> for BSP start])<br>
> > <br>
> ><br>
> <br>
</blockquote></div></div>