2014-04-05 13:13:45

by Vineet Gupta

Subject: [PATCH 0/2] ARC: unbork nsimosci serial console

Hi,

This is basically stable team fodder. I'll be sending these patches to
Linus as part of ARC 3.15 merge window changes early next week.

Thx,
-Vineet

Mischa Jonker (1):
ARC: [nsimosci] Change .dts to use generic 8250 UART

Vineet Gupta (1):
ARC: [nsimosci] Unbork console

arch/arc/boot/dts/nsimosci.dts | 12 +++++++-----
arch/arc/configs/nsimosci_defconfig | 1 +
2 files changed, 8 insertions(+), 5 deletions(-)

--
1.8.3.2

2014-04-05 13:09:48

by Vineet Gupta

Subject: [PATCH Resend 1/2] ARC: [nsimosci] Change .dts to use generic 8250 UART

From: Mischa Jonker <[email protected]>

The Synopsys APB DW UART has a couple of special features that are not
in the System C model. In 3.8, the 8250_dw driver didn't really use these
features, but from 3.9 onwards, the 8250_dw driver has become incompatible
with our model.

Signed-off-by: Mischa Jonker <[email protected]>
Signed-off-by: Vineet Gupta <[email protected]>
Cc: <[email protected]> #3.10, 3.12, 3.13, 3.14
Cc: Francois Bedard <[email protected]>
---
arch/arc/boot/dts/nsimosci.dts | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts
index ea16d782af58..8bd238c34c7d 100644
--- a/arch/arc/boot/dts/nsimosci.dts
+++ b/arch/arc/boot/dts/nsimosci.dts
@@ -11,7 +11,7 @@

/ {
compatible = "snps,nsimosci";
- clock-frequency = <80000000>; /* 80 MHZ */
+ clock-frequency = <20000000>; /* 20 MHZ */
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&intc>;
@@ -44,15 +44,14 @@
};

uart0: serial@c0000000 {
- compatible = "snps,dw-apb-uart";
+ compatible = "ns8250";
reg = <0xc0000000 0x2000>;
interrupts = <11>;
- #clock-frequency = <80000000>;
clock-frequency = <3686400>;
baud = <115200>;
reg-shift = <2>;
reg-io-width = <4>;
- status = "okay";
+ no-loopback-test = <1>;
};

