Add Ether support for R8A7791/Koelsch board
v2 cover Add Ether support for R8A7791/Koelsch board
Hello.
Resending with correct subject...
Here's the set of 3 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-v3.12-20131112' tag. Here we add the Ether support to the R8A7791/Koelsch board. The patchset requires the 'sh_eth' driver R8A7791 support patch posted earlier in order to work.
[1/3] ARM: shmobile: r8a7791: add Ether clock [2/3] ARM: shmobile: Koelsch: add Ether support [3/3] ARM: shmobile: Koelsch: enable Ether in defconfig
WBR, Sergei
PATCH v2 1/3 ARM: shmobile: r8a7791: add Ether clock
Add support for R8A7791 Ether clock.
---
Changes in version 2:
- changed Ether device name to "r8a779x-ether".
arch/arm/mach-shmobile/clock-r8a7791.c | 3 +++ 1 file changed, 3 insertions(+)
Index: renesas/arch/arm/mach-shmobile/clock-r8a7791.c =================================--- renesas.orig/arch/arm/mach-shmobile/clock-r8a7791.c +++ renesas/arch/arm/mach-shmobile/clock-r8a7791.c
@@ -120,6 +120,7 @@ static struct clk *main_clks[] = {
/* MSTP */
enum {
+ MSTP813,
MSTP721, MSTP720,
MSTP719, MSTP718, MSTP715, MSTP714,
MSTP216, MSTP207, MSTP206,
@@ -129,6 +130,7 @@ enum {
};
static struct clk mstp_clks[MSTP_NR] = {
+ [MSTP813] = SH_CLK_MSTP32(&p_clk, SMSTPCR8, 13, 0), /* Ether */
[MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */ [MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */ [MSTP719] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 19, 0), /* SCIF2 */
@@ -180,6 +182,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh-sci.13", &mstp_clks[MSTP1106]), /* SCIFA4 */ CLKDEV_DEV_ID("sh-sci.14", &mstp_clks[MSTP1107]), /* SCIFA5 */ CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
+ CLKDEV_DEV_ID("r8a779x-ether", &mstp_clks[MSTP813]), /* Ether */
};
#define R8A7791_CLOCK_ROOT(e, m, p0, p1, p30, p31) \
PATCH v2 2/3 ARM: shmobile: Koelsch: add Ether support
In reply to Sergei ShtylyovRegister Ether platform device and pin data on the Koelsch board. Register platform fixup for Micrel KSZ8041 PHY, just like on the Lager board.
---
Changes in version 2:
- added *if* (IS_ENABLED(CONFIG_PHYLIB)) around phy_register_fixup_for_id() call;
- changed Ether device name to "r8a779x-ether".
arch/arm/mach-shmobile/board-koelsch.c | 63 ++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-)
Index: renesas/arch/arm/mach-shmobile/board-koelsch.c =================================--- renesas.orig/arch/arm/mach-shmobile/board-koelsch.c +++ renesas/arch/arm/mach-shmobile/board-koelsch.c
@@ -24,14 +24,31 @@
#include <linux/input.h>
#include <linux/kernel.h>
#include <linux/leds.h>
+#include <linux/phy.h>
+#include <linux/pinctrl/machine.h>
#include <linux/platform_data/gpio-rcar.h>
#include <linux/platform_device.h>
+#include <linux/sh_eth.h>
#include <mach/common.h>
+#include <mach/irqs.h>
#include <mach/r8a7791.h>
#include <mach/rcar-gen2.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+/* Ether */
+static const struct sh_eth_plat_data ether_pdata __initconst = {
+ .phy = 0x1,
+ .edmac_endian = EDMAC_LITTLE_ENDIAN,
+ .phy_interface = PHY_INTERFACE_MODE_RMII,
+ .ether_link_active_low = 1,
+};
+
+static const struct resource ether_resources[] __initconst = {
+ DEFINE_RES_MEM(0xee700000, 0x400),
+ DEFINE_RES_IRQ(gic_spi(162)),
+};
+
/* LEDS */
static struct gpio_led koelsch_leds[] = {
{
@@ -71,11 +88,29 @@ static const struct gpio_keys_platform_d
.nbuttons = ARRAY_SIZE(gpio_buttons),
};
+static const struct pinctrl_map koelsch_pinctrl_map[] = {
+ /* Ether */
+ PIN_MAP_MUX_GROUP_DEFAULT("r8a779x-ether", "pfc-r8a7791",
+ "eth_link", "eth"),
+ PIN_MAP_MUX_GROUP_DEFAULT("r8a779x-ether", "pfc-r8a7791",
+ "eth_mdio", "eth"),
+ PIN_MAP_MUX_GROUP_DEFAULT("r8a779x-ether", "pfc-r8a7791",
+ "eth_rmii", "eth"),
+};
+
static void __init koelsch_add_standard_devices(void) {
r8a7791_clock_init();
+
+ pinctrl_register_mappings(koelsch_pinctrl_map,
+ ARRAY_SIZE(koelsch_pinctrl_map));
r8a7791_pinmux_init();
+
r8a7791_add_standard_devices();
+ platform_device_register_resndata(&platform_bus, "r8a779x-ether", -1,
+ ether_resources, + ARRAY_SIZE(ether_resources), + ðer_pdata, sizeof(ether_pdata));
platform_device_register_data(&platform_bus, "leds-gpio", -1,
&koelsch_leds_pdata, sizeof(koelsch_leds_pdata));
@@ -84,6 +119,32 @@ static void __init koelsch_add_standard_
sizeof(koelsch_keys_pdata));
}
+/*
+ * Ether LEDs on the Koelsch board are named LINK and ACTIVE which corresponds
+ * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits
+ * 14-15. We have to set them back to 01 from the default 00 value each time
+ * the PHY is reset. It's also important because the PHY's LED0 signal is
+ * connected to SoC's ETH_LINK signal and in the PHY's default mode it will
+ * bounce on and off after each packet, which we apparently want to avoid.
+ */
+static int koelsch_ksz8041_fixup(struct phy_device *phydev)
+{
+ u16 phyctrl1 = phy_read(phydev, 0x1e);
+
+ phyctrl1 &= ~0xc000;
+ phyctrl1 |= 0x4000;
+ return phy_write(phydev, 0x1e, phyctrl1);
+}
+
+static void __init koelsch_init(void)
+{
+ koelsch_add_standard_devices();
+
+ if (IS_ENABLED(CONFIG_PHYLIB))
+ phy_register_fixup_for_id("r8a779x-ether-ff:01",
+ koelsch_ksz8041_fixup);
+}
+
static const char * const koelsch_boards_compat_dt[] __initconst = {
"renesas,koelsch",
NULL,
@@ -92,7 +153,7 @@ static const char * const koelsch_boards
DT_MACHINE_START(KOELSCH_DT, "koelsch")
.smp = smp_ops(r8a7791_smp_ops),
.init_early = r8a7791_init_early,
- .init_machine = koelsch_add_standard_devices,
+ .init_machine = koelsch_init,
.init_time = rcar_gen2_timer_init,
.dt_compat = koelsch_boards_compat_dt,
MACHINE_END
PATCH v2 2/3 ARM: shmobile: Koelsch: add Ether support
Hi Sergei,
Thank you for the patch.
Quoted 99 lines · On Friday 15 November 2013 02:21:11 Sergei Shtylyov wrote:
Register Ether platform device and pin data on the Koelsch board. Register platform fixup for Micrel KSZ8041 PHY, just like on the Lager board.
Signed-off-by Sergei Shtylyov <[email protected]>---
Changes in version 2:
- added *if* (IS_ENABLED(CONFIG_PHYLIB)) aroundphy_register_fixup_for_id()call;
- changed Ether device name to "r8a779x-ether".arch/arm/mach-shmobile/board-koelsch.c | 63 ++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-)Index:
renesas/arch/arm/mach-shmobile/board-koelsch.c
===================================================================arch/arm/mach-shmobile/board-koelsch.c +37
-0@@ -24,14 +24,31 @@#include <linux/input.h> #include <linux/kernel.h> #include <linux/leds.h> +#include <linux/phy.h> +#include <linux/pinctrl/machine.h> #include <linux/platform_data/gpio-rcar.h> #include <linux/platform_device.h> +#include <linux/sh_eth.h> #include <mach/common.h> +#include <mach/irqs.h> #include <mach/r8a7791.h> #include <mach/rcar-gen2.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +/* Ether */ +static const struct sh_eth_plat_data ether_pdata__initconst = { + .phy =0x1 , + .edmac_endian =EDMAC_LITTLE_ENDIAN , + .phy_interface =PHY_INTERFACE_MODE_RMII , + .ether_link_active_low =1 , +}; + +static const struct resource ether_resources[]__initconst = { +DEFINE_RES_MEM (0xee700000 ,0x400 ), +DEFINE_RES_IRQ (gic_spi (162 )), +}; +/* LEDS */ static struct gpio_led koelsch_leds[] = { {@@ -71,11 +88,29 @@ static const struct gpio_keys_platform_d .nbuttons = ARRAY_SIZE(gpio_buttons), }; +static const struct pinctrl_map koelsch_pinctrl_map[] = { +/* Ether */ +PIN_MAP_MUX_GROUP_DEFAULT ("r8a779x-ether" ,"pfc-r8a7791" , +"eth_link" ,"eth" ), +PIN_MAP_MUX_GROUP_DEFAULT ("r8a779x-ether" ,"pfc-r8a7791" , +"eth_mdio" ,"eth" ), +PIN_MAP_MUX_GROUP_DEFAULT ("r8a779x-ether" ,"pfc-r8a7791" , +"eth_rmii" ,"eth" ), +}; +static void __init koelsch_add_standard_devices (void ) {r8a7791_clock_init (); + +pinctrl_register_mappings (koelsch_pinctrl_map, +ARRAY_SIZE (koelsch_pinctrl_map));r8a7791_pinmux_init (); +r8a7791_add_standard_devices (); +platform_device_register_resndata (&platform_bus,"r8a779x-ether" ,-1 , + ether_resources, +ARRAY_SIZE (ether_resources), + ðer_pdata,sizeof (ether_pdata));platform_device_register_data (&platform_bus,"leds-gpio" ,-1 , &koelsch_leds_pdata,sizeof (koelsch_leds_pdata));@@ -84,6 +119,32 @@ static void __init koelsch_add_standard_ sizeof(koelsch_keys_pdata)); } +/* +* Ether LEDs on the Koelsch board are named LINK and ACTIVE which corresponds + * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits + * 14-15. We have to set them back to 01 from the default 00 value each time + * the PHY is reset. It's also important because the PHY's LED0 signal is + * connected to SoC's
ETH_LINKsignal and in the PHY's default mode it will + * bounce on and off after each packet, which we apparently want to avoid. + */arch/arm/mach-shmobile/board-koelsch.c +6
-0+static int koelsch_ksz8041_fixup (struct phy_device *phydev) +{ +u16 phyctrl1 =phy_read (phydev,0x1e ); + + phyctrl1 &= ~0xc000 ; + phyctrl1 |=0x4000 ;
arch/arm/mach-shmobile/board-koelsch.c
Quoted 10 lines
arch/arm/mach-shmobile/board-koelsch.c +10
-0+return phy_write (phydev,0x1e , phyctrl1); +} + +static void __init koelsch_init (void ) +{ +koelsch_add_standard_devices (); + +if (IS_ENABLED (CONFIG_PHYLIB )) +phy_register_fixup_for_id ("r8a779x-ether-ff:01" , + koelsch_ksz8041_fixup);
This is fine with board code, but will break when we'll switch to DT. Would it be difficult to replace board code by using the existing micrel phy driver (drivers/net/phy/micrel.c) which should support the ksz8041 already and extending it with support for register 0x1e which doesn't seem to be handled ?
Quoted 14 lines
arch/arm/mach-shmobile/board-koelsch.c +3
-1+} +static const char *const koelsch_boards_compat_dt[]__initconst = {"renesas,koelsch" ,NULL ,@@ -92,7 +153,7 @@ static const char * const koelsch_boardsDT_MACHINE_START (KOELSCH_DT ,"koelsch" ) .smp = smp_ops(r8a7791_smp_ops), .init_early = r8a7791_init_early, - .init_machine = koelsch_add_standard_devices, + .init_machine = koelsch_init, .init_time = rcar_gen2_timer_init, .dt_compat = koelsch_boards_compat_dt,MACHINE_END
Signature · 3 lines
Regards, Laurent Pinchart
PATCH v2 2/3 ARM: shmobile: Koelsch: add Ether support
Hello.
Quoted 18 lines · Laurent Pinchart
Quoted 18 lines
Register Ether platform device and pin data on the Koelsch board. Register platform fixup for Micrel KSZ8041 PHY, just like on the Lager board.
Signed-off-by Sergei Shtylyov <[email protected]>---
Changes in version 2:
- added *if* (IS_ENABLED(CONFIG_PHYLIB)) aroundphy_register_fixup_for_id()call;
- changed Ether device name to "r8a779x-ether".arch/arm/mach-shmobile/board-koelsch.c | 63 ++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-)Index:
renesas/arch/arm/mach-shmobile/board-koelsch.c=================================>> ---renesas.orig/arch/arm/mach-shmobile/board-koelsch.c+++renesas/arch/arm/mach-shmobile/board-koelsch.c
[...]
Quoted 24 lines
Quoted 24 lines
(quoted diff) +2
-0@@ -84,6 +119,32 @@ static void __init koelsch_add_standard_ sizeof(koelsch_keys_pdata)); } +/* + * Ether LEDs on the Koelsch board are named LINK and ACTIVE whichcorresponds + * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits + * 14-15. We have to set them back to 01 from the default 00 value each time + * the PHY is reset. It's also important because the PHY's LED0 signal is + * connected to SoC's
ETH_LINKsignal and in the PHY's default mode it will + * bounce on and off after each packet, which we apparently want to avoid. + */(quoted diff) +12
-0+static int koelsch_ksz8041_fixup(struct phy_device *phydev) +{ + u16 phyctrl1 = phy_read(phydev, 0x1e); + + phyctrl1 &= ~0xc000; + phyctrl1 |= 0x4000; + return phy_write(phydev, 0x1e, phyctrl1); +} + +static void __init koelsch_init(void) +{ + koelsch_add_standard_devices();
Quoted 8 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ + if (IS_ENABLED(CONFIG_PHYLIB)) + phy_register_fixup_for_id("r8a779x-ether-ff:01", + koelsch_ksz8041_fixup);This is fine with board code, but will break when we'll switch to DT. Would it be difficult to replace board code by using the existing micrel phy driver (
drivers/net/phy/micrel.c) which should support the ksz8041 already and
The first issue here is KSZ8041 on the BOCK-W/Lager/Koelsch boards uses
undocumented PHY ID for some reason, so the current driver doesn't really support it. :-)
Quoted 1 line
extending it with support for register
0x1ewhich doesn't seem to be handled ?
You probably didn't quite understand the purpose of the platform PHY
fixup. It's designed to do the board-specific changes, not the driver-specific changes. In this case, the setting of the bits 14-15 of the PHY control register 1 (w/address 0x1E) purely depends on the board schematics and simply can't be selected by the PHY driver.
It could have been set by the PHY driver iff we would find a way to pass
the platform data to the PHY device (on the automatically probed MDIO bus).
We can also ignore ETH_LINK signal altogether in the 'sh_eth' driver
(because it would bounce on/off on each packet) and stop caring about the LED function matching to what's designed for the board.
Also we can stop resetting PHY in the 'sh_eth' driver -- that should help
(the platform fixup was mainly added to work around this reset but DaveM didn't take my simple 'sh_eth' patch), although not with PHY resets done via phy_mii_ioctl()...
WBR, Sergei
PATCH v2 2/3 ARM: shmobile: Koelsch: add Ether support
Hi Sergei,
Quoted 66 lines · On Saturday 16 November 2013 00:28:32 Sergei Shtylyov wrote:
Quoted 22 lines · Laurent Pinchart
Quoted 22 lines
Register Ether platform device and pin data on the Koelsch board. Register platform fixup for Micrel KSZ8041 PHY, just like on the Lager board.
Signed-off-by Sergei Shtylyov <[email protected]>---
Changes in version 2:
- added *if* (IS_ENABLED(CONFIG_PHYLIB)) aroundphy_register_fixup_for_id()call;- changed Ether device name to "r8a779x-ether".
arch/arm/mach-shmobile/board-koelsch.c | 63 ++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-)Index:
renesas/arch/arm/mach-shmobile/board-koelsch.c
===================================================================arch/arm/mach-shmobile/board-koelsch.c +0
-0[...]
Quoted 31 lines
Quoted 31 lines
arch/arm/mach-shmobile/board-koelsch.c +2
-0@@ -84,6 +119,32 @@ static void __init koelsch_add_standard_ sizeof(koelsch_keys_pdata)); } +/* +* Ether LEDs on the Koelsch board are named LINK and ACTIVE which corresponds
+ * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits
+ * 14-15. We have to set them back to 01 from the default 00 value each time
+ * the PHY is reset. It's also important because the PHY's LED0 signal is
+ * connected to SoC'sETH_LINKsignal and in the PHY's default mode it will
+ * bounce on and off after each packet, which we apparently want to avoid.
+ */arch/arm/mach-shmobile/board-koelsch.c +13
-0+static int koelsch_ksz8041_fixup (struct phy_device *phydev) +{ +u16 phyctrl1 =phy_read (phydev,0x1e ); + + phyctrl1 &= ~0xc000 ; + phyctrl1 |=0x4000 ; +return phy_write (phydev,0x1e , phyctrl1); +} + +static void __init koelsch_init (void ) +{ +koelsch_add_standard_devices (); +Quoted 8 lines
arch/arm/mach-shmobile/board-koelsch.c
Quoted 3 lines
arch/arm/mach-shmobile/board-koelsch.c +3
-0+if (IS_ENABLED (CONFIG_PHYLIB )) +phy_register_fixup_for_id ("r8a779x-ether-ff:01" , + koelsch_ksz8041_fixup);This is fine with board code, but will break when we'll switch to DT. Would it be difficult to replace board code by using the existing micrel phy driver (
drivers/net/phy/micrel.c) which should support the ksz8041 already and
Quoted 3 lines
The first issue here is KSZ8041 on the BOCK-W/Lager/Koelsch boards uses undocumented PHY ID for some reason, so the current driver doesn't really support it. :-)
Right. Let's teach the KSZ8041 driver about that then :-)
Quoted 11 lines
Quoted 2 lines
extending it with support for register
0x1ewhich doesn't seem to be handled ?You probably didn't quite understand the purpose of the platform PHY fixup. It's designed to do the board-specific changes, not the driver-specific changes. In this case, the setting of the bits 14-15 of the PHY control register 1 (w/address
0x1E) purely depends on the board schematics and simply can't be selected by the PHY driver.It could have been set by the PHY driver iff we would find a way to pass the platform data to the PHY device (on the automatically probed MDIO bus).
That seems to me like the real issue we need to solve. The PHY clearly needs platform (or DT) data, so we need a way to pass it to the driver. Once we get that it shouldn't be difficult to add LED configuration information to the platform data.
Quoted 8 lines
We can also ignore
ETH_LINKsignal altogether in the 'sh_eth' driver (because it would bounce on/off on each packet) and stop caring about the LED function matching to what's designed for the board.Also we can stop resetting PHY in the '
sh_eth' driver -- that should help (the platform fixup was mainly added to work around this reset but DaveM didn't take my simple 'sh_eth' patch), although not with PHY resets done viaphy_mii_ioctl()...
Signature · 3 lines
Regards, Laurent Pinchart
PATCH v2 2/3 ARM: shmobile: Koelsch: add Ether support
Quoted 63 lines · Laurent Pinchart
Quoted 62 lines
Quoted 20 lines
Quoted 20 lines
Register Ether platform device and pin data on the Koelsch board. Register platform fixup for Micrel KSZ8041 PHY, just like on the Lager board.
Signed-off-by Sergei Shtylyov <[email protected]>---
Changes in version 2:
- added *if* (IS_ENABLED(CONFIG_PHYLIB)) aroundphy_register_fixup_for_id()call;- changed Ether device name to "r8a779x-ether".
arch/arm/mach-shmobile/board-koelsch.c | 63 ++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-)Index:
renesas/arch/arm/mach-shmobile/board-koelsch.c=================================>>>> ---renesas.orig/arch/arm/mach-shmobile/board-koelsch.c+++renesas/arch/arm/mach-shmobile/board-koelsch.c[...]
Quoted 39 lines
Quoted 24 lines
(quoted diff) +2
-0@@ -84,6 +119,32 @@ static void __init koelsch_add_standard_ sizeof(koelsch_keys_pdata)); } +/* + * Ether LEDs on the Koelsch board are named LINK and ACTIVE whichcorresponds
+ * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits
+ * 14-15. We have to set them back to 01 from the default 00 value each time
+ * the PHY is reset. It's also important because the PHY's LED0 signal is
+ * connected to SoC'sETH_LINKsignal and in the PHY's default mode it will
+ * bounce on and off after each packet, which we apparently want to avoid.
+ */(quoted diff) +6
-0+static int koelsch_ksz8041_fixup(struct phy_device *phydev) +{ + u16 phyctrl1 = phy_read(phydev, 0x1e); + + phyctrl1 &= ~0xc000; + phyctrl1 |= 0x4000;Review
Quoted 10 lines
(quoted diff) +10
-0+ return phy_write(phydev, 0x1e, phyctrl1); +} + +static void __init koelsch_init(void) +{ + koelsch_add_standard_devices(); + + if (IS_ENABLED(CONFIG_PHYLIB)) + phy_register_fixup_for_id("r8a779x-ether-ff:01", + koelsch_ksz8041_fixup);This is fine with board code, but will break when we'll switch to DT. Would it be difficult to replace board code by using the existing micrel phy driver (
drivers/net/phy/micrel.c) which should support the ksz8041 already and
Quoted 5 lines
Quoted 3 lines
The first issue here is KSZ8041 on the BOCK-W/Lager/Koelsch boards uses undocumented PHY ID for some reason, so the current driver doesn't really support it. :-)
Right. Let's teach the KSZ8041 driver about that then :-)
Well, this seems at least easy. :-)
Quoted 9 lines
Quoted 8 lines
Quoted 2 lines
extending it with support for register
0x1ewhich doesn't seem to be handled ?You probably didn't quite understand the purpose of the platform PHY fixup. It's designed to do the board-specific changes, not the driver-specific changes. In this case, the setting of the bits 14-15 of the PHY control register 1 (w/address
0x1E) purely depends on the board schematics and simply can't be selected by the PHY driver.
Quoted 7 lines
Quoted 2 lines
It could have been set by the PHY driver iff we would find a way to pass the platform data to the PHY device (on the automatically probed MDIO bus).
That seems to me like the real issue we need to solve. The PHY clearly needs platform (or DT) data, so we need a way to pass it to the driver. Once we get that it shouldn't be difficult to add LED configuration information to the platform data.
Well, with the PHY driver being DT-enabled somehow, it wouldn't be
difficult (though how to make phylib's automatic probing coexist with DT probing is not clear to me ATM). More difficult is to link the platform data to an automatically probed device; there were attempts on linux-usb to link the platform data to an USB device but that went nowhere IIRC... anyway, with the PHY platform fixups already in place we need to care only about the DT case really...
WBR, Sergei
PATCH v2 2/3 ARM: shmobile: Koelsch: add Ether support
Hi Sergei,
Quoted 90 lines · On Saturday 16 November 2013 04:32:42 Sergei Shtylyov wrote:
Quoted 63 lines · Laurent Pinchart
Quoted 63 lines
Quoted 20 lines
Quoted 20 lines
Register Ether platform device and pin data on the Koelsch board. Register platform fixup for Micrel KSZ8041 PHY, just like on the Lager board.
Signed-off-by Sergei Shtylyov <[email protected]>---
Changes in version 2:
- added *if* (IS_ENABLED(CONFIG_PHYLIB)) aroundphy_register_fixup_for_id()call;- changed Ether device name to "r8a779x-ether".
arch/arm/mach-shmobile/board-koelsch.c | 63 +++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-)Index:
renesas/arch/arm/mach-shmobile/board-koelsch.c
===================================================================arch/arm/mach-shmobile/board-koelsch.c +0
-0[...]
Quoted 39 lines
Quoted 24 lines
arch/arm/mach-shmobile/board-koelsch.c +2
-0@@ -84,6 +119,32 @@ static void __init koelsch_add_standard_ sizeof(koelsch_keys_pdata)); } +/* +* Ether LEDs on the Koelsch board are named LINK and ACTIVE which corresponds
+ * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits
+ * 14-15. We have to set them back to 01 from the default 00 value each time
+ * the PHY is reset. It's also important because the PHY's LED0 signal is
+ * connected to SoC'sETH_LINKsignal and in the PHY's default mode it will
+ * bounce on and off after each packet, which we apparently want to avoid.
+ */arch/arm/mach-shmobile/board-koelsch.c +6
-0+static int koelsch_ksz8041_fixup (struct phy_device *phydev) +{ +u16 phyctrl1 =phy_read (phydev,0x1e ); + + phyctrl1 &= ~0xc000 ; + phyctrl1 |=0x4000 ;arch/arm/mach-shmobile/board-koelsch.c
Quoted 10 lines
arch/arm/mach-shmobile/board-koelsch.c +10
-0+return phy_write (phydev,0x1e , phyctrl1); +} + +static void __init koelsch_init (void ) +{ +koelsch_add_standard_devices (); + +if (IS_ENABLED (CONFIG_PHYLIB )) +phy_register_fixup_for_id ("r8a779x-ether-ff:01" , + koelsch_ksz8041_fixup);This is fine with board code, but will break when we'll switch to DT. Would it be difficult to replace board code by using the existing micrel phy driver (
drivers/net/phy/micrel.c) which should support the ksz8041 already andQuoted 5 lines
Quoted 3 lines
The first issue here is KSZ8041 on the BOCK-W/Lager/Koelsch boards uses undocumented PHY ID for some reason, so the current driver doesn't really support it. :-)
Right. Let's teach the KSZ8041 driver about that then :-)
Well, this seems at least easy. :-)
Quoted 9 lines
Quoted 9 lines
Quoted 2 lines
extending it with support for register
0x1ewhich doesn't seem to be handled ?You probably didn't quite understand the purpose of the platform PHY fixup. It's designed to do the board-specific changes, not the driver- specific changes. In this case, the setting of the bits 14-15 of the PHY control register 1 (w/address
0x1E) purely depends on the board schematics and simply can't be selected by the PHY driver.Quoted 8 lines
Quoted 3 lines
It could have been set by the PHY driver iff we would find a way to pass the platform data to the PHY device (on the automatically probed MDIO bus).
That seems to me like the real issue we need to solve. The PHY clearly needs platform (or DT) data, so we need a way to pass it to the driver. Once we get that it shouldn't be difficult to add LED configuration information to the platform data.
Quoted 7 lines
Well, with the PHY driver being DT-enabled somehow, it wouldn't be difficult (though how to make phylib's automatic probing coexist with DT probing is not clear to me ATM). More difficult is to link the platform data to an automatically probed device; there were attempts on linux-usb to link the platform data to an USB device but that went nowhere IIRC... anyway, with the PHY platform fixups already in place we need to care only about the DT case really...
I agree, let's focus on the DT case, board code can use platform fixups for now.
Signature · 3 lines
Regards, Laurent Pinchart
PATCH v2 2/3 ARM: shmobile: Koelsch: add Ether support
Quoted 101 lines · Laurent Pinchart
Hi Sergei,
Quoted 90 lines · On Saturday 16 November 2013 04:32:42 Sergei Shtylyov wrote:
Quoted 63 lines · Laurent Pinchart
Quoted 63 lines
Quoted 20 lines
Quoted 20 lines
Register Ether platform device and pin data on the Koelsch board. Register platform fixup for Micrel KSZ8041 PHY, just like on the Lager board.
Signed-off-by Sergei Shtylyov <[email protected]>---
Changes in version 2:
- added *if* (IS_ENABLED(CONFIG_PHYLIB)) aroundphy_register_fixup_for_id()call;- changed Ether device name to "r8a779x-ether".
arch/arm/mach-shmobile/board-koelsch.c | 63 +++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-)Index:
renesas/arch/arm/mach-shmobile/board-koelsch.c
===================================================================arch/arm/mach-shmobile/board-koelsch.c +0
-0[...]
Quoted 39 lines
Quoted 24 lines
arch/arm/mach-shmobile/board-koelsch.c +2
-0@@ -84,6 +119,32 @@ static void __init koelsch_add_standard_ sizeof(koelsch_keys_pdata)); } +/* +* Ether LEDs on the Koelsch board are named LINK and ACTIVE which corresponds
+ * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits
+ * 14-15. We have to set them back to 01 from the default 00 value each time
+ * the PHY is reset. It's also important because the PHY's LED0 signal is
+ * connected to SoC'sETH_LINKsignal and in the PHY's default mode it will
+ * bounce on and off after each packet, which we apparently want to avoid.
+ */arch/arm/mach-shmobile/board-koelsch.c +6
-0+static int koelsch_ksz8041_fixup (struct phy_device *phydev) +{ +u16 phyctrl1 =phy_read (phydev,0x1e ); + + phyctrl1 &= ~0xc000 ; + phyctrl1 |=0x4000 ;arch/arm/mach-shmobile/board-koelsch.c
Quoted 10 lines
arch/arm/mach-shmobile/board-koelsch.c +10
-0+return phy_write (phydev,0x1e , phyctrl1); +} + +static void __init koelsch_init (void ) +{ +koelsch_add_standard_devices (); + +if (IS_ENABLED (CONFIG_PHYLIB )) +phy_register_fixup_for_id ("r8a779x-ether-ff:01" , + koelsch_ksz8041_fixup);This is fine with board code, but will break when we'll switch to DT. Would it be difficult to replace board code by using the existing micrel phy driver (
drivers/net/phy/micrel.c) which should support the ksz8041 already andQuoted 5 lines
Quoted 3 lines
The first issue here is KSZ8041 on the BOCK-W/Lager/Koelsch boards uses undocumented PHY ID for some reason, so the current driver doesn't really support it. :-)
Right. Let's teach the KSZ8041 driver about that then :-)
Well, this seems at least easy. :-)
Quoted 9 lines
Quoted 9 lines
Quoted 2 lines
extending it with support for register
0x1ewhich doesn't seem to be handled ?You probably didn't quite understand the purpose of the platform PHY fixup. It's designed to do the board-specific changes, not the driver- specific changes. In this case, the setting of the bits 14-15 of the PHY control register 1 (w/address
0x1E) purely depends on the board schematics and simply can't be selected by the PHY driver.Quoted 8 lines
Quoted 3 lines
It could have been set by the PHY driver iff we would find a way to pass the platform data to the PHY device (on the automatically probed MDIO bus).
That seems to me like the real issue we need to solve. The PHY clearly needs platform (or DT) data, so we need a way to pass it to the driver. Once we get that it shouldn't be difficult to add LED configuration information to the platform data.
Quoted 7 lines
Well, with the PHY driver being DT-enabled somehow, it wouldn't be difficult (though how to make phylib's automatic probing coexist with DT probing is not clear to me ATM). More difficult is to link the platform data to an automatically probed device; there were attempts on linux-usb to link the platform data to an USB device but that went nowhere IIRC... anyway, with the PHY platform fixups already in place we need to care only about the DT case really...
Quoted 2 lines
I agree, let's focus on the DT case, board code can use platform fixups for now.
FWIW, I agree with this approach.
PATCH v2 3/3 ARM: shmobile: Koelsch: enable Ether in defconfig
In reply to Sergei ShtylyovEnable the Ether driver in 'koelsch_defconfig' along with DHCP autoconfiguration and NFS root.
---
Changes in version 2:
- new patch in the series.
arch/arm/configs/koelsch_defconfig | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
Index: renesas/arch/arm/configs/koelsch_defconfig =================================--- renesas.orig/arch/arm/configs/koelsch_defconfig +++ renesas/arch/arm/configs/koelsch_defconfig
@@ -29,7 +29,27 @@ CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_PM_RUNTIME=y
+CONFIG_NET=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_CADENCE is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+CONFIG_SH_ETH=y
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_LEGACY_PTYS is not set
@@ -49,6 +69,8 @@ CONFIG_LEDS_CLASS=y
CONFIG_TMPFS=y
CONFIG_CONFIGFS_FS=y
# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
# CONFIG_ENABLE_MUST_CHECK is not set
# CONFIG_ARM_UNWIND is not set
PATCH v2 3/3 ARM: shmobile: Koelsch: enable Ether in defconfig
Quoted 4 lines · Sergei Shtylyov
Enable the Ether driver in '
koelsch_defconfig' along with DHCP autoconfiguration and NFS root.Signed-off-by Sergei Shtylyov <[email protected]>
Thanks.
I think it is also appropriate to remove these too.
To be hones their inclusion appears to have been an error on my part. And if nfsroot is being enabled it seems to be a good opportunity to get rid of them.
CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="../../initramfs/out/rootfs.arm.cpio" CONFIG_INITRAMFS_COMPRESSION_GZIP=y
Quoted 54 lines
---
Changes in version 2:
- new patch in the series.arch/arm/configs/koelsch_defconfig | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)Index: renesas/arch/arm/configs/koelsch_defconfig
===================================================================arch/arm/configs/koelsch_defconfig +22
-1@@ -29,7 +29,27 @@ CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM_RUNTIME=y +CONFIG_NET=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_NETDEVICES=y +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_CADENCE is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +CONFIG_SH_ETH=y +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_INPUT_MOUSEDEV_PSAUX is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_LEGACY_PTYS is not set@@ -49,6 +69,8 @@ CONFIG_LEDS_CLASS=y CONFIG_TMPFS=y CONFIG_CONFIGFS_FS=y # CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ARM_UNWIND is not set --To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 3/3 ARM: shmobile: Koelsch: enable Ether in defconfig
Hello.
Quoted 7 lines · Simon Horman
Quoted 4 lines
Enable the Ether driver in '
koelsch_defconfig' along with DHCP autoconfiguration and NFS root.Signed-off-by Sergei Shtylyov <[email protected]>Thanks.
Quoted 8 lines
I think it is also appropriate to remove these too.
To be hones their inclusion appears to have been an error on my part. And if nfsroot is being enabled it seems to be a good opportunity to get rid of them.
CONFIG_BLK_DEV_INITRD=yCONFIG_INITRAMFS_SOURCE="../../initramfs/out/rootfs.arm.cpio"CONFIG_INITRAMFS_COMPRESSION_GZIP=y
Hm, where are you seeing these? Tag renesas-devel-v3.12-20131112 doesn't
contain anything similar...
WBR, Sergei
PATCH v2 3/3 ARM: shmobile: Koelsch: enable Ether in defconfig
Quoted 16 lines · Sergei Shtylyov
Hello.
Quoted 11 lines · Simon Horman
Quoted 4 lines
Enable the Ether driver in '
koelsch_defconfig' along with DHCP autoconfiguration and NFS root.Signed-off-by Sergei Shtylyov <[email protected]>Thanks.
I think it is also appropriate to remove these too.
To be hones their inclusion appears to have been an error on my part. And if nfsroot is being enabled it seems to be a good opportunity to get rid of them.
Quoted 6 lines
Quoted 3 lines
CONFIG_BLK_DEV_INITRD=yCONFIG_INITRAMFS_SOURCE="../../initramfs/out/rootfs.arm.cpio"CONFIG_INITRAMFS_COMPRESSION_GZIP=yHm, where are you seeing these? Tag renesas-devel-v3.12-20131112
doesn't contain anything similar...
Sorry, please ignore the noise.
I must have been looking at a local version by mistake.