* [PATCH 0/8] ACPI: parse the DBG2 table
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-arm-kernel
ARM Server Base Boot Requiremets' [1] mentions DBG2 (Microsoft Debug
Port Table 2) [2] as a mandatory ACPI table that specifies debug ports.
- Move acpi/dt decision earlier in boot process on ARM64
- Move earlycon early_param handling to serial to parse earlycon option once
- Add definition of DBG2 subtypes. It's the same patch as in the SPCR series [3]
- Refactor ACPI linker tables code to enable iterating over subtables other than
subtables having acpi_subtype header (such as DBG2)
- Implement macros
ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr)
that defines a handler for the port of the given type and subtype.
- For each port defined by that macros that is also described in the ACPI DBG2
table call provided callback.
- Implement a helper macros that can be used to define early serial console
- Enable DBG2 on ARM64
- Define early console for pl011 serial
[1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0044a/index.html
[2] http://go.microsoft.com/fwlink/p/?LinkId=234837
[3] https://lkml.kernel.org/g/455559532-8305-1-git-send-email-aleksey.makarov at linaro.org
Aleksey Makarov (6):
ACPI: add definitions of DBG2 subtypes
ACPI: genaralize iterating over subtables in ACPI_PROBE_TABLE()
ACPI: parse DBG2 table
ACPI: serial: implement earlycon on ACPI DBG2 port
ACPI: enable ACPI_DBG2_TABLE on ARM64
serial: pl011: add ACPI DBG2 serial port
Leif Lindholm (2):
arm64: move acpi/dt decision earlier in boot process
of/serial: move earlycon early_param handling to serial
Documentation/kernel-parameters.txt | 3 +
arch/arm64/Kconfig | 1 +
arch/arm64/kernel/acpi.c | 56 ++++++++++---------
drivers/acpi/Kconfig | 3 +
drivers/acpi/Makefile | 1 +
drivers/acpi/dbg2.c | 85 ++++++++++++++++++++++++++++
drivers/acpi/scan.c | 44 ++++++++++-----
drivers/clocksource/arm_arch_timer.c | 3 +-
drivers/irqchip/irq-gic.c | 4 +-
drivers/of/fdt.c | 11 +---
drivers/tty/serial/amba-pl011.c | 3 +
drivers/tty/serial/earlycon.c | 57 +++++++++++++++++++
include/acpi/actbl2.h | 5 ++
include/asm-generic/vmlinux.lds.h | 1 +
include/linux/acpi.h | 104 ++++++++++++++++++++++++-----------
include/linux/acpi_dbg2.h | 68 +++++++++++++++++++++++
include/linux/clocksource.h | 2 +-
include/linux/irqchip.h | 5 +-
include/linux/of_fdt.h | 2 +
19 files changed, 370 insertions(+), 88 deletions(-)
create mode 100644 drivers/acpi/dbg2.c
create mode 100644 include/linux/acpi_dbg2.h
--
2.7.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 0/8] ACPI: parse the DBG2 table
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-acpi
Cc: linux-serial, linux-kernel, linux-arm-kernel, Aleksey Makarov,
Russell King, Greg Kroah-Hartman, Rafael J . Wysocki,
Leif Lindholm, Graeme Gregory, Al Stone, Christopher Covington
ARM Server Base Boot Requiremets' [1] mentions DBG2 (Microsoft Debug
Port Table 2) [2] as a mandatory ACPI table that specifies debug ports.
- Move acpi/dt decision earlier in boot process on ARM64
- Move earlycon early_param handling to serial to parse earlycon option once
- Add definition of DBG2 subtypes. It's the same patch as in the SPCR series [3]
- Refactor ACPI linker tables code to enable iterating over subtables other than
subtables having acpi_subtype header (such as DBG2)
- Implement macros
ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr)
that defines a handler for the port of the given type and subtype.
- For each port defined by that macros that is also described in the ACPI DBG2
table call provided callback.
- Implement a helper macros that can be used to define early serial console
- Enable DBG2 on ARM64
- Define early console for pl011 serial
[1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0044a/index.html
[2] http://go.microsoft.com/fwlink/p/?LinkId=234837
[3] https://lkml.kernel.org/g/455559532-8305-1-git-send-email-aleksey.makarov@linaro.org
Aleksey Makarov (6):
ACPI: add definitions of DBG2 subtypes
ACPI: genaralize iterating over subtables in ACPI_PROBE_TABLE()
ACPI: parse DBG2 table
ACPI: serial: implement earlycon on ACPI DBG2 port
ACPI: enable ACPI_DBG2_TABLE on ARM64
serial: pl011: add ACPI DBG2 serial port
Leif Lindholm (2):
arm64: move acpi/dt decision earlier in boot process
of/serial: move earlycon early_param handling to serial
Documentation/kernel-parameters.txt | 3 +
arch/arm64/Kconfig | 1 +
arch/arm64/kernel/acpi.c | 56 ++++++++++---------
drivers/acpi/Kconfig | 3 +
drivers/acpi/Makefile | 1 +
drivers/acpi/dbg2.c | 85 ++++++++++++++++++++++++++++
drivers/acpi/scan.c | 44 ++++++++++-----
drivers/clocksource/arm_arch_timer.c | 3 +-
drivers/irqchip/irq-gic.c | 4 +-
drivers/of/fdt.c | 11 +---
drivers/tty/serial/amba-pl011.c | 3 +
drivers/tty/serial/earlycon.c | 57 +++++++++++++++++++
include/acpi/actbl2.h | 5 ++
include/asm-generic/vmlinux.lds.h | 1 +
include/linux/acpi.h | 104 ++++++++++++++++++++++++-----------
include/linux/acpi_dbg2.h | 68 +++++++++++++++++++++++
include/linux/clocksource.h | 2 +-
include/linux/irqchip.h | 5 +-
include/linux/of_fdt.h | 2 +
19 files changed, 370 insertions(+), 88 deletions(-)
create mode 100644 drivers/acpi/dbg2.c
create mode 100644 include/linux/acpi_dbg2.h
--
2.7.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process
2016-02-22 13:46 ` Aleksey Makarov
@ 2016-02-22 13:46 ` Aleksey Makarov
-1 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-acpi
Cc: linux-serial, linux-kernel, linux-arm-kernel, Aleksey Makarov,
Russell King, Greg Kroah-Hartman, Rafael J . Wysocki,
Leif Lindholm, Graeme Gregory, Al Stone, Christopher Covington,
Catalin Marinas, Will Deacon
From: Leif Lindholm <leif.lindholm@linaro.org>
In order to support selecting earlycon via either ACPI or DT, move
the decision on whether to attempt ACPI configuration into the
early_param handling. Then make acpi_boot_table_init() bail out if
acpi_disabled.
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++----------------------
1 file changed, 29 insertions(+), 25 deletions(-)
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index d1ce8e2..7a944f7 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled);
static bool param_acpi_off __initdata;
static bool param_acpi_force __initdata;
+static int __init dt_scan_depth1_nodes(unsigned long node,
+ const char *uname, int depth,
+ void *data)
+{
+ /*
+ * Return 1 as soon as we encounter a node at depth 1 that is
+ * not the /chosen node.
+ */
+ if (depth == 1 && (strcmp(uname, "chosen") != 0))
+ return 1;
+ return 0;
+}
+
static int __init parse_acpi(char *arg)
{
if (!arg)
@@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg)
else
return -EINVAL; /* Core will print when we return error */
- return 0;
-}
-early_param("acpi", parse_acpi);
+ /*
+ * Enable ACPI instead of device tree unless
+ * - ACPI has been disabled explicitly (acpi=off), or
+ * - the device tree is not empty (it has more than just a /chosen node)
+ * and ACPI has not been force enabled (acpi=force)
+ */
+ if (param_acpi_off ||
+ (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
+ return 0;
-static int __init dt_scan_depth1_nodes(unsigned long node,
- const char *uname, int depth,
- void *data)
-{
/*
- * Return 1 as soon as we encounter a node at depth 1 that is
- * not the /chosen node.
+ * ACPI is disabled at this point. Enable it in order to parse
+ * the ACPI tables and carry out sanity checks
*/
- if (depth == 1 && (strcmp(uname, "chosen") != 0))
- return 1;
+ enable_acpi();
+
return 0;
}
+early_param("acpi", parse_acpi);
+
/*
* __acpi_map_table() will be called before page_init(), so early_ioremap()
* or early_memremap() should be called here to for ACPI table mapping.
@@ -181,23 +198,10 @@ out:
*/
void __init acpi_boot_table_init(void)
{
- /*
- * Enable ACPI instead of device tree unless
- * - ACPI has been disabled explicitly (acpi=off), or
- * - the device tree is not empty (it has more than just a /chosen node)
- * and ACPI has not been force enabled (acpi=force)
- */
- if (param_acpi_off ||
- (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
+ if (acpi_disabled)
return;
/*
- * ACPI is disabled at this point. Enable it in order to parse
- * the ACPI tables and carry out sanity checks
- */
- enable_acpi();
-
- /*
* If ACPI tables are initialized and FADT sanity checks passed,
* leave ACPI enabled and carry on booting; otherwise disable ACPI
* on initialization error.
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-arm-kernel
From: Leif Lindholm <leif.lindholm@linaro.org>
In order to support selecting earlycon via either ACPI or DT, move
the decision on whether to attempt ACPI configuration into the
early_param handling. Then make acpi_boot_table_init() bail out if
acpi_disabled.
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++----------------------
1 file changed, 29 insertions(+), 25 deletions(-)
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index d1ce8e2..7a944f7 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled);
static bool param_acpi_off __initdata;
static bool param_acpi_force __initdata;
+static int __init dt_scan_depth1_nodes(unsigned long node,
+ const char *uname, int depth,
+ void *data)
+{
+ /*
+ * Return 1 as soon as we encounter a node at depth 1 that is
+ * not the /chosen node.
+ */
+ if (depth == 1 && (strcmp(uname, "chosen") != 0))
+ return 1;
+ return 0;
+}
+
static int __init parse_acpi(char *arg)
{
if (!arg)
@@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg)
else
return -EINVAL; /* Core will print when we return error */
- return 0;
-}
-early_param("acpi", parse_acpi);
+ /*
+ * Enable ACPI instead of device tree unless
+ * - ACPI has been disabled explicitly (acpi=off), or
+ * - the device tree is not empty (it has more than just a /chosen node)
+ * and ACPI has not been force enabled (acpi=force)
+ */
+ if (param_acpi_off ||
+ (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
+ return 0;
-static int __init dt_scan_depth1_nodes(unsigned long node,
- const char *uname, int depth,
- void *data)
-{
/*
- * Return 1 as soon as we encounter a node at depth 1 that is
- * not the /chosen node.
+ * ACPI is disabled at this point. Enable it in order to parse
+ * the ACPI tables and carry out sanity checks
*/
- if (depth == 1 && (strcmp(uname, "chosen") != 0))
- return 1;
+ enable_acpi();
+
return 0;
}
+early_param("acpi", parse_acpi);
+
/*
* __acpi_map_table() will be called before page_init(), so early_ioremap()
* or early_memremap() should be called here to for ACPI table mapping.
@@ -181,23 +198,10 @@ out:
*/
void __init acpi_boot_table_init(void)
{
- /*
- * Enable ACPI instead of device tree unless
- * - ACPI has been disabled explicitly (acpi=off), or
- * - the device tree is not empty (it has more than just a /chosen node)
- * and ACPI has not been force enabled (acpi=force)
- */
- if (param_acpi_off ||
- (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
+ if (acpi_disabled)
return;
/*
- * ACPI is disabled at this point. Enable it in order to parse
- * the ACPI tables and carry out sanity checks
- */
- enable_acpi();
-
- /*
* If ACPI tables are initialized and FADT sanity checks passed,
* leave ACPI enabled and carry on booting; otherwise disable ACPI
* on initialization error.
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process
2016-02-22 13:46 ` Aleksey Makarov
@ 2016-02-22 15:45 ` Matthias Brugger
-1 siblings, 0 replies; 31+ messages in thread
From: Matthias Brugger @ 2016-02-22 15:45 UTC (permalink / raw)
To: Aleksey Makarov, linux-acpi
Cc: Russell King, Graeme Gregory, Greg Kroah-Hartman,
Rafael J . Wysocki, linux-kernel, Leif Lindholm,
Christopher Covington, linux-serial, Catalin Marinas,
Will Deacon, Al Stone, linux-arm-kernel
On 22/02/16 14:46, Aleksey Makarov wrote:
> From: Leif Lindholm <leif.lindholm@linaro.org>
>
> In order to support selecting earlycon via either ACPI or DT, move
> the decision on whether to attempt ACPI configuration into the
> early_param handling. Then make acpi_boot_table_init() bail out if
> acpi_disabled.
>
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
> arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++----------------------
> 1 file changed, 29 insertions(+), 25 deletions(-)
>
> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
> index d1ce8e2..7a944f7 100644
> --- a/arch/arm64/kernel/acpi.c
> +++ b/arch/arm64/kernel/acpi.c
> @@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled);
> static bool param_acpi_off __initdata;
> static bool param_acpi_force __initdata;
>
> +static int __init dt_scan_depth1_nodes(unsigned long node,
> + const char *uname, int depth,
> + void *data)
> +{
> + /*
> + * Return 1 as soon as we encounter a node at depth 1 that is
> + * not the /chosen node.
> + */
> + if (depth == 1 && (strcmp(uname, "chosen") != 0))
> + return 1;
> + return 0;
> +}
> +
> static int __init parse_acpi(char *arg)
> {
> if (!arg)
> @@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg)
> else
> return -EINVAL; /* Core will print when we return error */
>
> - return 0;
> -}
> -early_param("acpi", parse_acpi);
> + /*
> + * Enable ACPI instead of device tree unless
> + * - ACPI has been disabled explicitly (acpi=off), or
> + * - the device tree is not empty (it has more than just a /chosen node)
> + * and ACPI has not been force enabled (acpi=force)
> + */
> + if (param_acpi_off ||
> + (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
> + return 0;
>
> -static int __init dt_scan_depth1_nodes(unsigned long node,
> - const char *uname, int depth,
> - void *data)
> -{
> /*
> - * Return 1 as soon as we encounter a node at depth 1 that is
> - * not the /chosen node.
> + * ACPI is disabled at this point. Enable it in order to parse
> + * the ACPI tables and carry out sanity checks
> */
> - if (depth == 1 && (strcmp(uname, "chosen") != 0))
> - return 1;
> + enable_acpi();
> +
So we only enable ACPI if we pass acpi=force as kernel parameter?
I'm not sure if this is what you wanted to do.
Regards,
Matthias
^ permalink raw reply [flat|nested] 31+ messages in thread* [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process
@ 2016-02-22 15:45 ` Matthias Brugger
0 siblings, 0 replies; 31+ messages in thread
From: Matthias Brugger @ 2016-02-22 15:45 UTC (permalink / raw)
To: linux-arm-kernel
On 22/02/16 14:46, Aleksey Makarov wrote:
> From: Leif Lindholm <leif.lindholm@linaro.org>
>
> In order to support selecting earlycon via either ACPI or DT, move
> the decision on whether to attempt ACPI configuration into the
> early_param handling. Then make acpi_boot_table_init() bail out if
> acpi_disabled.
>
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
> arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++----------------------
> 1 file changed, 29 insertions(+), 25 deletions(-)
>
> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
> index d1ce8e2..7a944f7 100644
> --- a/arch/arm64/kernel/acpi.c
> +++ b/arch/arm64/kernel/acpi.c
> @@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled);
> static bool param_acpi_off __initdata;
> static bool param_acpi_force __initdata;
>
> +static int __init dt_scan_depth1_nodes(unsigned long node,
> + const char *uname, int depth,
> + void *data)
> +{
> + /*
> + * Return 1 as soon as we encounter a node at depth 1 that is
> + * not the /chosen node.
> + */
> + if (depth == 1 && (strcmp(uname, "chosen") != 0))
> + return 1;
> + return 0;
> +}
> +
> static int __init parse_acpi(char *arg)
> {
> if (!arg)
> @@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg)
> else
> return -EINVAL; /* Core will print when we return error */
>
> - return 0;
> -}
> -early_param("acpi", parse_acpi);
> + /*
> + * Enable ACPI instead of device tree unless
> + * - ACPI has been disabled explicitly (acpi=off), or
> + * - the device tree is not empty (it has more than just a /chosen node)
> + * and ACPI has not been force enabled (acpi=force)
> + */
> + if (param_acpi_off ||
> + (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
> + return 0;
>
> -static int __init dt_scan_depth1_nodes(unsigned long node,
> - const char *uname, int depth,
> - void *data)
> -{
> /*
> - * Return 1 as soon as we encounter a node at depth 1 that is
> - * not the /chosen node.
> + * ACPI is disabled at this point. Enable it in order to parse
> + * the ACPI tables and carry out sanity checks
> */
> - if (depth == 1 && (strcmp(uname, "chosen") != 0))
> - return 1;
> + enable_acpi();
> +
So we only enable ACPI if we pass acpi=force as kernel parameter?
I'm not sure if this is what you wanted to do.
Regards,
Matthias
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process
2016-02-22 15:45 ` Matthias Brugger
@ 2016-02-23 13:57 ` Graeme Gregory
-1 siblings, 0 replies; 31+ messages in thread
From: Graeme Gregory @ 2016-02-23 13:57 UTC (permalink / raw)
To: Matthias Brugger
Cc: Aleksey Makarov, linux-acpi, Russell King, Graeme Gregory,
Greg Kroah-Hartman, Rafael J . Wysocki, linux-kernel,
Leif Lindholm, Christopher Covington, linux-serial,
Catalin Marinas, Will Deacon, Al Stone, linux-arm-kernel
On Mon, Feb 22, 2016 at 04:45:17PM +0100, Matthias Brugger wrote:
>
>
> On 22/02/16 14:46, Aleksey Makarov wrote:
> >From: Leif Lindholm <leif.lindholm@linaro.org>
> >
> >In order to support selecting earlycon via either ACPI or DT, move
> >the decision on whether to attempt ACPI configuration into the
> >early_param handling. Then make acpi_boot_table_init() bail out if
> >acpi_disabled.
> >
> >Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> >---
> > arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++----------------------
> > 1 file changed, 29 insertions(+), 25 deletions(-)
> >
> >diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
> >index d1ce8e2..7a944f7 100644
> >--- a/arch/arm64/kernel/acpi.c
> >+++ b/arch/arm64/kernel/acpi.c
> >@@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled);
> > static bool param_acpi_off __initdata;
> > static bool param_acpi_force __initdata;
> >
> >+static int __init dt_scan_depth1_nodes(unsigned long node,
> >+ const char *uname, int depth,
> >+ void *data)
> >+{
> >+ /*
> >+ * Return 1 as soon as we encounter a node at depth 1 that is
> >+ * not the /chosen node.
> >+ */
> >+ if (depth == 1 && (strcmp(uname, "chosen") != 0))
> >+ return 1;
> >+ return 0;
> >+}
> >+
> > static int __init parse_acpi(char *arg)
> > {
> > if (!arg)
> >@@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg)
> > else
> > return -EINVAL; /* Core will print when we return error */
> >
> >- return 0;
> >-}
> >-early_param("acpi", parse_acpi);
> >+ /*
> >+ * Enable ACPI instead of device tree unless
> >+ * - ACPI has been disabled explicitly (acpi=off), or
> >+ * - the device tree is not empty (it has more than just a /chosen node)
> >+ * and ACPI has not been force enabled (acpi=force)
> >+ */
> >+ if (param_acpi_off ||
> >+ (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
> >+ return 0;
> >
> >-static int __init dt_scan_depth1_nodes(unsigned long node,
> >- const char *uname, int depth,
> >- void *data)
> >-{
> > /*
> >- * Return 1 as soon as we encounter a node at depth 1 that is
> >- * not the /chosen node.
> >+ * ACPI is disabled at this point. Enable it in order to parse
> >+ * the ACPI tables and carry out sanity checks
> > */
> >- if (depth == 1 && (strcmp(uname, "chosen") != 0))
> >- return 1;
> >+ enable_acpi();
> >+
>
> So we only enable ACPI if we pass acpi=force as kernel parameter?
> I'm not sure if this is what you wanted to do.
>
The current preference from ARM64 maintainers was that is both ACPI
tables and a DT were presented then DT should take precedence.
With no DT provided the code should use ACPI.
Graeme
^ permalink raw reply [flat|nested] 31+ messages in thread* [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process
@ 2016-02-23 13:57 ` Graeme Gregory
0 siblings, 0 replies; 31+ messages in thread
From: Graeme Gregory @ 2016-02-23 13:57 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 22, 2016 at 04:45:17PM +0100, Matthias Brugger wrote:
>
>
> On 22/02/16 14:46, Aleksey Makarov wrote:
> >From: Leif Lindholm <leif.lindholm@linaro.org>
> >
> >In order to support selecting earlycon via either ACPI or DT, move
> >the decision on whether to attempt ACPI configuration into the
> >early_param handling. Then make acpi_boot_table_init() bail out if
> >acpi_disabled.
> >
> >Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> >---
> > arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++----------------------
> > 1 file changed, 29 insertions(+), 25 deletions(-)
> >
> >diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
> >index d1ce8e2..7a944f7 100644
> >--- a/arch/arm64/kernel/acpi.c
> >+++ b/arch/arm64/kernel/acpi.c
> >@@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled);
> > static bool param_acpi_off __initdata;
> > static bool param_acpi_force __initdata;
> >
> >+static int __init dt_scan_depth1_nodes(unsigned long node,
> >+ const char *uname, int depth,
> >+ void *data)
> >+{
> >+ /*
> >+ * Return 1 as soon as we encounter a node at depth 1 that is
> >+ * not the /chosen node.
> >+ */
> >+ if (depth == 1 && (strcmp(uname, "chosen") != 0))
> >+ return 1;
> >+ return 0;
> >+}
> >+
> > static int __init parse_acpi(char *arg)
> > {
> > if (!arg)
> >@@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg)
> > else
> > return -EINVAL; /* Core will print when we return error */
> >
> >- return 0;
> >-}
> >-early_param("acpi", parse_acpi);
> >+ /*
> >+ * Enable ACPI instead of device tree unless
> >+ * - ACPI has been disabled explicitly (acpi=off), or
> >+ * - the device tree is not empty (it has more than just a /chosen node)
> >+ * and ACPI has not been force enabled (acpi=force)
> >+ */
> >+ if (param_acpi_off ||
> >+ (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
> >+ return 0;
> >
> >-static int __init dt_scan_depth1_nodes(unsigned long node,
> >- const char *uname, int depth,
> >- void *data)
> >-{
> > /*
> >- * Return 1 as soon as we encounter a node at depth 1 that is
> >- * not the /chosen node.
> >+ * ACPI is disabled at this point. Enable it in order to parse
> >+ * the ACPI tables and carry out sanity checks
> > */
> >- if (depth == 1 && (strcmp(uname, "chosen") != 0))
> >- return 1;
> >+ enable_acpi();
> >+
>
> So we only enable ACPI if we pass acpi=force as kernel parameter?
> I'm not sure if this is what you wanted to do.
>
The current preference from ARM64 maintainers was that is both ACPI
tables and a DT were presented then DT should take precedence.
With no DT provided the code should use ACPI.
Graeme
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process
2016-02-23 13:57 ` Graeme Gregory
@ 2016-02-23 14:37 ` Matthias Brugger
-1 siblings, 0 replies; 31+ messages in thread
From: Matthias Brugger @ 2016-02-23 14:37 UTC (permalink / raw)
To: Graeme Gregory
Cc: Aleksey Makarov, linux-acpi, Russell King, Graeme Gregory,
Greg Kroah-Hartman, Rafael J . Wysocki, linux-kernel,
Leif Lindholm, Christopher Covington, linux-serial,
Catalin Marinas, Will Deacon, Al Stone, linux-arm-kernel
On 23/02/16 14:57, Graeme Gregory wrote:
> On Mon, Feb 22, 2016 at 04:45:17PM +0100, Matthias Brugger wrote:
>>
>>
>> On 22/02/16 14:46, Aleksey Makarov wrote:
>>> From: Leif Lindholm <leif.lindholm@linaro.org>
>>>
>>> In order to support selecting earlycon via either ACPI or DT, move
>>> the decision on whether to attempt ACPI configuration into the
>>> early_param handling. Then make acpi_boot_table_init() bail out if
>>> acpi_disabled.
>>>
>>> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
>>> ---
>>> arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++----------------------
>>> 1 file changed, 29 insertions(+), 25 deletions(-)
>>>
>>> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
>>> index d1ce8e2..7a944f7 100644
>>> --- a/arch/arm64/kernel/acpi.c
>>> +++ b/arch/arm64/kernel/acpi.c
>>> @@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled);
>>> static bool param_acpi_off __initdata;
>>> static bool param_acpi_force __initdata;
>>>
>>> +static int __init dt_scan_depth1_nodes(unsigned long node,
>>> + const char *uname, int depth,
>>> + void *data)
>>> +{
>>> + /*
>>> + * Return 1 as soon as we encounter a node at depth 1 that is
>>> + * not the /chosen node.
>>> + */
>>> + if (depth == 1 && (strcmp(uname, "chosen") != 0))
>>> + return 1;
>>> + return 0;
>>> +}
>>> +
>>> static int __init parse_acpi(char *arg)
>>> {
>>> if (!arg)
>>> @@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg)
>>> else
>>> return -EINVAL; /* Core will print when we return error */
If argument of parse_acpi is neither "off" nor "force" we return with
-EINVAL here. Actually parse_acpi will be only called if we pass "acpi="
as kernel parameter. Therefor we can get rid of "acpi=off" as this is
the _new_ standard. IMHO we should introduce "acpi=on" if we really want
to change the standard behavior.
>>>
>>> - return 0;
>>> -}
>>> -early_param("acpi", parse_acpi);
>>> + /*
>>> + * Enable ACPI instead of device tree unless
>>> + * - ACPI has been disabled explicitly (acpi=off), or
>>> + * - the device tree is not empty (it has more than just a /chosen node)
>>> + * and ACPI has not been force enabled (acpi=force)
>>> + */
>>> + if (param_acpi_off ||
>>> + (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
>>> + return 0;
Or param_acpi_off is true or param_acpi_force is true, the depth of the
DT has no influence.
>>>
>>> -static int __init dt_scan_depth1_nodes(unsigned long node,
>>> - const char *uname, int depth,
>>> - void *data)
>>> -{
>>> /*
>>> - * Return 1 as soon as we encounter a node at depth 1 that is
>>> - * not the /chosen node.
>>> + * ACPI is disabled at this point. Enable it in order to parse
>>> + * the ACPI tables and carry out sanity checks
>>> */
>>> - if (depth == 1 && (strcmp(uname, "chosen") != 0))
>>> - return 1;
>>> + enable_acpi();
>>> +
>>
>> So we only enable ACPI if we pass acpi=force as kernel parameter?
>> I'm not sure if this is what you wanted to do.
>>
>
> The current preference from ARM64 maintainers was that is both ACPI
> tables and a DT were presented then DT should take precedence.
>
> With no DT provided the code should use ACPI.
From my understanding in this patch that can never happen.
On which version is this set based on?
I'm looking on v4.5-rc5 ATM.
Regards,
Matthias
^ permalink raw reply [flat|nested] 31+ messages in thread* [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process
@ 2016-02-23 14:37 ` Matthias Brugger
0 siblings, 0 replies; 31+ messages in thread
From: Matthias Brugger @ 2016-02-23 14:37 UTC (permalink / raw)
To: linux-arm-kernel
On 23/02/16 14:57, Graeme Gregory wrote:
> On Mon, Feb 22, 2016 at 04:45:17PM +0100, Matthias Brugger wrote:
>>
>>
>> On 22/02/16 14:46, Aleksey Makarov wrote:
>>> From: Leif Lindholm <leif.lindholm@linaro.org>
>>>
>>> In order to support selecting earlycon via either ACPI or DT, move
>>> the decision on whether to attempt ACPI configuration into the
>>> early_param handling. Then make acpi_boot_table_init() bail out if
>>> acpi_disabled.
>>>
>>> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
>>> ---
>>> arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++----------------------
>>> 1 file changed, 29 insertions(+), 25 deletions(-)
>>>
>>> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
>>> index d1ce8e2..7a944f7 100644
>>> --- a/arch/arm64/kernel/acpi.c
>>> +++ b/arch/arm64/kernel/acpi.c
>>> @@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled);
>>> static bool param_acpi_off __initdata;
>>> static bool param_acpi_force __initdata;
>>>
>>> +static int __init dt_scan_depth1_nodes(unsigned long node,
>>> + const char *uname, int depth,
>>> + void *data)
>>> +{
>>> + /*
>>> + * Return 1 as soon as we encounter a node at depth 1 that is
>>> + * not the /chosen node.
>>> + */
>>> + if (depth == 1 && (strcmp(uname, "chosen") != 0))
>>> + return 1;
>>> + return 0;
>>> +}
>>> +
>>> static int __init parse_acpi(char *arg)
>>> {
>>> if (!arg)
>>> @@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg)
>>> else
>>> return -EINVAL; /* Core will print when we return error */
If argument of parse_acpi is neither "off" nor "force" we return with
-EINVAL here. Actually parse_acpi will be only called if we pass "acpi="
as kernel parameter. Therefor we can get rid of "acpi=off" as this is
the _new_ standard. IMHO we should introduce "acpi=on" if we really want
to change the standard behavior.
>>>
>>> - return 0;
>>> -}
>>> -early_param("acpi", parse_acpi);
>>> + /*
>>> + * Enable ACPI instead of device tree unless
>>> + * - ACPI has been disabled explicitly (acpi=off), or
>>> + * - the device tree is not empty (it has more than just a /chosen node)
>>> + * and ACPI has not been force enabled (acpi=force)
>>> + */
>>> + if (param_acpi_off ||
>>> + (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
>>> + return 0;
Or param_acpi_off is true or param_acpi_force is true, the depth of the
DT has no influence.
>>>
>>> -static int __init dt_scan_depth1_nodes(unsigned long node,
>>> - const char *uname, int depth,
>>> - void *data)
>>> -{
>>> /*
>>> - * Return 1 as soon as we encounter a node at depth 1 that is
>>> - * not the /chosen node.
>>> + * ACPI is disabled at this point. Enable it in order to parse
>>> + * the ACPI tables and carry out sanity checks
>>> */
>>> - if (depth == 1 && (strcmp(uname, "chosen") != 0))
>>> - return 1;
>>> + enable_acpi();
>>> +
>>
>> So we only enable ACPI if we pass acpi=force as kernel parameter?
>> I'm not sure if this is what you wanted to do.
>>
>
> The current preference from ARM64 maintainers was that is both ACPI
> tables and a DT were presented then DT should take precedence.
>
> With no DT provided the code should use ACPI.
From my understanding in this patch that can never happen.
On which version is this set based on?
I'm looking on v4.5-rc5 ATM.
Regards,
Matthias
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process
2016-02-23 14:37 ` Matthias Brugger
@ 2016-02-24 16:09 ` Aleksey Makarov
-1 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-24 16:09 UTC (permalink / raw)
To: Matthias Brugger, Graeme Gregory
Cc: Aleksey Makarov, linux-acpi, Russell King, Graeme Gregory,
Greg Kroah-Hartman, Rafael J . Wysocki, linux-kernel,
Leif Lindholm, Christopher Covington, linux-serial,
Catalin Marinas, Will Deacon, Al Stone, linux-arm-kernel
Hi Matthias,
Thank you for review. The bug is fixed in the next version of the patchset.
Aleksey Makarov
On 02/23/2016 05:37 PM, Matthias Brugger wrote:
>
>
> On 23/02/16 14:57, Graeme Gregory wrote:
>> On Mon, Feb 22, 2016 at 04:45:17PM +0100, Matthias Brugger wrote:
>>>
>>>
>>> On 22/02/16 14:46, Aleksey Makarov wrote:
>>>> From: Leif Lindholm <leif.lindholm@linaro.org>
>>>>
>>>> In order to support selecting earlycon via either ACPI or DT, move
>>>> the decision on whether to attempt ACPI configuration into the
>>>> early_param handling. Then make acpi_boot_table_init() bail out if
>>>> acpi_disabled.
>>>>
>>>> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
>>>> ---
>>>> arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++----------------------
>>>> 1 file changed, 29 insertions(+), 25 deletions(-)
>>>>
>>>> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
>>>> index d1ce8e2..7a944f7 100644
>>>> --- a/arch/arm64/kernel/acpi.c
>>>> +++ b/arch/arm64/kernel/acpi.c
>>>> @@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled);
>>>> static bool param_acpi_off __initdata;
>>>> static bool param_acpi_force __initdata;
>>>>
>>>> +static int __init dt_scan_depth1_nodes(unsigned long node,
>>>> + const char *uname, int depth,
>>>> + void *data)
>>>> +{
>>>> + /*
>>>> + * Return 1 as soon as we encounter a node at depth 1 that is
>>>> + * not the /chosen node.
>>>> + */
>>>> + if (depth == 1 && (strcmp(uname, "chosen") != 0))
>>>> + return 1;
>>>> + return 0;
>>>> +}
>>>> +
>>>> static int __init parse_acpi(char *arg)
>>>> {
>>>> if (!arg)
>>>> @@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg)
>>>> else
>>>> return -EINVAL; /* Core will print when we return error */
>
> If argument of parse_acpi is neither "off" nor "force" we return with -EINVAL here. Actually parse_acpi will be only called if we pass "acpi=" as kernel parameter. Therefor we can get rid of "acpi=off" as this is the _new_ standard. IMHO we should introduce "acpi=on" if we really want to change the standard behavior.
>
>>>>
>>>> - return 0;
>>>> -}
>>>> -early_param("acpi", parse_acpi);
>>>> + /*
>>>> + * Enable ACPI instead of device tree unless
>>>> + * - ACPI has been disabled explicitly (acpi=off), or
>>>> + * - the device tree is not empty (it has more than just a /chosen node)
>>>> + * and ACPI has not been force enabled (acpi=force)
>>>> + */
>>>> + if (param_acpi_off ||
>>>> + (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
>>>> + return 0;
>
> Or param_acpi_off is true or param_acpi_force is true, the depth of the DT has no influence.
>
>>>>
>>>> -static int __init dt_scan_depth1_nodes(unsigned long node,
>>>> - const char *uname, int depth,
>>>> - void *data)
>>>> -{
>>>> /*
>>>> - * Return 1 as soon as we encounter a node at depth 1 that is
>>>> - * not the /chosen node.
>>>> + * ACPI is disabled at this point. Enable it in order to parse
>>>> + * the ACPI tables and carry out sanity checks
>>>> */
>>>> - if (depth == 1 && (strcmp(uname, "chosen") != 0))
>>>> - return 1;
>>>> + enable_acpi();
>>>> +
>>>
>>> So we only enable ACPI if we pass acpi=force as kernel parameter?
>>> I'm not sure if this is what you wanted to do.
>>>
>>
>> The current preference from ARM64 maintainers was that is both ACPI
>> tables and a DT were presented then DT should take precedence.
>>
>> With no DT provided the code should use ACPI.
>
> From my understanding in this patch that can never happen.
>
> On which version is this set based on?
> I'm looking on v4.5-rc5 ATM.
>
> Regards,
> Matthias
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 31+ messages in thread* [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process
@ 2016-02-24 16:09 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-24 16:09 UTC (permalink / raw)
To: linux-arm-kernel
Hi Matthias,
Thank you for review. The bug is fixed in the next version of the patchset.
Aleksey Makarov
On 02/23/2016 05:37 PM, Matthias Brugger wrote:
>
>
> On 23/02/16 14:57, Graeme Gregory wrote:
>> On Mon, Feb 22, 2016 at 04:45:17PM +0100, Matthias Brugger wrote:
>>>
>>>
>>> On 22/02/16 14:46, Aleksey Makarov wrote:
>>>> From: Leif Lindholm <leif.lindholm@linaro.org>
>>>>
>>>> In order to support selecting earlycon via either ACPI or DT, move
>>>> the decision on whether to attempt ACPI configuration into the
>>>> early_param handling. Then make acpi_boot_table_init() bail out if
>>>> acpi_disabled.
>>>>
>>>> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
>>>> ---
>>>> arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++----------------------
>>>> 1 file changed, 29 insertions(+), 25 deletions(-)
>>>>
>>>> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
>>>> index d1ce8e2..7a944f7 100644
>>>> --- a/arch/arm64/kernel/acpi.c
>>>> +++ b/arch/arm64/kernel/acpi.c
>>>> @@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled);
>>>> static bool param_acpi_off __initdata;
>>>> static bool param_acpi_force __initdata;
>>>>
>>>> +static int __init dt_scan_depth1_nodes(unsigned long node,
>>>> + const char *uname, int depth,
>>>> + void *data)
>>>> +{
>>>> + /*
>>>> + * Return 1 as soon as we encounter a node at depth 1 that is
>>>> + * not the /chosen node.
>>>> + */
>>>> + if (depth == 1 && (strcmp(uname, "chosen") != 0))
>>>> + return 1;
>>>> + return 0;
>>>> +}
>>>> +
>>>> static int __init parse_acpi(char *arg)
>>>> {
>>>> if (!arg)
>>>> @@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg)
>>>> else
>>>> return -EINVAL; /* Core will print when we return error */
>
> If argument of parse_acpi is neither "off" nor "force" we return with -EINVAL here. Actually parse_acpi will be only called if we pass "acpi=" as kernel parameter. Therefor we can get rid of "acpi=off" as this is the _new_ standard. IMHO we should introduce "acpi=on" if we really want to change the standard behavior.
>
>>>>
>>>> - return 0;
>>>> -}
>>>> -early_param("acpi", parse_acpi);
>>>> + /*
>>>> + * Enable ACPI instead of device tree unless
>>>> + * - ACPI has been disabled explicitly (acpi=off), or
>>>> + * - the device tree is not empty (it has more than just a /chosen node)
>>>> + * and ACPI has not been force enabled (acpi=force)
>>>> + */
>>>> + if (param_acpi_off ||
>>>> + (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
>>>> + return 0;
>
> Or param_acpi_off is true or param_acpi_force is true, the depth of the DT has no influence.
>
>>>>
>>>> -static int __init dt_scan_depth1_nodes(unsigned long node,
>>>> - const char *uname, int depth,
>>>> - void *data)
>>>> -{
>>>> /*
>>>> - * Return 1 as soon as we encounter a node at depth 1 that is
>>>> - * not the /chosen node.
>>>> + * ACPI is disabled at this point. Enable it in order to parse
>>>> + * the ACPI tables and carry out sanity checks
>>>> */
>>>> - if (depth == 1 && (strcmp(uname, "chosen") != 0))
>>>> - return 1;
>>>> + enable_acpi();
>>>> +
>>>
>>> So we only enable ACPI if we pass acpi=force as kernel parameter?
>>> I'm not sure if this is what you wanted to do.
>>>
>>
>> The current preference from ARM64 maintainers was that is both ACPI
>> tables and a DT were presented then DT should take precedence.
>>
>> With no DT provided the code should use ACPI.
>
> From my understanding in this patch that can never happen.
>
> On which version is this set based on?
> I'm looking on v4.5-rc5 ATM.
>
> Regards,
> Matthias
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 2/8] of/serial: move earlycon early_param handling to serial
2016-02-22 13:46 ` Aleksey Makarov
@ 2016-02-22 13:46 ` Aleksey Makarov
-1 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-acpi
Cc: linux-serial, linux-kernel, linux-arm-kernel, Aleksey Makarov,
Russell King, Greg Kroah-Hartman, Rafael J . Wysocki,
Leif Lindholm, Graeme Gregory, Al Stone, Christopher Covington,
Rob Herring, Frank Rowand, Grant Likely, Jiri Slaby, devicetree
From: Leif Lindholm <leif.lindholm@linaro.org>
We have multiple "earlycon" early_param handlers - merge the DT one into
the main earlycon one. This means the earlycon early_param handler does
not just return success if no options are specified.
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
drivers/of/fdt.c | 11 +----------
drivers/tty/serial/earlycon.c | 3 ++-
include/linux/of_fdt.h | 2 ++
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 655f79d..6b4ab4f 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -798,7 +798,7 @@ static inline void early_init_dt_check_for_initrd(unsigned long node)
#ifdef CONFIG_SERIAL_EARLYCON
extern struct of_device_id __earlycon_of_table[];
-static int __init early_init_dt_scan_chosen_serial(void)
+int __init early_init_dt_scan_chosen_serial(void)
{
int offset;
const char *p;
@@ -843,15 +843,6 @@ static int __init early_init_dt_scan_chosen_serial(void)
}
return -ENODEV;
}
-
-static int __init setup_of_earlycon(char *buf)
-{
- if (buf)
- return 0;
-
- return early_init_dt_scan_chosen_serial();
-}
-early_param("earlycon", setup_of_earlycon);
#endif
/**
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 3f24236..05f9e4b 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -17,6 +17,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/io.h>
+#include <linux/of_fdt.h>
#include <linux/serial_core.h>
#include <linux/sizes.h>
#include <linux/mod_devicetable.h>
@@ -195,7 +196,7 @@ static int __init param_setup_earlycon(char *buf)
* don't generate a warning from parse_early_params() in that case
*/
if (!buf || !buf[0])
- return 0;
+ return early_init_dt_scan_chosen_serial();
err = setup_earlycon(buf);
if (err == -ENOENT || err == -EALREADY)
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index df9ef38..4d783aa8 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -63,6 +63,7 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
int depth, void *data);
extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
int depth, void *data);
+extern int early_init_dt_scan_chosen_serial(void);
extern void early_init_fdt_scan_reserved_mem(void);
extern void early_init_fdt_reserve_self(void);
extern void early_init_dt_add_memory_arch(u64 base, u64 size);
@@ -91,6 +92,7 @@ extern void early_get_first_memblock_info(void *, phys_addr_t *);
extern u64 fdt_translate_address(const void *blob, int node_offset);
extern void of_fdt_limit_memory(int limit);
#else /* CONFIG_OF_FLATTREE */
+static inline int early_init_dt_scan_chosen_serial(void) { return -ENODEV; }
static inline void early_init_fdt_scan_reserved_mem(void) {}
static inline void early_init_fdt_reserve_self(void) {}
static inline const char *of_flat_dt_get_machine_name(void) { return NULL; }
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 2/8] of/serial: move earlycon early_param handling to serial
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-arm-kernel
From: Leif Lindholm <leif.lindholm@linaro.org>
We have multiple "earlycon" early_param handlers - merge the DT one into
the main earlycon one. This means the earlycon early_param handler does
not just return success if no options are specified.
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
drivers/of/fdt.c | 11 +----------
drivers/tty/serial/earlycon.c | 3 ++-
include/linux/of_fdt.h | 2 ++
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 655f79d..6b4ab4f 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -798,7 +798,7 @@ static inline void early_init_dt_check_for_initrd(unsigned long node)
#ifdef CONFIG_SERIAL_EARLYCON
extern struct of_device_id __earlycon_of_table[];
-static int __init early_init_dt_scan_chosen_serial(void)
+int __init early_init_dt_scan_chosen_serial(void)
{
int offset;
const char *p;
@@ -843,15 +843,6 @@ static int __init early_init_dt_scan_chosen_serial(void)
}
return -ENODEV;
}
-
-static int __init setup_of_earlycon(char *buf)
-{
- if (buf)
- return 0;
-
- return early_init_dt_scan_chosen_serial();
-}
-early_param("earlycon", setup_of_earlycon);
#endif
/**
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 3f24236..05f9e4b 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -17,6 +17,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/io.h>
+#include <linux/of_fdt.h>
#include <linux/serial_core.h>
#include <linux/sizes.h>
#include <linux/mod_devicetable.h>
@@ -195,7 +196,7 @@ static int __init param_setup_earlycon(char *buf)
* don't generate a warning from parse_early_params() in that case
*/
if (!buf || !buf[0])
- return 0;
+ return early_init_dt_scan_chosen_serial();
err = setup_earlycon(buf);
if (err == -ENOENT || err == -EALREADY)
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index df9ef38..4d783aa8 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -63,6 +63,7 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
int depth, void *data);
extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
int depth, void *data);
+extern int early_init_dt_scan_chosen_serial(void);
extern void early_init_fdt_scan_reserved_mem(void);
extern void early_init_fdt_reserve_self(void);
extern void early_init_dt_add_memory_arch(u64 base, u64 size);
@@ -91,6 +92,7 @@ extern void early_get_first_memblock_info(void *, phys_addr_t *);
extern u64 fdt_translate_address(const void *blob, int node_offset);
extern void of_fdt_limit_memory(int limit);
#else /* CONFIG_OF_FLATTREE */
+static inline int early_init_dt_scan_chosen_serial(void) { return -ENODEV; }
static inline void early_init_fdt_scan_reserved_mem(void) {}
static inline void early_init_fdt_reserve_self(void) {}
static inline const char *of_flat_dt_get_machine_name(void) { return NULL; }
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread[parent not found: <1456148818-26257-3-git-send-email-aleksey.makarov-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>]
* Re: [PATCH 2/8] of/serial: move earlycon early_param handling to serial
2016-02-22 13:46 ` Aleksey Makarov
(?)
@ 2016-02-22 15:09 ` kbuild test robot
-1 siblings, 0 replies; 31+ messages in thread
From: kbuild test robot @ 2016-02-22 15:09 UTC (permalink / raw)
Cc: kbuild-all-JC7UmRfGjtg, linux-acpi-u79uwXL29TY76Z2rM5mHXA,
linux-serial-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Aleksey Makarov, Russell King, Greg Kroah-Hartman,
Rafael J . Wysocki, Leif Lindholm, Graeme Gregory, Al Stone,
Christopher Covington, Rob Herring, Frank Rowand, Grant Likely,
Jiri Slaby, devicetree-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 2368 bytes --]
Hi Leif,
[auto build test ERROR on pm/linux-next]
[also build test ERROR on v4.5-rc5 next-20160222]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Aleksey-Makarov/arm64-move-acpi-dt-decision-earlier-in-boot-process/20160222-215244
base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next
config: microblaze-allyesconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=microblaze
All errors (new ones prefixed by >>):
>> arch/microblaze/kernel/prom.c:48:19: error: conflicting types for 'early_init_dt_scan_chosen_serial'
static int __init early_init_dt_scan_chosen_serial(unsigned long node,
^
In file included from arch/microblaze/kernel/prom.c:33:0:
include/linux/of_fdt.h:66:12: note: previous declaration of 'early_init_dt_scan_chosen_serial' was here
extern int early_init_dt_scan_chosen_serial(void);
^
vim +/early_init_dt_scan_chosen_serial +48 arch/microblaze/kernel/prom.c
12e84142 Michal Simek 2009-03-27 42 #include <asm/sections.h>
12e84142 Michal Simek 2009-03-27 43 #include <asm/pci-bridge.h>
12e84142 Michal Simek 2009-03-27 44
12e84142 Michal Simek 2009-03-27 45 #ifdef CONFIG_EARLY_PRINTK
9d0c4dfe Rob Herring 2014-04-01 46 static const char *stdout;
2aa8e375 Michal Simek 2011-04-14 47
c0d997fb Michal Simek 2012-12-13 @48 static int __init early_init_dt_scan_chosen_serial(unsigned long node,
12e84142 Michal Simek 2009-03-27 49 const char *uname, int depth, void *data)
12e84142 Michal Simek 2009-03-27 50 {
9d0c4dfe Rob Herring 2014-04-01 51 int l;
:::::: The code at line 48 was first introduced by commit
:::::: c0d997fb4c4f202c55a4ed8ab9b714a81a16e5ac microblaze: Add static qualifiers
:::::: TO: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
:::::: CC: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 43955 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread* [PATCH 2/8] of/serial: move earlycon early_param handling to serial
@ 2016-02-22 15:09 ` kbuild test robot
0 siblings, 0 replies; 31+ messages in thread
From: kbuild test robot @ 2016-02-22 15:09 UTC (permalink / raw)
To: linux-arm-kernel
Hi Leif,
[auto build test ERROR on pm/linux-next]
[also build test ERROR on v4.5-rc5 next-20160222]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Aleksey-Makarov/arm64-move-acpi-dt-decision-earlier-in-boot-process/20160222-215244
base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next
config: microblaze-allyesconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=microblaze
All errors (new ones prefixed by >>):
>> arch/microblaze/kernel/prom.c:48:19: error: conflicting types for 'early_init_dt_scan_chosen_serial'
static int __init early_init_dt_scan_chosen_serial(unsigned long node,
^
In file included from arch/microblaze/kernel/prom.c:33:0:
include/linux/of_fdt.h:66:12: note: previous declaration of 'early_init_dt_scan_chosen_serial' was here
extern int early_init_dt_scan_chosen_serial(void);
^
vim +/early_init_dt_scan_chosen_serial +48 arch/microblaze/kernel/prom.c
12e84142 Michal Simek 2009-03-27 42 #include <asm/sections.h>
12e84142 Michal Simek 2009-03-27 43 #include <asm/pci-bridge.h>
12e84142 Michal Simek 2009-03-27 44
12e84142 Michal Simek 2009-03-27 45 #ifdef CONFIG_EARLY_PRINTK
9d0c4dfe Rob Herring 2014-04-01 46 static const char *stdout;
2aa8e375 Michal Simek 2011-04-14 47
c0d997fb Michal Simek 2012-12-13 @48 static int __init early_init_dt_scan_chosen_serial(unsigned long node,
12e84142 Michal Simek 2009-03-27 49 const char *uname, int depth, void *data)
12e84142 Michal Simek 2009-03-27 50 {
9d0c4dfe Rob Herring 2014-04-01 51 int l;
:::::: The code at line 48 was first introduced by commit
:::::: c0d997fb4c4f202c55a4ed8ab9b714a81a16e5ac microblaze: Add static qualifiers
:::::: TO: Michal Simek <michal.simek@xilinx.com>
:::::: CC: Michal Simek <michal.simek@xilinx.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/octet-stream
Size: 43955 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160222/f4a58943/attachment-0001.obj>
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 2/8] of/serial: move earlycon early_param handling to serial
@ 2016-02-22 15:09 ` kbuild test robot
0 siblings, 0 replies; 31+ messages in thread
From: kbuild test robot @ 2016-02-22 15:09 UTC (permalink / raw)
To: Aleksey Makarov
Cc: kbuild-all, linux-acpi, linux-serial, linux-kernel,
linux-arm-kernel, Aleksey Makarov, Russell King,
Greg Kroah-Hartman, Rafael J . Wysocki, Leif Lindholm,
Graeme Gregory, Al Stone, Christopher Covington, Rob Herring,
Frank Rowand, Grant Likely, Jiri Slaby, devicetree
[-- Attachment #1: Type: text/plain, Size: 2310 bytes --]
Hi Leif,
[auto build test ERROR on pm/linux-next]
[also build test ERROR on v4.5-rc5 next-20160222]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Aleksey-Makarov/arm64-move-acpi-dt-decision-earlier-in-boot-process/20160222-215244
base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next
config: microblaze-allyesconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=microblaze
All errors (new ones prefixed by >>):
>> arch/microblaze/kernel/prom.c:48:19: error: conflicting types for 'early_init_dt_scan_chosen_serial'
static int __init early_init_dt_scan_chosen_serial(unsigned long node,
^
In file included from arch/microblaze/kernel/prom.c:33:0:
include/linux/of_fdt.h:66:12: note: previous declaration of 'early_init_dt_scan_chosen_serial' was here
extern int early_init_dt_scan_chosen_serial(void);
^
vim +/early_init_dt_scan_chosen_serial +48 arch/microblaze/kernel/prom.c
12e84142 Michal Simek 2009-03-27 42 #include <asm/sections.h>
12e84142 Michal Simek 2009-03-27 43 #include <asm/pci-bridge.h>
12e84142 Michal Simek 2009-03-27 44
12e84142 Michal Simek 2009-03-27 45 #ifdef CONFIG_EARLY_PRINTK
9d0c4dfe Rob Herring 2014-04-01 46 static const char *stdout;
2aa8e375 Michal Simek 2011-04-14 47
c0d997fb Michal Simek 2012-12-13 @48 static int __init early_init_dt_scan_chosen_serial(unsigned long node,
12e84142 Michal Simek 2009-03-27 49 const char *uname, int depth, void *data)
12e84142 Michal Simek 2009-03-27 50 {
9d0c4dfe Rob Herring 2014-04-01 51 int l;
:::::: The code at line 48 was first introduced by commit
:::::: c0d997fb4c4f202c55a4ed8ab9b714a81a16e5ac microblaze: Add static qualifiers
:::::: TO: Michal Simek <michal.simek@xilinx.com>
:::::: CC: Michal Simek <michal.simek@xilinx.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 43955 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 3/8] ACPI: add definitions of DBG2 subtypes
2016-02-22 13:46 ` Aleksey Makarov
(?)
@ 2016-02-22 13:46 ` Aleksey Makarov
-1 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-acpi
Cc: devel, Russell King, Graeme Gregory, Greg Kroah-Hartman,
Rafael J. Wysocki, Rafael J . Wysocki, linux-kernel,
Leif Lindholm, Robert Moore, Aleksey Makarov,
Christopher Covington, linux-serial, Len Brown, Al Stone,
linux-arm-kernel, Lv Zheng
The recent version of Microsoft Debug Port Table 2 (DBG2) [1]
specifies additional serial debug port subtypes. These constants
are also referred by Serial Port Console Redirection Table (SPCR) [2]
Add these constants.
[1] https://msdn.microsoft.com/en-us/library/windows/hardware/dn639131(v=vs.85).aspx
[2] https://msdn.microsoft.com/en-us/library/windows/hardware/dn639132(v=vs.85).aspx
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
include/acpi/actbl2.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index a4ef625..652f747 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -371,6 +371,11 @@ struct acpi_dbg2_device {
#define ACPI_DBG2_16550_COMPATIBLE 0x0000
#define ACPI_DBG2_16550_SUBSET 0x0001
+#define ACPI_DBG2_ARM_PL011 0x0003
+#define ACPI_DBG2_ARM_SBSA_32BIT 0x000D
+#define ACPI_DBG2_ARM_SBSA_GENERIC 0x000E
+#define ACPI_DBG2_ARM_DCC 0x000F
+#define ACPI_DBG2_BCM2835 0x0010
#define ACPI_DBG2_1394_STANDARD 0x0000
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 3/8] ACPI: add definitions of DBG2 subtypes
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-arm-kernel
The recent version of Microsoft Debug Port Table 2 (DBG2) [1]
specifies additional serial debug port subtypes. These constants
are also referred by Serial Port Console Redirection Table (SPCR) [2]
Add these constants.
[1] https://msdn.microsoft.com/en-us/library/windows/hardware/dn639131(v=vs.85).aspx
[2] https://msdn.microsoft.com/en-us/library/windows/hardware/dn639132(v=vs.85).aspx
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
include/acpi/actbl2.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index a4ef625..652f747 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -371,6 +371,11 @@ struct acpi_dbg2_device {
#define ACPI_DBG2_16550_COMPATIBLE 0x0000
#define ACPI_DBG2_16550_SUBSET 0x0001
+#define ACPI_DBG2_ARM_PL011 0x0003
+#define ACPI_DBG2_ARM_SBSA_32BIT 0x000D
+#define ACPI_DBG2_ARM_SBSA_GENERIC 0x000E
+#define ACPI_DBG2_ARM_DCC 0x000F
+#define ACPI_DBG2_BCM2835 0x0010
#define ACPI_DBG2_1394_STANDARD 0x0000
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 3/8] ACPI: add definitions of DBG2 subtypes
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-acpi
Cc: linux-serial, linux-kernel, linux-arm-kernel, Aleksey Makarov,
Russell King, Greg Kroah-Hartman, Rafael J . Wysocki,
Leif Lindholm, Graeme Gregory, Al Stone, Christopher Covington,
Robert Moore, Lv Zheng, Rafael J. Wysocki, Len Brown, devel
The recent version of Microsoft Debug Port Table 2 (DBG2) [1]
specifies additional serial debug port subtypes. These constants
are also referred by Serial Port Console Redirection Table (SPCR) [2]
Add these constants.
[1] https://msdn.microsoft.com/en-us/library/windows/hardware/dn639131(v=vs.85).aspx
[2] https://msdn.microsoft.com/en-us/library/windows/hardware/dn639132(v=vs.85).aspx
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
include/acpi/actbl2.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index a4ef625..652f747 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -371,6 +371,11 @@ struct acpi_dbg2_device {
#define ACPI_DBG2_16550_COMPATIBLE 0x0000
#define ACPI_DBG2_16550_SUBSET 0x0001
+#define ACPI_DBG2_ARM_PL011 0x0003
+#define ACPI_DBG2_ARM_SBSA_32BIT 0x000D
+#define ACPI_DBG2_ARM_SBSA_GENERIC 0x000E
+#define ACPI_DBG2_ARM_DCC 0x000F
+#define ACPI_DBG2_BCM2835 0x0010
#define ACPI_DBG2_1394_STANDARD 0x0000
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 4/8] ACPI: genaralize iterating over subtables in ACPI_PROBE_TABLE()
2016-02-22 13:46 ` Aleksey Makarov
@ 2016-02-22 13:46 ` Aleksey Makarov
-1 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-acpi
Cc: linux-serial, linux-kernel, linux-arm-kernel, Aleksey Makarov,
Russell King, Greg Kroah-Hartman, Rafael J . Wysocki,
Leif Lindholm, Graeme Gregory, Al Stone, Christopher Covington,
Len Brown, Daniel Lezcano, Thomas Gleixner, Jason Cooper,
Marc Zyngier, John Stultz
Refactor ACPI_PROBE_TABLE() so that it is possible to iterate
over subtables that do not have acpi_subtype header (for example
over subtables of DBG2 table)
To do so:
- Add void * data pointer argument for callback. It will allow to
parse the table and iterate over subtables calling the subtable
callbacks that are provided via this data pointer.
- Save only ACPI table id, callback and callback data in the linker
tables. This makes tables more terse and simplifies the semantics
of the fields of it's elements.
The additional data that required for subtable parsing are saved
in static namespace without increasing the size of linker tables.
- Introduce two macros with clear meaning of arguments, instead one.
The old ACPI_DECLARE_PROBE_ENTRY() macros has arguments that have
different meaning if the entry is for table or for subtable. The
arguments of the new macroses ACPI_DECLARE_PROBE_ENTRY() and
ACPI_DECLARE_PROBE_SUBTYPE_ENTRY() have unambiguous meaning.
- Document arguments of those macroses instead of the fields of linker
table data.
- Fix the issue that prevents using this macros for parsing subtables
other than MADT. In the original code, MADT-specific function
was used to iterate over subtables, while the name was common.
Introduce a new parameter to macors that specifies the size of
the table to do it in common way.
- Don't expose the internals of the tables to the drivers passing
a pointer to struct acpi_probe_entry to the subtable callback validator.
Instead, pass the sideband data specified by the driver.
- Fix the driver's callback signatures: a. Add an unused pointer to void
for table matchers (currently only clocksource callback) b. Change
the type of sideband data to kernel_ulong_t.
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
drivers/acpi/scan.c | 44 ++++++++++-----
drivers/clocksource/arm_arch_timer.c | 3 +-
drivers/irqchip/irq-gic.c | 4 +-
include/linux/acpi.h | 104 ++++++++++++++++++++++++-----------
include/linux/clocksource.h | 2 +-
include/linux/irqchip.h | 5 +-
6 files changed, 109 insertions(+), 53 deletions(-)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 407a376..a258594 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1968,16 +1968,38 @@ static struct acpi_probe_entry *ape;
static int acpi_probe_count;
static DEFINE_SPINLOCK(acpi_probe_lock);
-static int __init acpi_match_madt(struct acpi_subtable_header *header,
- const unsigned long end)
+static int __init acpi_match_and_setup(struct acpi_subtable_header *header,
+ const unsigned long end)
{
- if (!ape->subtable_valid || ape->subtable_valid(header, ape))
- if (!ape->probe_subtbl(header, end))
+ const struct acpi_probe_subtype_data *data = ape->data;
+
+ if (data->valid(header, data->data))
+ if (!data->setup(header, end))
acpi_probe_count++;
return 0;
}
+int __init acpi_probe_subtype_setup(struct acpi_table_header *table,
+ const void *data)
+{
+ const struct acpi_probe_subtype_data *data_subtype = data;
+
+ return acpi_parse_entries(ape->id, data_subtype->size,
+ acpi_match_and_setup, table,
+ data_subtype->subtype, 0);
+}
+
+static int __init acpi_probe_table_handler(struct acpi_table_header *table)
+{
+ int err = ape->setup(table, ape->data);
+
+ if (ape->setup != acpi_probe_subtype_setup && err >= 0)
+ acpi_probe_count++;
+
+ return err;
+}
+
int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr)
{
int count = 0;
@@ -1987,16 +2009,10 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr)
spin_lock(&acpi_probe_lock);
for (ape = ap_head; nr; ape++, nr--) {
- if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) {
- acpi_probe_count = 0;
- acpi_table_parse_madt(ape->type, acpi_match_madt, 0);
- count += acpi_probe_count;
- } else {
- int res;
- res = acpi_table_parse(ape->id, ape->probe_table);
- if (!res)
- count++;
- }
+ acpi_probe_count = 0;
+ if (acpi_table_parse(ape->id, acpi_probe_table_handler) < 0)
+ continue;
+ count += acpi_probe_count;
}
spin_unlock(&acpi_probe_lock);
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index c64d543..95c4922e 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -826,7 +826,8 @@ static int __init map_generic_timer_interrupt(u32 interrupt, u32 flags)
}
/* Initialize per-processor generic timer */
-static int __init arch_timer_acpi_init(struct acpi_table_header *table)
+static int __init arch_timer_acpi_init(struct acpi_table_header *table,
+ const void *data)
{
struct acpi_table_gtdt *gtdt;
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 8f9ebf7..37a5eed 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1287,12 +1287,12 @@ static bool __init acpi_gic_redist_is_present(void)
}
static bool __init gic_validate_dist(struct acpi_subtable_header *header,
- struct acpi_probe_entry *ape)
+ kernel_ulong_t driver_data)
{
struct acpi_madt_generic_distributor *dist;
dist = (struct acpi_madt_generic_distributor *)header;
- return (dist->version == ape->driver_data &&
+ return (dist->version == driver_data &&
(dist->version != ACPI_MADT_GIC_VERSION_NONE ||
!acpi_gic_redist_is_present()));
}
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 06ed7e5..9636c32 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -879,47 +879,76 @@ int acpi_dev_prop_read(struct acpi_device *adev, const char *propname,
struct fwnode_handle *acpi_get_next_subnode(struct device *dev,
struct fwnode_handle *subnode);
-struct acpi_probe_entry;
typedef bool (*acpi_probe_entry_validate_subtbl)(struct acpi_subtable_header *,
- struct acpi_probe_entry *);
+ kernel_ulong_t);
+
+typedef int (*acpi_probe_entry_setup)(struct acpi_table_header *, const void *);
#define ACPI_TABLE_ID_LEN 5
-/**
- * struct acpi_probe_entry - boot-time probing entry
- * @id: ACPI table name
- * @type: Optional subtable type to match
- * (if @id contains subtables)
- * @subtable_valid: Optional callback to check the validity of
- * the subtable
- * @probe_table: Callback to the driver being probed when table
- * match is successful
- * @probe_subtbl: Callback to the driver being probed when table and
- * subtable match (and optional callback is successful)
- * @driver_data: Sideband data provided back to the driver
- */
struct acpi_probe_entry {
__u8 id[ACPI_TABLE_ID_LEN];
- __u8 type;
- acpi_probe_entry_validate_subtbl subtable_valid;
- union {
- acpi_tbl_table_handler probe_table;
- acpi_tbl_entry_handler probe_subtbl;
- };
- kernel_ulong_t driver_data;
+ acpi_probe_entry_setup setup;
+ const void *data;
};
-#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, valid, data, fn) \
+/**
+ * ACPI_DECLARE_PROBE_ENTRY() - declare boot-time probing entry
+ * @table: Name of subsystem to match
+ * @name: Identifier to compose name of table data
+ * @table_id: ACPI table name
+ * @setup_fn: Callback to the driver being probed when table
+ * matches (of type acpi_probe_entry_setup)
+ * @data_ptr: Sideband data provided back to the driver
+ */
+#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, setup_fn, data_ptr) \
static const struct acpi_probe_entry __acpi_probe_##name \
__used __section(__##table##_acpi_probe_table) \
= { \
.id = table_id, \
- .type = subtable, \
- .subtable_valid = valid, \
- .probe_table = (acpi_tbl_table_handler)fn, \
- .driver_data = data, \
+ .setup = setup_fn, \
+ .data = data_ptr, \
}
+struct acpi_probe_subtype_data {
+ u8 subtype;
+ unsigned long size;
+ acpi_probe_entry_validate_subtbl valid;
+ acpi_tbl_entry_handler setup;
+ kernel_ulong_t data;
+};
+
+int acpi_probe_subtype_setup(struct acpi_table_header *table, const void *data);
+
+/**
+ * ACPI_DECLARE_PROBE_SUBTYPE_ENTRY() - declare boot-time probing entry that
+ * matches subtables
+ * @table: Name of subsystem to match
+ * @name: Identifier to compose name of table data
+ * @table_id: ACPI table name
+ * @table_size: Size of the table (without subtables) of type table_id
+ * @subtable: Subtable type to match
+ * @valid_fn: Callback to check the validity of the subtable
+ * (of type acpi_probe_entry_validate_subtbl)
+ * @data_int: Sideband data provided back to the driver
+ * (of type kernel_ulong_t)
+ * @setup_fn: Callback to the driver being probed when table and
+ * subtable match and valid_fn callback is successful
+ * (of type acpi_tbl_entry_handler)
+ */
+#define ACPI_DECLARE_PROBE_SUBTYPE_ENTRY(table, name, table_id, table_size, \
+ subtable, valid_fn, data_int, setup_fn) \
+ static const struct acpi_probe_subtype_data \
+ __acpi_probe_subtype_##name __used = { \
+ .subtype = subtable, \
+ .size = table_size, \
+ .valid = valid_fn, \
+ .setup = setup_fn, \
+ .data = data_int, \
+ }; \
+ ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, \
+ acpi_probe_subtype_setup, &__acpi_probe_subtype_##name)
+
#define ACPI_PROBE_TABLE(name) __##name##_acpi_probe_table
#define ACPI_PROBE_TABLE_END(name) __##name##_acpi_probe_table_end
@@ -992,14 +1021,23 @@ static inline struct fwnode_handle *acpi_get_next_subnode(struct device *dev,
return NULL;
}
-#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, validate, data, fn) \
+#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, match, data) \
static const void * __acpi_table_##name[] \
__attribute__((unused)) \
- = { (void *) table_id, \
- (void *) subtable, \
- (void *) valid, \
- (void *) fn, \
- (void *) data }
+ = { (void *)table_id, \
+ (void *)match, \
+ (void *)data }
+
+#define ACPI_DECLARE_PROBE_SUBTYPE_ENTRY(table, name, table_id, table_size, \
+ subtable, valid_fn, data_int, setup_fn) \
+ static const void *__acpi_table_##name[] \
+ __attribute__((unused)) \
+ = { (void *)table_id, \
+ (void *)table_size, \
+ (void *)subtable, \
+ (void *)valid_fn, \
+ (void *)data_int, \
+ (void *)setup_fn }
#define acpi_probe_device_table(t) ({ int __r = 0; __r;})
#endif
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 6013021..2bb5d51 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -259,6 +259,6 @@ static inline void clocksource_probe(void) {}
#endif
#define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn) \
- ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn)
+ ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, fn, NULL)
#endif /* _LINUX_CLOCKSOURCE_H */
diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h
index 89c34b2..cc4c455 100644
--- a/include/linux/irqchip.h
+++ b/include/linux/irqchip.h
@@ -39,8 +39,9 @@
* @fn: initialization function
*/
#define IRQCHIP_ACPI_DECLARE(name, subtable, validate, data, fn) \
- ACPI_DECLARE_PROBE_ENTRY(irqchip, name, ACPI_SIG_MADT, \
- subtable, validate, data, fn)
+ ACPI_DECLARE_PROBE_SUBTYPE_ENTRY(irqchip, name, ACPI_SIG_MADT, \
+ sizeof(struct acpi_table_madt),\
+ subtable, validate, data, fn)
#ifdef CONFIG_IRQCHIP
void irqchip_init(void);
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 4/8] ACPI: genaralize iterating over subtables in ACPI_PROBE_TABLE()
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-arm-kernel
Refactor ACPI_PROBE_TABLE() so that it is possible to iterate
over subtables that do not have acpi_subtype header (for example
over subtables of DBG2 table)
To do so:
- Add void * data pointer argument for callback. It will allow to
parse the table and iterate over subtables calling the subtable
callbacks that are provided via this data pointer.
- Save only ACPI table id, callback and callback data in the linker
tables. This makes tables more terse and simplifies the semantics
of the fields of it's elements.
The additional data that required for subtable parsing are saved
in static namespace without increasing the size of linker tables.
- Introduce two macros with clear meaning of arguments, instead one.
The old ACPI_DECLARE_PROBE_ENTRY() macros has arguments that have
different meaning if the entry is for table or for subtable. The
arguments of the new macroses ACPI_DECLARE_PROBE_ENTRY() and
ACPI_DECLARE_PROBE_SUBTYPE_ENTRY() have unambiguous meaning.
- Document arguments of those macroses instead of the fields of linker
table data.
- Fix the issue that prevents using this macros for parsing subtables
other than MADT. In the original code, MADT-specific function
was used to iterate over subtables, while the name was common.
Introduce a new parameter to macors that specifies the size of
the table to do it in common way.
- Don't expose the internals of the tables to the drivers passing
a pointer to struct acpi_probe_entry to the subtable callback validator.
Instead, pass the sideband data specified by the driver.
- Fix the driver's callback signatures: a. Add an unused pointer to void
for table matchers (currently only clocksource callback) b. Change
the type of sideband data to kernel_ulong_t.
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
drivers/acpi/scan.c | 44 ++++++++++-----
drivers/clocksource/arm_arch_timer.c | 3 +-
drivers/irqchip/irq-gic.c | 4 +-
include/linux/acpi.h | 104 ++++++++++++++++++++++++-----------
include/linux/clocksource.h | 2 +-
include/linux/irqchip.h | 5 +-
6 files changed, 109 insertions(+), 53 deletions(-)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 407a376..a258594 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1968,16 +1968,38 @@ static struct acpi_probe_entry *ape;
static int acpi_probe_count;
static DEFINE_SPINLOCK(acpi_probe_lock);
-static int __init acpi_match_madt(struct acpi_subtable_header *header,
- const unsigned long end)
+static int __init acpi_match_and_setup(struct acpi_subtable_header *header,
+ const unsigned long end)
{
- if (!ape->subtable_valid || ape->subtable_valid(header, ape))
- if (!ape->probe_subtbl(header, end))
+ const struct acpi_probe_subtype_data *data = ape->data;
+
+ if (data->valid(header, data->data))
+ if (!data->setup(header, end))
acpi_probe_count++;
return 0;
}
+int __init acpi_probe_subtype_setup(struct acpi_table_header *table,
+ const void *data)
+{
+ const struct acpi_probe_subtype_data *data_subtype = data;
+
+ return acpi_parse_entries(ape->id, data_subtype->size,
+ acpi_match_and_setup, table,
+ data_subtype->subtype, 0);
+}
+
+static int __init acpi_probe_table_handler(struct acpi_table_header *table)
+{
+ int err = ape->setup(table, ape->data);
+
+ if (ape->setup != acpi_probe_subtype_setup && err >= 0)
+ acpi_probe_count++;
+
+ return err;
+}
+
int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr)
{
int count = 0;
@@ -1987,16 +2009,10 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr)
spin_lock(&acpi_probe_lock);
for (ape = ap_head; nr; ape++, nr--) {
- if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) {
- acpi_probe_count = 0;
- acpi_table_parse_madt(ape->type, acpi_match_madt, 0);
- count += acpi_probe_count;
- } else {
- int res;
- res = acpi_table_parse(ape->id, ape->probe_table);
- if (!res)
- count++;
- }
+ acpi_probe_count = 0;
+ if (acpi_table_parse(ape->id, acpi_probe_table_handler) < 0)
+ continue;
+ count += acpi_probe_count;
}
spin_unlock(&acpi_probe_lock);
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index c64d543..95c4922e 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -826,7 +826,8 @@ static int __init map_generic_timer_interrupt(u32 interrupt, u32 flags)
}
/* Initialize per-processor generic timer */
-static int __init arch_timer_acpi_init(struct acpi_table_header *table)
+static int __init arch_timer_acpi_init(struct acpi_table_header *table,
+ const void *data)
{
struct acpi_table_gtdt *gtdt;
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 8f9ebf7..37a5eed 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1287,12 +1287,12 @@ static bool __init acpi_gic_redist_is_present(void)
}
static bool __init gic_validate_dist(struct acpi_subtable_header *header,
- struct acpi_probe_entry *ape)
+ kernel_ulong_t driver_data)
{
struct acpi_madt_generic_distributor *dist;
dist = (struct acpi_madt_generic_distributor *)header;
- return (dist->version == ape->driver_data &&
+ return (dist->version == driver_data &&
(dist->version != ACPI_MADT_GIC_VERSION_NONE ||
!acpi_gic_redist_is_present()));
}
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 06ed7e5..9636c32 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -879,47 +879,76 @@ int acpi_dev_prop_read(struct acpi_device *adev, const char *propname,
struct fwnode_handle *acpi_get_next_subnode(struct device *dev,
struct fwnode_handle *subnode);
-struct acpi_probe_entry;
typedef bool (*acpi_probe_entry_validate_subtbl)(struct acpi_subtable_header *,
- struct acpi_probe_entry *);
+ kernel_ulong_t);
+
+typedef int (*acpi_probe_entry_setup)(struct acpi_table_header *, const void *);
#define ACPI_TABLE_ID_LEN 5
-/**
- * struct acpi_probe_entry - boot-time probing entry
- * @id: ACPI table name
- * @type: Optional subtable type to match
- * (if @id contains subtables)
- * @subtable_valid: Optional callback to check the validity of
- * the subtable
- * @probe_table: Callback to the driver being probed when table
- * match is successful
- * @probe_subtbl: Callback to the driver being probed when table and
- * subtable match (and optional callback is successful)
- * @driver_data: Sideband data provided back to the driver
- */
struct acpi_probe_entry {
__u8 id[ACPI_TABLE_ID_LEN];
- __u8 type;
- acpi_probe_entry_validate_subtbl subtable_valid;
- union {
- acpi_tbl_table_handler probe_table;
- acpi_tbl_entry_handler probe_subtbl;
- };
- kernel_ulong_t driver_data;
+ acpi_probe_entry_setup setup;
+ const void *data;
};
-#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, valid, data, fn) \
+/**
+ * ACPI_DECLARE_PROBE_ENTRY() - declare boot-time probing entry
+ * @table: Name of subsystem to match
+ * @name: Identifier to compose name of table data
+ * @table_id: ACPI table name
+ * @setup_fn: Callback to the driver being probed when table
+ * matches (of type acpi_probe_entry_setup)
+ * @data_ptr: Sideband data provided back to the driver
+ */
+#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, setup_fn, data_ptr) \
static const struct acpi_probe_entry __acpi_probe_##name \
__used __section(__##table##_acpi_probe_table) \
= { \
.id = table_id, \
- .type = subtable, \
- .subtable_valid = valid, \
- .probe_table = (acpi_tbl_table_handler)fn, \
- .driver_data = data, \
+ .setup = setup_fn, \
+ .data = data_ptr, \
}
+struct acpi_probe_subtype_data {
+ u8 subtype;
+ unsigned long size;
+ acpi_probe_entry_validate_subtbl valid;
+ acpi_tbl_entry_handler setup;
+ kernel_ulong_t data;
+};
+
+int acpi_probe_subtype_setup(struct acpi_table_header *table, const void *data);
+
+/**
+ * ACPI_DECLARE_PROBE_SUBTYPE_ENTRY() - declare boot-time probing entry that
+ * matches subtables
+ * @table: Name of subsystem to match
+ * @name: Identifier to compose name of table data
+ * @table_id: ACPI table name
+ * @table_size: Size of the table (without subtables) of type table_id
+ * @subtable: Subtable type to match
+ * @valid_fn: Callback to check the validity of the subtable
+ * (of type acpi_probe_entry_validate_subtbl)
+ * @data_int: Sideband data provided back to the driver
+ * (of type kernel_ulong_t)
+ * @setup_fn: Callback to the driver being probed when table and
+ * subtable match and valid_fn callback is successful
+ * (of type acpi_tbl_entry_handler)
+ */
+#define ACPI_DECLARE_PROBE_SUBTYPE_ENTRY(table, name, table_id, table_size, \
+ subtable, valid_fn, data_int, setup_fn) \
+ static const struct acpi_probe_subtype_data \
+ __acpi_probe_subtype_##name __used = { \
+ .subtype = subtable, \
+ .size = table_size, \
+ .valid = valid_fn, \
+ .setup = setup_fn, \
+ .data = data_int, \
+ }; \
+ ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, \
+ acpi_probe_subtype_setup, &__acpi_probe_subtype_##name)
+
#define ACPI_PROBE_TABLE(name) __##name##_acpi_probe_table
#define ACPI_PROBE_TABLE_END(name) __##name##_acpi_probe_table_end
@@ -992,14 +1021,23 @@ static inline struct fwnode_handle *acpi_get_next_subnode(struct device *dev,
return NULL;
}
-#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, validate, data, fn) \
+#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, match, data) \
static const void * __acpi_table_##name[] \
__attribute__((unused)) \
- = { (void *) table_id, \
- (void *) subtable, \
- (void *) valid, \
- (void *) fn, \
- (void *) data }
+ = { (void *)table_id, \
+ (void *)match, \
+ (void *)data }
+
+#define ACPI_DECLARE_PROBE_SUBTYPE_ENTRY(table, name, table_id, table_size, \
+ subtable, valid_fn, data_int, setup_fn) \
+ static const void *__acpi_table_##name[] \
+ __attribute__((unused)) \
+ = { (void *)table_id, \
+ (void *)table_size, \
+ (void *)subtable, \
+ (void *)valid_fn, \
+ (void *)data_int, \
+ (void *)setup_fn }
#define acpi_probe_device_table(t) ({ int __r = 0; __r;})
#endif
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 6013021..2bb5d51 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -259,6 +259,6 @@ static inline void clocksource_probe(void) {}
#endif
#define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn) \
- ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn)
+ ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, fn, NULL)
#endif /* _LINUX_CLOCKSOURCE_H */
diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h
index 89c34b2..cc4c455 100644
--- a/include/linux/irqchip.h
+++ b/include/linux/irqchip.h
@@ -39,8 +39,9 @@
* @fn: initialization function
*/
#define IRQCHIP_ACPI_DECLARE(name, subtable, validate, data, fn) \
- ACPI_DECLARE_PROBE_ENTRY(irqchip, name, ACPI_SIG_MADT, \
- subtable, validate, data, fn)
+ ACPI_DECLARE_PROBE_SUBTYPE_ENTRY(irqchip, name, ACPI_SIG_MADT, \
+ sizeof(struct acpi_table_madt),\
+ subtable, validate, data, fn)
#ifdef CONFIG_IRQCHIP
void irqchip_init(void);
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 5/8] ACPI: parse DBG2 table
2016-02-22 13:46 ` Aleksey Makarov
@ 2016-02-22 13:46 ` Aleksey Makarov
-1 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-acpi
Cc: linux-serial, linux-kernel, linux-arm-kernel, Aleksey Makarov,
Russell King, Greg Kroah-Hartman, Rafael J . Wysocki,
Leif Lindholm, Graeme Gregory, Al Stone, Christopher Covington,
Len Brown, Arnd Bergmann, linux-arch
'ARM Server Base Boot Requiremets' [1] mentions DBG2 (Microsoft Debug
Port Table 2) [2] as a mandatory ACPI table that specifies debug ports.
- Implement macros
ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr)
that defines a handler for the port of given type and subtype.
- For each declared port that is also described in the ACPI DBG2 table
call the provided callback.
[1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0044a/index.html
[2] http://go.microsoft.com/fwlink/p/?LinkId=234837
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
drivers/acpi/Kconfig | 3 ++
drivers/acpi/Makefile | 1 +
drivers/acpi/dbg2.c | 85 +++++++++++++++++++++++++++++++++++++++
include/asm-generic/vmlinux.lds.h | 1 +
include/linux/acpi_dbg2.h | 48 ++++++++++++++++++++++
5 files changed, 138 insertions(+)
create mode 100644 drivers/acpi/dbg2.c
create mode 100644 include/linux/acpi_dbg2.h
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 65fb483..660666e 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -57,6 +57,9 @@ config ACPI_SYSTEM_POWER_STATES_SUPPORT
config ACPI_CCA_REQUIRED
bool
+config ACPI_DBG2_TABLE
+ bool
+
config ACPI_DEBUGGER
bool "AML debugger interface"
select ACPI_DEBUG
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 346101c..ff5e4f0 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -82,6 +82,7 @@ obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o
obj-$(CONFIG_ACPI_BGRT) += bgrt.o
obj-$(CONFIG_ACPI_CPPC_LIB) += cppc_acpi.o
obj-$(CONFIG_ACPI_DEBUGGER_USER) += acpi_dbg.o
+obj-$(CONFIG_ACPI_DBG2_TABLE) += dbg2.o
# processor has its own "processor." module_param namespace
processor-y := processor_driver.o
diff --git a/drivers/acpi/dbg2.c b/drivers/acpi/dbg2.c
new file mode 100644
index 0000000..8a79117
--- /dev/null
+++ b/drivers/acpi/dbg2.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2012, Intel Corporation
+ * Copyright (c) 2015, 2016 Linaro Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#define pr_fmt(fmt) "ACPI: DBG2: " fmt
+
+#include <linux/acpi_dbg2.h>
+#include <linux/acpi.h>
+#include <linux/kernel.h>
+
+static const char * __init type2string(u16 type)
+{
+ switch (type) {
+ case ACPI_DBG2_SERIAL_PORT:
+ return "SERIAL";
+ case ACPI_DBG2_1394_PORT:
+ return "1394";
+ case ACPI_DBG2_USB_PORT:
+ return "USB";
+ case ACPI_DBG2_NET_PORT:
+ return "NET";
+ default:
+ return "?";
+ }
+}
+
+static const char * __init subtype2string(u16 subtype)
+{
+ switch (subtype) {
+ case ACPI_DBG2_16550_COMPATIBLE:
+ return "16550_COMPATIBLE";
+ case ACPI_DBG2_16550_SUBSET:
+ return "16550_SUBSET";
+ case ACPI_DBG2_ARM_PL011:
+ return "ARM_PL011";
+ case ACPI_DBG2_ARM_SBSA_32BIT:
+ return "ARM_SBSA_32BIT";
+ case ACPI_DBG2_ARM_SBSA_GENERIC:
+ return "ARM_SBSA_GENERIC";
+ case ACPI_DBG2_ARM_DCC:
+ return "ARM_DCC";
+ case ACPI_DBG2_BCM2835:
+ return "BCM2835";
+ default:
+ return "?";
+ }
+}
+
+int __init acpi_dbg2_setup(struct acpi_table_header *table, const void *data)
+{
+ struct acpi_table_dbg2 *dbg2 = (struct acpi_table_dbg2 *)table;
+ struct acpi_dbg2_data *dbg2_data = (struct acpi_dbg2_data *)data;
+ struct acpi_dbg2_device *dbg2_device, *dbg2_end;
+ int i;
+
+ dbg2_device = ACPI_ADD_PTR(struct acpi_dbg2_device, dbg2,
+ dbg2->info_offset);
+ dbg2_end = ACPI_ADD_PTR(struct acpi_dbg2_device, dbg2, table->length);
+
+ for (i = 0; i < dbg2->info_count; i++) {
+ if (dbg2_device + 1 > dbg2_end) {
+ pr_err("device pointer overflows, bad table\n");
+ return 0;
+ }
+
+ if (dbg2_device->port_type == dbg2_data->port_type &&
+ dbg2_device->port_subtype == dbg2_data->port_subtype) {
+ pr_info("debug port type: %s subtype: %s\n",
+ type2string(dbg2_device->port_type),
+ subtype2string(dbg2_device->port_subtype));
+ dbg2_data->setup(dbg2_device, dbg2_data->data);
+ }
+
+ dbg2_device = ACPI_ADD_PTR(struct acpi_dbg2_device, dbg2_device,
+ dbg2_device->length);
+ }
+
+ return 0;
+}
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index c4bd0e2..ad9752c 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -526,6 +526,7 @@
IRQCHIP_OF_MATCH_TABLE() \
ACPI_PROBE_TABLE(irqchip) \
ACPI_PROBE_TABLE(clksrc) \
+ ACPI_PROBE_TABLE(dbg2) \
EARLYCON_TABLE() \
EARLYCON_OF_TABLES()
diff --git a/include/linux/acpi_dbg2.h b/include/linux/acpi_dbg2.h
new file mode 100644
index 0000000..465afcb
--- /dev/null
+++ b/include/linux/acpi_dbg2.h
@@ -0,0 +1,48 @@
+#ifndef _ACPI_DBG2_H_
+#define _ACPI_DBG2_H_
+
+#ifdef CONFIG_ACPI_DBG2_TABLE
+
+#include <linux/kernel.h>
+
+struct acpi_dbg2_device;
+struct acpi_table_header;
+
+struct acpi_dbg2_data {
+ u16 port_type;
+ u16 port_subtype;
+ int (*setup)(struct acpi_dbg2_device *, void *);
+ void *data;
+};
+
+int acpi_dbg2_setup(struct acpi_table_header *header, const void *data);
+
+/*
+ * ACPI_DBG2_DECLARE() - Define handler for ACPI DBG2 port
+ * @name: Identifier to compose name of table data
+ * @type: Type of the port
+ * @subtype: Subtype of the port
+ * @setup_fn: Function to be called to setup the port
+ * (of type int (*)(struct acpi_dbg2_device *, void *);)
+ * @data_ptr: Sideband data provided back to the driver
+ */
+#define ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr) \
+ static const struct acpi_dbg2_data \
+ __acpi_dbg2_data_##name __used = { \
+ .port_type = type, \
+ .port_subtype = subtype, \
+ .setup = setup_fn, \
+ .data = data_ptr, \
+ }; \
+ ACPI_DECLARE_PROBE_ENTRY(dbg2, name, ACPI_SIG_DBG2, \
+ acpi_dbg2_setup, &__acpi_dbg2_data_##name)
+
+#else
+
+#define ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr) \
+ static const void *__acpi_dbg_data_##name[] \
+ __used __initdata = { (void *)setup_fn, (void *)data_ptr }
+
+#endif
+
+#endif
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 5/8] ACPI: parse DBG2 table
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-arm-kernel
'ARM Server Base Boot Requiremets' [1] mentions DBG2 (Microsoft Debug
Port Table 2) [2] as a mandatory ACPI table that specifies debug ports.
- Implement macros
ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr)
that defines a handler for the port of given type and subtype.
- For each declared port that is also described in the ACPI DBG2 table
call the provided callback.
[1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0044a/index.html
[2] http://go.microsoft.com/fwlink/p/?LinkId=234837
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
drivers/acpi/Kconfig | 3 ++
drivers/acpi/Makefile | 1 +
drivers/acpi/dbg2.c | 85 +++++++++++++++++++++++++++++++++++++++
include/asm-generic/vmlinux.lds.h | 1 +
include/linux/acpi_dbg2.h | 48 ++++++++++++++++++++++
5 files changed, 138 insertions(+)
create mode 100644 drivers/acpi/dbg2.c
create mode 100644 include/linux/acpi_dbg2.h
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 65fb483..660666e 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -57,6 +57,9 @@ config ACPI_SYSTEM_POWER_STATES_SUPPORT
config ACPI_CCA_REQUIRED
bool
+config ACPI_DBG2_TABLE
+ bool
+
config ACPI_DEBUGGER
bool "AML debugger interface"
select ACPI_DEBUG
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 346101c..ff5e4f0 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -82,6 +82,7 @@ obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o
obj-$(CONFIG_ACPI_BGRT) += bgrt.o
obj-$(CONFIG_ACPI_CPPC_LIB) += cppc_acpi.o
obj-$(CONFIG_ACPI_DEBUGGER_USER) += acpi_dbg.o
+obj-$(CONFIG_ACPI_DBG2_TABLE) += dbg2.o
# processor has its own "processor." module_param namespace
processor-y := processor_driver.o
diff --git a/drivers/acpi/dbg2.c b/drivers/acpi/dbg2.c
new file mode 100644
index 0000000..8a79117
--- /dev/null
+++ b/drivers/acpi/dbg2.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2012, Intel Corporation
+ * Copyright (c) 2015, 2016 Linaro Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#define pr_fmt(fmt) "ACPI: DBG2: " fmt
+
+#include <linux/acpi_dbg2.h>
+#include <linux/acpi.h>
+#include <linux/kernel.h>
+
+static const char * __init type2string(u16 type)
+{
+ switch (type) {
+ case ACPI_DBG2_SERIAL_PORT:
+ return "SERIAL";
+ case ACPI_DBG2_1394_PORT:
+ return "1394";
+ case ACPI_DBG2_USB_PORT:
+ return "USB";
+ case ACPI_DBG2_NET_PORT:
+ return "NET";
+ default:
+ return "?";
+ }
+}
+
+static const char * __init subtype2string(u16 subtype)
+{
+ switch (subtype) {
+ case ACPI_DBG2_16550_COMPATIBLE:
+ return "16550_COMPATIBLE";
+ case ACPI_DBG2_16550_SUBSET:
+ return "16550_SUBSET";
+ case ACPI_DBG2_ARM_PL011:
+ return "ARM_PL011";
+ case ACPI_DBG2_ARM_SBSA_32BIT:
+ return "ARM_SBSA_32BIT";
+ case ACPI_DBG2_ARM_SBSA_GENERIC:
+ return "ARM_SBSA_GENERIC";
+ case ACPI_DBG2_ARM_DCC:
+ return "ARM_DCC";
+ case ACPI_DBG2_BCM2835:
+ return "BCM2835";
+ default:
+ return "?";
+ }
+}
+
+int __init acpi_dbg2_setup(struct acpi_table_header *table, const void *data)
+{
+ struct acpi_table_dbg2 *dbg2 = (struct acpi_table_dbg2 *)table;
+ struct acpi_dbg2_data *dbg2_data = (struct acpi_dbg2_data *)data;
+ struct acpi_dbg2_device *dbg2_device, *dbg2_end;
+ int i;
+
+ dbg2_device = ACPI_ADD_PTR(struct acpi_dbg2_device, dbg2,
+ dbg2->info_offset);
+ dbg2_end = ACPI_ADD_PTR(struct acpi_dbg2_device, dbg2, table->length);
+
+ for (i = 0; i < dbg2->info_count; i++) {
+ if (dbg2_device + 1 > dbg2_end) {
+ pr_err("device pointer overflows, bad table\n");
+ return 0;
+ }
+
+ if (dbg2_device->port_type == dbg2_data->port_type &&
+ dbg2_device->port_subtype == dbg2_data->port_subtype) {
+ pr_info("debug port type: %s subtype: %s\n",
+ type2string(dbg2_device->port_type),
+ subtype2string(dbg2_device->port_subtype));
+ dbg2_data->setup(dbg2_device, dbg2_data->data);
+ }
+
+ dbg2_device = ACPI_ADD_PTR(struct acpi_dbg2_device, dbg2_device,
+ dbg2_device->length);
+ }
+
+ return 0;
+}
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index c4bd0e2..ad9752c 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -526,6 +526,7 @@
IRQCHIP_OF_MATCH_TABLE() \
ACPI_PROBE_TABLE(irqchip) \
ACPI_PROBE_TABLE(clksrc) \
+ ACPI_PROBE_TABLE(dbg2) \
EARLYCON_TABLE() \
EARLYCON_OF_TABLES()
diff --git a/include/linux/acpi_dbg2.h b/include/linux/acpi_dbg2.h
new file mode 100644
index 0000000..465afcb
--- /dev/null
+++ b/include/linux/acpi_dbg2.h
@@ -0,0 +1,48 @@
+#ifndef _ACPI_DBG2_H_
+#define _ACPI_DBG2_H_
+
+#ifdef CONFIG_ACPI_DBG2_TABLE
+
+#include <linux/kernel.h>
+
+struct acpi_dbg2_device;
+struct acpi_table_header;
+
+struct acpi_dbg2_data {
+ u16 port_type;
+ u16 port_subtype;
+ int (*setup)(struct acpi_dbg2_device *, void *);
+ void *data;
+};
+
+int acpi_dbg2_setup(struct acpi_table_header *header, const void *data);
+
+/*
+ * ACPI_DBG2_DECLARE() - Define handler for ACPI DBG2 port
+ * @name: Identifier to compose name of table data
+ * @type: Type of the port
+ * @subtype: Subtype of the port
+ * @setup_fn: Function to be called to setup the port
+ * (of type int (*)(struct acpi_dbg2_device *, void *);)
+ * @data_ptr: Sideband data provided back to the driver
+ */
+#define ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr) \
+ static const struct acpi_dbg2_data \
+ __acpi_dbg2_data_##name __used = { \
+ .port_type = type, \
+ .port_subtype = subtype, \
+ .setup = setup_fn, \
+ .data = data_ptr, \
+ }; \
+ ACPI_DECLARE_PROBE_ENTRY(dbg2, name, ACPI_SIG_DBG2, \
+ acpi_dbg2_setup, &__acpi_dbg2_data_##name)
+
+#else
+
+#define ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr) \
+ static const void *__acpi_dbg_data_##name[] \
+ __used __initdata = { (void *)setup_fn, (void *)data_ptr }
+
+#endif
+
+#endif
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 6/8] ACPI: serial: implement earlycon on ACPI DBG2 port
2016-02-22 13:46 ` Aleksey Makarov
@ 2016-02-22 13:46 ` Aleksey Makarov
-1 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-acpi
Cc: linux-serial, linux-kernel, linux-arm-kernel, Aleksey Makarov,
Russell King, Greg Kroah-Hartman, Rafael J . Wysocki,
Leif Lindholm, Graeme Gregory, Al Stone, Christopher Covington,
Jonathan Corbet, Jiri Slaby, linux-doc
Add ACPI_DBG2_EARLYCON_DECLARE() macros that declares
an earlycon on the serial port specified in the DBG2 ACPI table.
Pass the string "earlycon=acpi_dbg2" to the kernel to activate it.
Callbacks for EARLYCON_DECLARE() and OF_EARLYCON_DECLARE()
can also be used for this macros.
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
Documentation/kernel-parameters.txt | 3 ++
drivers/tty/serial/earlycon.c | 56 +++++++++++++++++++++++++++++++++++++
include/linux/acpi_dbg2.h | 20 +++++++++++++
3 files changed, 79 insertions(+)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9a53c92..4949ebb 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1058,6 +1058,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
A valid base address must be provided, and the serial
port must already be setup and configured.
+ acpi_dbg2
+ Use serial port specified by the DBG2 ACPI table.
+
earlyprintk= [X86,SH,BLACKFIN,ARM,M68k]
earlyprintk=vga
earlyprintk=efi
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 05f9e4b..3d11248 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -21,6 +21,7 @@
#include <linux/serial_core.h>
#include <linux/sizes.h>
#include <linux/mod_devicetable.h>
+#include <linux/acpi.h>
#ifdef CONFIG_FIX_EARLYCON_MEM
#include <asm/fixmap.h>
@@ -186,6 +187,8 @@ int __init setup_earlycon(char *buf)
return -ENOENT;
}
+static bool setup_dbg2_earlycon;
+
/* early_param wrapper for setup_earlycon() */
static int __init param_setup_earlycon(char *buf)
{
@@ -198,6 +201,11 @@ static int __init param_setup_earlycon(char *buf)
if (!buf || !buf[0])
return early_init_dt_scan_chosen_serial();
+ if (!strcmp(buf, "acpi_dbg2")) {
+ setup_dbg2_earlycon = true;
+ return 0;
+ }
+
err = setup_earlycon(buf);
if (err == -ENOENT || err == -EALREADY)
return 0;
@@ -228,3 +236,51 @@ int __init of_setup_earlycon(unsigned long addr,
register_console(early_console_dev.con);
return 0;
}
+
+int __init acpi_setup_earlycon(struct acpi_dbg2_device *device, void *d)
+{
+ int err;
+ struct uart_port *port = &early_console_dev.port;
+ int (*setup)(struct earlycon_device *, const char *) = d;
+ struct acpi_generic_address *reg;
+
+ if (!setup_dbg2_earlycon)
+ return -ENODEV;
+
+ if (device->register_count < 1)
+ return -ENODEV;
+
+ if (device->base_address_offset >= device->length)
+ return -EINVAL;
+
+ reg = (void *)device + device->base_address_offset;
+
+ if (reg->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY &&
+ reg->space_id != ACPI_ADR_SPACE_SYSTEM_IO)
+ return -EINVAL;
+
+ spin_lock_init(&port->lock);
+ port->uartclk = BASE_BAUD * 16;
+
+ if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+ if (device->port_type == ACPI_DBG2_ARM_SBSA_32BIT)
+ port->iotype = UPIO_MEM32;
+ else
+ port->iotype = UPIO_MEM;
+ port->mapbase = reg->address;
+ port->membase = earlycon_map(reg->address, SZ_4K);
+ } else {
+ port->iotype = UPIO_PORT;
+ port->iobase = reg->address;
+ }
+
+ early_console_dev.con->data = &early_console_dev;
+ err = setup(&early_console_dev, NULL);
+ if (err < 0)
+ return err;
+ if (!early_console_dev.con->write)
+ return -ENODEV;
+
+ register_console(early_console_dev.con);
+ return 0;
+}
diff --git a/include/linux/acpi_dbg2.h b/include/linux/acpi_dbg2.h
index 465afcb..9b96de2 100644
--- a/include/linux/acpi_dbg2.h
+++ b/include/linux/acpi_dbg2.h
@@ -37,12 +37,32 @@ int acpi_dbg2_setup(struct acpi_table_header *header, const void *data);
ACPI_DECLARE_PROBE_ENTRY(dbg2, name, ACPI_SIG_DBG2, \
acpi_dbg2_setup, &__acpi_dbg2_data_##name)
+int __init acpi_setup_earlycon(struct acpi_dbg2_device *device, void *d);
+
+/*
+ * ACPI_DBG2_EARLYCON_DECLARE() - Define handler for ACPI GDB2 serial port
+ * @name: Identifier to compose name of table data
+ * @subtype: Subtype of the port
+ * @console_setup: Function to be called to setup the port
+ *
+ * Type of the console_setup() callback is
+ * int (*setup)(struct earlycon_device *, const char *)
+ * It's the type of callback of of_setup_earlycon().
+ */
+#define ACPI_DBG2_EARLYCON_DECLARE(name, subtype, console_setup) \
+ ACPI_DBG2_DECLARE(name, ACPI_DBG2_SERIAL_PORT, subtype, \
+ acpi_setup_earlycon, console_setup)
+
#else
#define ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr) \
static const void *__acpi_dbg_data_##name[] \
__used __initdata = { (void *)setup_fn, (void *)data_ptr }
+#define ACPI_DBG2_EARLYCON_DECLARE(name, subtype, console_setup) \
+ static const void *__acpi_dbg_data_serial_##name[] \
+ __used __initdata = { (void *)console_setup }
+
#endif
#endif
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 6/8] ACPI: serial: implement earlycon on ACPI DBG2 port
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-arm-kernel
Add ACPI_DBG2_EARLYCON_DECLARE() macros that declares
an earlycon on the serial port specified in the DBG2 ACPI table.
Pass the string "earlycon=acpi_dbg2" to the kernel to activate it.
Callbacks for EARLYCON_DECLARE() and OF_EARLYCON_DECLARE()
can also be used for this macros.
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
Documentation/kernel-parameters.txt | 3 ++
drivers/tty/serial/earlycon.c | 56 +++++++++++++++++++++++++++++++++++++
include/linux/acpi_dbg2.h | 20 +++++++++++++
3 files changed, 79 insertions(+)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9a53c92..4949ebb 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1058,6 +1058,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
A valid base address must be provided, and the serial
port must already be setup and configured.
+ acpi_dbg2
+ Use serial port specified by the DBG2 ACPI table.
+
earlyprintk= [X86,SH,BLACKFIN,ARM,M68k]
earlyprintk=vga
earlyprintk=efi
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 05f9e4b..3d11248 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -21,6 +21,7 @@
#include <linux/serial_core.h>
#include <linux/sizes.h>
#include <linux/mod_devicetable.h>
+#include <linux/acpi.h>
#ifdef CONFIG_FIX_EARLYCON_MEM
#include <asm/fixmap.h>
@@ -186,6 +187,8 @@ int __init setup_earlycon(char *buf)
return -ENOENT;
}
+static bool setup_dbg2_earlycon;
+
/* early_param wrapper for setup_earlycon() */
static int __init param_setup_earlycon(char *buf)
{
@@ -198,6 +201,11 @@ static int __init param_setup_earlycon(char *buf)
if (!buf || !buf[0])
return early_init_dt_scan_chosen_serial();
+ if (!strcmp(buf, "acpi_dbg2")) {
+ setup_dbg2_earlycon = true;
+ return 0;
+ }
+
err = setup_earlycon(buf);
if (err == -ENOENT || err == -EALREADY)
return 0;
@@ -228,3 +236,51 @@ int __init of_setup_earlycon(unsigned long addr,
register_console(early_console_dev.con);
return 0;
}
+
+int __init acpi_setup_earlycon(struct acpi_dbg2_device *device, void *d)
+{
+ int err;
+ struct uart_port *port = &early_console_dev.port;
+ int (*setup)(struct earlycon_device *, const char *) = d;
+ struct acpi_generic_address *reg;
+
+ if (!setup_dbg2_earlycon)
+ return -ENODEV;
+
+ if (device->register_count < 1)
+ return -ENODEV;
+
+ if (device->base_address_offset >= device->length)
+ return -EINVAL;
+
+ reg = (void *)device + device->base_address_offset;
+
+ if (reg->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY &&
+ reg->space_id != ACPI_ADR_SPACE_SYSTEM_IO)
+ return -EINVAL;
+
+ spin_lock_init(&port->lock);
+ port->uartclk = BASE_BAUD * 16;
+
+ if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+ if (device->port_type == ACPI_DBG2_ARM_SBSA_32BIT)
+ port->iotype = UPIO_MEM32;
+ else
+ port->iotype = UPIO_MEM;
+ port->mapbase = reg->address;
+ port->membase = earlycon_map(reg->address, SZ_4K);
+ } else {
+ port->iotype = UPIO_PORT;
+ port->iobase = reg->address;
+ }
+
+ early_console_dev.con->data = &early_console_dev;
+ err = setup(&early_console_dev, NULL);
+ if (err < 0)
+ return err;
+ if (!early_console_dev.con->write)
+ return -ENODEV;
+
+ register_console(early_console_dev.con);
+ return 0;
+}
diff --git a/include/linux/acpi_dbg2.h b/include/linux/acpi_dbg2.h
index 465afcb..9b96de2 100644
--- a/include/linux/acpi_dbg2.h
+++ b/include/linux/acpi_dbg2.h
@@ -37,12 +37,32 @@ int acpi_dbg2_setup(struct acpi_table_header *header, const void *data);
ACPI_DECLARE_PROBE_ENTRY(dbg2, name, ACPI_SIG_DBG2, \
acpi_dbg2_setup, &__acpi_dbg2_data_##name)
+int __init acpi_setup_earlycon(struct acpi_dbg2_device *device, void *d);
+
+/*
+ * ACPI_DBG2_EARLYCON_DECLARE() - Define handler for ACPI GDB2 serial port
+ * @name: Identifier to compose name of table data
+ * @subtype: Subtype of the port
+ * @console_setup: Function to be called to setup the port
+ *
+ * Type of the console_setup() callback is
+ * int (*setup)(struct earlycon_device *, const char *)
+ * It's the type of callback of of_setup_earlycon().
+ */
+#define ACPI_DBG2_EARLYCON_DECLARE(name, subtype, console_setup) \
+ ACPI_DBG2_DECLARE(name, ACPI_DBG2_SERIAL_PORT, subtype, \
+ acpi_setup_earlycon, console_setup)
+
#else
#define ACPI_DBG2_DECLARE(name, type, subtype, setup_fn, data_ptr) \
static const void *__acpi_dbg_data_##name[] \
__used __initdata = { (void *)setup_fn, (void *)data_ptr }
+#define ACPI_DBG2_EARLYCON_DECLARE(name, subtype, console_setup) \
+ static const void *__acpi_dbg_data_serial_##name[] \
+ __used __initdata = { (void *)console_setup }
+
#endif
#endif
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 7/8] ACPI: enable ACPI_DBG2_TABLE on ARM64
2016-02-22 13:46 ` Aleksey Makarov
@ 2016-02-22 13:46 ` Aleksey Makarov
-1 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-acpi
Cc: linux-serial, linux-kernel, linux-arm-kernel, Aleksey Makarov,
Russell King, Greg Kroah-Hartman, Rafael J . Wysocki,
Leif Lindholm, Graeme Gregory, Al Stone, Christopher Covington,
Catalin Marinas, Will Deacon
SBBR mentions DBG2 as a mandatory ACPI table.
So enable it for ARM64
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
arch/arm64/Kconfig | 1 +
arch/arm64/kernel/acpi.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 6bb21d8..27cb5d7 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -3,6 +3,7 @@ config ARM64
select ACPI_CCA_REQUIRED if ACPI
select ACPI_GENERIC_GSI if ACPI
select ACPI_REDUCED_HARDWARE_ONLY if ACPI
+ select ACPI_DBG2_TABLE if ACPI
select ARCH_HAS_DEVMEM_IS_ALLOWED
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
select ARCH_HAS_ELF_RANDOMIZE
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 7a944f7..890d36f 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -213,6 +213,8 @@ void __init acpi_boot_table_init(void)
if (!param_acpi_force)
disable_acpi();
}
+
+ acpi_probe_device_table(dbg2);
}
#ifdef CONFIG_ACPI_APEI
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 7/8] ACPI: enable ACPI_DBG2_TABLE on ARM64
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-arm-kernel
SBBR mentions DBG2 as a mandatory ACPI table.
So enable it for ARM64
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
arch/arm64/Kconfig | 1 +
arch/arm64/kernel/acpi.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 6bb21d8..27cb5d7 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -3,6 +3,7 @@ config ARM64
select ACPI_CCA_REQUIRED if ACPI
select ACPI_GENERIC_GSI if ACPI
select ACPI_REDUCED_HARDWARE_ONLY if ACPI
+ select ACPI_DBG2_TABLE if ACPI
select ARCH_HAS_DEVMEM_IS_ALLOWED
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
select ARCH_HAS_ELF_RANDOMIZE
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 7a944f7..890d36f 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -213,6 +213,8 @@ void __init acpi_boot_table_init(void)
if (!param_acpi_force)
disable_acpi();
}
+
+ acpi_probe_device_table(dbg2);
}
#ifdef CONFIG_ACPI_APEI
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 8/8] serial: pl011: add ACPI DBG2 serial port
2016-02-22 13:46 ` Aleksey Makarov
@ 2016-02-22 13:46 ` Aleksey Makarov
-1 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-acpi
Cc: linux-serial, linux-kernel, linux-arm-kernel, Aleksey Makarov,
Russell King, Greg Kroah-Hartman, Rafael J . Wysocki,
Leif Lindholm, Graeme Gregory, Al Stone, Christopher Covington,
Jiri Slaby
Add a handler for ACPI DBG2 serial port of type ACPI_DBG2_ARM_PL011
that sets up an earlycon on it.
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
drivers/tty/serial/amba-pl011.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index c0da0cc..5633741 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -59,6 +59,7 @@
#include <linux/sizes.h>
#include <linux/io.h>
#include <linux/acpi.h>
+#include <linux/acpi_dbg2.h>
#include "amba-pl011.h"
@@ -2329,6 +2330,8 @@ static int __init pl011_early_console_setup(struct earlycon_device *device,
}
EARLYCON_DECLARE(pl011, pl011_early_console_setup);
OF_EARLYCON_DECLARE(pl011, "arm,pl011", pl011_early_console_setup);
+ACPI_DBG2_EARLYCON_DECLARE(pl011, ACPI_DBG2_ARM_PL011,
+ pl011_early_console_setup);
#else
#define AMBA_CONSOLE NULL
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 8/8] serial: pl011: add ACPI DBG2 serial port
@ 2016-02-22 13:46 ` Aleksey Makarov
0 siblings, 0 replies; 31+ messages in thread
From: Aleksey Makarov @ 2016-02-22 13:46 UTC (permalink / raw)
To: linux-arm-kernel
Add a handler for ACPI DBG2 serial port of type ACPI_DBG2_ARM_PL011
that sets up an earlycon on it.
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
drivers/tty/serial/amba-pl011.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index c0da0cc..5633741 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -59,6 +59,7 @@
#include <linux/sizes.h>
#include <linux/io.h>
#include <linux/acpi.h>
+#include <linux/acpi_dbg2.h>
#include "amba-pl011.h"
@@ -2329,6 +2330,8 @@ static int __init pl011_early_console_setup(struct earlycon_device *device,
}
EARLYCON_DECLARE(pl011, pl011_early_console_setup);
OF_EARLYCON_DECLARE(pl011, "arm,pl011", pl011_early_console_setup);
+ACPI_DBG2_EARLYCON_DECLARE(pl011, ACPI_DBG2_ARM_PL011,
+ pl011_early_console_setup);
#else
#define AMBA_CONSOLE NULL
--
2.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread