* [PATCH 1/2] ARM: kirkwood: provide ge clock aliases for shared smi
@ 2013-01-30 1:26 Sebastian Hesselbarth
2013-01-30 1:26 ` [PATCH 2/2] ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels Sebastian Hesselbarth
0 siblings, 1 reply; 6+ messages in thread
From: Sebastian Hesselbarth @ 2013-01-30 1:26 UTC (permalink / raw)
To: linux-arm-kernel
DT support for mv643xx_eth will split smi driver from core gbe driver.
Although different drivers, both use the same internal device and the
same (gateable) clock. This patch provides a proper clock alias for
the smi driver to not break non-DT kernels.
Reported-by: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Simon Baatz <gmbnomis@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/mach-kirkwood/common.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index bac21a5..502d80d 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -252,7 +252,9 @@ void __init kirkwood_clk_init(void)
orion_clkdev_add(NULL, "orion_spi.0", runit);
orion_clkdev_add(NULL, "orion_spi.1", runit);
orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0);
+ orion_clkdev_add(NULL, MV643XX_ETH_SHARED_NAME ".0", ge0);
orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1);
+ orion_clkdev_add(NULL, MV643XX_ETH_SHARED_NAME ".1", ge1);
orion_clkdev_add(NULL, "orion_wdt", tclk);
orion_clkdev_add("0", "sata_mv.0", sata0);
orion_clkdev_add("1", "sata_mv.0", sata1);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
2013-01-30 1:26 [PATCH 1/2] ARM: kirkwood: provide ge clock aliases for shared smi Sebastian Hesselbarth
@ 2013-01-30 1:26 ` Sebastian Hesselbarth
2013-01-30 18:30 ` Jason Cooper
0 siblings, 1 reply; 6+ messages in thread
From: Sebastian Hesselbarth @ 2013-01-30 1:26 UTC (permalink / raw)
To: linux-arm-kernel
The ethernet controller used on kirkwood looses its MAC address
register contents when the corresponding clock is gated. Until there
is proper DT support for the mv643xx_eth driver, we add a workaround
to always enable ge0/ge1 clocks on kirkwood. This workaround is also
already used on non-DT kirkwood kernels.
Reported-by: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Simon Baatz <gmbnomis@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/mach-kirkwood/board-dt.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index de4fd2b..e714ead 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -41,16 +41,12 @@ static void __init kirkwood_legacy_clk_init(void)
struct device_node *np = of_find_compatible_node(
NULL, NULL, "marvell,kirkwood-gating-clock");
-
struct of_phandle_args clkspec;
+ struct clk *clk;
clkspec.np = np;
clkspec.args_count = 1;
- clkspec.args[0] = CGC_BIT_GE0;
- orion_clkdev_add(NULL, "mv643xx_eth_port.0",
- of_clk_get_from_provider(&clkspec));
-
clkspec.args[0] = CGC_BIT_PEX0;
orion_clkdev_add("0", "pcie",
of_clk_get_from_provider(&clkspec));
@@ -63,14 +59,24 @@ static void __init kirkwood_legacy_clk_init(void)
orion_clkdev_add("1", "pcie",
of_clk_get_from_provider(&clkspec));
- clkspec.args[0] = CGC_BIT_GE1;
- orion_clkdev_add(NULL, "mv643xx_eth_port.1",
- of_clk_get_from_provider(&clkspec));
-
clkspec.args[0] = CGC_BIT_SDIO;
orion_clkdev_add(NULL, "mvsdio",
of_clk_get_from_provider(&clkspec));
+ /*
+ * The ethernet interfaces forget the MAC address assigned by
+ * u-boot if the clocks are turned off. Until proper DT support
+ * is available we always enable them for now.
+ */
+ clkspec.args[0] = CGC_BIT_GE0;
+ clk = of_clk_get_from_provider(&clkspec);
+ orion_clkdev_add(NULL, "mv643xx_eth_port.0", clk);
+ clk_prepare_enable(clk);
+
+ clkspec.args[0] = CGC_BIT_GE1;
+ clk = of_clk_get_from_provider(&clkspec);
+ orion_clkdev_add(NULL, "mv643xx_eth_port.1", clk);
+ clk_prepare_enable(clk);
}
static void __init kirkwood_of_clk_init(void)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
2013-01-30 1:26 ` [PATCH 2/2] ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels Sebastian Hesselbarth
@ 2013-01-30 18:30 ` Jason Cooper
2013-01-30 20:29 ` [PATCH v2 " Sebastian Hesselbarth
0 siblings, 1 reply; 6+ messages in thread
From: Jason Cooper @ 2013-01-30 18:30 UTC (permalink / raw)
To: linux-arm-kernel
Sebastian,
On Wed, Jan 30, 2013 at 02:26:41AM +0100, Sebastian Hesselbarth wrote:
> The ethernet controller used on kirkwood looses its MAC address
> register contents when the corresponding clock is gated. Until there
> is proper DT support for the mv643xx_eth driver, we add a workaround
> to always enable ge0/ge1 clocks on kirkwood. This workaround is also
> already used on non-DT kirkwood kernels.
Could you please make it clear that this is only relevant for scenarios
where mv643xx_eth is built as a module?
thx,
Jason.
>
> Reported-by: Simon Baatz <gmbnomis@gmail.com>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Cc: Simon Baatz <gmbnomis@gmail.com>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/mach-kirkwood/board-dt.c | 24 +++++++++++++++---------
> 1 file changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index de4fd2b..e714ead 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -41,16 +41,12 @@ static void __init kirkwood_legacy_clk_init(void)
>
> struct device_node *np = of_find_compatible_node(
> NULL, NULL, "marvell,kirkwood-gating-clock");
> -
> struct of_phandle_args clkspec;
> + struct clk *clk;
>
> clkspec.np = np;
> clkspec.args_count = 1;
>
> - clkspec.args[0] = CGC_BIT_GE0;
> - orion_clkdev_add(NULL, "mv643xx_eth_port.0",
> - of_clk_get_from_provider(&clkspec));
> -
> clkspec.args[0] = CGC_BIT_PEX0;
> orion_clkdev_add("0", "pcie",
> of_clk_get_from_provider(&clkspec));
> @@ -63,14 +59,24 @@ static void __init kirkwood_legacy_clk_init(void)
> orion_clkdev_add("1", "pcie",
> of_clk_get_from_provider(&clkspec));
>
> - clkspec.args[0] = CGC_BIT_GE1;
> - orion_clkdev_add(NULL, "mv643xx_eth_port.1",
> - of_clk_get_from_provider(&clkspec));
> -
> clkspec.args[0] = CGC_BIT_SDIO;
> orion_clkdev_add(NULL, "mvsdio",
> of_clk_get_from_provider(&clkspec));
>
> + /*
> + * The ethernet interfaces forget the MAC address assigned by
> + * u-boot if the clocks are turned off. Until proper DT support
> + * is available we always enable them for now.
> + */
> + clkspec.args[0] = CGC_BIT_GE0;
> + clk = of_clk_get_from_provider(&clkspec);
> + orion_clkdev_add(NULL, "mv643xx_eth_port.0", clk);
> + clk_prepare_enable(clk);
> +
> + clkspec.args[0] = CGC_BIT_GE1;
> + clk = of_clk_get_from_provider(&clkspec);
> + orion_clkdev_add(NULL, "mv643xx_eth_port.1", clk);
> + clk_prepare_enable(clk);
> }
>
> static void __init kirkwood_of_clk_init(void)
> --
> 1.7.10.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 2/2] ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
2013-01-30 18:30 ` Jason Cooper
@ 2013-01-30 20:29 ` Sebastian Hesselbarth
2013-02-02 23:49 ` Simon Baatz
2013-02-04 1:34 ` Jason Cooper
0 siblings, 2 replies; 6+ messages in thread
From: Sebastian Hesselbarth @ 2013-01-30 20:29 UTC (permalink / raw)
To: linux-arm-kernel
The ethernet controller used on kirkwood looses its MAC address
register contents when the corresponding clock is gated. As soon as
mv643xx_eth is built as module, the clock gets gated and when loading
the module, the MAC address is gone.
Proper DT support for the mv643xx_eth driver is expected soon, so we add
a workaround to always enable ge0/ge1 clocks on kirkwood. This workaround
is also already used on non-DT kirkwood kernels.
Reported-by: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Changelog:
[v2]
- add note in patch description that MAC address is lost only when using
modular driver
- add note in patch description that the workaround will be removed soon
Cc: Simon Baatz <gmbnomis@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/mach-kirkwood/board-dt.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index de4fd2b..e714ead 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -41,16 +41,12 @@ static void __init kirkwood_legacy_clk_init(void)
struct device_node *np = of_find_compatible_node(
NULL, NULL, "marvell,kirkwood-gating-clock");
-
struct of_phandle_args clkspec;
+ struct clk *clk;
clkspec.np = np;
clkspec.args_count = 1;
- clkspec.args[0] = CGC_BIT_GE0;
- orion_clkdev_add(NULL, "mv643xx_eth_port.0",
- of_clk_get_from_provider(&clkspec));
-
clkspec.args[0] = CGC_BIT_PEX0;
orion_clkdev_add("0", "pcie",
of_clk_get_from_provider(&clkspec));
@@ -63,14 +59,24 @@ static void __init kirkwood_legacy_clk_init(void)
orion_clkdev_add("1", "pcie",
of_clk_get_from_provider(&clkspec));
- clkspec.args[0] = CGC_BIT_GE1;
- orion_clkdev_add(NULL, "mv643xx_eth_port.1",
- of_clk_get_from_provider(&clkspec));
-
clkspec.args[0] = CGC_BIT_SDIO;
orion_clkdev_add(NULL, "mvsdio",
of_clk_get_from_provider(&clkspec));
+ /*
+ * The ethernet interfaces forget the MAC address assigned by
+ * u-boot if the clocks are turned off. Until proper DT support
+ * is available we always enable them for now.
+ */
+ clkspec.args[0] = CGC_BIT_GE0;
+ clk = of_clk_get_from_provider(&clkspec);
+ orion_clkdev_add(NULL, "mv643xx_eth_port.0", clk);
+ clk_prepare_enable(clk);
+
+ clkspec.args[0] = CGC_BIT_GE1;
+ clk = of_clk_get_from_provider(&clkspec);
+ orion_clkdev_add(NULL, "mv643xx_eth_port.1", clk);
+ clk_prepare_enable(clk);
}
static void __init kirkwood_of_clk_init(void)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 2/2] ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
2013-01-30 20:29 ` [PATCH v2 " Sebastian Hesselbarth
@ 2013-02-02 23:49 ` Simon Baatz
2013-02-04 1:34 ` Jason Cooper
1 sibling, 0 replies; 6+ messages in thread
From: Simon Baatz @ 2013-02-02 23:49 UTC (permalink / raw)
To: linux-arm-kernel
Hi Sebastian, Jason,
On Wed, Jan 30, 2013 at 09:29:58PM +0100, Sebastian Hesselbarth wrote:
> The ethernet controller used on kirkwood looses its MAC address
> register contents when the corresponding clock is gated. As soon as
> mv643xx_eth is built as module, the clock gets gated and when loading
> the module, the MAC address is gone.
>
> Proper DT support for the mv643xx_eth driver is expected soon, so we add
> a workaround to always enable ge0/ge1 clocks on kirkwood. This workaround
> is also already used on non-DT kirkwood kernels.
>
> Reported-by: Simon Baatz <gmbnomis@gmail.com>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested this on IB-NAS6210 (kirkwood, single GBE interface). Using
mv643xx_eth as a module works again now and yields
# cat /sys/kernel/debug/clk/tclk/ge[01]/clk_enable_count
2
1
as expected.
- Simon
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
2013-01-30 20:29 ` [PATCH v2 " Sebastian Hesselbarth
2013-02-02 23:49 ` Simon Baatz
@ 2013-02-04 1:34 ` Jason Cooper
1 sibling, 0 replies; 6+ messages in thread
From: Jason Cooper @ 2013-02-04 1:34 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 30, 2013 at 09:29:58PM +0100, Sebastian Hesselbarth wrote:
> The ethernet controller used on kirkwood looses its MAC address
> register contents when the corresponding clock is gated. As soon as
> mv643xx_eth is built as module, the clock gets gated and when loading
> the module, the MAC address is gone.
>
> Proper DT support for the mv643xx_eth driver is expected soon, so we add
> a workaround to always enable ge0/ge1 clocks on kirkwood. This workaround
> is also already used on non-DT kirkwood kernels.
>
> Reported-by: Simon Baatz <gmbnomis@gmail.com>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Changelog:
> [v2]
> - add note in patch description that MAC address is lost only when using
> modular driver
> - add note in patch description that the workaround will be removed soon
>
> Cc: Simon Baatz <gmbnomis@gmail.com>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/mach-kirkwood/board-dt.c | 24 +++++++++++++++---------
> 1 file changed, 15 insertions(+), 9 deletions(-)
Applied to mvebu/fixes with Simon's Tested-by:
thx,
Jason.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-02-04 1:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-30 1:26 [PATCH 1/2] ARM: kirkwood: provide ge clock aliases for shared smi Sebastian Hesselbarth
2013-01-30 1:26 ` [PATCH 2/2] ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels Sebastian Hesselbarth
2013-01-30 18:30 ` Jason Cooper
2013-01-30 20:29 ` [PATCH v2 " Sebastian Hesselbarth
2013-02-02 23:49 ` Simon Baatz
2013-02-04 1:34 ` Jason Cooper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).