pgu0: pgu@c9000000 {
--
1.8.3.2

2014-04-05 13:09:59

by Vineet Gupta

Subject: [PATCH Resend 2/2] ARC: [nsimosci] Unbork console

Despite the switch to right UART driver (prev patch), serial console
still doesn't work due to missing CONFIG_SERIAL_OF_PLATFORM

Also fix the default cmdline in DT to not refer to out-of-tree
ARC framebuffer driver for console.

Signed-off-by: Vineet Gupta <[email protected]>
Cc: <[email protected]> #3.10, 3.12, 3.13, 3.14
Cc: Francois Bedard <[email protected]>
---
arch/arc/boot/dts/nsimosci.dts | 5 ++++-
arch/arc/configs/nsimosci_defconfig | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts
index 8bd238c34c7d..4f31b2eb5cdf 100644
--- a/arch/arc/boot/dts/nsimosci.dts
+++ b/arch/arc/boot/dts/nsimosci.dts
@@ -17,7 +17,10 @@
interrupt-parent = <&intc>;

chosen {
- bootargs = "console=tty0 consoleblank=0";
+ /* this is for console on PGU */
+ /* bootargs = "console=tty0 consoleblank=0"; */
+ /* this is for console on serial */
+ bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=ttyS0,115200n8 consoleblank=0 debug";
};

aliases {
diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig
index 451af30914f6..c01ba35a4eff 100644
--- a/arch/arc/configs/nsimosci_defconfig
+++ b/arch/arc/configs/nsimosci_defconfig
@@ -54,6 +54,7 @@ CONFIG_SERIO_ARC_PS2=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_ARC=y
CONFIG_SERIAL_ARC_CONSOLE=y
# CONFIG_HW_RANDOM is not set
--
1.8.3.2

2014-04-08 13:42:44

by Vineet Gupta

Subject: Re: [PATCH Resend 2/2] ARC: [nsimosci] Unbork console

For Stable 3.10, 3.12, 3.13, 3.14

mainline commit 61fb4bfc010b0d2940f7fd87acbce6a0f03217cb

Thx,
-Vineet

On Saturday 05 April 2014 06:39 PM, Vineet Gupta wrote:
> Despite the switch to right UART driver (prev patch), serial console
> still doesn't work due to missing CONFIG_SERIAL_OF_PLATFORM
>
> Also fix the default cmdline in DT to not refer to out-of-tree
> ARC framebuffer driver for console.
>
> Signed-off-by: Vineet Gupta <[email protected]>
> Cc: <[email protected]> #3.10, 3.12, 3.13, 3.14
> Cc: Francois Bedard <[email protected]>
> ---
> arch/arc/boot/dts/nsimosci.dts | 5 ++++-
> arch/arc/configs/nsimosci_defconfig | 1 +
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts
> index 8bd238c34c7d..4f31b2eb5cdf 100644
> --- a/arch/arc/boot/dts/nsimosci.dts
> +++ b/arch/arc/boot/dts/nsimosci.dts
> @@ -17,7 +17,10 @@
> interrupt-parent = <&intc>;
>
> chosen {
> - bootargs = "console=tty0 consoleblank=0";
> + /* this is for console on PGU */
> + /* bootargs = "console=tty0 consoleblank=0"; */
> + /* this is for console on serial */
> + bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=ttyS0,115200n8 consoleblank=0 debug";
> };
>
> aliases {
> diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig
> index 451af30914f6..c01ba35a4eff 100644
> --- a/arch/arc/configs/nsimosci_defconfig
> +++ b/arch/arc/configs/nsimosci_defconfig
> @@ -54,6 +54,7 @@ CONFIG_SERIO_ARC_PS2=y
> CONFIG_SERIAL_8250=y
> CONFIG_SERIAL_8250_CONSOLE=y
> CONFIG_SERIAL_8250_DW=y
> +CONFIG_SERIAL_OF_PLATFORM=y
> CONFIG_SERIAL_ARC=y
> CONFIG_SERIAL_ARC_CONSOLE=y
> # CONFIG_HW_RANDOM is not set

2014-04-08 13:46:21

by Vineet Gupta

Subject: Re: [PATCH Resend 1/2] ARC: [nsimosci] Change .dts to use generic 8250 UART

For Stable 3.10, 3.12, 3.13, 3.14

mainline commit 6eda477b3c54b8236868c8784e5e042ff14244f0

Thx,
-Vineet

On Saturday 05 April 2014 06:39 PM, Vineet Gupta wrote:
> From: Mischa Jonker <[email protected]>
>
> The Synopsys APB DW UART has a couple of special features that are not
> in the System C model. In 3.8, the 8250_dw driver didn't really use these
> features, but from 3.9 onwards, the 8250_dw driver has become incompatible
> with our model.
>
> Signed-off-by: Mischa Jonker <[email protected]>
> Signed-off-by: Vineet Gupta <[email protected]>
> Cc: <[email protected]> #3.10, 3.12, 3.13, 3.14
> Cc: Francois Bedard <[email protected]>
> ---
> arch/arc/boot/dts/nsimosci.dts | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts
> index ea16d782af58..8bd238c34c7d 100644
> --- a/arch/arc/boot/dts/nsimosci.dts
> +++ b/arch/arc/boot/dts/nsimosci.dts
> @@ -11,7 +11,7 @@
>
> / {
> compatible = "snps,nsimosci";
> - clock-frequency = <80000000>; /* 80 MHZ */
> + clock-frequency = <20000000>; /* 20 MHZ */
> #address-cells = <1>;
> #size-cells = <1>;
> interrupt-parent = <&intc>;
> @@ -44,15 +44,14 @@
> };
>
> uart0: serial@c0000000 {
> - compatible = "snps,dw-apb-uart";
> + compatible = "ns8250";
> reg = <0xc0000000 0x2000>;
> interrupts = <11>;
> - #clock-frequency = <80000000>;
> clock-frequency = <3686400>;
> baud = <115200>;
> reg-shift = <2>;
> reg-io-width = <4>;
> - status = "okay";
> + no-loopback-test = <1>;
> };
>
> pgu0: pgu@c9000000 {