net/fec: add dual fec support for i.MX28
Subsystems (5)
v4 cover net/fec: add dual fec support for i.MX28
This patch series is to add dual fec support for mx28, which is a mxs-based soc. Some code changes related to the following commits are also made in this patch set for some reasons.
e6b043d512fa8d9a3801bf5d72bfa3b8fc3b3cc8
netdev/fec.c: add phylib supporting to enable carrier detection (v2)
e3fe8558c7fc182972c3d947d88744482111f304
net/fec: fix pm to survive to suspend/resume
It's been tested on mx28 evk and mx51 babbage. For mx28, it has to work against the tree
git://git.pengutronix.de/git/imx/linux-2.6.git imx-for-2.6.38
plus patch
[PATCH v4] ARM: mxs: Change duart device to use amba-pl011
The 3 patches below preceding with * have changes since v3, and the detailed change log can be found in individual patch.
[PATCH v4 01/10] net/fec: fix MMFR_OP type in fec_enet_mdio_write
[PATCH v4 02/10] net/fec: remove the use of "index" which is legacy [PATCH v4 03/10] net/fec: add mac field into platform data and consolidate fec_get_mac [PATCH v4 04/10] net/fec: improve pm for better suspend/resume
*[PATCH v4 05/10] net/fec: add dual fec support for mx28
*[PATCH v4 06/10] ARM: mx28: update clock and device name for dual fec support
[PATCH v4 07/10] ARM: mx28: add the second fec device registration
*[PATCH v4 08/10] ARM: mxs: add ocotp read function
[PATCH v4 09/10] ARM: mx28: read fec mac address from ocotp
[PATCH v4 10/10] ARM: mxs: add initial pm support
Thanks for the review.
Regards,
Shawn
PATCH v4 1/10 net/fec: fix MMFR_OP type in fec_enet_mdio_write
FEC_MMFR_OP_WRITE should be used than FEC_MMFR_OP_READ in a mdio write operation.
It's probably a typo introduced by commit:
e6b043d512fa8d9a3801bf5d72bfa3b8fc3b3cc8netdev/fec.c: add phylib supporting to enable carrier detection (v2)
--- drivers/net/fec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/fec.c +2 -2
@@ -651,8 +651,8 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum, fep->mii_timeout =0 ;init_completion (&fep->mdio_done); -/* start a read op */ -writel (FEC_MMFR_ST |FEC_MMFR_OP_READ | +/* start a write op */ +writel (FEC_MMFR_ST |FEC_MMFR_OP_WRITE |FEC_MMFR_PA (mii_id) |FEC_MMFR_RA (regnum) |FEC_MMFR_TA |FEC_MMFR_DATA (value), fep->hwp +FEC_MII_DATA );
Signature · 1 line
1.7.1
PATCH v4 2/10 net/fec: remove the use of "index" which is legacy
In reply to Shawn GuoThe "index" becomes legacy since fep->pdev->id starts working to identify the instance.
Moreover, the call of fec_enet_init(ndev, 0) always passes 0 to fep->index. This makes the following code in fec_get_mac buggy.
/* Adjust MAC if using default MAC address */ if (iap == fec_mac_default) dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
It may be the time to remove "index" and use fep->pdev->id instead.
--- drivers/net/fec.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
drivers/net/fec.c +3 -6
@@ -186,7 +186,6 @@ struct fec_enet_private {int mii_timeout;uint phy_speed;phy_interface_t phy_interface; -int index;int link;int full_duplex;struct completion mdio_done;
@@ -566,7 +565,7 @@ static void __inline__ fec_get_mac(struct net_device *dev)/* Adjust MAC if using default MAC address */ if (iap == fec_mac_default) - dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; + dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->pdev->id; }#endif
@@ -1067,9 +1066,8 @@ static const struct net_device_ops fec_netdev_ops = {/* * XXX: We need to clean up on failure exits here. * -* index is only used in legacy code */ -static int fec_enet_init (struct net_device *dev,int index) +static int fec_enet_init (struct net_device *dev) {struct fec_enet_private *fep =netdev_priv (dev);struct bufdesc *cbd_base;
@@ -1086,7 +1084,6 @@ static int fec_enet_init(struct net_device *dev, int index)spin_lock_init (&fep->hw_lock); - fep->index = index; fep->hwp = (void __iomem *)dev->base_addr; fep->netdev = dev;
@@ -1316,7 +1313,7 @@ fec_probe(struct platform_device *pdev) }clk_enable (fep->clk); - ret =fec_enet_init (ndev,0 ); + ret =fec_enet_init (ndev);if (ret) goto failed_init;
Signature · 1 line
1.7.1
PATCH v4 3/10 net/fec: add mac field into platform data and consolidate fec_get_mac
In reply to Shawn GuoAdd mac field into fec_platform_data and consolidate function fec_get_mac to get mac address in following order.
1) module parameter via kernel command line fec.macaddr=0x00,0x04,...
2) from flash in case of CONFIG_M5272 or fec_platform_data mac field for others, which typically have mac stored in fuse
3) fec mac address registers set by bootloader
---
Changes for v3:
- Use module parameter than new kernel command line to pass mac address
- Change variable name and comment to remove confusing word "default"
- Fix copyright breakage in fec.h
drivers/net/fec.c | 81 ++++++++++++++++++++++++--------------------------- include/linux/fec.h | 3 ++ 2 files changed, 41 insertions(+), 43 deletions(-)
drivers/net/fec.c +38 -43
@@ -59,15 +59,11 @@#define FEC_ALIGNMENT 0x3#endif -/* -* Define the fixed address of the FEC hardware. -*/ -#if defined(CONFIG_M5272 ) - -static unsigned char fec_mac_default[] = { -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -}; +static unsigned char macaddr[ETH_ALEN ]; +module_param_array (macaddr, byte,NULL ,0 ); +MODULE_PARM_DESC (macaddr,"FEC Ethernet MAC address" ); +#if defined(CONFIG_M5272 )/* * Some hardware gets it MAC address out of local flash memory. * if this is non-zero then assume it is the address to get MAC from.
@@ -537,37 +533,50 @@ rx_processing_done: }/* ------------------------------------------------------------------------- */ -#ifdef CONFIG_M5272 static void __inline__fec_get_mac (struct net_device *dev) {struct fec_enet_private *fep =netdev_priv (dev); +struct fec_platform_data *pdata = fep->pdev->dev.platform_data;unsigned char *iap, tmpaddr[ETH_ALEN ]; -if (FEC_FLASHMAC ) { -/* -* Get MAC address from FLASH. -* If it is all 1's or 0's, use the default. -*/ - iap = (unsigned char *)FEC_FLASHMAC ; -if ((iap[0 ] ==0 ) && (iap[1 ] ==0 ) && (iap[2 ] ==0 ) && - (iap[3 ] ==0 ) && (iap[4 ] ==0 ) && (iap[5 ] ==0 )) - iap = fec_mac_default; -if ((iap[0 ] ==0xff ) && (iap[1 ] ==0xff ) && (iap[2 ] ==0xff ) && - (iap[3 ] ==0xff ) && (iap[4 ] ==0xff ) && (iap[5 ] ==0xff )) - iap = fec_mac_default; - }else { - *((unsigned long *) &tmpaddr[0 ]) =readl (fep->hwp +FEC_ADDR_LOW ); - *((unsigned short *) &tmpaddr[4 ]) = (readl (fep->hwp +FEC_ADDR_HIGH ) >>16 ); +/* +* try to get mac address in following order: +* +* 1) module parameter via kernel command line in form +* fec.macaddr=0x00,0x04,0x9f,0x01,0x30,0xe0 +*/ + iap = macaddr; + +/* +* 2) from flash or fuse (via platform data) +*/ +if (!is_valid_ether_addr (iap)) { +#ifdef CONFIG_M5272 +if (FEC_FLASHMAC ) + iap = (unsigned char *)FEC_FLASHMAC ; +#else +if (pdata) +memcpy (iap, pdata->mac,ETH_ALEN ); +#endif + } + +/* +* 3) FEC mac registers set by bootloader +*/ +if (!is_valid_ether_addr (iap)) { + *((unsigned long *) &tmpaddr[0 ]) = +be32_to_cpu (readl (fep->hwp +FEC_ADDR_LOW )); + *((unsigned short *) &tmpaddr[4 ]) = +be16_to_cpu (readl (fep->hwp +FEC_ADDR_HIGH ) >>16 ); iap = &tmpaddr[0 ]; }memcpy (dev->dev_addr, iap,ETH_ALEN ); -/* Adjust MAC if using default MAC address */ -if (iap == fec_mac_default) - dev->dev_addr[ETH_ALEN -1 ] = fec_mac_default[ETH_ALEN -1 ] + fep->pdev->id; +/* Adjust MAC if using macaddr */ +if (iap == macaddr) + dev->dev_addr[ETH_ALEN -1 ] = macaddr[ETH_ALEN -1 ] + fep->pdev->id; } -#endif /* ------------------------------------------------------------------------- */
@@ -1087,22 +1096,8 @@ static int fec_enet_init(struct net_device *dev) fep->hwp = (void __iomem *)dev->base_addr; fep->netdev = dev; -/* Set the Ethernet address */ -#ifdef CONFIG_M5272 +/* Get the Ethernet address */ fec_get_mac (dev); -#else - { -unsigned long l; - l =readl (fep->hwp +FEC_ADDR_LOW ); - dev->dev_addr[0 ] = (unsigned char )((l &0xFF000000 ) >>24 ); - dev->dev_addr[1 ] = (unsigned char )((l &0x00FF0000 ) >>16 ); - dev->dev_addr[2 ] = (unsigned char )((l &0x0000FF00 ) >>8 ); - dev->dev_addr[3 ] = (unsigned char )((l &0x000000FF ) >>0 ); - l =readl (fep->hwp +FEC_ADDR_HIGH ); - dev->dev_addr[4 ] = (unsigned char )((l &0xFF000000 ) >>24 ); - dev->dev_addr[5 ] = (unsigned char )((l &0x00FF0000 ) >>16 ); - } -#endif /* Set receive and transmit descriptor base. */ fep->rx_bd_base = cbd_base;
include/linux/fec.h +3 -0
@@ -3,6 +3,8 @@* Copyright (c) 2009 Orex Computed Radiography * Baruch Siach <[email protected]> * +* Copyright (C) 2010 Freescale Semiconductor, Inc. +* * Header file for the FEC platform data * * This program is free software; you can redistribute it and/or modify
@@ -16,6 +18,7 @@struct fec_platform_data {phy_interface_t phy; +unsigned char mac[ETH_ALEN ]; };#endif
Signature · 1 line
1.7.1
PATCH v4 4/10 net/fec: improve pm for better suspend/resume
In reply to Shawn GuoThe following commit made a fix to use fec_enet_open/fec_enet_close over fec_enet_init/fec_stop for suspend/resume, because fec_enet_init does not allow to have a working network interface at resume.
e3fe8558c7fc182972c3d947d88744482111f304
net/fec: fix pm to survive to suspend/resume
This fix works for i.mx/mxc fec controller, but fails on mx28 fec which gets a different interrupt logic design. On i.mx fec, interrupt can be triggered even bit ETHER_EN of ECR register is not set. But on mx28 fec, ETHER_EN must be set to get interrupt work. Meanwhile, MII interrupt is mandatory to resume the driver, because MDIO read/write changed to interrupt mode by commit below.
97b72e4320a9aaa4a7f1592ee7d2da7e2c9bd349
fec: use interrupt for MDIO completion indication
fec_restart/fec_stop comes out as the solution working for both cases.
--- drivers/net/fec.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
drivers/net/fec.c +8 -4
@@ -1372,8 +1372,10 @@ fec_suspend(struct device *dev)if (ndev) { fep =netdev_priv (ndev); -if (netif_running (ndev)) -fec_enet_close (ndev); +if (netif_running (ndev)) { +fec_stop (ndev); +netif_device_detach (ndev); + }clk_disable (fep->clk); }return 0 ;
@@ -1388,8 +1390,10 @@ fec_resume(struct device *dev)if (ndev) { fep =netdev_priv (ndev);clk_enable (fep->clk); -if (netif_running (ndev)) -fec_enet_open (ndev); +if (netif_running (ndev)) { +fec_restart (ndev, fep->full_duplex); +netif_device_attach (ndev); + } }return 0 ; }
Signature · 1 line
1.7.1
PATCH v4 5/10 net/fec: add dual fec support for mx28
In reply to Shawn GuoThis patch is to add mx28 dual fec support. Here are some key notes for mx28 fec controller.
- The mx28 fec controller naming ENET-MAC is a different IP from FEC used on other i.mx variants. But they are basically compatible on software interface, so it's possible to share the same driver.
- ENET-MAC design on mx28 made an improper assumption that it runs on a big-endian system. As the result, driver has to swap every frame going to and coming from the controller.
- The external phys can only be configured by fec0, which means fec1 can not work independently and both phys need to be configured by mii_bus attached on fec0.
- ENET-MAC reset will get mac address registers reset too.
- ENET-MAC MII/RMII mode and 10M/100M speed are configured differently FEC.
- ETHER_EN bit must be set to get ENET-MAC interrupt work.
---
Changes for v4:
- Use #ifndef CONFIG_ARM to include ColdFire header files
- Define quirk bits in id_entry.driver_data to handle controller difference, which is more scalable than using device name
- Define fec0_mii_bus as a static function in fec_enet_mii_init to fold the mii_bus instance attached on fec0
- Use cpu_to_be32 over __swab32 in function swap_buffer
Changes for v3:
- Move v2 changes into patch #3
- Use device name to check if it's running on ENET-MAC
drivers/net/Kconfig | 7 ++- drivers/net/fec.c | 148 +++++++++++++++++++++++++++++++++++++++++++++------ drivers/net/fec.h | 5 +- 3 files changed, 139 insertions(+), 21 deletions(-)
drivers/net/Kconfig +4 -3
@@ -1944,18 +1944,19 @@ config 68360_ENET config FEC bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ - MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 + MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28 select PHYLIB help Say Y here if you want to use the built-in 10/100 Fast ethernet controller on some Motorola ColdFire and Freescale i.MX processors. config FEC2 - bool "Second FEC ethernet controller (on some ColdFire CPUs)" + bool "Second FEC ethernet controller" depends on FEC help Say Y here if you want to use the second built-in 10/100 Fast - ethernet controller on some Motorola ColdFire processors. + ethernet controller on some Motorola ColdFire and Freescale + i.MX processors. config FEC_MPC52xx tristate "MPC52xx FEC driver"
drivers/net/fec.c +132 -16
265 lines not on this page · raw message
drivers/net/fec.h +3 -2
@@ -14,7 +14,8 @@/****************************************************************************/ #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ - defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARCH_MXC ) + defined(CONFIG_M520x) || defined(CONFIG_M532x) || \ + defined(CONFIG_ARCH_MXC ) || defined(CONFIG_SOC_IMX28 )/* * Just figures, Motorola would have to change the offsets for * registers in the same peripheral device on different models
@@ -78,7 +79,7 @@/* * Define the buffer descriptor structure. */ -#ifdef CONFIG_ARCH_MXC +#if defined(CONFIG_ARCH_MXC) || defined(CONFIG_SOC_IMX28) struct bufdesc { unsigned short cbd_datlen; /* Data length */ unsigned short cbd_sc; /* Control and status info */
Signature · 1 line
1.7.1
Sascha Hauer
maintainerRe: [PATCH v4 05/10] net/fec: add dual fec support for mx28
Quoted 50 lines · Shawn Guo
This patch is to add mx28 dual fec support. Here are some key notes for mx28 fec controller.
- The mx28 fec controller naming ENET-MAC is a different IP from FEC used on other i.mx variants. But they are basically compatible on software interface, so it's possible to share the same driver.
- ENET-MAC design on mx28 made an improper assumption that it runs on a big-endian system. As the result, driver has to swap every frame going to and coming from the controller.
- The external phys can only be configured by fec0, which means fec1 can not work independently and both phys need to be configured bymii_busattached on fec0.
- ENET-MAC reset will get mac address registers reset too.
- ENET-MAC MII/RMII mode and 10M/100M speed are configured differently FEC.
-ETHER_ENbit must be set to get ENET-MAC interrupt work.Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Use #ifndefCONFIG_ARMto include ColdFire header files
- Define quirk bits in id_entry.driver_data to handle controller difference, which is more scalable than using device name
- Definefec0_mii_busas a static function infec_enet_mii_initto fold themii_businstance attached on fec0
- Usecpu_to_be32over__swab32in functionswap_bufferChanges for v3:
- Move v2 changes into patch #3
- Use device name to check if it's running on ENET-MACdrivers/net/Kconfig | 7 ++- drivers/net/fec.c | 148 +++++++++++++++++++++++++++++++++++++++++++++------ drivers/net/fec.h | 5 +- 3 files changed, 139 insertions(+), 21 deletions(-)drivers/net/Kconfig +1
-1@@ -1944,18 +1944,19 @@ config 68360_ENET config FEC bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ - MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 + MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28 select PHYLIB help Say Y here if you want to use the built-in 10/100 Fast ethernet controller on some Motorola ColdFire and Freescale i.MX processors.
drivers/net/Kconfig config 68360_ENET · line 1959
Quoted 10 lines
drivers/net/Kconfig +3
-2config FEC2 - bool "Second FEC ethernet controller (on some ColdFire CPUs)" + bool "Second FEC ethernet controller" depends on FEC help Say Y here if you want to use the second built-in 10/100 Fast - ethernet controller on some Motorola ColdFire processors. + ethernet controller on some Motorola ColdFire and Freescale + i.MX processors.
This option is used nowhere and should be removed. Certainly it does not have the effect of enabling the second ethernet controller.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
Quoted 52 lines · Sascha Hauer
Quoted 51 lines · Shawn Guo
This patch is to add mx28 dual fec support. Here are some key notes for mx28 fec controller.
- The mx28 fec controller naming ENET-MAC is a different IP from FEC used on other i.mx variants. But they are basically compatible on software interface, so it's possible to share the same driver.
- ENET-MAC design on mx28 made an improper assumption that it runs on a big-endian system. As the result, driver has to swap every frame going to and coming from the controller.
- The external phys can only be configured by fec0, which means fec1 can not work independently and both phys need to be configured bymii_busattached on fec0.
- ENET-MAC reset will get mac address registers reset too.
- ENET-MAC MII/RMII mode and 10M/100M speed are configured differently FEC.
-ETHER_ENbit must be set to get ENET-MAC interrupt work.Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Use #ifndefCONFIG_ARMto include ColdFire header files
- Define quirk bits in id_entry.driver_data to handle controller difference, which is more scalable than using device name
- Definefec0_mii_busas a static function infec_enet_mii_initto fold themii_businstance attached on fec0
- Usecpu_to_be32over__swab32in functionswap_bufferChanges for v3:
- Move v2 changes into patch #3
- Use device name to check if it's running on ENET-MACdrivers/net/Kconfig | 7 ++- drivers/net/fec.c | 148 +++++++++++++++++++++++++++++++++++++++++++++------ drivers/net/fec.h | 5 +- 3 files changed, 139 insertions(+), 21 deletions(-)drivers/net/Kconfig +1
-1@@ -1944,18 +1944,19 @@ config 68360_ENET config FEC bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ - MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 + MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28 select PHYLIB help Say Y here if you want to use the built-in 10/100 Fast ethernet controller on some Motorola ColdFire and Freescale i.MX processors.
Quoted 13 lines
drivers/net/Kconfig config 68360_ENET · line 1959
Quoted 9 lines
drivers/net/Kconfig +3
-2config FEC2 - bool "Second FEC ethernet controller (on some ColdFire CPUs)" + bool "Second FEC ethernet controller" depends on FEC help Say Y here if you want to use the second built-in 10/100 Fast - ethernet controller on some Motorola ColdFire processors. + ethernet controller on some Motorola ColdFire and Freescale + i.MX processors.This option is used nowhere and should be removed. Certainly it does not have the effect of enabling the second ethernet controller.
As David has merged it, I would send a follow-up patch to remove it.
Signature · 2 lines
Regards, Shawn
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
In reply to Sascha HauerQuoted 52 lines · Sascha Hauer
Quoted 51 lines · Shawn Guo
This patch is to add mx28 dual fec support. Here are some key notes for mx28 fec controller.
- The mx28 fec controller naming ENET-MAC is a different IP from FEC used on other i.mx variants. But they are basically compatible on software interface, so it's possible to share the same driver.
- ENET-MAC design on mx28 made an improper assumption that it runs on a big-endian system. As the result, driver has to swap every frame going to and coming from the controller.
- The external phys can only be configured by fec0, which means fec1 can not work independently and both phys need to be configured bymii_busattached on fec0.
- ENET-MAC reset will get mac address registers reset too.
- ENET-MAC MII/RMII mode and 10M/100M speed are configured differently FEC.
-ETHER_ENbit must be set to get ENET-MAC interrupt work.Signed-off-by Shawn Guo<[email protected]>---
Changes for v4:
- Use #ifndefCONFIG_ARMto include ColdFire header files
- Define quirk bits in id_entry.driver_data to handle controller difference, which is more scalable than using device name
- Definefec0_mii_busas a static function infec_enet_mii_initto fold themii_businstance attached on fec0
- Usecpu_to_be32over__swab32in functionswap_bufferChanges for v3:
- Move v2 changes into patch #3
- Use device name to check if it's running on ENET-MACdrivers/net/Kconfig | 7 ++- drivers/net/fec.c | 148 +++++++++++++++++++++++++++++++++++++++++++++------ drivers/net/fec.h | 5 +- 3 files changed, 139 insertions(+), 21 deletions(-)drivers/net/Kconfig +1
-1@@ -1944,18 +1944,19 @@ config 68360_ENET config FEC bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ - MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 + MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28 select PHYLIB help Say Y here if you want to use the built-in 10/100 Fast ethernet controller on some Motorola ColdFire and Freescale i.MX processors.
Quoted 12 lines
drivers/net/Kconfig config 68360_ENET · line 1959
Quoted 9 lines
drivers/net/Kconfig +3
-2config FEC2 - bool "Second FEC ethernet controller (on some ColdFire CPUs)" + bool "Second FEC ethernet controller" depends on FEC help Say Y here if you want to use the second built-in 10/100 Fast - ethernet controller on some Motorola ColdFire processors. + ethernet controller on some Motorola ColdFire and Freescale + i.MX processors.This option is used nowhere and should be removed. Certainly it does not have the effect of enabling the second ethernet controller.
It does for a ColdFire platform...
grep -r CONFIG_FEC2 *
arch/m68knommu/configs/m5275evb_defconfig:CONFIG_FEC2=y arch/m68knommu/platform/527x/config.c:#ifdef CONFIG_FEC2 arch/m68knommu/platform/527x/config.c:#ifdef CONFIG_FEC2
Regards
Greg
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg at snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close, FAX: +61 7 3891 3630 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
Hi Greg,
Quoted 5 lines · Greg Ungerer
Quoted 3 lines · Sascha Hauer
On Thu, Jan 06, 2011 at 03:13:13PM +0800, Shawn Guo wrote:
This option is used nowhere and should be removed. Certainly it does not have the effect of enabling the second ethernet controller.
Quoted 7 lines
It does for a ColdFire platform...
grep -r
CONFIG_FEC2*arch/m68knommu/configs/m5275evb_defconfig:CONFIG_FEC2=y arch/m68knommu/platform/527x/config.c:#ifdef
CONFIG_FEC2arch/m68knommu/platform/527x/config.c:#ifdefCONFIG_FEC2
IMHO Sascha's comment[1] applies here, too.
And someone might want to do what he suggested soon or the patch removing CONFIG_FEC2[2] needs to be commented accordingly.
Best regards
Uwe
[1] http://thread.gmane.org/gmane.linux.network/182929/focus=183378
[2] http://mid.gmane.org/1294747672-4433-1-git-send-email-shawn.guo at freescale.com
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
Hi Uwe,
Quoted 8 lines · Uwe Kleine-K?nig
Hi Greg,
Quoted 5 lines · Greg Ungerer
Quoted 3 lines · Sascha Hauer
On Thu, Jan 06, 2011 at 03:13:13PM +0800, Shawn Guo wrote:
This option is used nowhere and should be removed. Certainly it does not have the effect of enabling the second ethernet controller.
Quoted 8 lines
Quoted 7 lines
It does for a ColdFire platform...
grep -r
CONFIG_FEC2*arch/m68knommu/configs/m5275evb_defconfig:CONFIG_FEC2=y arch/m68knommu/platform/527x/config.c:#ifdef
CONFIG_FEC2arch/m68knommu/platform/527x/config.c:#ifdefCONFIG_FEC2IMHO Sascha's comment[1] applies here, too.
I am not arguing that it doesn't :-)
Simply that removing that config option and doing nothing else would not be the right thing to do.
Regards
Greg
Quoted 9 lines
And someone might want to do what he suggested soon or the patch removing CONFIG_FEC2[2] needs to be commented accordingly.
Best regards
Uwe[1] http://thread.gmane.org/gmane.linux.network/182929/focus=183378
[2] http://mid.gmane.org/1294747672-4433-1-git-send-email-shawn.guo at freescale.com
Signature · 5 lines
------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg at snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close, FAX: +61 7 3891 3630 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
Hi Greg,
Quoted 16 lines · Greg Ungerer
Quoted 6 lines · Uwe Kleine-K?nig
Quoted 5 lines · Greg Ungerer
Quoted 3 lines · Sascha Hauer
On Thu, Jan 06, 2011 at 03:13:13PM +0800, Shawn Guo wrote:
This option is used nowhere and should be removed. Certainly it does not have the effect of enabling the second ethernet controller.Quoted 8 lines
Quoted 7 lines
It does for a ColdFire platform...
grep -r
CONFIG_FEC2*arch/m68knommu/configs/m5275evb_defconfig:CONFIG_FEC2=y arch/m68knommu/platform/527x/config.c:#ifdef
CONFIG_FEC2arch/m68knommu/platform/527x/config.c:#ifdefCONFIG_FEC2IMHO Sascha's comment[1] applies here, too.
Quoted 11 lines
I am not arguing that it doesn't :-)
Simply that removing that config option and doing nothing else would not be the right thing to do.
Regards
GregQuoted 2 lines
And someone might want to do what he suggested soon or the patch removing CONFIG_FEC2[2] needs to be commented accordingly.
note that davem took the patch removing CONFIG_FEC2 now.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
In reply to Shawn GuoHello,
hmm, this review comes to late, probably I will post a follow-up patch for the low-hanging fruits at least.
Quoted 17 lines · Shawn Guo
This patch is to add mx28 dual fec support. Here are some key notes for mx28 fec controller.
- The mx28 fec controller naming ENET-MAC is a different IP from FEC used on other i.mx variants. But they are basically compatible on software interface, so it's possible to share the same driver.
- ENET-MAC design on mx28 made an improper assumption that it runs on a big-endian system. As the result, driver has to swap every frame going to and coming from the controller.
- The external phys can only be configured by fec0, which means fec1 can not work independently and both phys need to be configured bymii_busattached on fec0.
- ENET-MAC reset will get mac address registers reset too.
- ENET-MAC MII/RMII mode and 10M/100M speed are configured differently FEC.
-ETHER_ENbit must be set to get ENET-MAC interrupt work.
Quoted 4 lines
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Use #ifndefCONFIG_ARMto include ColdFire header files
I intended you to not use CONFIG_ARCH_MXS at all, at least up to now CONFIG_ARM works quite well.
Quoted 4 lines
- Define quirk bits in id_entry.driver_data to handle controller difference, which is more scalable than using device name
- Definefec0_mii_busas a static function infec_enet_mii_initto fold themii_businstance attached on fec0
IMHO not very good. At least the current code doesn't allow to have two dual-fecs, because the 2nd dual-fec's slave would be attached to the 1st dual-fec's mii_bus. Don't know a nice solution though. Probably you either need a slave pointer in platform_data or have to treat a dual-fec as only a single device.
Quoted 16 lines
- Use
cpu_to_be32over__swab32in functionswap_bufferChanges for v3:
- Move v2 changes into patch #3
- Use device name to check if it's running on ENET-MACdrivers/net/Kconfig | 7 ++- drivers/net/fec.c | 148 +++++++++++++++++++++++++++++++++++++++++++++------ drivers/net/fec.h | 5 +- 3 files changed, 139 insertions(+), 21 deletions(-)drivers/net/Kconfig +0
-0
drivers/net/Kconfig config 68360_ENET · line 1947
Quoted 5 lines
drivers/net/Kconfig +1
-1@@ -1944,18 +1944,19 @@ config 68360_ENET config FEC bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ - MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 + MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28
IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC ? Again this calls for a more global approach for these registration facilities.
Quoted 44 lines
drivers/net/Kconfig +3
-2select PHYLIB help Say Y here if you want to use the built-in 10/100 Fast ethernet controller on some Motorola ColdFire and Freescale i.MX processors. config FEC2 - bool "Second FEC ethernet controller (on some ColdFire CPUs)" + bool "Second FEC ethernet controller" depends on FEC help Say Y here if you want to use the second built-in 10/100 Fast - ethernet controller on some Motorola ColdFire processors. + ethernet controller on some Motorola ColdFire and Freescale + i.MX processors. config FEC_MPC52xx tristate "MPC52xx FEC driver"drivers/net/fec.c +3
-3@@ -17,6 +17,8 @@* * Bug fixes and cleanup by Philippe De Muyter (phdm at macqel.be) * Copyright (c) 2004-2006 Macq Electronique SA. +* +* Copyright (C) 2010 Freescale Semiconductor, Inc. */ #include <linux/module.h> @@ -45,20 +47,36 @@#include <asm/cacheflush.h> -#ifndef CONFIG_ARCH_MXC +#ifndef CONFIG_ARM #include <asm/coldfire.h> #include <asm/mcfsim.h> #endif #include "fec.h" -#ifdef CONFIG_ARCH_MXC -#include <mach/hardware.h>
drivers/net/fec.c line 66
Quoted 10 lines
drivers/net/fec.c +5
-0+#if defined(CONFIG_ARCH_MXC ) || defined(CONFIG_SOC_IMX28 )#define FEC_ALIGNMENT 0xf#else #define FEC_ALIGNMENT 0x3#endif +#define DRIVER_NAME "fec" + +/* Controller is ENET-MAC */ +#define FEC_QUIRK_ENET_MAC (1 << 0)
does this really qualify to be a quirk?
drivers/net/fec.c line 68
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller needs driver to swap frame */ +#define FEC_QUIRK_SWAP_FRAME (1 << 1)
IMHO this is a bit misnamed. FEC_QUIRK_NEEDS_BE_DATA or similar would be more accurate.
Quoted 14 lines
drivers/net/fec.c +10
-0+static struct platform_device_id fec_devtype[] = { + { + .name =DRIVER_NAME , + .driver_data =0 , + }, { + .name ="imx28-fec" , + .driver_data =FEC_QUIRK_ENET_MAC |FEC_QUIRK_SWAP_FRAME , + } +}; +static unsigned char macaddr[ETH_ALEN ];module_param_array (macaddr, byte,NULL ,0 );MODULE_PARM_DESC (macaddr,"FEC Ethernet MAC address" );
drivers/net/fec.c MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); · line 151
Quoted 6 lines
drivers/net/fec.c +2
-1@@ -129,7 +147,8 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");* account when setting it. */ #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ - defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARCH_MXC ) + defined(CONFIG_M520x) || defined(CONFIG_M532x) || \ + defined(CONFIG_ARCH_MXC ) || defined(CONFIG_SOC_IMX28 )
I wonder what is excluded here. FEC depends on
M523x || M527x || M5272 || M528x || M520x || M532x || \ MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28
so the only difference is that the latter lists M5272 which seems a bit redundant in the presence of M527x.
Quoted 4 lines
drivers/net/fec.c +0
-0#define OPT_FRAME_SIZE (PKT_MAXBUF_SIZE << 16)#else #define OPT_FRAME_SIZE 0
drivers/net/fec.c static void fec_stop(struct net_device *dev); · line 236
Quoted 10 lines
drivers/net/fec.c +7
-0@@ -208,10 +227,23 @@ static void fec_stop(struct net_device *dev);/* Transmitter timeout */ #define TX_TIMEOUT (2 * HZ) +static void *swap_buffer (void *bufaddr,int len) +{ +int i; +unsigned int *buf = bufaddr; + +for (i =0 ; i < (len +3 ) /4 ; i++, buf++) + *buf =cpu_to_be32 (*buf);
if len isn't a multiple of 4 this accesses bytes behind len. Is this generally OK here? (E.g. because skbs always have a length that is a multiple of 4?)
Quoted 85 lines
drivers/net/fec.c +35
-0+ +return bufaddr; +} +static netdev_tx_t fec_enet_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct fec_enet_private *fep =netdev_priv (dev); +const struct platform_device_id *id_entry = +platform_get_device_id (fep->pdev);struct bufdesc *bdp;void *bufaddr;unsigned short status;@@ -256,6 +288,14 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) bufaddr = fep->tx_bounce[index]; } +/* +* Some design made an incorrect assumption on endian mode of +* the system that it's running on. As the result, driver has to +* swap every frame going to and coming from the controller. +*/ +if (id_entry->driver_data &FEC_QUIRK_SWAP_FRAME ) +swap_buffer (bufaddr, skb->len); +/* Save skb pointer */ fep->tx_skbuff[fep->skb_cur] = skb;@@ -424,6 +464,8 @@ static void fec_enet_rx(struct net_device *dev) {struct fec_enet_private *fep =netdev_priv (dev); +const struct platform_device_id *id_entry = +platform_get_device_id (fep->pdev);struct bufdesc *bdp;unsigned short status;struct sk_buff *skb;@@ -487,6 +529,9 @@ fec_enet_rx(struct net_device *dev)dma_unmap_single (NULL , bdp->cbd_bufaddr, bdp->cbd_datlen,DMA_FROM_DEVICE ); +if (id_entry->driver_data &FEC_QUIRK_SWAP_FRAME ) +swap_buffer (data, pkt_len); +/* This does 16 byte alignment, exactly what we need. * The packet length includes FCS, but we don't want to * include that when passing upstream as it messes up @@ -689,6 +734,7 @@ static int fec_enet_mii_probe(struct net_device *dev)char mdio_bus_id[MII_BUS_ID_SIZE ];char phy_name[MII_BUS_ID_SIZE +3 ];int phy_id; +int dev_id = fep->pdev->id; fep->phy_dev =NULL ;@@ -700,6 +746,8 @@ static int fec_enet_mii_probe(struct net_device *dev)continue ;if (fep->mii_bus->phy_map[phy_id]->phy_id ==0 )continue ; +if (dev_id--) +continue ;strncpy (mdio_bus_id, fep->mii_bus->id,MII_BUS_ID_SIZE );break ; }@@ -737,10 +785,35 @@ static int fec_enet_mii_probe(struct net_device *dev)static int fec_enet_mii_init (struct platform_device *pdev) { +static struct mii_bus *fec0_mii_bus;struct net_device *dev =platform_get_drvdata (pdev);struct fec_enet_private *fep =netdev_priv (dev); +const struct platform_device_id *id_entry = +platform_get_device_id (fep->pdev);int err = -ENXIO , i; +/* +* The dual fec interfaces are not equivalent with enet-mac. +* Here are the differences: +* +* - fec0 supports MII & RMII modes while fec1 only supports RMII +* - fec0 acts as the 1588 time master while fec1 is slave +* - external phys can only be configured by fec0 +* +* That is to say fec1 can not work independently. It only works +* when fec0 is working. The reason behind this design is that the
drivers/net/fec.c static int fec_enet_mii_probe(struct net_device *dev) · line 814
Quoted 10 lines
drivers/net/fec.c +10
-0+* second interface is added primarily for Switch mode. +* +* Because of the last point above, both phys are attached on fec0 +* mdio interface in board design, and need to be configured by +* fec0 mii_bus. +*/ +if ((id_entry->driver_data &FEC_QUIRK_ENET_MAC ) && pdev->id) { +/* fec1 uses fec0 mii_bus */ + fep->mii_bus = fec0_mii_bus; +return 0 ;
What happens if imx28-fec.1 is probed before imx28-fec.0?
Quoted 54 lines
drivers/net/fec.c +21
-6+ } + fep->mii_timeout =0 ;/* @@ -777,6 +850,10 @@ static int fec_enet_mii_init(struct platform_device *pdev)if (mdiobus_register (fep->mii_bus)) goto err_out_free_mdio_irq; +/* save fec0 mii_bus */ +if (id_entry->driver_data &FEC_QUIRK_ENET_MAC ) + fec0_mii_bus = fep->mii_bus; +return 0 ; err_out_free_mdio_irq:@@ -1148,12 +1225,25 @@ static void fec_restart(struct net_device *dev, int duplex) {struct fec_enet_private *fep =netdev_priv (dev); +const struct platform_device_id *id_entry = +platform_get_device_id (fep->pdev);int i; +u32 val, temp_mac[2 ];/* Whack a reset. We should wait for this. */ writel (1 , fep->hwp +FEC_ECNTRL );udelay (10 ); +/* +* enet-mac reset will reset mac address registers too, +* so need to reconfigure it. +*/ +if (id_entry->driver_data &FEC_QUIRK_ENET_MAC ) { +memcpy (&temp_mac, dev->dev_addr,ETH_ALEN ); +writel (cpu_to_be32 (temp_mac[0 ]), fep->hwp +FEC_ADDR_LOW ); +writel (cpu_to_be32 (temp_mac[1 ]), fep->hwp +FEC_ADDR_HIGH ); + } +/* Clear any outstanding interrupt. */ writel (0xffc00000 , fep->hwp +FEC_IEVENT );@@ -1200,20 +1290,45 @@ fec_restart(struct net_device *dev, int duplex)/* Set MII speed */ writel (fep->phy_speed, fep->hwp +FEC_MII_SPEED ); -#ifdef FEC_MIIGSK_ENR -if (fep->phy_interface ==PHY_INTERFACE_MODE_RMII ) { -/* disable the gasket and wait */ -writel (0 , fep->hwp +FEC_MIIGSK_ENR ); -while (readl (fep->hwp +FEC_MIIGSK_ENR ) &4 ) -udelay (1 ); +/* +* The phy interface and speed need to get configured
drivers/net/fec.c fec_restart(struct net_device *dev, int duplex) · line 1302
Quoted 10 lines
drivers/net/fec.c +7
-2+* differently on enet-mac. +*/ +if (id_entry->driver_data &FEC_QUIRK_ENET_MAC ) { + val =readl (fep->hwp +FEC_R_CNTRL ); -/* configure the gasket: RMII, 50 MHz, no loopback, no echo */ -writel (1 , fep->hwp +FEC_MIIGSK_CFGR ); +/* MII or RMII */ +if (fep->phy_interface ==PHY_INTERFACE_MODE_RMII ) + val |= (1 <<8 );
Can we have a #define for 1 << 8 please?
drivers/net/fec.c fec_restart(struct net_device *dev, int duplex) · line 1304
Quoted 2 lines
drivers/net/fec.c +2
-0+else + val &= ~(1 <<8 );
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
Hi Uwe,
On Thu, Jan 13, 2011 at 03:48:05PM +0100, Uwe Kleine-König wrote:
[...]
Quoted 4 lines
drivers/net/fec.c line 66
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller is ENET-MAC */ +#define FEC_QUIRK_ENET_MAC (1 << 0)does this really qualify to be a quirk?
My understanding is that ENET-MAC is a type of "quirky" FEC controller.
Quoted 5 lines
drivers/net/fec.c line 68
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller needs driver to swap frame */ +#define FEC_QUIRK_SWAP_FRAME (1 << 1)IMHO this is a bit misnamed.
FEC_QUIRK_NEEDS_BE_DATAor similar would be more accurate.
When your make this change, you may want to pick a better name for function swap_buffer too.
[...]
Quoted 10 lines
drivers/net/fec.c static void fec_stop(struct net_device *dev); · line 236
Quoted 7 lines
drivers/net/fec.c +7
-0+static void *swap_buffer (void *bufaddr,int len) +{ +int i; +unsigned int *buf = bufaddr; + +for (i =0 ; i < (len +3 ) /4 ; i++, buf++) + *buf =cpu_to_be32 (*buf);if len isn't a multiple of 4 this accesses bytes behind len. Is this generally OK here? (E.g. because skbs always have a length that is a multiple of 4?)
The len may not be a multiple of 4. But I believe bufaddr is always a buffer allocated in a length that is a multiple of 4, and the 1~3 bytes exceeding the len very likely has no data that matters. But yes, it deserves a safer implementation.
[...]
Quoted 20 lines
Quoted 10 lines
drivers/net/fec.c +10
-0+/* +* The dual fec interfaces are not equivalent with enet-mac. +* Here are the differences: +* +* - fec0 supports MII & RMII modes while fec1 only supports RMII +* - fec0 acts as the 1588 time master while fec1 is slave +* - external phys can only be configured by fec0 +* +* That is to say fec1 can not work independently. It only works +* when fec0 is working. The reason behind this design is that the drivers/net/fec.c static int fec_enet_mii_probe(struct net_device *dev) · line 814
Quoted 10 lines
drivers/net/fec.c +10
-0+* second interface is added primarily for Switch mode. +* +* Because of the last point above, both phys are attached on fec0 +* mdio interface in board design, and need to be configured by +* fec0 mii_bus. +*/ +if ((id_entry->driver_data &FEC_QUIRK_ENET_MAC ) && pdev->id) { +/* fec1 uses fec0 mii_bus */ + fep->mii_bus = fec0_mii_bus; +return 0 ;
Quoted 1 line
What happens if imx28-fec.1 is probed before imx28-fec.0?
It's something that generally should not happen, as these two fec are not equivalent, and fec.1 should always be added after fec.0 if you intend to get dual interfaces. But yes, we should add error checking for this case in the driver.
Signature · 2 lines
Regards, Shawn
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
Quoted 33 lines · Shawn Guo
Hi Uwe,
On Thu, Jan 13, 2011 at 03:48:05PM +0100, Uwe Kleine-K?nig wrote:
[...]
Quoted 4 lines
drivers/net/fec.c line 66
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller is ENET-MAC */ +#define FEC_QUIRK_ENET_MAC (1 << 0)does this really qualify to be a quirk?
My understanding is that ENET-MAC is a type of "quirky" FEC controller.
Quoted 5 lines
drivers/net/fec.c line 68
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller needs driver to swap frame */ +#define FEC_QUIRK_SWAP_FRAME (1 << 1)IMHO this is a bit misnamed.
FEC_QUIRK_NEEDS_BE_DATAor similar would be more accurate.When your make this change, you may want to pick a better name for function
swap_buffertoo.[...]
Quoted 10 lines
drivers/net/fec.c static void fec_stop(struct net_device *dev); · line 236
Quoted 7 lines
drivers/net/fec.c +7
-0+static void *swap_buffer (void *bufaddr,int len) +{ +int i; +unsigned int *buf = bufaddr; + +for (i =0 ; i < (len +3 ) /4 ; i++, buf++) + *buf =cpu_to_be32 (*buf);if len isn't a multiple of 4 this accesses bytes behind len. Is this generally OK here? (E.g. because skbs always have a length that is a multiple of 4?)
Quoted 4 lines
The len may not be a multiple of 4. But I believe bufaddr is always a buffer allocated in a length that is a multiple of 4, and the 1~3 bytes exceeding the len very likely has no data that matters. But yes, it deserves a safer implementation.
Did you test what happens if bufaddr isn't aligned? Does it work at all then?
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
Quoted 34 lines · Uwe Kleine-K?nig
Quoted 33 lines · Shawn Guo
Hi Uwe,
On Thu, Jan 13, 2011 at 03:48:05PM +0100, Uwe Kleine-K?nig wrote:
[...]
Quoted 4 lines
drivers/net/fec.c line 66
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller is ENET-MAC */ +#define FEC_QUIRK_ENET_MAC (1 << 0)does this really qualify to be a quirk?
My understanding is that ENET-MAC is a type of "quirky" FEC controller.
Quoted 5 lines
drivers/net/fec.c line 68
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller needs driver to swap frame */ +#define FEC_QUIRK_SWAP_FRAME (1 << 1)IMHO this is a bit misnamed.
FEC_QUIRK_NEEDS_BE_DATAor similar would be more accurate.When your make this change, you may want to pick a better name for function
swap_buffertoo.[...]
Quoted 10 lines
drivers/net/fec.c static void fec_stop(struct net_device *dev); · line 236
Quoted 7 lines
drivers/net/fec.c +7
-0+static void *swap_buffer (void *bufaddr,int len) +{ +int i; +unsigned int *buf = bufaddr; + +for (i =0 ; i < (len +3 ) /4 ; i++, buf++) + *buf =cpu_to_be32 (*buf);if len isn't a multiple of 4 this accesses bytes behind len. Is this generally OK here? (E.g. because skbs always have a length that is a multiple of 4?)
Quoted 7 lines
Quoted 4 lines
The len may not be a multiple of 4. But I believe bufaddr is always a buffer allocated in a length that is a multiple of 4, and the 1~3 bytes exceeding the len very likely has no data that matters. But yes, it deserves a safer implementation.
Did you test what happens if bufaddr isn't aligned? Does it work at all then?
I see many calls passing a len that is not a multiple of 4, but it works good.
Signature · 2 lines
Regards, Shawn
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
Hi,
Quoted 39 lines · Shawn Guo
Quoted 38 lines · Uwe Kleine-K?nig
Quoted 37 lines · Shawn Guo
Hi Uwe,
On Thu, Jan 13, 2011 at 03:48:05PM +0100, Uwe Kleine-K?nig wrote:
[...]
Quoted 4 lines
drivers/net/fec.c line 66
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller is ENET-MAC */ +#define FEC_QUIRK_ENET_MAC (1 << 0)does this really qualify to be a quirk?
My understanding is that ENET-MAC is a type of "quirky" FEC controller.
Quoted 5 lines
drivers/net/fec.c line 68
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller needs driver to swap frame */ +#define FEC_QUIRK_SWAP_FRAME (1 << 1)IMHO this is a bit misnamed.
FEC_QUIRK_NEEDS_BE_DATAor similar would be more accurate.When your make this change, you may want to pick a better name for function
swap_buffertoo.[...]
Quoted 10 lines
drivers/net/fec.c static void fec_stop(struct net_device *dev); · line 236
Quoted 7 lines
drivers/net/fec.c +7
-0+static void *swap_buffer (void *bufaddr,int len) +{ +int i; +unsigned int *buf = bufaddr; + +for (i =0 ; i < (len +3 ) /4 ; i++, buf++) + *buf =cpu_to_be32 (*buf);if len isn't a multiple of 4 this accesses bytes behind len. Is this generally OK here? (E.g. because skbs always have a length that is a multiple of 4?)
The len may not be a multiple of 4. But I believe bufaddr is always a buffer allocated in a length that is a multiple of 4, and the 1~3 bytes exceeding the len very likely has no data that matters. But yes, it deserves a safer implementation.
Quoted 6 lines
Quoted 3 lines
Did you test what happens if bufaddr isn't aligned? Does it work at all then?
I see many calls passing a len that is not a multiple of 4, but it works good.
That does not prove anything, actually.
Anyway "bufaddr isn't aligned" != "len is not a multiple of 4". Is there any guarantee that the function cannot be called with a non-aligned buffer address?
Lothar Wa?mann
Signature · 9 lines
___________________________________________________________ Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10 Gesch?ftsf?hrer: Matthias Kaussen Handelsregistereintrag: Amtsgericht Aachen, HRB 4996 www.karo-electronics.de | info at karo-electronics.de ___________________________________________________________
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
Hi,
Quoted 43 lines · Lothar Wa?mann
Quoted 42 lines · Shawn Guo
Quoted 41 lines · Uwe Kleine-K?nig
Quoted 33 lines · Shawn Guo
Hi Uwe,
On Thu, Jan 13, 2011 at 03:48:05PM +0100, Uwe Kleine-K?nig wrote:
[...]
Quoted 4 lines
drivers/net/fec.c line 66
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller is ENET-MAC */ +#define FEC_QUIRK_ENET_MAC (1 << 0)does this really qualify to be a quirk?
My understanding is that ENET-MAC is a type of "quirky" FEC controller.
Quoted 5 lines
drivers/net/fec.c line 68
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller needs driver to swap frame */ +#define FEC_QUIRK_SWAP_FRAME (1 << 1)IMHO this is a bit misnamed.
FEC_QUIRK_NEEDS_BE_DATAor similar would be more accurate.When your make this change, you may want to pick a better name for function
swap_buffertoo.[...]
Quoted 10 lines
drivers/net/fec.c static void fec_stop(struct net_device *dev); · line 236
Quoted 7 lines
drivers/net/fec.c +7
-0+static void *swap_buffer (void *bufaddr,int len) +{ +int i; +unsigned int *buf = bufaddr; + +for (i =0 ; i < (len +3 ) /4 ; i++, buf++) + *buf =cpu_to_be32 (*buf);if len isn't a multiple of 4 this accesses bytes behind len. Is this generally OK here? (E.g. because skbs always have a length that is a multiple of 4?)
Quoted 4 lines
The len may not be a multiple of 4. But I believe bufaddr is always a buffer allocated in a length that is a multiple of 4, and the 1~3 bytes exceeding the len very likely has no data that matters. But yes, it deserves a safer implementation.
Did you test what happens if bufaddr isn't aligned? Does it work at all then?
Quoted 8 lines
Quoted 3 lines
I see many calls passing a len that is not a multiple of 4, but it works good.
That does not prove anything, actually.
Anyway "bufaddr isn't aligned" != "len is not a multiple of 4". Is there any guarantee that the function cannot be called with a non-aligned buffer address?
Over the weekend I wondered if we could reach alignment via a dma-mask setting. Didn't check yet how this is configured.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
In reply to Lothar WaßmannHi Lothar,
Quoted 45 lines · Lothar Waßmann
Hi,
Quoted 42 lines · Shawn Guo
Quoted 41 lines · Uwe Kleine-König
Quoted 33 lines · Shawn Guo
Hi Uwe,
On Thu, Jan 13, 2011 at 03:48:05PM +0100, Uwe Kleine-König wrote:
[...]
Quoted 4 lines
drivers/net/fec.c line 66
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller is ENET-MAC */ +#define FEC_QUIRK_ENET_MAC (1 << 0)does this really qualify to be a quirk?
My understanding is that ENET-MAC is a type of "quirky" FEC controller.
Quoted 5 lines
drivers/net/fec.c line 68
Quoted 2 lines
drivers/net/fec.c +2
-0+/* Controller needs driver to swap frame */ +#define FEC_QUIRK_SWAP_FRAME (1 << 1)IMHO this is a bit misnamed.
FEC_QUIRK_NEEDS_BE_DATAor similar would be more accurate.When your make this change, you may want to pick a better name for function
swap_buffertoo.[...]
Quoted 10 lines
drivers/net/fec.c static void fec_stop(struct net_device *dev); · line 236
Quoted 7 lines
drivers/net/fec.c +7
-0+static void *swap_buffer (void *bufaddr,int len) +{ +int i; +unsigned int *buf = bufaddr; + +for (i =0 ; i < (len +3 ) /4 ; i++, buf++) + *buf =cpu_to_be32 (*buf);if len isn't a multiple of 4 this accesses bytes behind len. Is this generally OK here? (E.g. because skbs always have a length that is a multiple of 4?)
Quoted 4 lines
The len may not be a multiple of 4. But I believe bufaddr is always a buffer allocated in a length that is a multiple of 4, and the 1~3 bytes exceeding the len very likely has no data that matters. But yes, it deserves a safer implementation.
Did you test what happens if bufaddr isn't aligned? Does it work at all then?
Quoted 9 lines
Quoted 3 lines
I see many calls passing a len that is not a multiple of 4, but it works good.
That does not prove anything, actually.
Anyway "bufaddr isn't aligned" != "len is not a multiple of 4". Is there any guarantee that the function cannot be called with a non-aligned buffer address?
Oops, I misunderstood the comment. With bounce buffer alignment handling removed, the driver stops working. But at least, mx28 fec driver can work with FEC_ALIGNMENT 0x3 and not necessarily with 0xf.
I hope this is what you intended to know.
Signature · 2 lines
Regards, Shawn
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
In reply to Uwe Kleine-KönigHello,
Quoted 11 lines · Uwe Kleine-K?nig
drivers/net/fec.c MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); · line 151
Quoted 4 lines
#if
defined(CONFIG_M523x)||defined(CONFIG_M527x)||defined(CONFIG_M528x)|| \drivers/net/fec.c +2
-1-defined (CONFIG_M520x) ||defined (CONFIG_M532x) ||defined (CONFIG_ARCH_MXC ) +defined (CONFIG_M520x) ||defined (CONFIG_M532x) || \ +defined (CONFIG_ARCH_MXC ) ||defined (CONFIG_SOC_IMX28 )I wonder what is excluded here. FEC depends on
M523x || M527x || M5272 || M528x || M520x || M532x || \ MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28so the only difference is that the latter lists M5272 which seems a bit redundant in the presence of M527x.
M527x = {M5271, M5275}, so it seems to me that only M5272 is excluded here. I don't know if it's possible to have a kernel supporting M5272 and (e.g.) M527x. If yes, does the driver work correct on M5272 then?
Greg, it seems to me that M5272 is the exception here, not all the others. Would it make sense to make the above read:
#if !defined(CONFIG_M5272)
?
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v4 05/10] net/fec: add dual fec support for mx28
In reply to Shawn GuoHello again,
Quoted 11 lines · Shawn Guo
static
netdev_tx_t
fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev){drivers/net/fec.c +2
-0struct fec_enet_private *fep =netdev_priv (dev); +const struct platform_device_id *id_entry = +platform_get_device_id (fep->pdev);struct bufdesc *bdp;void *bufaddr;unsigned short status;@@ -256,6 +288,14 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) bufaddr = fep->tx_bounce[index];
drivers/net/fec.c fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) · line 298
Quoted 10 lines
drivers/net/fec.c +8
-0} +/* +* Some design made an incorrect assumption on endian mode of +* the system that it's running on. As the result, driver has to +* swap every frame going to and coming from the controller. +*/ +if (id_entry->driver_data &FEC_QUIRK_SWAP_FRAME ) +swap_buffer (bufaddr, skb->len); +
Is that save here? bufaddr either points to a bounce buffer (which should be OK definitely) or skb->data. Or asked differently: Is the skb here owned by the driver such that it is allowed to write to it? Does the driver eventually need to restore the original data?
Just before this if, there is some bounce buffer handling. If it is not OK to modify skb->data, the call to swap_buffer can easily be moved in there.
Quoted 13 lines
drivers/net/fec.c +2
-0/* Save skb pointer */ fep->tx_skbuff[fep->skb_cur] = skb;@@ -424,6 +464,8 @@ static void fec_enet_rx(struct net_device *dev) {struct fec_enet_private *fep =netdev_priv (dev); +const struct platform_device_id *id_entry = +platform_get_device_id (fep->pdev);struct bufdesc *bdp;unsigned short status;struct sk_buff *skb;
drivers/net/fec.c fec_enet_rx(struct net_device *dev) · line 534
Quoted 6 lines
drivers/net/fec.c +3
-0@@ -487,6 +529,9 @@ fec_enet_rx(struct net_device *dev)dma_unmap_single (NULL , bdp->cbd_bufaddr, bdp->cbd_datlen,DMA_FROM_DEVICE ); +if (id_entry->driver_data &FEC_QUIRK_SWAP_FRAME ) +swap_buffer (data, pkt_len); +
Here I guess it's OK, the hardware just wrote to the buffer, so the skb cannot be shared to anything else and the write is all right.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH v4 6/10 ARM: mx28: update clock and device name for dual fec support
In reply to Shawn GuoChange device name from "fec" to "imx28-fec", so that fec driver can distinguish mx28.
---
Changes for v4:
- Use "imx28-fec" as fec device name
Changes for v3:
- Change device name to "enet-mac"
arch/arm/mach-mxs/clock-mx28.c | 3 ++- arch/arm/mach-mxs/devices/platform-fec.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/mach-mxs/clock-mx28.c +2 -1
@@ -606,7 +606,8 @@ static struct clk_lookup lookups[] = {_REGISTER_CLOCK ("duart" ,"apb_pclk" , xbus_clk) /* for amba-pl011 driver */ _REGISTER_CLOCK("duart", NULL, uart_clk) - _REGISTER_CLOCK("fec.0", NULL, fec_clk) + _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk) + _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk) _REGISTER_CLOCK("rtc", NULL, rtc_clk) _REGISTER_CLOCK("pll2", NULL, pll2_clk)_REGISTER_CLOCK (NULL ,"hclk" , hbus_clk)
arch/arm/mach-mxs/devices/platform-fec.c +1 -1
@@ -45,6 +45,6 @@ struct platform_device *__init mxs_add_fec( }, }; -return mxs_add_platform_device ("fec" , data->id, +return mxs_add_platform_device ("imx28-fec" , data->id, res,ARRAY_SIZE (res), pdata,sizeof (*pdata)); }
Signature · 1 line
1.7.1
Re: [PATCH v4 06/10] ARM: mx28: update clock and device name for dual fec support
Hi Shawn,
Quoted 34 lines · Shawn Guo
Change device name from "fec" to "imx28-fec", so that fec driver can distinguish mx28.
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Use "imx28-fec" as fec device nameChanges for v3:
- Change device name to "enet-mac"arch/arm/mach-mxs/clock-mx28.c | 3 ++- arch/arm/mach-mxs/devices/platform-fec.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)arch/arm/mach-mxs/clock-mx28.c +2
-1@@ -606,7 +606,8 @@ static struct clk_lookup lookups[] = {_REGISTER_CLOCK ("duart" ,"apb_pclk" , xbus_clk) /* for amba-pl011 driver */ _REGISTER_CLOCK("duart", NULL, uart_clk) - _REGISTER_CLOCK("fec.0", NULL, fec_clk) + _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk) + _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk) _REGISTER_CLOCK("rtc", NULL, rtc_clk) _REGISTER_CLOCK("pll2", NULL, pll2_clk)_REGISTER_CLOCK (NULL ,"hclk" , hbus_clk)arch/arm/mach-mxs/devices/platform-fec.c +0
-0
arch/arm/mach-mxs/devices/platform-fec.c struct platform_device *__init mxs_add_fec( · line 48
Quoted 5 lines
arch/arm/mach-mxs/devices/platform-fec.c +1
-1@@ -45,6 +45,6 @@ struct platform_device *__init mxs_add_fec( }, }; - return mxs_add_platform_device("fec", data->id, + return mxs_add_platform_device("imx28-fec", data->id,
IMHO "imx28-fec" shouldn't be hard coded here but come from data. See imx-spi device registration for an example.
Uwe
Quoted 7 lines
arch/arm/mach-mxs/devices/platform-fec.c +0
-0res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); }Signature · 1 line
1.7.1
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v4 06/10] ARM: mx28: update clock and device name for dual fec support
Hi Uwe,
Quoted 40 lines · Uwe Kleine-König
Hi Shawn,
Quoted 37 lines · Shawn Guo
Change device name from "fec" to "imx28-fec", so that fec driver can distinguish mx28.
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Use "imx28-fec" as fec device nameChanges for v3:
- Change device name to "enet-mac"arch/arm/mach-mxs/clock-mx28.c | 3 ++- arch/arm/mach-mxs/devices/platform-fec.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)arch/arm/mach-mxs/clock-mx28.c +2
-1@@ -606,7 +606,8 @@ static struct clk_lookup lookups[] = {_REGISTER_CLOCK ("duart" ,"apb_pclk" , xbus_clk) /* for amba-pl011 driver */ _REGISTER_CLOCK("duart", NULL, uart_clk) - _REGISTER_CLOCK("fec.0", NULL, fec_clk) + _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk) + _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk) _REGISTER_CLOCK("rtc", NULL, rtc_clk) _REGISTER_CLOCK("pll2", NULL, pll2_clk)_REGISTER_CLOCK (NULL ,"hclk" , hbus_clk)arch/arm/mach-mxs/devices/platform-fec.c +0
-0@@ -45,6 +45,6 @@ struct platform_device *__init mxs_add_fec( }, };
Quoted 5 lines
arch/arm/mach-mxs/devices/platform-fec.c struct platform_device *__init mxs_add_fec( · line 48
Quoted 2 lines
arch/arm/mach-mxs/devices/platform-fec.c +1
-1- return mxs_add_platform_device("fec", data->id, + return mxs_add_platform_device("imx28-fec", data->id,IMHO "imx28-fec" shouldn't be hard coded here but come from data. See imx-spi device registration for an example.
Sascha has merged the patch, so I will send a follow-up patch.
Signature · 2 lines
Regards, Shawn
PATCH 1/1 ARM: mxs: pass fec device name via platform data
In reply to Uwe Kleine-König--- arch/arm/mach-mxs/devices/platform-fec.c | 11 ++++++----- arch/arm/mach-mxs/include/mach/devices-common.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-)
arch/arm/mach-mxs/devices/platform-fec.c +6 -5
@@ -10,20 +10,21 @@#include <mach/mx28.h> #include <mach/devices-common.h> -#define mxs_fec_data_entry_single (soc, _id) \ +#define mxs_fec_data_entry_single (soc, _devid, _id) \ { \ + .devid = _devid, \ .id = _id, \ .iobase = soc ## _ENET_MAC ## _id ## _BASE_ADDR, \ .irq = soc ## _INT_ENET_MAC ## _id, \ } -#define mxs_fec_data_entry (soc, _id) \ - [_id] = mxs_fec_data_entry_single(soc, _id) +#define mxs_fec_data_entry (soc, _devid, _id) \ + [_id] = mxs_fec_data_entry_single(soc, _devid, _id)#ifdef CONFIG_SOC_IMX28 const struct mxs_fec_data mx28_fec_data[]__initconst = { #define mx28_fec_data_entry(_id) \ - mxs_fec_data_entry(MX28, _id) + mxs_fec_data_entry(MX28, "imx28-fec", _id)mx28_fec_data_entry (0 ),mx28_fec_data_entry (1 ), };
@@ -45,6 +46,6 @@ struct platform_device *__init mxs_add_fec( }, }; -return mxs_add_platform_device ("imx28-fec" , data->id, +return mxs_add_platform_device (data->devid, data->id, res,ARRAY_SIZE (res), pdata,sizeof (*pdata)); }
arch/arm/mach-mxs/include/mach/devices-common.h +1 -0
@@ -33,6 +33,7 @@ int __init mxs_add_duart(const struct amba_device *dev);/* fec */ #include <linux/fec.h> struct mxs_fec_data { +const char *devid;int id;resource_size_t iobase;resource_size_t iosize;
Signature · 1 line
1.7.1
Re: [PATCH] ARM: mxs: pass fec device name via platform data
Quoted 1 line · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>
Quoted 65 lines
--- arch/arm/mach-mxs/devices/platform-fec.c | 11 ++++++----- arch/arm/mach-mxs/include/mach/devices-common.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-)arch/arm/mach-mxs/devices/platform-fec.c +6
-5@@ -10,20 +10,21 @@#include <mach/mx28.h> #include <mach/devices-common.h> -#define mxs_fec_data_entry_single (soc, _id) \ +#define mxs_fec_data_entry_single (soc, _devid, _id) \ { \ + .devid = _devid, \ .id = _id, \ .iobase = soc ## _ENET_MAC ## _id ## _BASE_ADDR, \ .irq = soc ## _INT_ENET_MAC ## _id, \ } -#define mxs_fec_data_entry (soc, _id) \ - [_id] = mxs_fec_data_entry_single(soc, _id) +#define mxs_fec_data_entry (soc, _devid, _id) \ + [_id] = mxs_fec_data_entry_single(soc, _devid, _id)#ifdef CONFIG_SOC_IMX28 const struct mxs_fec_data mx28_fec_data[]__initconst = { #define mx28_fec_data_entry(_id) \ - mxs_fec_data_entry(MX28, _id) + mxs_fec_data_entry(MX28, "imx28-fec", _id)mx28_fec_data_entry (0 ),mx28_fec_data_entry (1 ), };@@ -45,6 +46,6 @@ struct platform_device *__init mxs_add_fec( }, }; -return mxs_add_platform_device ("imx28-fec" , data->id, +return mxs_add_platform_device (data->devid, data->id, res,ARRAY_SIZE (res), pdata,sizeof (*pdata)); }arch/arm/mach-mxs/include/mach/devices-common.h +1
-0@@ -33,6 +33,7 @@ int __init mxs_add_duart(const struct amba_device *dev);/* fec */ #include <linux/fec.h> struct mxs_fec_data { +const char *devid;int id;resource_size_t iobase;resource_size_t iosize;Signature · 8 lines
1.7.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH v4 7/10 ARM: mx28: add the second fec device registration
In reply to Shawn Guo--- arch/arm/mach-mxs/mach-mx28evk.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-)
arch/arm/mach-mxs/mach-mx28evk.c +25 -3
@@ -57,6 +57,19 @@ static const iomux_cfg_t mx28evk_pads[] __initconst = { (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ),MX28_PAD_ENET_CLK__CLKCTRL_ENET | (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +/* fec1 */ +MX28_PAD_ENET0_CRS__ENET1_RX_EN | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_RXD2__ENET1_RXD0 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_RXD3__ENET1_RXD1 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_COL__ENET1_TX_EN | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_TXD2__ENET1_TXD0 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_TXD3__ENET1_TXD1 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ),/* phy power line */ MX28_PAD_SSP1_DATA3__GPIO_2_15 | (MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
@@ -106,8 +119,14 @@ static void __init mx28evk_fec_reset(void)gpio_set_value (MX28EVK_FEC_PHY_RESET ,1 ); } -static const struct fec_platform_data mx28_fec_pdata__initconst = { - .phy =PHY_INTERFACE_MODE_RMII , +static struct fec_platform_data mx28_fec_pdata[] = { + { +/* fec0 */ + .phy =PHY_INTERFACE_MODE_RMII , + }, { +/* fec1 */ + .phy =PHY_INTERFACE_MODE_RMII , + }, };static void __init mx28evk_init (void )
@@ -117,7 +136,10 @@ static void __init mx28evk_init(void)mx28_add_duart ();mx28evk_fec_reset (); -mx28_add_fec (0 , &mx28_fec_pdata); +mx28_add_fec (0 , &mx28_fec_pdata[0 ]); +#ifdef CONFIG_FEC2 +mx28_add_fec (1 , &mx28_fec_pdata[1 ]); +#endif }static void __init mx28evk_timer_init (void )
Signature · 1 line
1.7.1
Sascha Hauer
maintainerRe: [PATCH v4 07/10] ARM: mx28: add the second fec device registration
Quoted 8 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>--- arch/arm/mach-mxs/mach-mx28evk.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-)static void
__initmx28evk_init(void)
arch/arm/mach-mxs/mach-mx28evk.c static void __init mx28evk_init(void) · line 142
Quoted 8 lines
arch/arm/mach-mxs/mach-mx28evk.c +4
-1@@ -117,7 +136,10 @@ static void __init mx28evk_init(void)mx28_add_duart ();mx28evk_fec_reset (); -mx28_add_fec (0 , &mx28_fec_pdata); +mx28_add_fec (0 , &mx28_fec_pdata[0 ]); +#ifdef CONFIG_FEC2 +mx28_add_fec (1 , &mx28_fec_pdata[1 ]); +#endif
Please don't do this. If you really want to make this configurable with kconfig use a board specific option, not a driver specific option. I think this should be made unconditional though.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH v4 07/10] ARM: mx28: add the second fec device registration
Hi Sascha,
Quoted 11 lines · Sascha Hauer
Quoted 10 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>--- arch/arm/mach-mxs/mach-mx28evk.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-)static void
__initmx28evk_init(void)arch/arm/mach-mxs/mach-mx28evk.c +0
-0@@ -117,7 +136,10 @@ static void __init mx28evk_init(void)mx28_add_duart ();
Quoted 11 lines
arch/arm/mach-mxs/mach-mx28evk.c static void __init mx28evk_init(void) · line 142
Quoted 6 lines
arch/arm/mach-mxs/mach-mx28evk.c +4
-1mx28evk_fec_reset (); -mx28_add_fec (0 , &mx28_fec_pdata); +mx28_add_fec (0 , &mx28_fec_pdata[0 ]); +#ifdef CONFIG_FEC2 +mx28_add_fec (1 , &mx28_fec_pdata[1 ]); +#endif Please don't do this. If you really want to make this configurable with kconfig use a board specific option, not a driver specific option. I think this should be made unconditional though.
I will resend this patch as v5 than the whole patch set, if you do not mind.
Signature · 2 lines
Regards, Shawn
Sascha Hauer
maintainerRe: [PATCH v4 07/10] ARM: mx28: add the second fec device registration
Quoted 25 lines · Shawn Guo
Hi Sascha,
Quoted 11 lines · Sascha Hauer
Quoted 10 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>--- arch/arm/mach-mxs/mach-mx28evk.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-)static void
__initmx28evk_init(void)arch/arm/mach-mxs/mach-mx28evk.c +0
-0@@ -117,7 +136,10 @@ static void __init mx28evk_init(void)mx28_add_duart ();Quoted 11 lines
arch/arm/mach-mxs/mach-mx28evk.c static void __init mx28evk_init(void) · line 142
Quoted 6 lines
arch/arm/mach-mxs/mach-mx28evk.c +4
-1mx28evk_fec_reset (); -mx28_add_fec (0 , &mx28_fec_pdata); +mx28_add_fec (0 , &mx28_fec_pdata[0 ]); +#ifdef CONFIG_FEC2 +mx28_add_fec (1 , &mx28_fec_pdata[1 ]); +#endif Please don't do this. If you really want to make this configurable with kconfig use a board specific option, not a driver specific option. I think this should be made unconditional though.
Quoted 2 lines
I will resend this patch as v5 than the whole patch set, if you do not mind.
ok
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH v4 8/10 ARM: mxs: add ocotp read function
In reply to Shawn Guo---
Changes for v4:
- Call cpu_relax() during polling
Changes for v2:
- Add mutex locking for mxs_read_ocotp()
- Use type size_t for count and i
- Add comment for clk_enable/disable skipping
- Add ERROR bit clearing and polling step
arch/arm/mach-mxs/Makefile | 2 +- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.c
arch/arm/mach-mxs/Makefile +1 -1
@@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.o obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o
arch/arm/mach-mxs/include/mach/common.h +1 -0
@@ -13,6 +13,7 @@struct clk ; +extern int mxs_read_ocotp (int offset,int count,u32 *values);extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );
arch/arm/mach-mxs/ocotp.c new file +79 -0
79 lines not on this page · raw message
Signature · 1 line
1.7.1
Sascha Hauer
maintainerRe: [PATCH v4 08/10] ARM: mxs: add ocotp read function
Quoted 77 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Callcpu_relax()during pollingChanges for v2:
- Add mutex locking formxs_read_ocotp()
- Use typesize_tfor count and i
- Add comment for clk_enable/disable skipping
- Add ERROR bit clearing and polling steparch/arm/mach-mxs/Makefile | 2 +- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.carch/arm/mach-mxs/Makefile +1
-1@@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.o obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.oarch/arm/mach-mxs/include/mach/common.h +1
-0@@ -13,6 +13,7 @@struct clk ; +extern int mxs_read_ocotp (int offset,int count,u32 *values);extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );arch/arm/mach-mxs/ocotp.c new file +31
-0@@ -0,0 +1,79 @@ +/* +* Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/mutex.h> + +#include <mach/mxs.h> + +#define BM_OCOTP_CTRL_BUSY (1 << 8) +#define BM_OCOTP_CTRL_ERROR (1 << 9) +#define BM_OCOTP_CTRL_RD_BANK_OPEN (1 << 12) + +static DEFINE_MUTEX (ocotp_mutex); + +int mxs_read_ocotp (unsigned offset,size_t count,u32 *values) +{ +void __iomem *ocotp_base =MXS_IO_ADDRESS (MXS_OCOTP_BASE_ADDR ); +int timeout =0x400 ; +size_t i;
arch/arm/mach-mxs/ocotp.c line 41
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+ +mutex_lock (&ocotp_mutex); + +/* +* clk_enable(hbus_clk) for ocotp can be skipped +* as it must be on when system is running. +*/ + +/* try to clear ERROR bit */ +__mxs_clrl (BM_OCOTP_CTRL_ERROR , ocotp_base);
This operation does not try to clear the error bit but actually clears it...
arch/arm/mach-mxs/ocotp.c line 46
Quoted 5 lines
arch/arm/mach-mxs/ocotp.c new file +5
-0+ +/* check both BUSY and ERROR cleared */ +while ((__raw_readl (ocotp_base) & + (BM_OCOTP_CTRL_BUSY |BM_OCOTP_CTRL_ERROR )) && --timeout) +cpu_relax ();
...which means you do not have to poll the error bit here...
Quoted 4 lines
arch/arm/mach-mxs/ocotp.c new file +4
-0+ +if (unlikely (!timeout)) + goto error_unlock; +
arch/arm/mach-mxs/ocotp.c line 60
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+/* open OCOTP banks for read */ +__mxs_setl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +/* approximately wait 32 hclk cycles */ +udelay (1 ); + +/* poll BUSY bit becoming cleared */ + timeout =0x400 ; +while ((__raw_readl (ocotp_base) &BM_OCOTP_CTRL_BUSY ) && --timeout) +cpu_relax ();
...which means you can factor out a ocotp_wait_busy function and let the code speak instead of the comments.
arch/arm/mach-mxs/ocotp.c line 66
Quoted 6 lines
arch/arm/mach-mxs/ocotp.c new file +6
-0+ +if (unlikely (!timeout)) + goto error_unlock; + +for (i =0 ; i < count; i++, offset +=4 ) + *values++ =__raw_readl (ocotp_base + offset);
The registers in the ocotp are 16 byte aligned. Does it really make sense to provide a function allowing to read the gaps between the registers?
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH v4 08/10] ARM: mxs: add ocotp read function
Hello Sascha,
Quoted 52 lines · Sascha Hauer
Quoted 37 lines · Shawn Guo
arch/arm/mach-mxs/ocotp.c new file +31
-0@@ -0,0 +1,79 @@ +/* +* Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/mutex.h> + +#include <mach/mxs.h> + +#define BM_OCOTP_CTRL_BUSY (1 << 8) +#define BM_OCOTP_CTRL_ERROR (1 << 9) +#define BM_OCOTP_CTRL_RD_BANK_OPEN (1 << 12) + +static DEFINE_MUTEX (ocotp_mutex); + +int mxs_read_ocotp (unsigned offset,size_t count,u32 *values) +{ +void __iomem *ocotp_base =MXS_IO_ADDRESS (MXS_OCOTP_BASE_ADDR ); +int timeout =0x400 ; +size_t i;arch/arm/mach-mxs/ocotp.c line 41
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+ +mutex_lock (&ocotp_mutex); + +/* +* clk_enable(hbus_clk) for ocotp can be skipped +* as it must be on when system is running. +*/ + +/* try to clear ERROR bit */ +__mxs_clrl (BM_OCOTP_CTRL_ERROR , ocotp_base);This operation does not try to clear the error bit but actually clears it...
Quoted 7 lines
arch/arm/mach-mxs/ocotp.c line 46
Quoted 5 lines
arch/arm/mach-mxs/ocotp.c new file +5
-0+ +/* check both BUSY and ERROR cleared */ +while ((__raw_readl (ocotp_base) & + (BM_OCOTP_CTRL_BUSY |BM_OCOTP_CTRL_ERROR )) && --timeout) +cpu_relax ();...which means you do not have to poll the error bit here...
well, I don't know how the hardware works here, but in general the argument is broken. Registers are not memory, so just because you set a bit in register space it doesn't mean it is really set when you read from the same address.
If there is something wrong with the ocotp I'd even expect that clearing the error bit doesn't work because it doesn't change the general condition.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v4 08/10] ARM: mxs: add ocotp read function
In reply to Sascha HauerHi Sascha,
Quoted 118 lines · Sascha Hauer
Quoted 77 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Callcpu_relax()during pollingChanges for v2:
- Add mutex locking formxs_read_ocotp()
- Use typesize_tfor count and i
- Add comment for clk_enable/disable skipping
- Add ERROR bit clearing and polling steparch/arm/mach-mxs/Makefile | 2 +- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.carch/arm/mach-mxs/Makefile +1
-1@@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.o obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.oarch/arm/mach-mxs/include/mach/common.h +1
-0@@ -13,6 +13,7 @@struct clk ; +extern int mxs_read_ocotp (int offset,int count,u32 *values);extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );arch/arm/mach-mxs/ocotp.c new file +31
-0@@ -0,0 +1,79 @@ +/* +* Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/mutex.h> + +#include <mach/mxs.h> + +#define BM_OCOTP_CTRL_BUSY (1 << 8) +#define BM_OCOTP_CTRL_ERROR (1 << 9) +#define BM_OCOTP_CTRL_RD_BANK_OPEN (1 << 12) + +static DEFINE_MUTEX (ocotp_mutex); + +int mxs_read_ocotp (unsigned offset,size_t count,u32 *values) +{ +void __iomem *ocotp_base =MXS_IO_ADDRESS (MXS_OCOTP_BASE_ADDR ); +int timeout =0x400 ; +size_t i;arch/arm/mach-mxs/ocotp.c line 41
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+ +mutex_lock (&ocotp_mutex); + +/* +* clk_enable(hbus_clk) for ocotp can be skipped +* as it must be on when system is running. +*/ + +/* try to clear ERROR bit */ +__mxs_clrl (BM_OCOTP_CTRL_ERROR , ocotp_base);This operation does not try to clear the error bit but actually clears it...
arch/arm/mach-mxs/ocotp.c line 46
Quoted 5 lines
arch/arm/mach-mxs/ocotp.c new file +5
-0+ +/* check both BUSY and ERROR cleared */ +while ((__raw_readl (ocotp_base) & + (BM_OCOTP_CTRL_BUSY |BM_OCOTP_CTRL_ERROR )) && --timeout) +cpu_relax ();...which means you do not have to poll the error bit here...
Quoted 4 lines
arch/arm/mach-mxs/ocotp.c new file +4
-0+ +if (unlikely (!timeout)) + goto error_unlock; +arch/arm/mach-mxs/ocotp.c line 60
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+/* open OCOTP banks for read */ +__mxs_setl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +/* approximately wait 32 hclk cycles */ +udelay (1 ); + +/* poll BUSY bit becoming cleared */ + timeout =0x400 ; +while ((__raw_readl (ocotp_base) &BM_OCOTP_CTRL_BUSY ) && --timeout) +cpu_relax ();...which means you can factor out a
ocotp_wait_busyfunction and let the code speak instead of the comments.
Quoted 11 lines
arch/arm/mach-mxs/ocotp.c line 66
Quoted 6 lines
arch/arm/mach-mxs/ocotp.c new file +6
-0+ +if (unlikely (!timeout)) + goto error_unlock; + +for (i =0 ; i < count; i++, offset +=4 ) + *values++ =__raw_readl (ocotp_base + offset);The registers in the ocotp are 16 byte aligned. Does it really make sense to provide a function allowing to read the gaps between the registers?
Good catch. The count was added to ease the consecutive otp word reading, as there is bank open/close cost for otp read. What about the following changes?
int mxs_read_ocotp(unsigned offset, size_t otp_word_cnt, u32 *values)
{
......
for (i = 0; i < otp_word_cnt; i++, offset += 0x10)
*values++ = __raw_readl(ocotp_base + offset);
......
}Signature · 2 lines
Regards, Shawn
Sascha Hauer
maintainerRe: [PATCH v4 08/10] ARM: mxs: add ocotp read function
Quoted 137 lines · Shawn Guo
Hi Sascha,
Quoted 118 lines · Sascha Hauer
Quoted 77 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Callcpu_relax()during pollingChanges for v2:
- Add mutex locking formxs_read_ocotp()
- Use typesize_tfor count and i
- Add comment for clk_enable/disable skipping
- Add ERROR bit clearing and polling steparch/arm/mach-mxs/Makefile | 2 +- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.carch/arm/mach-mxs/Makefile +1
-1@@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.o obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.oarch/arm/mach-mxs/include/mach/common.h +1
-0@@ -13,6 +13,7 @@struct clk ; +extern int mxs_read_ocotp (int offset,int count,u32 *values);extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );arch/arm/mach-mxs/ocotp.c new file +31
-0@@ -0,0 +1,79 @@ +/* +* Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/mutex.h> + +#include <mach/mxs.h> + +#define BM_OCOTP_CTRL_BUSY (1 << 8) +#define BM_OCOTP_CTRL_ERROR (1 << 9) +#define BM_OCOTP_CTRL_RD_BANK_OPEN (1 << 12) + +static DEFINE_MUTEX (ocotp_mutex); + +int mxs_read_ocotp (unsigned offset,size_t count,u32 *values) +{ +void __iomem *ocotp_base =MXS_IO_ADDRESS (MXS_OCOTP_BASE_ADDR ); +int timeout =0x400 ; +size_t i;arch/arm/mach-mxs/ocotp.c line 41
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+ +mutex_lock (&ocotp_mutex); + +/* +* clk_enable(hbus_clk) for ocotp can be skipped +* as it must be on when system is running. +*/ + +/* try to clear ERROR bit */ +__mxs_clrl (BM_OCOTP_CTRL_ERROR , ocotp_base);This operation does not try to clear the error bit but actually clears it...
arch/arm/mach-mxs/ocotp.c line 46
Quoted 5 lines
arch/arm/mach-mxs/ocotp.c new file +5
-0+ +/* check both BUSY and ERROR cleared */ +while ((__raw_readl (ocotp_base) & + (BM_OCOTP_CTRL_BUSY |BM_OCOTP_CTRL_ERROR )) && --timeout) +cpu_relax ();...which means you do not have to poll the error bit here...
Quoted 4 lines
arch/arm/mach-mxs/ocotp.c new file +4
-0+ +if (unlikely (!timeout)) + goto error_unlock; +arch/arm/mach-mxs/ocotp.c line 60
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+/* open OCOTP banks for read */ +__mxs_setl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +/* approximately wait 32 hclk cycles */ +udelay (1 ); + +/* poll BUSY bit becoming cleared */ + timeout =0x400 ; +while ((__raw_readl (ocotp_base) &BM_OCOTP_CTRL_BUSY ) && --timeout) +cpu_relax ();...which means you can factor out a
ocotp_wait_busyfunction and let the code speak instead of the comments.Quoted 11 lines
arch/arm/mach-mxs/ocotp.c line 66
Quoted 6 lines
arch/arm/mach-mxs/ocotp.c new file +6
-0+ +if (unlikely (!timeout)) + goto error_unlock; + +for (i =0 ; i < count; i++, offset +=4 ) + *values++ =__raw_readl (ocotp_base + offset);The registers in the ocotp are 16 byte aligned. Does it really make sense to provide a function allowing to read the gaps between the registers?
Good catch. The count was added to ease the consecutive otp word reading, as there is bank open/close cost for otp read. What about the following changes?
int
mxs_read_ocotp(unsigned offset, size_t otp_word_cnt, u32 *values)
Quoted 8 lines
{
......
for (i = 0; i < otp_word_cnt; i++, offset += 0x10)
*values++ = __raw_readl(ocotp_base + offset);
......
}I would rather make a function like this:
static u32 ocotp[0x27];
const u32 *mxs_get_ocotp(void)
{
static int once = 0;
if (once)
return ocotp
/* bank open */
for (i = 0; i < 0x27; i++)
ocotp[i] = readl(ocotp_base + 0x20 + i * 0x10)
/* bank_close */
once = 1;
return ocotp;
}Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH v4 08/10] ARM: mxs: add ocotp read function
Hello Sascha,
Quoted 150 lines · Sascha Hauer
Quoted 135 lines · Shawn Guo
Quoted 118 lines · Sascha Hauer
Quoted 77 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Callcpu_relax()during pollingChanges for v2:
- Add mutex locking formxs_read_ocotp()
- Use typesize_tfor count and i
- Add comment for clk_enable/disable skipping
- Add ERROR bit clearing and polling steparch/arm/mach-mxs/Makefile | 2 +- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.carch/arm/mach-mxs/Makefile +1
-1@@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.o obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.oarch/arm/mach-mxs/include/mach/common.h +1
-0@@ -13,6 +13,7 @@struct clk ; +extern int mxs_read_ocotp (int offset,int count,u32 *values);extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );arch/arm/mach-mxs/ocotp.c new file +31
-0@@ -0,0 +1,79 @@ +/* +* Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/mutex.h> + +#include <mach/mxs.h> + +#define BM_OCOTP_CTRL_BUSY (1 << 8) +#define BM_OCOTP_CTRL_ERROR (1 << 9) +#define BM_OCOTP_CTRL_RD_BANK_OPEN (1 << 12) + +static DEFINE_MUTEX (ocotp_mutex); + +int mxs_read_ocotp (unsigned offset,size_t count,u32 *values) +{ +void __iomem *ocotp_base =MXS_IO_ADDRESS (MXS_OCOTP_BASE_ADDR ); +int timeout =0x400 ; +size_t i;arch/arm/mach-mxs/ocotp.c line 41
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+ +mutex_lock (&ocotp_mutex); + +/* +* clk_enable(hbus_clk) for ocotp can be skipped +* as it must be on when system is running. +*/ + +/* try to clear ERROR bit */ +__mxs_clrl (BM_OCOTP_CTRL_ERROR , ocotp_base);This operation does not try to clear the error bit but actually clears it...
arch/arm/mach-mxs/ocotp.c line 46
Quoted 5 lines
arch/arm/mach-mxs/ocotp.c new file +5
-0+ +/* check both BUSY and ERROR cleared */ +while ((__raw_readl (ocotp_base) & + (BM_OCOTP_CTRL_BUSY |BM_OCOTP_CTRL_ERROR )) && --timeout) +cpu_relax ();...which means you do not have to poll the error bit here...
Quoted 4 lines
arch/arm/mach-mxs/ocotp.c new file +4
-0+ +if (unlikely (!timeout)) + goto error_unlock; +arch/arm/mach-mxs/ocotp.c line 60
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+/* open OCOTP banks for read */ +__mxs_setl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +/* approximately wait 32 hclk cycles */ +udelay (1 ); + +/* poll BUSY bit becoming cleared */ + timeout =0x400 ; +while ((__raw_readl (ocotp_base) &BM_OCOTP_CTRL_BUSY ) && --timeout) +cpu_relax ();...which means you can factor out a
ocotp_wait_busyfunction and let the code speak instead of the comments.Quoted 11 lines
arch/arm/mach-mxs/ocotp.c line 66
Quoted 6 lines
arch/arm/mach-mxs/ocotp.c new file +6
-0+ +if (unlikely (!timeout)) + goto error_unlock; + +for (i =0 ; i < count; i++, offset +=4 ) + *values++ =__raw_readl (ocotp_base + offset);The registers in the ocotp are 16 byte aligned. Does it really make sense to provide a function allowing to read the gaps between the registers?
Good catch. The count was added to ease the consecutive otp word reading, as there is bank open/close cost for otp read. What about the following changes?
int
mxs_read_ocotp(unsigned offset, size_t otp_word_cnt, u32 *values)Quoted 8 lines
{ ...... for (i = 0; i < otp_word_cnt; i++, offset += 0x10) *values++ = __raw_readl(ocotp_base + offset); ...... }I would rather make a function like this:
static u32 ocotp[0x27];
const u32
*mxs_get_ocotp(void)
Quoted 16 lines
{
static int once = 0;
if (once)
return ocotp
/* bank open */
for (i = 0; i < 0x27; i++)
ocotp[i] = readl(ocotp_base + 0x20 + i * 0x10)
/* bank_close */
once = 1;
return ocotp;which is save on UP when it's not called from irq context.
Additionally I suggest a #define for 0x27 and 0x20.
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v4 08/10] ARM: mxs: add ocotp read function
Quoted 164 lines · Uwe Kleine-König
Hello Sascha,
Quoted 161 lines · Sascha Hauer
Quoted 135 lines · Shawn Guo
Quoted 118 lines · Sascha Hauer
Quoted 77 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Callcpu_relax()during pollingChanges for v2:
- Add mutex locking formxs_read_ocotp()
- Use typesize_tfor count and i
- Add comment for clk_enable/disable skipping
- Add ERROR bit clearing and polling steparch/arm/mach-mxs/Makefile | 2 +- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.carch/arm/mach-mxs/Makefile +1
-1@@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.o obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.oarch/arm/mach-mxs/include/mach/common.h +1
-0@@ -13,6 +13,7 @@struct clk ; +extern int mxs_read_ocotp (int offset,int count,u32 *values);extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );arch/arm/mach-mxs/ocotp.c new file +31
-0@@ -0,0 +1,79 @@ +/* +* Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/mutex.h> + +#include <mach/mxs.h> + +#define BM_OCOTP_CTRL_BUSY (1 << 8) +#define BM_OCOTP_CTRL_ERROR (1 << 9) +#define BM_OCOTP_CTRL_RD_BANK_OPEN (1 << 12) + +static DEFINE_MUTEX (ocotp_mutex); + +int mxs_read_ocotp (unsigned offset,size_t count,u32 *values) +{ +void __iomem *ocotp_base =MXS_IO_ADDRESS (MXS_OCOTP_BASE_ADDR ); +int timeout =0x400 ; +size_t i;arch/arm/mach-mxs/ocotp.c line 41
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+ +mutex_lock (&ocotp_mutex); + +/* +* clk_enable(hbus_clk) for ocotp can be skipped +* as it must be on when system is running. +*/ + +/* try to clear ERROR bit */ +__mxs_clrl (BM_OCOTP_CTRL_ERROR , ocotp_base);This operation does not try to clear the error bit but actually clears it...
arch/arm/mach-mxs/ocotp.c line 46
Quoted 5 lines
arch/arm/mach-mxs/ocotp.c new file +5
-0+ +/* check both BUSY and ERROR cleared */ +while ((__raw_readl (ocotp_base) & + (BM_OCOTP_CTRL_BUSY |BM_OCOTP_CTRL_ERROR )) && --timeout) +cpu_relax ();...which means you do not have to poll the error bit here...
Quoted 4 lines
arch/arm/mach-mxs/ocotp.c new file +4
-0+ +if (unlikely (!timeout)) + goto error_unlock; +arch/arm/mach-mxs/ocotp.c line 60
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+/* open OCOTP banks for read */ +__mxs_setl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +/* approximately wait 32 hclk cycles */ +udelay (1 ); + +/* poll BUSY bit becoming cleared */ + timeout =0x400 ; +while ((__raw_readl (ocotp_base) &BM_OCOTP_CTRL_BUSY ) && --timeout) +cpu_relax ();...which means you can factor out a
ocotp_wait_busyfunction and let the code speak instead of the comments.Quoted 11 lines
arch/arm/mach-mxs/ocotp.c line 66
Quoted 6 lines
arch/arm/mach-mxs/ocotp.c new file +6
-0+ +if (unlikely (!timeout)) + goto error_unlock; + +for (i =0 ; i < count; i++, offset +=4 ) + *values++ =__raw_readl (ocotp_base + offset);The registers in the ocotp are 16 byte aligned. Does it really make sense to provide a function allowing to read the gaps between the registers?
Good catch. The count was added to ease the consecutive otp word reading, as there is bank open/close cost for otp read. What about the following changes?
int
mxs_read_ocotp(unsigned offset, size_t otp_word_cnt, u32 *values)Quoted 8 lines
{ ...... for (i = 0; i < otp_word_cnt; i++, offset += 0x10) *values++ = __raw_readl(ocotp_base + offset); ...... }I would rather make a function like this:
static u32 ocotp[0x27];
const u32
*mxs_get_ocotp(void){ static int once = 0; if (once) return ocotp /* bank open */ for (i = 0; i < 0x27; i++) ocotp[i] = readl(ocotp_base + 0x20 + i * 0x10)
Quoted 9 lines
Quoted 5 lines
/* bank_close */ once = 1; return ocotp;which is save on UP when it's not called from irq context.
Additionally I suggest a #define for
0x27and0x20.
So I will keep the mutex and not read SRK bits.
Thanks for the comments.
Signature · 2 lines
Regards, Shawn
Re: [PATCH v4 08/10] ARM: mxs: add ocotp read function
In reply to Shawn GuoQuoted 22 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Callcpu_relax()during pollingChanges for v2:
- Add mutex locking formxs_read_ocotp()
- Use typesize_tfor count and i
- Add comment for clk_enable/disable skipping
- Add ERROR bit clearing and polling steparch/arm/mach-mxs/Makefile | 2 +- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.carch/arm/mach-mxs/Makefile +0
-0
arch/arm/mach-mxs/Makefile line 2
Quoted 3 lines
arch/arm/mach-mxs/Makefile +1
-1@@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.o
is it worth to make ocotp optional? (and let evk select CONFIG_MXS_OCOTP)
Best regards
Uwe
Quoted 105 lines
arch/arm/mach-mxs/Makefile +0
-0obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.oarch/arm/mach-mxs/include/mach/common.h +1
-0@@ -13,6 +13,7 @@struct clk ; +extern int mxs_read_ocotp (int offset,int count,u32 *values);extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );arch/arm/mach-mxs/ocotp.c new file +79
-0@@ -0,0 +1,79 @@ +/* +* Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/mutex.h> + +#include <mach/mxs.h> + +#define BM_OCOTP_CTRL_BUSY (1 << 8) +#define BM_OCOTP_CTRL_ERROR (1 << 9) +#define BM_OCOTP_CTRL_RD_BANK_OPEN (1 << 12) + +static DEFINE_MUTEX (ocotp_mutex); + +int mxs_read_ocotp (unsigned offset,size_t count,u32 *values) +{ +void __iomem *ocotp_base =MXS_IO_ADDRESS (MXS_OCOTP_BASE_ADDR ); +int timeout =0x400 ; +size_t i; + +mutex_lock (&ocotp_mutex); + +/* +* clk_enable(hbus_clk) for ocotp can be skipped +* as it must be on when system is running. +*/ + +/* try to clear ERROR bit */ +__mxs_clrl (BM_OCOTP_CTRL_ERROR , ocotp_base); + +/* check both BUSY and ERROR cleared */ +while ((__raw_readl (ocotp_base) & + (BM_OCOTP_CTRL_BUSY |BM_OCOTP_CTRL_ERROR )) && --timeout) +cpu_relax (); + +if (unlikely (!timeout)) + goto error_unlock; + +/* open OCOTP banks for read */ +__mxs_setl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +/* approximately wait 32 hclk cycles */ +udelay (1 ); + +/* poll BUSY bit becoming cleared */ + timeout =0x400 ; +while ((__raw_readl (ocotp_base) &BM_OCOTP_CTRL_BUSY ) && --timeout) +cpu_relax (); + +if (unlikely (!timeout)) + goto error_unlock; + +for (i =0 ; i < count; i++, offset +=4 ) + *values++ =__raw_readl (ocotp_base + offset); + +/* close banks for power saving */ +__mxs_clrl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +mutex_unlock (&ocotp_mutex); + +return 0 ; + +error_unlock: +mutex_unlock (&ocotp_mutex); +pr_err ("%s: timeout in reading OCOTP\n" , __func__); +return -ETIMEDOUT ; +}Signature · 1 line
1.7.1
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Sascha Hauer
maintainerRe: [PATCH v4 08/10] ARM: mxs: add ocotp read function
Quoted 18 lines · Uwe Kleine-K?nig
Quoted 17 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Callcpu_relax()during pollingChanges for v2:
- Add mutex locking formxs_read_ocotp()
- Use typesize_tfor count and i
- Add comment for clk_enable/disable skipping
- Add ERROR bit clearing and polling steparch/arm/mach-mxs/Makefile | 2 +- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.c
Quoted 10 lines
arch/arm/mach-mxs/Makefile line 2
Quoted 8 lines
arch/arm/mach-mxs/Makefile +1
-1@@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.ois it worth to make ocotp optional? (and let evk select
CONFIG_MXS_OCOTP)
I think not.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH v4 08/10] ARM: mxs: add ocotp read function
Quoted 30 lines · Sascha Hauer
Quoted 18 lines · Uwe Kleine-K?nig
Quoted 17 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Callcpu_relax()during pollingChanges for v2:
- Add mutex locking formxs_read_ocotp()
- Use typesize_tfor count and i
- Add comment for clk_enable/disable skipping
- Add ERROR bit clearing and polling steparch/arm/mach-mxs/Makefile | 2 +- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.cQuoted 10 lines
arch/arm/mach-mxs/Makefile line 2
Quoted 8 lines
arch/arm/mach-mxs/Makefile +1
-1@@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.ois it worth to make ocotp optional? (and let evk select
CONFIG_MXS_OCOTP)
Quoted 2 lines
I think not.
I thought it depends on how we think about it. If we think that ocotp is a block of soc and should be on every system based on the soc, we should build it unconditional. However, if we think ocotp is a function that could either be used on a machine or not, it should be built conditional, so that the machine does not use ocotp function could save the ocotp build and the memory of u32 ocotp_words[0x20].
Signature · 2 lines
Regards, Shawn
Re: [PATCH v4 08/10] ARM: mxs: add ocotp read function
Hi Sascha,
Quoted 33 lines · Shawn Guo
Quoted 30 lines · Sascha Hauer
Quoted 18 lines · Uwe Kleine-König
Quoted 17 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v4:
- Callcpu_relax()during pollingChanges for v2:
- Add mutex locking formxs_read_ocotp()
- Use typesize_tfor count and i
- Add comment for clk_enable/disable skipping
- Add ERROR bit clearing and polling steparch/arm/mach-mxs/Makefile | 2 +- arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.cQuoted 10 lines
arch/arm/mach-mxs/Makefile line 2
Quoted 8 lines
arch/arm/mach-mxs/Makefile +1
-1@@ -1,5 +1,5 @@ # Common support -obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.ois it worth to make ocotp optional? (and let evk select
CONFIG_MXS_OCOTP)Quoted 2 lines
I think not.
Quoted 8 lines
I thought it depends on how we think about it. If we think that ocotp is a block of soc and should be on every system based on the soc, we should build it unconditional. However, if we think ocotp is a function that could either be used on a machine or not, it should be built conditional, so that the machine does not use ocotp function could save the ocotp build and the memory of u32 ocotp_words[0x20].
You've not merged patch #8, #9, #10, so you still think CONFIG_MXS_OCOTP should not be added?
Signature · 2 lines
Regards, Shawn
PATCH v4 9/10 ARM: mx28: read fec mac address from ocotp
In reply to Shawn GuoRead fec mac address from ocotp and save it into fec_platform_data mac field for fec driver to use.
---
Changes for v2:
- It's not necessary to remove "const" for fec_platform_data from platform-fec.c and devices-common.h, so add it back.
- Hard-coding Freescale OUI (00:04:9f) instead of just the first two two octets.
- Correct the return of mx28evk_fec_get_mac() and check it with caller
arch/arm/mach-mxs/mach-mx28evk.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-)
arch/arm/mach-mxs/mach-mx28evk.c +32 -0
@@ -129,12 +129,44 @@ static struct fec_platform_data mx28_fec_pdata[] = { }, }; +static int __init mx28evk_fec_get_mac (void ) +{ +int i, ret; +u32 val; + +/* +* OCOTP only stores the last 4 octets for each mac address, +* so hard-code Freescale OUI (00:04:9f) here. +*/ +for (i =0 ; i <2 ; i++) { + ret =mxs_read_ocotp (0x20 + i *0x10 ,1 , &val); +if (ret) + goto error; + + mx28_fec_pdata[i].mac[0 ] =0x00 ; + mx28_fec_pdata[i].mac[1 ] =0x04 ; + mx28_fec_pdata[i].mac[2 ] =0x9f ; + mx28_fec_pdata[i].mac[3 ] = (val >>16 ) &0xff ; + mx28_fec_pdata[i].mac[4 ] = (val >>8 ) &0xff ; + mx28_fec_pdata[i].mac[5 ] = (val >>0 ) &0xff ; + } + +return 0 ; + +error: +pr_err ("%s: timeout when reading fec mac from OCOTP\n" , __func__); +return ret; +} +static void __init mx28evk_init (void ) {mxs_iomux_setup_multiple_pads (mx28evk_pads,ARRAY_SIZE (mx28evk_pads));mx28_add_duart (); +if (mx28evk_fec_get_mac ()) +pr_warn ("%s: failed on fec mac setup\n" , __func__); +mx28evk_fec_reset ();mx28_add_fec (0 , &mx28_fec_pdata[0 ]);#ifdef CONFIG_FEC2
Signature · 1 line
1.7.1
Re: [PATCH v4 09/10] ARM: mx28: read fec mac address from ocotp
Hello Shawn,
$SUBJECT ~= s,mx28,mxs/mx28evk, please
Quoted 70 lines · Shawn Guo
Read fec mac address from ocotp and save it into
fec_platform_datamac field for fec driver to use.Signed-off-by Shawn Guo <[email protected]>---
Changes for v2:
- It's not necessary to remove "const" forfec_platform_datafromplatform-fec.canddevices-common.h, so add it back.
- Hard-coding Freescale OUI (00:04:9f) instead of just the first two two octets.
- Correct the return ofmx28evk_fec_get_mac()and check it with callerarch/arm/mach-mxs/mach-mx28evk.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-)arch/arm/mach-mxs/mach-mx28evk.c +32
-0@@ -129,12 +129,44 @@ static struct fec_platform_data mx28_fec_pdata[] = { }, }; +static int __init mx28evk_fec_get_mac (void ) +{ +int i, ret; +u32 val; + +/* +* OCOTP only stores the last 4 octets for each mac address, +* so hard-code Freescale OUI (00:04:9f) here. +*/ +for (i =0 ; i <2 ; i++) { + ret =mxs_read_ocotp (0x20 + i *0x10 ,1 , &val); +if (ret) + goto error; + + mx28_fec_pdata[i].mac[0 ] =0x00 ; + mx28_fec_pdata[i].mac[1 ] =0x04 ; + mx28_fec_pdata[i].mac[2 ] =0x9f ; + mx28_fec_pdata[i].mac[3 ] = (val >>16 ) &0xff ; + mx28_fec_pdata[i].mac[4 ] = (val >>8 ) &0xff ; + mx28_fec_pdata[i].mac[5 ] = (val >>0 ) &0xff ; + } + +return 0 ; + +error: +pr_err ("%s: timeout when reading fec mac from OCOTP\n" , __func__); +return ret; +} +static void __init mx28evk_init (void ) {mxs_iomux_setup_multiple_pads (mx28evk_pads,ARRAY_SIZE (mx28evk_pads));mx28_add_duart (); +if (mx28evk_fec_get_mac ()) +pr_warn ("%s: failed on fec mac setup\n" , __func__); +mx28evk_fec_reset ();mx28_add_fec (0 , &mx28_fec_pdata[0 ]);#ifdef CONFIG_FEC2 Signature · 1 line
1.7.1
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH v4 10/10 ARM: mxs: add initial pm support
In reply to Shawn GuoThis is a very initial pm support and basically does nothing. With this pm support entry, drivers can start testing their own pm functions.
---
Changes for v2:
- Let build of pm.c depend on CONFIG_PM
- Remove the blank line above device_initcall in pm.c
arch/arm/mach-mxs/Makefile | 2 ++ arch/arm/mach-mxs/pm.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-mxs/pm.c
arch/arm/mach-mxs/Makefile +2 -0
@@ -1,6 +1,8 @@ # Common support obj-y := clock.o devices.o gpio.o icoll.o iomux.o ocotp.o system.o timer.o +obj-$(CONFIG_PM) += pm.o + obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o
arch/arm/mach-mxs/pm.c new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.7.1
From: Shawn Guo <[email protected]>
Date: Thu, 6 Jan 2011 15:13:08 +0800
Quoted 13 lines
This patch series is to add dual fec support for mx28, which is a mxs-based soc. Some code changes related to the following commits are also made in this patch set for some reasons.
e6b043d512fa8d9a3801bf5d72bfa3b8fc3b3cc8
netdev/fec.c: add phylib supporting to enable carrier detection (v2)
e3fe8558c7fc182972c3d947d88744482111f304
net/fec: fix pm to survive to suspend/resumeIt's been tested on mx28 evk and mx51 babbage. For mx28, it has to work against the tree
Quoted 8 lines
git://git.pengutronix.de/git/imx/linux-2.6.gitimx-for-2.6.38plus patch
[PATCH v4] ARM: mxs: Change duart device to use amba-pl011
The 3 patches below preceding with * have changes since v3, and the detailed change log can be found in individual patch.
I've applied all of the "net/fec:" patches (#1 to #5) to net-2.6, please push the ARM changes via the appropriate ARM tree.
Thanks.
Quoted 22 lines · David Miller
From: Shawn Guo <[email protected]>
Date: Thu, 6 Jan 2011 15:13:08 +0800Quoted 19 lines
This patch series is to add dual fec support for mx28, which is a mxs-based soc. Some code changes related to the following commits are also made in this patch set for some reasons.
e6b043d512fa8d9a3801bf5d72bfa3b8fc3b3cc8
netdev/fec.c: add phylib supporting to enable carrier detection (v2)
e3fe8558c7fc182972c3d947d88744482111f304
net/fec: fix pm to survive to suspend/resumeIt's been tested on mx28 evk and mx51 babbage. For mx28, it has to work against the tree
git://git.pengutronix.de/git/imx/linux-2.6.gitimx-for-2.6.38plus patch
[PATCH v4] ARM: mxs: Change duart device to use amba-pl011
Quoted 8 lines
Quoted 2 lines
The 3 patches below preceding with * have changes since v3, and the detailed change log can be found in individual patch.
I've applied all of the "net/fec:" patches (#1 to #5) to net-2.6, please push the ARM changes via the appropriate ARM tree.
Thanks.
Thanks, David. I will ping Sascha for ARM changes.
Signature · 2 lines
Regards, Shawn
Hi Sascha,
Quoted 20 lines · David Miller
From: Shawn Guo <[email protected]>
Date: Thu, 6 Jan 2011 15:13:08 +0800Quoted 17 lines
This patch series is to add dual fec support for mx28, which is a mxs-based soc. Some code changes related to the following commits are also made in this patch set for some reasons.
e6b043d512fa8d9a3801bf5d72bfa3b8fc3b3cc8
netdev/fec.c: add phylib supporting to enable carrier detection (v2)
e3fe8558c7fc182972c3d947d88744482111f304
net/fec: fix pm to survive to suspend/resumeIt's been tested on mx28 evk and mx51 babbage. For mx28, it has to work against the tree
git://git.pengutronix.de/git/imx/linux-2.6.gitimx-for-2.6.38plus patch
Quoted 8 lines
Quoted 4 lines
[PATCH v4] ARM: mxs: Change duart device to use amba-pl011
The 3 patches below preceding with * have changes since v3, and the detailed change log can be found in individual patch.
I've applied all of the "net/fec:" patches (#1 to #5) to net-2.6, please push the ARM changes via the appropriate ARM tree.
Is there anything needs to be done to get the following patches merged?
[PATCH v4] ARM: mxs: Change duart device to use amba-pl011 [PATCH v4 00/10] net/fec: add dual fec support for i.MX28, #6 to #10.
Signature · 2 lines
Regards, Shawn
PATCH 1/1 net/fec: remove config FEC2 as it's used nowhere
In reply to Shawn Guo--- drivers/net/Kconfig | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
drivers/net/Kconfig +0 -8
@@ -1950,14 +1950,6 @@ config FEC Say Y here if you want to use the built-in 10/100 Fast ethernet controller on some Motorola ColdFire and Freescale i.MX processors. -config FEC2 - bool "Second FEC ethernet controller" - depends on FEC - help - Say Y here if you want to use the second built-in 10/100 Fast - ethernet controller on some Motorola ColdFire and Freescale - i.MX processors. - config FEC_MPC52xx tristate "MPC52xx FEC driver" depends on PPC_MPC52xx && PPC_BESTCOMM
Signature · 1 line
1.7.1
Re: [PATCH] net/fec: remove config FEC2 as it's used nowhere
From: Shawn Guo <[email protected]>
Date: Tue, 11 Jan 2011 20:07:52 +0800
Quoted 1 line
Signed-off-by Shawn Guo <[email protected]>
Applied.
PATCH v5 1/1 ARM: mx28: add the second fec device registration
In reply to Shawn Guo---
Changes for v5:
- Do not use CONFIG_FEC2 which is a fec driver configration
arch/arm/mach-mxs/mach-mx28evk.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-)
arch/arm/mach-mxs/mach-mx28evk.c +23 -3
@@ -57,6 +57,19 @@ static const iomux_cfg_t mx28evk_pads[] __initconst = { (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ),MX28_PAD_ENET_CLK__CLKCTRL_ENET | (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +/* fec1 */ +MX28_PAD_ENET0_CRS__ENET1_RX_EN | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_RXD2__ENET1_RXD0 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_RXD3__ENET1_RXD1 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_COL__ENET1_TX_EN | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_TXD2__ENET1_TXD0 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_TXD3__ENET1_TXD1 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ),/* phy power line */ MX28_PAD_SSP1_DATA3__GPIO_2_15 | (MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
@@ -106,8 +119,14 @@ static void __init mx28evk_fec_reset(void)gpio_set_value (MX28EVK_FEC_PHY_RESET ,1 ); } -static const struct fec_platform_data mx28_fec_pdata__initconst = { - .phy =PHY_INTERFACE_MODE_RMII , +static struct fec_platform_data mx28_fec_pdata[] = { + { +/* fec0 */ + .phy =PHY_INTERFACE_MODE_RMII , + }, { +/* fec1 */ + .phy =PHY_INTERFACE_MODE_RMII , + }, };static void __init mx28evk_init (void )
@@ -117,7 +136,8 @@ static void __init mx28evk_init(void)mx28_add_duart ();mx28evk_fec_reset (); -mx28_add_fec (0 , &mx28_fec_pdata); +mx28_add_fec (0 , &mx28_fec_pdata[0 ]); +mx28_add_fec (1 , &mx28_fec_pdata[1 ]); }static void __init mx28evk_timer_init (void )
Signature · 1 line
1.7.1
Re: [PATCH v5] ARM: mx28: add the second fec device registration
Quoted 33 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v5:
- Do not useCONFIG_FEC2which is a fec driver configrationarch/arm/mach-mxs/mach-mx28evk.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-)arch/arm/mach-mxs/mach-mx28evk.c +13
-0@@ -57,6 +57,19 @@ static const iomux_cfg_t mx28evk_pads[] __initconst = { (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ),MX28_PAD_ENET_CLK__CLKCTRL_ENET | (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +/* fec1 */ +MX28_PAD_ENET0_CRS__ENET1_RX_EN | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_RXD2__ENET1_RXD0 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_RXD3__ENET1_RXD1 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_COL__ENET1_TX_EN | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_TXD2__ENET1_TXD0 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_TXD3__ENET1_TXD1 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ),/* phy power line */ MX28_PAD_SSP1_DATA3__GPIO_2_15 | (MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
arch/arm/mach-mxs/mach-mx28evk.c static void __init mx28evk_fec_reset(void) · line 122
Quoted 6 lines
arch/arm/mach-mxs/mach-mx28evk.c +1
-2@@ -106,8 +119,14 @@ static void __init mx28evk_fec_reset(void)gpio_set_value (MX28EVK_FEC_PHY_RESET ,1 ); } -static const struct fec_platform_data mx28_fec_pdata__initconst = { - .phy =PHY_INTERFACE_MODE_RMII , +static struct fec_platform_data mx28_fec_pdata[] = {
this can still be initdata, doesn't it?
Quoted 25 lines
arch/arm/mach-mxs/mach-mx28evk.c +9
-1+ { +/* fec0 */ + .phy = PHY_INTERFACE_MODE_RMII, + }, { +/* fec1 */ + .phy = PHY_INTERFACE_MODE_RMII, + }, };static void __init mx28evk_init (void )@@ -117,7 +136,8 @@ static void __init mx28evk_init(void)mx28_add_duart ();mx28evk_fec_reset (); -mx28_add_fec (0 , &mx28_fec_pdata); +mx28_add_fec (0 , &mx28_fec_pdata[0 ]); +mx28_add_fec (1 , &mx28_fec_pdata[1 ]); }static void __init mx28evk_timer_init (void )Signature · 1 line
1.7.1
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v5] ARM: mx28: add the second fec device registration
Hi Uwe,
Quoted 37 lines · Uwe Kleine-König
Quoted 36 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>---
Changes for v5:
- Do not useCONFIG_FEC2which is a fec driver configrationarch/arm/mach-mxs/mach-mx28evk.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-)arch/arm/mach-mxs/mach-mx28evk.c +13
-0@@ -57,6 +57,19 @@ static const iomux_cfg_t mx28evk_pads[] __initconst = { (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ),MX28_PAD_ENET_CLK__CLKCTRL_ENET | (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +/* fec1 */ +MX28_PAD_ENET0_CRS__ENET1_RX_EN | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_RXD2__ENET1_RXD0 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_RXD3__ENET1_RXD1 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_COL__ENET1_TX_EN | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_TXD2__ENET1_TXD0 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), +MX28_PAD_ENET0_TXD3__ENET1_TXD1 | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ),/* phy power line */ MX28_PAD_SSP1_DATA3__GPIO_2_15 | (MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),@@ -106,8 +119,14 @@ static void __init mx28evk_fec_reset(void)gpio_set_value (MX28EVK_FEC_PHY_RESET ,1 ); }
Quoted 5 lines
arch/arm/mach-mxs/mach-mx28evk.c static void __init mx28evk_fec_reset(void) · line 122
Quoted 3 lines
arch/arm/mach-mxs/mach-mx28evk.c +1
-2-static const struct fec_platform_data mx28_fec_pdata__initconst = { - .phy =PHY_INTERFACE_MODE_RMII , +static struct fec_platform_data mx28_fec_pdata[] = {this can still be initdata, doesn't it?
Sascha has merged the patch. This one line change may not deserve a separate patch, so I will take care of it when updating the file with new version of ocotp patch.
Signature · 2 lines
Regards, Shawn
PATCH v5 8/10 ARM: mxs: add ocotp read function
In reply to Shawn Guo--- arch/arm/mach-mxs/Kconfig | 4 ++ arch/arm/mach-mxs/Makefile | 3 + arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 90 +++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.c
arch/arm/mach-mxs/Kconfig +4 -0
@@ -2,6 +2,9 @@ if ARCH_MXS source "arch/arm/mach-mxs/devices/Kconfig" +config MXS_OCOTP + bool + config SOC_IMX23 bool select CPU_ARM926T
@@ -26,6 +29,7 @@ config MACH_MX28EVK select SOC_IMX28 select MXS_HAVE_AMBA_DUART select MXS_HAVE_PLATFORM_FEC + select MXS_OCOTP default y help Include support for MX28EVK platform. This includes specific
arch/arm/mach-mxs/Makefile +3 -0
@@ -1,6 +1,9 @@ # Common support obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-$(CONFIG_PM) += pm.o +obj-$(CONFIG_MXS_OCOTP) += ocotp.o + obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o
arch/arm/mach-mxs/include/mach/common.h +1 -0
@@ -13,6 +13,7 @@struct clk ; +extern const u32 *mxs_get_ocotp (void );extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );
arch/arm/mach-mxs/ocotp.c new file +90 -0
90 lines not on this page · raw message
Signature · 1 line
1.7.1
Sascha Hauer
maintainerRe: [PATCH v5 08/10] ARM: mxs: add ocotp read function
Quoted 143 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>--- arch/arm/mach-mxs/Kconfig | 4 ++ arch/arm/mach-mxs/Makefile | 3 + arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 90 +++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.carch/arm/mach-mxs/Kconfig +4
-0@@ -2,6 +2,9 @@ if ARCH_MXS source "arch/arm/mach-mxs/devices/Kconfig" +config MXS_OCOTP + bool + config SOC_IMX23 bool select CPU_ARM926T@@ -26,6 +29,7 @@ config MACH_MX28EVK select SOC_IMX28 select MXS_HAVE_AMBA_DUART select MXS_HAVE_PLATFORM_FEC + select MXS_OCOTP default y help Include support for MX28EVK platform. This includes specificarch/arm/mach-mxs/Makefile +3
-0@@ -1,6 +1,9 @@ # Common support obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-$(CONFIG_PM) += pm.o +obj-$(CONFIG_MXS_OCOTP) += ocotp.o + obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.oarch/arm/mach-mxs/include/mach/common.h +1
-0@@ -13,6 +13,7 @@struct clk ; +extern const u32 *mxs_get_ocotp (void );extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );arch/arm/mach-mxs/ocotp.c new file +80
-0@@ -0,0 +1,90 @@ +/* +* Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/mutex.h> + +#include <mach/mxs.h> + +#define OCOTP_WORD_OFFSET 0x20 +#define OCOTP_WORD_COUNT 0x20 + +#define BM_OCOTP_CTRL_BUSY (1 << 8) +#define BM_OCOTP_CTRL_ERROR (1 << 9) +#define BM_OCOTP_CTRL_RD_BANK_OPEN (1 << 12) + +static DEFINE_MUTEX (ocotp_mutex); +static u32 ocotp_words[OCOTP_WORD_COUNT ]; + +const u32 *mxs_get_ocotp (void ) +{ +void __iomem *ocotp_base =MXS_IO_ADDRESS (MXS_OCOTP_BASE_ADDR ); +int timeout =0x400 ; +size_t i; +static int once =0 ; + +if (once) +return ocotp_words; + +mutex_lock (&ocotp_mutex); + +/* +* clk_enable(hbus_clk) for ocotp can be skipped +* as it must be on when system is running. +*/ + +/* try to clear ERROR bit */ +__mxs_clrl (BM_OCOTP_CTRL_ERROR , ocotp_base); + +/* check both BUSY and ERROR cleared */ +while ((__raw_readl (ocotp_base) & + (BM_OCOTP_CTRL_BUSY |BM_OCOTP_CTRL_ERROR )) && --timeout) +cpu_relax (); + +if (unlikely (!timeout)) + goto error_unlock; + +/* open OCOTP banks for read */ +__mxs_setl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +/* approximately wait 32 hclk cycles */ +udelay (1 ); + +/* poll BUSY bit becoming cleared */ + timeout =0x400 ; +while ((__raw_readl (ocotp_base) &BM_OCOTP_CTRL_BUSY ) && --timeout) +cpu_relax (); + +if (unlikely (!timeout)) + goto error_unlock; + +for (i =0 ; i <OCOTP_WORD_COUNT ; i++) + ocotp_words[i] =__raw_readl (ocotp_base +OCOTP_WORD_OFFSET + + i *0x10 ); + +/* close banks for power saving */ +__mxs_clrl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +mutex_unlock (&ocotp_mutex);
arch/arm/mach-mxs/ocotp.c line 90
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+ + once =1 ; + +return ocotp_words; + +error_unlock: +mutex_unlock (&ocotp_mutex); +pr_err ("%s: timeout in reading OCOTP\n" , __func__); +return NULL ; +}
EXPORT_SYMBOL?
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH v5 08/10] ARM: mxs: add ocotp read function
Hello Sascha,
Quoted 7 lines · Sascha Hauer
arch/arm/mach-mxs/ocotp.c line 90
Quoted 4 lines · Shawn Guo
arch/arm/mach-mxs/ocotp.c new file +4
-0+const u32 *mxs_get_ocotp (void ) +{ + [...] +}
EXPORT_SYMBOL?
I don't think this should be necessary. mxs_get_ocotp should only be called from platform code that cannot (ot at least should not) be modular. I suggest to skip it for now and if we really need it later only add it then.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v5 08/10] ARM: mxs: add ocotp read function
In reply to Shawn GuoQuoted 36 lines · Shawn Guo
Signed-off-by Shawn Guo <[email protected]>--- arch/arm/mach-mxs/Kconfig | 4 ++ arch/arm/mach-mxs/Makefile | 3 + arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 90 +++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.carch/arm/mach-mxs/Kconfig +4
-0@@ -2,6 +2,9 @@ if ARCH_MXS source "arch/arm/mach-mxs/devices/Kconfig" +config MXS_OCOTP + bool + config SOC_IMX23 bool select CPU_ARM926T@@ -26,6 +29,7 @@ config MACH_MX28EVK select SOC_IMX28 select MXS_HAVE_AMBA_DUART select MXS_HAVE_PLATFORM_FEC + select MXS_OCOTP default y help Include support for MX28EVK platform. This includes specificarch/arm/mach-mxs/Makefile +0
-0
arch/arm/mach-mxs/Makefile line 4
Quoted 4 lines
arch/arm/mach-mxs/Makefile +1
-0@@ -1,6 +1,9 @@ # Common support obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-$(CONFIG_PM) += pm.o
this line doesn't belong here.
Quoted 95 lines
arch/arm/mach-mxs/Makefile +2
-0+obj-$(CONFIG_MXS_OCOTP) += ocotp.o + obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.oarch/arm/mach-mxs/include/mach/common.h +1
-0@@ -13,6 +13,7 @@struct clk ; +extern const u32 *mxs_get_ocotp (void );extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );arch/arm/mach-mxs/ocotp.c new file +72
-0@@ -0,0 +1,90 @@ +/* +* Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/mutex.h> + +#include <mach/mxs.h> + +#define OCOTP_WORD_OFFSET 0x20 +#define OCOTP_WORD_COUNT 0x20 + +#define BM_OCOTP_CTRL_BUSY (1 << 8) +#define BM_OCOTP_CTRL_ERROR (1 << 9) +#define BM_OCOTP_CTRL_RD_BANK_OPEN (1 << 12) + +static DEFINE_MUTEX (ocotp_mutex); +static u32 ocotp_words[OCOTP_WORD_COUNT ]; + +const u32 *mxs_get_ocotp (void ) +{ +void __iomem *ocotp_base =MXS_IO_ADDRESS (MXS_OCOTP_BASE_ADDR ); +int timeout =0x400 ; +size_t i; +static int once =0 ; + +if (once) +return ocotp_words; + +mutex_lock (&ocotp_mutex); + +/* +* clk_enable(hbus_clk) for ocotp can be skipped +* as it must be on when system is running. +*/ + +/* try to clear ERROR bit */ +__mxs_clrl (BM_OCOTP_CTRL_ERROR , ocotp_base); + +/* check both BUSY and ERROR cleared */ +while ((__raw_readl (ocotp_base) & + (BM_OCOTP_CTRL_BUSY |BM_OCOTP_CTRL_ERROR )) && --timeout) +cpu_relax (); + +if (unlikely (!timeout)) + goto error_unlock; + +/* open OCOTP banks for read */ +__mxs_setl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +/* approximately wait 32 hclk cycles */ +udelay (1 ); + +/* poll BUSY bit becoming cleared */ + timeout =0x400 ; +while ((__raw_readl (ocotp_base) &BM_OCOTP_CTRL_BUSY ) && --timeout) +cpu_relax (); + +if (unlikely (!timeout)) + goto error_unlock; +
arch/arm/mach-mxs/ocotp.c line 82
Quoted 10 lines
arch/arm/mach-mxs/ocotp.c new file +10
-0+for (i =0 ; i <OCOTP_WORD_COUNT ; i++) + ocotp_words[i] =__raw_readl (ocotp_base +OCOTP_WORD_OFFSET + + i *0x10 ); + +/* close banks for power saving */ +__mxs_clrl (BM_OCOTP_CTRL_RD_BANK_OPEN , ocotp_base); + +mutex_unlock (&ocotp_mutex); + + once =1 ;
once needs to be protected by the mutex, too.
Best regards
Uwe
Quoted 18 lines
arch/arm/mach-mxs/ocotp.c new file +8
-0+ +return ocotp_words; + +error_unlock: +mutex_unlock (&ocotp_mutex); +pr_err ("%s: timeout in reading OCOTP\n" , __func__); +return NULL ; +}Signature · 8 lines
1.7.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH v5 9/10 ARM: mxs/mx28evk: read fec mac address from ocotp
In reply to Shawn GuoRead fec mac address from ocotp and save it into fec_platform_data mac field for fec driver to use.
--- arch/arm/mach-mxs/mach-mx28evk.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-)
arch/arm/mach-mxs/mach-mx28evk.c +34 -1
@@ -119,7 +119,7 @@ static void __init mx28evk_fec_reset(void)gpio_set_value (MX28EVK_FEC_PHY_RESET ,1 ); } -static struct fec_platform_data mx28_fec_pdata[] = { +static struct fec_platform_data mx28_fec_pdata[]__initdata = { {/* fec0 */ .phy =PHY_INTERFACE_MODE_RMII ,
@@ -129,12 +129,45 @@ static struct fec_platform_data mx28_fec_pdata[] = { }, }; +static int __init mx28evk_fec_get_mac (void ) +{ +int i; +u32 val; +const u32 *ocotp =mxs_get_ocotp (); + +if (!ocotp) + goto error; + +/* +* OCOTP only stores the last 4 octets for each mac address, +* so hard-code Freescale OUI (00:04:9f) here. +*/ +for (i =0 ; i <2 ; i++) { + val = ocotp[i *4 ]; + mx28_fec_pdata[i].mac[0 ] =0x00 ; + mx28_fec_pdata[i].mac[1 ] =0x04 ; + mx28_fec_pdata[i].mac[2 ] =0x9f ; + mx28_fec_pdata[i].mac[3 ] = (val >>16 ) &0xff ; + mx28_fec_pdata[i].mac[4 ] = (val >>8 ) &0xff ; + mx28_fec_pdata[i].mac[5 ] = (val >>0 ) &0xff ; + } + +return 0 ; + +error: +pr_err ("%s: timeout when reading fec mac from OCOTP\n" , __func__); +return -ETIMEDOUT ; +} +static void __init mx28evk_init (void ) {mxs_iomux_setup_multiple_pads (mx28evk_pads,ARRAY_SIZE (mx28evk_pads));mx28_add_duart (); +if (mx28evk_fec_get_mac ()) +pr_warn ("%s: failed on fec mac setup\n" , __func__); +mx28evk_fec_reset ();mx28_add_fec (0 , &mx28_fec_pdata[0 ]);mx28_add_fec (1 , &mx28_fec_pdata[1 ]);
Signature · 1 line
1.7.1
PATCH v6 8/10 ARM: mxs: add ocotp read function
In reply to Shawn Guo--- arch/arm/mach-mxs/Kconfig | 4 ++ arch/arm/mach-mxs/Makefile | 2 + arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/ocotp.c | 90 +++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-mxs/ocotp.c
arch/arm/mach-mxs/Kconfig +4 -0
@@ -2,6 +2,9 @@ if ARCH_MXS source "arch/arm/mach-mxs/devices/Kconfig" +config MXS_OCOTP + bool + config SOC_IMX23 bool select CPU_ARM926T
@@ -26,6 +29,7 @@ config MACH_MX28EVK select SOC_IMX28 select MXS_HAVE_AMBA_DUART select MXS_HAVE_PLATFORM_FEC + select MXS_OCOTP default y help Include support for MX28EVK platform. This includes specific
arch/arm/mach-mxs/Makefile +2 -0
@@ -1,6 +1,8 @@ # Common support obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o +obj-$(CONFIG_MXS_OCOTP) += ocotp.o + obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o
arch/arm/mach-mxs/include/mach/common.h +1 -0
@@ -13,6 +13,7 @@struct clk ; +extern const u32 *mxs_get_ocotp (void );extern int mxs_reset_block (void __iomem *);extern void mxs_timer_init (struct clk *,int );
arch/arm/mach-mxs/ocotp.c new file +90 -0
90 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v5 1/1 ARM: mxs: add initial pm support
In reply to Shawn GuoThis is a very initial pm support and basically does nothing. With this pm support entry, drivers can start testing their own pm functions.
---
Hi Sascha,
The merging conflict was fixed in this version, and you can pick it up on imx-for-2.6.39 branch now.
arch/arm/mach-mxs/Makefile | 1 + arch/arm/mach-mxs/pm.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-mxs/pm.c
arch/arm/mach-mxs/Makefile +1 -0
@@ -2,6 +2,7 @@ obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o obj-$(CONFIG_MXS_OCOTP) += ocotp.o +obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o
arch/arm/mach-mxs/pm.c new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.7.1