On 03/05/2015 10:13 AM, Rob Herring wrote:
> On Wed, Mar 4, 2015 at 11:24 AM, Peter Hurley <peter@xxxxxxxxxxxxxxxxxx> wrote:
>> The OF device name of the earlycon is never used because there is no
>> device; re-purpose the name field to store the earlycon name in
>> the OF earlycon table. Earlycon will use the table entry to
>> fixup the console name and index.
>>
>> Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
>> ---
>> include/linux/serial_core.h | 15 +++++++++++++--
>> 1 file changed, 13 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
>> index 8aeec49..c523785 100644
>> --- a/include/linux/serial_core.h
>> +++ b/include/linux/serial_core.h
>> @@ -29,6 +29,7 @@
>> #include <linux/tty.h>
>> #include <linux/mutex.h>
>> #include <linux/sysrq.h>
>> +#include <linux/mod_devicetable.h>
>> #include <uapi/linux/serial_core.h>
>>
>> #ifdef CONFIG_SERIAL_CORE_CONSOLE
>> @@ -353,8 +354,18 @@ extern int of_setup_earlycon(unsigned long addr,
>> = { .name = __stringify(_name), \
>> .setup = func }
>>
>> -#define OF_EARLYCON_DECLARE(name, compat, fn) \
>> - _OF_DECLARE(earlycon, name, compat, fn, void *)
>
> The purpose of this was to follow the same structure for all users of
> this. We're not there yet, but this moves in the wrong direction.
Ok.
There's no special dependence on the earlycons needing to be of_device_ids;
afaict that's simply for convenience' sake also.
Maybe this is a good time to ditch separate OF_EARLYCON_DECLARE/EARLYCON_DECLARE
macros and simply use a single table to find and start the correct earlycon?
>> +#ifdef CONFIG_OF
>> +#define EARLYCON_OF_TABLE_ATTR __used __section(__earlycon_of_table)
>> +#else
>> +#define EARLYCON_OF_TABLE_ATTR __attribute__((unused))
>> +#endif
>> +
>> +#define OF_EARLYCON_DECLARE(_name, compat, fn) \
>> + static const struct of_device_id __of_table_##_name \
>> + EARLYCON_OF_TABLE_ATTR \
>> + = { .name = __stringify(_name), \
>
> While convenient, this is an abuse of name which is supposed to be the
> DT node name.
>
> Perhaps instead of trying to make the earlycon have the right name,
> the real console can know the matching earlycon's name?
Just to be clear here: as of the other patch series, "Extensible console
matching & direct earlycon", the name and index values stored in the earlycon
struct console have no effect on earlycon->console handoff (which at the moment,
is supported by command line matching).
However, console names are really the basis for the whole console subsystem;
I'd really like to see devicetree working within that framework rather than
parallel to it.
Regards,
Peter Hurley
>> + .compatible = compat, \
>> + .data = (fn == (void *)NULL) ? fn : fn }
>>
>> struct uart_port *uart_get_console(struct uart_port *ports, int nr,
>> struct console *c);
>> --
>> 2.3.1
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
